akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnwallet: remove OP_CHECKSEQUENCEVERIFY variable

Browse Source 
Primarily to avoid linting errors, the lnwallet.OP_CHECKSEQUENCEVERIFY
variable was removed and references to it replaced with
txscript.OP_CHECKSEQUENCEVERIFY.
This commit is contained in:
bryanvu 2017-05-03 00:48:50 -07:00 committed by Olaoluwa Osuntokun
parent c1769f959b
commit 74854963bf
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lnwallet/script_utils.go
View File

@ -24,8 +24,6 @@ var (
// time is in seconds. // time is in seconds.
SequenceLockTimeSeconds = uint32(1 << 22) SequenceLockTimeSeconds = uint32(1 << 22)
OP_CHECKSEQUENCEVERIFY byte = txscript.OP_NOP3
// TimelockShift is used to make sure the commitment transaction is // TimelockShift is used to make sure the commitment transaction is
// spendable by setting the locktime with it so that it is larger than // spendable by setting the locktime with it so that it is larger than
// 500,000,000, thus interpreting it as Unix epoch timestamp and not // 500,000,000, thus interpreting it as Unix epoch timestamp and not
@ -236,7 +234,7 @@ func senderHTLCScript(absoluteTimeout, relativeTimeout uint32, senderKey,
builder.AddInt64(int64(absoluteTimeout)) builder.AddInt64(int64(absoluteTimeout))
builder.AddOp(txscript.OP_CHECKLOCKTIMEVERIFY) builder.AddOp(txscript.OP_CHECKLOCKTIMEVERIFY)
builder.AddInt64(int64(relativeTimeout)) builder.AddInt64(int64(relativeTimeout))
builder.AddOp(OP_CHECKSEQUENCEVERIFY) builder.AddOp(txscript.OP_CHECKSEQUENCEVERIFY)
builder.AddOp(txscript.OP_2DROP) builder.AddOp(txscript.OP_2DROP)
builder.AddData(senderKey.SerializeCompressed()) builder.AddData(senderKey.SerializeCompressed())
builder.AddOp(txscript.OP_CHECKSIG) builder.AddOp(txscript.OP_CHECKSIG)
@ -401,7 +399,7 @@ func receiverHTLCScript(absoluteTimeout, relativeTimeout uint32, senderKey,
builder.AddData(paymentHash) builder.AddData(paymentHash)
builder.AddOp(txscript.OP_EQUALVERIFY) builder.AddOp(txscript.OP_EQUALVERIFY)
builder.AddInt64(int64(relativeTimeout)) builder.AddInt64(int64(relativeTimeout))
builder.AddOp(OP_CHECKSEQUENCEVERIFY) builder.AddOp(txscript.OP_CHECKSEQUENCEVERIFY)
builder.AddOp(txscript.OP_DROP) builder.AddOp(txscript.OP_DROP)
builder.AddData(receiverKey.SerializeCompressed()) builder.AddData(receiverKey.SerializeCompressed())
builder.AddOp(txscript.OP_CHECKSIG) builder.AddOp(txscript.OP_CHECKSIG)
@ -599,7 +597,7 @@ func commitScriptToSelf(csvTimeout uint32, selfKey, revokeKey *btcec.PublicKey)
builder.AddData(selfKey.SerializeCompressed()) builder.AddData(selfKey.SerializeCompressed())
builder.AddOp(txscript.OP_CHECKSIGVERIFY) builder.AddOp(txscript.OP_CHECKSIGVERIFY)
builder.AddInt64(int64(csvTimeout)) builder.AddInt64(int64(csvTimeout))
builder.AddOp(OP_CHECKSEQUENCEVERIFY) builder.AddOp(txscript.OP_CHECKSEQUENCEVERIFY)
builder.AddOp(txscript.OP_ENDIF) builder.AddOp(txscript.OP_ENDIF)