highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-10-11 13:52:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

input: eliminate CSV trick for HTLC outputs

Browse Source
This commit is contained in:
Olaoluwa Osuntokun
2023-05-24 21:13:41 -07:00
parent 6ce7f5d29e
commit 4733da5ccb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
input/script_utils.go
View File

@@ -553,7 +553,7 @@ func SenderHTLCTapLeafTimeout(senderHtlcKey,
// OP_SIZE 32 OP_EQUALVERIFY OP_HASH160 // OP_SIZE 32 OP_EQUALVERIFY OP_HASH160
// <RIPEMD160(payment_hash)> OP_EQUALVERIFY // <RIPEMD160(payment_hash)> OP_EQUALVERIFY
// <remote_htlcpubkey> OP_CHECKSIG // <remote_htlcpubkey> OP_CHECKSIG
// OP_CHECKSEQUENCEVERIFY // 1 OP_CHECKSEQUENCEVERIFY OP_DROP
func SenderHTLCTapLeafSuccess(receiverHtlcKey *btcec.PublicKey, func SenderHTLCTapLeafSuccess(receiverHtlcKey *btcec.PublicKey,
paymentHash []byte) (txscript.TapLeaf, error) { paymentHash []byte) (txscript.TapLeaf, error) {
@@ -574,7 +574,9 @@ func SenderHTLCTapLeafSuccess(receiverHtlcKey *btcec.PublicKey,
// after confirmation to properly sweep. // after confirmation to properly sweep.
builder.AddData(schnorr.SerializePubKey(receiverHtlcKey)) builder.AddData(schnorr.SerializePubKey(receiverHtlcKey))
builder.AddOp(txscript.OP_CHECKSIG) builder.AddOp(txscript.OP_CHECKSIG)
builder.AddOp(txscript.OP_1)
builder.AddOp(txscript.OP_CHECKSEQUENCEVERIFY) builder.AddOp(txscript.OP_CHECKSEQUENCEVERIFY)
builder.AddOp(txscript.OP_DROP)
successLeafScript, err := builder.Script() successLeafScript, err := builder.Script()
if err != nil { if err != nil {
@@ -663,7 +665,7 @@ func senderHtlcTapScriptTree(senderHtlcKey, receiverHtlcKey,
// OP_SIZE 32 OP_EQUALVERIFY // OP_SIZE 32 OP_EQUALVERIFY
// OP_HASH160 <RIPEMD160(payment_hash)> OP_EQUALVERIFY // OP_HASH160 <RIPEMD160(payment_hash)> OP_EQUALVERIFY
// <remote_htlcpubkey> OP_CHECKSIG // <remote_htlcpubkey> OP_CHECKSIG
// OP_CHECKSEQUENCEVERIFY // 1 OP_CHECKSEQUENCEVERIFY OP_DROP
// //
// The timeout path can be spent with a witness of (sender timeout): // The timeout path can be spent with a witness of (sender timeout):
// //
@@ -1070,7 +1072,7 @@ func ReceiverHtlcSpendTimeout(signer Signer, signDesc *SignDescriptor,
// timeout the HTLC after expiry: // timeout the HTLC after expiry:
// //
// <sender_htlcpubkey> OP_CHECKSIG // <sender_htlcpubkey> OP_CHECKSIG
// OP_CHECKSEQUENCEVERIFY // 1 OP_CHECKSEQUENCEVERIFY OP_DROP
// <cltv_expiry> OP_CHECKLOCKTIMEVERIFY OP_DROP // <cltv_expiry> OP_CHECKLOCKTIMEVERIFY OP_DROP
func ReceiverHtlcTapLeafTimeout(senderHtlcKey *btcec.PublicKey, func ReceiverHtlcTapLeafTimeout(senderHtlcKey *btcec.PublicKey,
cltvExpiry uint32) (txscript.TapLeaf, error) { cltvExpiry uint32) (txscript.TapLeaf, error) {
@@ -1081,7 +1083,9 @@ func ReceiverHtlcTapLeafTimeout(senderHtlcKey *btcec.PublicKey,
// sender authorizing the spend (the timeout). // sender authorizing the spend (the timeout).
builder.AddData(schnorr.SerializePubKey(senderHtlcKey)) builder.AddData(schnorr.SerializePubKey(senderHtlcKey))
builder.AddOp(txscript.OP_CHECKSIG) builder.AddOp(txscript.OP_CHECKSIG)
builder.AddOp(txscript.OP_1)
builder.AddOp(txscript.OP_CHECKSEQUENCEVERIFY) builder.AddOp(txscript.OP_CHECKSEQUENCEVERIFY)
builder.AddOp(txscript.OP_DROP)
// The second portion will ensure that the CLTV expiry on the spending // The second portion will ensure that the CLTV expiry on the spending
// transaction is correct. // transaction is correct.
@@ -1191,7 +1195,7 @@ func receiverHtlcTapScriptTree(senderHtlcKey, receiverHtlcKey,
// //
// - The timeout path: // - The timeout path:
// <remote_htlcpubkey> OP_CHECKSIG // <remote_htlcpubkey> OP_CHECKSIG
// OP_CHECKSEQUENCEVERIFY // 1 OP_CHECKSEQUENCEVERIFY OP_DROP
// <cltv_expiry> OP_CHECKLOCKTIMEVERIFY OP_DROP // <cltv_expiry> OP_CHECKLOCKTIMEVERIFY OP_DROP
// //
// - Success path: // - Success path: