diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/bench/coin_selection.cpp | 24 | ||||
| -rw-r--r-- | src/bitcoind.cpp | 4 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 253 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 1289 | ||||
| -rw-r--r-- | src/script/sign.h | 18 | ||||
| -rw-r--r-- | src/serialize.h | 8 | ||||
| -rw-r--r-- | src/test/netbase_tests.cpp | 8 | ||||
| -rw-r--r-- | src/util.h | 14 | ||||
| -rw-r--r-- | src/wallet/coincontrol.cpp | 23 | ||||
| -rw-r--r-- | src/wallet/coincontrol.h | 16 | ||||
| -rw-r--r-- | src/wallet/coinselection.cpp | 150 | ||||
| -rw-r--r-- | src/wallet/coinselection.h | 55 | ||||
| -rw-r--r-- | src/wallet/init.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/test/coinselector_tests.cpp | 120 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 115 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 27 |
17 files changed, 731 insertions, 1395 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2603dbae56..60ecf07a59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -274,6 +274,7 @@ libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_wallet_a_SOURCES = \ interfaces/wallet.cpp \ + wallet/coincontrol.cpp \ wallet/crypter.cpp \ wallet/db.cpp \ wallet/feebumper.cpp \ diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp index f3180809b5..7510d53c88 100644 --- a/src/bench/coin_selection.cpp +++ b/src/bench/coin_selection.cpp @@ -8,7 +8,7 @@ #include <set> -static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<COutput>& vCoins) +static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<OutputGroup>& groups) { int nInput = 0; @@ -21,7 +21,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<CO int nAge = 6 * 24; COutput output(wtx, nInput, nAge, true /* spendable */, true /* solvable */, true /* safe */); - vCoins.push_back(output); + groups.emplace_back(output.GetInputCoin(), 0, false, 0, 0); } // Simple benchmark for wallet coin selection. Note that it maybe be necessary @@ -37,11 +37,11 @@ static void CoinSelection(benchmark::State& state) LOCK(wallet.cs_wallet); // Add coins. - std::vector<COutput> vCoins; + std::vector<OutputGroup> groups; for (int i = 0; i < 1000; ++i) { - addCoin(1000 * COIN, wallet, vCoins); + addCoin(1000 * COIN, wallet, groups); } - addCoin(3 * COIN, wallet, vCoins); + addCoin(3 * COIN, wallet, groups); const CoinEligibilityFilter filter_standard(1, 6, 0); const CoinSelectionParams coin_selection_params(true, 34, 148, CFeeRate(0), 0); @@ -49,7 +49,7 @@ static void CoinSelection(benchmark::State& state) std::set<CInputCoin> setCoinsRet; CAmount nValueRet; bool bnb_used; - bool success = wallet.SelectCoinsMinConf(1003 * COIN, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used); + bool success = wallet.SelectCoinsMinConf(1003 * COIN, filter_standard, groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used); assert(success); assert(nValueRet == 1003 * COIN); assert(setCoinsRet.size() == 2); @@ -57,17 +57,21 @@ static void CoinSelection(benchmark::State& state) } typedef std::set<CInputCoin> CoinSet; +static const CWallet testWallet("dummy", WalletDatabase::CreateDummy()); +std::vector<std::unique_ptr<CWalletTx>> wtxn; // Copied from src/wallet/test/coinselector_tests.cpp -static void add_coin(const CAmount& nValue, int nInput, std::vector<CInputCoin>& set) +static void add_coin(const CAmount& nValue, int nInput, std::vector<OutputGroup>& set) { CMutableTransaction tx; tx.vout.resize(nInput + 1); tx.vout[nInput].nValue = nValue; - set.emplace_back(MakeTransactionRef(tx), nInput); + std::unique_ptr<CWalletTx> wtx(new CWalletTx(&testWallet, MakeTransactionRef(std::move(tx)))); + set.emplace_back(COutput(wtx.get(), nInput, 0, true, true, true).GetInputCoin(), 0, true, 0, 0); + wtxn.emplace_back(std::move(wtx)); } // Copied from src/wallet/test/coinselector_tests.cpp -static CAmount make_hard_case(int utxos, std::vector<CInputCoin>& utxo_pool) +static CAmount make_hard_case(int utxos, std::vector<OutputGroup>& utxo_pool) { utxo_pool.clear(); CAmount target = 0; @@ -82,7 +86,7 @@ static CAmount make_hard_case(int utxos, std::vector<CInputCoin>& utxo_pool) static void BnBExhaustion(benchmark::State& state) { // Setup - std::vector<CInputCoin> utxo_pool; + std::vector<OutputGroup> utxo_pool; CoinSet selection; CAmount value_ret = 0; CAmount not_input_fees = 0; diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index a18ad2dfeb..5c711c0773 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -29,12 +29,14 @@ * * \section intro_sec Introduction * - * This is the developer documentation of the reference client for an experimental new digital currency called Bitcoin (https://www.bitcoin.org/), + * This is the developer documentation of the reference client for an experimental new digital currency called Bitcoin, * which enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate * with no central authority: managing transactions and issuing money are carried out collectively by the network. * * The software is a community-driven open source project, released under the MIT license. * + * See https://github.com/bitcoin/bitcoin and https://bitcoincore.org/ for further information about the project. + * * \section Navigation * Use the buttons <code>Namespaces</code>, <code>Classes</code> or <code>Files</code> at the top of the page to start navigating the code. */ diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index adf001c968..ab7e56a9da 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -12,128 +12,37 @@ static const char UNUSED *bitcoin_strings[] = { QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core"), QT_TRANSLATE_NOOP("bitcoin-core", "The %s developers"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"(1 = keep tx meta data e.g. account owner and payment request information, 2 " -"= drop tx meta data)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "-maxtxfee is set very high! Fees this large could be paid on a single " "transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"A fee rate (in %s/kB) that will be used when fee estimation has insufficient " -"data (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Accept relayed transactions received from whitelisted peers even when not " -"relaying transactions (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Add a node to connect to and attempt to keep the connection open (see the " -"`addnode` RPC command help for more info)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Allow JSON-RPC connections from specified source. Valid for <ip> are a " -"single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or " -"a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Bind to given address and always listen on it. Use [host]:port notation for " -"IPv6"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Bind to given address and whitelist peers connecting to it. Use [host]:port " -"notation for IPv6"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Bind to given address to listen for JSON-RPC connections. This option is " -"ignored unless -rpcallowip is also passed. Port is optional and overrides -" -"rpcport. Use [host]:port notation for IPv6. This option can be specified " -"multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -" -"rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)"), +"Can't generate a change-address key. Private keys are disabled for this " +"wallet."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. %s is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot provide specific connections and have addrman find outgoing " "connections at the same."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Connect only to the specified node(s); -connect=0 disables automatic " -"connections (the rules for this peer are the same as for -addnode)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Create new files with system default permissions, instead of umask 077 (only " -"effective with disabled wallet functionality)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Delete all wallet transactions and only recover those parts of the " -"blockchain through -rescan on startup"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Discover own IP addresses (default: 1 when listening and no -externalip or -" -"proxy)"), +"Cannot upgrade a non HD split wallet without upgrading to support pre split " +"keypool. Please use -upgradewallet=169900 or -upgradewallet with no version " +"specified."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Distributed under the MIT software license, see the accompanying file %s or " "%s"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Do not keep transactions in the mempool longer than <n> hours (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Equivalent bytes per sigop in transactions for relay and mining (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Error loading %s: You can't enable HD on an already existing non-HD wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Error loading wallet %s. -wallet parameter must only specify a filename (not " -"a path)."), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Error reading %s! All keys read correctly, but transaction data or address " "book entries might be missing or incorrect."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Error: Listening for incoming connections failed (listen returned error %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Exclude debugging information for a category. Can be used in conjunction " -"with -debug=1 to output debug logs for all categories except one or more " -"specified categories."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Execute command when a relevant alert is received or we see a really long " -"fork (%s in cmd is replaced by message)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Execute command when a wallet transaction changes (%s in cmd is replaced by " -"TxID)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Execute command when the best block changes (%s in cmd is replaced by block " -"hash)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Extra transactions to keep in memory for compact block reconstructions " -"(default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Fees (in %s/kB) smaller than this are considered zero fee for relaying, " -"mining and transaction creation (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Fees (in %s/kB) smaller than this are considered zero fee for transaction " -"creation (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Force relay of transactions from whitelisted peers even if they violate " -"local relay policy (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"How thorough the block verification of -checkblocks is (0-4, default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"If <category> is not supplied or if <category> = 1, output all debugging " -"information."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"If paytxfee is not set, include enough fee so transactions begin " -"confirmation on average within n blocks (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"If this block is in the chain assume that it and its ancestors are valid and " -"potentially skip their script verification (0 to verify all, default: %s, " -"testnet: %s)"), +"Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -" +"fallbackfee."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay " "fee of %s to prevent stuck transactions)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Maintain a full transaction index, used by the getrawtransaction rpc call " -"(default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"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)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Maximum size of data in data carrier transactions we relay and mine " -"(default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Maximum total fees (in %s) to use in a single wallet transaction or raw " -"transaction; setting this too low may abort large transactions (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Number of seconds to keep misbehaving peers from reconnecting (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Output debugging information (default: %u, supplying <category> is optional)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Please check that your computer's date and time are correct! If your clock " "is wrong, %s will not work properly."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -145,53 +54,14 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Prune: last wallet synchronisation goes beyond pruned data. You need to -" "reindex (download the whole blockchain again in case of pruned node)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Query for peer addresses via DNS lookup, if low on addresses (default: 1 " -"unless -connect used)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Randomize credentials for every proxy connection. This enables Tor stream " -"isolation (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Reduce storage requirements by enabling pruning (deleting) of old blocks. " -"This allows the pruneblockchain RPC to be called to delete specific blocks, " -"and enables automatic pruning of old blocks if a target size in MiB is " -"provided. This mode is incompatible with -txindex and -rescan. Warning: " -"Reverting this setting requires re-downloading the entire blockchain. " -"(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u " -"= automatically prune block files to stay under the specified target size in " -"MiB)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Rescans are not possible in pruned mode. You will need to use -reindex which " "will download the whole blockchain again."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set lowest fee rate (in %s/kB) for transactions to be included in block " -"creation. (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set the number of script verification threads (%u to %d, 0 = auto, <0 = " -"leave that many cores free, default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Sets the serialization of raw transaction or block hex returned in non-" -"verbose mode, non-segwit(0) or segwit(1) (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Specify directory to hold wallets (default: <datadir>/wallets if it exists, " -"otherwise <datadir>)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Specify location of debug log file: this can be an absolute path or a path " -"relative to the data directory (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Support filtering of blocks and transaction with bloom filters (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "The block database contains a block which appears to be from the future. " "This may be due to your computer's date and time being set incorrectly. Only " "rebuild the block database if you are sure that your computer's date and " "time are correct"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"The fee rate (in %s/kB) that indicates your tolerance for discarding change " -"by adding it to the fee (default: %s). Note: An output is discarded if it is " -"dust at this rate, but we will always discard up to the dust relay fee and a " -"discard fee above that is limited by the fee estimate for the longest target"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "The transaction amount is too small to send after the fee has been deducted"), QT_TRANSLATE_NOOP("bitcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " @@ -209,9 +79,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Total length of network version string (%i) exceeds maximum length (%i). " "Reduce the number or size of uacomments."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = " -"no limit (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Unable to replay blocks. You will need to rebuild the database using -" "reindex-chainstate."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -224,19 +91,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/" "or -whitelistforcerelay."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Use UPnP to map the listening port (default: 1 when listening and no -proxy)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: " -"%s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Username and hashed password for JSON-RPC connections. The field <userpw> " -"comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is " -"included in share/rpcuser. The client then connects normally using the " -"rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can " -"be specified multiple times"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Wallet will not create transactions that violate mempool chain limits " -"(default: %u)"), +"Warning: Private keys detected in wallet {%s} with disabled private keys"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: The network does not appear to fully agree! Some miners appear to " "be experiencing issues."), @@ -251,61 +106,30 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: We do not appear to fully agree with our peers! You may need to " "upgrade, or other nodes may need to upgrade."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Whether to save the mempool on shutdown and load on restart (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR " -"notated network (e.g. 1.2.3.0/24). Can be specified multiple times."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Whitelisted peers cannot be DoS banned and their transactions are always " -"relayed, even if they are already in the mempool, useful e.g. for a gateway"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "You need to rebuild the database using -reindex to go back to unpruned " "mode. This will redownload the entire blockchain"), QT_TRANSLATE_NOOP("bitcoin-core", "%d of last 100 blocks have unexpected version"), QT_TRANSLATE_NOOP("bitcoin-core", "%s corrupt, salvage failed"), QT_TRANSLATE_NOOP("bitcoin-core", "%s is set very high!"), -QT_TRANSLATE_NOOP("bitcoin-core", "(default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "(default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "-maxmempool must be at least %d MB"), -QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"), -QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Accept public REST requests (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), -QT_TRANSLATE_NOOP("bitcoin-core", "Always query for peer addresses via DNS lookup (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Append comment to the user agent string"), -QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet on startup"), -QT_TRANSLATE_NOOP("bitcoin-core", "Automatically create Tor hidden service (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Chain selection options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write to data directory '%s'; check permissions."), QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) %i-%i"), QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), -QT_TRANSLATE_NOOP("bitcoin-core", "Debugging/Testing options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"), QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), -QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash block in <address>"), -QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash transaction in <address>"), -QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw block in <address>"), -QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw transaction in <address>"), -QT_TRANSLATE_NOOP("bitcoin-core", "Enable transaction replacement in the memory pool (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Error creating %s: You can't create non-HD wallets with this version."), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Private keys can only be disabled during creation"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: You can't disable HD on an already existing HD wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet %s. -wallet filename must be a regular file."), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet %s. Duplicate -wallet filename specified."), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet %s. Invalid characters in -wallet filename."), QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."), QT_TRANSLATE_NOOP("bitcoin-core", "Error upgrading chainstate database"), @@ -314,11 +138,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: A fatal internal error occurred, see d QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"), -QT_TRANSLATE_NOOP("bitcoin-core", "Fee (in %s/kB) to add to transactions you send (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: %u, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "Importing..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file on startup"), -QT_TRANSLATE_NOOP("bitcoin-core", "Include IP addresses in debug output (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"), QT_TRANSLATE_NOOP("bitcoin-core", "Information"), QT_TRANSLATE_NOOP("bitcoin-core", "Initialization sanity check failed. %s is shutting down."), @@ -330,62 +150,25 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -discardfee=<amount>: '%s' QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -fallbackfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Keep the transaction memory pool below <n> megabytes (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Keypool ran out, please call keypoolrefill first"), -QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: %u or testnet: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Loading P2P addresses..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading banlist..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Location of the auth cookie (default: data dir)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Make the wallet broadcast transactions"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Node relay options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."), -QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network <net> (ipv4, ipv6 or onion)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), -QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Print this help message and exit"), -QT_TRANSLATE_NOOP("bitcoin-core", "Print version and exit"), QT_TRANSLATE_NOOP("bitcoin-core", "Prune cannot be configured with a negative value."), QT_TRANSLATE_NOOP("bitcoin-core", "Prune mode is incompatible with -txindex."), QT_TRANSLATE_NOOP("bitcoin-core", "Pruning blockstore..."), -QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild chain state and block index from the blk*.dat files on disk"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild chain state from the currently indexed blocks"), QT_TRANSLATE_NOOP("bitcoin-core", "Reducing -maxconnections from %d to %d, because of system limitations."), -QT_TRANSLATE_NOOP("bitcoin-core", "Relay and mine data carrier transactions (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Relay non-P2SH multisig (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Replaying blocks..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions on startup"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Rewinding blocks..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions with full-RBF opt-in enabled (RPC only, default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum BIP141 block weight (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"), QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"), QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (minimum: 1, default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist.\n"), QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads..."), QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."), QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"), @@ -393,9 +176,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "The wallet will avoid paying less than the mi QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."), QT_TRANSLATE_NOOP("bitcoin-core", "This is the minimum transaction fee you pay on every transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "This is the transaction fee you will pay if you send a transaction."), -QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Tor control port password (default: empty)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Tor control port to use if onion listening enabled (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must not be negative"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction fee and change calculation failed"), @@ -406,28 +186,21 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer. %s is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate initial keys"), +QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate keys"), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to start HTTP server. See debug log for details."), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -benchmark ignored, use -debug=bench."), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use -debug=net."), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -tor found, use -onion."), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported logging category %s=%s."), -QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format on startup"), QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading UTXO database"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use the test chain"), +QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading txindex database"), QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."), -QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)..."), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside wallet directory %s"), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet debugging/testing options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart %s to complete"), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: unknown new rules activated (versionbit %i)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Whether to operate in a blocks only mode (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."), -QT_TRANSLATE_NOOP("bitcoin-core", "ZeroMQ notification options:"), }; diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 2b712b4317..1b51699b31 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -4,7 +4,7 @@ <context> <name>AddressBookPage</name> <message> - <location filename="../forms/addressbookpage.ui" line="+30"/> + <location filename="../forms/addressbookpage.ui" line="+37"/> <source>Right-click to edit address or label</source> <translation type="unfinished"></translation> </message> @@ -39,7 +39,12 @@ <translation>Delete the currently selected address from the list</translation> </message> <message> - <location line="+30"/> + <location line="-71"/> + <source>Enter address or label to search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+101"/> <source>Export the data in the current tab to a file</source> <translation>Export the data in the current tab to a file</translation> </message> @@ -54,7 +59,7 @@ <translation>&Delete</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+50"/> + <location filename="../addressbookpage.cpp" line="+85"/> <source>Choose the address to send coins to</source> <translation type="unfinished"></translation> </message> @@ -84,12 +89,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>&Copy Address</source> <translation type="unfinished"></translation> </message> @@ -104,7 +109,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+193"/> + <location line="+177"/> <source>Export Address List</source> <translation type="unfinished"></translation> </message> @@ -127,7 +132,7 @@ <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+169"/> + <location filename="../addresstablemodel.cpp" line="+164"/> <source>Label</source> <translation type="unfinished"></translation> </message> @@ -291,7 +296,7 @@ <context> <name>BanTableModel</name> <message> - <location filename="../bantablemodel.cpp" line="+89"/> + <location filename="../bantablemodel.cpp" line="+88"/> <source>IP/Netmask</source> <translation type="unfinished"></translation> </message> @@ -304,27 +309,27 @@ <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+358"/> + <location filename="../bitcoingui.cpp" line="+307"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+430"/> + <location line="+483"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-508"/> + <location line="-561"/> <source>&Overview</source> <translation>&Overview</translation> </message> <message> - <location line="-144"/> + <location line="-140"/> <source>Node</source> <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+141"/> <source>Show general overview of wallet</source> <translation>Show general overview of wallet</translation> </message> @@ -409,7 +414,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+360"/> + <location line="+104"/> + <source>Wallet:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+83"/> + <source>default wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+226"/> <source>Click to disable network activity.</source> <translation type="unfinished"></translation> </message> @@ -434,7 +449,12 @@ <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-511"/> + <location line="+316"/> + <source>Proxy is <b>enabled</b>: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-880"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -464,17 +484,17 @@ <translation>&Verify message...</translation> </message> <message> - <location line="+517"/> + <location line="+570"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-743"/> + <location line="-792"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+153"/> + <location line="+149"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -554,7 +574,7 @@ <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+357"/> + <location line="+410"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -615,12 +635,12 @@ <translation>Up to date</translation> </message> <message> - <location line="-441"/> + <location line="-494"/> <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> <translation type="unfinished"></translation> </message> <message> - <location line="+200"/> + <location line="+253"/> <source>%1 client</source> <translation type="unfinished"></translation> </message> @@ -635,7 +655,7 @@ <translation>Catching up...</translation> </message> <message> - <location line="+145"/> + <location line="+151"/> <source>Date: %1 </source> <translation type="unfinished"></translation> @@ -647,7 +667,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+2"/> + <source>Wallet: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Type: %1 </source> <translation type="unfinished"></translation> @@ -695,7 +721,7 @@ <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+534"/> + <location filename="../bitcoin.cpp" line="+529"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -849,7 +875,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+325"/> + <location line="+315"/> <source>(%1 locked)</source> <translation type="unfinished"></translation> </message> @@ -874,8 +900,8 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> - <location line="+52"/> + <location line="+45"/> + <location line="+54"/> <source>(no label)</source> <translation type="unfinished"></translation> </message> @@ -918,12 +944,7 @@ <translation>&Address</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+30"/> - <source>New receiving address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location filename="../editaddressdialog.cpp" line="+29"/> <source>New sending address</source> <translation type="unfinished"></translation> </message> @@ -938,17 +959,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+72"/> + <location line="+71"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>The entered address "%1" is already in the address book.</source> + <location line="+33"/> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> <translation type="unfinished"></translation> </message> <message> <location line="+5"/> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-28"/> <source>Could not unlock wallet.</source> <translation type="unfinished"></translation> </message> @@ -961,7 +987,7 @@ <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+76"/> + <location filename="../intro.cpp" line="+77"/> <source>A new data directory will be created.</source> <translation>A new data directory will be created.</translation> </message> @@ -989,7 +1015,7 @@ <context> <name>HelpMessageDialog</name> <message> - <location filename="../utilitydialog.cpp" line="+40"/> + <location filename="../utilitydialog.cpp" line="+41"/> <source>version</source> <translation type="unfinished">version</translation> </message> @@ -1009,51 +1035,6 @@ <source>Command-line options</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+1"/> - <source>Usage:</source> - <translation type="unfinished">Usage:</translation> - </message> - <message> - <location line="+1"/> - <source>command-line options</source> - <translation type="unfinished">command-line options</translation> - </message> - <message> - <location line="+9"/> - <source>UI Options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Choose data directory on startup (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Start minimized</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Show splash screen on startup (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Reset all settings changed in the GUI</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>Intro</name> @@ -1128,7 +1109,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Error</source> <translation>Error</translation> </message> @@ -1238,7 +1219,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../openuridialog.cpp" line="+47"/> + <location filename="../openuridialog.cpp" line="+45"/> <source>Select payment request file to open</source> <translation type="unfinished"></translation> </message> @@ -1266,7 +1247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+72"/> <source>Size of &database cache</source> <translation type="unfinished"></translation> </message> @@ -1350,7 +1331,27 @@ <translation>&Network</translation> </message> <message> - <location line="-85"/> + <location line="-191"/> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Prune &block storage to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>GB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+25"/> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>(0 = auto, <0 = leave that many cores free)</source> <translation type="unfinished"></translation> </message> @@ -1518,28 +1519,28 @@ <translation>&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+82"/> + <location filename="../optionsdialog.cpp" line="+92"/> <source>default</source> <translation>default</translation> </message> <message> - <location line="+64"/> + <location line="+52"/> <source>none</source> <translation type="unfinished"></translation> </message> <message> - <location line="+72"/> + <location line="+77"/> <source>Confirm options reset</source> <translation>Confirm options reset</translation> </message> <message> <location line="+1"/> - <location line="+55"/> + <location line="+60"/> <source>Client restart required to activate changes.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-55"/> + <location line="-60"/> <source>Client will be shut down. Do you want to proceed?</source> <translation type="unfinished"></translation> </message> @@ -1564,7 +1565,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>This change would require a client restart.</source> <translation type="unfinished"></translation> </message> @@ -1671,10 +1672,10 @@ <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+326"/> - <location line="+214"/> + <location filename="../paymentserver.cpp" line="+317"/> + <location line="+215"/> <location line="+42"/> - <location line="+111"/> + <location line="+110"/> <location line="+14"/> <location line="+18"/> <source>Payment request error</source> @@ -1686,14 +1687,20 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+102"/> + <location line="+82"/> + <location line="+21"/> <location line="+13"/> <location line="+7"/> <source>URI handling</source> <translation type="unfinished"></translation> </message> <message> - <location line="-19"/> + <location line="-41"/> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+22"/> <source>Payment request fetch URL is invalid: %1</source> <translation type="unfinished"></translation> </message> @@ -1723,12 +1730,12 @@ <location line="+31"/> <location line="+10"/> <location line="+17"/> - <location line="+86"/> + <location line="+85"/> <source>Payment request rejected</source> <translation type="unfinished"></translation> </message> <message> - <location line="-153"/> + <location line="-152"/> <source>Payment request network doesn't match client network.</source> <translation type="unfinished"></translation> </message> @@ -1759,12 +1766,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>Refund from %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+31"/> <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> <translation type="unfinished"></translation> </message> @@ -1797,7 +1804,7 @@ <context> <name>PeerTableModel</name> <message> - <location filename="../peertablemodel.cpp" line="+121"/> + <location filename="../peertablemodel.cpp" line="+109"/> <source>User Agent</source> <translation type="unfinished"></translation> </message> @@ -1830,17 +1837,17 @@ <context> <name>QObject</name> <message> - <location filename="../bitcoinunits.cpp" line="+185"/> + <location filename="../bitcoinunits.cpp" line="+197"/> <source>Amount</source> <translation type="unfinished">Amount</translation> </message> <message> - <location filename="../guiutil.cpp" line="+130"/> + <location filename="../guiutil.cpp" line="+124"/> <source>Enter a Bitcoin address (e.g. %1)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+760"/> + <location line="+722"/> <source>%1 d</source> <translation type="unfinished"></translation> </message> @@ -1950,7 +1957,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+178"/> + <location filename="../bitcoin.cpp" line="+193"/> <source>%1 didn't yet exit safely...</source> <translation type="unfinished"></translation> </message> @@ -1963,13 +1970,18 @@ <context> <name>QObject::QObject</name> <message> - <location filename="../bitcoin.cpp" line="-86"/> + <location filename="../bitcoin.cpp" line="-118"/> + <source>Error parsing command line arguments: %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <location line="+5"/> + <source>Error: Cannot parse configuration file: %1.</source> <translation type="unfinished"></translation> </message> <message> @@ -1981,7 +1993,7 @@ <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+35"/> + <location filename="../receiverequestdialog.cpp" line="+32"/> <source>&Save Image...</source> <translation type="unfinished"></translation> </message> @@ -2015,7 +2027,7 @@ <location line="+23"/> <location line="+36"/> <location line="+23"/> - <location line="+663"/> + <location line="+679"/> <location line="+23"/> <location line="+23"/> <location line="+23"/> @@ -2037,7 +2049,7 @@ <translation>N/A</translation> </message> <message> - <location line="-1345"/> + <location line="-1361"/> <source>Client version</source> <translation>Client version</translation> </message> @@ -2112,7 +2124,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+324"/> + <location line="+94"/> + <source>Wallet: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>(none)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+238"/> <source>&Reset</source> <translation type="unfinished"></translation> </message> @@ -2140,8 +2162,8 @@ </message> <message> <location line="+60"/> - <location filename="../rpcconsole.cpp" line="+496"/> - <location line="+718"/> + <location filename="../rpcconsole.cpp" line="+502"/> + <location line="+760"/> <source>Select a peer to view detailed information.</source> <translation type="unfinished"></translation> </message> @@ -2176,18 +2198,18 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1079"/> - <location line="+987"/> + <location line="-1095"/> + <location line="+1003"/> <source>User Agent</source> <translation type="unfinished"></translation> </message> <message> - <location line="-684"/> + <location line="-700"/> <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+68"/> + <location line="+84"/> <source>Decrease font size</source> <translation type="unfinished"></translation> </message> @@ -2247,7 +2269,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1116"/> + <location line="-1132"/> <source>Last block time</source> <translation>Last block time</translation> </message> @@ -2262,7 +2284,7 @@ <translation>&Console</translation> </message> <message> - <location line="+195"/> + <location line="+211"/> <source>&Network Traffic</source> <translation type="unfinished"></translation> </message> @@ -2272,7 +2294,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-401"/> + <location filename="../rpcconsole.cpp" line="-414"/> <source>In:</source> <translation type="unfinished"></translation> </message> @@ -2282,17 +2304,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/debugwindow.ui" line="-299"/> + <location filename="../forms/debugwindow.ui" line="-315"/> <source>Debug log file</source> <translation>Debug log file</translation> </message> <message> - <location line="+136"/> + <location line="+152"/> <source>Clear console</source> <translation>Clear console</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-225"/> + <location filename="../rpcconsole.cpp" line="-253"/> <source>1 &hour</source> <translation type="unfinished"></translation> </message> @@ -2330,7 +2352,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+136"/> + <location line="+54"/> + <source>default wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+110"/> <source>Welcome to the %1 RPC console.</source> <translation type="unfinished"></translation> </message> @@ -2360,7 +2387,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+243"/> + <location line="+68"/> + <source>Executing command without any wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Executing command using "%1" wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+190"/> <source>(node id: %1)</source> <translation type="unfinished"></translation> </message> @@ -2453,27 +2490,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+142"/> - <source>Requested payments history</source> + <location line="+78"/> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-162"/> - <source>&Request payment</source> + <location line="+3"/> + <source>Generate native segwit (Bech32) address</source> <translation type="unfinished"></translation> </message> <message> - <location line="+98"/> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> + <location line="+61"/> + <source>Requested payments history</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Generate Bech32 address</source> + <location line="-162"/> + <source>&Request payment</source> <translation type="unfinished"></translation> </message> <message> - <location line="+86"/> + <location line="+187"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"></translation> </message> @@ -2571,7 +2608,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+2"/> + <source>Wallet</source> + <translation type="unfinished">Wallet</translation> + </message> + <message> + <location line="+11"/> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation type="unfinished"></translation> </message> @@ -2584,7 +2626,7 @@ <context> <name>RecentRequestsTableModel</name> <message> - <location filename="../recentrequeststablemodel.cpp" line="+28"/> + <location filename="../recentrequeststablemodel.cpp" line="+27"/> <source>Date</source> <translation type="unfinished">Date</translation> </message> @@ -2623,7 +2665,7 @@ <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+578"/> + <location filename="../sendcoinsdialog.cpp" line="+588"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -2713,22 +2755,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+54"/> - <source>per kilobyte</source> + <location line="+51"/> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-3"/> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <location line="+5"/> + <source>per kilobyte</source> <translation type="unfinished"></translation> </message> <message> - <location line="-48"/> + <location line="-53"/> <source>Hide</source> <translation type="unfinished"></translation> </message> <message> - <location line="+78"/> + <location line="+80"/> <location line="+13"/> <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> <translation type="unfinished"></translation> @@ -2769,12 +2813,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-833"/> + <location line="-835"/> <source>Dust:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+694"/> + <location line="+696"/> <source>Confirmation time target:</source> <translation type="unfinished"></translation> </message> @@ -2809,7 +2853,7 @@ <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-494"/> + <location filename="../sendcoinsdialog.cpp" line="-504"/> <source>Copy quantity</source> <translation type="unfinished"></translation> </message> @@ -2849,7 +2893,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+127"/> + <location line="+131"/> <location line="+5"/> <location line="+5"/> <location line="+4"/> @@ -2862,31 +2906,41 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+42"/> + <source>or</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source>Total Amount %1</source> + <location line="-19"/> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>or</source> + <location line="-57"/> + <source>from wallet %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <location line="+36"/> + <source>Please, review your transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+7"/> + <source>Transaction fee</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation type="unfinished"></translation> </message> <message> + <location line="+14"/> + <source>Total Amount</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+5"/> <source>Confirm send coins</source> <translation type="unfinished"></translation> @@ -2942,7 +2996,7 @@ <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+42"/> + <location line="+43"/> <source>Estimated to begin confirmation within %n block(s).</source> <translation> <numerusform>Estimated to begin confirmation within %n block.</numerusform> @@ -3084,7 +3138,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+36"/> + <location filename="../sendcoinsentry.cpp" line="+35"/> <source>Enter a label for this address to add it to your address book</source> <translation type="unfinished"></translation> </message> @@ -3101,7 +3155,7 @@ <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+78"/> + <location filename="../utilitydialog.cpp" line="+84"/> <source>%1 is shutting down...</source> <translation type="unfinished"></translation> </message> @@ -3222,12 +3276,12 @@ <translation>Reset all verify message fields</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+41"/> + <location filename="../signverifymessagedialog.cpp" line="+39"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"></translation> </message> <message> - <location line="+82"/> + <location line="+81"/> <location line="+78"/> <source>The entered address is invalid.</source> <translation type="unfinished"></translation> @@ -3304,7 +3358,7 @@ <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+80"/> + <location filename="../trafficgraphwidget.cpp" line="+81"/> <source>KB/s</source> <translation type="unfinished"></translation> </message> @@ -3312,7 +3366,7 @@ <context> <name>TransactionDesc</name> <message numerus="yes"> - <location filename="../transactiondesc.cpp" line="+30"/> + <location filename="../transactiondesc.cpp" line="+31"/> <source>Open for %n more block(s)</source> <translation> <numerusform>Open for %n more block</numerusform> @@ -3331,11 +3385,6 @@ </message> <message> <location line="+2"/> - <source>%1/offline</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> <source>0/unconfirmed, %1</source> <translation type="unfinished"></translation> </message> @@ -3365,25 +3414,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+23"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>, has not been successfully broadcast yet</source> - <translation type="unfinished"></translation> - </message> - <message numerus="yes"> - <location line="+2"/> - <source>, broadcast through %n node(s)</source> - <translation> - <numerusform>, broadcast through %n node</numerusform> - <numerusform>, broadcast through %n nodes</numerusform> - </translation> - </message> - <message> - <location line="+4"/> + <location line="+3"/> <source>Date</source> <translation type="unfinished">Date</translation> </message> @@ -3399,7 +3435,7 @@ </message> <message> <location line="+5"/> - <location line="+12"/> + <location line="+14"/> <location line="+72"/> <source>From</source> <translation type="unfinished"></translation> @@ -3412,12 +3448,12 @@ <message> <location line="+1"/> <location line="+20"/> - <location line="+69"/> + <location line="+70"/> <source>To</source> <translation type="unfinished"></translation> </message> <message> - <location line="-87"/> + <location line="-88"/> <source>own address</source> <translation type="unfinished"></translation> </message> @@ -3433,16 +3469,16 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <location line="+12"/> - <location line="+53"/> - <location line="+26"/> - <location line="+55"/> + <location line="+54"/> + <location line="+30"/> + <location line="+58"/> <source>Credit</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="-144"/> + <location line="-152"/> <source>matures in %n more block(s)</source> <translation> <numerusform>matures in %n more block</numerusform> @@ -3455,14 +3491,14 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+59"/> - <location line="+25"/> - <location line="+55"/> + <location line="+60"/> + <location line="+26"/> + <location line="+61"/> <source>Debit</source> <translation type="unfinished"></translation> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Total debit</source> <translation type="unfinished"></translation> </message> @@ -3477,18 +3513,18 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+16"/> + <location line="+22"/> <source>Net amount</source> <translation type="unfinished"></translation> </message> <message> <location line="+6"/> - <location line="+11"/> + <location line="+12"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Comment</source> <translation type="unfinished"></translation> </message> @@ -3504,6 +3540,11 @@ </message> <message> <location line="+1"/> + <source>Transaction virtual size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Output index</source> <translation type="unfinished"></translation> </message> @@ -3533,7 +3574,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>Amount</source> <translation type="unfinished">Amount</translation> </message> @@ -3566,7 +3607,7 @@ <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+248"/> + <location filename="../transactiontablemodel.cpp" line="+226"/> <source>Date</source> <translation type="unfinished">Date</translation> </message> @@ -3595,11 +3636,6 @@ </message> <message> <location line="+3"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> <source>Unconfirmed</source> <translation type="unfinished"></translation> </message> @@ -3630,11 +3666,6 @@ </message> <message> <location line="+3"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> <source>Generated but not accepted</source> <translation type="unfinished"></translation> </message> @@ -3674,7 +3705,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+213"/> + <location line="+208"/> <source>(no label)</source> <translation type="unfinished"></translation> </message> @@ -3773,17 +3804,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Enter address, transaction id, or label to search</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+4"/> <source>Min amount</source> <translation type="unfinished"></translation> </message> <message> - <location line="+48"/> + <location line="+47"/> <source>Abandon transaction</source> <translation type="unfinished"></translation> </message> @@ -3833,7 +3864,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+194"/> + <location line="+193"/> <source>Export Transaction History</source> <translation type="unfinished"></translation> </message> @@ -3911,7 +3942,7 @@ <context> <name>UnitDisplayStatusBarControl</name> <message> - <location filename="../bitcoingui.cpp" line="+129"/> + <location filename="../bitcoingui.cpp" line="+159"/> <source>Unit to show amounts in. Click to select another unit.</source> <translation type="unfinished"></translation> </message> @@ -3919,7 +3950,7 @@ <context> <name>WalletFrame</name> <message> - <location filename="../walletframe.cpp" line="+28"/> + <location filename="../walletframe.cpp" line="+29"/> <source>No wallet has been loaded.</source> <translation type="unfinished"></translation> </message> @@ -3927,12 +3958,12 @@ <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+290"/> + <location filename="../walletmodel.cpp" line="+215"/> <source>Send Coins</source> <translation type="unfinished">Send Coins</translation> </message> <message> - <location line="+384"/> + <location line="+289"/> <location line="+39"/> <location line="+6"/> <source>Fee bump error</source> @@ -3982,7 +4013,7 @@ <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+47"/> <source>&Export</source> <translation type="unfinished">&Export</translation> </message> @@ -3992,7 +4023,7 @@ <translation type="unfinished">Export the data in the current tab to a file</translation> </message> <message> - <location line="+201"/> + <location line="+207"/> <source>Backup Wallet</source> <translation type="unfinished"></translation> </message> @@ -4021,46 +4052,21 @@ <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+54"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+351"/> - <source>Options:</source> - <translation>Options:</translation> - </message> - <message> - <location line="+33"/> - <source>Specify data directory</source> - <translation>Specify data directory</translation> - </message> - <message> - <location line="-99"/> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> - </message> - <message> - <location line="+102"/> - <source>Specify your own public address</source> - <translation>Specify your own public address</translation> - </message> - <message> - <location line="-116"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accept command line and JSON-RPC commands</translation> - </message> - <message> - <location line="-209"/> + <location filename="../bitcoinstrings.cpp" line="+29"/> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation type="unfinished"></translation> </message> <message> - <location line="+44"/> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+36"/> + <location line="+22"/> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation type="unfinished"></translation> </message> @@ -4070,37 +4076,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+3"/> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+151"/> + <location line="+81"/> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+41"/> + <location line="+25"/> <source>Pruning blockstore...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Run in the background as a daemon and accept commands</translation> - </message> - <message> - <location line="+40"/> + <location line="+28"/> <source>Unable to start HTTP server. See debug log for details.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-397"/> + <location line="-178"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -4111,26 +4107,6 @@ </message> <message> <location line="+7"/> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation> - </message> - <message> - <location line="+12"/> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation type="unfinished"></translation> </message> @@ -4140,52 +4116,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+18"/> + <location line="+12"/> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> - </message> - <message> - <location line="+6"/> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> - <source>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)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation type="unfinished"></translation> </message> @@ -4195,32 +4131,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+12"/> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+14"/> + <location line="+11"/> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+7"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"></translation> </message> @@ -4230,7 +4146,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+12"/> <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> <translation type="unfinished"></translation> </message> @@ -4240,22 +4156,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+11"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation type="unfinished"></translation> </message> @@ -4265,12 +4166,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+11"/> + <location line="+6"/> <source>%d of last 100 blocks have unexpected version</source> <translation type="unfinished"></translation> </message> @@ -4280,56 +4176,21 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>-maxmempool must be at least %d MB</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source><category> can be:</source> - <translation type="unfinished"></translation> - </message> - <message> <location line="+2"/> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Append comment to the user agent string</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <source>-maxmempool must be at least %d MB</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Block creation options:</source> - <translation>Block creation options:</translation> - </message> - <message> - <location line="+2"/> <source>Cannot resolve -%s address: '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Chain selection options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Change index out of range</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Connection options:</source> - <translation type="unfinished"></translation> - </message> - <message> <location line="+1"/> <source>Copyright (C) %i-%i</source> <translation type="unfinished"></translation> @@ -4341,46 +4202,11 @@ </message> <message> <location line="+1"/> - <source>Debugging/Testing options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Do you want to rebuild the block database now?</source> <translation>Do you want to rebuild the block database now?</translation> </message> <message> <location line="+2"/> - <source>Enable publish hash block in <address></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Enable publish hash transaction in <address></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Enable publish raw block in <address></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Enable publish raw transaction in <address></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation type="unfinished"></translation> </message> @@ -4401,6 +4227,11 @@ </message> <message> <location line="+1"/> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Error loading %s: Wallet corrupted</source> <translation type="unfinished"></translation> </message> @@ -4415,7 +4246,7 @@ <translation>Error loading block database</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> <source>Error opening block database</source> <translation>Error opening block database</translation> </message> @@ -4435,12 +4266,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+1"/> <source>Importing...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+1"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>Incorrect or no genesis block found. Wrong datadir for network?</translation> </message> @@ -4465,12 +4296,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> + <location line="+47"/> + <source>Upgrading txindex database</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="-43"/> <source>Loading P2P addresses...</source> <translation type="unfinished"></translation> </message> @@ -4480,32 +4311,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Location of the auth cookie (default: data dir)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="+4"/> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> <message> <location line="+1"/> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Print this help message and exit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Print version and exit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Prune cannot be configured with a negative value.</source> <translation type="unfinished"></translation> </message> @@ -4516,46 +4327,21 @@ </message> <message> <location line="+3"/> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> <source>Replaying blocks...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Rewinding blocks...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+14"/> - <source>Specify wallet file (within data directory)</source> - <translation>Specify wallet file (within data directory)</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>The source code is available from %s.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+8"/> <source>Transaction fee and change calculation failed</source> <translation type="unfinished"></translation> </message> @@ -4565,7 +4351,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Unable to generate keys</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation type="unfinished"></translation> </message> @@ -4585,142 +4376,52 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Upgrading UTXO database</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> <location line="+1"/> - <source>Use the test chain</source> + <source>Upgrading UTXO database</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>User Agent comment (%s) contains unsafe characters.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Verifying blocks...</source> <translation>Verifying blocks...</translation> </message> <message> <location line="+3"/> - <source>Wallet debugging/testing options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Wallet options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-397"/> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+17"/> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+18"/> + <location line="-165"/> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation> - </message> - <message> - <location line="+12"/> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+14"/> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="+5"/> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+24"/> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+44"/> + <location line="+22"/> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation type="unfinished"></translation> </message> <message> - <location line="+64"/> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+44"/> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>(default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Accept public REST requests (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Connect through SOCKS5 proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> + <location line="+22"/> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+4"/> <source>Error reading from database, shutting down.</source> <translation type="unfinished"></translation> </message> @@ -4730,12 +4431,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+8"/> <source>Information</source> <translation>Information</translation> </message> @@ -4760,52 +4456,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+14"/> + <location line="+6"/> <source>Need to specify a port with -whitebind: '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Node relay options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+11"/> - <source>RPC server options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+5"/> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation type="unfinished"></translation> </message> <message> <location line="+4"/> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Send trace/debug info to console instead of debug.log file</translation> - </message> - <message> - <location line="+6"/> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> - </message> - <message> - <location line="+1"/> <source>Signing transaction failed</source> <translation>Signing transaction failed</translation> </message> @@ -4825,27 +4486,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> - <source>The transaction amount is too small to pay the fee</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>This is experimental software.</source> + <location line="+1"/> + <source>Specified blocks directory "%s" does not exist. +</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Tor control port password (default: empty)</source> + <location line="+3"/> + <source>The transaction amount is too small to pay the fee</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Tor control port to use if onion listening enabled (default: %s)</source> + <location line="+2"/> + <source>This is experimental software.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+3"/> <source>Transaction amount too small</source> <translation>Transaction amount too small</translation> </message> @@ -4870,17 +4527,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Upgrade wallet to latest format on startup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Username for JSON-RPC connections</source> - <translation>Username for JSON-RPC connections</translation> - </message> - <message> - <location line="+2"/> + <location line="+12"/> <source>Verifying wallet(s)...</source> <translation type="unfinished"></translation> </message> @@ -4890,7 +4537,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+2"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -4901,136 +4548,21 @@ </message> <message> <location line="+1"/> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Zapping all transactions from wallet...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>ZeroMQ notification options:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-80"/> - <source>Password for JSON-RPC connections</source> - <translation>Password for JSON-RPC connections</translation> - </message> - <message> - <location line="-263"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> - </message> - <message> - <location line="+185"/> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> - </message> - <message> - <location line="-260"/> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="-191"/> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+22"/> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+26"/> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+18"/> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+27"/> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+34"/> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+40"/> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation type="unfinished"></translation> </message> @@ -5045,11 +4577,6 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation type="unfinished"></translation> - </message> - <message> <location line="+9"/> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation type="unfinished"></translation> @@ -5060,12 +4587,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> + <location line="+8"/> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation type="unfinished"></translation> </message> @@ -5075,187 +4597,92 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+11"/> + <location line="+12"/> <source>%s is set very high!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>(default: %s)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+31"/> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+19"/> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Include IP addresses in debug output (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+14"/> + <location line="+21"/> <source>Keypool ran out, please call keypoolrefill first</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Make the wallet broadcast transactions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Set key pool size to <n> (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Set maximum BIP141 block weight (default: %d)</source> + <location line="+19"/> + <source>Starting network threads...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Set the number of threads to service RPC calls (default: %d)</source> + <location line="+3"/> + <source>The wallet will avoid paying less than the minimum relay fee.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Specify configuration file (default: %s)</source> + <location line="+2"/> + <source>This is the minimum transaction fee you pay on every transaction.</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <source>This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Specify pid file (default: %s)</source> + <source>Transaction amounts must not be negative</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <location line="+2"/> + <source>Transaction has too long of a mempool chain</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Starting network threads...</source> + <source>Transaction must have at least one recipient</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>The wallet will avoid paying less than the minimum relay fee.</source> - <translation type="unfinished"></translation> + <location line="+8"/> + <source>Unknown network specified in -onlynet: '%s'</source> + <translation>Unknown network specified in -onlynet: '%s'</translation> </message> <message> - <location line="+2"/> - <source>This is the minimum transaction fee you pay on every transaction.</source> - <translation type="unfinished"></translation> + <location line="-46"/> + <source>Insufficient funds</source> + <translation>Insufficient funds</translation> </message> <message> - <location line="+1"/> - <source>This is the transaction fee you will pay if you send a transaction.</source> + <location line="-128"/> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <location line="+8"/> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Transaction amounts must not be negative</source> + <location line="+14"/> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Transaction has too long of a mempool chain</source> + <location line="+54"/> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Transaction must have at least one recipient</source> + <location line="+24"/> + <source>Cannot write to data directory '%s'; check permissions.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Unknown network specified in -onlynet: '%s'</translation> - </message> - <message> - <location line="-85"/> - <source>Insufficient funds</source> - <translation>Insufficient funds</translation> - </message> - <message> - <location line="+15"/> + <location line="+39"/> <source>Loading block index...</source> <translation>Loading block index...</translation> </message> @@ -5265,22 +4692,22 @@ <translation>Loading wallet...</translation> </message> <message> - <location line="-61"/> + <location line="-42"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> <message> - <location line="+87"/> + <location line="+50"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-75"/> + <location line="-43"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+20"/> + <location line="+14"/> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/script/sign.h b/src/script/sign.h index e3a6196b28..250b637035 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -116,26 +116,24 @@ static constexpr uint8_t PSBT_OUT_BIP32_DERIVATION = 0x02; // as a 0 length key which indicates that this is the separator. The separator has no value. static constexpr uint8_t PSBT_SEPARATOR = 0x00; -// Takes a stream and multiple arguments and serializes them into a vector and then into the stream +// Takes a stream and multiple arguments and serializes them as if first serialized into a vector and then into the stream // The resulting output into the stream has the total serialized length of all of the objects followed by all objects concatenated with each other. template<typename Stream, typename... X> void SerializeToVector(Stream& s, const X&... args) { - std::vector<unsigned char> ret; - CVectorWriter ss(SER_NETWORK, PROTOCOL_VERSION, ret, 0); - SerializeMany(ss, args...); - s << ret; + WriteCompactSize(s, GetSerializeSizeMany(s, args...)); + SerializeMany(s, args...); } // Takes a stream and multiple arguments and unserializes them first as a vector then each object individually in the order provided in the arguments template<typename Stream, typename... X> void UnserializeFromVector(Stream& s, X&... args) { - std::vector<unsigned char> data; - s >> data; - CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION); - UnserializeMany(ss, args...); - if (!ss.eof()) { + size_t expected_size = ReadCompactSize(s); + size_t remaining_before = s.size(); + UnserializeMany(s, args...); + size_t remaining_after = s.size(); + if (remaining_after + expected_size != remaining_before) { throw std::ios_base::failure("Size of value was not the stated size"); } } diff --git a/src/serialize.h b/src/serialize.h index df3b47ba87..627225b6ef 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -991,4 +991,12 @@ size_t GetSerializeSize(const S& s, const T& t) return (CSizeComputer(s.GetType(), s.GetVersion()) << t).size(); } +template <typename S, typename... T> +size_t GetSerializeSizeMany(const S& s, const T&... t) +{ + CSizeComputer sc(s.GetType(), s.GetVersion()); + SerializeMany(sc, t...); + return sc.size(); +} + #endif // BITCOIN_SERIALIZE_H diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index bc90e5ae09..67f7c37f3b 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -82,10 +82,10 @@ bool static TestSplitHost(std::string test, std::string host, int port) BOOST_AUTO_TEST_CASE(netbase_splithost) { - BOOST_CHECK(TestSplitHost("www.bitcoin.org", "www.bitcoin.org", -1)); - BOOST_CHECK(TestSplitHost("[www.bitcoin.org]", "www.bitcoin.org", -1)); - BOOST_CHECK(TestSplitHost("www.bitcoin.org:80", "www.bitcoin.org", 80)); - BOOST_CHECK(TestSplitHost("[www.bitcoin.org]:80", "www.bitcoin.org", 80)); + BOOST_CHECK(TestSplitHost("www.bitcoincore.org", "www.bitcoincore.org", -1)); + BOOST_CHECK(TestSplitHost("[www.bitcoincore.org]", "www.bitcoincore.org", -1)); + BOOST_CHECK(TestSplitHost("www.bitcoincore.org:80", "www.bitcoincore.org", 80)); + BOOST_CHECK(TestSplitHost("[www.bitcoincore.org]:80", "www.bitcoincore.org", 80)); BOOST_CHECK(TestSplitHost("127.0.0.1", "127.0.0.1", -1)); BOOST_CHECK(TestSplitHost("127.0.0.1:8333", "127.0.0.1", 8333)); BOOST_CHECK(TestSplitHost("[127.0.0.1]", "127.0.0.1", -1)); diff --git a/src/util.h b/src/util.h index 2c22720a6b..23b2a787e4 100644 --- a/src/util.h +++ b/src/util.h @@ -355,4 +355,18 @@ std::string CopyrightHolders(const std::string& strPrefix); */ int ScheduleBatchPriority(void); +namespace util { + +//! Simplification of std insertion +template <typename Tdst, typename Tsrc> +inline void insert(Tdst& dst, const Tsrc& src) { + dst.insert(dst.begin(), src.begin(), src.end()); +} +template <typename TsetT, typename Tsrc> +inline void insert(std::set<TsetT>& dst, const Tsrc& src) { + dst.insert(src.begin(), src.end()); +} + +} // namespace util + #endif // BITCOIN_UTIL_H diff --git a/src/wallet/coincontrol.cpp b/src/wallet/coincontrol.cpp new file mode 100644 index 0000000000..645981faa4 --- /dev/null +++ b/src/wallet/coincontrol.cpp @@ -0,0 +1,23 @@ +// Copyright (c) 2018 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include <wallet/coincontrol.h> + +#include <util.h> + +void CCoinControl::SetNull() +{ + destChange = CNoDestination(); + m_change_type.reset(); + fAllowOtherInputs = false; + fAllowWatchOnly = false; + m_avoid_partial_spends = gArgs.GetBoolArg("-avoidpartialspends", DEFAULT_AVOIDPARTIALSPENDS); + setSelected.clear(); + m_feerate.reset(); + fOverrideFeeRate = false; + m_confirm_target.reset(); + m_signal_bip125_rbf.reset(); + m_fee_mode = FeeEstimateMode::UNSET; +} + diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h index 98b4298507..fbe6c43e24 100644 --- a/src/wallet/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -32,6 +32,8 @@ public: boost::optional<unsigned int> m_confirm_target; //! Override the wallet's m_signal_rbf if set boost::optional<bool> m_signal_bip125_rbf; + //! Avoid partial use of funds sent to a given address + bool m_avoid_partial_spends; //! Fee estimation mode to control arguments to estimateSmartFee FeeEstimateMode m_fee_mode; @@ -40,19 +42,7 @@ public: SetNull(); } - void SetNull() - { - destChange = CNoDestination(); - m_change_type.reset(); - fAllowOtherInputs = false; - fAllowWatchOnly = false; - setSelected.clear(); - m_feerate.reset(); - fOverrideFeeRate = false; - m_confirm_target.reset(); - m_signal_bip125_rbf.reset(); - m_fee_mode = FeeEstimateMode::UNSET; - } + void SetNull(); bool HasSelected() const { diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp index 78258cdec2..1a810e763f 100644 --- a/src/wallet/coinselection.cpp +++ b/src/wallet/coinselection.cpp @@ -8,7 +8,7 @@ // Descending order comparator struct { - bool operator()(const CInputCoin& a, const CInputCoin& b) const + bool operator()(const OutputGroup& a, const OutputGroup& b) const { return a.effective_value > b.effective_value; } @@ -59,7 +59,7 @@ struct { static const size_t TOTAL_TRIES = 100000; -bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_value, const CAmount& cost_of_change, std::set<CInputCoin>& out_set, CAmount& value_ret, CAmount not_input_fees) +bool SelectCoinsBnB(std::vector<OutputGroup>& utxo_pool, const CAmount& target_value, const CAmount& cost_of_change, std::set<CInputCoin>& out_set, CAmount& value_ret, CAmount not_input_fees) { out_set.clear(); CAmount curr_value = 0; @@ -70,7 +70,7 @@ bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_va // Calculate curr_available_value CAmount curr_available_value = 0; - for (const CInputCoin& utxo : utxo_pool) { + for (const OutputGroup& utxo : utxo_pool) { // Assert that this utxo is not negative. It should never be negative, effective value calculation should have removed it assert(utxo.effective_value > 0); curr_available_value += utxo.effective_value; @@ -123,11 +123,11 @@ bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_va // Output was included on previous iterations, try excluding now. curr_selection.back() = false; - CInputCoin& utxo = utxo_pool.at(curr_selection.size() - 1); + OutputGroup& utxo = utxo_pool.at(curr_selection.size() - 1); curr_value -= utxo.effective_value; curr_waste -= utxo.fee - utxo.long_term_fee; } else { // Moving forwards, continuing down this branch - CInputCoin& utxo = utxo_pool.at(curr_selection.size()); + OutputGroup& utxo = utxo_pool.at(curr_selection.size()); // Remove this utxo from the curr_available_value utxo amount curr_available_value -= utxo.effective_value; @@ -156,32 +156,32 @@ bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_va value_ret = 0; for (size_t i = 0; i < best_selection.size(); ++i) { if (best_selection.at(i)) { - out_set.insert(utxo_pool.at(i)); - value_ret += utxo_pool.at(i).txout.nValue; + util::insert(out_set, utxo_pool.at(i).m_outputs); + value_ret += utxo_pool.at(i).m_value; } } return true; } -static void ApproximateBestSubset(const std::vector<CInputCoin>& vValue, const CAmount& nTotalLower, const CAmount& nTargetValue, +static void ApproximateBestSubset(const std::vector<OutputGroup>& groups, const CAmount& nTotalLower, const CAmount& nTargetValue, std::vector<char>& vfBest, CAmount& nBest, int iterations = 1000) { std::vector<char> vfIncluded; - vfBest.assign(vValue.size(), true); + vfBest.assign(groups.size(), true); nBest = nTotalLower; FastRandomContext insecure_rand; for (int nRep = 0; nRep < iterations && nBest != nTargetValue; nRep++) { - vfIncluded.assign(vValue.size(), false); + vfIncluded.assign(groups.size(), false); CAmount nTotal = 0; bool fReachedTarget = false; for (int nPass = 0; nPass < 2 && !fReachedTarget; nPass++) { - for (unsigned int i = 0; i < vValue.size(); i++) + for (unsigned int i = 0; i < groups.size(); i++) { //The solver here uses a randomized algorithm, //the randomness serves no real security purpose but is just @@ -191,7 +191,7 @@ static void ApproximateBestSubset(const std::vector<CInputCoin>& vValue, const C //the selection random. if (nPass == 0 ? insecure_rand.randbool() : !vfIncluded[i]) { - nTotal += vValue[i].txout.nValue; + nTotal += groups[i].m_value; vfIncluded[i] = true; if (nTotal >= nTargetValue) { @@ -201,7 +201,7 @@ static void ApproximateBestSubset(const std::vector<CInputCoin>& vValue, const C nBest = nTotal; vfBest = vfIncluded; } - nTotal -= vValue[i].txout.nValue; + nTotal -= groups[i].m_value; vfIncluded[i] = false; } } @@ -210,86 +210,75 @@ static void ApproximateBestSubset(const std::vector<CInputCoin>& vValue, const C } } -bool KnapsackSolver(const CAmount& nTargetValue, std::vector<CInputCoin>& vCoins, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet) +bool KnapsackSolver(const CAmount& nTargetValue, std::vector<OutputGroup>& groups, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet) { setCoinsRet.clear(); nValueRet = 0; // List of values less than target - boost::optional<CInputCoin> coinLowestLarger; - std::vector<CInputCoin> vValue; + boost::optional<OutputGroup> lowest_larger; + std::vector<OutputGroup> applicable_groups; CAmount nTotalLower = 0; - random_shuffle(vCoins.begin(), vCoins.end(), GetRandInt); + random_shuffle(groups.begin(), groups.end(), GetRandInt); - for (const CInputCoin &coin : vCoins) - { - if (coin.txout.nValue == nTargetValue) - { - setCoinsRet.insert(coin); - nValueRet += coin.txout.nValue; + for (const OutputGroup& group : groups) { + if (group.m_value == nTargetValue) { + util::insert(setCoinsRet, group.m_outputs); + nValueRet += group.m_value; return true; - } - else if (coin.txout.nValue < nTargetValue + MIN_CHANGE) - { - vValue.push_back(coin); - nTotalLower += coin.txout.nValue; - } - else if (!coinLowestLarger || coin.txout.nValue < coinLowestLarger->txout.nValue) - { - coinLowestLarger = coin; + } else if (group.m_value < nTargetValue + MIN_CHANGE) { + applicable_groups.push_back(group); + nTotalLower += group.m_value; + } else if (!lowest_larger || group.m_value < lowest_larger->m_value) { + lowest_larger = group; } } - if (nTotalLower == nTargetValue) - { - for (const auto& input : vValue) - { - setCoinsRet.insert(input); - nValueRet += input.txout.nValue; + if (nTotalLower == nTargetValue) { + for (const auto& group : applicable_groups) { + util::insert(setCoinsRet, group.m_outputs); + nValueRet += group.m_value; } return true; } - if (nTotalLower < nTargetValue) - { - if (!coinLowestLarger) - return false; - setCoinsRet.insert(coinLowestLarger.get()); - nValueRet += coinLowestLarger->txout.nValue; + if (nTotalLower < nTargetValue) { + if (!lowest_larger) return false; + util::insert(setCoinsRet, lowest_larger->m_outputs); + nValueRet += lowest_larger->m_value; return true; } // Solve subset sum by stochastic approximation - std::sort(vValue.begin(), vValue.end(), descending); + std::sort(applicable_groups.begin(), applicable_groups.end(), descending); std::vector<char> vfBest; CAmount nBest; - ApproximateBestSubset(vValue, nTotalLower, nTargetValue, vfBest, nBest); - if (nBest != nTargetValue && nTotalLower >= nTargetValue + MIN_CHANGE) - ApproximateBestSubset(vValue, nTotalLower, nTargetValue + MIN_CHANGE, vfBest, nBest); + ApproximateBestSubset(applicable_groups, nTotalLower, nTargetValue, vfBest, nBest); + if (nBest != nTargetValue && nTotalLower >= nTargetValue + MIN_CHANGE) { + ApproximateBestSubset(applicable_groups, nTotalLower, nTargetValue + MIN_CHANGE, vfBest, nBest); + } // If we have a bigger coin and (either the stochastic approximation didn't find a good solution, // or the next bigger coin is closer), return the bigger coin - if (coinLowestLarger && - ((nBest != nTargetValue && nBest < nTargetValue + MIN_CHANGE) || coinLowestLarger->txout.nValue <= nBest)) - { - setCoinsRet.insert(coinLowestLarger.get()); - nValueRet += coinLowestLarger->txout.nValue; - } - else { - for (unsigned int i = 0; i < vValue.size(); i++) - if (vfBest[i]) - { - setCoinsRet.insert(vValue[i]); - nValueRet += vValue[i].txout.nValue; + if (lowest_larger && + ((nBest != nTargetValue && nBest < nTargetValue + MIN_CHANGE) || lowest_larger->m_value <= nBest)) { + util::insert(setCoinsRet, lowest_larger->m_outputs); + nValueRet += lowest_larger->m_value; + } else { + for (unsigned int i = 0; i < applicable_groups.size(); i++) { + if (vfBest[i]) { + util::insert(setCoinsRet, applicable_groups[i].m_outputs); + nValueRet += applicable_groups[i].m_value; } + } if (LogAcceptCategory(BCLog::SELECTCOINS)) { LogPrint(BCLog::SELECTCOINS, "SelectCoins() best subset: "); /* Continued */ - for (unsigned int i = 0; i < vValue.size(); i++) { + for (unsigned int i = 0; i < applicable_groups.size(); i++) { if (vfBest[i]) { - LogPrint(BCLog::SELECTCOINS, "%s ", FormatMoney(vValue[i].txout.nValue)); /* Continued */ + LogPrint(BCLog::SELECTCOINS, "%s ", FormatMoney(applicable_groups[i].m_value)); /* Continued */ } } LogPrint(BCLog::SELECTCOINS, "total %s\n", FormatMoney(nBest)); @@ -298,3 +287,40 @@ bool KnapsackSolver(const CAmount& nTargetValue, std::vector<CInputCoin>& vCoins return true; } + +/****************************************************************************** + + OutputGroup + + ******************************************************************************/ + +void OutputGroup::Insert(const CInputCoin& output, int depth, bool from_me, size_t ancestors, size_t descendants) { + m_outputs.push_back(output); + m_from_me &= from_me; + m_value += output.effective_value; + m_depth = std::min(m_depth, depth); + // m_ancestors is currently the max ancestor count for all coins in the group; however, this is + // not ideal, as a wallet will consider e.g. thirty 2-ancestor coins as having two ancestors, + // when in reality it has 60 ancestors. + m_ancestors = std::max(m_ancestors, ancestors); + // m_descendants is the count as seen from the top ancestor, not the descendants as seen from the + // coin itself; thus, this value is accurate + m_descendants = std::max(m_descendants, descendants); + effective_value = m_value; +} + +std::vector<CInputCoin>::iterator OutputGroup::Discard(const CInputCoin& output) { + auto it = m_outputs.begin(); + while (it != m_outputs.end() && it->outpoint != output.outpoint) ++it; + if (it == m_outputs.end()) return it; + m_value -= output.effective_value; + effective_value -= output.effective_value; + return m_outputs.erase(it); +} + +bool OutputGroup::EligibleForSpending(const CoinEligibilityFilter& eligibility_filter) const +{ + return m_depth >= (m_from_me ? eligibility_filter.conf_mine : eligibility_filter.conf_theirs) + && m_ancestors <= eligibility_filter.max_ancestors + && m_descendants <= eligibility_filter.max_descendants; +} diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 2b185879c6..1be776e695 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -28,11 +28,17 @@ public: effective_value = txout.nValue; } + CInputCoin(const CTransactionRef& tx, unsigned int i, int input_bytes) : CInputCoin(tx, i) + { + m_input_bytes = input_bytes; + } + COutPoint outpoint; CTxOut txout; CAmount effective_value; - CAmount fee = 0; - CAmount long_term_fee = 0; + + /** Pre-computed estimated size of this output as a fully-signed input in a transaction. Can be -1 if it could not be calculated */ + int m_input_bytes{-1}; bool operator<(const CInputCoin& rhs) const { return outpoint < rhs.outpoint; @@ -47,8 +53,49 @@ public: } }; -bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_value, const CAmount& cost_of_change, std::set<CInputCoin>& out_set, CAmount& value_ret, CAmount not_input_fees); +struct CoinEligibilityFilter +{ + const int conf_mine; + const int conf_theirs; + const uint64_t max_ancestors; + const uint64_t max_descendants; + + CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_ancestors) {} + CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors, uint64_t max_descendants) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_descendants) {} +}; + +struct OutputGroup +{ + std::vector<CInputCoin> m_outputs; + bool m_from_me{true}; + CAmount m_value{0}; + int m_depth{999}; + size_t m_ancestors{0}; + size_t m_descendants{0}; + CAmount effective_value{0}; + CAmount fee{0}; + CAmount long_term_fee{0}; + + OutputGroup() {} + OutputGroup(std::vector<CInputCoin>&& outputs, bool from_me, CAmount value, int depth, size_t ancestors, size_t descendants) + : m_outputs(std::move(outputs)) + , m_from_me(from_me) + , m_value(value) + , m_depth(depth) + , m_ancestors(ancestors) + , m_descendants(descendants) + {} + OutputGroup(const CInputCoin& output, int depth, bool from_me, size_t ancestors, size_t descendants) : OutputGroup() { + Insert(output, depth, from_me, ancestors, descendants); + } + void Insert(const CInputCoin& output, int depth, bool from_me, size_t ancestors, size_t descendants); + std::vector<CInputCoin>::iterator Discard(const CInputCoin& output); + bool EligibleForSpending(const CoinEligibilityFilter& eligibility_filter) const; +}; + +bool SelectCoinsBnB(std::vector<OutputGroup>& utxo_pool, const CAmount& target_value, const CAmount& cost_of_change, std::set<CInputCoin>& out_set, CAmount& value_ret, CAmount not_input_fees); // Original coin selection algorithm as a fallback -bool KnapsackSolver(const CAmount& nTargetValue, std::vector<CInputCoin>& vCoins, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet); +bool KnapsackSolver(const CAmount& nTargetValue, std::vector<OutputGroup>& groups, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet); + #endif // BITCOIN_WALLET_COINSELECTION_H diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 076134cdd1..52c7e6c70f 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -54,6 +54,7 @@ const WalletInitInterface& g_wallet_init_interface = WalletInit(); void WalletInit::AddWalletOptions() const { gArgs.AddArg("-addresstype", strprintf("What type of addresses to use (\"legacy\", \"p2sh-segwit\", or \"bech32\", default: \"%s\")", FormatOutputType(DEFAULT_ADDRESS_TYPE)), false, OptionsCategory::WALLET); + gArgs.AddArg("-avoidpartialspends", strprintf(_("Group outputs by address, selecting all or none, instead of selecting on a per-output basis. Privacy is improved as an address is only used once (unless someone sends to it after spending from it), but may result in slightly higher fees as suboptimal coin selection may result due to the added limitation (default: %u)"), DEFAULT_AVOIDPARTIALSPENDS), false, OptionsCategory::WALLET); gArgs.AddArg("-changetype", "What type of change to use (\"legacy\", \"p2sh-segwit\", or \"bech32\"). Default is same as -addresstype, except when -addresstype=p2sh-segwit a native segwit output is used when sending to a native segwit address)", false, OptionsCategory::WALLET); gArgs.AddArg("-disablewallet", "Do not load the wallet and disable wallet RPC calls", false, OptionsCategory::WALLET); gArgs.AddArg("-discardfee=<amt>", strprintf("The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). " diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp index d90be33000..1561760577 100644 --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -102,6 +102,22 @@ static CAmount make_hard_case(int utxos, std::vector<CInputCoin>& utxo_pool) return target; } +inline std::vector<OutputGroup>& GroupCoins(const std::vector<CInputCoin>& coins) +{ + static std::vector<OutputGroup> static_groups; + static_groups.clear(); + for (auto& coin : coins) static_groups.emplace_back(coin, 0, true, 0, 0); + return static_groups; +} + +inline std::vector<OutputGroup>& GroupCoins(const std::vector<COutput>& coins) +{ + static std::vector<OutputGroup> static_groups; + static_groups.clear(); + for (auto& coin : coins) static_groups.emplace_back(coin.GetInputCoin(), coin.nDepth, coin.tx->fDebitCached && coin.tx->nDebitCached == 1 /* HACK: we can't figure out the is_me flag so we use the conditions defined above; perhaps set safe to false for !fIsFromMe in add_coin() */, 0, 0); + return static_groups; +} + // Branch and bound coin selection tests BOOST_AUTO_TEST_CASE(bnb_search_test) { @@ -121,7 +137,7 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) BOOST_TEST_MESSAGE("Testing known outcomes"); // Empty utxo pool - BOOST_CHECK(!SelectCoinsBnB(utxo_pool, 1 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(!SelectCoinsBnB(GroupCoins(utxo_pool), 1 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); selection.clear(); // Add utxos @@ -132,14 +148,14 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) // Select 1 Cent add_coin(1 * CENT, 1, actual_selection); - BOOST_CHECK(SelectCoinsBnB(utxo_pool, 1 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(SelectCoinsBnB(GroupCoins(utxo_pool), 1 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); BOOST_CHECK(equal_sets(selection, actual_selection)); actual_selection.clear(); selection.clear(); // Select 2 Cent add_coin(2 * CENT, 2, actual_selection); - BOOST_CHECK(SelectCoinsBnB(utxo_pool, 2 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(SelectCoinsBnB(GroupCoins(utxo_pool), 2 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); BOOST_CHECK(equal_sets(selection, actual_selection)); actual_selection.clear(); selection.clear(); @@ -147,13 +163,13 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) // Select 5 Cent add_coin(3 * CENT, 3, actual_selection); add_coin(2 * CENT, 2, actual_selection); - BOOST_CHECK(SelectCoinsBnB(utxo_pool, 5 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(SelectCoinsBnB(GroupCoins(utxo_pool), 5 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); BOOST_CHECK(equal_sets(selection, actual_selection)); actual_selection.clear(); selection.clear(); // Select 11 Cent, not possible - BOOST_CHECK(!SelectCoinsBnB(utxo_pool, 11 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(!SelectCoinsBnB(GroupCoins(utxo_pool), 11 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); actual_selection.clear(); selection.clear(); @@ -163,7 +179,7 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) add_coin(3 * CENT, 3, actual_selection); add_coin(2 * CENT, 2, actual_selection); add_coin(1 * CENT, 1, actual_selection); - BOOST_CHECK(SelectCoinsBnB(utxo_pool, 10 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(SelectCoinsBnB(GroupCoins(utxo_pool), 10 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); BOOST_CHECK(equal_sets(selection, actual_selection)); actual_selection.clear(); selection.clear(); @@ -173,18 +189,18 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) add_coin(5 * CENT, 5, actual_selection); add_coin(3 * CENT, 3, actual_selection); add_coin(2 * CENT, 2, actual_selection); - BOOST_CHECK(SelectCoinsBnB(utxo_pool, 10 * CENT, 5000, selection, value_ret, not_input_fees)); + BOOST_CHECK(SelectCoinsBnB(GroupCoins(utxo_pool), 10 * CENT, 5000, selection, value_ret, not_input_fees)); // Select 0.25 Cent, not possible - BOOST_CHECK(!SelectCoinsBnB(utxo_pool, 0.25 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(!SelectCoinsBnB(GroupCoins(utxo_pool), 0.25 * CENT, 0.5 * CENT, selection, value_ret, not_input_fees)); actual_selection.clear(); selection.clear(); // Iteration exhaustion test CAmount target = make_hard_case(17, utxo_pool); - BOOST_CHECK(!SelectCoinsBnB(utxo_pool, target, 0, selection, value_ret, not_input_fees)); // Should exhaust + BOOST_CHECK(!SelectCoinsBnB(GroupCoins(utxo_pool), target, 0, selection, value_ret, not_input_fees)); // Should exhaust target = make_hard_case(14, utxo_pool); - BOOST_CHECK(SelectCoinsBnB(utxo_pool, target, 0, selection, value_ret, not_input_fees)); // Should not exhaust + BOOST_CHECK(SelectCoinsBnB(GroupCoins(utxo_pool), target, 0, selection, value_ret, not_input_fees)); // Should not exhaust // Test same value early bailout optimization add_coin(7 * CENT, 7, actual_selection); @@ -200,7 +216,7 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) for (int i = 0; i < 50000; ++i) { add_coin(5 * CENT, 7, utxo_pool); } - BOOST_CHECK(SelectCoinsBnB(utxo_pool, 30 * CENT, 5000, selection, value_ret, not_input_fees)); + BOOST_CHECK(SelectCoinsBnB(GroupCoins(utxo_pool), 30 * CENT, 5000, selection, value_ret, not_input_fees)); //////////////////// // Behavior tests // @@ -212,7 +228,7 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) } // Run 100 times, to make sure it is never finding a solution for (int i = 0; i < 100; ++i) { - BOOST_CHECK(!SelectCoinsBnB(utxo_pool, 1 * CENT, 2 * CENT, selection, value_ret, not_input_fees)); + BOOST_CHECK(!SelectCoinsBnB(GroupCoins(utxo_pool), 1 * CENT, 2 * CENT, selection, value_ret, not_input_fees)); } // Make sure that effective value is working in SelectCoinsMinConf when BnB is used @@ -223,7 +239,7 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) empty_wallet(); add_coin(1); vCoins.at(0).nInputBytes = 40; // Make sure that it has a negative effective value. The next check should assert if this somehow got through. Otherwise it will fail - BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params_bnb, bnb_used)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, filter_standard, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params_bnb, bnb_used)); // Make sure that we aren't using BnB when there are preset inputs empty_wallet(); @@ -252,24 +268,24 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) empty_wallet(); // with an empty wallet we can't even pay one cent - BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, filter_standard, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); add_coin(1*CENT, 4); // add a new 1 cent coin // with a new 1 cent coin, we still can't find a mature 1 cent - BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, filter_standard, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); // but we can find a new 1 cent - BOOST_CHECK( testWallet.SelectCoinsMinConf( 1 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 1 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 1 * CENT); add_coin(2*CENT); // add a mature 2 cent coin // we can't make 3 cents of mature coins - BOOST_CHECK(!testWallet.SelectCoinsMinConf( 3 * CENT, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf( 3 * CENT, filter_standard, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); // we can make 3 cents of new coins - BOOST_CHECK( testWallet.SelectCoinsMinConf( 3 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 3 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 3 * CENT); add_coin(5*CENT); // add a mature 5 cent coin, @@ -279,33 +295,33 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) // now we have new: 1+10=11 (of which 10 was self-sent), and mature: 2+5+20=27. total = 38 // we can't make 38 cents only if we disallow new coins: - BOOST_CHECK(!testWallet.SelectCoinsMinConf(38 * CENT, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf(38 * CENT, filter_standard, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); // we can't even make 37 cents if we don't allow new coins even if they're from us - BOOST_CHECK(!testWallet.SelectCoinsMinConf(38 * CENT, filter_standard_extra, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf(38 * CENT, filter_standard_extra, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); // but we can make 37 cents if we accept new coins from ourself - BOOST_CHECK( testWallet.SelectCoinsMinConf(37 * CENT, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(37 * CENT, filter_standard, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 37 * CENT); // and we can make 38 cents if we accept all new coins - BOOST_CHECK( testWallet.SelectCoinsMinConf(38 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(38 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 38 * CENT); // try making 34 cents from 1,2,5,10,20 - we can't do it exactly - BOOST_CHECK( testWallet.SelectCoinsMinConf(34 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(34 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 35 * CENT); // but 35 cents is closest BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); // the best should be 20+10+5. it's incredibly unlikely the 1 or 2 got included (but possible) // when we try making 7 cents, the smaller coins (1,2,5) are enough. We should see just 2+5 - BOOST_CHECK( testWallet.SelectCoinsMinConf( 7 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 7 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 7 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); // when we try making 8 cents, the smaller coins (1,2,5) are exactly enough. - BOOST_CHECK( testWallet.SelectCoinsMinConf( 8 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 8 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK(nValueRet == 8 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); // when we try making 9 cents, no subset of smaller coins is enough, and we get the next bigger coin (10) - BOOST_CHECK( testWallet.SelectCoinsMinConf( 9 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 9 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 10 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); @@ -319,30 +335,30 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) add_coin(30*CENT); // now we have 6+7+8+20+30 = 71 cents total // check that we have 71 and not 72 - BOOST_CHECK( testWallet.SelectCoinsMinConf(71 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); - BOOST_CHECK(!testWallet.SelectCoinsMinConf(72 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(71 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf(72 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); // now try making 16 cents. the best smaller coins can do is 6+7+8 = 21; not as good at the next biggest coin, 20 - BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 20 * CENT); // we should get 20 in one coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); add_coin( 5*CENT); // now we have 5+6+7+8+20+30 = 75 cents total // now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, better than the next biggest coin, 20 - BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 3 coins BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); add_coin( 18*CENT); // now we have 5+6+7+8+18+20+30 // and now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, the same as the next biggest coin, 18 - BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 1 coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); // because in the event of a tie, the biggest coin wins // now try making 11 cents. we should get 5+6 - BOOST_CHECK( testWallet.SelectCoinsMinConf(11 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(11 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 11 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); @@ -351,11 +367,11 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) add_coin( 2*COIN); add_coin( 3*COIN); add_coin( 4*COIN); // now we have 5+6+7+8+18+20+30+100+200+300+400 = 1094 cents - BOOST_CHECK( testWallet.SelectCoinsMinConf(95 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(95 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 1 * COIN); // we should get 1 BTC in 1 coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); - BOOST_CHECK( testWallet.SelectCoinsMinConf(195 * CENT, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(195 * CENT, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 2 * COIN); // we should get 2 BTC in 1 coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); @@ -370,14 +386,14 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) // try making 1 * MIN_CHANGE from the 1.5 * MIN_CHANGE // we'll get change smaller than MIN_CHANGE whatever happens, so can expect MIN_CHANGE exactly - BOOST_CHECK( testWallet.SelectCoinsMinConf(MIN_CHANGE, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(MIN_CHANGE, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE); // but if we add a bigger coin, small change is avoided add_coin(1111*MIN_CHANGE); // try making 1 from 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 1111 = 1112.5 - BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount // if we add more small coins: @@ -385,7 +401,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) add_coin(MIN_CHANGE * 7 / 10); // and try again to make 1.0 * MIN_CHANGE - BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount // run the 'mtgox' test (see http://blockexplorer.com/tx/29a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf) @@ -394,7 +410,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) for (int j = 0; j < 20; j++) add_coin(50000 * COIN); - BOOST_CHECK( testWallet.SelectCoinsMinConf(500000 * COIN, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(500000 * COIN, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 500000 * COIN); // we should get the exact amount BOOST_CHECK_EQUAL(setCoinsRet.size(), 10U); // in ten coins @@ -407,7 +423,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) add_coin(MIN_CHANGE * 6 / 10); add_coin(MIN_CHANGE * 7 / 10); add_coin(1111 * MIN_CHANGE); - BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 1111 * MIN_CHANGE); // we get the bigger coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); @@ -417,7 +433,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) add_coin(MIN_CHANGE * 6 / 10); add_coin(MIN_CHANGE * 8 / 10); add_coin(1111 * MIN_CHANGE); - BOOST_CHECK( testWallet.SelectCoinsMinConf(MIN_CHANGE, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(MIN_CHANGE, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE); // we should get the exact amount BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); // in two coins 0.4+0.6 @@ -428,12 +444,12 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) add_coin(MIN_CHANGE * 100); // trying to make 100.01 from these three coins - BOOST_CHECK(testWallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE * 10105 / 100); // we should get all coins BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); // but if we try to make 99.9, we should take the bigger of the two small coins to avoid small change - BOOST_CHECK(testWallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 101 * MIN_CHANGE); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); @@ -443,7 +459,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) // Create 676 inputs (= (old MAX_STANDARD_TX_SIZE == 100000) / 148 bytes per input) for (uint16_t j = 0; j < 676; j++) add_coin(amt); - BOOST_CHECK(testWallet.SelectCoinsMinConf(2000, filter_confirmed, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(2000, filter_confirmed, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); if (amt - 2000 < MIN_CHANGE) { // needs more than one input: uint16_t returnSize = std::ceil((2000.0 + MIN_CHANGE)/amt); @@ -465,8 +481,8 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) // picking 50 from 100 coins doesn't depend on the shuffle, // but does depend on randomness in the stochastic approximation code - BOOST_CHECK(testWallet.SelectCoinsMinConf(50 * COIN, filter_standard, vCoins, setCoinsRet , nValueRet, coin_selection_params, bnb_used)); - BOOST_CHECK(testWallet.SelectCoinsMinConf(50 * COIN, filter_standard, vCoins, setCoinsRet2, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(50 * COIN, filter_standard, GroupCoins(vCoins), setCoinsRet , nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(50 * COIN, filter_standard, GroupCoins(vCoins), setCoinsRet2, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK(!equal_sets(setCoinsRet, setCoinsRet2)); int fails = 0; @@ -474,8 +490,8 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) { // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time // run the test RANDOM_REPEATS times and only complain if all of them fail - BOOST_CHECK(testWallet.SelectCoinsMinConf(COIN, filter_standard, vCoins, setCoinsRet , nValueRet, coin_selection_params, bnb_used)); - BOOST_CHECK(testWallet.SelectCoinsMinConf(COIN, filter_standard, vCoins, setCoinsRet2, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(COIN, filter_standard, GroupCoins(vCoins), setCoinsRet , nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(COIN, filter_standard, GroupCoins(vCoins), setCoinsRet2, nValueRet, coin_selection_params, bnb_used)); if (equal_sets(setCoinsRet, setCoinsRet2)) fails++; } @@ -495,8 +511,8 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test) { // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time // run the test RANDOM_REPEATS times and only complain if all of them fail - BOOST_CHECK(testWallet.SelectCoinsMinConf(90*CENT, filter_standard, vCoins, setCoinsRet , nValueRet, coin_selection_params, bnb_used)); - BOOST_CHECK(testWallet.SelectCoinsMinConf(90*CENT, filter_standard, vCoins, setCoinsRet2, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(90*CENT, filter_standard, GroupCoins(vCoins), setCoinsRet , nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(90*CENT, filter_standard, GroupCoins(vCoins), setCoinsRet2, nValueRet, coin_selection_params, bnb_used)); if (equal_sets(setCoinsRet, setCoinsRet2)) fails++; } @@ -521,7 +537,7 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset) add_coin(1000 * COIN); add_coin(3 * COIN); - BOOST_CHECK(testWallet.SelectCoinsMinConf(1003 * COIN, filter_standard, vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(1003 * COIN, filter_standard, GroupCoins(vCoins), setCoinsRet, nValueRet, coin_selection_params, bnb_used)); BOOST_CHECK_EQUAL(nValueRet, 1003 * COIN); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); @@ -559,8 +575,8 @@ BOOST_AUTO_TEST_CASE(SelectCoins_test) CoinSet out_set; CAmount out_value = 0; bool bnb_used = false; - BOOST_CHECK(testWallet.SelectCoinsMinConf(target, filter_standard, vCoins, out_set, out_value, coin_selection_params_bnb, bnb_used) || - testWallet.SelectCoinsMinConf(target, filter_standard, vCoins, out_set, out_value, coin_selection_params_knapsack, bnb_used)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(target, filter_standard, GroupCoins(vCoins), out_set, out_value, coin_selection_params_bnb, bnb_used) || + testWallet.SelectCoinsMinConf(target, filter_standard, GroupCoins(vCoins), out_set, out_value, coin_selection_params_knapsack, bnb_used)); BOOST_CHECK_GE(out_value, target); } } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d38f943558..3ec6aefaec 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2415,32 +2415,14 @@ const CTxOut& CWallet::FindNonChangeParentOutput(const CTransaction& tx, int out return ptx->vout[n]; } -bool CWallet::OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibility_filter) const -{ - if (!output.fSpendable) - return false; - - if (output.nDepth < (output.tx->IsFromMe(ISMINE_ALL) ? eligibility_filter.conf_mine : eligibility_filter.conf_theirs)) - return false; - - size_t ancestors, descendants; - mempool.GetTransactionAncestry(output.tx->GetHash(), ancestors, descendants); - if (ancestors > eligibility_filter.max_ancestors || descendants > eligibility_filter.max_descendants) { - return false; - } - - return true; -} - -bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<COutput> vCoins, +bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<OutputGroup> groups, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CoinSelectionParams& coin_selection_params, bool& bnb_used) const { setCoinsRet.clear(); nValueRet = 0; - std::vector<CInputCoin> utxo_pool; + std::vector<OutputGroup> utxo_pool; if (coin_selection_params.use_bnb) { - // Get long term estimate FeeCalculation feeCalc; CCoinControl temp; @@ -2451,19 +2433,26 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibil CAmount cost_of_change = GetDiscardRate(*this, ::feeEstimator).GetFee(coin_selection_params.change_spend_size) + coin_selection_params.effective_fee.GetFee(coin_selection_params.change_output_size); // Filter by the min conf specs and add to utxo_pool and calculate effective value - for (const COutput &output : vCoins) - { - if (!OutputEligibleForSpending(output, eligibility_filter)) - continue; - - CInputCoin coin(output.tx->tx, output.i); - coin.effective_value = coin.txout.nValue - (output.nInputBytes < 0 ? 0 : coin_selection_params.effective_fee.GetFee(output.nInputBytes)); - // Only include outputs that are positive effective value (i.e. not dust) - if (coin.effective_value > 0) { - coin.fee = output.nInputBytes < 0 ? 0 : coin_selection_params.effective_fee.GetFee(output.nInputBytes); - coin.long_term_fee = output.nInputBytes < 0 ? 0 : long_term_feerate.GetFee(output.nInputBytes); - utxo_pool.push_back(coin); + for (OutputGroup& group : groups) { + if (!group.EligibleForSpending(eligibility_filter)) continue; + + group.fee = 0; + group.long_term_fee = 0; + group.effective_value = 0; + for (auto it = group.m_outputs.begin(); it != group.m_outputs.end(); ) { + const CInputCoin& coin = *it; + CAmount effective_value = coin.txout.nValue - (coin.m_input_bytes < 0 ? 0 : coin_selection_params.effective_fee.GetFee(coin.m_input_bytes)); + // Only include outputs that are positive effective value (i.e. not dust) + if (effective_value > 0) { + group.fee += coin.m_input_bytes < 0 ? 0 : coin_selection_params.effective_fee.GetFee(coin.m_input_bytes); + group.long_term_fee += coin.m_input_bytes < 0 ? 0 : long_term_feerate.GetFee(coin.m_input_bytes); + group.effective_value += effective_value; + ++it; + } else { + it = group.Discard(coin); + } } + if (group.effective_value > 0) utxo_pool.push_back(group); } // Calculate the fees for things that aren't inputs CAmount not_input_fees = coin_selection_params.effective_fee.GetFee(coin_selection_params.tx_noinputs_size); @@ -2471,13 +2460,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibil return SelectCoinsBnB(utxo_pool, nTargetValue, cost_of_change, setCoinsRet, nValueRet, not_input_fees); } else { // Filter by the min conf specs and add to utxo_pool - for (const COutput &output : vCoins) - { - if (!OutputEligibleForSpending(output, eligibility_filter)) - continue; - - CInputCoin coin = CInputCoin(output.tx->tx, output.i); - utxo_pool.push_back(coin); + for (const OutputGroup& group : groups) { + if (!group.EligibleForSpending(eligibility_filter)) continue; + utxo_pool.push_back(group); } bnb_used = false; return KnapsackSolver(nTargetValue, utxo_pool, setCoinsRet, nValueRet); @@ -2499,7 +2484,7 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm if (!out.fSpendable) continue; nValueRet += out.tx->tx->vout[out.i].nValue; - setCoinsRet.insert(CInputCoin(out.tx->tx, out.i)); + setCoinsRet.insert(out.GetInputCoin()); } return (nValueRet >= nTargetValue); } @@ -2533,27 +2518,31 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm // remove preset inputs from vCoins for (std::vector<COutput>::iterator it = vCoins.begin(); it != vCoins.end() && coin_control.HasSelected();) { - if (setPresetCoins.count(CInputCoin(it->tx->tx, it->i))) + if (setPresetCoins.count(it->GetInputCoin())) it = vCoins.erase(it); else ++it; } + // form groups from remaining coins; note that preset coins will not + // automatically have their associated (same address) coins included + std::vector<OutputGroup> groups = GroupOutputs(vCoins, !coin_control.m_avoid_partial_spends); + size_t max_ancestors = (size_t)std::max<int64_t>(1, gArgs.GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT)); size_t max_descendants = (size_t)std::max<int64_t>(1, gArgs.GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT)); bool fRejectLongChains = gArgs.GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS); bool res = nTargetValue <= nValueFromPresetInputs || - SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(1, 6, 0), vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used) || - SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(1, 1, 0), vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used) || - (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, 2), vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || - (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, std::min((size_t)4, max_ancestors/3), std::min((size_t)4, max_descendants/3)), vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || - (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, max_ancestors/2, max_descendants/2), vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || - (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, max_ancestors-1, max_descendants-1), vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || - (m_spend_zero_conf_change && !fRejectLongChains && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, std::numeric_limits<uint64_t>::max()), vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); + SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(1, 6, 0), groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used) || + SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(1, 1, 0), groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used) || + (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, 2), groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || + (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, std::min((size_t)4, max_ancestors/3), std::min((size_t)4, max_descendants/3)), groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || + (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, max_ancestors/2, max_descendants/2), groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || + (m_spend_zero_conf_change && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, max_ancestors-1, max_descendants-1), groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) || + (m_spend_zero_conf_change && !fRejectLongChains && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, CoinEligibilityFilter(0, 1, std::numeric_limits<uint64_t>::max()), groups, setCoinsRet, nValueRet, coin_selection_params, bnb_used)); // because SelectCoinsMinConf clears the setCoinsRet, we now add the possible inputs to the coinset - setCoinsRet.insert(setPresetCoins.begin(), setPresetCoins.end()); + util::insert(setCoinsRet, setPresetCoins); // add preset inputs to the total value selected nValueRet += nValueFromPresetInputs; @@ -2667,7 +2656,7 @@ OutputType CWallet::TransactionChangeType(OutputType change_type, const std::vec } bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransactionRef& tx, CReserveKey& reservekey, CAmount& nFeeRet, - int& nChangePosInOut, std::string& strFailReason, const CCoinControl& coin_control, bool sign) + int& nChangePosInOut, std::string& strFailReason, const CCoinControl& coin_control, bool sign) { CAmount nValue = 0; int nChangePosRequest = nChangePosInOut; @@ -4439,3 +4428,29 @@ void CWallet::LearnAllRelatedScripts(const CPubKey& key) LearnRelatedScripts(key, OutputType::P2SH_SEGWIT); } +std::vector<OutputGroup> CWallet::GroupOutputs(const std::vector<COutput>& outputs, bool single_coin) const { + std::vector<OutputGroup> groups; + std::map<CTxDestination, OutputGroup> gmap; + CTxDestination dst; + for (const auto& output : outputs) { + if (output.fSpendable) { + CInputCoin input_coin = output.GetInputCoin(); + + size_t ancestors, descendants; + mempool.GetTransactionAncestry(output.tx->GetHash(), ancestors, descendants); + if (!single_coin && ExtractDestination(output.tx->tx->vout[output.i].scriptPubKey, dst)) { + if (gmap.count(dst) == 10) { + groups.push_back(gmap[dst]); + gmap.erase(dst); + } + gmap[dst].Insert(input_coin, output.nDepth, output.tx->IsFromMe(ISMINE_ALL), ancestors, descendants); + } else { + groups.emplace_back(input_coin, output.nDepth, output.tx->IsFromMe(ISMINE_ALL), ancestors, descendants); + } + } + } + if (!single_coin) { + for (const auto& it : gmap) groups.push_back(it.second); + } + return groups; +} diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 85d7209a1d..122649d575 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -55,6 +55,8 @@ static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000; static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true; //! Default for -walletrejectlongchains static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false; +//! Default for -avoidpartialspends +static const bool DEFAULT_AVOIDPARTIALSPENDS = false; //! -txconfirmtarget default static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6; //! -walletrbf default @@ -525,10 +527,12 @@ public: } std::string ToString() const; -}; - - + inline CInputCoin GetInputCoin() const + { + return CInputCoin(tx->tx, i, nInputBytes); + } +}; /** Private key that includes an expiration date in case it never gets used. */ class CWalletKey @@ -652,17 +656,6 @@ struct CoinSelectionParams CoinSelectionParams() {} }; -struct CoinEligibilityFilter -{ - const int conf_mine; - const int conf_theirs; - const uint64_t max_ancestors; - const uint64_t max_descendants; - - CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_ancestors) {} - CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors, uint64_t max_descendants) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_descendants) {} -}; - class WalletRescanReserver; //forward declarations for ScanForWalletTransactions/RescanFromTime /** * A CWallet is an extension of a keystore, which also maintains a set of transactions and balances, @@ -864,10 +857,11 @@ public: * completion the coin set and corresponding actual target value is * assembled */ - bool SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<COutput> vCoins, + bool SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<OutputGroup> groups, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CoinSelectionParams& coin_selection_params, bool& bnb_used) const; bool IsSpent(const uint256& hash, unsigned int n) const; + std::vector<OutputGroup> GroupOutputs(const std::vector<COutput>& outputs, bool single_coin) const; bool IsLockedCoin(uint256 hash, unsigned int n) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); void LockCoin(const COutPoint& output) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); @@ -1194,9 +1188,6 @@ public: */ void LearnAllRelatedScripts(const CPubKey& key); - /** Whether a given output is spendable by this wallet */ - bool OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibility_filter) const; - /** set a single wallet flag */ void SetWalletFlag(uint64_t flags); |