[moveonly] Extract CWallet::MarkInputsDirty, and privatize AddToWalletIfInvolvingMe #13651

pull Empact wants to merge 2 commits into bitcoin:master from Empact:mark-inputs-dirty changing 2 files +31 −35

Empact commented at 8:26 PM on July 12, 2018: member

Thus reducing code and surface area of CWallet.
fanquake added the label Wallet on Jul 12, 2018

in src/wallet/wallet.h:707 in de381c6c9b outdated

 702 | @@ -703,9 +703,27 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
 703 |      void AddToSpends(const COutPoint& outpoint, const uint256& wtxid);
 704 |      void AddToSpends(const uint256& wtxid);
 705 |  
 706 | +    /**
 707 | +     * Add a transaction to the wallet, or update it.  pIndex and posInBlock should

promag commented at 2:25 PM on July 13, 2018:

... if belongs to the wallet?

Empact commented at 4:39 PM on July 13, 2018:

Going to leave as moveonly.

promag commented at 2:36 PM on July 13, 2018: member

utACK de381c6.
Empact renamed this:
~~Extract CWallet::MarkInputsDirty, and privatize AddToWalletIfInvolvingMe~~
[moveonly] Extract CWallet::MarkInputsDirty, and privatize AddToWalletIfInvolvingMe
on Jul 13, 2018
DrahtBot cross-referenced this on Jul 13, 2018 from issue [moveonly] Extract RescanWallet to handle a simple rescan by Empact
DrahtBot commented at 7:22 PM on July 13, 2018: contributor
Note to reviewers: This pull request conflicts with the following ones:
- #13658 ([wallet] [moveonly] Move rescanning from time logic into wallet/rpcdump.cpp by Empact)
- #11634 (wallet: Add missing cs_wallet/cs_KeyStore locks to wallet by practicalswift)
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 commented at 7:43 PM on July 13, 2018: contributor

Needs rebase
DrahtBot added the label Needs rebase on Jul 13, 2018
Extract CWallet::MarkInputsDirty
To avoid repeated implementations.
b7f5650942
Privatize CWallet::AddToWalletIfInvolvingMe
And document in the header.
17e6aa8e33
Empact force-pushed on Jul 13, 2018
Empact commented at 8:20 PM on July 13, 2018: member

Rebased for #12944
promag commented at 8:37 PM on July 13, 2018: member

(re)utACK 17e6aa8.
sipa commented at 10:01 PM on July 13, 2018: member

utACK 17e6aa8e333dbf3631fb09dc6eb7ede1937269df
MarcoFalke commented at 12:15 AM on July 14, 2018: member

utACK 17e6aa8
sipa merged this on Jul 14, 2018
sipa closed this on Jul 14, 2018
sipa referenced this in commit 1329ef1f00 on Jul 14, 2018
Empact deleted the branch on Jul 14, 2018
Bushstar cross-referenced this on Jul 16, 2018 from issue commits from bitcoin/master by Bushstar
ryanofsky cross-referenced this on Aug 3, 2018 from issue Refactor: separate wallet from node by ryanofsky
ryanofsky cross-referenced this on Nov 12, 2018 from issue Remove CWalletTx merging logic from AddToWallet by ryanofsky
laanwj removed the label Needs rebase on Oct 24, 2019
UdjinM6 referenced this in commit df5018c609 on Jun 29, 2021
UdjinM6 referenced this in commit f4b1dbd662 on Jun 29, 2021
UdjinM6 referenced this in commit e7ce358a40 on Jul 1, 2021
UdjinM6 referenced this in commit 0629f2c57a on Jul 2, 2021
UdjinM6 referenced this in commit f7bbcabba9 on Jul 2, 2021
bitcoin locked this on Dec 16, 2021

Contributors

Labels

Linked (view graph)

#9381 Remove CWalletTx merging logic from AddToWallet #10973 Refactor: separate wallet from node