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

lnwallet: fix compile errors against btcd's segwit branch

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2016-04-12 21:37:08 -07:00
parent f9a8dcbc9c
commit 1e35018e89
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lnwallet/channel.go
View File

@ -202,7 +202,7 @@ func (c *ChannelUpdate) VerifyNewCommitmentSigs(ourSig, theirSig []byte) error {
commitTx := c.ourPendingCommitTx commitTx := c.ourPendingCommitTx
commitTx.TxIn[0].SignatureScript = scriptSig commitTx.TxIn[0].SignatureScript = scriptSig
vm, err := txscript.NewEngine(c.lnChannel.fundingP2SH, commitTx, 0, vm, err := txscript.NewEngine(c.lnChannel.fundingP2SH, commitTx, 0,
txscript.StandardVerifyFlags, nil) txscript.StandardVerifyFlags, nil, nil, 0)
if err != nil { if err != nil {
return err return err
} }

4
lnwallet/wallet.go
View File

@ -927,7 +927,7 @@ func (l *LightningWallet) handleFundingCounterPartySigs(msg *addCounterPartySigs
// Ensure that the signature is valid. // Ensure that the signature is valid.
vm, err := txscript.NewEngine(pkscript, vm, err := txscript.NewEngine(pkscript,
fundingTx, i, txscript.StandardVerifyFlags, nil) fundingTx, i, txscript.StandardVerifyFlags, nil, nil, 0)
if err != nil { if err != nil {
// TODO(roasbeef): cancel at this stage if invalid sigs? // TODO(roasbeef): cancel at this stage if invalid sigs?
msg.err <- fmt.Errorf("cannot create script engine: %s", err) msg.err <- fmt.Errorf("cannot create script engine: %s", err)
@ -983,7 +983,7 @@ func (l *LightningWallet) handleFundingCounterPartySigs(msg *addCounterPartySigs
// Script executes succesfully. // Script executes succesfully.
commitTx.TxIn[0].SignatureScript = scriptSig commitTx.TxIn[0].SignatureScript = scriptSig
vm, err := txscript.NewEngine(p2sh, commitTx, 0, vm, err := txscript.NewEngine(p2sh, commitTx, 0,
txscript.StandardVerifyFlags, nil) txscript.StandardVerifyFlags, nil, nil, 0)
if err != nil { if err != nil {
msg.err <- err msg.err <- err
return return