Merge 1a19a4d960 into merged_master (Bitcoin PR bitcoin/bitcoin#29656)

This commit is contained in:
ivanlele 2026-03-11 10:36:54 +00:00
commit c54dc2f736
No known key found for this signature in database
12 changed files with 68 additions and 62 deletions

View file

@ -335,7 +335,7 @@ public:
chainTxData = ChainTxData{
// Data from RPC: getchaintxstats 4096 000000000000000000026811d149d4d261995ec5b3f64f439a0a10e1a464af9a
.nTime = 1704194835,
.nTxCount = 946728933,
.tx_count = 946728933,
.dTxRate = 6.569290261471664,
};
}
@ -456,7 +456,7 @@ public:
{
.height = 2'500'000,
.hash_serialized = AssumeutxoHash{uint256S("0xf841584909f68e47897952345234e37fcd9128cd818f41ee6c3ca68db8071be7")},
.nChainTx = 66484552,
.m_chain_tx_count = 66484552,
.blockhash = uint256S("0x0000000000000093bcb68c03a9a168ae252572d348a2eaeba2cdf9231d73206f")
}
};
@ -464,7 +464,7 @@ public:
chainTxData = ChainTxData{
// Data from RPC: getchaintxstats 4096 000000000001323071f38f21ea5aae529ece491eadaccce506a59bcc2d968917
.nTime = 1703579240,
.nTxCount = 67845391,
.tx_count = 67845391,
.dTxRate = 1.464436832560951,
};
}
@ -496,7 +496,7 @@ public:
chainTxData = ChainTxData{
// Data from RPC: getchaintxstats 4096 0000000870f15246ba23c16e370a7ffb1fc8a3dcf8cb4492882ed4b0e3d4cd26
.nTime = 1706331472,
.nTxCount = 2425380,
.tx_count = 2425380,
.dTxRate = 0.008277759863833788,
};
} else {
@ -596,7 +596,7 @@ public:
{
.height = 160'000,
.hash_serialized = AssumeutxoHash{uint256S("0xfe0a44309b74d6b5883d246cb419c6221bcccf0b308c9b59b7d70783dbdf928a")},
.nChainTx = 2289496,
.m_chain_tx_count = 2289496,
.blockhash = uint256S("0x0000003ca3c99aff040f2563c2ad8f8ec88bd0fd6b8f0895cfaf1ef90353a62c")
}
};
@ -747,21 +747,21 @@ public:
{ // For use by unit tests
.height = 110,
.hash_serialized = AssumeutxoHash{uint256S("0x6657b736d4fe4db0cbc796789e812d5dba7f5c143764b1b6905612f1830609d1")},
.nChainTx = 111,
.m_chain_tx_count = 111,
.blockhash = uint256S("0x696e92821f65549c7ee134edceeeeaaa4105647a3c4fd9f298c0aec0ab50425c")
},
{
// For use by fuzz target src/test/fuzz/utxo_snapshot.cpp
.height = 200,
.hash_serialized = AssumeutxoHash{uint256S("0x4f34d431c3e482f6b0d67b64609ece3964dc8d7976d02ac68dd7c9c1421738f2")},
.nChainTx = 201,
.m_chain_tx_count = 201,
.blockhash = uint256S("0x5e93653318f294fb5aa339d00bbf8cf1c3515488ad99412c37608b139ea63b27"),
},
{
// For use by test/functional/feature_assumeutxo.py
.height = 299,
.hash_serialized = AssumeutxoHash{uint256S("0x4f046c8d36732314b2ccd00be35232e7a211eb87b0fd8858f898f511bc7fae64")},
.nChainTx = 334,
.m_chain_tx_count = 334,
.blockhash = uint256S("0x3bb27e6f7166543430d14d8a4a839a59aef05f845d8e9a0c210901a597269d1b")
},
};