Skip to content

Commit fd3f3d4

Browse files
Merge #6687: backport: merge bitcoin#23647, bitcoin#23667 (split up rpcwallet)
730ef82 merge bitcoin#23667: Split up rpcwallet (Kittywhiskers Van Gogh) bf18e7a Remove unused imports from rpc/wallet and reorder RPCs (Kittywhiskers Van Gogh) d17884f MOVEONLY: Move rpcwallet to rpc/wallet (Kittywhiskers Van Gogh) 1290783 MOVEONLY: Move spending RPCs to spend.cpp (Kittywhiskers Van Gogh) 36107c7 MOVEONLY: Move balance and utxo RPCs to coins.cpp (Kittywhiskers Van Gogh) 0aac1b3 MOVEONLY: Move address related functions from rpcwallet to addresses.cpp (Kittywhiskers Van Gogh) 6dcf2a2 MOVEONLY: Move transaction related wallet RPCs to transactions.cpp (Kittywhiskers Van Gogh) c080211 merge bitcoin#23647: Move wallet backup and encryption RPCs out of rpcwallet (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Depends on #6686 * [bitcoin#23667](bitcoin#23667) was merged upstream in v0.23. As of this writing, the backport backlog for v0.23 is at ~90% completion. While this refactor is disruptive, delaying it makes any backport after v0.23 at best annoying and at worst, causing history inconsistency, which may cause conflicts. * While the commits for [bitcoin#23647](bitcoin#23647) have been squashed down, due to the diff size, [bitcoin#23667](bitcoin#23667) is available commit-by-commit. Both can be validated as primarily move-only with `git log -p -n1 --color-moved=dimmed_zebra`. * In [bitcoin#23647](bitcoin#23647), `LoadWalletHelper` was moved to `wallet/rpc/util.cpp` but [bitcoin#23721](bitcoin#23721) (included in [dash#6137](#6137)) replaced it with `HandleWalletError`. Due to this OOO backport, changes in [bitcoin#23647](bitcoin#23647) adopts portions of [bitcoin#23721](bitcoin#23721) for correctness and consistency. * [bitcoin#23667](bitcoin#23667) does not move `walletdisplayaddress` as it is not implemented yet on account of relying on external signer support (which is the same reason why [bitcoin#23172](bitcoin#23172) hasn't been backported per the spreadsheet and `FundTxDoc` wasn't moved in this PR as it isn't backported yet). This needs to be kept in mind when backporting [bitcoin#23172](bitcoin#23172) and [bitcoin#21467](bitcoin#21467) (and its predecessors). ## Breaking Changes None expected. All changes are move-only. ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 730ef82 PastaPastaPasta: utACK 730ef82 Tree-SHA512: 445d3e42ea73b745d71b4cbfedd891359701aec25542a9d58f514e22dc059e665659fdd428ea71204996163a90c33b0621f4bc415691f1b42e7a2f558f035642
2 parents 66c1774 + 730ef82 commit fd3f3d4

File tree

14 files changed

+4802
-4710
lines changed

14 files changed

+4802
-4710
lines changed

src/Makefile.am

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ BITCOIN_CORE_H = \
404404
wallet/ismine.h \
405405
wallet/load.h \
406406
wallet/receive.h \
407-
wallet/rpcwallet.h \
408407
wallet/rpc/util.h \
408+
wallet/rpc/wallet.h \
409409
wallet/salvage.h \
410410
wallet/scriptpubkeyman.h \
411411
wallet/spend.h \
@@ -604,10 +604,15 @@ libbitcoin_wallet_a_SOURCES = \
604604
wallet/interfaces.cpp \
605605
wallet/load.cpp \
606606
wallet/receive.cpp \
607+
wallet/rpc/addresses.cpp \
608+
wallet/rpc/backup.cpp \
609+
wallet/rpc/coins.cpp \
610+
wallet/rpc/encrypt.cpp \
611+
wallet/rpc/spend.cpp \
607612
wallet/rpc/signmessage.cpp \
613+
wallet/rpc/transactions.cpp \
608614
wallet/rpc/util.cpp \
609-
wallet/rpcdump.cpp \
610-
wallet/rpcwallet.cpp \
615+
wallet/rpc/wallet.cpp \
611616
wallet/scriptpubkeyman.cpp \
612617
wallet/spend.cpp \
613618
wallet/transaction.cpp \

src/rpc/evo.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@
3535

3636
#ifdef ENABLE_WALLET
3737
#include <wallet/coincontrol.h>
38-
#include <wallet/rpcwallet.h>
3938
#include <wallet/spend.h>
4039
#include <wallet/wallet.h>
4140
#endif//ENABLE_WALLET
4241

4342
#ifdef ENABLE_WALLET
44-
extern RPCHelpMan signrawtransaction();
43+
extern RPCHelpMan signrawtransactionwithwallet();
4544
extern RPCHelpMan sendrawtransaction();
4645
#else
4746
class CWallet;

src/wallet/interfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <wallet/ismine.h>
2828
#include <wallet/load.h>
2929
#include <wallet/receive.h>
30-
#include <wallet/rpcwallet.h>
30+
#include <wallet/rpc/wallet.h>
3131
#include <wallet/spend.h>
3232
#include <wallet/wallet.h>
3333

0 commit comments

Comments
 (0)