LBRYFoundation/lbcwallet
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcwallet.git synced 2025-08-23 17:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet: fix db deadlock when creating new tx

Browse source
This commit is contained in:
Olaoluwa Osuntokun 2017-04-24 16:07:39 -07:00
parent ef179b1e18
commit d27d1211c5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wallet/createtx.go
View file

@ -107,8 +107,8 @@ func (w *Wallet) txToOutputs(outputs []*wire.TxOut, account uint32, minconf int3
return nil, err return nil, err
} }
err = walletdb.View(w.db, func(dbtx walletdb.ReadTx) error { err = walletdb.Update(w.db, func(dbtx walletdb.ReadWriteTx) error {
addrmgrNs := dbtx.ReadBucket(waddrmgrNamespaceKey) addrmgrNs := dbtx.ReadWriteBucket(waddrmgrNamespaceKey)
// Get current block's height and hash. // Get current block's height and hash.
bs, err := chainClient.BlockStamp() bs, err := chainClient.BlockStamp()
@ -128,9 +128,9 @@ func (w *Wallet) txToOutputs(outputs []*wire.TxOut, account uint32, minconf int3
var changeAddr btcutil.Address var changeAddr btcutil.Address
var err error var err error
if account == waddrmgr.ImportedAddrAccount { if account == waddrmgr.ImportedAddrAccount {
changeAddr, err = w.NewChangeAddress(0) changeAddr, err = w.newChangeAddress(addrmgrNs, 0, waddrmgr.WitnessPubKey)
} else { } else {
changeAddr, err = w.NewChangeAddress(account) changeAddr, err = w.newChangeAddress(addrmgrNs, account, waddrmgr.WitnessPubKey)
} }
if err != nil { if err != nil {
return nil, err return nil, err