wallet: remove extra wtx lookup in AddToSpends #25427

pull furszy wants to merge 1 commits into bitcoin:master from furszy:2022_wallet_AddToSpends_extra_wtx_lookup changing 2 files +7 −10

furszy commented at 2:40 PM on June 20, 2022: member

As AddToSpends is only called from AddToWallet and LoadToWallet, places where we insert the wtx into the wallet map, we can directly feed AddToSpends with the wtx and remove another extra lookup.
fanquake added the label Wallet on Jun 20, 2022

in src/wallet/wallet.cpp:666 in 89e582278e outdated

 662 | @@ -663,16 +663,13 @@ void CWallet::AddToSpends(const COutPoint& outpoint, const uint256& wtxid, Walle
 663 |  }
 664 |  
 665 |  
 666 | -void CWallet::AddToSpends(const uint256& wtxid, WalletBatch* batch)
 667 | +void CWallet::AddToSpends(CWalletTx& wtx, WalletBatch* batch)

laanwj commented at 4:18 PM on June 20, 2022:

Can't this reference be const?

furszy commented at 5:24 PM on June 20, 2022:

yep, added.

Riahiamirreza approved

wallet: avoid extra wtx lookup in AddToSpends

This method is only called from AddToWallet and LoadToWallet,
places where we already have the wtx.

32e5edc0f4

furszy force-pushed on Jun 20, 2022
laanwj commented at 5:45 PM on June 20, 2022: member

Code review ACK 32e5edc0f454c59c8e0d8d86a9abfa9a3f25ca28
theStack approved
theStack commented at 8:50 PM on June 20, 2022: contributor

Code-review ACK 32e5edc0f454c59c8e0d8d86a9abfa9a3f25ca28
DrahtBot commented at 11:58 PM on June 20, 2022: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #25297 (wallet: speedup transactions sync, rescan and load not flushing to db constantly by furszy)
- #22693 (RPC/Wallet: Add "use_txids" to output of getaddressinfo by luke-jr)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
DrahtBot cross-referenced this on Jun 21, 2022 from issue wallet: group independent db writes on single batched db transaction by furszy
DrahtBot cross-referenced this on Jun 21, 2022 from issue RPC/Wallet: Add "use_txids" to output of getaddressinfo by luke-jr
w0xlt approved
w0xlt commented at 5:09 PM on June 21, 2022: contributor

Code Review ACK https://github.com/bitcoin/bitcoin/pull/25427/commits/32e5edc0f454c59c8e0d8d86a9abfa9a3f25ca28
brunoerg approved
brunoerg commented at 11:55 PM on June 21, 2022: contributor

crACK 32e5edc0f454c59c8e0d8d86a9abfa9a3f25ca28
achow101 commented at 12:51 AM on June 22, 2022: member

ACK 32e5edc0f454c59c8e0d8d86a9abfa9a3f25ca28
achow101 merged this on Jun 22, 2022
achow101 closed this on Jun 22, 2022
sidhujag referenced this in commit e229e8e8ae on Jun 22, 2022
furszy deleted the branch on May 27, 2023
bitcoin locked this on May 26, 2024

Contributors

Labels

wallet: remove extra wtx lookup in AddToSpends #25427

Conflicts