Andrew Poelstra
15d1e10a14
Merge d2db25233c into merged_master (Bitcoin PR #18474 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
b67e35ae94
Merge 72ef366564 into merged_master (Bitcoin PR #18472 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
f8e3be6cb7
Merge d52ba21dff into merged_master (Bitcoin PR #18481 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
4192a98947
Merge 965c0c37d5 into merged_master (Bitcoin PR #18420 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
9587ad280d
Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
0f623aede0
Merge 210b533a11 into merged_master (Bitcoin PR #18447 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
6a5b5f13ec
Merge b53af72b82 into merged_master (Bitcoin PR #18416 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
bdd87dc5fa
Merge 694f4cbd78 into merged_master (Bitcoin PR #18312 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
5b3e849748
Merge 2e97d80017 into merged_master (Bitcoin PR #18134 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
477c4a5c58
Merge ac5a435247 into merged_master (Elements PR #838 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
ff1454245a
Merge d478a737db into merged_master (Bitcoin PR #18392 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
169fbf8221
Merge 57a8fa9c3b into merged_master (Bitcoin PR #18406 )
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
acec4e75af
Merge 5c9d408b2d into merged_master (Bitcoin PR #18300 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
fc64d8f534
Merge 95602ec21f into merged_master (Elements PR #834 )
...
Hadta bump the fee test in feature_confidential_transactions.py since our default
rangeproofs are now bigger.
2020-11-26 01:07:58 +00:00
Andrew Poelstra
42372ae3a5
Merge ad04f0d8a5 into merged_master (Bitcoin PR #17319 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
cc259f1835
Merge 71d00ba8df into merged_master (Elements PR #835 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
526b571c9e
Merge 8fc5f2bdf0 into merged_master (Bitcoin PR #18366 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
a2b9606552
Merge 7060d2d97a into merged_master (Bitcoin PR #18350 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
665487ce94
Merge bef78a0447 into merged_master (Elements PR #828 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
5c5d93eb64
Merge d402c1e4d3 into merged_master (Bitcoin PR #18345 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
93c7d0d22d
Merge e2d36639ca into merged_master (Bitcoin PR #18228 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
e747991568
Merge 2737197ff3 into merged_master (Bitcoin PR #18213 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
cc5099dcd6
Merge 9cc7eba1b5 into merged_master (Bitcoin PR #18318 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
ad33c3a204
Merge 309b0c4c19 into merged_master (Bitcoin PR #13693 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
7bc1e4d084
Merge 24a727e23e into merged_master (Bitcoin PR #18255 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
bf899b9e7f
Merge 16dfaed1b7 into merged_master (Bitcoin PR #18304 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
9259d819c1
Merge b5c7665e30 into merged_master (Bitcoin PR #18311 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
f3b377f05b
Merge cf4cb28efc into merged_master (Bitcoin PR #18305 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
f19177a927
Merge 1a97c9a483 into merged_master (Bitcoin PR #15443 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
9352c087d1
Merge ccb2c9e789 into merged_master (Bitcoin PR #18306 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
2c29630441
Merge 5518eeec27 into merged_master (Bitcoin PR #18047 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
7ab7ad899c
Merge 31b2ce70fb into merged_master (Bitcoin PR #18299 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
bf2f2a3652
Merge 5e12a61044 into merged_master (Bitcoin PR #17926 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
0ae13d03b6
Merge 3d28c886f0 into merged_master (Bitcoin PR #18286 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
2d35bebf6b
Merge 3516a31eaa into merged_master (Bitcoin PR #18234 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
60e037bb94
Merge 45cdcd47d9 into merged_master (Bitcoin PR #18126 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
b052838fed
Merge 3f826598a4 into merged_master (Bitcoin PR #17972 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
7fd5f968e9
Merge a2b5aae9f3 into merged_master (Bitcoin PR #17996 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
cad0fb9200
Merge a2a77ba34f into merged_master (Bitcoin PR #18056 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
6b887e82dc
Merge d0601e67f1 into merged_master (Bitcoin PR #17812 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
e6e0bcc70d
Merge cbc32d67dc into merged_master (Bitcoin PR #18249 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
cdeb19ce22
Merge 088604221b into merged_master (Bitcoin PR #18253 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
01aa5b3023
Merge 1f886243e4 into merged_master (Bitcoin PR #18224 )
...
Added a new "signed but not finalized" vector to the functional tests, which took
some time to figure out how to generate. Evenetually I took the output of walletsignpsbt
from the nonconf->nonconf test and manually un-finalized that by pulling the
scriptwitness apart into a pubkey->signature mapping.
2020-11-26 01:07:48 +00:00
Andrew Poelstra
feb99445da
Merge 9aa8145bc0 into merged_master (Bitcoin PR #17959 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
4bc1e03e5d
Merge e5753fa4e8 into merged_master (Bitcoin PR #17921 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
87ff0bd466
Merge eae48ec84c into merged_master (Bitcoin PR #18209 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
acf499a048
Merge 1615043935 into merged_master (Bitcoin PR #17461 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
1456bbe89b
Merge 324a6dfeaf into merged_master (Bitcoin PR #17771 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
dcc1b1a31e
Merge 89a97a71f2 into merged_master (Bitcoin PR #17985 )
2020-11-26 01:07:46 +00:00
