bitcoin/bips
1
0
Fork 0
mirror of https://github.com/bitcoin/bips.git synced 2025-05-19 12:08:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #258 from petertodd/bip65-fix-spec-missing-case

Browse Source 
BIP65 formatting fixes
This commit is contained in:
Wladimir J. van der Laan 2015-12-08 10:35:00 +01:00
commit 84779aa5c3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bip-0065.mediawiki
View File

@ -92,7 +92,7 @@ making transaction malleability a non-issue.
====Two-factor wallets==== ====Two-factor wallets====
Services like GreenAddress store Bitcoins with 2-of-2 multisig scriptPubKey's Services like GreenAddress store bitcoins with 2-of-2 multisig scriptPubKey's
such that one keypair is controlled by the user, and the other keypair is such that one keypair is controlled by the user, and the other keypair is
controlled by the service. To spend funds the user uses locally installed controlled by the service. To spend funds the user uses locally installed
wallet software that generates one of the required signatures, and then uses a wallet software that generates one of the required signatures, and then uses a
@ -195,6 +195,7 @@ transaction output ''can'' be spent.
Refer to the reference implementation, reproduced below, for the precise Refer to the reference implementation, reproduced below, for the precise
semantics and detailed rationale for those semantics. semantics and detailed rationale for those semantics.
case OP_NOP2: case OP_NOP2:
{ {
// CHECKLOCKTIMEVERIFY // CHECKLOCKTIMEVERIFY
@ -270,7 +271,7 @@ https://github.com/petertodd/bitcoin/commit/ab0f54f38e08ee1e50ff72f801680ee84d0f
==Deployment== ==Deployment==
We reuse the double-threshold IsSuperMajority() switchover mechanism used in We reuse the double-threshold IsSuperMajority() switchover mechanism used in
BIP 66 with the same thresholds, but for nVersion = 4. The new rules are BIP66 with the same thresholds, but for nVersion = 4. The new rules are
in effect for every block (at height H) with nVersion = 4 and at least in effect for every block (at height H) with nVersion = 4 and at least
750 out of 1000 blocks preceding it (with heights H-1000..H-1) also 750 out of 1000 blocks preceding it (with heights H-1000..H-1) also
have nVersion >= 4. Furthermore, when 950 out of the 1000 blocks have nVersion >= 4. Furthermore, when 950 out of the 1000 blocks