From 7f575b688e574efe6e545d13167a9e7aa6ae840d Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 24 Aug 2017 18:55:27 -0700 Subject: [PATCH] multi: txscript.WitnessScript -> txscript.WitnessSignature --- htlcswitch/mock.go | 2 +- lnwallet/btcwallet/signer.go | 2 +- lnwallet/channel_test.go | 2 +- mock.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go index 737b7ee5..47b3e24a 100644 --- a/htlcswitch/mock.go +++ b/htlcswitch/mock.go @@ -478,7 +478,7 @@ func (m *mockSigner) ComputeInputScript(tx *wire.MsgTx, signDesc *lnwallet.SignD signDesc.DoubleTweak) } - witnessScript, err := txscript.WitnessScript(tx, signDesc.SigHashes, + witnessScript, err := txscript.WitnessSignature(tx, signDesc.SigHashes, signDesc.InputIndex, signDesc.Output.Value, signDesc.Output.PkScript, txscript.SigHashAll, privKey, true) if err != nil { diff --git a/lnwallet/btcwallet/signer.go b/lnwallet/btcwallet/signer.go index bf679e8f..82cb6929 100644 --- a/lnwallet/btcwallet/signer.go +++ b/lnwallet/btcwallet/signer.go @@ -225,7 +225,7 @@ func (b *BtcWallet) ComputeInputScript(tx *wire.MsgTx, // Generate a valid witness stack for the input. // TODO(roasbeef): adhere to passed HashType - witnessScript, err := txscript.WitnessScript(tx, signDesc.SigHashes, + witnessScript, err := txscript.WitnessSignature(tx, signDesc.SigHashes, signDesc.InputIndex, signDesc.Output.Value, witnessProgram, txscript.SigHashAll, privKey, true) if err != nil { diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go index 8ba3e0a0..d41dee7e 100644 --- a/lnwallet/channel_test.go +++ b/lnwallet/channel_test.go @@ -101,7 +101,7 @@ func (m *mockSigner) ComputeInputScript(tx *wire.MsgTx, signDesc *SignDescriptor signDesc.DoubleTweak) } - witnessScript, err := txscript.WitnessScript(tx, signDesc.SigHashes, + witnessScript, err := txscript.WitnessSignature(tx, signDesc.SigHashes, signDesc.InputIndex, signDesc.Output.Value, signDesc.Output.PkScript, txscript.SigHashAll, privKey, true) if err != nil { diff --git a/mock.go b/mock.go index d88033d2..b6c194a3 100644 --- a/mock.go +++ b/mock.go @@ -36,7 +36,7 @@ func (m *mockSigner) SignOutputRaw(tx *wire.MsgTx, func (m *mockSigner) ComputeInputScript(tx *wire.MsgTx, signDesc *lnwallet.SignDescriptor) (*lnwallet.InputScript, error) { - witnessScript, err := txscript.WitnessScript(tx, signDesc.SigHashes, + witnessScript, err := txscript.WitnessSignature(tx, signDesc.SigHashes, signDesc.InputIndex, signDesc.Output.Value, signDesc.Output.PkScript, txscript.SigHashAll, m.key, true) if err != nil {