Skip to content

Commit

Permalink
Merge dashpay#5998: backport: (scripted-diff) Merge bitcoin#21836, 21…
Browse files Browse the repository at this point in the history 
…710, 21753

e0d9dc1 scripted-diff: Merge bitcoin#21836: Replace three dots with ellipsis in the UI string (Vijay)
7bd0262 Merge bitcoin#21753: doc: add -addrinfo to tor docs (W. J. van der Laan)
6350b0c Merge bitcoin#21710: doc: update helps for addnode rpc and -addnode/-maxconnections config options (W. J. van der Laan)

Pull request description:

  bitcoin backports

Top commit has no ACKs.

Tree-SHA512: 0aafc4ac01f13418921d3cc4f13f42e7a4c4688918de3a801d9f7f7e6290d33b6e9408689866aef7db558b233375d2f8d01a0fe670e96dd09346ece634e45211
  • Loading branch information
@PastaPastaPasta
PastaPastaPasta committed May 19, 2024
2 parents b114e2e + e0d9dc1 commit df6d666
Show file tree
Hide file tree
Showing 27 changed files with 82 additions and 76 deletions.
4 changes: 4 additions & 0 deletions doc/tor.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ There are several ways to see your local onion address in Dash Core:
You may set the `-debug=tor` config logging option to have additional
information in the debug log about your Tor configuration.

CLI `-addrinfo` returns the number of addresses known to your node per network
type, including Tor v2 and v3. This is useful to see how many onion addresses
are known to your node for `-onlynet=onion` and how many Tor v3 addresses it
knows when upgrading to current and future Tor releases that support Tor v3 only.

## 1. Run Dash Core behind a Tor proxy

Expand Down
2 changes: 1 addition & 1 deletion src/banman.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BanMan::BanMan(fs::path ban_file, CClientUIInterface* client_interface, int64_t default_ban_time)
: m_client_interface(client_interface), m_ban_db(std::move(ban_file)), m_default_ban_time(default_ban_time)
{
if (m_client_interface) m_client_interface->InitMessage(_("Loading banlist...").translated);
if (m_client_interface) m_client_interface->InitMessage(_("Loading banlist…").translated);

int64_t n_start = GetTimeMillis();
if (m_ban_db.Read(m_banned)) {
Expand Down
10 changes: 5 additions & 5 deletions src/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ void SetupServerArgs(NodeContext& node)
ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);

argsman.AddArg("-asmap=<file>", strprintf("Specify asn mapping used for bucketing of the peers (default: %s). Relative paths will be prefixed by the net-specific datadir location.", DEFAULT_ASMAP_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-addnode=<ip>", "Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info). This option can be specified multiple times to add multiple nodes.", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::CONNECTION);
argsman.AddArg("-addnode=<ip>", strprintf("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 %u at a time and are counted separately from the -maxconnections limit.", MAX_ADDNODE_CONNECTIONS), ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::CONNECTION);
argsman.AddArg("-allowprivatenet", strprintf("Allow RFC1918 addresses to be relayed and connected to (default: %u)", DEFAULT_ALLOWPRIVATENET), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-bantime=<n>", strprintf("Default duration (in seconds) of manually configured bans (default: %u)", DEFAULT_MISBEHAVING_BANTIME), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-bind=<addr>[:<port>][=onion]", strprintf("Bind to given address and always listen on it (default: 0.0.0.0). Use [host]:port notation for IPv6. Append =onion to tag any incoming connections to that address and port as incoming Tor connections (default: 127.0.0.1:%u=onion, testnet: 127.0.0.1:%u=onion, regtest: 127.0.0.1:%u=onion)", defaultBaseParams->OnionServiceTargetPort(), testnetBaseParams->OnionServiceTargetPort(), regtestBaseParams->OnionServiceTargetPort()), ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::CONNECTION);
Expand All @@ -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);
argsman.AddArg("-maxreceivebuffer=<n>", strprintf("Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)", DEFAULT_MAXRECEIVEBUFFER), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-maxsendbuffer=<n>", strprintf("Maximum per-connection send buffer, <n>*1000 bytes (default: %u)", DEFAULT_MAXSENDBUFFER), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
argsman.AddArg("-maxtimeadjustment", strprintf("Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)", DEFAULT_MAX_TIME_ADJUSTMENT), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
Expand Down Expand Up @@ -1929,7 +1929,7 @@ bool AppInitMain(const CoreContext& context, NodeContext& node, interfaces::Bloc
};
bilingual_str strLoadError;

uiInterface.InitMessage(_("Loading block index...").translated);
uiInterface.InitMessage(_("Loading block index…").translated);

do {
bool failed_verification = false;
Expand Down Expand Up @@ -2120,7 +2120,7 @@ bool AppInitMain(const CoreContext& context, NodeContext& node, interfaces::Bloc

for (CChainState* chainstate : chainman.GetAll()) {
if (!is_coinsview_empty(chainstate)) {
uiInterface.InitMessage(_("Verifying blocks...").translated);
uiInterface.InitMessage(_("Verifying blocks…").translated);
if (fHavePruned && args.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) > MIN_BLOCKS_TO_KEEP) {
LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n",
MIN_BLOCKS_TO_KEEP);
Expand Down Expand Up @@ -2302,7 +2302,7 @@ bool AppInitMain(const CoreContext& context, NodeContext& node, interfaces::Bloc
if (!fReindex) {
LOCK(cs_main);
for (CChainState* chainstate : chainman.GetAll()) {
uiInterface.InitMessage(_("Pruning blockstore...").translated);
uiInterface.InitMessage(_("Pruning blockstore…").translated);
chainstate->PruneAndFlush();
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/masternode/sync.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ void CMasternodeSync::SwitchToNextAsset()
std::string CMasternodeSync::GetSyncStatus() const
{
switch (nCurrentAsset) {
case MASTERNODE_SYNC_BLOCKCHAIN: return _("Synchronizing blockchain...").translated;
case MASTERNODE_SYNC_GOVERNANCE: return _("Synchronizing governance objects...").translated;
case MASTERNODE_SYNC_BLOCKCHAIN: return _("Synchronizing blockchain…").translated;
case MASTERNODE_SYNC_GOVERNANCE: return _("Synchronizing governance objects…").translated;
case MASTERNODE_SYNC_FINISHED: return _("Synchronization finished").translated;
default: return "";
}
Expand Down
4 changes: 2 additions & 2 deletions src/net.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3299,7 +3299,7 @@ bool CConnman::Start(CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_met
}

if (clientInterface) {
clientInterface->InitMessage(_("Loading P2P addresses...").translated);
clientInterface->InitMessage(_("Loading P2P addresses…").translated);
}
// Load addresses from peers.dat
int64_t nStart = GetTimeMillis();
Expand All @@ -3323,7 +3323,7 @@ bool CConnman::Start(CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_met
LogPrintf("%i block-relay-only anchors will be tried for connections.\n", m_anchors.size());
}

uiInterface.InitMessage(_("Starting network threads...").translated);
uiInterface.InitMessage(_("Starting network threads…").translated);

fAddressesInitialized = true;

Expand Down
2 changes: 1 addition & 1 deletion src/qt/bitcoin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ int GuiMain(int argc, char* argv[])
if (app.baseInitialize()) {
app.requestInitialize();
#if defined(Q_OS_WIN)
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely...").arg(PACKAGE_NAME), (HWND)app.getMainWinId());
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely…").arg(PACKAGE_NAME), (HWND)app.getMainWinId());
#endif
app.exec();
app.requestShutdown();
Expand Down
40 changes: 20 additions & 20 deletions src/qt/bitcoingui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,29 +383,29 @@ void BitcoinGUI::createActions()
aboutQtAction = new QAction(tr("About &Qt"), this);
aboutQtAction->setStatusTip(tr("Show information about Qt"));
aboutQtAction->setMenuRole(QAction::AboutQtRole);
optionsAction = new QAction(tr("&Options..."), this);
optionsAction = new QAction(tr("&Options…"), this);
optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(PACKAGE_NAME));
optionsAction->setMenuRole(QAction::PreferencesRole);
optionsAction->setEnabled(false);
toggleHideAction = new QAction(tr("&Show / Hide"), this);
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));

encryptWalletAction = new QAction(tr("&Encrypt Wallet..."), this);
encryptWalletAction = new QAction(tr("&Encrypt Wallet…"), this);
encryptWalletAction->setStatusTip(tr("Encrypt the private keys that belong to your wallet"));
backupWalletAction = new QAction(tr("&Backup Wallet..."), this);
backupWalletAction = new QAction(tr("&Backup Wallet…"), this);
backupWalletAction->setStatusTip(tr("Backup wallet to another location"));
changePassphraseAction = new QAction(tr("&Change Passphrase..."), this);
changePassphraseAction = new QAction(tr("&Change Passphrase…"), this);
changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
unlockWalletAction = new QAction(tr("&Unlock Wallet..."), this);
unlockWalletAction = new QAction(tr("&Unlock Wallet…"), this);
unlockWalletAction->setToolTip(tr("Unlock wallet"));
lockWalletAction = new QAction(tr("&Lock Wallet"), this);
signMessageAction = new QAction(tr("Sign &message..."), this);
signMessageAction = new QAction(tr("Sign &message…"), this);
signMessageAction->setStatusTip(tr("Sign messages with your Dash addresses to prove you own them"));
verifyMessageAction = new QAction(tr("&Verify message..."), this);
verifyMessageAction = new QAction(tr("&Verify message…"), this);
verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Dash addresses"));
m_load_psbt_action = new QAction(tr("&Load PSBT from file..."), this);
m_load_psbt_action = new QAction(tr("&Load PSBT from file…"), this);
m_load_psbt_action->setStatusTip(tr("Load Partially Signed Dash Transaction"));
m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard..."), this);
m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard…"), this);
m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction from clipboard"));

openInfoAction = new QAction(tr("&Information"), this);
Expand Down Expand Up @@ -437,22 +437,22 @@ void BitcoinGUI::createActions()
usedReceivingAddressesAction = new QAction(tr("&Receiving addresses"), this);
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));

openAction = new QAction(tr("Open &URI..."), this);
openAction = new QAction(tr("Open &URI…"), this);
openAction->setStatusTip(tr("Open a dash: URI"));

m_open_wallet_action = new QAction(tr("Open Wallet"), this);
m_open_wallet_action->setEnabled(false);
m_open_wallet_action->setStatusTip(tr("Open a wallet"));
m_open_wallet_menu = new QMenu(this);

m_close_wallet_action = new QAction(tr("Close Wallet..."), this);
m_close_wallet_action = new QAction(tr("Close Wallet…"), this);
m_close_wallet_action->setStatusTip(tr("Close wallet"));

m_create_wallet_action = new QAction(tr("Create Wallet..."), this);
m_create_wallet_action = new QAction(tr("Create Wallet…"), this);
m_create_wallet_action->setEnabled(false);
m_create_wallet_action->setStatusTip(tr("Create a new wallet"));

m_close_all_wallets_action = new QAction(tr("Close All Wallets..."), this);
m_close_all_wallets_action = new QAction(tr("Close All Wallets…"), this);
m_close_all_wallets_action->setStatusTip(tr("Close all wallets"));

showHelpMessageAction = new QAction(tr("&Command-line options"), this);
Expand Down Expand Up @@ -1300,7 +1300,7 @@ void BitcoinGUI::updateHeadersSyncProgressLabel()
int headersTipHeight = clientModel->getHeaderTipHeight();
int estHeadersLeft = (GetTime() - headersTipTime) / Params().GetConsensus().nPowTargetSpacing;
if (estHeadersLeft > HEADER_HEIGHT_DELTA_SYNC)
progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1)));
progressBarLabel->setText(tr("Syncing Headers (%1%)…").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1)));
}

void BitcoinGUI::openOptionsDialogWithTab(OptionsDialog::Tab tab)
Expand Down Expand Up @@ -1421,24 +1421,24 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, const QStri
updateHeadersSyncProgressLabel();
return;
}
progressBarLabel->setText(tr("Synchronizing with network..."));
progressBarLabel->setText(tr("Synchronizing with network…"));
updateHeadersSyncProgressLabel();
break;
case BlockSource::DISK:
if (header) {
progressBarLabel->setText(tr("Indexing blocks on disk..."));
progressBarLabel->setText(tr("Indexing blocks on disk…"));
} else {
progressBarLabel->setText(tr("Processing blocks on disk..."));
progressBarLabel->setText(tr("Processing blocks on disk…"));
}
break;
case BlockSource::REINDEX:
progressBarLabel->setText(tr("Reindexing blocks on disk..."));
progressBarLabel->setText(tr("Reindexing blocks on disk…"));
break;
case BlockSource::NONE:
if (header) {
return;
}
progressBarLabel->setText(tr("Connecting to peers..."));
progressBarLabel->setText(tr("Connecting to peers…"));
break;
}

Expand Down Expand Up @@ -1470,7 +1470,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, const QStri
progressBar->setMaximum(1000000000);
progressBar->setValue(nVerificationProgress * 1000000000.0 + 0.5);

tooltip = tr("Catching up...") + QString("<br>") + tooltip;
tooltip = tr("Catching up…") + QString("<br>") + tooltip;

#ifdef ENABLE_WALLET
if(walletFrame)
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/intro.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
</size>
</property>
<property name="text">
<string notr="true">...</string>
<string notr="true">…</string>
</property>
<property name="autoDefault">
<bool>false</bool>
Expand Down
8 changes: 4 additions & 4 deletions src/qt/forms/modaloverlay.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<item row="0" column="1">
<widget class="QLabel" name="numberOfBlocksLeft">
<property name="text">
<string>Unknown...</string>
<string>Unknown…</string>
</property>
</widget>
</item>
Expand All @@ -211,7 +211,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Unknown...</string>
<string>Unknown…</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -243,7 +243,7 @@
<item row="4" column="1">
<widget class="QLabel" name="progressIncreasePerH">
<property name="text">
<string>calculating...</string>
<string>calculating…</string>
</property>
</widget>
</item>
Expand All @@ -257,7 +257,7 @@
<item row="5" column="1">
<widget class="QLabel" name="expectedTimeLeft">
<property name="text">
<string>calculating...</string>
<string>calculating…</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/psbtoperationsdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<item>
<widget class="QPushButton" name="saveButton">
<property name="text">
<string>Save...</string>
<string>Save…</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/qrdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<item>
<widget class="QPushButton" name="button_saveImage">
<property name="text">
<string>&amp;Save Image...</string>
<string>&amp;Save Image…</string>
</property>
<property name="autoDefault">
<bool>false</bool>
Expand Down
8 changes: 4 additions & 4 deletions src/qt/forms/receiverequestdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Request payment to ...</string>
<string>Request payment to …</string>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
<property name="sizeConstraint">
Expand Down Expand Up @@ -65,7 +65,7 @@
<item row="2" column="1" alignment="Qt::AlignTop">
<widget class="QLabel" name="uri_content">
<property name="text">
<string notr="true">bitcoin:BC1...</string>
<string notr="true">bitcoin:BC1…</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
Expand Down Expand Up @@ -97,7 +97,7 @@
<item row="3" column="1" alignment="Qt::AlignTop">
<widget class="QLabel" name="address_content">
<property name="text">
<string notr="true">bc1...</string>
<string notr="true">bc1…</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
Expand Down Expand Up @@ -257,7 +257,7 @@
<item>
<widget class="QPushButton" name="btnSaveAs">
<property name="text">
<string>&amp;Save Image...</string>
<string>&amp;Save Image…</string>
</property>
<property name="autoDefault">
<bool>false</bool>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/forms/sendcoinsdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>Inputs...</string>
<string>Inputs…</string>
</property>
<property name="autoDefault">
<bool>false</bool>
Expand Down Expand Up @@ -669,7 +669,7 @@
<item>
<widget class="QPushButton" name="buttonChooseFee">
<property name="text">
<string>Choose...</string>
<string>Choose…</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -939,7 +939,7 @@
<item>
<widget class="QLabel" name="labelSmartFee2">
<property name="text">
<string>(Smart fee not initialized yet. This usually takes a few blocks...)</string>
<string>(Smart fee not initialized yet. This usually takes a few blocks…)</string>
</property>
</widget>
</item>
Expand Down
Loading

0 comments on commit df6d666

Please sign in to comment.