[Wallet] Laggard wallet-related backports from btc 0.15 #2351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
random-zebra
added this to In Progress
in perpetual updating PIVX Core to BTC Core
via automation
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
7159b8f
to
349ea39
Compare
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
349ea39
to
b4bd8f1
Compare
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
b4bd8f1
to
f87331a
Compare
|
Rebased on master, now that #2337 has been merged. |
|
quick thing before doing a more complete review: I see you've moved a lot of the tier two Index: CMakeLists.txt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision 9a868f8579704920271d0c259a28478c46704041)
+++ b/CMakeLists.txt (date 1621481390924)
@@ -251,24 +251,10 @@
endif()
set(WALLET_SOURCES
- ./src/activemasternode.cpp
./src/bip38.cpp
./src/wallet/db.cpp
./src/addressbook.cpp
./src/crypter.cpp
- ./src/budget/budgetdb.cpp
- ./src/budget/budgetmanager.cpp
- ./src/budget/budgetproposal.cpp
- ./src/budget/budgetvote.cpp
- ./src/budget/finalizedbudget.cpp
- ./src/budget/finalizedbudgetvote.cpp
- ./src/masternode.cpp
- ./src/masternode-payments.cpp
- ./src/masternode-sync.cpp
- ./src/tiertwo_networksync.cpp
- ./src/masternodeconfig.cpp
- ./src/masternodeman.cpp
- ./src/messagesigner.cpp
./src/zpiv/mintpool.cpp
./src/wallet/hdchain.cpp
./src/wallet/rpcdump.cpp
@@ -355,8 +341,15 @@
target_include_directories(ZEROCOIN_A PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(COMMON_SOURCES
+ ./src/activemasternode.cpp
./src/base58.cpp
./src/bip38.cpp
+ ./src/budget/budgetdb.cpp
+ ./src/budget/budgetmanager.cpp
+ ./src/budget/budgetproposal.cpp
+ ./src/budget/budgetvote.cpp
+ ./src/budget/finalizedbudget.cpp
+ ./src/budget/finalizedbudgetvote.cpp
./src/consensus/params.cpp
./src/consensus/upgrades.cpp
./src/chainparams.cpp
@@ -379,6 +372,12 @@
./src/invalid.cpp
./src/key.cpp
./src/keystore.cpp
+ ./src/masternode.cpp
+ ./src/masternode-payments.cpp
+ ./src/masternode-sync.cpp
+ ./src/masternodeconfig.cpp
+ ./src/masternodeman.cpp
+ ./src/messagesigner.cpp
./src/netaddress.cpp
./src/netbase.cpp
./src/policy/feerate.cpp
@@ -393,6 +392,7 @@
./src/script/script_error.cpp
./src/spork.cpp
./src/sporkdb.cpp
+ ./src/tiertwo_networksync.cpp
./src/warnings.cpp
)
add_library(COMMON_A STATIC ${BitcoinHeaders} ${COMMON_SOURCES}) |
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
f87331a
to
c913391
Compare
|
Good idea @Fuzzbawls 👍 . Patch squashed into 49c201e |
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
c913391
to
1cb5cb2
Compare
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
1cb5cb2
to
c710b03
Compare
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
c710b03
to
74cf071
Compare
|
Rebased on master, fixing conflicts. |
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
74cf071
to
e840ab7
Compare
furszy
previously approved these changes
Jun 1, 2021
Raise RPC_WALLET_NOT_SPECIFIED instead of RPC_METHOD_NOT_FOUND when a required wallet filename was not specified in an RPC call. Also raise more specific RPC_WALLET_NOT_FOUND error instead of RPC_INVALID_PARAMETER in case an invalid wallet was specified, for consistency.
>>> backports bitcoin/bitcoin@3ef77a0
>>> backports bitcoin/bitcoin@d97fe20 This commit just moves a few function declarations and updates callers. Function bodies are moved in two followup MOVEONLY commits. This change is desirable because wallet.h/cpp are monolithic and hard to navigate, so pulling things out and grouping together pieces of related functionality should improve the organization. Another proximate motivation is the wallet process separation work in parameter parsing and fee estimation are still done in the main process rather than the wallet process, and having functions that run in different processes scrambled up throughout wallet.cpp is unnecessarily confusing.
Changes the errors field to warnings. To maintain compatibility, the errors field is deprecated and enabled by starting bitcoind with -deprecatedrpc=getmininginfo
Now using a std::unique_ptr, the Db instance is correctly released when CDB initialization fails. The internal CDB state and mapFileUseCount are only mutated when the CDB initialization succeeds.
Make sure wallet databases have unique fileids. If they don't, throw an error. BDB caches do not work properly when more than one open database has the same fileid, because values written to one database may show up in reads to other databases. Bitcoin will never create different databases with the same fileid, but users can create them by manually copying database files. BDB caching bug was reported by Chris Moore <dooglus@gmail.com> Fixes bitcoin issue 11429
random-zebra
force-pushed
the
202104_wallet-backports
branch
from
e840ab7
to
d5526bd
Compare
|
Rebased on master, fixing conflicts. |
furszy
approved these changes
Jun 2, 2021
Fuzzbawls
approved these changes
Jun 9, 2021
perpetual updating PIVX Core to BTC Core
automation
moved this from In Progress
to Ready
Jun 9, 2021
|
Merging... |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I think these are all the remaining Bitcoin Core v0.15 PRs in the wallet area that we don't have yet, and are useful to us.
I've grouped them here since they are all pretty small, simple, and narrow-focused (on the wallet/rpcwallet files).
This changeset is based on top of
as it keeps going with the multiwallet implementation, adding:
listwalletsRPCgetwalletinfoRPCwallet_multiwallet.pyfunctional testAs in some areas we are much closer to upstream, some of the commits needed adaptations (especially the functional tests). A couple of commits have been extended to include shield-related code.
List of upstream PRs backported/adapted:
getwalletinfoand add multiwallet test bitcoin/bitcoin#10604 : Add listwallets RPC, include wallet name in getwalletinfo + tests