Tom Trevethan
1244d0d5a3
Merge 6e21dedbf2 into merged_master (Bitcoin PR bitcoin/bitcoin#31130 )
2026-04-01 13:36:19 +01:00
ivanlele
b8f2ccaca4
Merge 0c2c3bb3f5 into merged_master (Bitcoin PR bitcoin/bitcoin#30955 )
2026-03-30 10:44:41 +00:00
ivanlele
96b8f1c3c3
Merge 5837e3463f into merged_master (Bitcoin PR bitcoin/bitcoin#30967 )
2026-03-30 10:15:21 +00:00
ivanlele
1f6c8b929f
Merge c33eb2360e into merged_master (Bitcoin PR bitcoin/bitcoin#30043 )
2026-03-27 11:35:17 +00:00
Tom Trevethan
5e863b61b0
Merge dabc74e86c into merged_master (Bitcoin PR bitcoin/bitcoin#30409 )
2026-03-26 22:46:45 +00:00
Tom Trevethan
9e99dcf8d8
Merge a8a2628b7a into merged_master (Bitcoin PR bitcoin/bitcoin
...
interfaces:#30828
#30697 )
2026-03-26 21:47:47 +00:00
ivanlele
0a8be8f942
Merge 3f66642820 into merged_master (Bitcoin PR bitcoin/bitcoin#30440 )
2026-03-26 10:43:00 +00:00
ivanlele
41f86ea365
Merge df3f63ccfa into merged_master (Bitcoin PR bitcoin/bitcoin#30509 )
2026-03-25 12:35:05 +00:00
ivanlele
ecab615ff5
Merge 27e89bc2f5 into merged_master (Bitcoin PR bitcoin/bitcoin#26619 )
2026-03-24 14:10:22 +00:00
Tom Trevethan
fc0ac93eb7
Merge 78567b052d into merged_master (Bitcoin PR bitcoin/bitcoin#30697 )
2026-03-15 23:55:38 +00:00
Tom Trevethan
af51da82d8
Merge e682e7db7e into merged_master (Bitcoin PR bitcoin-core/gui#824 )
2026-03-12 23:16:30 +00:00
Tom Trevethan
7115874fbe
Merge ec8b38c7b9 into merged_master (Bitcoin PR bitcoin/bitcoin#626 )
2026-03-11 00:30:35 +00:00
ivanlele
9cfa8d130d
Merge ef19a193fc into merged_master (Bitcoin PR bitcoin/bitcoin#30356 )
2026-03-09 14:55:47 +00:00
ikripaka
2b8357e439
Merge ff100bb549 into merged_master (Bitcoin PR bitcoin/bitcoin#825 )
2026-03-06 15:23:19 +00:00
ikripaka
f810342eeb
Merge 01dc38bd01 into merged_master (Bitcoin PR bitcoin/bitcoin#30406 )
2026-03-06 10:20:12 +00:00
ikripaka
916e3086b0
Merge 2f6dca4d1c into merged_master (Bitcoin PR bitcoin/bitcoin#30335 )
2026-03-03 11:17:26 +00:00
ikripaka
7f7a7c4e0c
Merge 323b0acfcb into merged_master (Bitcoin PR bitcoin/bitcoin#30200 )
2026-03-02 15:10:06 +00:00
ikripaka
006073614d
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015 )
2026-02-27 22:51:31 +00:00
ivanlele
0f50b83d1e
Merge a7129f827c into merged_master (Bitcoin PR bitcoin/bitcoin#24313 )
2026-02-18 14:19:06 +00:00
Byron Hambly
a264d5785d
Merge 143ace65db into merged_master (Bitcoin PR bitcoin/bitcoin#28890 )
2025-11-17 21:42:59 +02:00
Byron Hambly
c99f0e4a16
Merge dd391944dc into merged_master (Bitcoin PR bitcoin/bitcoin#28863 )
2025-11-17 20:53:12 +02:00
Byron Hambly
8cf8bd5564
Merge 108462139b into merged_master (Bitcoin PR bitcoin/bitcoin#28438 )
2025-11-10 13:45:17 +02:00
Byron Hambly
86ea3ebeac
Merge 29c2c90362 into merged_master (Bitcoin PR bitcoin/bitcoin#28721 )
2025-11-06 11:20:50 +02:00
Byron Hambly
7fc909ab98
Merge e7b0004b37 into merged_master (Bitcoin PR bitcoin/bitcoin#27596 )
...
ELEMENTS TODO assumeutxo for liquidv1
2025-08-06 14:33:15 +02:00
Byron Hambly
f0b077e7ce
Merge 1d4846a844 into merged_master (Bitcoin PR bitcoin-core/gui#738 )
2025-08-04 10:11:39 +02:00
Byron Hambly
0aec781a49
Merge 459272d639 into merged_master (Bitcoin PR bitcoin/bitcoin#26152 )
2025-08-01 09:39:10 +02:00
Byron Hambly
6c55760a2d
Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244 )
2025-07-04 17:24:18 +02:00
Byron Hambly
30814e6064
Merge c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708 )
2025-06-27 14:01:27 +02:00
Byron Hambly
3af56ffbe7
Merge 153a6882f4 into merged_master (Bitcoin PR bitcoin/bitcoin#27576 )
2025-06-27 13:00:41 +02:00
Byron Hambly
c590a01aff
Merge 10c4a4613f into merged_master (Bitcoin PR bitcoin/bitcoin#27469 )
2025-06-25 09:17:16 +02:00
Byron Hambly
0d6796ec53
Merge cae0608ad4 into merged_master (Bitcoin PR bitcoin/bitcoin#27217 )
2025-04-12 17:04:51 +02:00
Byron Hambly
e23e51f9ef
Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254 )
2025-04-12 12:19:09 +02:00
Byron Hambly
a429c96e07
Merge 1bcabe6f2a into merged_master (Bitcoin PR bitcoin-core/gui#697 )
2025-04-05 15:06:43 +02:00
Tom Trevethan
147febdae3
Merge 65ecf24b5c into merged_master (Bitcoin PR bitcoin/bitcoin#26752 )
2025-04-01 13:25:03 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Tom Trevethan
3f43afa4b9
Merge 7d51560003 into merged_master (Bitcoin PR bitcoin/bitcoin#26298 )
2025-03-25 12:09:21 +00: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
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +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
09c66ca532
Merge f5e96ecef5 into merged_master (Bitcoin PR bitcoin/bitcoin#25616 )
2024-11-01 13:00:25 +02:00
Byron Hambly
a4fa9c6ada
Merge 59bd6b6d37 into merged_master (Bitcoin PR bitcoin/bitcoin#24699 )
2024-10-29 14:19:22 +02:00
Byron Hambly
49d368ea6b
Merge 006740b6f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25721 )
2024-10-25 13:33:19 +02:00
Antoine Poinsot
a5fcfb7385
interfaces: remove now unused 'use_upnp' arg from 'mapPort'
2024-10-24 18:23:30 +02:00
Byron Hambly
2081703f71
Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494 )
2024-10-17 17:06:13 +02:00
Byron Hambly
b81762fcb2
Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997 )
2024-10-17 10:15:38 +02:00
James Dorfman
66071a5dbb
Merge 062b9db0cc into merged_master (Bitcoin PR bitcoin/bitcoin#25594 )
2024-10-16 06:40:24 +00:00
James Dorfman
e22bfb3011
Merge 316afb1eca into merged_master (Bitcoin PR bitcoin/bitcoin#25218 )
2024-10-16 04:56:53 +00:00
James Dorfman
f6f9f6b155
Merge 7ba0850c49 into merged_master (Bitcoin PR bitcoin/bitcoin#25036 )
2024-10-15 17:03:37 +00:00
James Dorfman
d72be3f6b9
Merge b9f9ed4640 into merged_master (Bitcoin PR bitcoin/bitcoin#25337 )
2024-10-13 18:07:54 +00:00
Ava Chow
0c2c3bb3f5
Merge bitcoin/bitcoin#30955 : Mining interface: getCoinbaseMerklePath() and submitSolution()
...
525e9dcba047b4875ef063d6ad7c89#30440 allows for a more efficient way for a miner to submit the block solution. Instead of having the send the full block, it only needs to provide the nonce, timestamp, version fields and coinbase transaction.
This PR introduces `submitSolution()` for that. It's currently unused.
#29432 and https://github.com/Sjors/bitcoin/pull/48 use it to process the Stratum v2 message [SubmitSolution](https://github.com/stratum-mining/sv2-spec/blob/main/07-Template-Distribution-Protocol.md#77-submitsolution-client---server ). The method should be sufficiently generic to work with alternative mining protocols (none exist that I'm aware off).
This PR also introduces `getCoinbaseMerklePath()`, which is needed in Stratum v2 to construct the `merkle_path` field of the `NewTemplate` message (see [spec](https://github.com/stratum-mining/sv2-spec/blob/main/07-Template-Distribution-Protocol.md#72-newtemplate-server---client )). The coinbase merkle path is also used in Stratum "v1", see e.g. https://bitcoin.stackexchange.com/questions/109820/questions-on-merkle-root-hashing-for-stratum-pools
This last function uses `BlockMerkleBranch` which was moved to the test code in #13191 . The reason back then for moving it was that it was no longer used. This PR moves it back.
This PR does not change behaviour since both methods are unused.
ACKs for top commit:
achow101:
ACK 525e9dcba0525e9dcba0525e9dcba0525e9dcba0
2024-10-09 20:20:09 -04:00
