James Dorfman
b4bb11c719
Merge 1e7db37e76 into merged_master (Bitcoin PR bitcoin/bitcoin#24856 )
2024-08-01 23:50:54 +00:00
James Dorfman
25c8789d36
Merge 16fa967d3c into merged_master (Bitcoin PR bitcoin/bitcoin#24915 )
2024-08-01 23:50:40 +00:00
James Dorfman
44fd2a99f8
Merge 9eedbe98c8 into merged_master (Bitcoin PR bitcoin/bitcoin#24815 )
2024-08-01 23:50:18 +00:00
James Dorfman
8151d20bd7
Merge 0342ae1d39 into merged_master (Bitcoin PR bitcoin/bitcoin#24802 )
2024-08-01 23:50:15 +00:00
James Dorfman
787ae77a13
Merge 777b89b300 into merged_master (Bitcoin PR bitcoin/bitcoin#24929 )
2024-08-01 23:50:12 +00:00
James Dorfman
00c9603a5b
Merge 8b686776ef into merged_master (Bitcoin PR bitcoin/bitcoin#24902 )
2024-08-01 23:50:06 +00:00
James Dorfman
8a70ad8e8a
Merge c90b42bcdb into merged_master (Bitcoin PR bitcoin/bitcoin#24916 )
2024-08-01 23:50:02 +00:00
James Dorfman
62cca3c61b
Merge 7134327be5 into merged_master (Bitcoin PR bitcoin/bitcoin#24932 )
2024-08-01 23:49:34 +00:00
James Dorfman
6ca494eded
Merge aa54132bac into merged_master (Bitcoin PR bitcoin/bitcoin#24454 )
2024-08-01 23:29:18 +00:00
James Dorfman
1af96cd932
Merge b1c5991eeb into merged_master (Bitcoin PR bitcoin/bitcoin#24812 )
2024-08-01 21:46:36 +00:00
James Dorfman
8733f8df12
Merge 7a4ac713aa into merged_master (Bitcoin PR bitcoin/bitcoin#24936 )
2024-08-01 20:56:46 +00:00
James Dorfman
44db25e24a
Merge 2513499348 into merged_master (Bitcoin PR bitcoin/bitcoin#24803 )
2024-08-01 20:29:52 +00:00
James Dorfman
914f571c09
Merge 346e780442 into merged_master (Bitcoin PR bitcoin/bitcoin#24918 )
2024-08-01 18:25:58 +00:00
James Dorfman
f12786df12
Merge fc99f8c09e into merged_master (Bitcoin PR bitcoin/bitcoin#24895 )
2024-08-01 17:10:21 +00:00
James Dorfman
2c58f992c5
Merge 8d3743a365 into merged_master (Bitcoin PR bitcoin/bitcoin#24896 )
2024-08-01 15:58:52 +00:00
James Dorfman
5585b749b6
Merge 013daed9ac into merged_master (Bitcoin PR bitcoin/bitcoin#24919 )
2024-08-01 06:17:00 +00:00
James Dorfman
e8ba951dbc
Merge 57a73d71a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24794 )
2024-08-01 06:06:21 +00:00
James Dorfman
2dbf842435
Merge 5fdf37e14b into merged_master (Bitcoin PR bitcoin/bitcoin#24853 )
...
This commit removed a bash script and added in a Python version of the same script.
There did not appear to be anything elements-related in the script, but for some
reason git marked it as a merge conflict. Please verify that the removed / rewritten
script had no elements-specific changes.
2024-08-01 06:04:25 +00:00
James Dorfman
13315e3cdd
Merge 3059d4dd72 into merged_master (Bitcoin PR bitcoin/bitcoin#24844 )
2024-08-01 01:29:16 +00:00
James Dorfman
530c5ea7e6
Merge 2095f19db9 into merged_master (Bitcoin PR bitcoin/bitcoin#24859 )
2024-08-01 01:18:15 +00:00
James Dorfman
28023d45b1
Merge d1b3dfb275 into merged_master (Bitcoin PR bitcoin/bitcoin#24855 )
2024-08-01 00:50:18 +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
da14cb0b26
Merge d0f7493b6c into merged_master (Bitcoin PR bitcoin/bitcoin#24849 )
2024-07-30 15:14:02 +00:00
James Dorfman
de364241b4
Merge 22e3b6f4d5 into merged_master (Bitcoin PR bitcoin/bitcoin#24800 )
...
git claimed we had some differences in the Elements version of
test/lint/lint-python-mutable-default-parameters.sh which did not
exist in the bitcoin version, so it marked a conflict for me when
bitcoin deleted the file. However, I don't see anything elements-specific.
Please review this file and confirm that there is nothing elements-specific
which needs to go into the new python version of the file introduced
in this commit, named test/lint/lint-python-mutable-default-parameters.py.
2024-07-30 04:36:37 +00:00
James Dorfman
a0419d9629
Merge cd110cdd0e into merged_master (Bitcoin PR bitcoin/bitcoin#24817 )
2024-07-30 04:25:47 +00:00
James Dorfman
e97784928b
Merge 4a58b6acd2 into merged_master (Bitcoin PR bitcoin/bitcoin#24797 )
2024-07-30 03:33:05 +00:00
James Dorfman
3ef748701c
Merge c1059c9fef into merged_master (Bitcoin PR bitcoin/bitcoin#24770 )
2024-07-30 02:08:55 +00:00
James Dorfman
59f0445908
Merge 5c80d9b72d into merged_master (Bitcoin PR bitcoin/bitcoin#24790 )
2024-07-30 01:34:25 +00:00
James Dorfman
7c295551a5
Merge ce33194ea0 into merged_master (Bitcoin PR bitcoin/bitcoin#24785 )
2024-07-29 19:33:48 +00:00
James Dorfman
41e72be6e1
Merge 10f629e644 into merged_master (Bitcoin PR bitcoin/bitcoin#24576 )
2024-07-29 19:15:06 +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
c40923460a
Fix test/functional/mining_basic which broke in merge of bitcoin/bitcoin#24753 in 372f1a3c25.
...
Please review the last merge (not this commit) carefully. The bitcoin merge of bitcoin/bitcoin#24753
did not lead to any changes in the mining_basic functional test, so it's possible I made a mistake
which caused this test to be affected.
2024-07-29 15:23:45 +00:00
James Dorfman
1278b31bc7
Merge 372f1a3c25 into merged_master (Bitcoin PR bitcoin/bitcoin#24753 )
...
Please review this very very carefully. I don't think this is correct, but I wanted to move on with the merges.
Let's fix this.
2024-07-26 06:16:39 +00:00
James Dorfman
18d0ebdd77
Merge 27cfaeed1e into merged_master (Bitcoin PR bitcoin/bitcoin#24098 )
2024-07-09 02:27:59 +00:00
James Dorfman
7381c88222
Merge 70c522004f into merged_master (Bitcoin PR bitcoin/bitcoin#24766 )
2024-07-08 21:07:26 +00:00
James Dorfman
b48e393d7a
Merge d3ff02688a into merged_master (Bitcoin PR bitcoin/bitcoin#24778 )
2024-07-08 20:58:33 +00:00
James Dorfman
5896e751de
Merge f421de5be6 into merged_master (Bitcoin PR bitcoin/bitcoin#24236 )
2024-07-08 20:04:51 +00:00
James Dorfman
cc29129ebc
Merge ee9af95f09 into merged_master (Bitcoin PR bitcoin/bitcoin#24749 )
2024-07-08 19:55:31 +00:00
James Dorfman
c0a8b9dbf6
Merge 4262100b8c into merged_master (Bitcoin PR bitcoin/bitcoin#24762 )
2024-07-08 16:37:00 +00:00
James Dorfman
6c04279f86
Merge c8ac7e6a65 into merged_master (Bitcoin PR bitcoin/bitcoin#24698 )
2024-07-08 06:22:34 +00:00
James Dorfman
11fbfcc25c
Merge e1e6a3386f into merged_master (Bitcoin PR bitcoin/bitcoin#24707 )
2024-07-08 06:22:24 +00:00
James Dorfman
22ccf93f29
Adapt sendall RPC to work properly in elements.
...
This fixes errors introduced in the merge of bitcoin/bitcoin#24118 in d5b8d28d07
2024-06-21 20:19:03 +00:00
James Dorfman
d5b8d28d07
Merge f4e5d704f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24118 )
2024-05-24 18:21:12 +00:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
James Dorfman
d1b8d682f2
Merge 7ff33d45df into merged_master (Elements PR #1330 )
2024-05-24 16:13:43 +00:00
James Dorfman
51ce17b418
Merge 1b65d4d37b into merged_master (Elements PR #1284 )
2024-05-24 07:10:54 +00:00
James Dorfman
77b849f4c6
Merge 20c5630f8c into merged_master (Elements PR #1277 )
2024-05-24 06:39:06 +00:00
James Dorfman
26a2a9702e
Merge c248983aab into merged_master (Elements PR #1276 )
2024-05-24 05:46:29 +00:00
James Dorfman
44228c4194
Merge e14d987438 into merged_master (Elements PR #1275 )
2024-05-24 05:37:54 +00:00
