James Dorfman
a124f16efc
Merge fd557ceb88 into merged_master (Bitcoin PR bitcoin/bitcoin#13533 )
...
Temporarily disable failing tests that use elements-specific interpreter flags
2023-03-24 19:33:46 +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
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
c7889e60c3
Merge 0fffd6c4fb into merged_master (Bitcoin PR bitcoin/bitcoin#22505 )
2023-03-16 15:32:08 +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
16dab8bcf6
Merge 9e627b6ea4 into merged_master (Elements PR #1212 )
2023-03-13 05:27:13 +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
ebdebbfe6f
Merge 816585db1a into merged_master (Elements PR #1182 )
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
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
Jeff Frontz
1b0424530a
Remove erroneous PAK-checking info from testproposedblock help
2023-03-05 09:05:38 -03: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
f3332ba8c8
Merge ed31d2215f into merged_master (Elements PR #1165 )
2023-03-01 14:22:06 -08:00
Glenn Willen
de41f79f6f
Merge b4935a51c0 into merged_master (Elements PR #1157 )
2023-03-01 12:09:22 -08:00
Glenn Willen
0931e4590b
Merge da236e8ad9 into merged_master (Elements PR ElementsProject/elements#1160 )
2023-03-01 12:06:11 -08:00
Glenn Willen
391bb41e14
Merge 03b646930f into merged_master (Elements PR #1154 )
2023-03-01 10:45:02 -08:00
Glenn Willen
edce83c4f3
Merge 53da86e398 into merged_master (Elements PR #1150 )
2023-03-01 10:33:38 -08:00
Glenn Willen
01015bf992
Merge 0be72f4c39 into merged_master (Elements PR #1146 )
2023-03-01 10:23:45 -08:00
Glenn Willen
3a57896cb2
Merge debf46b89e into merged_master (Elements PR #1145 )
2023-03-01 10:13:04 -08:00
Glenn Willen
0876dba1a3
Merge fa809aff5e into merged_master (Elements PR #1141 )
2023-03-01 10:01:55 -08:00
Glenn Willen
007bc08775
Merge 6132c01d60 into merged_master (Elements PR #1121 )
2023-03-01 09:37:39 -08:00
Glenn Willen
4fedc4f94c
Merge 1efefc3914 into merged_master (Elements PR #1131 )
2023-03-01 09:28:02 -08:00
Glenn Willen
98e863fcbb
Merge 426679e48c into merged_master (Elements PR #1134 )
2023-03-01 09:18:11 -08:00
Glenn Willen
6478593fbe
Merge 1be529a11b into merged_master (Elements PR #1130 )
2023-03-01 09:08:34 -08:00
Glenn Willen
49d83e5aed
Merge 83ad381f47 into merged_master (Elements PR #1117 )
2023-03-01 00:30:48 -08:00
Glenn Willen
2a246a8da1
Merge b4d4b1a2c1 into merged_master (Elements PR #1114 )
2023-03-01 00:26:50 -08:00
Glenn Willen
011feab4c4
Fix spelling lints.
...
For all spelling lints, either fix them in place, or add them to the
ignore list.
I don't understand how these have gotten in here without ever
triggering the linter until now. I'm not sure if it's something about
my test environment or what. But fixing them can't hurt.
2023-02-26 19:30:18 -08:00
Pablo Greco
e7fea1d50b
Fix underflow when blocks are ahead of headers
2023-02-21 06:22:25 -03:00
Pablo Greco
4cbe3d4322
Allow starting regtest networks with p2wsh peg-in addresses
2023-02-07 18:16:43 -03:00
