Tom Trevethan
c5cac8efa2
Merge 712cab3a8f into merged_master (Bitcoin PR bitcoin/bitcoin#31061 )
2026-04-10 00:46:01 +01:00
ivanlele
5eec58e762
Merge 11f68cc810 into merged_master (Bitcoin PR bitcoin/bitcoin#31212 )
2026-04-08 12:28:17 +00:00
ivanlele
e5db086bce
Merge f842d0801e into merged_master (Bitcoin PR bitcoin/bitcoin#29686 )
2026-04-02 14:10:47 +00:00
ivanlele
1e88a1e5c2
Merge 05aebe3790 into merged_master (Bitcoin PR bitcoin/bitcoin#30930 )
2026-04-02 11:38:58 +00:00
Tom Trevethan
030ab66c70
Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042 )
2026-04-01 22:41:52 +01:00
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 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
MarcoFalke
fa1d5acb8d
refactor: Use TranslateFn type consistently
...
The type was introduced in the previous commit.
2025-01-15 12:15:40 +01:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Hodlinator
12f8d848fd
args: Disallow -nodatadir
...
Does not make sense to run without a datadir.
Prior to this change it would be interpreted as a mix of unset and as a relative path of "0".
2024-11-20 22:55:25 +01:00
Hodlinator
6ff9662760
scripted-diff: Avoid printing version information for -noversion
...
-BEGIN VERIFY SCRIPT-
sed -i --regexp-extended 's/\b(gArgs|args)\.IsArgSet\("-version"\)/\1.GetBoolArg("-version", false)/g' $(git grep -l '-version')
-END VERIFY SCRIPT-
2024-11-20 22:55:23 +01:00
Hodlinator
e8a2054edc
doc args: Document narrow scope of -color
2024-11-18 23:04:19 +01:00
Ava Chow
f842d0801e
Merge bitcoin/bitcoin#29686 : Update manpage descriptions
...
47f50c7af5 doc: add bitcoin-qt man description (willcl-ark)
40b82e3ab0 doc: add bitcoin-util man description (willcl-ark)
a7bf80f3a2 doc: add bitcoin-tx man description (willcl-ark)
3f9a516832 doc: add bitcoin-wallet man description (willcl-ark)
d8c0bb23ef doc: add bitcoin-cli man description (willcl-ark)
09abccfa77 doc: add bitcoind man description (willcl-ark)
Pull request description:
Closes #29552
Add better descriptions to help string for all binaries. Use format which is correctly detected by help2man when generating manpages.
Examples:
Before:

After:

Demonstration using `bitcoin-cli` also highlights removal of inline usage explanations which were being incorrectly formatted by `help2man`. This results in the following changed format to `bitcoin-cli --help`:

ACKs for top commit:
achow101:
ACK 47f50c7af5
tdb3:
re ACK 47f50c7af5
rkrux:
tACK 47f50c7af5
maflcko:
ACK 47f50c7af5 📠
Tree-SHA512: 124a8877077b7d47758ea970949d472b2444e3ba65d2bfeb47ebbdb1f5f8d3bf0abe2c88714bb6c92ba0e36583f0b36aa6f016ea88b65f011c610096ea872182
2024-11-08 13:34:59 -05:00
Ava Chow
05aebe3790
Merge bitcoin/bitcoin#30930 : netinfo: add peer services column and outbound-only option
...
87532fe558 netinfo: allow setting an outbound-only peer list (Jon Atack)
681ebcceca netinfo: rename and hoist max level constant to use in top-level help (Jon Atack)
e7d307ce8c netinfo: clarify relaytxes and addr_relay_enabled help docs (Jon Atack)
eef2a9d406 netinfo: add peer services column (Jon Atack)
Pull request description:
Been using this since May 2023.
- add a peer services column (considered displaying the p2p_v2 flag as "p" or "2"; proposing "2" here for continuity with the "v" column, but "p" is fine for me as well)
- clarify in the help that "relaytxes" and "addr_relay_enabled" are from getpeerinfo
- hoist (and rename) the max level constant to use in top-level help, to avoid overlooking to update the top-level help if the value of the constant changes (as caught by Larry Ruane in review below)
- add an optional "outonly" (or "o") argument for an outbound-only peer list, as suggested by Vasil Dimov in his review below. Several people have requested this, to keep the output within screen limits when running netinfo as a live dashboard (i.e. with `watch`) on a node with many peers. While doing this, also permit passing "h" for the help in addition to "help".
ACKs for top commit:
achow101:
ACK 87532fe558
rkrux:
tACK 87532fe558
tdb3:
cr re ACK 87532fe558
brunoerg:
crACK 87532fe558
Tree-SHA512: 35b1b0de28dfecaad58bf5af194757a5e0f563553cf69ea4d76f2e1963f8d662717254df2549114c7bba4a041bf5282d5cb3fba8d436b2807f2a00560787d64c
2024-11-04 15:50:59 -05:00
Byron Hambly
1006327a13
Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707 )
2024-11-04 11:26:40 +02:00
willcl-ark
d8c0bb23ef
doc: add bitcoin-cli man description
2024-10-30 10:18:37 +00:00
Hennadii Stepanov
70713303b6
scripted-diff: Rename PACKAGE_* variables to CLIENT_*
...
This change ensures consistent use of the `CLIENT_` namespace everywhere
in the repository.
-BEGIN VERIFY SCRIPT-
ren() { sed -i "s/\<$1\>/$2/g" $( git grep -l "$1" ./cmake ./src :\(exclude\)./src/secp256k1 ./test ) ; }
ren PACKAGE_NAME CLIENT_NAME
ren PACKAGE_VERSION CLIENT_VERSION_STRING
ren PACKAGE_URL CLIENT_URL
ren PACKAGE_BUGREPORT CLIENT_BUGREPORT
-END VERIFY SCRIPT-
2024-10-28 12:36:19 +00:00
Jon Atack
87532fe558
netinfo: allow setting an outbound-only peer list
...
by passing an additional argument of "outonly" or "o".
This has been requested in order to keep the output within screen limits when running -netinfo
as a live dashboard, i.e. with `watch`.
Also allow passing "h" in addition to "help" to see the help documentation.
2024-10-25 07:22:15 -06: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
...
a16917fb59 rpc, net: improve `mapped_as` doc for getrawaddrman/getpeerinfo (brunoerg)
bdad0243be rpc, net: getrawaddrman "mapped_as" follow-ups (brunoerg)
Pull request description:
- Change `addrman` to reference to const since it isn't modified (https://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 a16917fb59
0xB10C:
re-ACK a16917fb59
laanwj:
re-ACK a16917fb59
Tree-SHA512: c66b2ee9d24da93d443be83f6ef3b2d39fd5bf3f73e2974574cad238ffb82035704cf4fbf1bac22a63734948e285e8e091c2884bb640202efdb473315e770233
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