diff options
| -rw-r--r-- | bip-0065.mediawiki | 8 | ||||
| -rw-r--r-- | bip-0121.mediawiki | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/bip-0065.mediawiki b/bip-0065.mediawiki index a2bd40e..ed87478 100644 --- a/bip-0065.mediawiki +++ b/bip-0065.mediawiki @@ -273,14 +273,18 @@ https://github.com/petertodd/bitcoin/commit/ab0f54f38e08ee1e50ff72f801680ee84d0f ==Deployment== -We reuse the double-threshold switchover mechanism from BIPs 34 and -66, with the same thresholds, but for nVersion = 4. The new rules are +We reuse the double-threshold IsSuperMajority() switchover mechanism used in +BIP 66 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 preceding a block do have nVersion >= 4, nVersion < 4 blocks become invalid, and all further blocks enforce the new rules. +It should be noted that BIP9 involves permanently setting a high-order bit to +1 which results in nVersion >= all prior IsSuperMajority() soft-forks and thus +no bits in nVersion are permanently lost. + ===SPV Clients=== diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki index 716f3c9..bafe856 100644 --- a/bip-0121.mediawiki +++ b/bip-0121.mediawiki @@ -68,11 +68,11 @@ following table: {| | <tt>btcpop:</tt> URI parameter || <tt>bitcoin:</tt> URI parameter || BIP70 PaymentDetails data |- -| <tt>label</tt> || <tt>label</tt> || <tt>merchant_data</tt> +| <tt>label</tt> || <tt>label</tt> || <tt>memo</tt> |- | <tt>amount</tt> || <tt>amount</tt> || <tt>sum of outputs.amount</tt> |- -| <tt>message</tt> || <tt>message</tt> || <tt>memo</tt> +| <tt>message</tt> || <tt>message</tt> || <tt>-</tt> |} The <tt>txid</tt> parameter value must match the transaction hash of @@ -104,9 +104,9 @@ not make their <tt>p</tt> parameter unnecessarily long. Wallet implementations must support the <tt>http:</tt> and <tt>https:</tt> schemes in which case <tt>POST</tt> method must be -used. The content type of the POST request must be set to - - application/bitcoin-pop +used. The PoP is sent as a binary serialized transaction. The content +type of the POST request must be set to +<tt>application/bitcoin-pop</tt> == Examples == |