From aa7cbf77a6f741ef7753ea86990baf4fc3d08b41 Mon Sep 17 00:00:00 2001 From: Peter Todd Date: Sat, 5 Dec 2015 17:57:04 +0800 Subject: [PATCH 1/3] Minor: fix capitalisation --- bip-0065.mediawiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bip-0065.mediawiki b/bip-0065.mediawiki index b48fa759..cd0b0ae5 100644 --- a/bip-0065.mediawiki +++ b/bip-0065.mediawiki @@ -92,7 +92,7 @@ making transaction malleability a non-issue. ====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 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 From 0feb1209d0d224b9465532db55b9bf19b9b42e04 Mon Sep 17 00:00:00 2001 From: Peter Todd Date: Sat, 5 Dec 2015 17:57:43 +0800 Subject: [PATCH 2/3] Remove space in BIP66 Seems to be how people are writing BIP's these days. --- bip-0065.mediawiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bip-0065.mediawiki b/bip-0065.mediawiki index cd0b0ae5..57b3d025 100644 --- a/bip-0065.mediawiki +++ b/bip-0065.mediawiki @@ -270,7 +270,7 @@ https://github.com/petertodd/bitcoin/commit/ab0f54f38e08ee1e50ff72f801680ee84d0f ==Deployment== 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 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 From 7cd2a7bdbbb46e2803855f13e2e39ec20d4f96a1 Mon Sep 17 00:00:00 2001 From: Peter Todd Date: Sat, 5 Dec 2015 17:58:33 +0800 Subject: [PATCH 3/3] Fix missing case statement at beginning of specification Wasn't being displayed on github; adding an empty line prior to the spec seems to fix this. --- bip-0065.mediawiki | 1 + 1 file changed, 1 insertion(+) diff --git a/bip-0065.mediawiki b/bip-0065.mediawiki index 57b3d025..f5144ebe 100644 --- a/bip-0065.mediawiki +++ b/bip-0065.mediawiki @@ -195,6 +195,7 @@ transaction output ''can'' be spent. Refer to the reference implementation, reproduced below, for the precise semantics and detailed rationale for those semantics. + case OP_NOP2: { // CHECKLOCKTIMEVERIFY