Commit graph

1156 commits

Author SHA1 Message Date
Byron Hambly
e999ab6070 Merge caff95a023 into merged_master (Bitcoin PR bitcoin/bitcoin#27896) 2025-06-28 11:08:01 +02:00
Byron Hambly
16d9ef4a8c Merge 35b01e8504 into merged_master (Bitcoin PR bitcoin/bitcoin#27676) 2025-06-28 09:59:07 +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
2d8d993e9d Merge fb4f047686 into merged_master (Bitcoin PR bitcoin/bitcoin#27724) 2025-06-25 10:21:31 +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
dfbd5fc4d5 Merge a106a86c46 into merged_master (Bitcoin PR bitcoin/bitcoin#27696) 2025-06-20 21:48:29 +02:00
Byron Hambly
fca322ec2f Merge 2f1403ae53 into merged_master (Bitcoin PR bitcoin/bitcoin#27458) 2025-06-20 21:31:26 +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
9314aec4cd Merge b2c85bd82f into merged_master (Bitcoin PR bitcoin/bitcoin#27656) 2025-06-20 11:18:51 +02:00
Byron Hambly
a39314cc75 Merge 8bfe503ec6 into merged_master (Bitcoin PR bitcoin/bitcoin#27628) 2025-06-20 11:08:23 +02:00
Byron Hambly
24b30fd7a6 Merge d89aca1bdb into merged_master (Bitcoin PR bitcoin/bitcoin#27483) 2025-05-14 14:30:31 +02:00
Byron Hambly
f03f4b8ab6 Merge bbbf89a9de into merged_master (Bitcoin PR bitcoin/bitcoin#27503) 2025-04-14 09:17:31 +02:00
Byron Hambly
5c9dec941c Merge 8c3cc4cad3 into merged_master (Bitcoin PR bitcoin/bitcoin#27420) 2025-04-12 12:49:26 +02:00
Tom Trevethan
a498211f40 Merge 23e2bfcbc4 into merged_master (Bitcoin PR bitcoin/bitcoin#25696) 2025-04-09 19:01:38 +00:00
Byron Hambly
8db6b78170 Merge 82793f1984 into merged_master (Bitcoin PR bitcoin/bitcoin#27146)
Unrelated FIXME: moved transactiontime functional tests to extended
temporarily
2025-04-09 06:47:56 +02:00
Tom Trevethan
38bd7be453 Merge 0561f344e0 into merged_master (Bitcoin PR bitcoin/bitcoin#27027) 2025-04-07 11:50:36 +00:00
Byron Hambly
f6fbd4846e Merge 1ad0711d7c into merged_master (Bitcoin PR bitcoin/bitcoin#27016) 2025-04-05 17:02:21 +02:00
Byron Hambly
d401635428 Merge 835af48e03 into merged_master (Bitcoin PR bitcoin/bitcoin#27057) 2025-04-05 15:46:46 +02:00
Byron Hambly
6f36298f42 Merge 7b850bc2a1 into merged_master (Bitcoin PR bitcoin/bitcoin#27061) 2025-04-05 15:31:47 +02:00
Byron Hambly
82c89efa24 Merge 2b211b41e3 into merged_master (Bitcoin PR bitcoin/bitcoin#26952) 2025-04-05 09:11:03 +02:00
Tom Trevethan
3f66b4f13e Merge 79e18ebc81 into merged_master (Bitcoin PR bitcoin/bitcoin#26896) 2025-04-04 15:20:49 +00:00
Byron Hambly
d20ad7ad88 Merge fcff639af1 into merged_master (Bitcoin PR bitcoin/bitcoin#26958) 2025-04-04 09:51:39 +02:00
Byron Hambly
30170c6bd9 Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226) 2025-04-03 11:42:16 +02:00
Byron Hambly
fb75dbf144 Merge 8915e4d9f5 into merged_master (Bitcoin PR bitcoin/bitcoin#26824) 2025-04-02 09:54:59 +02:00
Byron Hambly
b388e94aaf Merge 535adce272 into merged_master (Bitcoin PR bitcoin/bitcoin#26825) 2025-04-01 21:57:07 +02:00
Byron Hambly
047c6214c2 Merge 06dd571534 into merged_master (Bitcoin PR bitcoin/bitcoin#26748) 2025-03-31 16:30:09 +02:00
Byron Hambly
6658d3ce4b Merge 9c47eb4503 into merged_master (Bitcoin PR bitcoin/bitcoin#26446) 2025-03-03 15:12:03 +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
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
Byron Hambly
d78604da4c Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219) 2024-12-02 08:51:39 +02:00
Byron Hambly
bf18cb4ee3 Merge 6e11e20340 into merged_master (Bitcoin PR bitcoin/bitcoin#26121) 2024-11-27 11:44:43 +02:00
Byron Hambly
dd73ace208 Merge 29d540b7ad into merged_master (Bitcoin PR bitcoin/bitcoin#26070) 2024-11-26 15:09:08 +02:00
Byron Hambly
3b4249237a Merge 2e34374bf3 into merged_master (Bitcoin PR bitcoin/bitcoin#26003) 2024-11-26 13:12:15 +02:00
Byron Hambly
740179071b Merge 02aefa169a into merged_master (Bitcoin PR bitcoin/bitcoin#25852) 2024-11-04 11:12:04 +02:00
Byron Hambly
1269611e85 Merge b63c24a509 into merged_master (Bitcoin PR bitcoin/bitcoin#25809) 2024-11-02 17:08:58 +02:00
Byron Hambly
d9fe5dbedc Merge f765d4e232 into merged_master (Bitcoin PR bitcoin/bitcoin#25770) 2024-10-25 10:20:17 +02:00
Byron Hambly
d5e80e41bf Merge 0043ec4e13 into merged_master (Bitcoin PR bitcoin/bitcoin#25687) 2024-10-24 16:17:31 +02:00
Byron Hambly
95d7021764 Merge c6fafa4ed6 into merged_master (Bitcoin PR bitcoin/bitcoin#25630) 2024-10-17 15:24:30 +02:00
Byron Hambly
1773a10586 Merge 8c9ea8a556 into merged_master (Bitcoin PR bitcoin/bitcoin#25612) 2024-10-17 13:56:06 +02:00
Byron Hambly
0889a08688 Merge f002f8a0e7 into merged_master (Bitcoin PR bitcoin/bitcoin#25599) 2024-10-17 09:30:31 +02:00
Byron Hambly
50916cf108 simplicity: enable coverage in configure.ac
also filters src/simplicity/secp256k1 from the coverage results
2024-10-07 14:39:09 -04:00
James Dorfman
f4d5be248d Merge fffff0abb9 into merged_master (Bitcoin PR bitcoin/bitcoin#25436) 2024-09-16 06:31:30 +00:00
James Dorfman
7b3b3b21a0 Merge b1a824dd06 into merged_master (Bitcoin PR bitcoin/bitcoin#24291) 2024-09-16 05:05:47 +00:00
James Dorfman
5218e5f117 Merge 7377ed778c into merged_master (Bitcoin PR bitcoin/bitcoin#25389) 2024-09-16 04:08:52 +00:00
James Dorfman
0c2f436c2a Merge 5884a47c36 into merged_master (Bitcoin PR bitcoin/bitcoin#25422) 2024-09-16 04:08:05 +00:00
James Dorfman
3c5be32752 Merge 1d39c9ca06 into merged_master (Bitcoin PR bitcoin/bitcoin#25425) 2024-09-16 03:42:13 +00:00
James Dorfman
c24bc9e856 Merge faf25b09d9 into merged_master (Bitcoin PR bitcoin/bitcoin#25282) 2024-09-10 20:19:30 +00:00
James Dorfman
40b938125f Merge 1557014378 into merged_master (Bitcoin PR bitcoin/bitcoin#25332) 2024-09-10 18:47:28 +00:00
James Dorfman
4f4566129d Merge 2e079c86ae into merged_master (Bitcoin PR bitcoin/bitcoin#24395) 2024-09-09 20:00:39 +00:00