Commit graph

3164 commits

Author SHA1 Message Date
Tom Trevethan
0fa67e0cb9 Merge 296e882250 into merged_master (Bitcoin PR bitcoin/bitcoin#26598) 2025-04-01 15:13:59 +00:00
Tom Trevethan
8a132ad63c Merge 2ec97825e7 into merged_master (Bitcoin PR bitcoin/bitcoin#26771) 2025-04-01 10:09:32 +00:00
Byron Hambly
1b7e6dda13 Merge f3bc1a7282 into merged_master (Bitcoin PR bitcoin/bitcoin#26265) 2025-03-31 16:29:50 +02:00
Byron Hambly
cb8fe45c9f Merge 7386da7a0b into merged_master (Bitcoin PR bitcoin/bitcoin#26709) 2025-03-31 09:11:29 +02:00
Byron Hambly
72ece14fe6 Merge 03708dac0a into merged_master (Bitcoin PR bitcoin/bitcoin#26704) 2025-03-31 09:09:01 +02:00
Tom Trevethan
be69eb05cb Merge a4baf3f177 into merged_master (Bitcoin PR bitcoin/bitcoin#26628) 2025-03-27 09:46:31 +00:00
Tom Trevethan
5baaf035fa Merge 3b5fb6e77a into merged_master (Bitcoin PR bitcoin/bitcoin#26213) 2025-03-26 12:30:53 +00:00
Tom Trevethan
69157e67bf Merge a653f4bb1f into merged_master (Bitcoin PR bitcoin/bitcoin#25934) 2025-03-25 14:14:08 +00:00
Tom Trevethan
c00c7ed977 Merge 0abb5b2dd6 into merged_master (Bitcoin PR bitcoin/bitcoin#26648) 2025-03-24 23:35:25 +00:00
Byron Hambly
f60df3b742 Merge 71abee86db into merged_master (Bitcoin PR bitcoin/bitcoin#25993) 2025-03-04 13:22:14 +02:00
Byron Hambly
b735ecc00d Merge a63192afb8 into merged_master (Bitcoin PR bitcoin/bitcoin#19762) 2025-03-04 10:44:34 +02:00
Byron Hambly
fd4160ae71
Merge b3c76ab757 into merged_master (Bitcoin PR bitcoin/bitcoin#26524) 2025-03-03 09:49:16 +02:00
Byron Hambly
d97db2851f
Merge f0c646f026 into merged_master (Bitcoin PR bitcoin/bitcoin#25730) 2025-02-28 14:25:06 +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
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
b29ae90f29 Merge 27351fb915 into merged_master (Bitcoin PR bitcoin/bitcoin#26093) 2024-11-27 10:46:37 +02:00
Byron Hambly
89296b2c3f Merge c67d6f5b5f into merged_master (Bitcoin PR bitcoin/bitcoin#26079) 2024-11-26 15:33:48 +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
e1e241d410 Merge 7921026a24 into merged_master (Bitcoin PR bitcoin/bitcoin#19602)
FIXME for test_other_watchonly in the new wallet migration test
2024-11-26 11:21:27 +02:00
Byron Hambly
77f3ebc498 Merge eed2bd37ef into merged_master (Bitcoin PR bitcoin/bitcoin#25355) 2024-11-22 09:39:18 +02:00
Byron Hambly
6e2b008ba2 Merge ba2edcae73 into merged_master (Bitcoin PR bitcoin/bitcoin#25925) 2024-11-22 09:27:20 +02:00
Byron Hambly
7a022fb75d Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775) 2024-11-04 15:04:48 +02:00
Byron Hambly
fe1dbdc225 Merge e5a83141fa into merged_master (Bitcoin PR bitcoin/bitcoin#25883) 2024-11-04 12:49:24 +02:00
Byron Hambly
d6e6f35037 Merge c336f813b3 into merged_master (Bitcoin PR bitcoin/bitcoin#25504) 2024-11-02 17:28:21 +02:00
Byron Hambly
85cd9e605d Merge ac59112a6a into merged_master (Bitcoin PR bitcoin/bitcoin#23480) 2024-10-30 09:49:14 +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
641fbe39e8 Merge c5ba1d92b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25610) 2024-10-24 13:55:08 +02:00
Byron Hambly
8669e19b82 Merge b3c7c023b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25719) 2024-10-24 13:30:57 +02:00
James Dorfman
a6c560a364 Merge 826fae6a0f into merged_master (Bitcoin PR bitcoin/bitcoin#25618) 2024-10-16 07:07:43 +00:00
James Dorfman
a1bb92a8d7 Merge 39d111aee7 into merged_master (Bitcoin PR bitcoin/bitcoin#25575) 2024-10-16 04:56:58 +00:00
James Dorfman
eb0e9f9d2e Merge 8479ed02d7 into merged_master (Bitcoin PR bitcoin/bitcoin#25565) 2024-10-15 17:17:05 +00:00
James Dorfman
49ad81a3da Merge f9783b0f07 into merged_master (Bitcoin PR bitcoin-core/gui#471) 2024-10-15 06:49:00 +00:00
James Dorfman
9a2c16494f Merge 994573726f into merged_master (Bitcoin PR bitcoin/bitcoin#25549) 2024-10-13 18:06:17 +00:00
James Dorfman
dbab4c012c Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353) 2024-10-13 18:06:13 +00:00
James Dorfman
abc4714fdf Merge 691a08718b into merged_master (Bitcoin PR bitcoin/bitcoin#25550) 2024-10-09 19:34:31 +00:00
James Dorfman
c54c954e0e Merge ddd7a39aa9 into merged_master (Bitcoin PR bitcoin/bitcoin#25414) 2024-09-16 05:06:09 +00:00
James Dorfman
69d34657d2 Merge a4e066af85 into merged_master (Bitcoin PR bitcoin/bitcoin#24352) 2024-09-16 04:28:39 +00:00
James Dorfman
ac7b05a27d Merge 8035b5c80d into merged_master (Bitcoin PR bitcoin/bitcoin#25369) 2024-09-10 20:10:06 +00:00
James Dorfman
2847b2bdbe Merge d6832217ef into merged_master (Bitcoin PR bitcoin/bitcoin#25382) 2024-09-10 20:10:02 +00:00
James Dorfman
3dde891f8c Merge cccbc5fe3e into merged_master (Bitcoin PR bitcoin/bitcoin#25359) 2024-09-10 18:46:59 +00:00
James Dorfman
e69c4acdf8 Merge 37633d2f61 into merged_master (Bitcoin PR bitcoin-core/gui#602) 2024-09-10 00:50:29 +00:00
James Dorfman
c472e94b84 Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931) 2024-09-09 21:13:17 +00:00
James Dorfman
abb51db9fa Merge bbf2a25044 into merged_master (Bitcoin PR bitcoin/bitcoin#25298) 2024-09-09 19:51:25 +00:00
James Dorfman
791e673535 Merge 9dae9f5f1e into merged_master (Bitcoin PR bitcoin/bitcoin#25292) 2024-09-09 19:48:55 +00:00
James Dorfman
62e75618ee Merge dd52f79a73 into merged_master (Bitcoin PR bitcoin/bitcoin#24416) 2024-09-06 18:49:33 +00:00
James Dorfman
7604b7b603 Merge ad9e5eaf77 into merged_master (Bitcoin PR bitcoin/bitcoin#24424) 2024-09-06 17:09:13 +00:00
James Dorfman
b089fee4af Merge b6ab45ae5c into merged_master (Bitcoin PR bitcoin/bitcoin#25204) 2024-09-06 17:08:46 +00:00
James Dorfman
bf065f9c8a Merge 3ba6dd6f4b into merged_master (Bitcoin PR bitcoin/bitcoin#24408) 2024-09-06 16:21:04 +00:00
James Dorfman
bf33fb75f1 Merge 48eec32347 into merged_master (Bitcoin PR bitcoin/bitcoin#25216) 2024-09-06 15:45:47 +00:00