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
James Dorfman
404eee671f
Merge fe66dad8a7 into merged_master (Bitcoin PR bitcoin/bitcoin#24710 )
2024-07-08 20:21:29 +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
94e058d3b7
Merge d492dc1cda into merged_master (Bitcoin PR bitcoin/bitcoin#24147 )
2024-07-08 17:49:09 +00:00
James Dorfman
3233c08a3c
Merge 0baf6aded5 into merged_master (Bitcoin PR bitcoin/bitcoin#24391 )
2024-07-08 17:17:18 +00:00
James Dorfman
f41df85f0e
Merge 44e7d6d6dd into merged_master (Bitcoin PR bitcoin/bitcoin#24754 )
2024-07-08 16:57:09 +00:00
James Dorfman
5e757d2d2c
Merge 24c6b20c14 into merged_master (Bitcoin PR bitcoin/bitcoin#24583 )
2024-07-08 16:45:55 +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
7bc62ad48b
Merge 47bac475f0 into merged_master (Bitcoin PR bitcoin-core/gui#569 )
2024-07-08 16:28:05 +00:00
James Dorfman
d773d8e15f
Merge 4faf7a1d86 into merged_master (Bitcoin PR bitcoin/bitcoin#24729 )
2024-07-08 16:04:21 +00:00
James Dorfman
787d80ad02
Merge 6348bc61b5 into merged_master (Bitcoin PR bitcoin/bitcoin#24746 )
2024-07-08 15:55:23 +00:00
James Dorfman
384747805b
Merge 67dc002aae into merged_master (Bitcoin PR bitcoin/bitcoin#24735 )
2024-07-08 15:46:34 +00:00
James Dorfman
905b65caf0
Merge 83b26cb97c into merged_master (Bitcoin PR bitcoin/bitcoin#24736 )
2024-07-08 15:37:38 +00:00
James Dorfman
fd72f4863c
Merge 52f0f7a1bb into merged_master (Bitcoin PR bitcoin/bitcoin#24668 )
2024-07-08 15:28:11 +00:00
James Dorfman
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
bbc825e0f6
Merge 62efdfb3be into merged_master (Bitcoin PR bitcoin/bitcoin#24558 )
2024-07-08 08:43:05 +00:00
James Dorfman
cfba870d20
Merge 31b1c67cf6 into merged_master (Bitcoin PR bitcoin-core/gui#557 )
2024-07-08 08:29:54 +00:00
James Dorfman
e5a7a645d6
Merge 55ea6fd250 into merged_master (Bitcoin PR bitcoin/bitcoin#24738 )
2024-07-08 08:21:05 +00:00
James Dorfman
0e93345e41
Merge d018db966a into merged_master (Bitcoin PR bitcoin/bitcoin#24740 )
2024-07-08 08:12:12 +00:00
James Dorfman
792b17f5c2
Merge 03251b6b93 into merged_master (Bitcoin PR bitcoin/bitcoin#24594 )
2024-07-08 08:03:03 +00:00
