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

wallet: fix incorrect namespace name

Browse source 
This commit fixes a panic introduced with #718 that was caused by
looking up addresses in the wrong namespace.
This commit is contained in:
Oliver Gugger 2020-11-18 19:42:12 +01:00
parent 9bd6d26f83
commit be57c71c9c
No known key found for this signature in database
GPG key ID: 8E4256593F177720
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wallet/wallet.go
View file

@ -3468,7 +3468,7 @@ func (w *Wallet) reliablyPublishTransaction(tx *wire.MsgTx,
// the transaction. // the transaction.
var ourAddrs []btcutil.Address var ourAddrs []btcutil.Address
err = walletdb.Update(w.db, func(dbTx walletdb.ReadWriteTx) error { err = walletdb.Update(w.db, func(dbTx walletdb.ReadWriteTx) error {
txmgrNs := dbTx.ReadWriteBucket(wtxmgrNamespaceKey) addrmgrNs := dbTx.ReadWriteBucket(waddrmgrNamespaceKey)
for _, txOut := range tx.TxOut { for _, txOut := range tx.TxOut {
_, addrs, _, err := txscript.ExtractPkScriptAddrs( _, addrs, _, err := txscript.ExtractPkScriptAddrs(
txOut.PkScript, w.chainParams, txOut.PkScript, w.chainParams,
@ -3481,7 +3481,7 @@ func (w *Wallet) reliablyPublishTransaction(tx *wire.MsgTx,
for _, addr := range addrs { for _, addr := range addrs {
// Skip any addresses which are not relevant to // Skip any addresses which are not relevant to
// us. // us.
_, err := w.Manager.Address(txmgrNs, addr) _, err := w.Manager.Address(addrmgrNs, addr)
if waddrmgr.IsError(err, waddrmgr.ErrAddressNotFound) { if waddrmgr.IsError(err, waddrmgr.ErrAddressNotFound) {
continue continue
} }
@ -3503,6 +3503,7 @@ func (w *Wallet) reliablyPublishTransaction(tx *wire.MsgTx,
// If there is a label we should write, get the namespace key // If there is a label we should write, get the namespace key
// and record it in the tx store. // and record it in the tx store.
txmgrNs := dbTx.ReadWriteBucket(wtxmgrNamespaceKey)
return w.TxStore.PutTxLabel(txmgrNs, tx.TxHash(), label) return w.TxStore.PutTxLabel(txmgrNs, tx.TxHash(), label)
}) })
if err != nil { if err != nil {