Andrew Poelstra
e377f4f773
Merge f4cfa6d019 into merged_master (Bitcoin PR #15935 )
2020-11-26 18:11:36 +00:00
Andrew Poelstra
461829d58e
Merge 2031aa92a3 into merged_master (Bitcoin PR #19562 )
2020-11-26 15:26:04 +00:00
Andrew Poelstra
9280ac9ba9
Merge 597d2f905e into merged_master (Bitcoin PR #19548 )
2020-11-26 15:20:28 +00:00
Andrew Poelstra
8eb2701f0b
Merge b763ae02a6 into merged_master (Bitcoin PR #16878 )
2020-11-26 14:30:39 +00:00
Andrew Poelstra
8a894fdcbb
Merge 476436b2de into merged_master (Bitcoin PR #19551 )
2020-11-26 13:58:21 +00:00
Andrew Poelstra
cd8a188ed8
Merge 090d877160 into merged_master (Bitcoin PR #19143 )
2020-11-26 13:52:27 +00:00
Andrew Poelstra
5c12ae9beb
Merge 0f6900e780 into merged_master (Bitcoin PR #19533 )
2020-11-26 12:02:44 +00:00
Andrew Poelstra
75408ab731
Merge affed844ba into merged_master (Bitcoin PR #19174 )
2020-11-26 06:06:02 +00:00
Andrew Poelstra
9139511690
Merge 31bdd86631 into merged_master (Bitcoin PR #19353 )
2020-11-26 05:37:52 +00:00
Andrew Poelstra
69313c4329
Merge 21209c9cce into merged_master (Bitcoin PR #19512 )
2020-11-26 05:14:51 +00:00
Andrew Poelstra
389b232e46
Merge 43125596ce into merged_master (Bitcoin PR #19296 )
2020-11-26 04:55:08 +00:00
Andrew Poelstra
3894f4419c
Merge 3d57015aa2 into merged_master (Bitcoin PR #19491 )
2020-11-26 04:25:00 +00:00
Andrew Poelstra
10eade5ba9
Merge b93c4244b9 into merged_master (Bitcoin PR #19464 )
2020-11-26 02:44:00 +00:00
Andrew Poelstra
c2e804e75b
Merge 32302e5c88 into merged_master (Bitcoin PR #19490 )
2020-11-26 01:09:24 +00:00
Andrew Poelstra
cd38c4dfbf
Merge a42631775a into merged_master (Bitcoin PR #19222 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
52c243844d
Merge ca055885c6 into merged_master (Bitcoin PR #19474 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
e2360eec1a
Merge 505b4eda55 into merged_master (Bitcoin PR #19140 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
aef7078adf
Merge 107b8559c5 into merged_master (Bitcoin PR #18638 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
874de6a557
Merge cc9d09e73d into merged_master (Bitcoin PR #19191 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
51f4252472
Merge 0d69fdb9a0 into merged_master (Bitcoin PR #19314 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
ceefa62cdb
Merge abdfd2d0e3 into merged_master (Bitcoin PR #19219 )
2020-11-26 01:09:20 +00:00
Andrew Poelstra
1aa51f0c4c
Merge b52e25cc1b into merged_master (Bitcoin PR #19328 )
2020-11-26 01:09:20 +00:00
Andrew Poelstra
7fabb1de9a
Merge 5ec19df687 into merged_master (Bitcoin PR #19277 )
2020-11-26 01:09:19 +00:00
Andrew Poelstra
d664527f5a
Merge a24806c25d into merged_master (Bitcoin PR #19215 )
2020-11-26 01:09:18 +00:00
Andrew Poelstra
5fcf5348d9
Merge e1b20e2285 into merged_master (Bitcoin PR #19028 )
2020-11-26 01:09:17 +00:00
Andrew Poelstra
a4f01a718d
Merge 8edfc1715a into merged_master (Bitcoin PR #19204 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
dc44b27189
Merge d3a5dbfd1f into merged_master (Bitcoin PR #19114 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
84109bef9a
Merge 3bbd8225b9 into merged_master (Bitcoin PR #19366 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
1f1b2cb2c6
Merge 90981b7d68 into merged_master (Bitcoin PR #19286 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
72283db549
Merge 3a4a3729d9 into merged_master (Bitcoin PR #19090 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
44551473a5
Merge c9d1040d25 into merged_master (Bitcoin PR #19237 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
b431cfa2d7
Merge 532b134cb0 into merged_master (Bitcoin PR #19373 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
3c6fb19445
Merge f591a1a184 into merged_master (Bitcoin PR #19351 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
fa10c4dfe5
Merge bd331bd745 into merged_master (Bitcoin PR #17938 )
...
Also re-`static`'d a method in src/script/standard.cpp which we had made globally
visible for some historical reason, but which I noticed diffing that file against
upstream.
2020-11-26 01:09:10 +00:00
Andrew Poelstra
e543dd36d9
Merge 62948caf44 into merged_master (Bitcoin PR #18937 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
5fba7c3c24
Merge c940c1ad85 into merged_master (Bitcoin PR #19293 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
2468108f7b
Merge b8740d6737 into merged_master (Bitcoin PR #18468 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
347c8d5942
Merge 8682414d02 into merged_master (Bitcoin PR #19247 )
2020-11-26 01:09:03 +00:00
Andrew Poelstra
440e85cbdb
Merge 371a73e940 into merged_master (Bitcoin PR #19233 )
2020-11-26 01:09:02 +00:00
Andrew Poelstra
3aaeae55ea
Merge f8364df250 into merged_master (Bitcoin PR #19176 )
2020-11-26 01:09:02 +00:00
Andrew Poelstra
e92d54175b
Merge a79bca2f1f into merged_master (Bitcoin PR #19069 )
2020-11-26 01:09:01 +00:00
Andrew Poelstra
195eb8a243
Merge 4ede05d421 into merged_master (Bitcoin PR #18758 )
2020-11-26 01:08:58 +00:00
Andrew Poelstra
1f4aca7097
Merge 01b45b2e01 into merged_master (Bitcoin PR #19053 )
2020-11-26 01:08:58 +00:00
Andrew Poelstra
9f5ed74282
Merge 0f55294cc1 into merged_master (Bitcoin PR #18875 )
2020-11-26 01:08:57 +00:00
Andrew Poelstra
04c3079da5
Merge a65b55fa45 into merged_master (Bitcoin PR #18994 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
e2bd203ab9
Merge 091cc4b94e into merged_master (Bitcoin PR #16564 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
b345693615
Merge cb88de3e3d into merged_master (Bitcoin PR #18926 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
5b9754580e
Merge 55b4c65bd1 into merged_master (Bitcoin PR #16127 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
11afdcc66a
Merge 9ccaee1d5e into merged_master (Bitcoin PR #19004 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
c4f517db76
Merge dcacea096e into merged_master (Bitcoin PR #19032 )
...
This finally retires the old serialization framework, so I had to implement
the new serialization for all the Elements types. So there's a fair bit of
new code here but it's all straightforward rearrangements of the old code.
Was able to remove some const casts which was nice.
2020-11-26 01:08:50 +00:00
