Andrew Poelstra
0ae13d03b6
Merge 3d28c886f0 into merged_master (Bitcoin PR #18286 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
5bbbba1ce1
Merge 4d80274b99 into merged_master (Bitcoin PR #18241 )
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
cc668250eb
Merge 97aadf98d0 into merged_master (Bitcoin PR #16117 )
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
cf94078b64
Merge d7134b306a into merged_master (Bitcoin PR #17917 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
49a80f654a
Merge 891464950b into merged_master (Bitcoin PR #18109 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
3cad03e603
Merge 727857d12d into merged_master (Bitcoin PR #18112 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
9b85a6536b
Merge aaf09469fb into merged_master (Bitcoin PR #18260 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
ba86e72eba
Merge 96488e6784 into merged_master (Bitcoin PR #18263 )
2020-11-26 01:07:49 +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
a2660bd336
Merge 2492dc0068 into merged_master (Bitcoin PR #18259 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
c2d905db1d
Merge 29298ceeb6 into merged_master (Elements PR #829 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
91b1e1b4ab
Merge a71c34742c into merged_master (Bitcoin PR #17809 )
...
This was pretty-much as awful as it looks.
2020-11-26 01:07:48 +00:00
Andrew Poelstra
cdeb19ce22
Merge 088604221b into merged_master (Bitcoin PR #18253 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
a9d26157fb
Merge ac5c5d0162 into merged_master (Bitcoin PR #18168 )
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
0246b86872
Merge 54a7ef612a into merged_master (Bitcoin PR #17399 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
1a37ad8637
Merge 715dbbe9e8 into merged_master (Bitcoin PR #18229 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
a0d00c7c75
Merge 9027960932 into merged_master (Bitcoin PR #18225 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
bf55b8fdab
Merge eca4d8ef6a into merged_master (Bitcoin PR #16562 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
862b02f20b
Merge 1a51cd1ac5 into merged_master (Bitcoin PR #17800 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
584ee38590
Merge 7a266a679d into merged_master (Bitcoin PR #18173 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
feb99445da
Merge 9aa8145bc0 into merged_master (Bitcoin PR #17959 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
871d31b516
Merge 5ad80bec3f into merged_master (Bitcoin PR #18135 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
19ec8f2bf8
Merge 73cfa070e5 into merged_master (Bitcoin PR #18195 )
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
ea995086f7
Merge fe63d79eab into merged_master (Bitcoin PR #18212 )
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
5878782435
Merge 4502ed7cd1 into merged_master (Bitcoin PR #18211 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
105646a03d
Merge e5d47ed8fd into merged_master (Bitcoin PR #18167 )
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
Andrew Poelstra
66204f061c
Merge c0e0e0a9d5 into merged_master (Elements PR #818 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
f4a783ba0b
Merge 171540429f into merged_master (Elements PR #819 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
bb88191981
Merge c3b4715923 into merged_master (Bitcoin PR #18206 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
a0e2e69cfd
Merge 31c0006a6c into merged_master (Bitcoin PR #17264 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
f0e3e31c0d
Merge 03f98b15ad into merged_master (Bitcoin PR #17577 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
1ce4e7c713
Merge a674e89d27 into merged_master (Bitcoin PR #18162 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
8e931da20b
Merge 225aa5d6d5 into merged_master (Bitcoin PR #18193 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
2dde4faa5c
Merge a2fa6ba736 into merged_master (Elements PR #825 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
873c33754d
Merge ab9de43588 into merged_master (Bitcoin PR #18181 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
697ce68b63
Merge 36e507227e into merged_master (Bitcoin PR #18183 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
0c1829049e
Merge 9dd7bd47be into merged_master (Bitcoin PR #18034 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
1f0738f05f
Merge e9fc8f6e7f into merged_master (Bitcoin PR #18172 )
2020-11-26 01:07:44 +00:00
