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

bitcoin: add to check-source-bolt, and (minor) quotes fixup.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-06-17 14:42:35 +09:30
parent d946de6814
commit b17db120b1
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bitcoin/Makefile
View File

@@ -41,6 +41,9 @@ BITCOIN_HEADERS := bitcoin/address.h \
# Bitcoin objects depends on bitcoin/ external/ and ccan # Bitcoin objects depends on bitcoin/ external/ and ccan
$(BITCOIN_OBJS): $(CCAN_HEADERS) $(BITCOIN_HEADERS) $(EXTERNAL_HEADERS) $(BITCOIN_OBJS): $(CCAN_HEADERS) $(BITCOIN_HEADERS) $(EXTERNAL_HEADERS)
ALL_C_HEADERS += $(BITCOIN_HEADERS)
ALL_C_SOURCES += $(BITCOIN_SRC)
check-makefile: check-bitcoin-makefile check-makefile: check-bitcoin-makefile
check-bitcoin-makefile: check-bitcoin-makefile:

4
bitcoin/psbt.c
View File

@@ -618,11 +618,11 @@ bool psbt_finalize(struct wally_psbt *psbt)
/* BOLT #3: /* BOLT #3:
* #### `to_remote` Output * #### `to_remote` Output
* *
* If `option_anchor_outputs` applies to the commitment * If `option_anchors` applies to the commitment
* transaction, the `to_remote` output is encumbered by a one * transaction, the `to_remote` output is encumbered by a one
* block csv lock. * block csv lock.
* *
* <remote_pubkey> OP_CHECKSIGVERIFY 1 OP_CHECKSEQUENCEVERIFY * <remotepubkey> OP_CHECKSIGVERIFY 1 OP_CHECKSEQUENCEVERIFY
* *
* The output is spent by an input with `nSequence` * The output is spent by an input with `nSequence`
* field set to `1` and witness: * field set to `1` and witness:

14
bitcoin/script.c
View File

@@ -314,10 +314,10 @@ u8 *scriptpubkey_witness_raw(const tal_t *ctx, u8 version,
* *
* #### `to_remote` Output * #### `to_remote` Output
* *
* If `option_anchor_outputs` applies to the commitment * If `option_anchors` applies to the commitment
* transaction, the `to_remote` output is encumbered by a one * transaction, the `to_remote` output is encumbered by a one
* block csv lock. * block csv lock.
* <remote_pubkey> OP_CHECKSIGVERIFY 1 OP_CHECKSEQUENCEVERIFY * <remotepubkey> OP_CHECKSIGVERIFY 1 OP_CHECKSEQUENCEVERIFY
*/ */
/* BOLT- #3 /* BOLT- #3
* ##### Leased channel (`option_will_fund`) * ##### Leased channel (`option_will_fund`)
@@ -564,7 +564,7 @@ u8 *bitcoin_wscript_to_local(const tal_t *ctx, u16 to_self_delay,
* This output sends funds to either an HTLC-timeout transaction after the * This output sends funds to either an HTLC-timeout transaction after the
* HTLC-timeout or to the remote node using the payment preimage or the * HTLC-timeout or to the remote node using the payment preimage or the
* revocation key. The output is a P2WSH, with a witness script (no * revocation key. The output is a P2WSH, with a witness script (no
* option_anchor_outputs): * option_anchors):
* *
* # To remote node with revocation key * # To remote node with revocation key
* OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL * OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL
@@ -582,7 +582,7 @@ u8 *bitcoin_wscript_to_local(const tal_t *ctx, u16 to_self_delay,
* OP_ENDIF * OP_ENDIF
* OP_ENDIF * OP_ENDIF
* *
* Or, with `option_anchor_outputs`: * Or, with `option_anchors`:
* *
* # To remote node with revocation key * # To remote node with revocation key
* OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL * OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL
@@ -671,7 +671,7 @@ u8 *bitcoin_wscript_htlc_offer(const tal_t *ctx,
* This output sends funds to either the remote node after the HTLC-timeout or * This output sends funds to either the remote node after the HTLC-timeout or
* using the revocation key, or to an HTLC-success transaction with a * using the revocation key, or to an HTLC-success transaction with a
* successful payment preimage. The output is a P2WSH, with a witness script * successful payment preimage. The output is a P2WSH, with a witness script
* (no `option_anchor_outputs`): * (no `option_anchors`):
* *
* # To remote node with revocation key * # To remote node with revocation key
* OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL * OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL
@@ -691,7 +691,7 @@ u8 *bitcoin_wscript_htlc_offer(const tal_t *ctx,
* OP_ENDIF * OP_ENDIF
* OP_ENDIF * OP_ENDIF
* *
* Or, with `option_anchor_outputs`: * Or, with `option_anchors`:
* *
* # To remote node with revocation key * # To remote node with revocation key
* OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL * OP_DUP OP_HASH160 <RIPEMD160(SHA256(revocationpubkey))> OP_EQUAL
@@ -859,7 +859,7 @@ u8 *bitcoin_wscript_anchor(const tal_t *ctx,
u8 *script = tal_arr(ctx, u8, 0); u8 *script = tal_arr(ctx, u8, 0);
/* BOLT #3: /* BOLT #3:
* #### `to_local_anchor` and `to_remote_anchor` Output (option_anchor_outputs) * #### `to_local_anchor` and `to_remote_anchor` Output (option_anchors)
*... *...
* <local_funding_pubkey/remote_funding_pubkey> OP_CHECKSIG OP_IFDUP * <local_funding_pubkey/remote_funding_pubkey> OP_CHECKSIG OP_IFDUP
* OP_NOTIF * OP_NOTIF