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

wallet: fix nil txid in publishTransaction

Browse source 
A nil txid could've been returned from publishTransaction even if it was
successful. This was due to the underlying SendRawTransaction call
"failing", e.g., when the transaction being broadcast has already
confirmed, but publishTranasction interpreting such failure as a
success.
This commit is contained in:
Wilmer Paulino 2019-07-10 15:56:44 -07:00
parent 44d818d813
commit 02b0a7c18d
No known key found for this signature in database
GPG key ID: 6DF57B9F9514972F
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wallet/wallet.go
View file

@ -3369,7 +3369,7 @@ func (w *Wallet) publishTransaction(tx *wire.MsgTx) (*chainhash.Hash, error) {
return nil, err
}
txid, err := chainClient.SendRawTransaction(tx, false)
_, err = chainClient.SendRawTransaction(tx, false)
// Determine if this was an RPC error thrown due to the transaction
// already confirming.
@ -3378,9 +3378,10 @@ func (w *Wallet) publishTransaction(tx *wire.MsgTx) (*chainhash.Hash, error) {
rpcTxConfirmed = rpcErr.Code == btcjson.ErrRPCTxAlreadyInChain
}
txid := tx.TxHash()
switch {
case err == nil:
return txid, nil
return &txid, nil
// Since we have different backends that can be used with the wallet,
// we'll need to check specific errors for each one.
@ -3399,7 +3400,7 @@ func (w *Wallet) publishTransaction(tx *wire.MsgTx) (*chainhash.Hash, error) {
case strings.Contains(
strings.ToLower(err.Error()), "txn-already-in-mempool",
):
return txid, nil
return &txid, nil
// If the transaction has already confirmed, we can safely remove it
// from the unconfirmed store as it should already exist within the
@ -3434,7 +3435,7 @@ func (w *Wallet) publishTransaction(tx *wire.MsgTx) (*chainhash.Hash, error) {
"from unconfirmed store: %v", tx.TxHash(), dbErr)
}
return txid, nil
return &txid, nil
// If the transaction was rejected for whatever other reason, then we'll
// remove it from the transaction store, as otherwise, we'll attempt to