From fa46cc22bc696e6845915ae91d6b68e36bf4c242 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Thu, 16 Nov 2023 10:35:08 +0100 Subject: Remove deprecated -rpcserialversion --- src/rpc/blockchain.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/rpc/blockchain.cpp') diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index be6a8c47fd..931a741f53 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -189,7 +189,7 @@ UniValue blockToJSON(BlockManager& blockman, const CBlock& block, const CBlockIn // coinbase transaction (i.e. i == 0) doesn't have undo data 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, /*without_witness=*/RPCSerializationWithoutWitness(), txundo, verbosity); + TxToUniv(*tx, /*block_hash=*/uint256(), /*entry=*/objTx, /*include_hex=*/true, txundo, verbosity); txs.push_back(objTx); } break; @@ -738,10 +738,9 @@ static RPCHelpMan getblock() const CBlock block{GetBlockChecked(chainman.m_blockman, pblockindex)}; - if (verbosity <= 0) - { + if (verbosity <= 0) { DataStream ssBlock; - ssBlock << RPCTxSerParams(block); + ssBlock << TX_WITH_WITNESS(block); std::string strHex = HexStr(ssBlock); return strHex; } -- cgit v1.2.3