diff options
| author | fanquake <fanquake@gmail.com> | 2022-01-02 08:14:27 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-01-02 08:14:34 +0800 |
| commit | 653577251011d077adea198c1c1437a56e2ae2ee (patch) | |
| tree | f92bc4e0a6d8d0c4e27eaae6f8c7aeae15bf6ecd /src | |
| parent | e9ee023f6eaa4899178cf435b3ed24cb1c7aab82 (diff) | |
| parent | fa1a51cbc1c50a6d3adcad5ccea4c6067f89f7d3 (diff) | |
| download | bitcoin-653577251011d077adea198c1c1437a56e2ae2ee.tar.xz | |
Merge bitcoin/bitcoin#23882: doc: testnet3 was not reset and is doing BIP30 checks again
fa1a51cbc1c50a6d3adcad5ccea4c6067f89f7d3 doc: testnet3 was not reset and is doing BIP30 checks again (MarcoFalke)
Pull request description:
ACKs for top commit:
theStack:
ACK fa1a51cbc1c50a6d3adcad5ccea4c6067f89f7d3
Tree-SHA512: 793eccda583a3edb056b142c36a09a5c867f61d90b96e15e6643417d62eb651eb2f3429c5f245bdb062d18ab9bb05b5048c0888aa5a492cb7bb21a2f3f52324e
Diffstat (limited to 'src')
| -rw-r--r-- | src/validation.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index fa67a01bdd..9eae41dd2f 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2006,9 +2006,8 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state, // another edge case to deal with. // testnet3 has no blocks before the BIP34 height with indicated heights - // post BIP34 before approximately height 486,000,000 and presumably will - // be reset before it reaches block 1,983,702 and starts doing unnecessary - // BIP30 checking again. + // post BIP34 before approximately height 486,000,000. After block + // 1,983,702 testnet3 starts doing unnecessary BIP30 checking again. assert(pindex->pprev); CBlockIndex* pindexBIP34height = pindex->pprev->GetAncestor(m_params.GetConsensus().BIP34Height); //Only continue to enforce if we're below BIP34 activation height or the block hash at that height doesn't correspond. |