ivanlele
b21871dc0b
Merge 28ce159bc3 into merged_master (Bitcoin PR bitcoin/bitcoin#30183 )
2026-03-30 14:37:07 +00:00
ivanlele
55dd6d547d
Merge 9f45062b9b into merged_master (Bitcoin PR bitcoin/bitcoin#30937 )
2026-03-30 10:51:11 +00:00
Tom Trevethan
1e831942a6
Merge c985a34b9c into merged_master (Bitcoin PR bitcoin/bitcoin#26990 )
2026-03-26 21:15:43 +00:00
ivanlele
464433bd1b
Merge 81276540d3 into merged_master (Bitcoin PR bitcoin/bitcoin#30148 )
2026-03-24 16:04:14 +00:00
ivanlele
d06014267a
Merge da083d4bbd into merged_master (Bitcoin PR bitcoin/bitcoin#29775 )
2026-03-11 17:10:37 +00:00
ikripaka
006073614d
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015 )
2026-02-27 22:51:31 +00:00
ivanlele
4aef8053f4
Merge 1bcc91a52c into merged_master (Bitcoin PR bitcoin/bitcoin#29521 )
2026-02-26 12:00:08 +00:00
Tom Trevethan
9ab55b7c05
Merge a44b0f771f into merged_master (Bitcoin PR bitcoin/bitcoin#30238 )
2026-02-26 01:08:00 +00:00
Tom Trevethan
b64d8b87c8
Merge 6300438a2e into merged_master (Bitcoin PR bitcoin/bitcoin#30115 )
2026-02-23 23:41:30 +00:00
ivanlele
c3eebcf145
Merge 75118a608f into merged_master (Bitcoin PR bitcoin/bitcoin#27101 )
2026-02-20 16:40:57 +00:00
ivanlele
f64242fec3
Merge 8efd03ad04 into merged_master (Bitcoin PR bitcoin/bitcoin#29494 )
2026-02-19 16:14:46 +00:00
ivanlele
9bf3ef6967
Merge 16a6174613 into merged_master (Bitcoin PR bitcoin/bitcoin#29904 )
2026-02-18 16:43:54 +00:00
ivanlele
1b13cad223
Merge dec74c035b into merged_master (Bitcoin PR bitcoin/bitcoin#29657 )
2026-02-18 13:10:22 +00:00
ivanlele
8b9fcbd78b
Merge c407caa297 into merged_master (Bitcoin PR bitcoin/bitcoin#29687 )
2026-02-17 13:25:22 +00:00
Byron Hambly
6a9d92b28b
Merge 4baa162dbb into merged_master (Bitcoin PR bitcoin/bitcoin#29212 )
2025-11-18 10:16:07 +02:00
Byron Hambly
5db91236bd
Merge 063a8b8387 into merged_master (Bitcoin PR bitcoin/bitcoin#29058 )
2025-11-18 08:50:19 +02:00
Byron Hambly
edc585d157
Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636 )
2025-06-25 11:40:46 +02:00
Byron Hambly
a40347d7f5
Merge e0a70c5b4f into merged_master (Bitcoin PR bitcoin/bitcoin#27605 )
2025-06-20 09:50:22 +02:00
Byron Hambly
c5e6e709b8
Merge 104eed1166 into merged_master (Bitcoin PR bitcoin/bitcoin#27611 )
2025-06-20 09:31:55 +02:00
Byron Hambly
cbd7b123d9
Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491 )
2025-06-19 16:08:36 +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
e04de3e652
Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642 )
2025-04-11 22:28:06 +02:00
Byron Hambly
e24c402fac
Merge b175bdb9b2 into merged_master (Bitcoin PR bitcoin/bitcoin#27238 )
2025-04-10 08:26:17 +02:00
Byron Hambly
4d00218319
Merge 8303f11e10 into merged_master (Bitcoin PR bitcoin/bitcoin#27170 )
2025-04-09 12:38:49 +02:00
Byron Hambly
57e13e480e
Merge 68e484afbb into merged_master (Bitcoin PR bitcoin/bitcoin#26584 )
2025-04-05 17:47:02 +02:00
Byron Hambly
e9d751c3ea
Merge 329d7e379d into merged_master (Bitcoin PR bitcoin/bitcoin#26328 )
2025-04-01 21:20:57 +02:00
Byron Hambly
feb8f8cf2b
Merge 9887fc7898 into merged_master (Bitcoin PR bitcoin/bitcoin#26758 )
2025-04-01 21:20:49 +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
c66623d5d0
Merge 295f617988 into merged_master (Bitcoin PR bitcoin/bitcoin#26505 )
2025-03-03 12:10:21 +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
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
1006327a13
Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707 )
2024-11-04 11:26:40 +02:00
Byron Hambly
a1f37eeae6
Merge e09ad284c7 into merged_master (Bitcoin PR bitcoin/bitcoin#24675 )
2024-10-25 11:37:05 +02:00
merge-script
28ce159bc3
Merge bitcoin/bitcoin#30183: rpc: net: follow-ups for #30062
...
a16917fb59bdad0243behttps://github.com/bitcoin/bitcoin/pull/30062#discussion_r1612272793 ).
- Improve documentation of `mapped_as`/`source_mapped_as` in `getrawaddrman` RPC by mentioning that both fields will be only available if asmap flag is set. It is the same message for `mapped_as` field in `getpeerinfo`.
ACKs for top commit:
fjahr:
re-ACK a16917fb59a16917fb59a16917fb59
2024-10-22 09:49:57 +01:00
brunoerg
a16917fb59
rpc, net: improve mapped_as doc for getrawaddrman/getpeerinfo
...
Before, we did not explicity say that both fields
`{source_}mapped_as` (that are optional in getrawaddrman)
will be only available if the asmap config flag is set.
Co-authored-by: Jon Atack <jon@atack.com>
2024-10-21 10:14:56 -03:00
Byron Hambly
068f46b4f5
Merge 5c82ca3365 into merged_master (Bitcoin PR bitcoin/bitcoin#25493 )
2024-10-17 18:03:37 +02:00
Sebastian Falbesoner
1786be7b4a
scripted-diff: drop config/ subdir for bitcoin-config.h, rename to bitcoin-build-config.h
...
Follow-up for PR #30856 , commit 0dd66251
2024-10-10 12:22:12 +02:00
pablomartin4btc
54227e681a
rpc, cli: improve error message on multiwallet mode
...
The primary objective is to provide users with clearer
and more informative error messages when encountering
the RPC_WALLET_NOT_SPECIFIED error, which occurs when
multiple wallets are loadad.
This commit also rectifies the error message consistency
by bringing the error message in line with the definition
established in protocol.h ("error when there are multiple
wallets loaded").
2024-09-17 16:22:12 -03:00
James Dorfman
1e24510c7e
Merge b91055ea55 into merged_master (Bitcoin PR bitcoin/bitcoin#25251 )
2024-09-10 18:10:02 +00:00
James Dorfman
7ec702f8f0
Merge 44037a2912 into merged_master (Bitcoin PR bitcoin/bitcoin#25176 )
2024-09-06 05:45:13 +00:00
Ava Chow
81276540d3
Merge bitcoin/bitcoin#30148 : cli: restrict multiple exclusive argument usage in bitcoin-cli
...
c8e6771af08838c4f171https://github.com/bitcoin/bitcoin/pull/27815 ) to ensure that only one Request Handler can be specified at a time.
ACKs for top commit:
stratospher:
reACK c8e6771c8e6771af0c8e6771af0
2024-09-04 14:47:38 -04:00
James Dorfman
e940df7e48
Merge 6407c0e8a3 into merged_master (Bitcoin PR bitcoin/bitcoin#25101 )
2024-08-13 06:33:14 +00:00
James Dorfman
06a6044137
Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153 )
2024-08-13 06:00:38 +00:00
James Dorfman
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20:55 +00:00
James Dorfman
0027999db1
Merge 002411dc53 into merged_master (Bitcoin PR bitcoin/bitcoin#25157 )
2024-08-13 04:12:31 +00:00
James Dorfman
cac4a07224
Merge dd9f61a184 into merged_master (Bitcoin PR bitcoin/bitcoin#25102 )
2024-08-09 21:19:15 +00:00
naiyoma
8838c4f171
common/args.h: automate check for multiple cli commands
...
Co-authored-by: Anthony Towns <aj@erisian.com.au>
2024-08-06 14:55:20 +03:00
Fabian Jahr
74a04f9e7a
testnet: Introduce Testnet4
2024-08-06 01:38:10 +02:00
James Dorfman
1fda45d8e8
Merge 3bbc46ddaf into merged_master (Bitcoin PR bitcoin/bitcoin#24632 )
2024-07-30 05:26:33 +00:00
