Commit graph

408 commits

Author SHA1 Message Date
Andrew Poelstra
65b01321e2 Merge 4f45ea1f73 into merged_master (Bitcoin PR #19725) 2020-11-29 22:09:36 +00:00
Andrew Poelstra
455f61c0db Merge 8c5f68118c into merged_master (Bitcoin PR #18267)
This commit adds signet support, which is a little bit silly/redundant for us :)
Was a surprisingly easy merge to handle, and hopefully in future Core is more
mindful of signed blocks when they are changing code architecture.

I had to change a couple lines of src/signet.cpp to add blank assets to the
CTxOuts and to find transaction input scriptWitnesses. No need to add any
other tx witness data (and the CAsset()s that I did add to make things compile
won't be used..) because signet will always have g_con_elementsmode off.
2020-11-29 16:57:55 +00:00
Andrew Poelstra
5e62edcf8e Merge ffaac6e614 into merged_master (Bitcoin PR #16378)
Adds a new "send" RPC which I didn't really look at too closely to match
our other RPC modifications. In particular our backport of #17211 adds a
"solving_data" field to other transaction-creation RPCs, but not this
one. (But I checked the current status of #17211 and Andy hasn't updated
upstream either, just passes NullUniValue to FundTransaction from `send`.
So that's what I did here.)
2020-11-29 04:33:22 +00:00
Andrew Poelstra
ef13698934 Merge 48c1083632 into merged_master (Bitcoin PR #19105) 2020-11-28 20:18:13 +00:00
Andrew Poelstra
afe472121a Merge a1d14f522c into merged_master (Bitcoin PR #19671) 2020-11-28 19:48:53 +00:00
Andrew Poelstra
e10dd69c55 Merge a0e75bd31d into merged_master (Bitcoin PR #15937) 2020-11-27 20:39:27 +00:00
Andrew Poelstra
a67921c2c8 Merge dabab06a1a into merged_master (Bitcoin PR #19455) 2020-11-27 19:01:46 +00:00
Andrew Poelstra
9cbfabd2d6 Merge 14ceddd290 into merged_master (Bitcoin PR #18991) 2020-11-27 00:01:40 +00:00
Andrew Poelstra
e377f4f773 Merge f4cfa6d019 into merged_master (Bitcoin PR #15935) 2020-11-26 18:11:36 +00:00
Andrew Poelstra
4a5f6d253f Merge 19aaf7945e into merged_master (Bitcoin PR #19423) 2020-11-26 13:33:52 +00:00
Andrew Poelstra
aef7078adf Merge 107b8559c5 into merged_master (Bitcoin PR #18638) 2020-11-26 01:09:23 +00:00
Andrew Poelstra
37cb4fdaba Merge a4eb6a51a7 into merged_master (Bitcoin PR #19469) 2020-11-26 01:09:22 +00:00
Andrew Poelstra
e96a115bab Merge f6072e601a into merged_master (Bitcoin PR #19368) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
31f5cfcef7 Merge 02b26ba1c1 into merged_master (Bitcoin PR #19200) 2020-11-26 01:09:10 +00:00
Andrew Poelstra
24f4a02a03 Merge 0afbeb73cc into merged_master (Bitcoin PR #19153) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
cd430597f1 Merge 5af16a4db7 into merged_master (Bitcoin PR #16756) 2020-11-26 01:09:04 +00:00
Andrew Poelstra
55d166627c Merge b33136b6ba into merged_master (Bitcoin PR #19083) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
dd4616946d Merge 85f7db2284 into merged_master (Bitcoin PR #19239) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
9e70adf13e Merge 6762a627ec into merged_master (Bitcoin PR #19230) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
d5082ffa37 Merge 39afe5b1c6 into merged_master (Bitcoin PR #19082) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
67f55c5173 Merge 234fabab90 into merged_master (Bitcoin PR #18210) 2020-11-26 01:08:57 +00:00
Andrew Poelstra
b23acd5046 Merge dec067f5a0 into merged_master (Bitcoin PR #18965) 2020-11-26 01:08:54 +00:00
Andrew Poelstra
9ac62395d7 Merge e45fb7e0d2 into merged_master (Bitcoin PR #18877) 2020-11-26 01:08:42 +00:00
Andrew Poelstra
bda1054131 Merge 7a5767423f into merged_master (Bitcoin PR #18808) 2020-11-26 01:08:41 +00:00
Andrew Poelstra
503f615f81 Merge a66ba6d029 into merged_master (Bitcoin PR #18576) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
252c3a223c Merge 978c5a2122 into merged_master (Bitcoin PR #18485) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
733d5cf974 Merge e302830fae into merged_master (Bitcoin PR #18774) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
e5f1b2cdaa Merge 0ef0d33f75 into merged_master (Bitcoin PR #18038) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
1c12ae1719 Merge eef90c14ed into merged_master (Bitcoin PR #16528)
This is the 43-commit descriptor wallet PR. It was remarkably easy to merge, given
its magnitude. With this commit Elements supports importing Bitcoin descriptors
and deriving (Bitcoin) addresses, though of course it does not support blinding
yet. That is a post-rebase project.

The material changes were:

1. Changing constants in the tests (super annoying but nothing surprising)

2. Adding a missing "skip if this coin is not ours" check in src/script/sign.cpp
   which was causing us to erroneously remove existing witnesses from transactions.
   This wasn't a problem before this commit since we would only ask specific
   scriptpubkeymans to sign, and we'd never ask any to sign inputs we didn't
   own. Andy simplified the logic here to always try every scriptpubkeyman,
   which means they have to play a bit more nicely with each other.

Other than that, this was a big diff with many conflicts but literally all of
them were "we both added code" and the resolution was to take both sides.
2020-11-26 01:08:31 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
5f85d5672b Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
63a52d3633 Merge 29893ec875 into merged_master (Bitcoin PR #18454) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
9587ad280d Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334) 2020-11-26 01:08:05 +00:00
Andrew Poelstra
bdd87dc5fa Merge 694f4cbd78 into merged_master (Bitcoin PR #18312) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
ff1454245a Merge d478a737db into merged_master (Bitcoin PR #18392) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
e1f1d5dc40 Merge 67de1ee8bc into merged_master (Bitcoin PR #18378) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
ad33c3a204 Merge 309b0c4c19 into merged_master (Bitcoin PR #13693) 2020-11-26 01:07:54 +00:00
Andrew Poelstra
f19177a927 Merge 1a97c9a483 into merged_master (Bitcoin PR #15443) 2020-11-26 01:07:52 +00:00
Andrew Poelstra
6b887e82dc Merge d0601e67f1 into merged_master (Bitcoin PR #17812) 2020-11-26 01:07:49 +00:00
Andrew Poelstra
1f0738f05f Merge e9fc8f6e7f into merged_master (Bitcoin PR #18172) 2020-11-26 01:07:44 +00:00
Andrew Poelstra
bca8bce3b7 Merge caa2f3af29 into merged_master (Bitcoin PR #12134) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
ca0936ab69 Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585) 2020-11-26 00:29:43 +00:00
Andrew Poelstra
74d2e8da1b Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
7776084b8f Merge 988fe5b1ad into merged_master (Bitcoin PR #12763) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
f9acc8330d Merge ca1eeba0b0 into merged_master (Bitcoin PR #17488) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
1d3555cdaf Merge b05b28183c into merged_master (Bitcoin PR #16899) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
3875efaaa2 Merge 6a7c40bee4 into merged_master (Bitcoin PR #15888) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
371868fdac Merge 4258fd7377 into merged_master (Bitcoin PR #17091) 2020-11-09 21:20:43 +00:00
Andrew Poelstra
e413b2ebbb Merge ca97d292ce into merged_master (Bitcoin PR #16551) 2020-11-09 21:20:24 +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