Andrew Poelstra
c5d05866bb
Merge 4b24c3962f into merged_master (Bitcoin PR #19504 )
2020-12-02 18:14:01 +00:00
Andrew Poelstra
5b89a9fc92
Merge 80e32e120e into merged_master (Bitcoin PR #20305 )
2020-12-02 17:53:59 +00:00
Andrew Poelstra
29c7f63764
Merge c48e788246 into merged_master (Bitcoin PR #18836 )
2020-12-02 15:51:02 +00:00
Andrew Poelstra
45668b8508
Merge c2d8ba6265 into merged_master (Bitcoin PR #19502 )
2020-12-02 12:53:09 +00:00
Andrew Poelstra
3f6fdc2838
Merge 42f950cb27 into merged_master (Bitcoin PR #20322 )
2020-12-02 07:07:00 +00:00
Andrew Poelstra
7ec1f12f7c
Merge 1dfe19e284 into merged_master (Bitcoin PR #20153 )
2020-12-02 06:52:54 +00:00
Andrew Poelstra
3e4941552f
Merge 79a3b59cc7 into merged_master (Bitcoin PR #20120 )
2020-12-02 06:46:10 +00:00
Andrew Poelstra
51e3b537f6
Merge 4fd37d0a10 into merged_master (Bitcoin PR #20292 )
2020-12-02 06:39:49 +00:00
Andrew Poelstra
2d1adacaf2
Merge 663fd92b28 into merged_master (Bitcoin PR #20266 )
2020-12-02 06:16:37 +00:00
Andrew Poelstra
23f0a2294b
Merge c51c2753a4 into merged_master (Bitcoin PR #20326 )
2020-12-02 05:21:55 +00:00
Andrew Poelstra
31caf66124
Merge f5cdc290d5 into merged_master (Bitcoin PR #20316 )
2020-12-02 05:06:51 +00:00
Andrew Poelstra
699e2f45db
Merge 6954e4d16c into merged_master (Bitcoin PR #20283 )
2020-12-02 04:15:43 +00:00
Andrew Poelstra
0b598c17b3
Merge 83650e4df5 into merged_master (Bitcoin PR #20199 )
2020-12-02 04:08:17 +00:00
Andrew Poelstra
105b7f1159
Merge ed9f547750 into merged_master (Bitcoin PR #20299 )
2020-12-02 03:28:18 +00:00
Andrew Poelstra
2577c79f78
Merge 5d32009f1a into merged_master (Bitcoin PR #20220 )
2020-12-02 03:05:14 +00:00
Andrew Poelstra
3f275df2be
Merge 17c6fb176a into merged_master (Bitcoin PR #20282 )
2020-12-02 02:10:14 +00:00
Andrew Poelstra
0a4ca5becf
Merge ca18860563 into merged_master (Bitcoin PR #20263 )
2020-12-02 01:27:52 +00:00
Andrew Poelstra
d009849f95
Merge ef4c7c4e0b into merged_master (Bitcoin PR #18788 )
...
This one was pretty brutal, but ultimately nothing too surprising.
Just had to keep track of which wallets owned which blinding keys,
and in wallet_importprunedfunds.py I had to manually create a
Liquid address.
2020-12-02 01:21:09 +00:00
Andrew Poelstra
aff3d057d5
Merge c5ec0367d7 into merged_master (Bitcoin PR #20165 )
2020-12-01 21:54:11 +00:00
Andrew Poelstra
a01ffb9d0c
Merge 0c2eb7f8de into merged_master (Bitcoin PR #20262 )
2020-12-01 21:09:44 +00:00
Andrew Poelstra
9ce2c21435
Merge 42b66a6b81 into merged_master (Bitcoin PR #20186 )
2020-12-01 20:37:50 +00:00
Andrew Poelstra
3fde0f012f
Merge 6196cf77e5 into merged_master (Bitcoin PR #19753 )
2020-12-01 18:26:43 +00:00
Andrew Poelstra
11d75a53ed
Merge 3f512f3d56 into merged_master (Bitcoin PR #20258 )
2020-12-01 18:07:02 +00:00
Andrew Poelstra
ec01e32371
Merge db26eeba71 into merged_master (Bitcoin PR #19877 )
2020-12-01 17:59:59 +00:00
Andrew Poelstra
10ea7f1e54
Merge 83363f7b62 into merged_master (Bitcoin PR #20167 )
2020-12-01 17:32:41 +00:00
Andrew Poelstra
1254d1081d
Merge 88271184e8 into merged_master (Bitcoin PR #20112 )
2020-12-01 16:10:09 +00:00
Andrew Poelstra
797a5bf283
Merge 7012db2a6b into merged_master (Bitcoin PR #20176 )
2020-12-01 16:03:26 +00:00
Andrew Poelstra
f1188d79e4
Merge 1cb4e339f9 into merged_master (Bitcoin PR #20039 )
2020-12-01 15:56:21 +00:00
Andrew Poelstra
5a0577ecb6
Merge dda18e7310 into merged_master (Bitcoin PR #20214 )
2020-12-01 15:16:21 +00:00
Andrew Poelstra
bd9d811281
Merge b46f37ba5e into merged_master (Bitcoin PR #20198 )
2020-12-01 14:56:40 +00:00
Andrew Poelstra
6f267e338a
Merge 47fc883106 into merged_master (Bitcoin PR #19967 )
2020-12-01 14:36:58 +00:00
Andrew Poelstra
9eb2afd7ff
Merge f5bd46a4cc into merged_master (Bitcoin PR #20125 )
2020-12-01 14:13:32 +00:00
Andrew Poelstra
dad417577a
Merge 4769942d90 into merged_master (Bitcoin PR #19624 )
2020-12-01 06:42:52 +00:00
Andrew Poelstra
86062499f5
Merge d9d9a29352 into merged_master (Bitcoin PR #20179 )
2020-12-01 06:36:26 +00:00
Andrew Poelstra
251361078d
Merge 80c8a02f1b into merged_master (Bitcoin PR #20159 )
2020-12-01 05:47:16 +00:00
Andrew Poelstra
b733f588d8
Merge cb21d864c5 into merged_master (Bitcoin PR #19401 )
2020-12-01 05:14:13 +00:00
Andrew Poelstra
85663c72a3
Merge 82d3596dfe into merged_master (Bitcoin PR #20161 )
2020-12-01 04:25:27 +00:00
Andrew Poelstra
2a2f3e49ea
Merge 0d22482353 into merged_master (Bitcoin PR #20002 )
2020-12-01 03:42:49 +00:00
Andrew Poelstra
653fe79fe8
Merge 560dea9b26 into merged_master (Bitcoin PR #19770 )
2020-12-01 03:29:12 +00:00
Andrew Poelstra
e765fc93ea
Merge 3caee16946 into merged_master (Bitcoin PR #19953 )
...
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
4eeadb7fde
Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077 )
2020-11-30 20:20:56 +00:00
Andrew Poelstra
f327fa97f2
Merge c2c4dbaebd into merged_master (Bitcoin PR #19988 )
2020-11-30 19:05:03 +00:00
Andrew Poelstra
c33f69966f
Merge cd6e193d4c into merged_master (Bitcoin PR #20126 )
2020-11-30 18:26:10 +00:00
Andrew Poelstra
4cb66aae97
Merge 0b2abaa666 into merged_master (Bitcoin PR #19954 )
2020-11-30 17:12:23 +00:00
Andrew Poelstra
111d9d89b2
Merge 392c6f4fb2 into merged_master (Bitcoin PR #20101 )
2020-11-30 16:29:27 +00:00
Andrew Poelstra
613f65d853
Merge 9dd4de2832 into merged_master (Bitcoin PR #20027 )
2020-11-30 16:15:12 +00:00
Andrew Poelstra
ab283556b0
Merge db88db4727 into merged_master (Bitcoin PR #19339 )
...
Changes API for AcceptToMemoryPool to no longer check maximum fee; we remove
this check from interfaces::CChain::testPeginClaimAcceptance. This is fine,
the check never should have been there (this method's job is to notice double
claim attempts and provide a more helpful message to the user; other mempool
failures should be caught later in the `claimrawpegin` logic when we call
`pwallet->commitTransaction` which actually subits to the mempool). It was
only checking fees because the API made it easier to do so than to not.
2020-11-30 15:50:18 +00:00
Andrew Poelstra
3ce8ed9bb5
Merge 88067ddbe4 into merged_master (Elements PR #912 )
...
Also fixed an intermittent failure in feature_assetsdir.py that has
been bugging me for the entire rebase.
2020-11-30 15:19:14 +00:00
Andrew Poelstra
a9a69ea6fa
Merge 875e1ccc9f into merged_master (Bitcoin PR #19947 )
2020-11-30 13:51:18 +00:00
Andrew Poelstra
1108aae86c
Merge 54fc96ffa7 into merged_master (Bitcoin PR #19956 )
2020-11-30 05:40:00 +00:00
