Byron Hambly
c99f0e4a16
Merge dd391944dc into merged_master (Bitcoin PR bitcoin/bitcoin#28863 )
2025-11-17 20:53:12 +02:00
Byron Hambly
a41762b512
Merge 4ad5c71adb into merged_master (Bitcoin PR bitcoin/bitcoin#28051 )
2025-11-17 16:50:25 +02:00
Byron Hambly
ace23d7b9b
Merge a97a89244e into merged_master (Bitcoin PR bitcoin/bitcoin#28368 )
2025-11-11 14:35:48 +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
d55f2b27cb
Merge dd5f5713bc into merged_master (Bitcoin PR bitcoin/bitcoin#28391 )
2025-11-06 11:13:40 +02:00
Byron Hambly
69492d27da
Merge 08ea835220 into merged_master (Bitcoin PR bitcoin/bitcoin#28583 )
2025-08-07 10:05:15 +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
0aec781a49
Merge 459272d639 into merged_master (Bitcoin PR bitcoin/bitcoin#26152 )
2025-08-01 09:39:10 +02:00
Byron Hambly
f95cdcb6d6
Merge 723f1c669f into merged_master (Bitcoin PR bitcoin/bitcoin#28218 )
2025-07-04 21:40:54 +02:00
Byron Hambly
27a302a296
Merge a62f5ee86c into merged_master (Bitcoin PR bitcoin/bitcoin#27675 )
2025-07-04 09:56:00 +02:00
Byron Hambly
5ee80641fe
Merge b565485c24 into merged_master (Bitcoin PR bitcoin/bitcoin#28186 )
2025-07-03 20:58:01 +02:00
Byron Hambly
e999ab6070
Merge caff95a023 into merged_master (Bitcoin PR bitcoin/bitcoin#27896 )
2025-06-28 11:08:01 +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
b1d470027d
Merge c2f2abd0a4 into merged_master (Bitcoin PR bitcoin/bitcoin#27125 )
2025-06-20 10:46:05 +02:00
Byron Hambly
cbd7b123d9
Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491 )
2025-06-19 16:08:36 +02:00
Byron Hambly
5ac82e15a9
Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419 )
2025-05-09 11:47:45 +02:00
Byron Hambly
e04de3e652
Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642 )
2025-04-11 22:28:06 +02:00
Byron Hambly
59a4dcb178
Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781 )
2025-04-10 09:10:09 +02:00
Byron Hambly
28ddb39e46
Merge 40d0b0a524 into merged_master (Bitcoin PR bitcoin/bitcoin#27239 )
2025-04-10 07:04:03 +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
5b2b315520
Merge 9a288430df into merged_master (Bitcoin PR bitcoin/bitcoin#26900 )
2025-04-04 14:21:48 +00:00
Tom Trevethan
147febdae3
Merge 65ecf24b5c into merged_master (Bitcoin PR bitcoin/bitcoin#26752 )
2025-04-01 13:25:03 +00:00
Byron Hambly
80b3fcae86
Merge 80fc1af096 into merged_master (Bitcoin PR bitcoin/bitcoin#26289 )
2025-04-01 09:10:14 +02: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
Tom Trevethan
387af571cd
Merge 1ff79292e3 into merged_master (Bitcoin PR bitcoin/bitcoin#26609 )
2025-03-24 23:33:59 +00:00
Byron Hambly
da8b6f2f7f
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786 )
2025-03-03 11:12:31 +02: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
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +02:00
Byron Hambly
f88268fb7c
Merge da23320998 into merged_master (Bitcoin PR bitcoin/bitcoin#25651 )
2024-10-24 14:21:48 +02:00
Byron Hambly
715350d30c
Merge 1eedde157f into merged_master (Bitcoin PR bitcoin/bitcoin#25638 )
2024-10-17 17:43:57 +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
f6f9f6b155
Merge 7ba0850c49 into merged_master (Bitcoin PR bitcoin/bitcoin#25036 )
2024-10-15 17:03:37 +00:00
James Dorfman
17851700b4
Merge e4e201dfd9 into merged_master (Bitcoin PR bitcoin/bitcoin#25290 )
2024-09-19 18:56:19 +00:00
James Dorfman
c6fee1dac3
Merge 38c63e3683 into merged_master (Bitcoin PR bitcoin/bitcoin#25338 )
2024-09-10 18:55:20 +00:00
James Dorfman
5c24574c48
Merge aac9c259b0 into merged_master (Bitcoin PR bitcoin/bitcoin#25065 )
2024-09-09 16:46:26 +00:00
James Dorfman
8667ac6db7
Merge 2642dee136 into merged_master (Bitcoin PR bitcoin/bitcoin#15936 )
2024-09-06 15:45:51 +00:00
James Dorfman
bfb0f5d1e1
Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064 )
2024-08-13 21:57:29 +00:00
James Dorfman
66bc45020f
Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168 )
2024-08-13 20:10:21 +00:00
James Dorfman
06a6044137
Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153 )
2024-08-13 06:00:38 +00:00
James Dorfman
d4aa6eba2f
Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909 )
2024-08-01 18:03:20 +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
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
ismaelsadeeq
8dec9c560b
wallet, mempool: propagete checkChainLimits error message to wallet
...
Update CheckPackageLimits to use util::Result to pass the error message
instead of out parameter.
Also update test to reflect the error message from `CTxMempool`
`CheckPackageLimits` output.
2023-12-17 21:13:44 +01:00
Ryan Ofsky
6db04be102
Get rid of shutdown.cpp/shutdown.h, use SignalInterrupt directly
...
This change is mostly a refectoring that removes some code and gets rid of an
unnecessary layer of indirection after #27861
But it is not a pure refactoring since StartShutdown, AbortShutdown, and
WaitForShutdown functions used to abort on failure, and the replacement code
logs or returns errors instead.
2023-12-04 15:39:15 -04:00
