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

bolt: update to lightning-rfc:636b9f, change opcode reference format

Browse Source 
Updates BOLT reference to match spec; replaces OP_CSV ->
OP_CHECKSEQUENCEVERIFY
This commit is contained in:
lisa neigut
2019-07-15 18:42:16 -05:00
committed by Rusty Russell
parent 85e325cb1f
commit 81c40da3b5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -15,7 +15,7 @@ CCANDIR := ccan
# Where we keep the BOLT RFCs # Where we keep the BOLT RFCs
BOLTDIR := ../lightning-rfc/ BOLTDIR := ../lightning-rfc/
BOLTVERSION := 6f6ea63233c56f14c04de6cf0ec1e4f0e91c1ead BOLTVERSION := 636b9f2e28c5eb9564b50b85ac85e23fc2176623
-include config.vars -include config.vars

6
bitcoin/script.c
View File

@@ -454,7 +454,7 @@ 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 and * 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_CHECKSEQUENCEVERIFY`. It can be claimed, without delay,
* by the other party if they know the revocation private key. The output is a * by the other party if they know the revocation private key. The output is a
* version-0 P2WSH, with a witness script: * version-0 P2WSH, with a witness script:
* *
@@ -463,7 +463,7 @@ u8 **bitcoin_witness_sig_and_element(const tal_t *ctx,
* <revocationpubkey> * <revocationpubkey>
* OP_ELSE * OP_ELSE
* `to_self_delay` * `to_self_delay`
* OP_CSV * OP_CHECKSEQUENCEVERIFY
* OP_DROP * OP_DROP
* <local_delayedpubkey> * <local_delayedpubkey>
* OP_ENDIF * OP_ENDIF
@@ -706,7 +706,7 @@ u8 *bitcoin_wscript_htlc_tx(const tal_t *ctx,
* <revocationpubkey> * <revocationpubkey>
* OP_ELSE * OP_ELSE
* `to_self_delay` * `to_self_delay`
* OP_CSV * OP_CHECKSEQUENCEVERIFY
* OP_DROP * OP_DROP
* <local_delayedpubkey> * <local_delayedpubkey>
* OP_ENDIF * OP_ENDIF