Glenn Willen
cff2b0aae2
Merge 9df1906091 into merged_master (Bitcoin PR bitcoin/bitcoin#22511 )
2023-03-22 04:41:10 +00:00
Glenn Willen
7fd21e5ae4
Merge e8b7b60d09 into merged_master (Bitcoin PR bitcoin/bitcoin#22526 )
2023-03-22 04:21:15 +00:00
Glenn Willen
7050d04a75
Merge 7925f3aba8 into merged_master (Bitcoin PR bitcoin/bitcoin#22383 )
2023-03-22 03:54:56 +00:00
James Dorfman
17e6efe7fe
Merge 5d83e7d714 into merged_master (Bitcoin PR bitcoin/bitcoin#21090 )
...
We comment out a newly-added assert from the Bitcoin
side, because it's unclear how to replicate it
correctly in Elements.
Co-authored-by: Glenn Willen <gwillen@nerdnet.org>
2023-03-22 01:11:20 +00:00
James Dorfman
af7b29045f
Merge bfa52cbddf into merged_master (Bitcoin PR bitcoin/bitcoin#22493 )
2023-03-21 19:06:33 +00:00
James Dorfman
751b37293b
Merge 3f083a5bbd into merged_master (Bitcoin PR bitcoin/bitcoin#22481 )
2023-03-21 18:04:30 +00:00
James Dorfman
50c5c56817
Merge 36aee0f353 into merged_master (Bitcoin PR bitcoin-core/gui#381 )
2023-03-21 17:29:50 +00:00
James Dorfman
4829d3f7e8
Merge ba15ab4990 into merged_master (Bitcoin PR bitcoin/bitcoin#22218 )
2023-03-21 16:55:27 +00:00
James Dorfman
91eba3427c
Merge a3791da0e8 into merged_master (Bitcoin PR bitcoin/bitcoin#22428 )
2023-03-21 16:20:59 +00:00
Glenn Willen
72a0ba0291
Merge cac38cdd02 into merged_master (Bitcoin PR bitcoin/bitcoin#21832 )
2023-03-21 03:59:44 +00:00
James Dorfman
1e233fd230
Merge 1c046bb7ac into merged_master (Bitcoin PR bitcoin/bitcoin#22288 )
2023-03-19 18:23:14 +00:00
James Dorfman
d87f839aab
Merge 10eb000409 into merged_master (Bitcoin PR bitcoin/bitcoin#22515 )
2023-03-19 17:49:27 +00:00
James Dorfman
4859871d82
Merge 40fed336b2 into merged_master (Bitcoin PR bitcoin/bitcoin#22510 )
2023-03-17 15:33:09 +00:00
James Dorfman
b936a034a6
Merge a273e3c58a into merged_master (Bitcoin PR bitcoin/bitcoin#21934 )
2023-03-17 14:59:12 +00:00
James Dorfman
c5226be2a5
Merge 458d6ac23b into merged_master (Bitcoin PR bitcoin/bitcoin#22407 )
2023-03-17 14:24:43 +00:00
James Dorfman
b5a37b0c9b
Merge 7fc9a45f47 into merged_master (Bitcoin PR bitcoin/bitcoin#22469 )
2023-03-16 16:06:33 +00:00
James Dorfman
c7889e60c3
Merge 0fffd6c4fb into merged_master (Bitcoin PR bitcoin/bitcoin#22505 )
2023-03-16 15:32:08 +00:00
James Dorfman
7ddc9ed58c
Merge bb09ec6f10 into merged_master (Bitcoin PR bitcoin/bitcoin#22507 )
2023-03-16 14:58:02 +00:00
James Dorfman
44df9bbb73
Merge 951850bebf into merged_master (Bitcoin PR #22371 )
2023-03-16 14:23:27 +00:00
James Dorfman
400c44abcc
Merge 9faa4b68db into merged_master (Bitcoin PR #22232 )
2023-03-16 04:51:52 +00:00
James Dorfman
a016b9c9a6
Merge b4ba5c770c into merged_master (Elements PR #1216 )
2023-03-13 05:27:13 +00:00
James Dorfman
00d4bcd085
Merge 8a179079e0 into merged_master (Elements PR #1214 )
2023-03-13 05:27:13 +00:00
James Dorfman
16dab8bcf6
Merge 9e627b6ea4 into merged_master (Elements PR #1212 )
2023-03-13 05:27:13 +00:00
James Dorfman
371d15d0d5
Merge 718ac5bd6b into merged_master (Elements PR #1118 )
2023-03-13 05:27:12 +00:00
James Dorfman
3aef5e4172
Merge a47f465847 into merged_master (Elements PR #1209 )
2023-03-13 05:27:12 +00:00
James Dorfman
400c502eaa
Merge 2f7bf3e1f1 into merged_master (Elements PR #1206 )
2023-03-13 05:27:12 +00:00
James Dorfman
df235c0ef3
Merge 0a20d6e327 into merged_master (Elements PR #1203 )
2023-03-13 05:27:12 +00:00
James Dorfman
d12e80a749
Merge ffeeddef54 into merged_master (Elements PR #1190 )
2023-03-13 05:27:12 +00:00
James Dorfman
5e972b2edc
Merge 29e62db08e into merged_master (Elements PR ElementsProject/elements#1195 )
2023-03-13 05:27:12 +00:00
James Dorfman
96c650b849
Merge 679f620a07 into merged_master (Elements PR #928 )
2023-03-13 05:27:12 +00:00
James Dorfman
5a40d8347f
Merge 5c82e351a9 into merged_master (Elements PR #1194 )
2023-03-13 05:27:12 +00:00
James Dorfman
48c04977aa
Merge 1339dae913 into merged_master (Elements PR ElementsProject/elements#1167 )
2023-03-13 05:27:12 +00:00
James Dorfman
544ccad427
Merge 58b5fa0dbf into merged_master (Elements PR #1186 )
2023-03-13 05:27:12 +00:00
James Dorfman
0a67cb9acd
Merge 9c067622cf into merged_master (Elements PR #1192 )
2023-03-13 05:27:12 +00:00
James Dorfman
ebdebbfe6f
Merge 816585db1a into merged_master (Elements PR #1182 )
2023-03-13 05:27:12 +00:00
James Dorfman
a8329dde1c
Merge fde2277034 into merged_master (Elements PR #1168 )
2023-03-13 05:27:12 +00:00
James Dorfman
cd394a40ed
Merge eca4cd9259 into merged_master (Elements PR #1169 )
2023-03-13 05:27:12 +00:00
James Dorfman
04bd333eaf
Merge f09a276eb0 into merged_master (Elements PR #1171 )
2023-03-13 05:27:12 +00:00
James Dorfman
a2183b9e86
Merge 38eacf73e3 into merged_master (Elements PR #1175 )
2023-03-13 05:27:11 +00:00
James Dorfman
7c66f57fb9
Merge ae220b8545 into merged_master (Elements PR #1184 )
2023-03-13 05:27:11 +00:00
James Dorfman
3d2881680e
Merge 285a18dbe9 into merged_master (Elements PR #1173 )
2023-03-13 05:27:11 +00:00
Byron Hambly
b4ba5c770c
Merge pull request #1216 from jhfrontz/correct_testproposedblock_help
...
Correct testproposedblock help
2023-03-05 18:39:23 +02:00
Jeff Frontz
1b0424530a
Remove erroneous PAK-checking info from testproposedblock help
2023-03-05 09:05:38 -03:00
Glenn Willen
6f5b948a36
Merge a7c455e6bf into merged_master (Elements PR #1178 )
2023-03-01 17:10:34 -08:00
Glenn Willen
8b34ffac1e
Merge f1dd3de8e1 into merged_master (Elements PR #1172 )
2023-03-01 16:30:10 -08:00
Glenn Willen
eb5e63b8d5
Merge 1cfcf1c360 into merged_master (Elements PR #1155 )
2023-03-01 15:38:39 -08:00
Glenn Willen
c835c7cb87
Merge f49e97dd47 into merged_master (Elements PR #1162 )
2023-03-01 14:45:25 -08:00
Glenn Willen
f3332ba8c8
Merge ed31d2215f into merged_master (Elements PR #1165 )
2023-03-01 14:22:06 -08:00
Glenn Willen
a04d6f313c
Merge 457a5645fe into merged_master (Elements PR #869 )
2023-03-01 13:46:51 -08:00
Glenn Willen
de41f79f6f
Merge b4935a51c0 into merged_master (Elements PR #1157 )
2023-03-01 12:09:22 -08:00
