mirror of
https://github.com/bitcoin/bips.git
synced 2025-11-24 14:33:33 +00:00
Merge pull request #2035 from Bashmunta/fix/bip8
BIP-116: add link to bip-8 and fix collision
This commit is contained in:
commit
3851847d0a
@ -112,7 +112,7 @@ An implementation of this BIP, including both consensus code updates and tests i
|
|||||||
|
|
||||||
==Deployment==
|
==Deployment==
|
||||||
|
|
||||||
This BIP will be deployed by BIP8 (Version bits with lock-in by height)[9] with the name "merklebranchverify" and using bit 2.
|
This BIP will be deployed by BIP8 (Version bits with lock-in by height)[10] with the name "merklebranchverify" and using bit 2.
|
||||||
|
|
||||||
For Bitcoin mainnet, the BIP8 startheight will be at height M to be determined and BIP8 timeout activation will occur on height M + 50,400 blocks.
|
For Bitcoin mainnet, the BIP8 startheight will be at height M to be determined and BIP8 timeout activation will occur on height M + 50,400 blocks.
|
||||||
|
|
||||||
@ -143,3 +143,5 @@ Old clients will consider the OP_MERKLEBRANCHVERIFY as a NOP and ignore it. Proo
|
|||||||
[8] [https://blockstream.com/2015/08/24/treesignatures.html Multisig on steroids using tree signatures]
|
[8] [https://blockstream.com/2015/08/24/treesignatures.html Multisig on steroids using tree signatures]
|
||||||
|
|
||||||
[9] [https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki BIP68: Relative lock-time using consensus-enforced sequence numbers]
|
[9] [https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki BIP68: Relative lock-time using consensus-enforced sequence numbers]
|
||||||
|
|
||||||
|
[10] [https://github.com/bitcoin/bips/blob/master/bip-0008.mediawiki BIP8: Version bits with lock-in by height]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user