diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp --- a/src/blockencodings.cpp +++ b/src/blockencodings.cpp @@ -201,7 +201,7 @@ "Initialized PartiallyDownloadedBlock for block %s using a " "cmpctblock of size %lu\n", cmpctblock.header.GetHash().ToString(), - GetSerializeSize(cmpctblock, SER_NETWORK, PROTOCOL_VERSION)); + GetSerializeSize(cmpctblock, PROTOCOL_VERSION)); return READ_STATUS_OK; } diff --git a/src/coins.cpp b/src/coins.cpp --- a/src/coins.cpp +++ b/src/coins.cpp @@ -334,7 +334,7 @@ // TODO: merge with similar definition in undo.h. static const size_t MAX_OUTPUTS_PER_TX = - MAX_TX_SIZE / ::GetSerializeSize(CTxOut(), SER_NETWORK, PROTOCOL_VERSION); + MAX_TX_SIZE / ::GetSerializeSize(CTxOut(), PROTOCOL_VERSION); const Coin &AccessByTxid(const CCoinsViewCache &view, const TxId &txid) { for (uint32_t n = 0; n < MAX_OUTPUTS_PER_TX; n++) { diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -50,8 +50,7 @@ if (IsMagneticAnomalyEnabled(params, nHeight)) { // Size limit - if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) < - MIN_TX_SIZE) { + if (::GetSerializeSize(tx, PROTOCOL_VERSION) < MIN_TX_SIZE) { return state.DoS(100, false, REJECT_INVALID, "bad-txns-undersize"); } } @@ -199,7 +198,7 @@ } // Size limit - if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_TX_SIZE) { + if (::GetSerializeSize(tx, PROTOCOL_VERSION) > MAX_TX_SIZE) { return state.DoS(100, false, REJECT_INVALID, "bad-txns-oversize"); } diff --git a/src/core_write.cpp b/src/core_write.cpp --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -222,8 +222,7 @@ entry.pushKV("txid", tx.GetId().GetHex()); entry.pushKV("hash", tx.GetHash().GetHex()); entry.pushKV("version", tx.nVersion); - entry.pushKV("size", - (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION)); + entry.pushKV("size", (int)::GetSerializeSize(tx, PROTOCOL_VERSION)); entry.pushKV("locktime", (int64_t)tx.nLockTime); UniValue vin(UniValue::VARR); diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp --- a/src/index/txindex.cpp +++ b/src/index/txindex.cpp @@ -257,7 +257,7 @@ vPos.reserve(block.vtx.size()); for (const auto &tx : block.vtx) { vPos.emplace_back(tx->GetId(), pos); - pos.nTxOffset += ::GetSerializeSize(*tx, SER_DISK, CLIENT_VERSION); + pos.nTxOffset += ::GetSerializeSize(*tx, CLIENT_VERSION); } return m_db->WriteTxs(vPos); } diff --git a/src/miner.cpp b/src/miner.cpp --- a/src/miner.cpp +++ b/src/miner.cpp @@ -188,8 +188,7 @@ coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0; // Make sure the coinbase is big enough. - uint64_t coinbaseSize = - ::GetSerializeSize(coinbaseTx, SER_NETWORK, PROTOCOL_VERSION); + uint64_t coinbaseSize = ::GetSerializeSize(coinbaseTx, PROTOCOL_VERSION); if (coinbaseSize < MIN_TX_SIZE) { coinbaseTx.vin[0].scriptSig << std::vector(MIN_TX_SIZE - coinbaseSize - 1); @@ -202,8 +201,7 @@ // mode. pblocktemplate->entries[0].txFee = -1 * nFees; - uint64_t nSerializeSize = - GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION); + uint64_t nSerializeSize = GetSerializeSize(*pblock, PROTOCOL_VERSION); LogPrintf("CreateNewBlock(): total size: %u txs: %u fees: %ld sigops %d\n", nSerializeSize, nBlockTx, nFees, nBlockSigOps); @@ -297,8 +295,7 @@ return false; } - uint64_t nTxSize = - ::GetSerializeSize(it->GetTx(), SER_NETWORK, PROTOCOL_VERSION); + uint64_t nTxSize = ::GetSerializeSize(it->GetTx(), PROTOCOL_VERSION); if (nPotentialBlockSize + nTxSize >= nMaxGeneratedBlockSize) { return false; } @@ -312,8 +309,7 @@ BlockAssembler::TestForBlockResult BlockAssembler::TestForBlock(CTxMemPool::txiter it) { auto blockSizeWithTx = - nBlockSize + - ::GetSerializeSize(it->GetTx(), SER_NETWORK, PROTOCOL_VERSION); + nBlockSize + ::GetSerializeSize(it->GetTx(), PROTOCOL_VERSION); if (blockSizeWithTx >= nMaxGeneratedBlockSize) { if (nBlockSize > nMaxGeneratedBlockSize - 100 || lastFewTxs > 50) { return TestForBlockResult::BlockFinished; @@ -708,16 +704,14 @@ COINBASE_FLAGS; // Make sure the coinbase is big enough. - uint64_t coinbaseSize = - ::GetSerializeSize(txCoinbase, SER_NETWORK, PROTOCOL_VERSION); + uint64_t coinbaseSize = ::GetSerializeSize(txCoinbase, PROTOCOL_VERSION); if (coinbaseSize < MIN_TX_SIZE) { txCoinbase.vin[0].scriptSig << std::vector(MIN_TX_SIZE - coinbaseSize - 1); } assert(txCoinbase.vin[0].scriptSig.size() <= MAX_COINBASE_SCRIPTSIG_SIZE); - assert(::GetSerializeSize(txCoinbase, SER_NETWORK, PROTOCOL_VERSION) >= - MIN_TX_SIZE); + assert(::GetSerializeSize(txCoinbase, PROTOCOL_VERSION) >= MIN_TX_SIZE); pblock->vtx[0] = MakeTransactionRef(std::move(txCoinbase)); pblock->hashMerkleRoot = BlockMerkleRoot(*pblock); diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -26,7 +26,7 @@ return Amount::zero(); } - size_t nSize = GetSerializeSize(txout, SER_DISK, 0); + size_t nSize = GetSerializeSize(txout); // the 148 mentioned above nSize += (32 + 4 + 1 + 107 + 4); @@ -187,14 +187,12 @@ int64_t GetVirtualTransactionSize(const CTransaction &tx, int64_t nSigOpCost, unsigned int bytes_per_sigop) { - return GetVirtualTransactionSize( - ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION), nSigOpCost, - bytes_per_sigop); + return GetVirtualTransactionSize(::GetSerializeSize(tx, PROTOCOL_VERSION), + nSigOpCost, bytes_per_sigop); } int64_t GetVirtualTransactionInputSize(const CTxIn &txin, int64_t nSigOpCost, unsigned int bytes_per_sigop) { - return GetVirtualTransactionSize( - ::GetSerializeSize(txin, SER_NETWORK, PROTOCOL_VERSION), nSigOpCost, - bytes_per_sigop); + return GetVirtualTransactionSize(::GetSerializeSize(txin, PROTOCOL_VERSION), + nSigOpCost, bytes_per_sigop); } diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -114,7 +114,7 @@ } unsigned int CTransaction::GetTotalSize() const { - return ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION); + return ::GetSerializeSize(*this, PROTOCOL_VERSION); } std::string CTransaction::ToString() const { diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -114,8 +114,7 @@ const CBlockIndex *pnext; int confirmations = ComputeNextBlockAndDepth(tip, blockindex, pnext); result.pushKV("confirmations", confirmations); - result.pushKV( - "size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)); + result.pushKV("size", (int)::GetSerializeSize(block, PROTOCOL_VERSION)); result.pushKV("height", blockindex->nHeight); result.pushKV("version", block.nVersion); result.pushKV("versionHex", strprintf("%08x", block.nVersion)); @@ -2065,8 +2064,7 @@ for (const CTxOut &out : tx->vout) { tx_total_out += out.nValue; utxo_size_inc += - GetSerializeSize(out, SER_NETWORK, PROTOCOL_VERSION) + - PER_UTXO_OVERHEAD; + GetSerializeSize(out, PROTOCOL_VERSION) + PER_UTXO_OVERHEAD; } } @@ -2112,9 +2110,9 @@ CTxOut prevoutput = tx_in->vout[in.prevout.GetN()]; tx_total_in += prevoutput.nValue; - utxo_size_inc -= GetSerializeSize(prevoutput, SER_NETWORK, - PROTOCOL_VERSION) + - PER_UTXO_OVERHEAD; + utxo_size_inc -= + GetSerializeSize(prevoutput, PROTOCOL_VERSION) + + PER_UTXO_OVERHEAD; } Amount txfee = tx_total_in - tx_total_out; diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp --- a/src/script/bitcoinconsensus.cpp +++ b/src/script/bitcoinconsensus.cpp @@ -92,7 +92,7 @@ return set_error(err, bitcoinconsensus_ERR_TX_INDEX); } - if (GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) != txToLen) { + if (GetSerializeSize(tx, PROTOCOL_VERSION) != txToLen) { return set_error(err, bitcoinconsensus_ERR_TX_SIZE_MISMATCH); } diff --git a/src/seeder/bitcoin.cpp b/src/seeder/bitcoin.cpp --- a/src/seeder/bitcoin.cpp +++ b/src/seeder/bitcoin.cpp @@ -176,8 +176,8 @@ do { CDataStream::iterator pstart = std::search( vRecv.begin(), vRecv.end(), BEGIN(netMagic), END(netMagic)); - uint32_t nHeaderSize = GetSerializeSize( - CMessageHeader(netMagic), vRecv.GetType(), vRecv.GetVersion()); + uint32_t nHeaderSize = + GetSerializeSize(CMessageHeader(netMagic), vRecv.GetVersion()); if (vRecv.end() - pstart < nHeaderSize) { if (vRecv.size() > nHeaderSize) { vRecv.erase(vRecv.begin(), vRecv.end() - nHeaderSize); diff --git a/src/serialize.h b/src/serialize.h --- a/src/serialize.h +++ b/src/serialize.h @@ -928,12 +928,10 @@ protected: size_t nSize; - const int nType; const int nVersion; public: - CSizeComputer(int nTypeIn, int nVersionIn) - : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {} + explicit CSizeComputer(int nVersionIn) : nSize(0), nVersion(nVersionIn) {} void write(const char *psz, size_t _nSize) { this->nSize += _nSize; } @@ -948,7 +946,6 @@ size_t size() const { return nSize; } int GetVersion() const { return nVersion; } - int GetType() const { return nType; } }; template void SerializeMany(Stream &s) {} @@ -987,14 +984,13 @@ s.seek(GetSizeOfCompactSize(nSize)); } -template -size_t GetSerializeSize(const T &t, int nType, int nVersion) { - return (CSizeComputer(nType, nVersion) << t).size(); +template size_t GetSerializeSize(const T &t, int nVersion = 0) { + return (CSizeComputer(nVersion) << t).size(); } template size_t GetSerializeSize(const S &s, const T &t) { - return (CSizeComputer(s.GetType(), s.GetVersion()) << t).size(); + return (CSizeComputer(s.GetVersion()) << t).size(); } #endif // BITCOIN_SERIALIZE_H diff --git a/src/test/blockcheck_tests.cpp b/src/test/blockcheck_tests.cpp --- a/src/test/blockcheck_tests.cpp +++ b/src/test/blockcheck_tests.cpp @@ -83,7 +83,7 @@ // Oversize block. tx = CMutableTransaction(coinbaseTx); block.vtx[0] = MakeTransactionRef(tx); - auto txSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); + auto txSize = ::GetSerializeSize(tx, PROTOCOL_VERSION); auto maxTxCount = ((DEFAULT_MAX_BLOCK_SIZE - 1) / txSize) - 1; for (size_t i = 1; i < maxTxCount; i++) { diff --git a/src/test/flatfile_tests.cpp b/src/test/flatfile_tests.cpp --- a/src/test/flatfile_tests.cpp +++ b/src/test/flatfile_tests.cpp @@ -38,7 +38,7 @@ "still required to prevent double-spending."); size_t pos1 = 0; - size_t pos2 = pos1 + GetSerializeSize(line1, 0, CLIENT_VERSION); + size_t pos2 = pos1 + GetSerializeSize(line1, CLIENT_VERSION); // Write first line to file. { diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -66,33 +66,33 @@ }; BOOST_AUTO_TEST_CASE(sizes) { - BOOST_CHECK_EQUAL(sizeof(char), GetSerializeSize(char(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(int8_t), GetSerializeSize(int8_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(uint8_t), GetSerializeSize(uint8_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(int16_t), GetSerializeSize(int16_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(uint16_t), GetSerializeSize(uint16_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(int32_t), GetSerializeSize(int32_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(uint32_t), GetSerializeSize(uint32_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(int64_t), GetSerializeSize(int64_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(uint64_t), GetSerializeSize(uint64_t(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(float), GetSerializeSize(float(0), 0, 0)); - BOOST_CHECK_EQUAL(sizeof(double), GetSerializeSize(double(0), 0, 0)); + BOOST_CHECK_EQUAL(sizeof(char), GetSerializeSize(char(0))); + BOOST_CHECK_EQUAL(sizeof(int8_t), GetSerializeSize(int8_t(0))); + BOOST_CHECK_EQUAL(sizeof(uint8_t), GetSerializeSize(uint8_t(0))); + BOOST_CHECK_EQUAL(sizeof(int16_t), GetSerializeSize(int16_t(0))); + BOOST_CHECK_EQUAL(sizeof(uint16_t), GetSerializeSize(uint16_t(0))); + BOOST_CHECK_EQUAL(sizeof(int32_t), GetSerializeSize(int32_t(0))); + BOOST_CHECK_EQUAL(sizeof(uint32_t), GetSerializeSize(uint32_t(0))); + BOOST_CHECK_EQUAL(sizeof(int64_t), GetSerializeSize(int64_t(0))); + BOOST_CHECK_EQUAL(sizeof(uint64_t), GetSerializeSize(uint64_t(0))); + BOOST_CHECK_EQUAL(sizeof(float), GetSerializeSize(float(0))); + BOOST_CHECK_EQUAL(sizeof(double), GetSerializeSize(double(0))); // Bool is serialized as char - BOOST_CHECK_EQUAL(sizeof(char), GetSerializeSize(bool(0), 0, 0)); + BOOST_CHECK_EQUAL(sizeof(char), GetSerializeSize(bool(0))); // Sanity-check GetSerializeSize and c++ type matching - BOOST_CHECK_EQUAL(GetSerializeSize(char(0), 0, 0), 1U); - BOOST_CHECK_EQUAL(GetSerializeSize(int8_t(0), 0, 0), 1U); - BOOST_CHECK_EQUAL(GetSerializeSize(uint8_t(0), 0, 0), 1U); - BOOST_CHECK_EQUAL(GetSerializeSize(int16_t(0), 0, 0), 2U); - BOOST_CHECK_EQUAL(GetSerializeSize(uint16_t(0), 0, 0), 2U); - BOOST_CHECK_EQUAL(GetSerializeSize(int32_t(0), 0, 0), 4U); - BOOST_CHECK_EQUAL(GetSerializeSize(uint32_t(0), 0, 0), 4U); - BOOST_CHECK_EQUAL(GetSerializeSize(int64_t(0), 0, 0), 8U); - BOOST_CHECK_EQUAL(GetSerializeSize(uint64_t(0), 0, 0), 8U); - BOOST_CHECK_EQUAL(GetSerializeSize(float(0), 0, 0), 4U); - BOOST_CHECK_EQUAL(GetSerializeSize(double(0), 0, 0), 8U); - BOOST_CHECK_EQUAL(GetSerializeSize(bool(0), 0, 0), 1U); + BOOST_CHECK_EQUAL(GetSerializeSize(char(0)), 1U); + BOOST_CHECK_EQUAL(GetSerializeSize(int8_t(0)), 1U); + BOOST_CHECK_EQUAL(GetSerializeSize(uint8_t(0)), 1U); + BOOST_CHECK_EQUAL(GetSerializeSize(int16_t(0)), 2U); + BOOST_CHECK_EQUAL(GetSerializeSize(uint16_t(0)), 2U); + BOOST_CHECK_EQUAL(GetSerializeSize(int32_t(0)), 4U); + BOOST_CHECK_EQUAL(GetSerializeSize(uint32_t(0)), 4U); + BOOST_CHECK_EQUAL(GetSerializeSize(int64_t(0)), 8U); + BOOST_CHECK_EQUAL(GetSerializeSize(uint64_t(0)), 8U); + BOOST_CHECK_EQUAL(GetSerializeSize(float(0)), 4U); + BOOST_CHECK_EQUAL(GetSerializeSize(double(0)), 8U); + BOOST_CHECK_EQUAL(GetSerializeSize(bool(0)), 1U); } BOOST_AUTO_TEST_CASE(floats_conversion) { @@ -188,14 +188,13 @@ CDataStream::size_type size = 0; for (int i = 0; i < 100000; i++) { ss << VARINT(i, VarIntMode::NONNEGATIVE_SIGNED); - size += - ::GetSerializeSize(VARINT(i, VarIntMode::NONNEGATIVE_SIGNED), 0, 0); + size += ::GetSerializeSize(VARINT(i, VarIntMode::NONNEGATIVE_SIGNED)); BOOST_CHECK(size == ss.size()); } for (uint64_t i = 0; i < 100000000000ULL; i += 999999937) { ss << VARINT(i); - size += ::GetSerializeSize(VARINT(i), 0, 0); + size += ::GetSerializeSize(VARINT(i)); BOOST_CHECK(size == ss.size()); } diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp --- a/src/test/uint256_tests.cpp +++ b/src/test/uint256_tests.cpp @@ -197,8 +197,8 @@ BOOST_CHECK(OneL.begin() + 32 == OneL.end()); BOOST_CHECK(MaxL.begin() + 32 == MaxL.end()); BOOST_CHECK(TmpL.begin() + 32 == TmpL.end()); - BOOST_CHECK(GetSerializeSize(R1L, 0, PROTOCOL_VERSION) == 32); - BOOST_CHECK(GetSerializeSize(ZeroL, 0, PROTOCOL_VERSION) == 32); + BOOST_CHECK(GetSerializeSize(R1L, PROTOCOL_VERSION) == 32); + BOOST_CHECK(GetSerializeSize(ZeroL, PROTOCOL_VERSION) == 32); CDataStream ss(0, PROTOCOL_VERSION); ss << R1L; @@ -245,8 +245,8 @@ BOOST_CHECK(OneS.begin() + 20 == OneS.end()); BOOST_CHECK(MaxS.begin() + 20 == MaxS.end()); BOOST_CHECK(TmpS.begin() + 20 == TmpS.end()); - BOOST_CHECK(GetSerializeSize(R1S, 0, PROTOCOL_VERSION) == 20); - BOOST_CHECK(GetSerializeSize(ZeroS, 0, PROTOCOL_VERSION) == 20); + BOOST_CHECK(GetSerializeSize(R1S, PROTOCOL_VERSION) == 20); + BOOST_CHECK(GetSerializeSize(ZeroS, PROTOCOL_VERSION) == 20); ss << R1S; BOOST_CHECK(ss.str() == std::string(R1Array, R1Array + 20)); diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp --- a/src/test/validation_tests.cpp +++ b/src/test/validation_tests.cpp @@ -58,16 +58,15 @@ BOOST_CHECK_EQUAL(nwritten, 1UL); CTransaction empty_tx; - size_t empty_tx_size = GetSerializeSize(empty_tx, SER_DISK, CLIENT_VERSION); + size_t empty_tx_size = GetSerializeSize(empty_tx, CLIENT_VERSION); size_t num_tx = (10 * MAX_TX_SIZE) / empty_tx_size; CBlock block = makeLargeDummyBlock(num_tx); - BOOST_CHECK(GetSerializeSize(block, SER_DISK, CLIENT_VERSION) > - 2 * MAX_TX_SIZE); + BOOST_CHECK(GetSerializeSize(block, CLIENT_VERSION) > 2 * MAX_TX_SIZE); - unsigned int size = GetSerializeSize(block, SER_DISK, CLIENT_VERSION); + unsigned int size = GetSerializeSize(block, CLIENT_VERSION); { CAutoFile outs(fp, SER_DISK, CLIENT_VERSION); outs << size; diff --git a/src/undo.h b/src/undo.h --- a/src/undo.h +++ b/src/undo.h @@ -70,7 +70,7 @@ }; static const size_t MAX_INPUTS_PER_TX = - MAX_TX_SIZE / ::GetSerializeSize(CTxIn(), SER_NETWORK, PROTOCOL_VERSION); + MAX_TX_SIZE / ::GetSerializeSize(CTxIn(), PROTOCOL_VERSION); /** Restore the UTXO in a Coin at a given COutPoint */ class CTxUndo { diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -57,7 +57,7 @@ } #define MIN_TRANSACTION_SIZE \ - (::GetSerializeSize(CTransaction(), SER_NETWORK, PROTOCOL_VERSION)) + (::GetSerializeSize(CTransaction(), PROTOCOL_VERSION)) /** Default for -whitelistrelay. */ static const bool DEFAULT_WHITELISTRELAY = true; diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1577,9 +1577,8 @@ // Write undo information to disk if (pindex->GetUndoPos().IsNull()) { FlatFilePos _pos; - if (!FindUndoPos( - state, pindex->nFile, _pos, - ::GetSerializeSize(blockundo, SER_DISK, CLIENT_VERSION) + 40)) { + if (!FindUndoPos(state, pindex->nFile, _pos, + ::GetSerializeSize(blockundo, CLIENT_VERSION) + 40)) { return error("ConnectBlock(): FindUndoPos failed"); } if (!UndoWriteToDisk(blockundo, _pos, pindex->pprev->GetBlockHash(), @@ -1867,7 +1866,7 @@ // Sigops counting. We need to do it again because of P2SH. uint64_t nSigOpsCount = 0; const uint64_t currentBlockSize = - ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION); + ::GetSerializeSize(block, PROTOCOL_VERSION); const uint64_t nMaxSigOpsCount = GetMaxBlockSigOpsCount(currentBlockSize); blockundo.vtxundo.reserve(block.vtx.size() - 1); @@ -3548,8 +3547,7 @@ "size limits failed"); } - auto currentBlockSize = - ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION); + auto currentBlockSize = ::GetSerializeSize(block, PROTOCOL_VERSION); if (currentBlockSize > nMaxBlockSize) { return state.DoS(100, false, REJECT_INVALID, "bad-blk-length", false, "size limits failed"); @@ -3956,8 +3954,7 @@ static FlatFilePos SaveBlockToDisk(const CBlock &block, int nHeight, const CChainParams &chainparams, const FlatFilePos *dbp) { - unsigned int nBlockSize = - ::GetSerializeSize(block, SER_DISK, CLIENT_VERSION); + unsigned int nBlockSize = ::GetSerializeSize(block, CLIENT_VERSION); FlatFilePos blockPos; if (dbp != nullptr) { blockPos = *dbp; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3062,7 +3062,7 @@ } CTxOut change_prototype_txout(Amount::zero(), scriptChange); coin_selection_params.change_output_size = - GetSerializeSize(change_prototype_txout, SER_DISK, 0); + GetSerializeSize(change_prototype_txout); // Get the fee rate to use effective values in coin selection CFeeRate nFeeRateNeeded = @@ -3111,7 +3111,7 @@ // Include the fee cost for outputs. Note this is only used for // BnB right now coin_selection_params.tx_noinputs_size += - ::GetSerializeSize(txout, SER_NETWORK, PROTOCOL_VERSION); + ::GetSerializeSize(txout, PROTOCOL_VERSION); if (IsDust(txout, dustRelayFee)) { if (recipient.fSubtractFeeFromAmount &&