-
Notifications
You must be signed in to change notification settings - Fork 717
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Wallet] AddToWallet split in AddToWallet and LoadToWallet #1717
[Wallet] AddToWallet split in AddToWallet and LoadToWallet #1717
Conversation
This is an extremely good PR, I'd like to have it in 4.2 if possible. |
This should be rebased, now that #1734 has been merged. |
8ec6ed7
to
c101d25
Compare
rebased |
This does not compile now. Probably because the rebase on master included the changes from #1713, which moved (to wallet_zerocoin.cpp) some call to |
c101d25
to
f117fa9
Compare
done. ccache played with my system.. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK f117fa9
Coming from btc@0fd599767d2dabf25ac8c3543cb586cfc4b9d816
Coming from btc@bb16c8894becfba8764b13d448ba6e7e7f1608c2
This removes the fFromLoadWallet flag in AddToWallet. These were already effectively two methods. Coming from btc@00f09c920c2e8906d2260251be6d1d2fa1bbb29d
f117fa9
to
aaf063f
Compare
rebased again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
re utACK aaf063f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK aaf063f
Coming from btc@0fd599767d2dabf25ac8c3543cb586cfc4b9d816 Github-Pull: PIVX-Project#1717 Rebased-From: 266b1a0
Coming from btc@bb16c8894becfba8764b13d448ba6e7e7f1608c2 Github-Pull: PIVX-Project#1717 Rebased-From: 49f4124
This removes the fFromLoadWallet flag in AddToWallet. These were already effectively two methods. Coming from btc@00f09c920c2e8906d2260251be6d1d2fa1bbb29d Github-Pull: PIVX-Project#1717 Rebased-From: c3779c5
Github-Pull: PIVX-Project#1717 Rebased-From: aaf063f
dd22385 [GUI] Update translations from transifex (Fuzzbawls) 919e060 Solving old, not loaded at startup, transactions notification issue. (furszy) 943d84b NU name words separated by underscore instead of white space. (furszy) fc042f1 Fixing UpgradeIndex position issue. (furszy) 531673c Customize network upgrades activation height for regtest at the startup. (furszy) 1337685 Sapling activation height for regtest (furszy) 15b1052 Miner: Unused reserveKey cleanup (furszy) 566b6fc [GUI] Load persisted transaction filter/sort during start (V3) (Mrs-X) 5d22583 [GUI] Recognize key event for clearing console (Fuzzbawls) 77880e0 GUI: Settings console message moved to read only. (furszy) 6b63591 options model unused signals cleanup (furszy) b9e3859 GUI: Fixing settings display lang initialization (furszy) b434cbf Transaction primitive unused methods cleanup. (furszy) 7f9037f missing validation_zerocoin_legacy added to CMakeLists.txt (furszy) 22bfc12 Move-only: ATMP zerocoin check moved to its own legacy file. (furszy) 24d9ac4 Move-only: DataBaseAccChecksum to zerocoin validation legacy. (furszy) fb2993d Move-only: Move Zerocoin tx disconnection from DisconnectBlock to its own legacy file method. (furszy) eaacd29 Wallet::AddToWallet if walletdb is null, create one and write the tx. (furszy) 609407d Split CWallet::AddToWallet into AddToWallet and LoadToWallet. (furszy) 9aacb38 Prevent multiple calls to CWallet::AvailableCoins (furszy) c0e9b13 Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk (furszy) Pull request description: backports the following PRs that have been merged since the `4.2` branch-off: #1717 #1733 #1736 #1742 #1741 #1744 #1287 #1751 #1747 #1749 #1763 ACKs for top commit: furszy: utACK dd22385 , ready for 4.2 :) . Tree-SHA512: 38dd47320b8a7de77879240c36dec7588671fc09bc7d4f0be573fb6a33d6d243d4adbf4451bd4b4da9c046fab058c1cb0eb2ec2d97052b4d1171ac959ae5a71f
…WithWallets 9d1beb3 Move wallet callbacks into cs_main. (furszy) 4b4858b Remove SyncWithWallets wrapper function (Matt Corallo) 3b2807f Performance Regression Fix: Pre-Allocate txChanged vector (furszy) 1fe0be6 trivial: remove unused variable (Daniel Kraft) f1eb073 Reduce cs_main locks during ConnectTip/SyncWithWallets (furszy) 5e155b4 Remove unused pwalletdb from CommitTransaction (furszy) d8cc80a Remove CWalletDB* parameter from CWallet::AddToWallet (furszy) Pull request description: Work done on top of #1717 . Essentially an improvement over `SyncWithWallets` & `SyncTransaction` flow to run without locking `cs_main`. (made as less modifications as possible over the zpiv wallet/chain files, no real need to improve that code.. most of it will disappear soon) It's an adapted version of bitcoin#7946. ACKs for top commit: random-zebra: utACK 9d1beb3 Fuzzbawls: ACK 9d1beb3 Tree-SHA512: 8fc494a1d94a7fdf048fd6d08eb3f831693c9cf252a871cee83405777f40ff36e2e9455efa66ed78d3d56e528336179de2ed54b8675cf819a00d8dafa19e909a
6c566bb Add TxPriority class and comparator (Alex Morcos) 5e9df89 Make accessing mempool parents and children public (Alex Morcos) 1279a9f Add a score index to the mempool (furszy) e5a72fe Store the total sig op count of a tx (furszy) Pull request description: On top of #1707 and #1717 . Back ports bitcoin#6898 (without back porting the last commit as we need some cleanup on the miner area first). ACKs for top commit: random-zebra: ACK 6c566bb Fuzzbawls: utACK 6c566bb Tree-SHA512: c6fa788c59ea6e024e340e926e81462d0817617003034eecf9c3eeda3dfd5fbd2a7b6ec1ada3b867dba98079a195931f8a72fc2250207f475d8f44060452825b
Commits details:
1- [No functional changes] Stop using CWalletTx::WriteToDisk, and use directly CWalletDB::WriteTx.
2- Performance improvement, preventing several calls to AvailableCoins in CreateTransaction.
3- [No functional changes] Split AddToWallet in AddToWallet and LoadToWallet (these two were already divided by a boolean method argument)