From a2ff118b250b4290c2fd15427cb9d40ab6c44259 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 12 Apr 2016 21:27:32 -0700 Subject: [PATCH] wallet: fix compile errors under WIP segwit branch --- wallet/createtx.go | 4 ++-- wallet/wallet.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wallet/createtx.go b/wallet/createtx.go index b167909..27c600e 100644 --- a/wallet/createtx.go +++ b/wallet/createtx.go @@ -40,7 +40,7 @@ func makeInputSource(eligible []wtxmgr.Credit) txauthor.InputSource { for currentTotal < target && len(eligible) != 0 { nextCredit := &eligible[0] eligible = eligible[1:] - nextInput := wire.NewTxIn(&nextCredit.OutPoint, nil) + nextInput := wire.NewTxIn(&nextCredit.OutPoint, nil, nil) currentTotal += nextCredit.Amount currentInputs = append(currentInputs, nextInput) currentScripts = append(currentScripts, nextCredit.PkScript) @@ -224,7 +224,7 @@ func (w *Wallet) findEligibleOutputs(account uint32, minconf int32, bs *waddrmgr func validateMsgTx(tx *wire.MsgTx, prevScripts [][]byte) error { for i, prevScript := range prevScripts { vm, err := txscript.NewEngine(prevScript, tx, i, - txscript.StandardVerifyFlags, nil) + txscript.StandardVerifyFlags, nil, nil, 0) if err != nil { return fmt.Errorf("cannot create script engine: %s", err) } diff --git a/wallet/wallet.go b/wallet/wallet.go index 4a31f18..955ed20 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -2024,7 +2024,7 @@ func (w *Wallet) SignTransaction(tx *wire.MsgTx, hashType txscript.SigHashType, // Either it was already signed or we just signed it. // Find out if it is completely satisfied or still needs more. vm, err := txscript.NewEngine(prevOutScript, tx, i, - txscript.StandardVerifyFlags, nil) + txscript.StandardVerifyFlags, nil, nil, 0) if err == nil { err = vm.Execute() }