Skip to content

Commit 914034b

Browse files
Merge #6543: backport: merge bitcoin#15596, bitcoin#21207, partial bitcoin#22155 (wallet refactoring)
2c3d9cf merge bitcoin#21207: CWallet transaction code out of wallet.cpp/.h (Kittywhiskers Van Gogh) a21691a partial bitcoin#22155: Add test for subtract fee from recipient behavior (Kittywhiskers Van Gogh) 829510c merge bitcoin#15596: Ignore sendmany::minconf as dummy value (Kittywhiskers Van Gogh) Pull request description: ## Additional Information As [dash#6517](#6517) and [dash#6529](#6529) both introduce behavior changes and workarounds that, changes from both PRs that do not affect behavior have been extracted and spun-off into this PR and they will be subsequently rebased on this PR upon merger into `develop`. This should let us at least get some of the larger (mostly move-only) diffs merged in and ease review for the aforementioned PRs. [bitcoin#21207](bitcoin#21207) can be reviewed using `git log -p -n1 --color-moved=dimmed_zebra` ## Breaking Changes None expected, no changes in behavior. ## 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 - [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 2c3d9cf PastaPastaPasta: utACK 2c3d9cf Tree-SHA512: 3e5bb5869793b389aefbe0e97b1cedd13d06abce2ad06d1c16c0f8ecd4e0fa7f148fa5d89653c76ac97171787b35525ec20ece1ea753fb97eebec95a456411e2
2 parents 21fb709 + 2c3d9cf commit 914034b

File tree

14 files changed

+2208
-2061
lines changed

14 files changed

+2208
-2061
lines changed

src/Makefile.am

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,13 @@ BITCOIN_CORE_H = \
401401
wallet/hdchain.h \
402402
wallet/ismine.h \
403403
wallet/load.h \
404+
wallet/receive.h \
404405
wallet/rpcwallet.h \
405406
wallet/salvage.h \
406407
wallet/scriptpubkeyman.h \
408+
wallet/spend.h \
407409
wallet/sqlite.h \
410+
wallet/transaction.h \
408411
wallet/wallet.h \
409412
wallet/walletdb.h \
410413
wallet/wallettool.h \
@@ -596,9 +599,12 @@ libbitcoin_wallet_a_SOURCES = \
596599
wallet/hdchain.cpp \
597600
wallet/interfaces.cpp \
598601
wallet/load.cpp \
602+
wallet/receive.cpp \
599603
wallet/rpcdump.cpp \
600604
wallet/rpcwallet.cpp \
601605
wallet/scriptpubkeyman.cpp \
606+
wallet/spend.cpp \
607+
wallet/transaction.cpp \
602608
wallet/wallet.cpp \
603609
wallet/walletdb.cpp \
604610
wallet/walletutil.cpp \

src/Makefile.test.include

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ endif
213213

214214

215215
BITCOIN_TEST_SUITE += \
216+
wallet/test/util.cpp \
217+
wallet/test/util.h \
216218
wallet/test/wallet_test_fixture.cpp \
217219
wallet/test/wallet_test_fixture.h \
218220
wallet/test/init_test_fixture.cpp \

0 commit comments

Comments
 (0)