From b2b97f258fa479b7ac7c27544cc391504041381a Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Tue, 22 Jan 2019 16:33:20 +0300 Subject: [PATCH] Fix some strings, docs and cmd-line/rpc help messages (#2632) * No need to translate "Dash" * Fix missing dashification * Update docs * Fix cmd-line params help - `bool` should have no `=` - non-`bool` should have proper `` * Fix `quorum dkgstatus` help * add llmq/ into files.md --- doc/developer-notes.md | 2 ++ doc/files.md | 37 +++++++++++++------------------------ src/init.cpp | 14 +++++++------- src/qt/intro.cpp | 4 ++-- src/rpc/rpcquorums.cpp | 4 ++-- src/wallet/wallet.cpp | 8 ++++---- 6 files changed, 30 insertions(+), 39 deletions(-) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index be67692e2a47b..0231cbeab4939 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -179,6 +179,8 @@ Threads - ThreadOpenConnections : Initiates new connections to peers. +- ThreadOpenMasternodeConnections : Opens network connections to masternodes. + - ThreadMessageHandler : Higher-level message handling (sending and receiving). - DumpAddresses : Dumps IP addresses of nodes to peers.dat. diff --git a/doc/files.md b/doc/files.md index 8326c4e6610e2..c295581569d2c 100644 --- a/doc/files.md +++ b/doc/files.md @@ -1,34 +1,23 @@ * banlist.dat: stores the IPs/Subnets of banned nodes +* blocks/blk000??.dat: block data (custom, 128 MiB per file) +* blocks/rev000??.dat; block undo data (custom) +* blocks/index/*; block index (LevelDB) +* chainstate/*; block chain state database (LevelDB) * dash.conf: contains configuration settings for dashd or dash-qt * dashd.pid: stores the process id of dashd while running -* blocks/blk000??.dat: block data (custom, 128 MiB per file); since 0.8.0 -* blocks/rev000??.dat; block undo data (custom); since 0.8.0 (format changed since pre-0.8) -* blocks/index/*; block index (LevelDB); since 0.8.0 -* chainstate/*; block chain state database (LevelDB); since 0.8.0 -* database/*: BDB database environment; only used for wallet since 0.8.0 +* database/*: BDB database environment; only used for wallet * db.log: wallet database log file * debug.log: contains debug information and general logging generated by dashd or dash-qt -* fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation; since 0.10.0 -* mempool.dat: dump of the mempool's transactions; since 0.14.0. +* evodb/*: special txes and quorums database +* fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation * governance.dat: stores data for governance obgects +* instantsend.dat: stores data for instantsend locks +* llmq/*: quorum signatures database +* mempool.dat: dump of the mempool's transactions * mncache.dat: stores data for masternode list * netfulfilled.dat: stores data about recently made network requests -* peers.dat: peer IP address database (custom format); since 0.7.0 +* peers.dat: peer IP address database (custom format) * wallet.dat: personal wallet (BDB) with keys and transactions -* .cookie: session RPC authentication cookie (written at start when cookie authentication is used, deleted on shutdown): since 0.12.0 -* onion_private_key: cached Tor hidden service private key for `-listenonion`: since 0.12.0 - -Only used in pre-0.8.0 ---------------------- -* blktree/*; block chain index (LevelDB); since pre-0.8, replaced by blocks/index/* in 0.8.0 -* coins/*; unspent transaction output database (LevelDB); since pre-0.8, replaced by chainstate/* in 0.8.0 - -Only used before 0.8.0 ---------------------- -* blkindex.dat: block chain index database (BDB); replaced by {chainstate/*,blocks/index/*,blocks/rev000??.dat} in 0.8.0 -* blk000?.dat: block data (custom, 2 GiB per file); replaced by blocks/blk000??.dat in 0.8.0 - -Only used before 0.7.0 ---------------------- -* addr.dat: peer IP address database (BDB); replaced by peers.dat in 0.7.0 +* .cookie: session RPC authentication cookie (written at start when cookie authentication is used, deleted on shutdown) +* onion_private_key: cached Tor hidden service private key for `-listenonion` diff --git a/src/init.cpp b/src/init.cpp index 6b8e82f5a5288..7d75929b930a2 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -543,7 +543,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-limitancestorsize=", strprintf("Do not accept transactions whose size with all in-mempool ancestors exceeds kilobytes (default: %u)", DEFAULT_ANCESTOR_SIZE_LIMIT)); strUsage += HelpMessageOpt("-limitdescendantcount=", strprintf("Do not accept transactions if any ancestor would have or more in-mempool descendants (default: %u)", DEFAULT_DESCENDANT_LIMIT)); strUsage += HelpMessageOpt("-limitdescendantsize=", strprintf("Do not accept transactions if any ancestor would have more than kilobytes of in-mempool descendants (default: %u).", DEFAULT_DESCENDANT_SIZE_LIMIT)); - strUsage += HelpMessageOpt("-bip9params=deployment:start:end", "Use given start/end times for specified BIP9 deployment (regtest-only)"); + strUsage += HelpMessageOpt("-bip9params=::", "Use given start/end times for specified BIP9 deployment (regtest-only)"); strUsage += HelpMessageOpt("-watchquorums=", strprintf("Watch and validate quorum communication (default: %u)", llmq::DEFAULT_WATCH_QUORUMS)); } std::string debugCategories = "addrman, alert, bench, cmpctblock, coindb, db, http, leveldb, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq, " @@ -579,18 +579,18 @@ std::string HelpMessage(HelpMessageMode mode) } strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink debug.log file on client startup (default: 1 when no -debug)")); AppendParamsHelpMessages(strUsage, showDebug); - strUsage += HelpMessageOpt("-litemode=", strprintf(_("Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)"), 0)); - strUsage += HelpMessageOpt("-sporkaddr=", strprintf(_("Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you."))); + strUsage += HelpMessageOpt("-litemode", strprintf(_("Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)"), 0)); + strUsage += HelpMessageOpt("-sporkaddr=", strprintf(_("Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you."))); strUsage += HelpMessageOpt("-minsporkkeys=", strprintf(_("Overrides minimum spork signers to change spork value. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you."))); strUsage += HelpMessageGroup(_("Masternode options:")); - strUsage += HelpMessageOpt("-masternode=", strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0)); + strUsage += HelpMessageOpt("-masternode", strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0)); strUsage += HelpMessageOpt("-masternodeblsprivkey=", _("Set the masternode BLS private key")); #ifdef ENABLE_WALLET strUsage += HelpMessageGroup(_("PrivateSend options:")); - strUsage += HelpMessageOpt("-enableprivatesend=", strprintf(_("Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)"), 0)); - strUsage += HelpMessageOpt("-privatesendmultisession=", strprintf(_("Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)"), DEFAULT_PRIVATESEND_MULTISESSION)); + strUsage += HelpMessageOpt("-enableprivatesend", strprintf(_("Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)"), 0)); + strUsage += HelpMessageOpt("-privatesendmultisession", strprintf(_("Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)"), DEFAULT_PRIVATESEND_MULTISESSION)); strUsage += HelpMessageOpt("-privatesendsessions=", strprintf(_("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_SESSIONS, MAX_PRIVATESEND_SESSIONS, DEFAULT_PRIVATESEND_SESSIONS)); strUsage += HelpMessageOpt("-privatesendrounds=", strprintf(_("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_ROUNDS, MAX_PRIVATESEND_ROUNDS, DEFAULT_PRIVATESEND_ROUNDS)); strUsage += HelpMessageOpt("-privatesendamount=", strprintf(_("Keep N DASH anonymized (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT)); @@ -599,7 +599,7 @@ std::string HelpMessage(HelpMessageMode mode) #endif // ENABLE_WALLET strUsage += HelpMessageGroup(_("InstantSend options:")); - strUsage += HelpMessageOpt("-enableinstantsend=", strprintf(_("Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)"), 1)); + strUsage += HelpMessageOpt("-enableinstantsend", strprintf(_("Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)"), 1)); strUsage += HelpMessageOpt("-instantsendnotify=", _("Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)")); diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 117d4424c3434..36da905d2c276 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -130,7 +130,7 @@ Intro::Intro(QWidget *parent) : .arg(tr(PACKAGE_NAME)) .arg(BLOCK_CHAIN_SIZE) .arg(2014) - .arg(tr("Dash")) + .arg("Dash") ); ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME))); @@ -149,7 +149,7 @@ Intro::Intro(QWidget *parent) : } requiredSpace += CHAIN_STATE_SIZE; ui->sizeWarningLabel->setText( - tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " + + tr("%1 will download and store a copy of the Dash block chain.").arg(tr(PACKAGE_NAME)) + " " + storageRequiresMsg.arg(requiredSpace) + " " + tr("The wallet will also be stored in this directory.") ); diff --git a/src/rpc/rpcquorums.cpp b/src/rpc/rpcquorums.cpp index 0eb467b220f20..677d1e203c2f3 100644 --- a/src/rpc/rpcquorums.cpp +++ b/src/rpc/rpcquorums.cpp @@ -118,9 +118,9 @@ void quorum_dkgstatus_help() throw std::runtime_error( "quorum dkgstatus (\"proTxHash\" detail_level)\n" "\nArguments:\n" - "1. \"proTxHash\" (string, optional, default=0) ProTxHash of masternode to show status for.\n" + "1. \"proTxHash\" (string, optional, default=\"\") ProTxHash of masternode to show status for.\n" " If set to an empty string, the local status is shown.\n" - "2. detail_level (number, optional, default=\"\") Detail level of output.\n" + "2. detail_level (number, optional, default=0) Detail level of output.\n" " 0=Only show counts. 1=Show member indexes. 2=Show member's ProTxHashes.\n" ); } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index fd0ec54858c03..c2ab434c45f36 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4807,9 +4807,9 @@ std::string CWallet::GetWalletHelpString(bool showDebug) strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), DEFAULT_SPEND_ZEROCONF_CHANGE)); strUsage += HelpMessageOpt("-txconfirmtarget=", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), DEFAULT_TX_CONFIRM_TARGET)); strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET)); - strUsage += HelpMessageOpt("-mnemonic", _("User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)")); - strUsage += HelpMessageOpt("-mnemonicpassphrase", _("User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)")); - strUsage += HelpMessageOpt("-hdseed", _("User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)")); + strUsage += HelpMessageOpt("-mnemonic=", _("User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)")); + strUsage += HelpMessageOpt("-mnemonicpassphrase=", _("User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)")); + strUsage += HelpMessageOpt("-hdseed=", _("User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)")); strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup")); strUsage += HelpMessageOpt("-wallet=", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), DEFAULT_WALLET_DAT)); strUsage += HelpMessageOpt("-walletbroadcast", _("Make the wallet broadcast transactions") + " " + strprintf(_("(default: %u)"), DEFAULT_WALLETBROADCAST)); @@ -4821,7 +4821,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug) strUsage += HelpMessageOpt("-keepass", strprintf(_("Use KeePass 2 integration using KeePassHttp plugin (default: %u)"), 0)); strUsage += HelpMessageOpt("-keepassport=", strprintf(_("Connect to KeePassHttp on port (default: %u)"), DEFAULT_KEEPASS_HTTP_PORT)); strUsage += HelpMessageOpt("-keepasskey=", _("KeePassHttp key for AES encrypted communication with KeePass")); - strUsage += HelpMessageOpt("-keepassid=", _("KeePassHttp id for the established association")); + strUsage += HelpMessageOpt("-keepassid=", _("KeePassHttp id for the established association")); strUsage += HelpMessageOpt("-keepassname=", _("Name to construct url for KeePass entry that stores the wallet passphrase")); if (showDebug)