mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 15:09:59 +01:00
Merge #8068: Compact Blocks
48efec8Fix some minor compact block issues that came up in review (Matt Corallo)ccd06b9Elaborate bucket size math (Pieter Wuille)0d4cb48Use vTxHashes to optimize InitData significantly (Matt Corallo)8119026Provide a flat list of txid/terators to txn in CTxMemPool (Matt Corallo)678ee97Add BIP 152 to implemented BIPs list (Matt Corallo)56ba516Add reconstruction debug logging (Matt Corallo)2f34a2eGet our "best three" peers to announce blocks using cmpctblocks (Matt Corallo)927f8eeAdd ability to fetch CNode by NodeId (Matt Corallo)d25cd3eAdd receiver-side protocol implementation for CMPCTBLOCK stuff (Matt Corallo)9c837d5Add sender-side protocol implementation for CMPCTBLOCK stuff (Matt Corallo)00c4078Add protocol messages for short-ids blocks (Matt Corallo)e3b2222Add some blockencodings tests (Matt Corallo)f4f8f14Add TestMemPoolEntryHelper::FromTx version for CTransaction (Matt Corallo)85ad31eAdd partial-block block encodings API (Matt Corallo)5249dacAdd COMPACTSIZE wrapper similar to VARINT for serialization (Matt Corallo)cbda71cMove context-required checks from CheckBlockHeader to Contextual... (Matt Corallo)7c29ec9If AcceptBlockHeader returns true, pindex will be set. (Matt Corallo)96806c3Stop trimming when mapTx is empty (Pieter Wuille)
This commit is contained in:
@@ -127,7 +127,11 @@ TestChain100Setup::~TestChain100Setup()
|
||||
|
||||
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPool *pool) {
|
||||
CTransaction txn(tx);
|
||||
bool hasNoDependencies = pool ? pool->HasNoInputsOf(tx) : hadNoDependencies;
|
||||
return FromTx(txn, pool);
|
||||
}
|
||||
|
||||
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CTransaction &txn, CTxMemPool *pool) {
|
||||
bool hasNoDependencies = pool ? pool->HasNoInputsOf(txn) : hadNoDependencies;
|
||||
// Hack to assume either its completely dependent on other mempool txs or not at all
|
||||
CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user