LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Update for wire.NewMsgTx API change. (#458)

Browse source 
Also, bump glide.lock to ensure the appropriate deps are pulled in.
This commit is contained in:
Dave Collins 2016-10-27 15:39:23 -05:00 committed by Josh Rickmar
parent 1cb3b8b29a
commit cc240cafc5
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glide.lock generated
View file

@ -1,10 +1,10 @@
hash: 5efa5cef5495a0b5256f45ecb2456ea21101934ed56e780a46b1c16e30177ebc hash: 5efa5cef5495a0b5256f45ecb2456ea21101934ed56e780a46b1c16e30177ebc
updated: 2016-10-27T11:04:37.4161268-04:00 updated: 2016-10-27T11:54:19.492811-05:00
imports: imports:
- name: github.com/boltdb/bolt - name: github.com/boltdb/bolt
version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9 version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9
- name: github.com/btcsuite/btcd - name: github.com/btcsuite/btcd
version: e3eeb4a34a04c8ec40298fee9f9d8fe2ce0c13ca version: f6ad7eb2c963151c71de2bd37d04d9af644a891d
subpackages: subpackages:
- blockchain - blockchain
- btcec - btcec
@ -19,7 +19,7 @@ imports:
- name: github.com/btcsuite/btcrpcclient - name: github.com/btcsuite/btcrpcclient
version: 2b780d16b042054d07aa322146194118fd7f7b81 version: 2b780d16b042054d07aa322146194118fd7f7b81
- name: github.com/btcsuite/btcutil - name: github.com/btcsuite/btcutil
version: 68e5965458062d031a6e333b35c778ce464fb73f version: 9b9ce80a2edafc6198569550fcc01df11d214425
subpackages: subpackages:
- base58 - base58
- hdkeychain - hdkeychain

4
rpc/legacyrpc/methods.go
View file

@ -1631,7 +1631,7 @@ func signRawTransaction(icmd interface{}, w *wallet.Wallet, chainClient *chain.R
if err != nil { if err != nil {
return nil, err return nil, err
} }
tx := wire.NewMsgTx() var tx wire.MsgTx
err = tx.Deserialize(bytes.NewBuffer(serializedTx)) err = tx.Deserialize(bytes.NewBuffer(serializedTx))
if err != nil { if err != nil {
e := errors.New("TX decode failed") e := errors.New("TX decode failed")
@ -1764,7 +1764,7 @@ func signRawTransaction(icmd interface{}, w *wallet.Wallet, chainClient *chain.R
// `complete' denotes that we successfully signed all outputs and that // `complete' denotes that we successfully signed all outputs and that
// all scripts will run to completion. This is returned as part of the // all scripts will run to completion. This is returned as part of the
// reply. // reply.
signErrs, err := w.SignTransaction(tx, hashType, inputs, keys, scripts) signErrs, err := w.SignTransaction(&tx, hashType, inputs, keys, scripts)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
votingpool/db.go
View file

@ -552,12 +552,12 @@ func deserializeWithdrawal(p *Pool, serialized []byte) (*withdrawalInfo, error)
} }
} }
for ntxid, tx := range row.Status.Transactions { for ntxid, tx := range row.Status.Transactions {
msgtx := wire.NewMsgTx() var msgtx wire.MsgTx
if err := msgtx.Deserialize(bytes.NewBuffer(tx.SerializedMsgTx)); err != nil { if err := msgtx.Deserialize(bytes.NewBuffer(tx.SerializedMsgTx)); err != nil {
return nil, newError(ErrWithdrawalStorage, "cannot deserialize transaction", err) return nil, newError(ErrWithdrawalStorage, "cannot deserialize transaction", err)
} }
wInfo.status.transactions[ntxid] = changeAwareTx{ wInfo.status.transactions[ntxid] = changeAwareTx{
MsgTx: msgtx, MsgTx: &msgtx,
changeIdx: tx.ChangeIdx, changeIdx: tx.ChangeIdx,
} }
} }

2
votingpool/withdrawal.go
View file

@ -358,7 +358,7 @@ func (tx *withdrawalTx) hasChange() bool {
// toMsgTx generates a btcwire.MsgTx with this tx's inputs and outputs. // toMsgTx generates a btcwire.MsgTx with this tx's inputs and outputs.
func (tx *withdrawalTx) toMsgTx() *wire.MsgTx { func (tx *withdrawalTx) toMsgTx() *wire.MsgTx {
msgtx := wire.NewMsgTx() msgtx := wire.NewMsgTx(wire.TxVersion)
for _, o := range tx.outputs { for _, o := range tx.outputs {
msgtx.AddTxOut(wire.NewTxOut(int64(o.amount), o.pkScript())) msgtx.AddTxOut(wire.NewTxOut(int64(o.amount), o.pkScript()))
} }

2
wtxmgr/tx_test.go
View file

@ -109,7 +109,7 @@ func TestInsertsCreditsDebitsRollbacks(t *testing.T) {
// Create a "signed" (with invalid sigs) tx that spends output 0 of // Create a "signed" (with invalid sigs) tx that spends output 0 of
// the double spend. // the double spend.
spendingTx := wire.NewMsgTx() spendingTx := wire.NewMsgTx(wire.TxVersion)
spendingTxIn := wire.NewTxIn(wire.NewOutPoint(TstDoubleSpendTx.Hash(), 0), []byte{0, 1, 2, 3, 4}) spendingTxIn := wire.NewTxIn(wire.NewOutPoint(TstDoubleSpendTx.Hash(), 0), []byte{0, 1, 2, 3, 4})
spendingTx.AddTxIn(spendingTxIn) spendingTx.AddTxIn(spendingTxIn)
spendingTxOut1 := wire.NewTxOut(1e7, []byte{5, 6, 7, 8, 9}) spendingTxOut1 := wire.NewTxOut(1e7, []byte{5, 6, 7, 8, 9})