From 1e35018e890bdbecbb5d57271fa7ff7032520e96 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 12 Apr 2016 21:37:08 -0700 Subject: [PATCH] lnwallet: fix compile errors against btcd's segwit branch --- lnwallet/channel.go | 2 +- lnwallet/wallet.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lnwallet/channel.go b/lnwallet/channel.go index a545aa2f..da48024f 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -202,7 +202,7 @@ func (c *ChannelUpdate) VerifyNewCommitmentSigs(ourSig, theirSig []byte) error { commitTx := c.ourPendingCommitTx commitTx.TxIn[0].SignatureScript = scriptSig vm, err := txscript.NewEngine(c.lnChannel.fundingP2SH, commitTx, 0, - txscript.StandardVerifyFlags, nil) + txscript.StandardVerifyFlags, nil, nil, 0) if err != nil { return err } diff --git a/lnwallet/wallet.go b/lnwallet/wallet.go index 1df86bea..005e41df 100644 --- a/lnwallet/wallet.go +++ b/lnwallet/wallet.go @@ -927,7 +927,7 @@ func (l *LightningWallet) handleFundingCounterPartySigs(msg *addCounterPartySigs // Ensure that the signature is valid. vm, err := txscript.NewEngine(pkscript, - fundingTx, i, txscript.StandardVerifyFlags, nil) + fundingTx, i, txscript.StandardVerifyFlags, nil, nil, 0) if err != nil { // TODO(roasbeef): cancel at this stage if invalid sigs? msg.err <- fmt.Errorf("cannot create script engine: %s", err) @@ -983,7 +983,7 @@ func (l *LightningWallet) handleFundingCounterPartySigs(msg *addCounterPartySigs // Script executes succesfully. commitTx.TxIn[0].SignatureScript = scriptSig vm, err := txscript.NewEngine(p2sh, commitTx, 0, - txscript.StandardVerifyFlags, nil) + txscript.StandardVerifyFlags, nil, nil, 0) if err != nil { msg.err <- err return