aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 00:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitcoin/*: fix up BOLT references.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-06-17 19:43:44 +09:30
committed by Christian Decker
parent 80182ce275
commit 18a6cbd11f
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
bitcoin/script.c
View File

@@ -452,19 +452,19 @@ u8 **bitcoin_witness_sig_and_element(const tal_t *ctx,
/* BOLT #3: /* BOLT #3:
* *
* This output sends funds back to the owner of this commitment transaction, * This output sends funds back to the owner of this commitment transaction and
* thus must be timelocked using `OP_CSV`. It can be claimed, without delay, * thus must be timelocked using `OP_CSV`. It can be claimed, without delay,
* by the other party if they know the revocation key. The output is a version * by the other party if they know the revocation private key. The output is a
* 0 P2WSH, with a witness script: * version-0 P2WSH, with a witness script:
* *
* OP_IF * OP_IF
* # Penalty transaction * # Penalty transaction
* <revocationkey> * <revocationpubkey>
* OP_ELSE * OP_ELSE
* `to_self_delay` * `to_self_delay`
* OP_CSV * OP_CSV
* OP_DROP * OP_DROP
* <local_delayedkey> * <local_delayedpubkey>
* OP_ENDIF * OP_ENDIF
* OP_CHECKSIG * OP_CHECKSIG
*/ */
@@ -489,21 +489,21 @@ u8 *bitcoin_wscript_to_local(const tal_t *ctx, u16 to_self_delay,
* *
* #### Offered HTLC Outputs * #### Offered HTLC Outputs
* *
* This output sends funds to an HTLC-timeout transaction after the HTLC * This output sends funds to either an HTLC-timeout transaction after the
* timeout, or to the remote peer using the payment preimage or the revocation * HTLC-timeout or to the remote node using the payment preimage or the
* key. The output is a P2WSH, with a witness script: * revocation key. The output is a P2WSH, with a witness script:
* *
* # To you with revocation key * # To remote node with revocation key
* OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationkey))> OP_EQUAL * OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL
* OP_IF * OP_IF
* OP_CHECKSIG * OP_CHECKSIG
* OP_ELSE * OP_ELSE
* <remote_htlckey> OP_SWAP OP_SIZE 32 OP_EQUAL * <remote_htlcpubkey> OP_SWAP OP_SIZE 32 OP_EQUAL
* OP_NOTIF * OP_NOTIF
* # To me via HTLC-timeout transaction (timelocked). * # To local node via HTLC-timeout transaction (timelocked).
* OP_DROP 2 OP_SWAP <local_htlckey> 2 OP_CHECKMULTISIG * OP_DROP 2 OP_SWAP <local_htlcpubkey> 2 OP_CHECKMULTISIG
* OP_ELSE * OP_ELSE
* # To you with preimage. * # To remote node with preimage.
* OP_HASH160 <RIPEMD160(payment_hash)> OP_EQUALVERIFY * OP_HASH160 <RIPEMD160(payment_hash)> OP_EQUALVERIFY
* OP_CHECKSIG * OP_CHECKSIG
* OP_ENDIF * OP_ENDIF
@@ -568,23 +568,23 @@ u8 *bitcoin_wscript_htlc_offer(const tal_t *ctx,
* *
* #### Received HTLC Outputs * #### Received HTLC Outputs
* *
* This output sends funds to the remote peer after the HTLC timeout or using * This output sends funds to either the remote node after the HTLC-timeout or
* the revocation key, or to an HTLC-success transaction with a successful * using the revocation key, or to an HTLC-success transaction with a
* payment preimage. The output is a P2WSH, with a witness script: * successful payment preimage. The output is a P2WSH, with a witness script:
* *
* # To you with revocation key * # To remote node with revocation key
* OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationkey))> OP_EQUAL * OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL
* OP_IF * OP_IF
* OP_CHECKSIG * OP_CHECKSIG
* OP_ELSE * OP_ELSE
* <remote_htlckey> OP_SWAP * <remote_htlcpubkey> OP_SWAP
* OP_SIZE 32 OP_EQUAL * OP_SIZE 32 OP_EQUAL
* OP_IF * OP_IF
* # To me via HTLC-success transaction. * # To local node via HTLC-success transaction.
* OP_HASH160 <RIPEMD160(payment_hash)> OP_EQUALVERIFY * OP_HASH160 <RIPEMD160(payment_hash)> OP_EQUALVERIFY
* 2 OP_SWAP <local_htlckey> 2 OP_CHECKMULTISIG * 2 OP_SWAP <local_htlcpubkey> 2 OP_CHECKMULTISIG
* OP_ELSE * OP_ELSE
* # To you after timeout. * # To remote node after timeout.
* OP_DROP <cltv_expiry> OP_CHECKLOCKTIMEVERIFY OP_DROP * OP_DROP <cltv_expiry> OP_CHECKLOCKTIMEVERIFY OP_DROP
* OP_CHECKSIG * OP_CHECKSIG
* OP_ENDIF * OP_ENDIF
@@ -655,7 +655,7 @@ u8 *bitcoin_wscript_htlc_receive(const tal_t *ctx,
* ## HTLC-Timeout and HTLC-Success Transactions * ## HTLC-Timeout and HTLC-Success Transactions
* *
*... *...
* * `txin[0]` witness stack: `0 <remotehtlcsig> <localhtlcsig> <payment_preimage>` for HTLC-Success, `0 <remotehtlcsig> <localhtlcsig> 0` for HTLC-Timeout. * * `txin[0]` witness stack: `0 <remotehtlcsig> <localhtlcsig> <payment_preimage>` for HTLC-success, `0 <remotehtlcsig> <localhtlcsig> 0` for HTLC-timeout
*/ */
u8 **bitcoin_witness_htlc_timeout_tx(const tal_t *ctx, u8 **bitcoin_witness_htlc_timeout_tx(const tal_t *ctx,
const secp256k1_ecdsa_signature *localhtlcsig, const secp256k1_ecdsa_signature *localhtlcsig,
@@ -702,12 +702,12 @@ u8 *bitcoin_wscript_htlc_tx(const tal_t *ctx,
* *
* OP_IF * OP_IF
* # Penalty transaction * # Penalty transaction
* <revocationkey> * <revocationpubkey>
* OP_ELSE * OP_ELSE
* `to_self_delay` * `to_self_delay`
* OP_CSV * OP_CSV
* OP_DROP * OP_DROP
* <local_delayedkey> * <local_delayedpubkey>
* OP_ENDIF * OP_ENDIF
* OP_CHECKSIG * OP_CHECKSIG
*/ */