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

script: add OP_CHECKLOCKTIMEVERIFY.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2015-08-07 12:45:30 +09:30
parent 0170ad4abd
commit cf3433a0ad
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -3,8 +3,8 @@
# Needs to have oneof support: Ubuntu vivid's is too old :( # Needs to have oneof support: Ubuntu vivid's is too old :(
PROTOCC:=protoc-c PROTOCC:=protoc-c
# Alpha has checksequenceverify, segregated witness+input-amount-in-sig+confidentual-transactions, schnorr # Alpha has checksequenceverify, segregated witness+input-amount-in-sig+confidentual-transactions, schnorr, checklocktimeverify
FEATURES := -DHAS_CSV=1 -DALPHA_TXSTYLE=1 -DUSE_SCHNORR=1 FEATURES := -DHAS_CSV=1 -DALPHA_TXSTYLE=1 -DUSE_SCHNORR=1 -DHAS_CLTV=1
# Bitcoin uses DER for signatures # Bitcoin uses DER for signatures
#FEATURES := -DSCRIPTS_USE_DER #FEATURES := -DSCRIPTS_USE_DER

8
bitcoin/script.c
View File

@@ -33,6 +33,14 @@
/* OP_NOP, otherwise bitcoind complains */ /* OP_NOP, otherwise bitcoind complains */
#define OP_CHECKSEQUENCEVERIFY 0x61 #define OP_CHECKSEQUENCEVERIFY 0x61
#endif #endif
#ifdef HAS_CLTV
#define OP_CHECKLOCKTIMEVERIFY 0xB1
#else
/* OP_NOP, otherwise bitcoind complains */
#define OP_CHECKLOCKTIMEVERIFY 0x61
#endif
static void add(u8 **scriptp, const void *mem, size_t len) static void add(u8 **scriptp, const void *mem, size_t len)
{ {
size_t oldlen = tal_count(*scriptp); size_t oldlen = tal_count(*scriptp);