Skip to content

BIP65 formatting fixes #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laanwj merged 3 commits into from
Dec 8, 2015
Merged

BIP65 formatting fixes #258

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa7cbf7
Minor: fix capitalisation
petertodd Dec 5, 2015
0feb120
Remove space in BIP66
petertodd Dec 5, 2015
7cd2a7b
Fix missing case statement at beginning of specification
petertodd Dec 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bip-0065.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -270,7 +271,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
Expand Down