highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-02 07:50:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#30094: rpc: move UniValue in blockToJSON

Browse Source 
b77bad309e92f176f340598eec056eb7bff86f5f rpc: move UniValue in blockToJSON (willcl-ark)

Pull request description:

  Fixes: #24542
  Fixes: #30052

  Without explicitly declaring the move, these `UniValues` get copied, causing increased memory usage. Fix this by explicitly moving the `UniValue` objects.

  Used by `rest_block` and `getblock` RPC.

ACKs for top commit:
  maflcko:
    review ACK b77bad309e92f176f340598eec056eb7bff86f5f
  ismaelsadeeq:
    ACK b77bad309e92f176f340598eec056eb7bff86f5f
  TheCharlatan:
    ACK b77bad309e92f176f340598eec056eb7bff86f5f
  theuni:
    utACK b77bad309e92f176f340598eec056eb7bff86f5f
  hebasto:
    ACK b77bad309e92f176f340598eec056eb7bff86f5f, I have reviewed the code and it looks OK.
  BrandonOdiwuor:
    ACK b77bad309e92f176f340598eec056eb7bff86f5f

Tree-SHA512: 767608331040f9cfe5c3568ed0e3c338920633472a1a50d4bbb47d1dc69d2bb11466d611f050ac8ad1a894b47fe1ea4d968cf34cbd44d4bb8d479fc5c7475f6d
This commit is contained in:
Ryan Ofsky 2024-05-13 16:12:18 -04:00
commit 0503cbea9a
No known key found for this signature in database
GPG Key ID: 46800E30FC748A66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc/blockchain.cpp
View File

@ -188,12 +188,12 @@ UniValue blockToJSON(BlockManager& blockman, const CBlock& block, const CBlockIn
const CTxUndo* txundo = (have_undo && i > 0) ? &blockUndo.vtxundo.at(i - 1) : nullptr;
UniValue objTx(UniValue::VOBJ);
TxToUniv(*tx, /*block_hash=*/uint256(), /*entry=*/objTx, /*include_hex=*/true, txundo, verbosity);
txs.push_back(objTx);
txs.push_back(std::move(objTx));
}
break;
}
result.pushKV("tx", txs);
result.pushKV("tx", std::move(txs));
return result;
}