Andrew Poelstra
9ec912e160
Merge 976cc766c4 into merged_master (Bitcoin PR #17381 )
2020-11-09 23:10:08 +00:00
Andrew Poelstra
c3b2f1d8c0
Merge bdda137878 into merged_master (Bitcoin PR #16766 )
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
751d0ac9f4
Merge 100fa0a62a into merged_master (Bitcoin PR #17300 )
2020-11-09 21:20:48 +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
c08bbefb33
Merge 0d7e8d66c4 into merged_master (Bitcoin PR #17203 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
2640e37921
Merge a3af5b5c13 into merged_master (Bitcoin PR #17138 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
0fbbfe35c3
Merge a689c11907 into merged_master (Bitcoin PR #16524 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
ff55bb704c
Merge 8d39c636aa into merged_master (Bitcoin PR #16952 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
8fa52e84b0
Merge 8af835a72d into merged_master (Bitcoin PR #16796 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
29e73c226a
Merge 5e202382a9 into merged_master (Bitcoin PR #16624 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
0003c1dd27
Merge 6e431296da into merged_master (Bitcoin PR #16745 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
fd1ee6632c
Merge e9ef1b2c2e into merged_master (Bitcoin PR #16716 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
6e9332432f
Merge a8ecd0dada into merged_master (Bitcoin PR #16753 )
2020-11-09 21:20:19 +00:00
Andrew Poelstra
f35b9f02e1
Merge b499d8576f into merged_master (Bitcoin PR #16557 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
c14d13f7fe
Merge be0e8b4bff into merged_master (Bitcoin PR #15713 )
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
b584854f1b
Merge 8241b51504 into merged_master (Bitcoin PR #16451 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
cf718f2179
Merge 478fe328a7 into merged_master (Bitcoin PR #16475 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
7b34c1b724
Merge 74ea1f3b0f into merged_master (Bitcoin PR #16399 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
29e9ba5bc9
Merge dfb7fd60f2 into merged_master (Bitcoin PR #16402 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
bf4ccc84dd
Merge dbf4f3f86a into merged_master (Bitcoin PR #16301 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
152198061a
Merge 459baa1756 into merged_master (Bitcoin PR #16208 )
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
8a94b6b2cb
Merge ff0aad8a40 into merged_master (Bitcoin PR #16361 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
7774f13936
Merge 6c1e45c4c4 into merged_master (Bitcoin PR #16322 )
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
15f0fb459f
Merge 4882040182 into merged_master (Bitcoin PR #16291 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
f7cb3a9645
Merge f373beebbc into merged_master (Bitcoin PR #16344 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b
Merge 8c69fae944 into merged_master (Bitcoin PR #15457 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
969b50e413
Merge 1212808762 into merged_master (Bitcoin PR #16257 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
d363ffe5e4
Merge ca80fec973 into merged_master (Bitcoin PR #16286 )
2020-11-09 03:58:17 +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
d4b074ad4b
Merge d54d02bfe1 into merged_master (Elements PR #660 )
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
Andrew Poelstra
c6ad410dd9
Merge a6beb256ed into merged_master (Elements PR #629 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
4862e2ee48
Merge ed40fbb02a into merged_master (Bitcoin PR #15741 )
2020-10-29 23:21:56 +00:00
Andrew Poelstra
4c663b631a
Merge f3d27d126b into merged_master (Bitcoin PR #16033 )
2020-10-29 19:10:55 +00:00
Andrew Poelstra
5cb1c16c7d
Merge d5931f3676 into merged_master (Bitcoin PR #15870 )
2020-10-29 18:02:26 +00:00
Andrew Poelstra
ff1c4012ad
Merge de5af41e35 into merged_master (Bitcoin PR #15452 )
2020-10-29 14:52:44 +00:00
Andrew Poelstra
c91184f6c2
Merge b2a6b02161 into merged_master (Bitcoin PR #15948 )
2020-10-29 02:36:55 +00:00
Andrew Poelstra
9ca74a409b
Merge c5ffe8d515 into merged_master (Bitcoin PR #15730 )
2020-10-29 02:14:31 +00:00
Andrew Poelstra
4c22d34cd1
Merge 0936f35f65 into merged_master (Bitcoin PR #15842 )
2020-10-29 02:07:15 +00:00
Andrew Poelstra
ae82f80186
Merge bdd7217f2c into merged_master (Bitcoin PR #15901 )
2020-10-28 23:29:30 +00:00
