Commit graph

823 commits

Author SHA1 Message Date
Andrew Poelstra
9ec912e160 Merge 976cc766c4 into merged_master (Bitcoin PR #17381) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
47f60c4e53 Merge bfc4c896d6 into merged_master (Bitcoin PR #17258) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
00d30ddc6c Merge 94a26b192f into merged_master (Bitcoin PR #17318) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
84bc0faf8f Merge bbc9e4133c into merged_master (Bitcoin PR #17304) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
bde84fefc4 Merge 3c40bc6726 into merged_master (Bitcoin PR #15921) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
34af974d28 Merge 471e5f8829 into merged_master (Bitcoin PR #16839) 2020-11-09 21:20:47 +00:00
Andrew Poelstra
e910b15aa8 Merge 6a97e8a060 into merged_master (Bitcoin PR #17260) (multiple commits)
This is the start of some nontrivial wallet refactoring by achow. See
https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Class-Structure-Changes
for a high-level design.

This PR moves some stuff out of CWallet into a dummy "box" LegacyScriptPubKeyMan
which is (currently) very tightly coulped to CWallet. Because of the coupling there
are currently null-checks that cannot fail, things which assume non-nullness which
will eventually be wrong, and a plethora of currently-equivalent ways to get from
a CWallet to a provider or back.

Our approach is basically to ignore the refactoring; leave the blinding key stuff
in CWallet and have it call into the wallet's provider when we are obtaining the
underlying keys.

Later, probably in a post-rebase PR, we should rethink how we manage blinding keys
to more closely match Core's "all keys go into providers" model.
2020-11-09 21:20:47 +00:00
Andrew Poelstra
fc2108d672 Merge 8a191148db into merged_master (Bitcoin PR #17154) 2020-11-09 21:20:43 +00:00
Andrew Poelstra
42a1dc16a6 Merge a22b62481a into merged_master (Bitcoin PR #17070) 2020-11-09 21:20:43 +00:00
Andrew Poelstra
821f5256a5 Merge 46d6930f8c into merged_master (Bitcoin PR #16659) 2020-11-09 21:20:41 +00:00
Andrew Poelstra
4f50591181 Merge 0d2832a6d1 into merged_master (Elements PR #741)
To resolve the `ConstructTransaction` conflict I reverted to the existing code
then manually applied the diff (it adds a parameter then adds a giant pile of
code to the input loop).
2020-11-09 21:20:40 +00:00
Andrew Poelstra
a7df99d033 Merge e180be49d7 into merged_master (Bitcoin PR #17098) 2020-11-09 21:20:40 +00:00
Andrew Poelstra
109d39e33e Merge 2a0164085b into merged_master (Bitcoin PR #16689) 2020-11-09 21:20:37 +00:00
Andrew Poelstra
60dfbbddd8 Merge 94d6a18f23 into merged_master (Bitcoin PR #16507) 2020-11-09 21:20:34 +00:00
Andrew Poelstra
eec7dc36b6 Merge 8afa602f30 into merged_master (Bitcoin PR #16727) (Core 0.19 branch point) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
b8a1b9df4d Merge ed03bfc899 into merged_master (Elements PR #726) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
081a0198bd Merge 79aeed8e76 into merged_master (Bitcoin PR #16397) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
a3139d9501 Merge 280c33f865 into merged_master (Elements PR #723) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
31729410b6 Merge b0a7a76c9d into merged_master (Bitcoin PR #16873) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
183aea8254 Merge 4bfef0daeb into merged_master (Bitcoin PR #16866) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
87438de6c3 Merge 51c4ebbe81 into merged_master (Elements PR #706) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
15573b7a25 Merge 46494b08e2 into merged_master (Bitcoin PR #16798) 2020-11-09 21:20:22 +00:00
Andrew Poelstra
9cc26a716a Merge 5b2fe5563b into merged_master (Elements PR #642)
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
29e73c226a Merge 5e202382a9 into merged_master (Bitcoin PR #16624) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
d73a5a5a8d Merge 33f9750b1b into merged_master (Bitcoin PR #16185) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
adceec0ffe Merge a6878b8080 into merged_master (Elements PR #696) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
1b2ba86a9e Merge e8a6d52724 into merged_master (Bitcoin PR #16542) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
19def18ab9 Merge 0d65106dce into merged_master (Bitcoin PR #16383) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
766d79d33f Merge 9ab9d63569 into merged_master (Bitcoin PR #16503) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
626971b963 Merge d759b5d26a into merged_master (Bitcoin PR #15911) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
db933991ff Merge 6841b01340 into merged_master (Bitcoin PR #16394) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
62ce823f8f Merge c67ef2938c into merged_master (Elements PR #600)
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
Andrew Poelstra
fc0be4dda7 Merge 00922b8720 into merged_master (Bitcoin PR #15906) 2020-11-09 21:20:10 +00:00
Andrew Poelstra
7b34c1b724 Merge 74ea1f3b0f into merged_master (Bitcoin PR #16399) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
9a159f8617 Merge c606e6fc53 into merged_master (Bitcoin PR #15996) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
1e0c1107d3 Merge 065401bc63 into merged_master (Elements PR #674) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
152198061a Merge 459baa1756 into merged_master (Bitcoin PR #16208) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
1e58aac3d1 Merge 8f604361eb into merged_master (Bitcoin PR #16194) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
a50b652932 Merge 735d6b57e7 into merged_master (Bitcoin PR #16227) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
082a6486a0 Merge 4fcccdac78 into merged_master (Bitcoin PR #16244) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
0065d674a4 Merge 8d1286014c into merged_master (Bitcoin PR #16237)
I'm sorry, this should have been a few commits, but it got away from me
as the scope of this refactoring was not immediately obvious. It essentially
just moves code around so hopefully is not too hard to review. --asp
2020-11-09 03:58:21 +00:00
Andrew Poelstra
f11c2f3dab Merge 357488f660 into merged_master (Bitcoin PR #16240) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
1750fbd46c Merge 545836e5b1 into merged_master (Elements PR #655) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
ac51ef6930 Merge 2cbcc55ba6 into merged_master (Bitcoin PR #16239) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
bb82340205 Merge 7b302eb99d into merged_master (Elements PR #663) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
c995586189 Merge 303ec103ba into merged_master (Bitcoin PR #16026) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
4a70305bf8 Merge 44d8172323 into merged_master (Bitcoin PR #13756)
This PR introduces a `avoid_reuse` flag to the `getnewaddress` `sendtoaddress` `getbalance`
RPCs, which we've also added some asset-specific stuff. Since both changes have default
values they aren't individually breaking, but together they are since some existing
asset-related RPC workflows now require the user to jam a `False` in there to make
the new avoid-reuse stuff go away.
2020-11-06 15:20:16 +00:00
Andrew Poelstra
66474e84c9 Merge 22b6c4ed75 into merged_master (Bitcoin PR #15899) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
3a76b73035 Merge 3689bc83dd into merged_master (Elements PR #657) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
68d9951825 Merge d0f81a96d9 into merged_master (Bitcoin PR #16129) 2020-11-06 15:20:13 +00:00