Andrew Poelstra
87c8ca42dd
Merge 696b5eb179 into merged_master (Bitcoin PR #16987 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
6aeb84256a
Merge c3a8e097b1 into merged_master (Bitcoin PR #16991 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
6a5ea9af4e
Merge 2fe6c185a6 into merged_master (Bitcoin PR #16988 )
...
Massive automated translation-update PR. I just blindly took Core's updates for
everything. We should re-run this after the rebase to add translations for all
the new Elements stuff.
2020-11-09 21:20:30 +00:00
Andrew Poelstra
977162a889
Merge 981ec9b817 into merged_master (Bitcoin PR #15459 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
081a0198bd
Merge 79aeed8e76 into merged_master (Bitcoin PR #16397 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
5836ff48b8
Merge b658ca71b3 into merged_master (Bitcoin PR #16931 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
976eac2d81
Merge df692600c6 into merged_master (Bitcoin PR #16927 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
2384f8e567
Merge bb83d23ad8 into merged_master (Bitcoin PR #16926 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
9f9af7d680
Merge d6026ec874 into merged_master (Bitcoin PR #16971 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
633321d927
Merge 942e275018 into merged_master (Bitcoin PR #16962 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
96f3c60af2
Merge 6b9405e319 into merged_master (Bitcoin PR #16957 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
c5e90d0076
Merge 26a7437045 into merged_master (Bitcoin PR #16982 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
8926bc044b
Merge 9edb2b6550 into merged_master (Bitcoin PR #16953 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
a3139d9501
Merge 280c33f865 into merged_master (Elements PR #723 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
14552b9725
Merge b1c36a8ba6 into merged_master (Elements PR #719 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
d1ed1db7fc
Merge 6b2210f101 into merged_master (Bitcoin PR #16713 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
f2240a15bf
Merge a6c8aed1f1 into merged_master (Bitcoin PR #16817 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
acb351bf48
Merge 690fed668c into merged_master (Elements PR #720 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
ecd17723f2
Merge 6288f15f50 into merged_master (Bitcoin PR #16968 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
9b0e31e130
Merge ab765c2ec7 into merged_master (Bitcoin PR #16577 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
b2076c2709
Merge 003f2d20b1 into merged_master (Bitcoin PR #16837 )
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
065f0f7e86
Merge 4c4ff4911a into merged_master (Bitcoin PR #16961 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
1f7bfa84c8
Merge ae3902ee3f into merged_master (Bitcoin PR #16928 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
dad5fd9884
Merge 1e5da20b5e into merged_master (Elements PR #717 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
285f1c540f
Merge 4116a50595 into merged_master (Bitcoin PR #16959 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
e87be41b02
Merge 742cd77f6f into merged_master (Bitcoin PR #16929 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
282b502fc2
Merge 6393da8fdc into merged_master (Bitcoin PR #16960 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
52411627ed
Merge 36604b4ef5 into merged_master (Bitcoin PR #16912 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
f4a8c57154
Merge c838f2707a into merged_master (Bitcoin PR #16941 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
efe3d4d21d
Merge 3ce8298888 into merged_master (Bitcoin PR #15558 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
eab90a6495
Merge 13377b7a69 into merged_master (Bitcoin PR #16918 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
3dfcf985fb
Merge cf57e33cc6 into merged_master (Bitcoin PR #16870 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
7991670332
Merge f8b0b190aa into merged_master (Bitcoin PR #16920 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
e7e7cff7c7
Merge 04321494ae into merged_master (Bitcoin PR #16921 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
98c5244de1
Merge a73775e4d5 into merged_master (Bitcoin PR #16917 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
f4b0731eda
Merge 587003d380 into merged_master (Bitcoin PR #16914 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
5b97b7115a
Merge 630ec7bf41 into merged_master (Bitcoin PR #16900 )
2020-11-09 21:20:27 +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
b24be4b1a7
Merge 59c138d2f1 into merged_master (Bitcoin PR #16898 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
b11de4e489
Merge cfcaa9759e into merged_master (Bitcoin PR #16907 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
244335056c
Merge 0ee0474234 into merged_master (Bitcoin PR #16521 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
5febfe6b77
Merge dd8cf82e96 into merged_master (Bitcoin PR #15146 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
df8fcece9d
Merge 72d30d668a into merged_master (Bitcoin PR #16512 )
2020-11-09 21:20:26 +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
6c3a0ea0fb
Merge 4b5e5ef4ce into merged_master (Bitcoin PR #16809 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
3d08cfb21f
Merge cc1d7fd57c into merged_master (Bitcoin PR #16879 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
a53cae00a0
Merge b3067f4338 into merged_master (Bitcoin PR #16865 )
2020-11-09 21:20:26 +00:00
