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
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
James Dorfman
8667ac6db7
Merge 2642dee136 into merged_master (Bitcoin PR bitcoin/bitcoin#15936 )
2024-09-06 15:45:51 +00:00
Sjors Provoost
6b4c817d4b
refactor: pass BlockCreateOptions to createNewBlock
...
Rather than pass options individually to createNewBlock and then
combining them into BlockAssembler::Options, this commit introduces
BlockCreateOptions and passes that instead.
Currently there's only one option (use_mempool) but the next
commit adds more.
Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
2024-07-16 10:27:57 +02:00
Hennadii Stepanov
ff100bb549
Merge bitcoin-core/gui#825 : Show maximum mempool size in information window
...
4a028cf54c gui: show maximum mempool size in information window (Sebastian Falbesoner)
bbde6ffefe add node interface method for getting maximum mempool size (Sebastian Falbesoner)
Pull request description:
This PR adds the maximum mempool size to the information window (Menu "Window" -> "Information" -> section "Memory Pool" -> line "Memory usage").
master:

PR:

ACKs for top commit:
MarnixCroes:
tested ACK 4a028cf54c
pablomartin4btc:
tACK 4a028cf54c
luke-jr:
tACK 4a028cf54c & in Knots
hebasto:
ACK 4a028cf54c , tested on Ubuntu 24.04.
Tree-SHA512: c10fb23605d060cea19a86d11822fc4d12496b19547870052aace503670e62e4c4e19ae4c2c4fbf7420a472adb071c9ddebe82447e0cfbce5a6fb9fcd7b9eda3
2024-07-14 13:07:44 +01:00
MarcoFalke
3333bae9b2
tidy: modernize-use-equals-default
2024-07-08 11:12:01 +02:00
Sjors Provoost
a74b0f93ef
Have testBlockValidity hold cs_main instead of caller
...
The goal of interfaces is to eventually run in their own process,
so we can't use EXCLUSIVE_LOCKS_REQUIRED in their declaration.
However TestBlockValidaty will crash (in its call to ConnectBlock)
if the tip changes from under the proposed block.
Have the testBlockValidity implementation hold the lock instead,
and non-fatally check for this condition.
2024-06-27 08:58:25 +02:00
Sjors Provoost
75ce7637ad
refactor: testBlockValidity make out argument last
2024-06-26 12:24:48 +02:00
Sjors Provoost
83a9bef0e2
Add missing include for mining interface
...
Needed for std::unique_ptr
2024-06-26 12:24:47 +02:00
Sebastian Falbesoner
bbde6ffefe
add node interface method for getting maximum mempool size
2024-06-20 17:43:37 +02:00
Sjors Provoost
a9716c53f0
rpc: call IsInitialBlockDownload via miner interface
2024-06-18 21:07:51 +02:00
Sjors Provoost
dda0b0834f
rpc: minize getTipHash() calls in gbt
...
Set tip at the start of the function and only update it for a long poll.
Additionally have getTipHash return an optional, so the
caller can explicitly check that a tip exists.
2024-06-18 18:47:52 +02:00
Sjors Provoost
7b4d3249ce
rpc: call processNewBlock via miner interface
2024-06-18 18:47:52 +02:00
Sjors Provoost
9e228351e7
rpc: getTransactionsUpdated via miner interface
2024-06-18 18:47:52 +02:00
Sjors Provoost
4bf2e361da
rpc: call CreateNewBlock via miner interface
2024-06-18 18:47:51 +02:00
Sjors Provoost
404b01c436
rpc: getblocktemplate getTipHash() via Miner interface
2024-06-18 18:47:51 +02:00