Commit graph

356 commits

Author SHA1 Message Date
Byron Hambly
69492d27da
Merge 08ea835220 into merged_master (Bitcoin PR bitcoin/bitcoin#28583) 2025-08-07 10:05:15 +02:00
Byron Hambly
189ca0ae5a
Merge 52c6904c78 into merged_master (Bitcoin PR bitcoin/bitcoin#28558) 2025-08-06 15:28:22 +02:00
Byron Hambly
61847fc900 Merge 1e9d367d0d into merged_master (Bitcoin PR bitcoin/bitcoin#28423) 2025-07-21 14:48:23 +02:00
Byron Hambly
bef3aeb383 Merge ecab855838 into merged_master (Bitcoin PR bitcoin/bitcoin#28195) 2025-07-07 09:45:43 +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
aacc36f977 Merge c97270d722 into merged_master (Bitcoin PR bitcoin/bitcoin#27499) 2025-07-03 09:45:27 +02:00
Byron Hambly
4fd04eb7d7 Merge 24d5cf9314 into merged_master (Bitcoin PR bitcoin/bitcoin#27425) 2025-07-01 13:43:46 +02:00
Byron Hambly
f61ec91393 Merge ef29d5d7e2 into merged_master (Bitcoin PR bitcoin/bitcoin#27607) 2025-07-01 11:32:01 +02:00
Byron Hambly
a8a9ae2ae1 Merge 75135c673e into merged_master (Bitcoin PR bitcoin/bitcoin#27861) 2025-07-01 10:39:46 +02:00
Byron Hambly
68031c5f6e Merge f80db62b2d into merged_master (Bitcoin PR bitcoin/bitcoin#27622) 2025-06-27 14:54:38 +02:00
Byron Hambly
edc585d157 Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636) 2025-06-25 11:40:46 +02:00
Byron Hambly
73663a4c89 Merge 4e8a7654f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25193) 2025-06-20 16:01:14 +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
9c9439cef9 Merge 322ec63b01 into merged_master (Bitcoin PR bitcoin/bitcoin#17860) 2025-05-16 11:01:25 +02:00
Byron Hambly
e22e1b9509 Merge ccd4db7d62 into merged_master (Bitcoin PR bitcoin/bitcoin#27570) 2025-05-16 10:32:57 +02:00
Byron Hambly
7f83d8d9fe Merge bdfe27c9d2 into merged_master (Bitcoin PR bitcoin/bitcoin#26933) 2025-05-14 14:04:27 +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
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