Skip to content

Commit

Permalink
Merge #30094: rpc: move UniValue in blockToJSON
Browse files Browse the repository at this point in the history
b77bad3 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 b77bad3
  ismaelsadeeq:
    ACK b77bad3
  TheCharlatan:
    ACK b77bad3
  theuni:
    utACK b77bad3
  hebasto:
    ACK b77bad3, I have reviewed the code and it looks OK.
  BrandonOdiwuor:
    ACK b77bad3

Tree-SHA512: 767608331040f9cfe5c3568ed0e3c338920633472a1a50d4bbb47d1dc69d2bb11466d611f050ac8ad1a894b47fe1ea4d968cf34cbd44d4bb8d479fc5c7475f6d
  • Loading branch information
ryanofsky committed May 13, 2024
2 parents ff8c606 + b77bad3 commit 0503cbe
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/rpc/blockchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 0503cbe

Please sign in to comment.