Byron Hambly
|
d45c7cba9b
|
Merge 5241b8bdff into merged_master (Bitcoin PR bitcoin/bitcoin#27368)
|
2025-04-12 10:25:04 +02:00 |
|
Byron Hambly
|
32f56a1e5b
|
Merge d254f942a5 into merged_master (Bitcoin PR bitcoin/bitcoin#27324)
|
2025-04-11 23:01:24 +02:00 |
|
Byron Hambly
|
230bfb058b
|
Merge 2305643646 into merged_master (Bitcoin PR bitcoin/bitcoin#27257)
|
2025-04-11 22:04:13 +02:00 |
|
Thomas Trevethan
|
860731d44d
|
Merge 664500fc71 into merged_master (Bitcoin PR bitcoin/bitcoin#27278)
|
2025-04-11 14:58:52 +01:00 |
|
Byron Hambly
|
c312a23624
|
Merge 35fbc97208 into merged_master (Bitcoin PR bitcoin/bitcoin#25619)
|
2025-04-07 08:19:49 +02:00 |
|
Tom Trevethan
|
e8e7aea876
|
Merge 37fea41bbf into merged_master (Bitcoin PR bitcoin/bitcoin#26982)
|
2025-04-04 14:42:54 +00:00 |
|
Tom Trevethan
|
5b2b315520
|
Merge 9a288430df into merged_master (Bitcoin PR bitcoin/bitcoin#26900)
|
2025-04-04 14:21:48 +00:00 |
|
Tom Trevethan
|
1200d73ab4
|
Merge 835212cd1d into merged_master (Bitcoin PR bitcoin/bitcoin#25880)
|
2025-04-04 14:12:28 +00:00 |
|
Tom Trevethan
|
1435fb334b
|
Merge 79e007d1d6 into merged_master (Bitcoin PR bitcoin/bitcoin#25296)
|
2025-04-04 13:36:08 +00:00 |
|
Byron Hambly
|
0534256d39
|
Merge 77a36033b5 into merged_master (Bitcoin PR bitcoin/bitcoin#26551)
|
2025-04-04 11:47:53 +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
|
98fc0af965
|
Merge 6061eb6564 into merged_master (Bitcoin PR bitcoin/bitcoin#26199)
|
2025-03-26 15:42:23 +00:00 |
|
Tom Trevethan
|
1b33a06134
|
Merge 5126e625cb into merged_master (Bitcoin PR bitcoin/bitcoin#26378)
|
2025-03-25 19:43:38 +00:00 |
|
Tom Trevethan
|
387af571cd
|
Merge 1ff79292e3 into merged_master (Bitcoin PR bitcoin/bitcoin#26609)
|
2025-03-24 23:33:59 +00:00 |
|
Byron Hambly
|
028fd5fcbb
|
Merge 5b3f05b7eb into merged_master (Bitcoin PR bitcoin/bitcoin#24226)
|
2025-03-04 13:22:16 +02:00 |
|
Byron Hambly
|
1c748cbfe2
|
Merge 8b796866b4 into merged_master (Bitcoin PR bitcoin/bitcoin#26624)
|
2025-03-04 13:22:12 +02:00 |
|
Byron Hambly
|
da0e8310ca
|
Merge 78aee0fe2c into merged_master (Bitcoin PR bitcoin/bitcoin#26569)
|
2025-03-04 12:20:20 +02:00 |
|
Byron Hambly
|
6274a3e6a7
|
Merge bcee94d107 into merged_master (Bitcoin PR bitcoin/bitcoin#26359)
|
2025-03-04 11:18:33 +02:00 |
|
Byron Hambly
|
b929f50852
|
Merge a79b720092 into merged_master (Bitcoin PR bitcoin/bitcoin#26295)
|
2025-03-03 15:12:13 +02:00 |
|
Byron Hambly
|
da8b6f2f7f
|
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786)
|
2025-03-03 11:12:31 +02:00 |
|
Byron Hambly
|
5c10c048e6
|
Merge 7ed2768dca into merged_master (Elements PR #1421)
|
2025-02-28 15:02:20 +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 |
|
Pablo Greco
|
b92a3ceda2
|
TSAN: Avoid unlocked access to pindexBestHeader
|
2025-02-23 14:34:19 -08:00 |
|
Byron Hambly
|
07aebbf505
|
lint: fixes
|
2025-02-14 15:54:27 +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
|
c794f76ea8
|
asan: lock cs_main for calls to chainman
|
2025-01-06 15:29:01 +02:00 |
|
Byron Hambly
|
8499b13762
|
lint: fix lint issues
|
2024-12-03 14:02:33 +02:00 |
|
Byron Hambly
|
b4b6a0705e
|
net_processing: fix for merge of bitcoin/bitcoin#25717 where have_headers_sync was unused
|
2024-12-03 10:06:38 +02:00 |
|
Byron Hambly
|
13283a60b1
|
Merge 6ab84709fc into merged_master (Bitcoin PR bitcoin/bitcoin#25960)
|
2024-11-26 09:50:26 +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
|
7fc66b1618
|
Merge cfda740b33 into merged_master (Bitcoin PR bitcoin/bitcoin#25174)
|
2024-11-22 10:06:47 +02:00 |
|
Byron Hambly
|
3fd262a515
|
Merge 0f35f4ddf4 into merged_master (Bitcoin PR bitcoin/bitcoin#25786)
|
2024-11-04 12:32:04 +02:00 |
|
Byron Hambly
|
793d471d13
|
Merge a75b7796b7 into merged_master (Bitcoin PR bitcoin/bitcoin#25077)
|
2024-11-03 16:10:34 +02:00 |
|
Byron Hambly
|
3aec1a9069
|
Merge 22d96d76ab into merged_master (Bitcoin PR bitcoin/bitcoin#25720)
|
2024-11-02 16:49:35 +02:00 |
|
Byron Hambly
|
5d174dc4d0
|
Merge e038605585 into merged_master (Bitcoin PR bitcoin/bitcoin#24662)
|
2024-10-25 12:07:59 +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
|
35cc1e213b
|
Merge b1c8ea45c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25683)
|
2024-10-24 12:20:41 +02:00 |
|
Byron Hambly
|
da5b3cf786
|
Merge 9ba73758c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24697)
Also removes the redundant redeclaration of CheckMinimalPush from
interpreter.h that was moved to script.h in f4e289f384
|
2024-10-20 20:19:04 +02:00 |
|
Byron Hambly
|
299207b5d6
|
Merge 2bdce7f7ad into merged_master (Bitcoin PR bitcoin/bitcoin#25514)
Note I did manually run the trim headers functional test successfully on
this commit, since it touched some of trim headers code.
|
2024-10-17 10:44:56 +02:00 |
|
James Dorfman
|
3e5580265d
|
Merge 8efa73e7ce into merged_master (Bitcoin PR bitcoin/bitcoin#25557)
|
2024-10-16 06:40:15 +00:00 |
|
James Dorfman
|
6e9f70937f
|
Merge 87d012324a into merged_master (Bitcoin PR bitcoin/bitcoin#25454)
|
2024-10-09 18:16:23 +00:00 |
|
James Dorfman
|
61b0543ba7
|
Merge cdcc74bbcc into merged_master (Elements PR #1270)
|
2024-09-23 16:51:13 +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
|
438cb545b7
|
Merge 2364d17a31 into merged_master (Bitcoin PR bitcoin/bitcoin#25480)
|
2024-09-19 15:22:38 +00:00 |
|
James Dorfman
|
88a98fd4b3
|
Merge 2fe27029f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25404)
|
2024-09-17 18:36:02 +00:00 |
|
James Dorfman
|
fb17f731bd
|
Merge 50a3921c96 into merged_master (Bitcoin PR bitcoin/bitcoin#25144)
|
2024-09-16 06:44:24 +00:00 |
|
James Dorfman
|
1c386ceb80
|
Merge e05564d706 into merged_master (Bitcoin PR bitcoin/bitcoin#25446)
|
2024-09-16 05:06:26 +00:00 |
|
James Dorfman
|
fe8d041f9f
|
Merge 489b587669 into merged_master (Bitcoin PR bitcoin/bitcoin#25215)
|
2024-09-10 20:19:35 +00:00 |
|
James Dorfman
|
115b62e5ec
|
Merge ede9089096 into merged_master (Bitcoin PR bitcoin/bitcoin#25156)
|
2024-09-10 19:08:58 +00:00 |
|
James Dorfman
|
c472e94b84
|
Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931)
|
2024-09-09 21:13:17 +00:00 |
|