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.

Sign up for GitHub

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

Jump to bottom

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

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

wants to merge 3 commits into from
+104 −98

Conversation

vijaydasmp
Copy link

bitcoin backports

@vijaydasmp vijaydasmp changed the title backport: Merge #21836: backport: (scripted-diff) Merge #21836: Apr 25, 2024
@vijaydasmp vijaydasmp changed the title backport: (scripted-diff) Merge #21836: backport: (scripted-diff) Merge #21836 Apr 25, 2024
@vijaydasmp vijaydasmp force-pushed the bp22_37 branch 2 times, most recently from 56e470c to ee2aeae Compare April 26, 2024 01:44
@vijaydasmp vijaydasmp changed the title backport: (scripted-diff) Merge #21836 backport: (scripted-diff) Merge bitcoin#21836, 21710, 21753, 21775 May 3, 2024
@vijaydasmp vijaydasmp changed the title backport: (scripted-diff) Merge bitcoin#21836, 21710, 21753, 21775 backport: (scripted-diff) Merge bitcoin#21836, 21710, 21753 May 4, 2024
@vijaydasmp vijaydasmp marked this pull request as ready for review May 5, 2024 06:42
UdjinM6
UdjinM6 requested changes May 10, 2024
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

script in 21836 should be

-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-

src/immer/extra/guile/benchmark.scm Outdated
@@ -54,7 +54,7 @@
(display " seconds")
(newline))))))

(display ";;;; benchmarking creation...") (newline)
(display ";;;; benchmarking creation…") (newline)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

21836: should exclude src/immer/

src/qt/dashstrings.cpp Outdated
@@ -188,9 +188,9 @@ QT_TRANSLATE_NOOP("dash-core", "Failed to rescan the wallet during initializatio
QT_TRANSLATE_NOOP("dash-core", "Failed to start a new mixing queue"),
QT_TRANSLATE_NOOP("dash-core", "Failed to verify database"),
QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ( waiting %s )"),
QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ..."),
QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing …"),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

21836: should dashify script

src/init.cpp
@@ -574,7 +574,7 @@ void SetupServerArgs(NodeContext& node)
argsman.AddArg("-forcednsseed", strprintf("Always query for peer addresses via DNS lookup (default: %u)", DEFAULT_FORCEDNSSEED), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-listen", "Accept connections from outside (default: 1 if no -proxy or -connect)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-listenonion", strprintf("Automatically create Tor onion service (default: %d)", DEFAULT_LISTEN_ONION), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-maxconnections=<n>", strprintf("Maintain at most <n> connections to peers (temporary service connections excluded) (default: %u)", DEFAULT_MAX_PEER_CONNECTIONS), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-maxconnections=<n>", strprintf("Maintain at most <n> connections to peers (temporary service connections excluded) (default: %u). This limit does not apply to connections manually added via -addnode or the addnode RPC, which have a separate limit of %u.", DEFAULT_MAX_PEER_CONNECTIONS, MAX_ADDNODE_CONNECTIONS), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

21710: missing changes in src/rpc/net.cpp

vijaydasmp and others added 3 commits May 14, 2024 05:49
@vijaydasmp
scripted-diff: Merge bitcoin#21836: scripted-diff: Replace three dots…
3119106 
… 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-
@laanwj @vijaydasmp
Merge bitcoin#21710: doc: update helps for addnode rpc and -addnode/-…
35e4d68 
…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 @vijaydasmp
Merge bitcoin#21753: doc: add -addrinfo to tor docs
001947d 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UdjinM6 UdjinM6 UdjinM6 requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@vijaydasmp @UdjinM6 @laanwj