Byron Hambly
5ac82e15a9
Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419 )
2025-05-09 11:47:45 +02:00
Byron Hambly
59a4dcb178
Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781 )
2025-04-10 09:10:09 +02:00
Tom Trevethan
e09c9ea798
Merge 832fa2d238 into merged_master (Bitcoin PR bitcoin/bitcoin#25574 )
2025-04-08 17:05:26 +00:00
Byron Hambly
9d216df88a
Merge 9321df4487 into merged_master (Bitcoin PR bitcoin/bitcoin#25862 )
2025-04-07 09:44:14 +02:00
Tom Trevethan
5b2b315520
Merge 9a288430df into merged_master (Bitcoin PR bitcoin/bitcoin#26900 )
2025-04-04 14:21:48 +00:00
Byron Hambly
bb18aed1c1
Merge 2f6a8e5e02 into merged_master (Bitcoin PR bitcoin/bitcoin#26695 )
2025-04-01 21:37:29 +02:00
Byron Hambly
feb8f8cf2b
Merge 9887fc7898 into merged_master (Bitcoin PR bitcoin/bitcoin#26758 )
2025-04-01 21:20:49 +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
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
b83abdf89a
Merge UP TO e42ba134f4 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26448 )
...
1667577042 2022-11-04T16:50:42+01:00 e42ba134f4 Bitcoin Merge bitcoin/bitcoin#26448 : test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055bef Bitcoin Merge bitcoin/bitcoin#26443 : doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596a Bitcoin Merge bitcoin/bitcoin#26445 : .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984db Bitcoin Merge bitcoin/bitcoin#25248 : refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437 Bitcoin Merge bitcoin/bitcoin#26417 : test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ec Bitcoin Merge bitcoin/bitcoin#26396 : net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990 Bitcoin Merge bitcoin/bitcoin#26437 : test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1d Bitcoin Merge bitcoin/bitcoin#25548 : gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9 Bitcoin Merge bitcoin/bitcoin#26360 : build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24 Bitcoin Merge bitcoin/bitcoin#26294 : build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0 Bitcoin Merge bitcoin/bitcoin#26373 : Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2 Bitcoin Merge bitcoin/bitcoin#26387 : p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981 Bitcoin Merge bitcoin/bitcoin#24051 : Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808 Bitcoin Merge bitcoin/bitcoin#26402 : doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11 Bitcoin Merge bitcoin/bitcoin#26424 : doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63 Bitcoin Merge bitcoin/bitcoin#26404 : test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589b Bitcoin Merge bitcoin/bitcoin#26408 : test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1 Bitcoin Merge bitcoin/bitcoin#26409 : refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02 Bitcoin Merge bitcoin/bitcoin#26377 : test: Make `system_tests/run_command` test locale and platform agnostic
2025-02-27 13:40:17 +02:00
Byron Hambly
13c2a2b766
chainstatemanager: fix warnings of missing fields in initialization
2025-02-17 15:27:34 +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
b80b3aeff4
Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513 )
2024-11-26 14:42:49 +02:00
Byron Hambly
dad57e3dbf
Merge 7281fac2e0 into merged_master (Bitcoin PR bitcoin/bitcoin#25614 )
2024-11-26 11:22:35 +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
79d275ea14
Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527 )
2024-10-25 11:03:47 +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
d71cdde1aa
Merge 0897b189e4 into merged_master (Bitcoin PR bitcoin/bitcoin#25308 )
2024-10-17 17:25:50 +02:00
James Dorfman
261587da79
Merge 02ede4f1fd into merged_master (Bitcoin PR bitcoin/bitcoin#25607 )
2024-10-16 06:40:29 +00:00
James Dorfman
bf5189aa76
Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472 )
2024-10-16 05:44:43 +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
616633ec35
Merge a7a36590f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25223 )
2024-09-10 19:59:14 +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
ef7aeb3e50
Merge a100c42a13 into merged_master (Bitcoin PR bitcoin/bitcoin#24927 )
2024-09-09 06:01:09 +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
5854eae590
Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595 )
2024-08-12 02:29:42 +00:00
James Dorfman
628a1506e1
Merge b51e60f914 into merged_master (Bitcoin PR bitcoin/bitcoin#22564 )
2024-08-06 19:02:09 +00:00
James Dorfman
7ad79475b5
Merge 505ba39665 into merged_master (Bitcoin PR bitcoin/bitcoin#22910 )
2024-08-01 21:06:05 +00:00
James Dorfman
f0f70cefd8
Merge 6be319beb8 into merged_master (Bitcoin PR bitcoin/bitcoin#24841 )
2024-08-01 00:41:04 +00:00
Byron Hambly
47abcf869f
Merge cba41db327 into merged_master (Bitcoin PR bitcoin/bitcoin#24299 )
2023-10-13 10:36:29 +00:00
Byron Hambly
d87b47ba1f
Merge d0bf9bb6a5 into merged_master (Bitcoin PR bitcoin/bitcoin#23373 )
2023-06-20 11:37:17 +00:00
Byron Hambly
7878ba47b9
Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497 )
2023-06-19 09:28:31 +00:00
Byron Hambly
a14e05aac7
Merge 3917dff732 into merged_master (Bitcoin PR bitcoin/bitcoin#23855 )
2023-06-15 11:07:17 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
22661115b9
Merge f5c678e5c3 into merged_master (Bitcoin PR bitcoin/bitcoin#23736 )
2023-06-14 06:18:12 +00:00
James Dorfman
67a5234365
Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280 )
2023-06-12 17:58:49 +00:00
Byron Hambly
77acfd01b8
Merge 205877e55f into merged_master (Bitcoin PR bitcoin/bitcoin#23546 )
2023-06-01 08:23:12 +00:00
Byron Hambly
32a72637f7
Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517 )
2023-05-31 09:33:07 +00:00
Byron Hambly
2da8f66309
Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173 )
2023-05-24 11:45:57 +00:00
Byron Hambly
2b8eef42dd
Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937 )
2023-05-11 12:38:50 +00:00
Byron Hambly
9b7c9154fe
Merge c4fc899442 into merged_master (Bitcoin PR bitcoin/bitcoin#22950 )
2023-05-09 12:21:13 +00:00
Byron Hambly
7856df2733
test: elements fixes for Bitcoin PR bitcoin/bitcoin#22818
2023-04-24 08:30:36 +00:00
Byron Hambly
13fb374543
Merge 8e9801bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#22818 )
2023-04-24 07:13:42 +00:00
Byron Hambly
070c52dcef
Merge b7e3600815 into merged_master (Bitcoin PR bitcoin/bitcoin#21526 )
2023-04-23 10:59:59 +00:00
Byron Hambly
8d6c4da78c
Merge 528e08119f into merged_master (Bitcoin PR bitcoin/bitcoin#22219 )
2023-04-21 09:23:54 +00:00
James Dorfman
0627d9aacb
Merge a8fdfea77b into merged_master (Bitcoin PR bitcoin/bitcoin#22791 )
2023-04-20 22:19:30 +00:00
TheCharlatan
be55f545d5
move-only: Extract common/args and common/config.cpp from util/system
...
This is an extraction of ArgsManager related functions from util/system
into their own common file.
Config file related functions are moved to common/config.cpp.
The background of this commit is an ongoing effort to decouple the
libbitcoinkernel library from the ArgsManager. The ArgsManager belongs
into the common library, since the kernel library should not depend on
it. See doc/design/libraries.md for more information on this rationale.
2023-04-19 10:48:30 +02:00