Andrew Poelstra
f3fc8e9b77
Merge 6ab96ec546 into merged_master (Bitcoin PR #18574 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
63a52d3633
Merge 29893ec875 into merged_master (Bitcoin PR #18454 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
8078d38fd4
Merge 081dcbde66 into merged_master (Bitcoin PR #18561 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
0a87d878fa
Merge 63dad67348 into merged_master (Bitcoin PR #18546 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
d4beddb515
Merge abc145c9a4 into merged_master (Bitcoin PR #18543 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
886accd6fa
Merge 54d5ba3d9c into merged_master (Bitcoin PR #18540 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
1ff8f7acff
Merge c0b389b335 into merged_master (Bitcoin PR #18484 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
9280951289
Merge 425a7f900e into merged_master (Bitcoin PR #18516 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
3e35839fe6
Merge 299544f9c5 into merged_master (Bitcoin PR #18534 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
f3f386ffee
Merge cf21293ef7 into merged_master (Bitcoin PR #18515 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
da30c131c3
Merge 94fd4a56ed into merged_master (Bitcoin PR #18496 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
4fd24473ed
Merge 490ae0e87b into merged_master (Bitcoin PR #18520 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
61b65dbb0c
Merge ff53433fe4 into merged_master (Bitcoin PR #18494 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
44f30e687f
Merge 6bdd515ccf into merged_master (Bitcoin PR #16923 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
87d0e26d18
Merge 67a72466e1 into merged_master (Bitcoin PR #18247 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
15d1e10a14
Merge d2db25233c into merged_master (Bitcoin PR #18474 )
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
bdd87dc5fa
Merge 694f4cbd78 into merged_master (Bitcoin PR #18312 )
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
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
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
dcc1b1a31e
Merge 89a97a71f2 into merged_master (Bitcoin PR #17985 )
2020-11-26 01:07:46 +00:00
