Andrew Poelstra
cf14f230f5
Merge 6ddf435493 into merged_master (Bitcoin PR #18274 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
5bbbba1ce1
Merge 4d80274b99 into merged_master (Bitcoin PR #18241 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
c2d905db1d
Merge 29298ceeb6 into merged_master (Elements PR #829 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
91b1e1b4ab
Merge a71c34742c into merged_master (Bitcoin PR #17809 )
...
This was pretty-much as awful as it looks.
2020-11-26 01:07:48 +00:00
Andrew Poelstra
0246b86872
Merge 54a7ef612a into merged_master (Bitcoin PR #17399 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
a0e2e69cfd
Merge 31c0006a6c into merged_master (Bitcoin PR #17264 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
f0e3e31c0d
Merge 03f98b15ad into merged_master (Bitcoin PR #17577 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
8e931da20b
Merge 225aa5d6d5 into merged_master (Bitcoin PR #18193 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
2dde4faa5c
Merge a2fa6ba736 into merged_master (Elements PR #825 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
d6ed4831e0
Merge 56fc2dfcc3 into merged_master (Bitcoin PR #18122 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
e81fccc9a5
Merge 263f53e2d0 into merged_master (Bitcoin PR #18098 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
54b93c4315
Merge 470664f2b7 into merged_master (Bitcoin PR #17746 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
dd22beb3b3
Merge e5ab941489 into merged_master (Elements PR #813 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
bcf509470b
Merge 75fb37ce68 into merged_master (Bitcoin PR #18032 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
d20bafff5e
Merge 712b7d9b47 into merged_master (Bitcoin PR #17804 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
ca0936ab69
Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
91e195d7cd
Merge 2d6e76af24 into merged_master (Bitcoin PR #17261 )
...
Moved GetOnlinePakKey to the scriptpubkey manager; the other blinding
stuff remains in the CWallet. At some point after the rebase we should
consider whether there's a better separation to be had between the PAK
related stuff now that we have wallet boxes.
2020-11-14 17:16:10 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
74d2e8da1b
Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
c0f55c006c
Merge 45f151913e into merged_master (Bitcoin PR #16373 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
4f611f400d
Merge bcb4cdcca3 into merged_master (Bitcoin PR #17621 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
fe9767f625
Merge d4b335c60a into merged_master (Bitcoin PR #17617 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
c7bf5baf96
Merge 526e802d69 into merged_master (Elements PR #755 )
...
This Elements PR includes components of Core PR #17211 , which since the
refactors to use effective value landed, no longer provides the right
error message when a user provides an unowned input from a wallet tx.
See https://github.com/bitcoin/bitcoin/pull/17211#pullrequestreview-528389011
This breaks a functional test which was included in this PR, but which
conveniently has been changed in the current version of the Core PR. I
fixed the behavior (commented, in SelectCoins) rather than updating the
test to the most recent version.
2020-11-14 16:51:53 +00:00
Andrew Poelstra
6a5fc1dd58
Merge d8a66626d6 into merged_master (Bitcoin PR #17283 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
569c46ca22
Merge 6d00035cae into merged_master (Elements PR #778 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
1df4f4164c
Merge 0ee914ba9e into merged_master (Bitcoin PR #17584 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
9239882c43
Merge 8aac85d71e into merged_master (Bitcoin PR #17371 )
2020-11-14 16:51:41 +00:00
Andrew Poelstra
bce97903cf
Merge 1028882eea into merged_master (Bitcoin PR #17437 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
cfde15703a
Merge 99ab3a72c5 into merged_master (Bitcoin PR #15931 )
2020-11-09 23:10:09 +00:00
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
