James Dorfman
46162b40bd
Merge 333a41882c into merged_master (Bitcoin PR bitcoin/bitcoin#24172 )
2024-07-30 17:50:20 +00:00
James Dorfman
341f5c222c
Merge 7da4f65a00 into merged_master (Bitcoin PR bitcoin/bitcoin#24818 )
2024-07-30 17:41:16 +00:00
James Dorfman
73346e81f8
Merge e14f0fa6a3 into merged_master (Bitcoin PR bitcoin/bitcoin#19952 )
2024-07-30 17:32:03 +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
de36637d9c
Merge b69fd5eaa9 into merged_master (Bitcoin PR bitcoin/bitcoin#22052 )
2024-07-30 06:40:58 +00:00
James Dorfman
5b1a4e1dd3
Merge 1e3ed01faa into merged_master (Bitcoin PR bitcoin/bitcoin#23416 )
2024-07-30 06:40:35 +00:00
James Dorfman
1bc6917a7a
Merge 6c9bc14a3f into merged_master (Bitcoin PR bitcoin/bitcoin#24842 )
2024-07-30 06:29:12 +00:00
James Dorfman
48c8ab569b
Merge 8e3c266a4f into merged_master (Bitcoin PR bitcoin/bitcoin#24077 )
2024-07-30 06:06:22 +00:00
James Dorfman
098585cb1c
Merge decde9bba6 into merged_master (Bitcoin PR bitcoin/bitcoin#24355 )
2024-07-30 05:44:26 +00:00
James Dorfman
ff18798461
Merge 9b7eb584ad into merged_master (Bitcoin PR bitcoin/bitcoin#24285 )
2024-07-30 05:35:32 +00:00
James Dorfman
1fda45d8e8
Merge 3bbc46ddaf into merged_master (Bitcoin PR bitcoin/bitcoin#24632 )
2024-07-30 05:26:33 +00:00
James Dorfman
1f0a4760ba
Merge f60a63cc5f into merged_master (Bitcoin PR bitcoin-core/gui#577 )
2024-07-30 05:17:21 +00:00
James Dorfman
8c5d4d132d
Merge f509760026 into merged_master (Bitcoin PR bitcoin-core/gui#576 )
2024-07-30 05:08:10 +00:00
James Dorfman
696422b3b7
Merge 0f46e73c74 into merged_master (Bitcoin PR bitcoin-core/gui#543 )
2024-07-30 04:57:11 +00:00
James Dorfman
84413436a5
Merge 2b5a741e98 into merged_master (Bitcoin PR bitcoin/bitcoin#24826 )
2024-07-30 04:56:45 +00:00
James Dorfman
5a24a3c13f
Merge 7626e547b8 into merged_master (Bitcoin PR bitcoin/bitcoin#24337 )
2024-07-30 04:47:52 +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
d3eb9580ec
Fix bug introduced in merge of bitcoin/bitcoin#24152 in d844b5e799
2024-07-30 04:06:48 +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
21bc5cd263
Merge 747cdf1d65 into merged_master (Bitcoin PR bitcoin/bitcoin#24792 )
...
This is an empty commit. Ignored all secp256k1 changes, since the
corresponding changes in secp256k1-zkp for elements get merged
separately.
2024-07-30 03:32:02 +00:00
James Dorfman
df428b0489
Merge 87c7dcc60d into merged_master (Bitcoin PR bitcoin/bitcoin#24808 )
2024-07-30 03:09:29 +00:00
James Dorfman
f62a9f1386
Merge e0680bbce8 into merged_master (Bitcoin PR bitcoin/bitcoin#24806 )
2024-07-30 02:59:41 +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
e17aba0c07
Merge 38d3d0bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#24796 )
2024-07-30 01:52:26 +00:00
James Dorfman
381c18e20a
Merge 323d4c09c0 into merged_master (Bitcoin PR bitcoin/bitcoin#24784 )
2024-07-30 01:43:18 +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
cc18b00783
Merge d844b5e799 into merged_master (Bitcoin PR bitcoin/bitcoin#24152 )
2024-07-29 22:42:33 +00:00
James Dorfman
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +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
9663c4ed6a
Merge c02a3dabe2 into merged_master (Bitcoin PR bitcoin/bitcoin#24779 )
2024-07-29 19:24:33 +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
5499524906
Merge d906329c28 into merged_master (Bitcoin PR bitcoin/bitcoin#24681 )
2024-07-29 19:05:12 +00:00
James Dorfman
76db49f822
Merge bbb83f0b2b into merged_master (Bitcoin PR bitcoin/bitcoin#24145 )
2024-07-29 18:55:35 +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
cf879985b9
Merge b307279924 into merged_master (Bitcoin PR bitcoin/bitcoin#24552 )
2024-07-29 18:35:27 +00:00
James Dorfman
4846fad979
Merge 696d39410f into merged_master (Bitcoin PR bitcoin/bitcoin#24669 )
2024-07-29 18:26:09 +00:00
James Dorfman
847807539e
Merge c5c4fb3182 into merged_master (Bitcoin PR bitcoin/bitcoin#24758 )
2024-07-29 16:46:56 +00:00
James Dorfman
e169d13984
Merge f3e3563369 into merged_master (Bitcoin PR bitcoin/bitcoin#24652 )
2024-07-29 16:28:15 +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
81d22754ea
Add more missing includes to fix gcc-13 compile errors
2024-07-29 05:29:05 +00:00
MarcoFalke
9f38620872
Add missing includes to fix gcc-13 compile error
2024-07-29 05:28:36 +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
b4d7a023e5
Merge 15220ec903 into merged_master (Bitcoin PR bitcoin/bitcoin#24775 )
2024-07-08 20:49:44 +00:00
James Dorfman
0c4e15c4fd
Merge 9ce1c506a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24216 )
2024-07-08 20:40:13 +00:00
