Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: (scripted-diff) Merge bitcoin#21836, 21710, 21753 #5998

Merged
merged 3 commits into from
May 19, 2024

Commits on May 19, 2024

  1. Merge bitcoin#21710: doc: update helps for addnode rpc and -addnode/-…

    …maxconnections config options
    
    b4fcbcf doc: update -maxconnections config option help (Jon Atack)
    79685a8 doc: update -addnode config option help (Jon Atack)
    2896c6c doc: update addnode rpc help (Jon Atack)
    
    Pull request description:
    
      Since bitcoin#9319 proposed by Gregory Maxwell and released in v0.14, peers manually added through the `-addnode` config option or using the `addnode` RPC have their own separate limit of 8 connections that does not compete with other inbound or outbound connection usage and is not subject to the limitation imposed by the `-maxconnections` option.
    
      This PR updates the `-addnode` and `-maxconnections` config options and the `addnode` RPC help docs with this information.
    
      `-addnode` config option help
      ```
      $ bitcoind -h | grep -A5 addnode=
        -addnode=<ip>
             Add a node to connect to and attempt to keep the connection open (see
             the addnode RPC help for more info). This option can be specified
             multiple times to add multiple nodes; connections are limited to
             8 at a time and are counted separately from the -maxconnections
             limit.
    
      $ bitcoind -h | grep -A3 maxconnections=
        -maxconnections=<n>
             Maintain at most <n> connections to peers (default: 125). This limit
             does not apply to connections manually added via -addnode or the
             addnode RPC, which have a separate limit of 8.
      ```
    
      `addnode` rpc help
      ```
      $ bitcoin-cli help addnode
      addnode "node" "command"
    
      Attempts to add or remove a node from the addnode list.
      Or try a connection to a node once.
      Nodes added using addnode (or -connect) are protected from DoS disconnection and are not required to be
      full nodes/support SegWit as other outbound peers are (though such peers will not be synced from).
      Addnode connections are limited to 8 at a time and are counted separately from the -maxconnections limit.
      ```
    
    ACKs for top commit:
      prayank23:
        ACK bitcoin@b4fcbcf
      jarolrod:
        ACK b4fcbcf
    
    Tree-SHA512: b6d69baa6cbf6d53f91bac5b39b549d49db6c95f92ea1bdd3588a6432794a25ac2c8b3c89e2c72bb9097e61f2717c8b5ecc404745d5992b88e523db03200898f
    laanwj authored and PastaPastaPasta committed May 19, 2024
    Configuration menu
    Copy the full SHA
    6350b0c View commit details
    Browse the repository at this point in the history
  2. Merge bitcoin#21753: doc: add -addrinfo to tor docs

    65f30e4 doc: add -addrinfo troubleshooting section to tor.md (Jon Atack)
    
    Pull request description:
    
      Follow-up to bitcoin#21595.
    
    ACKs for top commit:
      jarolrod:
        ACK 65f30e4
      practicalswift:
        ACK 65f30e4
      0xB10C:
        ACK 65f30e4
      theStack:
        ACK 65f30e4
    
    Tree-SHA512: d17fa007106b8f877d2632c99273c663a24f025febe52faec9b197c561df808fd6a92bb27992ccbf5c3cc0d82058a8c4b82a2f1b99325f0ddfdac5ef703ac7d7
    laanwj authored and PastaPastaPasta committed May 19, 2024
    Configuration menu
    Copy the full SHA
    7bd0262 View commit details
    Browse the repository at this point in the history
  3. scripted-diff: Merge bitcoin#21836: Replace three dots with ellipsis …

    …in the UI string
    
    -BEGIN VERIFY SCRIPT-
    sed -i -E -e 's/\.\.\."\)(\.|,|\)| )/…"\)\1/' -- $(git ls-files -- 'src' ':(exclude)src/qt/dashstrings.cpp' ':(exclude)src/immer/')
    sed -i -e 's/\.\.\.\\"/…\\"/' src/qt/sendcoinsdialog.cpp
    sed -i -e 's|\.\.\.</string>|…</string>|' src/qt/forms/*.ui
    sed -i -e 's|\.\.\.)</string>|…)</string>|' src/qt/forms/sendcoinsdialog.ui
    -END VERIFY SCRIPT-
    vijaydasmp authored and PastaPastaPasta committed May 19, 2024
    Configuration menu
    Copy the full SHA
    e0d9dc1 View commit details
    Browse the repository at this point in the history