Andrew Poelstra
88a7e99a91
Merge 48cb468ce3 into merged_master (Bitcoin PR #17242 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
234994b810
Merge 90ed98ae9a into merged_master (Bitcoin PR #17080 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
e25e16c65e
Merge ccaef6c28b into merged_master (Bitcoin PR #16908 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
e5deb2eb70
Merge 30c2b0b1cb into merged_master (Bitcoin PR #16849 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
d1ed1db7fc
Merge 6b2210f101 into merged_master (Bitcoin PR #16713 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
f2874628b4
Merge fdfaeb67de into merged_master (Bitcoin PR #16956 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
7ed0d4f1e2
Merge 7d4bc60f1f into merged_master (Bitcoin PR #16743 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
084729aa3d
Merge 9bf5768dd6 into merged_master (Bitcoin PR #16885 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
74202bd35a
Merge 408c920381 into merged_master (Bitcoin PR #16400 )
...
This was a scary-looking refactor but basically what it does is move all the
local variables from AcceptToMemoryPoolWorker into a class Workspace, so
that the method can be broken down into multiple steps.
The only Elements change required (beyond obvious conflict resolution) was
to also move the local variable setPeginsSpent into the class, and to rename
it m_set_pegins_spent for consistency. There were also multiple loops over
transaction inputs and it was important to make sure all the Elements pegin
logic went into the right ones, to preserve the control flow. This was
annoying because of all the whitespace changes in the PR but not too hard.
2020-11-09 21:20:26 +00:00
Andrew Poelstra
ca7b7f3810
Merge feb162d500 into merged_master (Bitcoin PR #14696 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
94cf235067
Merge 871d3ae45b into merged_master (Bitcoin PR #16757 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
3465e350be
Merge fb4f5beb6e into merged_master (Bitcoin PR #16854 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
5cca042772
Merge 0d20c42a01 into merged_master (Bitcoin PR #16421 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
14b98224c3
Merge ae3e3bd151 into merged_master (Bitcoin PR #16793 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
9cc26a716a
Merge 5b2fe5563b into merged_master (Elements PR #642 )
...
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
bbfa3115a1
Merge 8e00a68552 into merged_master (Bitcoin PR #16774 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
5115dbbf41
Merge 6519be6054 into merged_master (Bitcoin PR #13868 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
5deb2c636f
Merge 1f8378508a into merged_master (Bitcoin PR #15615 )
2020-11-09 21:20:19 +00:00
Andrew Poelstra
5f280a6068
Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
028f2d94d1
Merge 85883a9f8e into merged_master (Bitcoin PR #16443 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
0657bbeffa
Merge 68da54987d into merged_master (Bitcoin PR #16471 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
31aa2513fb
Merge d5a54ce8f0 into merged_master (Bitcoin PR #15305 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
04f0e67e67
Merge 51a6e2c419 into merged_master (Bitcoin PR #15681 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e58aac3d1
Merge 8f604361eb into merged_master (Bitcoin PR #16194 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
f7cb3a9645
Merge f373beebbc into merged_master (Bitcoin PR #16344 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b
Merge 8c69fae944 into merged_master (Bitcoin PR #15457 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
19568c3891
Merge c6e42f1ca9 into merged_master (Bitcoin PR #14193 )
2020-11-09 03:58:18 +00:00
Andrew Poelstra
695bf1c24d
Merge 332c6134bb into merged_master (Bitcoin PR #15894 )
2020-11-09 03:58:16 +00:00
Andrew Poelstra
f60ef72524
Merge 0b68fca700 into merged_master (Bitcoin PR #16092 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
83f93df4d0
Merge e2182b02b5 into merged_master (Bitcoin PR #16171 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
2c4ed107ff
Merge c977f2b99d into merged_master (Elements PR #664 )
2020-11-06 15:20:14 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
cb15f46946
Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
a835ebdb2f
Merge 1c177c3a00 into merged_master (Bitcoin PR #16015 )
2020-10-29 20:55:17 +00:00
Andrew Poelstra
96169f79e3
Merge 7110d455eb into merged_master (Bitcoin PR #12980 )
2020-10-29 19:54:46 +00:00
Andrew Poelstra
e6adc4efa2
Merge a822a0e4f6 into merged_master (Bitcoin PR #15999 )
2020-10-29 19:17:12 +00:00
Andrew Poelstra
f6f2aefae3
Merge 40c66bb3d1 into merged_master (Bitcoin PR #15855 )
2020-10-29 16:50:16 +00:00
Andrew Poelstra
5bf56b8829
Merge 49c1aa5f83 into merged_master (Bitcoin PR #15971 )
2020-10-29 04:29:12 +00:00
Andrew Poelstra
c91184f6c2
Merge b2a6b02161 into merged_master (Bitcoin PR #15948 )
2020-10-29 02:36:55 +00:00
Andrew Poelstra
2d57dcb681
Merge d7d7d31506 into merged_master (Bitcoin PR #15141 )
2020-10-29 02:10:39 +00:00
Andrew Poelstra
cf22dd0930
Merge 12aa2ac988 into merged_master (Bitcoin PR #15323 )
2020-10-29 02:07:08 +00:00
Andrew Poelstra
44e5901b98
Merge 2c35fe6238 into merged_master (Bitcoin PR #15849 )
2020-10-29 02:06:12 +00:00
Andrew Poelstra
ad0dc00fc2
Merge 3356799ee3 into merged_master (Bitcoin PR #15778 )
2020-10-28 23:22:29 +00:00
Andrew Poelstra
e490be0579
Merge d76b72a454 into merged_master (Bitcoin PR #15267 )
2020-10-28 22:35:27 +00:00
Andrew Poelstra
e316ed34be
Merge ae2c19f578 into merged_master (Bitcoin PR #15655 )
2020-10-28 20:52:58 +00:00
Andrew Poelstra
a8581ea138
Merge 6a135fbe5b into merged_master (Bitcoin PR #15638 )
2020-10-28 03:16:57 +00:00
Andrew Poelstra
45dad5302b
Merge 93623eea71 into merged_master (Bitcoin PR #15623 )
2020-10-28 00:09:42 +00:00
