Byron Hambly
0b1508bf01
ci: fix lint issues
2025-04-17 11:06:32 +02:00
Byron Hambly
99e05530f2
Merge 9ec30db888 into merged_master (Bitcoin PR bitcoin/bitcoin#27418 )
2025-04-12 13:04:35 +02:00
Byron Hambly
443b443230
Merge 88134fcee9 into merged_master (Bitcoin PR bitcoin/bitcoin#27378 )
2025-04-12 12:06:18 +02:00
Byron Hambly
a8c15ff245
Merge c0311b1dda into merged_master (Bitcoin PR bitcoin/bitcoin#27349 )
2025-04-12 10:10:01 +02:00
Byron Hambly
e048a4bffd
Merge 873a5062db into merged_master (Bitcoin PR bitcoin/bitcoin#27269 )
2025-04-11 22:20:04 +02:00
Thomas Trevethan
c9d0126dab
Merge 6e69fead2b into merged_master (Bitcoin PR bitcoin/bitcoin#27280 )
2025-04-11 15:20:38 +01:00
Thomas Trevethan
eb25e1f18f
Merge 09e86d7a1a into merged_master (Bitcoin PR bitcoin/bitcoin#27200 )
2025-04-11 12:56:43 +01:00
Byron Hambly
f0a58bed97
Merge f088949fcf into merged_master (Bitcoin PR bitcoin/bitcoin#27221 )
2025-04-10 07:22:14 +02:00
Tom Trevethan
fe800396da
Merge 6f5eb7a39e into merged_master (Bitcoin PR bitcoin/bitcoin#27226 )
2025-04-09 20:49:41 +00:00
Tom Trevethan
adca9e22d5
Merge c6e65a102c into merged_master (Bitcoin PR bitcoin/bitcoin#27137 )
2025-04-08 13:12:49 +00:00
Tom Trevethan
fad4c02c57
Merge 0c579203d2 into merged_master (Bitcoin PR bitcoin/bitcoin#25867 )
2025-04-08 12:33:05 +00:00
Byron Hambly
83fd716cd8
Merge 446c8f581c into merged_master (Bitcoin PR bitcoin/bitcoin#25950 )
2025-04-07 10:29:44 +02:00
Byron Hambly
8df89b56d5
Merge 6e08e5cb5c into merged_master (Bitcoin PR bitcoin/bitcoin#17127 )
2025-04-05 14:44:25 +02:00
Byron Hambly
a0428bac7c
Merge 357d750cab into merged_master (Bitcoin PR bitcoin/bitcoin#26956 )
2025-04-05 09:10:40 +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
a40bcf97bd
Merge 89fb354f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26625 )
2025-04-03 10:33:03 +02:00
Byron Hambly
769260634b
Merge 8339f3cea8 into merged_master (Bitcoin PR bitcoin/bitcoin#26886 )
2025-04-02 21:57:11 +02:00
Tom Trevethan
15bc30b2c3
Merge 599e941c19 into merged_master (Bitcoin PR bitcoin/bitcoin#26657 )
2025-04-02 16:04:31 +00:00
Tom Trevethan
c4ef833d9d
Merge 2182149dc5 into merged_master (Bitcoin PR bitcoin/bitcoin#26631 )
2025-04-02 14:35:02 +00:00
Byron Hambly
1d7fb2b124
Merge 32834034a3 into merged_master (Bitcoin PR bitcoin/bitcoin#26882 )
2025-04-02 09:47:37 +02:00
Byron Hambly
a9b63b8f3c
Merge edc3d1b296 into merged_master (Bitcoin PR bitcoin/bitcoin#26854 )
2025-04-01 22:12:23 +02:00
Byron Hambly
2210416134
Merge f301bf52ab into merged_master (Bitcoin PR bitcoin/bitcoin#26257 )
2025-04-01 08:27:16 +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
1b7e6dda13
Merge f3bc1a7282 into merged_master (Bitcoin PR bitcoin/bitcoin#26265 )
2025-03-31 16:29:50 +02:00
Byron Hambly
df8dcaa38e
Merge 8456bfac6b into merged_master (Bitcoin PR bitcoin/bitcoin#26638 )
2025-03-31 12:07:25 +02:00
Byron Hambly
41f380c8f0
Merge bd13d6b369 into merged_master (Bitcoin PR bitcoin/bitcoin#26656 )
2025-03-31 10:06:08 +02:00
Byron Hambly
d11cdab5ae
Merge 66c08e741d into merged_master (Bitcoin PR bitcoin/bitcoin#24865 )
2025-03-31 09:12:26 +02:00
Byron Hambly
4ed7e5c229
Merge 678889e6c6 into merged_master (Bitcoin PR bitcoin/bitcoin#26689 )
2025-03-31 08:53:12 +02:00
Tom Trevethan
590b5bd44c
Merge 9e229a542f into merged_master (Bitcoin PR bitcoin/bitcoin#26601 )
2025-03-25 23:34:44 +00:00
Byron Hambly
4f17f28214
Merge 38cbf43dee into merged_master (Bitcoin PR bitcoin/bitcoin#26414 )
2025-03-05 09:36:38 +02:00
Byron Hambly
92327d7b65
Merge a04121bdf9 into merged_master (Bitcoin PR bitcoin/bitcoin#26617 )
2025-03-04 11:18:54 +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
809ca1e546
Merge 3be21060d6 into merged_master (Bitcoin PR bitcoin/bitcoin#26600 )
2025-03-04 11:08:18 +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
0b0d5d214e
Merge 8597260872 into merged_master (Bitcoin PR bitcoin/bitcoin#26480 )
2025-03-04 10:42:21 +02:00
Byron Hambly
3ed5ae03ca
Merge 00c323610a into merged_master (Bitcoin PR bitcoin/bitcoin#25986 )
2025-03-03 16:38:50 +02:00
Byron Hambly
f0478dd601
Merge 38d06e1561 into merged_master (Bitcoin PR bitcoin/bitcoin#26383 )
2025-03-03 13:44:12 +02:00
Byron Hambly
2ff59e9636
Merge 7eeae5c023 into merged_master (Bitcoin PR bitcoin/bitcoin#26553 )
2025-03-03 13:37:53 +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 e42ba134f4bitcoin/bitcoin#26448 : test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055befbitcoin/bitcoin#26443 : doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596abitcoin/bitcoin#26445 : .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984dbbitcoin/bitcoin#25248 : refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437bitcoin/bitcoin#26417 : test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ecbitcoin/bitcoin#26396 : net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990bitcoin/bitcoin#26437 : test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1dbitcoin/bitcoin#25548 : gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9bitcoin/bitcoin#26360 : build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24bitcoin/bitcoin#26294 : build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0bitcoin/bitcoin#26373 : Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2bitcoin/bitcoin#26387 : p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981bitcoin/bitcoin#24051 : Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808bitcoin/bitcoin#26402 : doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11bitcoin/bitcoin#26424 : doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63bitcoin/bitcoin#26404 : test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589bbitcoin/bitcoin#26408 : test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1bitcoin/bitcoin#26409 : refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02bitcoin/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
d78604da4c
Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219 )
2024-12-02 08:51:39 +02:00
Byron Hambly
2d4094eb0b
Merge 5291933fed into merged_master (Bitcoin PR bitcoin/bitcoin#25768 )
2024-11-26 12:31:26 +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
b30fd6f694
Merge 29c195cf6a into merged_master (Bitcoin PR bitcoin/bitcoin#25792 )
2024-11-01 15:07:02 +02:00
Byron Hambly
891686a9c5
Merge 251c535800 into merged_master (Bitcoin PR bitcoin/bitcoin#25810 )
2024-11-01 13:25:11 +02:00
Byron Hambly
16f25771a0
Merge 35305c759a into merged_master (Bitcoin PR bitcoin/bitcoin#22751 )
...
This PR introduced a new RPC "simulaterawtransaction". It has been modified from
upstream and from ElementsProject/elements#1016
to work correctly with Elements blinded transactions and issued assets.
2024-10-29 10:15:55 +02:00
Byron Hambly
b11cdfc92b
Merge 2c3115d4f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25773 )
2024-10-25 12:00:10 +02:00
Byron Hambly
48d663a3d6
Merge 9155f9b7af into merged_master (Bitcoin PR bitcoin/bitcoin#25379 )
2024-10-25 09:50:32 +02:00
Byron Hambly
80c47aa8aa
Merge 317ef0368b into merged_master (Bitcoin PR bitcoin/bitcoin#25670 )
...
related to the FIXME in #25625 , PSBT python class needs to be reworked
for elements
2024-10-21 11:06:06 +02:00
Byron Hambly
6db4ca0b66
Merge d67f89bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25625 )
...
Commented out the change to the psbt test with a FIXME, due to
differences between PSBT/PSET
2024-10-18 12:05:54 +02:00
