LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues5 Pull requests Projects Releases14 Packages Wiki Activity

small cleanup

Browse source
This commit is contained in:
Josh Rickmar 2013-10-11 10:53:55 -04:00
parent 50073b32c1
commit 42b15ccaa3
1 changed files with 3 additions and 3 deletions

6
createtx.go
View file

@ -160,8 +160,7 @@ func (w *BtcWallet) txToPairs(pairs map[string]uint64, fee uint64, minconf int)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot create txout script: %s", err) return nil, fmt.Errorf("cannot create txout script: %s", err)
} }
txout := btcwire.NewTxOut(int64(change), pkScript) msgtx.AddTxOut(btcwire.NewTxOut(int64(change), pkScript))
msgtx.AddTxOut(txout)
} }
// Selected unspent outputs become new transaction's inputs. // Selected unspent outputs become new transaction's inputs.
@ -190,9 +189,10 @@ func (w *BtcWallet) txToPairs(pairs map[string]uint64, fee uint64, minconf int)
} }
// Validate msgtx before returning the raw transaction. // Validate msgtx before returning the raw transaction.
bip16 := time.Now().After(btcscript.Bip16Activation)
for i, txin := range msgtx.TxIn { for i, txin := range msgtx.TxIn {
engine, err := btcscript.NewScript(txin.SignatureScript, outputs[i].Subscript, i, engine, err := btcscript.NewScript(txin.SignatureScript, outputs[i].Subscript, i,
msgtx, time.Now().After(btcscript.Bip16Activation)) msgtx, bip16)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot create script engine: %s", err) return nil, fmt.Errorf("cannot create script engine: %s", err)
} }