Commit graph

173 commits

Author SHA1 Message Date
Byron Hambly
ba93978657
ci: correct link for script_assets_test.json 2025-11-04 13:15:28 +02:00
Byron Hambly
21cd3e384e
ci: remove enable-external-signer
this is eventually done upstream as well
2025-08-22 09:29:34 +02:00
Byron Hambly
210e6f64f5
ci: fix macos github action
use boost@1.85 for macos on github actions
2025-08-22 09:22:39 +02:00
Byron Hambly
c414ccff88
Merge fc1073bb45 into merged_master (Bitcoin PR bitcoin/bitcoin#28643) 2025-08-07 13:48:00 +02:00
Byron Hambly
f1bf7ab6aa
Merge bf32ae3969 into merged_master (Bitcoin PR bitcoin/bitcoin#28482) 2025-08-06 20:35:48 +02:00
Byron Hambly
9908b4c817
Merge 97f756b12c into merged_master (Bitcoin PR bitcoin/bitcoin#28575) 2025-08-06 15:09:58 +02:00
Byron Hambly
411c0d949c Merge 260445bee8 into merged_master (Bitcoin PR bitcoin/bitcoin#28359) 2025-07-05 20:33:35 +02:00
Byron Hambly
3234a2d016 Merge cd5d2f5f09 into merged_master (Bitcoin PR bitcoin/bitcoin#27976) 2025-07-05 10:52:21 +02:00
Byron Hambly
a0bdcf75af Merge 93e8bc22bf into merged_master (Bitcoin PR bitcoin/bitcoin#28296) 2025-07-04 21:25:32 +02:00
Byron Hambly
a8206a271b Merge 492257019d into merged_master (Bitcoin PR bitcoin/bitcoin#28087) 2025-07-03 21:07:35 +02:00
Byron Hambly
81083d47bf Merge 624333455a into merged_master (Bitcoin PR bitcoin/bitcoin#26296) 2025-07-03 20:38:42 +02:00
Byron Hambly
db4135c3e5 Merge e92013e178 into merged_master (Bitcoin PR bitcoin/bitcoin#28188) 2025-07-03 12:29:35 +02:00
Byron Hambly
317bb99e58 Merge c325f0fbae into merged_master (Bitcoin PR bitcoin/bitcoin#28034) 2025-06-30 15:47:30 +02:00
Byron Hambly
b6ef944adb Merge c6287faae4 into merged_master (Bitcoin PR bitcoin/bitcoin#27996) 2025-06-30 14:45:41 +02:00
Byron Hambly
be84f94042 Merge a596bdf3e9 into merged_master (Bitcoin PR bitcoin/bitcoin#27919) 2025-06-27 15:55:29 +02:00
Byron Hambly
27e665a353 Merge 9372ec71e8 into merged_master (Bitcoin PR bitcoin/bitcoin#27872) 2025-06-27 14:40:29 +02:00
Byron Hambly
2ad90bac11 Merge dfe658009d into merged_master (Bitcoin PR bitcoin/bitcoin#27759) 2025-06-25 10:11:41 +02:00
Byron Hambly
741b17733c Merge 456701420b into merged_master (Bitcoin PR bitcoin/bitcoin#27672) 2025-06-20 21:48:46 +02:00
Byron Hambly
0bdf3a6f46 Merge 09351f51d2 into merged_master (Bitcoin PR bitcoin/bitcoin#27699) 2025-06-20 21:48:41 +02:00
Byron Hambly
3e00e726f6 Merge f998eb7662 into merged_master (Bitcoin PR bitcoin/bitcoin#27683) 2025-06-20 21:48:26 +02:00
Byron Hambly
4dfd0f949d Merge 9a8318f30b into merged_master (Bitcoin PR bitcoin/bitcoin#27707) 2025-06-20 21:48:16 +02:00
Byron Hambly
3f802aa444 Merge edd6d8395f into merged_master (Bitcoin PR bitcoin/bitcoin#27662) 2025-06-20 21:31:14 +02:00
Byron Hambly
33a8bd7621 Merge 77b0a80ce7 into merged_master (Bitcoin PR bitcoin/bitcoin#27682) 2025-06-20 16:11:35 +02:00
Byron Hambly
8ebb49db8e Merge 4c3d67a2d0 into merged_master (Bitcoin PR bitcoin/bitcoin#27571) 2025-06-20 15:59:26 +02:00
Byron Hambly
c795df1d58 Merge 904631e0fc into merged_master (Bitcoin PR bitcoin/bitcoin#27667) 2025-06-20 15:49:09 +02:00
Byron Hambly
2f59e99982 Merge 03a4e8dd4c into merged_master (Bitcoin PR bitcoin/bitcoin#27674) 2025-06-20 15:49:07 +02:00
Byron Hambly
9990535be8 Merge 3a63ef5020 into merged_master (Bitcoin PR bitcoin/bitcoin#27616) 2025-06-20 11:18:33 +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
a4486ae690 Merge 883766fa45 into merged_master (Bitcoin PR bitcoin/bitcoin#27573) 2025-06-20 09:10:03 +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
d23a2260eb Merge 04595484d9 into merged_master (Bitcoin PR bitcoin/bitcoin#27404) 2025-04-12 13:30:40 +02:00
Byron Hambly
cbcc6e9930 Merge 8d31d769b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27344) 2025-04-11 23:10:04 +02:00
Byron Hambly
47d4c33c81 Merge f380bb93e8 into merged_master (Bitcoin PR bitcoin/bitcoin#27311) 2025-04-11 21:20:31 +02:00
Byron Hambly
e24c402fac Merge b175bdb9b2 into merged_master (Bitcoin PR bitcoin/bitcoin#27238) 2025-04-10 08:26:17 +02:00
Tom Trevethan
842220464b Merge 2de0559f2c into merged_master (Bitcoin PR bitcoin/bitcoin#27189) 2025-04-09 18:54:57 +00:00
Tom Trevethan
0ab95ded19 Merge fc037c8c83 into merged_master (Bitcoin PR bitcoin/bitcoin#27150) 2025-04-09 17:42:19 +00:00
Byron Hambly
4ec18086ff Merge a245429d68 into merged_master (Bitcoin PR bitcoin/bitcoin#26940) 2025-04-07 10:05:17 +02:00
Byron Hambly
4abd543c2b Merge 52ddbd52f9 into merged_master (Bitcoin PR bitcoin/bitcoin#26345) 2025-04-05 14:25:05 +02:00
Byron Hambly
7f18a826fe Merge c2028f98ae into merged_master (Bitcoin PR bitcoin/bitcoin#27012) 2025-04-05 12:05:13 +02:00
Byron Hambly
63968575ee Merge b5868f4b1f into merged_master (Bitcoin PR bitcoin/bitcoin#23670) 2025-04-05 09:26:20 +02:00
Byron Hambly
3d66973c33 Merge 7241b936c5 into merged_master (Bitcoin PR bitcoin/bitcoin#26965) 2025-04-05 08:26:09 +02:00
Byron Hambly
37fc0a0c53 Merge d91364fdd9 into merged_master (Bitcoin PR bitcoin/bitcoin#26912) 2025-04-03 11:01:23 +02:00
Byron Hambly
c363e82b11 Merge f4ef856375 into merged_master (Bitcoin PR bitcoin/bitcoin#26850) 2025-04-02 07:06:42 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
cfe620f7fd Merge 93cae70d87 into merged_master (Bitcoin PR bitcoin/bitcoin#26561) 2025-03-03 14:54:07 +02:00
Byron Hambly
b5a75af14a Merge 1b680948d4 into merged_master (Bitcoin PR bitcoin/bitcoin#26292) 2025-03-03 13:37:42 +02:00
Byron Hambly
89cb20a432
Merge 6863ad79a6 into merged_master (Bitcoin PR bitcoin/bitcoin#25112) 2025-03-03 09:48:51 +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
a6f8dc6a86
tidy: fixes for clang tidy ci job 2024-12-04 14:16:45 +02:00