Optimization: Remove Consensus::Params::BIP34Hash#276
Closed
jtimon wants to merge 1 commit intoElementsProject:elements-0.14.1from
Closed
Optimization: Remove Consensus::Params::BIP34Hash#276jtimon wants to merge 1 commit intoElementsProject:elements-0.14.1from
jtimon wants to merge 1 commit intoElementsProject:elements-0.14.1from
Conversation
This was referenced Sep 30, 2017
Contributor
Author
|
I think we should merge this even if it's rejected upstream or fully remove bip30 instead as discussed in #251 (although that option is slightly harder to rebase). |
instagibbs
reviewed
Oct 4, 2017
| CBlockIndex *pindexBIP34height = pindex->pprev->GetAncestor(chainparams.GetConsensus().BIP34Height); | ||
| //Only continue to enforce if we're below BIP34 activation height or the block hash at that height doesn't correspond. | ||
| fEnforceBIP30 = fEnforceBIP30 && (!pindexBIP34height || !(pindexBIP34height->GetBlockHash() == chainparams.GetConsensus().BIP34Hash)); | ||
| fEnforceBIP30 = fEnforceBIP30 && pindex->nHeight > chainparams.GetConsensus().BIP34Height; |
Contributor
There was a problem hiding this comment.
I think you've got the logic backwards here. We don't need BIP30 at all if we have BIP34 activated.
Contributor
Author
There was a problem hiding this comment.
oops, yeah, corrected the nit upstream but not here.
Contributor
|
Looks like upstream PR was abandoned, closing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Like upstream bitcoin/bitcoin#11427
#251 needs less disruption after this (no need to remove bip30's code anymore).