summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjl2012 <jl2012@xbt.hk>2016-06-24 01:59:25 +0800
committerjl2012 <jl2012@xbt.hk>2016-06-24 01:59:25 +0800
commit7478ee3260c0d3c0cef39233931b307691764edc (patch)
tree3b5aba7a8687003dc32906d1840a081119c59a7b
parentae70f3ec69bf3e66c28fa3a7813c08fdce125dab (diff)
downloadbips-7478ee3260c0d3c0cef39233931b307691764edc.tar.xz
BIP112/114 example fix
-rw-r--r--bip-0112.mediawiki16
-rw-r--r--bip-0114.mediawiki10
2 files changed, 13 insertions, 13 deletions
diff --git a/bip-0112.mediawiki b/bip-0112.mediawiki
index 19f74b6..e19e0e9 100644
--- a/bip-0112.mediawiki
+++ b/bip-0112.mediawiki
@@ -138,10 +138,10 @@ A simple output, paying to Alice might then look like:
HASH160 <revokehash> EQUAL
IF
- <Bob key hash>
+ <Bob's pubkey>
ELSE
"24h" CHECKSEQUENCEVERIFY DROP
- <Alice key hash>
+ <Alice's pubkey>
ENDIF
CHECKSIG
@@ -153,10 +153,10 @@ With CHECKLOCKTIMEVERIFY, this would look like:
HASH160 <revokehash> EQUAL
IF
- <Bob key hash>
+ <Bob's pubkey>
ELSE
"2015/12/15" CHECKLOCKTIMEVERIFY DROP
- <Alice key hash>
+ <Alice's pubkey>
ENDIF
CHECKSIG
@@ -181,13 +181,13 @@ Alice might look like the following in Alice's commitment transaction:
IF
"24h" CHECKSEQUENCEVERIFY
2DROP
- <Alice key hash>
+ <Alice's pubkey>
ELSE
<Commit-Revocation-Hash> EQUAL
NOTIF
"2015/10/20 10:33" CHECKLOCKTIMEVERIFY DROP
ENDIF
- <Bob key hash>
+ <Bob's pubkey>
ENDIF
CHECKSIG
@@ -196,12 +196,12 @@ and correspondingly in Bob's commitment transaction:
HASH160 DUP <R-HASH> EQUAL
SWAP <Commit-Revocation-Hash> EQUAL ADD
IF
- <Alice key hash>
+ <Alice's pubkey>
ELSE
"2015/10/20 10:33" CHECKLOCKTIMEVERIFY
"24h" CHECKSEQUENCEVERIFY
2DROP
- <Bob key hash>
+ <Bob's pubkey>
ENDIF
CHECKSIG
diff --git a/bip-0114.mediawiki b/bip-0114.mediawiki
index 2d16084..aee8646 100644
--- a/bip-0114.mediawiki
+++ b/bip-0114.mediawiki
@@ -96,20 +96,20 @@ The following is the "Hashed TIme-Lock Contract" example in [[bip-0112.mediawiki
IF
"24h" CHECKSEQUENCEVERIFY
2DROP
- <Alice key hash>
+ <Alice's pubkey>
ELSE
<Commit-Revocation-Hash> EQUAL
NOTIF
"Timestamp" CHECKLOCKTIMEVERIFY DROP
ENDIF
- <Bob key hash>
+ <Bob's pubkey>
ENDIF
CHECKSIG
To create a MAST Root, it is flattened to 3 mutually exclusive branches:
- HASH160 <R-HASH> EQUALVERIFY "24h" CHECKSEQUENCEVERIFY DROP <Alice key hash> CHECKSIG
- HASH160 <Commit-Revocation-Hash> EQUALVERIFY <Bob key hash> CHECKSIG
- "Timestamp" CHECKLOCKTIMEVERIFY DROP <Bob key hash> CHECKSIG
+ HASH160 <R-HASH> EQUALVERIFY "24h" CHECKSEQUENCEVERIFY DROP <Alice's pubkey> CHECKSIG
+ HASH160 <Commit-Revocation-Hash> EQUALVERIFY <Bob's pubkey> CHECKSIG
+ "Timestamp" CHECKLOCKTIMEVERIFY DROP <Bob's pubkey> CHECKSIG
which significantly improves readability and reduces the witness size when it is redeemed.