Byron Hambly
6ec7ce1641
Merge bb136aaf2c into merged_master (Bitcoin PR bitcoin/bitcoin#26533 )
2025-04-09 12:28:27 +02:00
Byron Hambly
8db6b78170
Merge 82793f1984 into merged_master (Bitcoin PR bitcoin/bitcoin#27146 )
...
Unrelated FIXME: moved transactiontime functional tests to extended
temporarily
2025-04-09 06:47:56 +02:00
Byron Hambly
10a48f98f1
Merge 94070029fb into merged_master (Bitcoin PR bitcoin/bitcoin#27053 )
2025-04-08 11:36:10 +02:00
Byron Hambly
8df89b56d5
Merge 6e08e5cb5c into merged_master (Bitcoin PR bitcoin/bitcoin#17127 )
2025-04-05 14:44:25 +02:00
Tom Trevethan
1200d73ab4
Merge 835212cd1d into merged_master (Bitcoin PR bitcoin/bitcoin#25880 )
2025-04-04 14:12:28 +00:00
Byron Hambly
30170c6bd9
Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226 )
2025-04-03 11:42:16 +02:00
Byron Hambly
a40bcf97bd
Merge 89fb354f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26625 )
2025-04-03 10:33:03 +02:00
Tom Trevethan
c4ef833d9d
Merge 2182149dc5 into merged_master (Bitcoin PR bitcoin/bitcoin#26631 )
2025-04-02 14:35:02 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
41f380c8f0
Merge bd13d6b369 into merged_master (Bitcoin PR bitcoin/bitcoin#26656 )
2025-03-31 10:06:08 +02:00
Byron Hambly
d11cdab5ae
Merge 66c08e741d into merged_master (Bitcoin PR bitcoin/bitcoin#24865 )
2025-03-31 09:12:26 +02:00
Tom Trevethan
590b5bd44c
Merge 9e229a542f into merged_master (Bitcoin PR bitcoin/bitcoin#26601 )
2025-03-25 23:34:44 +00:00
Byron Hambly
da0e8310ca
Merge 78aee0fe2c into merged_master (Bitcoin PR bitcoin/bitcoin#26569 )
2025-03-04 12:20:20 +02:00
Byron Hambly
809ca1e546
Merge 3be21060d6 into merged_master (Bitcoin PR bitcoin/bitcoin#26600 )
2025-03-04 11:08:18 +02:00
Byron Hambly
7c5f4914fb
Merge f37bd15d47 into merged_master (Bitcoin PR bitcoin/bitcoin#25685 )
...
FIXME introduces a new regression test to reproduce the issue commented
out in the confidential transaction functional test
2025-02-27 09:55:45 +02:00
Byron Hambly
ae2a8a49d6
Merge e9a914465d into merged_master (Elements PR #1385 )
2025-02-11 14:35:51 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
4303fa500d
test: add functional test for issue
2025-01-14 15:25:05 +02:00
Byron Hambly
70c819546f
Merge aa2420cd18 into merged_master (Elements PR #1368 )
2024-12-02 09:20:42 +02:00
Byron Hambly
e3d3f8cdb2
Merge 9fefd00d8e into merged_master (Bitcoin PR bitcoin/bitcoin#26107 )
2024-11-27 11:24:26 +02:00
Byron Hambly
41633df3a3
Merge 013924aa6d into merged_master (Bitcoin PR bitcoin/bitcoin#26031 )
2024-11-26 13:04:05 +02:00
Byron Hambly
e1e241d410
Merge 7921026a24 into merged_master (Bitcoin PR bitcoin/bitcoin#19602 )
...
FIXME for test_other_watchonly in the new wallet migration test
2024-11-26 11:21:27 +02:00
Byron Hambly
54b236050d
Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717 )
...
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
2024-11-22 14:26:38 +02:00
Byron Hambly
77f3ebc498
Merge eed2bd37ef into merged_master (Bitcoin PR bitcoin/bitcoin#25355 )
2024-11-22 09:39:18 +02:00
Byron Hambly
3aec1a9069
Merge 22d96d76ab into merged_master (Bitcoin PR bitcoin/bitcoin#25720 )
2024-11-02 16:49:35 +02:00
Byron Hambly
b30fd6f694
Merge 29c195cf6a into merged_master (Bitcoin PR bitcoin/bitcoin#25792 )
2024-11-01 15:07:02 +02:00
Byron Hambly
16f25771a0
Merge 35305c759a into merged_master (Bitcoin PR bitcoin/bitcoin#22751 )
...
This PR introduced a new RPC "simulaterawtransaction". It has been modified from
upstream and from ElementsProject/elements#1016
to work correctly with Elements blinded transactions and issued assets.
2024-10-29 10:15:55 +02:00
Byron Hambly
f7b03ad72e
Merge 1abbae65eb into merged_master (Bitcoin PR bitcoin/bitcoin#24584 )
...
This should be reviewed carefully. The new availablecoins_test was
showing an intermittent error [1]. The test variants were split out into
their own test cases to work around the issue, but requires further
investigation.
[1]: https://github.com/ElementsProject/elements/issues/1370
2024-10-24 12:08:44 +02:00
James Dorfman
d94f55ff58
Merge 85b601e043 into merged_master (Bitcoin PR bitcoin/bitcoin#24148 )
2024-10-16 06:54:02 +00:00
James Dorfman
2a62c87084
Merge 0817cc379f into merged_master (Bitcoin PR bitcoin/bitcoin#25512 )
2024-10-15 15:56:45 +00:00
James Dorfman
94c44698f4
Move the slow feature_trim_headers functional test to the extended tests, so that it doesn't automatically run
2024-10-09 05:28:58 +00:00
James Dorfman
0fff8eea05
Merge 5d68d6840d into merged_master (Bitcoin PR bitcoin/bitcoin#25364 )
2024-10-09 05:20:03 +00:00
James Dorfman
9e9b73df05
Merge 6adae27f8c into merged_master (Bitcoin PR bitcoin/bitcoin#24836 )
2024-10-08 18:34:54 +00:00
Andrew Poelstra
626e3aeafb
test: add functional simplicity activation test
2024-10-08 14:41:40 +00:00
James Dorfman
61b0543ba7
Merge cdcc74bbcc into merged_master (Elements PR #1270 )
2024-09-23 16:51:13 +00:00
James Dorfman
033f17b1df
Merge 00ce8543f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24171 )
...
Please review the changes to src/net_processing.cpp carefully, I'm not sure
if I adapted new IBD logic to work properly for elements.
2024-09-09 16:33:14 +00:00
James Dorfman
fec3aaf01a
Merge 269fa667f2 into merged_master (Bitcoin PR bitcoin/bitcoin#25044 )
2024-09-06 18:10:08 +00:00
James Dorfman
b089fee4af
Merge b6ab45ae5c into merged_master (Bitcoin PR bitcoin/bitcoin#25204 )
2024-09-06 17:08:46 +00:00
James Dorfman
bf065f9c8a
Merge 3ba6dd6f4b into merged_master (Bitcoin PR bitcoin/bitcoin#24408 )
2024-09-06 16:21:04 +00:00
James Dorfman
46bad21aba
Merge ed4eeafbb6 into merged_master (Bitcoin PR bitcoin/bitcoin#24793 )
2024-08-09 17:46:34 +00:00
James Dorfman
56a93102e0
Merge 606ce05ec2 into merged_master (Bitcoin PR bitcoin/bitcoin#18554 )
2024-08-08 16:40:09 +00:00
James Dorfman
f810d6d444
Merge 47b8256da8 into merged_master (Bitcoin PR bitcoin/bitcoin#24937 )
2024-08-06 19:57:11 +00:00
James Dorfman
01e944c8aa
Merge 34ae04d775 into merged_master (Bitcoin PR bitcoin/bitcoin#21726 )
...
This changed the node pruning logic and moved test/functional/feature_blockfilterindex_prune.py
to test/functional/feature_index_prune.py.
Please verify that:
1. I migrated the test correctly
2. The magic numbers in the test look fine
With respect to #2 : I believe the magic numbers are wrong. I previously had to tweak them heavily
in commit 1278b31
2024-08-06 16:43:47 +00:00
James Dorfman
249473e319
Merge 260ede1d99 into merged_master (Bitcoin PR bitcoin/bitcoin#24644 )
2024-08-02 20:43:21 +00:00
James Dorfman
91173e1408
Disables functional test tool_signet_miner.py, since signet mining is not needed in Elements.
...
Ideally, this new test (added in last commit) should work in Elements, but I couldn't get
it working. Please look into if you can get this test working. Perhaps we need to set
g_con_elementsmode to False, or something similar.
2024-07-30 17:31:59 +00:00
James Dorfman
de5fe0b74d
Merge cf0a8b9c48 into merged_master (Bitcoin PR bitcoin/bitcoin#24559 )
2024-07-30 15:23:21 +00:00
James Dorfman
b0c4300d1d
Merge 6c9460edae into merged_master (Bitcoin PR bitcoin/bitcoin#24358 )
2024-07-29 18:46:45 +00:00
James Dorfman
5896e751de
Merge f421de5be6 into merged_master (Bitcoin PR bitcoin/bitcoin#24236 )
2024-07-08 20:04:51 +00:00
Byron Hambly
4171939b58
test: add trim_headers functional test
...
(cherry picked from commit 630870f21d
2024-05-30 16:02:27 +02:00
James Dorfman
d5b8d28d07
Merge f4e5d704f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24118 )
2024-05-24 18:21:12 +00:00
