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
Andrew Poelstra
738a42292f
Merge 52ec4c64e8 into merged_master (Bitcoin PR #16144 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
cb15f46946
Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
11cdf7ebf5
Merge 1b78b9f222 into merged_master (Elements PR #636 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
68a81ca040
Merge c29771437e into merged_master (Elements PR #625 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
45601fb0fb
update libsecp256k1-zkp to 5fbc67e108
2020-12-16 20:00:54 +00:00
Andrew Poelstra
5ecb077261
Merge 65c4bbe629 into merged_master (Bitcoin PR #16034 )
2020-10-29 21:44:47 +00:00
Andrew Poelstra
03cbb94d6a
Merge 12fd4bbd1e into merged_master (Bitcoin PR #16063 )
2020-10-29 21:04:50 +00:00
Andrew Poelstra
d8883c3b97
Merge 1c719f78d3 into merged_master (Bitcoin PR #15006 )
2020-10-29 18:09:57 +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
3a5a7341ba
Merge a3d2d6b067 into merged_master (Bitcoin PR #15930 )
2020-10-29 02:14:22 +00:00
Andrew Poelstra
ad0dc00fc2
Merge 3356799ee3 into merged_master (Bitcoin PR #15778 )
2020-10-28 23:22:29 +00:00
Andrew Poelstra
c31c6e0d89
Merge 703414994a into merged_master (Bitcoin PR #15784 )
2020-10-28 22:37:05 +00:00
Andrew Poelstra
90a5045c3b
Merge cd14d210c4 into merged_master (Bitcoin PR #15463 )
2020-10-28 22:16:27 +00:00
Andrew Poelstra
1613726319
Merge 2a854a1781 into merged_master (Bitcoin PR #15750 )
2020-10-28 16:39:28 +00:00
Andrew Poelstra
1c4e3cbb5f
Merge 4f4ef3138b into merged_master (Bitcoin PR #15557 )
...
This restricts the `bumpfee` RPC, when given a feerate target, to unblinded
transactions, because this is the only way I could figure out quickly to
allow adding inputs to an already-created transaction. It appears to be the
strategy used by the `fundrawtransaction` RPC which has similar behaviour.
This should be fixed in a followup PR.
2020-10-28 15:36:05 +00:00
