mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-23 08:34:58 +01:00
Compare commits
7 Commits
master
...
v0.19.0rc1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
913972944b | ||
|
|
bd22dea633 | ||
|
|
cd1e7bb064 | ||
|
|
6db76c6bc7 | ||
|
|
9fdaaecf49 | ||
|
|
76ec335234 | ||
|
|
57eb126416 |
@@ -33,7 +33,7 @@
|
||||
# and this notice are preserved. This file is offered as-is, without any
|
||||
# warranty.
|
||||
|
||||
#serial 47
|
||||
#serial 49
|
||||
|
||||
# example boost program (need to pass version)
|
||||
m4_define([_AX_BOOST_BASE_PROGRAM],
|
||||
@@ -126,8 +126,14 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
|
||||
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
|
||||
)
|
||||
|
||||
dnl some arches may advertise a cpu type that doesn't line up with their
|
||||
dnl prefix's cpu type. For example, uname may report armv7l while libs are
|
||||
dnl installed to /usr/lib/arm-linux-gnueabihf. Try getting the compiler's
|
||||
dnl value for an extra chance of finding the correct path.
|
||||
libsubdirs="lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs"
|
||||
|
||||
dnl first we check the system location for boost libraries
|
||||
dnl this location ist chosen if boost libraries are installed with the --layout=system option
|
||||
dnl this location is chosen if boost libraries are installed with the --layout=system option
|
||||
dnl or if you install boost with RPM
|
||||
AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
|
||||
AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"])
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
#define CLIENT_VERSION_BUILD 0
|
||||
|
||||
/* Version is release */
|
||||
#define CLIENT_VERSION_IS_RELEASE false
|
||||
#define CLIENT_VERSION_IS_RELEASE true
|
||||
|
||||
/* Major version */
|
||||
#define CLIENT_VERSION_MAJOR 0
|
||||
|
||||
/* Minor version */
|
||||
#define CLIENT_VERSION_MINOR 18
|
||||
#define CLIENT_VERSION_MINOR 19
|
||||
|
||||
/* Build revision */
|
||||
#define CLIENT_VERSION_REVISION 99
|
||||
#define CLIENT_VERSION_REVISION 0
|
||||
|
||||
/* Copyright holder(s) before %s replacement */
|
||||
#define COPYRIGHT_HOLDERS "The %s developers"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
|
||||
AC_PREREQ([2.60])
|
||||
define(_CLIENT_VERSION_MAJOR, 0)
|
||||
define(_CLIENT_VERSION_MINOR, 18)
|
||||
define(_CLIENT_VERSION_REVISION, 99)
|
||||
define(_CLIENT_VERSION_MINOR, 19)
|
||||
define(_CLIENT_VERSION_REVISION, 0)
|
||||
define(_CLIENT_VERSION_BUILD, 0)
|
||||
define(_CLIENT_VERSION_RC, 0)
|
||||
define(_CLIENT_VERSION_IS_RELEASE, false)
|
||||
define(_CLIENT_VERSION_RC, 1)
|
||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||
define(_COPYRIGHT_YEAR, 2019)
|
||||
define(_COPYRIGHT_HOLDERS,[The %s developers])
|
||||
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH BITCOIN-CLI "1" "February 2019" "bitcoin-cli v0.17.99.0" "User Commands"
|
||||
.TH BITCOIN-CLI "1" "October 2019" "bitcoin-cli v0.19.0.0" "User Commands"
|
||||
.SH NAME
|
||||
bitcoin-cli \- manual page for bitcoin-cli v0.17.99.0
|
||||
bitcoin-cli \- manual page for bitcoin-cli v0.19.0.0
|
||||
.SH SYNOPSIS
|
||||
.B bitcoin-cli
|
||||
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
|
||||
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v0.17.99.0
|
||||
.B bitcoin-cli
|
||||
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
|
||||
.SH DESCRIPTION
|
||||
Bitcoin Core RPC client version v0.17.99.0
|
||||
Bitcoin Core RPC client version v0.19.0.0
|
||||
.SH OPTIONS
|
||||
.HP
|
||||
\-?
|
||||
@@ -98,11 +98,18 @@ RPC password.
|
||||
.IP
|
||||
Print version and exit
|
||||
.PP
|
||||
Debugging/Testing options:
|
||||
.PP
|
||||
Chain selection options:
|
||||
.HP
|
||||
\fB\-chain=\fR<chain>
|
||||
.IP
|
||||
Use the chain <chain> (default: main). Allowed values: main, test,
|
||||
regtest
|
||||
.HP
|
||||
\fB\-testnet\fR
|
||||
.IP
|
||||
Use the test chain
|
||||
Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR.
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2009-2019 The Bitcoin Core developers
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH BITCOIN-QT "1" "February 2019" "bitcoin-qt v0.17.99.0" "User Commands"
|
||||
.TH BITCOIN-QT "1" "October 2019" "bitcoin-qt v0.19.0.0" "User Commands"
|
||||
.SH NAME
|
||||
bitcoin-qt \- manual page for bitcoin-qt v0.17.99.0
|
||||
bitcoin-qt \- manual page for bitcoin-qt v0.19.0.0
|
||||
.SH SYNOPSIS
|
||||
.B bitcoin-qt
|
||||
[\fI\,command-line options\/\fR]
|
||||
.SH DESCRIPTION
|
||||
Bitcoin Core version v0.17.99.0 (64\-bit)
|
||||
Bitcoin Core version v0.19.0.0 (64\-bit)
|
||||
.SH OPTIONS
|
||||
.HP
|
||||
\-?
|
||||
@@ -23,9 +23,15 @@ long fork (%s in cmd is replaced by message)
|
||||
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:
|
||||
0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8,
|
||||
00000000000000000005f8920febd3925f8272a6a71237563d78c2edfdd09ddf,
|
||||
testnet:
|
||||
0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75)
|
||||
00000000000000b7ab6ce61eb6d571003fbe5fe892da4c9b740c49a07542462d)
|
||||
.HP
|
||||
\fB\-blockfilterindex=\fR<type>
|
||||
.IP
|
||||
Maintain an index of compact filters by block (default: 0, values:
|
||||
basic). If <type> is not supplied or if <type> = 1, indexes for
|
||||
all known types are enabled.
|
||||
.HP
|
||||
\fB\-blocknotify=\fR<cmd>
|
||||
.IP
|
||||
@@ -39,7 +45,14 @@ Extra transactions to keep in memory for compact block reconstructions
|
||||
.HP
|
||||
\fB\-blocksdir=\fR<dir>
|
||||
.IP
|
||||
Specify blocks directory (default: <datadir>/blocks)
|
||||
Specify directory to hold blocks subdirectory for *.dat files (default:
|
||||
<datadir>)
|
||||
.HP
|
||||
\fB\-blocksonly\fR
|
||||
.IP
|
||||
Whether to reject transactions from network peers. Transactions from the
|
||||
wallet, RPC and relay whitelisted inbound peers are not affected.
|
||||
(default: 0)
|
||||
.HP
|
||||
\fB\-conf=\fR<file>
|
||||
.IP
|
||||
@@ -56,7 +69,9 @@ Specify data directory
|
||||
.HP
|
||||
\fB\-dbcache=\fR<n>
|
||||
.IP
|
||||
Set database cache size in MiB (4 to 16384, default: 450)
|
||||
Maximum database cache size <n> MiB (4 to 16384, default: 450). In
|
||||
addition, unused mempool memory is shared for this cache (see
|
||||
\fB\-maxmempool\fR).
|
||||
.HP
|
||||
\fB\-debuglogfile=\fR<file>
|
||||
.IP
|
||||
@@ -88,7 +103,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
|
||||
.HP
|
||||
\fB\-par=\fR<n>
|
||||
.IP
|
||||
Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
|
||||
Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
|
||||
leave that many cores free, default: 0)
|
||||
.HP
|
||||
\fB\-persistmempool\fR
|
||||
@@ -237,7 +252,7 @@ networks.
|
||||
\fB\-peerbloomfilters\fR
|
||||
.IP
|
||||
Support filtering of blocks and transaction with bloom filters (default:
|
||||
1)
|
||||
0)
|
||||
.HP
|
||||
\fB\-permitbaremultisig\fR
|
||||
.IP
|
||||
@@ -281,18 +296,22 @@ Tor control port password (default: empty)
|
||||
.IP
|
||||
Use UPnP to map the listening port (default: 0)
|
||||
.HP
|
||||
\fB\-whitebind=\fR<addr>
|
||||
\fB\-whitebind=\fR<[permissions@]addr>
|
||||
.IP
|
||||
Bind to given address and whitelist peers connecting to it. Use
|
||||
[host]:port notation for IPv6
|
||||
[host]:port notation for IPv6. Allowed permissions are
|
||||
bloomfilter (allow requesting BIP37 filtered blocks and
|
||||
transactions), noban (do not ban for misbehavior), forcerelay
|
||||
(relay even non\-standard transactions), relay (relay even in
|
||||
\fB\-blocksonly\fR mode), and mempool (allow requesting BIP35 mempool
|
||||
contents). Specify multiple permissions separated by commas
|
||||
(default: noban,mempool,relay). Can be specified multiple times.
|
||||
.HP
|
||||
\fB\-whitelist=\fR<IP address or network>
|
||||
\fB\-whitelist=\fR<[permissions@]IP address or network>
|
||||
.IP
|
||||
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. 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
|
||||
CIDR notated network(e.g. 1.2.3.0/24). Uses same permissions as
|
||||
\fB\-whitebind\fR. Can be specified multiple times.
|
||||
.PP
|
||||
Wallet options:
|
||||
.HP
|
||||
@@ -307,7 +326,8 @@ 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: 0)
|
||||
selection may result due to the added limitation (default: 0
|
||||
(always enabled for wallets with "avoid_reuse" enabled))
|
||||
.HP
|
||||
\fB\-changetype\fR
|
||||
.IP
|
||||
@@ -406,17 +426,35 @@ ZeroMQ notification options:
|
||||
.IP
|
||||
Enable publish hash block in <address>
|
||||
.HP
|
||||
\fB\-zmqpubhashblockhwm=\fR<n>
|
||||
.IP
|
||||
Set publish hash block outbound message high water mark (default: 1000)
|
||||
.HP
|
||||
\fB\-zmqpubhashtx=\fR<address>
|
||||
.IP
|
||||
Enable publish hash transaction in <address>
|
||||
.HP
|
||||
\fB\-zmqpubhashtxhwm=\fR<n>
|
||||
.IP
|
||||
Set publish hash transaction outbound message high water mark (default:
|
||||
1000)
|
||||
.HP
|
||||
\fB\-zmqpubrawblock=\fR<address>
|
||||
.IP
|
||||
Enable publish raw block in <address>
|
||||
.HP
|
||||
\fB\-zmqpubrawblockhwm=\fR<n>
|
||||
.IP
|
||||
Set publish raw block outbound message high water mark (default: 1000)
|
||||
.HP
|
||||
\fB\-zmqpubrawtx=\fR<address>
|
||||
.IP
|
||||
Enable publish raw transaction in <address>
|
||||
.HP
|
||||
\fB\-zmqpubrawtxhwm=\fR<n>
|
||||
.IP
|
||||
Set publish raw transaction outbound message high water mark (default:
|
||||
1000)
|
||||
.PP
|
||||
Debugging/Testing options:
|
||||
.HP
|
||||
@@ -443,15 +481,19 @@ Print help message with debugging options and exit
|
||||
.IP
|
||||
Include IP addresses in debug output (default: 0)
|
||||
.HP
|
||||
\fB\-logthreadnames\fR
|
||||
.IP
|
||||
Prepend debug output with name of the originating thread (only available
|
||||
on platforms supporting thread_local) (default: 0)
|
||||
.HP
|
||||
\fB\-logtimestamps\fR
|
||||
.IP
|
||||
Prepend debug output with timestamp (default: 1)
|
||||
.HP
|
||||
\fB\-maxtxfee=\fR<amt>
|
||||
.IP
|
||||
Maximum total fees (in BTC) to use in a single wallet transaction or raw
|
||||
transaction; setting this too low may abort large transactions
|
||||
(default: 0.10)
|
||||
Maximum total fees (in BTC) to use in a single wallet transaction;
|
||||
setting this too low may abort large transactions (default: 0.10)
|
||||
.HP
|
||||
\fB\-printtoconsole\fR
|
||||
.IP
|
||||
@@ -468,9 +510,14 @@ Append comment to the user agent string
|
||||
.PP
|
||||
Chain selection options:
|
||||
.HP
|
||||
\fB\-chain=\fR<chain>
|
||||
.IP
|
||||
Use the chain <chain> (default: main). Allowed values: main, test,
|
||||
regtest
|
||||
.HP
|
||||
\fB\-testnet\fR
|
||||
.IP
|
||||
Use the test chain
|
||||
Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR.
|
||||
.PP
|
||||
Node relay options:
|
||||
.HP
|
||||
@@ -488,7 +535,6 @@ Relay and mine data carrier transactions (default: 1)
|
||||
Maximum size of data in data carrier transactions we relay and mine
|
||||
(default: 83)
|
||||
.HP
|
||||
.HP
|
||||
\fB\-minrelaytxfee=\fR<amt>
|
||||
.IP
|
||||
Fees (in BTC/kB) smaller than this are considered zero fee for relaying,
|
||||
@@ -496,13 +542,16 @@ mining and transaction creation (default: 0.00001)
|
||||
.HP
|
||||
\fB\-whitelistforcerelay\fR
|
||||
.IP
|
||||
Force relay of transactions from whitelisted peers even if they violate
|
||||
local relay policy (default: 0)
|
||||
Add 'forcerelay' permission to whitelisted inbound peers with default
|
||||
permissions. This will relay transactions even if the
|
||||
transactions were already in the mempool or violate local relay
|
||||
policy. (default: 0)
|
||||
.HP
|
||||
\fB\-whitelistrelay\fR
|
||||
.IP
|
||||
Accept relayed transactions received from whitelisted peers even when
|
||||
not relaying transactions (default: 1)
|
||||
Add 'relay' permission to whitelisted inbound peers with default
|
||||
permissions. The will accept relayed transactions even when not
|
||||
relaying transactions (default: 1)
|
||||
.PP
|
||||
Block creation options:
|
||||
.HP
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH BITCOIN-TX "1" "February 2019" "bitcoin-tx v0.17.99.0" "User Commands"
|
||||
.TH BITCOIN-TX "1" "October 2019" "bitcoin-tx v0.19.0.0" "User Commands"
|
||||
.SH NAME
|
||||
bitcoin-tx \- manual page for bitcoin-tx v0.17.99.0
|
||||
bitcoin-tx \- manual page for bitcoin-tx v0.19.0.0
|
||||
.SH SYNOPSIS
|
||||
.B bitcoin-tx
|
||||
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
|
||||
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v0.17.99.0
|
||||
.B bitcoin-tx
|
||||
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
|
||||
.SH DESCRIPTION
|
||||
Bitcoin Core bitcoin\-tx utility version v0.17.99.0
|
||||
Bitcoin Core bitcoin\-tx utility version v0.19.0.0
|
||||
.SH OPTIONS
|
||||
.HP
|
||||
\-?
|
||||
@@ -28,11 +28,18 @@ Select JSON output
|
||||
.IP
|
||||
Output only the hex\-encoded transaction id of the resultant transaction.
|
||||
.PP
|
||||
Debugging/Testing options:
|
||||
.PP
|
||||
Chain selection options:
|
||||
.HP
|
||||
\fB\-chain=\fR<chain>
|
||||
.IP
|
||||
Use the chain <chain> (default: main). Allowed values: main, test,
|
||||
regtest
|
||||
.HP
|
||||
\fB\-testnet\fR
|
||||
.IP
|
||||
Use the test chain
|
||||
Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR.
|
||||
.PP
|
||||
Commands:
|
||||
.IP
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH BITCOIN-WALLET "1" "February 2019" "bitcoin-wallet v0.17.99.0" "User Commands"
|
||||
.TH BITCOIN-WALLET "1" "October 2019" "bitcoin-wallet v0.19.0.0" "User Commands"
|
||||
.SH NAME
|
||||
bitcoin-wallet \- manual page for bitcoin-wallet v0.17.99.0
|
||||
bitcoin-wallet \- manual page for bitcoin-wallet v0.19.0.0
|
||||
.SH DESCRIPTION
|
||||
Bitcoin Core bitcoin\-wallet version v0.17.99.0
|
||||
Bitcoin Core bitcoin\-wallet version v0.19.0.0
|
||||
.PP
|
||||
wallet\-tool is an offline tool for creating and interacting with Bitcoin Core wallet files.
|
||||
By default wallet\-tool will act on wallets in the default mainnet wallet directory in the datadir.
|
||||
@@ -34,13 +34,18 @@ Output debugging information (default: 0).
|
||||
\fB\-printtoconsole\fR
|
||||
.IP
|
||||
Send trace/debug info to console (default: 1 when no \fB\-debug\fR is true, 0
|
||||
otherwise.
|
||||
otherwise).
|
||||
.PP
|
||||
Chain selection options:
|
||||
.HP
|
||||
\fB\-chain=\fR<chain>
|
||||
.IP
|
||||
Use the chain <chain> (default: main). Allowed values: main, test,
|
||||
regtest
|
||||
.HP
|
||||
\fB\-testnet\fR
|
||||
.IP
|
||||
Use the test chain
|
||||
Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR.
|
||||
.PP
|
||||
Commands:
|
||||
.IP
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH BITCOIND "1" "February 2019" "bitcoind v0.17.99.0" "User Commands"
|
||||
.TH BITCOIND "1" "October 2019" "bitcoind v0.19.0.0" "User Commands"
|
||||
.SH NAME
|
||||
bitcoind \- manual page for bitcoind v0.17.99.0
|
||||
bitcoind \- manual page for bitcoind v0.19.0.0
|
||||
.SH SYNOPSIS
|
||||
.B bitcoind
|
||||
[\fI\,options\/\fR] \fI\,Start Bitcoin Core Daemon\/\fR
|
||||
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
|
||||
.SH DESCRIPTION
|
||||
Bitcoin Core Daemon version v0.17.99.0
|
||||
Bitcoin Core version v0.19.0.0
|
||||
.SH OPTIONS
|
||||
.HP
|
||||
\-?
|
||||
@@ -23,9 +23,15 @@ long fork (%s in cmd is replaced by message)
|
||||
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:
|
||||
0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8,
|
||||
00000000000000000005f8920febd3925f8272a6a71237563d78c2edfdd09ddf,
|
||||
testnet:
|
||||
0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75)
|
||||
00000000000000b7ab6ce61eb6d571003fbe5fe892da4c9b740c49a07542462d)
|
||||
.HP
|
||||
\fB\-blockfilterindex=\fR<type>
|
||||
.IP
|
||||
Maintain an index of compact filters by block (default: 0, values:
|
||||
basic). If <type> is not supplied or if <type> = 1, indexes for
|
||||
all known types are enabled.
|
||||
.HP
|
||||
\fB\-blocknotify=\fR<cmd>
|
||||
.IP
|
||||
@@ -39,7 +45,14 @@ Extra transactions to keep in memory for compact block reconstructions
|
||||
.HP
|
||||
\fB\-blocksdir=\fR<dir>
|
||||
.IP
|
||||
Specify blocks directory (default: <datadir>/blocks)
|
||||
Specify directory to hold blocks subdirectory for *.dat files (default:
|
||||
<datadir>)
|
||||
.HP
|
||||
\fB\-blocksonly\fR
|
||||
.IP
|
||||
Whether to reject transactions from network peers. Transactions from the
|
||||
wallet, RPC and relay whitelisted inbound peers are not affected.
|
||||
(default: 0)
|
||||
.HP
|
||||
\fB\-conf=\fR<file>
|
||||
.IP
|
||||
@@ -56,7 +69,9 @@ Specify data directory
|
||||
.HP
|
||||
\fB\-dbcache=\fR<n>
|
||||
.IP
|
||||
Set database cache size in MiB (4 to 16384, default: 450)
|
||||
Maximum database cache size <n> MiB (4 to 16384, default: 450). In
|
||||
addition, unused mempool memory is shared for this cache (see
|
||||
\fB\-maxmempool\fR).
|
||||
.HP
|
||||
\fB\-debuglogfile=\fR<file>
|
||||
.IP
|
||||
@@ -88,7 +103,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
|
||||
.HP
|
||||
\fB\-par=\fR<n>
|
||||
.IP
|
||||
Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
|
||||
Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
|
||||
leave that many cores free, default: 0)
|
||||
.HP
|
||||
\fB\-persistmempool\fR
|
||||
@@ -237,7 +252,7 @@ networks.
|
||||
\fB\-peerbloomfilters\fR
|
||||
.IP
|
||||
Support filtering of blocks and transaction with bloom filters (default:
|
||||
1)
|
||||
0)
|
||||
.HP
|
||||
\fB\-permitbaremultisig\fR
|
||||
.IP
|
||||
@@ -281,18 +296,22 @@ Tor control port password (default: empty)
|
||||
.IP
|
||||
Use UPnP to map the listening port (default: 0)
|
||||
.HP
|
||||
\fB\-whitebind=\fR<addr>
|
||||
\fB\-whitebind=\fR<[permissions@]addr>
|
||||
.IP
|
||||
Bind to given address and whitelist peers connecting to it. Use
|
||||
[host]:port notation for IPv6
|
||||
[host]:port notation for IPv6. Allowed permissions are
|
||||
bloomfilter (allow requesting BIP37 filtered blocks and
|
||||
transactions), noban (do not ban for misbehavior), forcerelay
|
||||
(relay even non\-standard transactions), relay (relay even in
|
||||
\fB\-blocksonly\fR mode), and mempool (allow requesting BIP35 mempool
|
||||
contents). Specify multiple permissions separated by commas
|
||||
(default: noban,mempool,relay). Can be specified multiple times.
|
||||
.HP
|
||||
\fB\-whitelist=\fR<IP address or network>
|
||||
\fB\-whitelist=\fR<[permissions@]IP address or network>
|
||||
.IP
|
||||
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. 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
|
||||
CIDR notated network(e.g. 1.2.3.0/24). Uses same permissions as
|
||||
\fB\-whitebind\fR. Can be specified multiple times.
|
||||
.PP
|
||||
Wallet options:
|
||||
.HP
|
||||
@@ -307,7 +326,8 @@ 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: 0)
|
||||
selection may result due to the added limitation (default: 0
|
||||
(always enabled for wallets with "avoid_reuse" enabled))
|
||||
.HP
|
||||
\fB\-changetype\fR
|
||||
.IP
|
||||
@@ -406,17 +426,35 @@ ZeroMQ notification options:
|
||||
.IP
|
||||
Enable publish hash block in <address>
|
||||
.HP
|
||||
\fB\-zmqpubhashblockhwm=\fR<n>
|
||||
.IP
|
||||
Set publish hash block outbound message high water mark (default: 1000)
|
||||
.HP
|
||||
\fB\-zmqpubhashtx=\fR<address>
|
||||
.IP
|
||||
Enable publish hash transaction in <address>
|
||||
.HP
|
||||
\fB\-zmqpubhashtxhwm=\fR<n>
|
||||
.IP
|
||||
Set publish hash transaction outbound message high water mark (default:
|
||||
1000)
|
||||
.HP
|
||||
\fB\-zmqpubrawblock=\fR<address>
|
||||
.IP
|
||||
Enable publish raw block in <address>
|
||||
.HP
|
||||
\fB\-zmqpubrawblockhwm=\fR<n>
|
||||
.IP
|
||||
Set publish raw block outbound message high water mark (default: 1000)
|
||||
.HP
|
||||
\fB\-zmqpubrawtx=\fR<address>
|
||||
.IP
|
||||
Enable publish raw transaction in <address>
|
||||
.HP
|
||||
\fB\-zmqpubrawtxhwm=\fR<n>
|
||||
.IP
|
||||
Set publish raw transaction outbound message high water mark (default:
|
||||
1000)
|
||||
.PP
|
||||
Debugging/Testing options:
|
||||
.HP
|
||||
@@ -443,15 +481,19 @@ Print help message with debugging options and exit
|
||||
.IP
|
||||
Include IP addresses in debug output (default: 0)
|
||||
.HP
|
||||
\fB\-logthreadnames\fR
|
||||
.IP
|
||||
Prepend debug output with name of the originating thread (only available
|
||||
on platforms supporting thread_local) (default: 0)
|
||||
.HP
|
||||
\fB\-logtimestamps\fR
|
||||
.IP
|
||||
Prepend debug output with timestamp (default: 1)
|
||||
.HP
|
||||
\fB\-maxtxfee=\fR<amt>
|
||||
.IP
|
||||
Maximum total fees (in BTC) to use in a single wallet transaction or raw
|
||||
transaction; setting this too low may abort large transactions
|
||||
(default: 0.10)
|
||||
Maximum total fees (in BTC) to use in a single wallet transaction;
|
||||
setting this too low may abort large transactions (default: 0.10)
|
||||
.HP
|
||||
\fB\-printtoconsole\fR
|
||||
.IP
|
||||
@@ -468,9 +510,14 @@ Append comment to the user agent string
|
||||
.PP
|
||||
Chain selection options:
|
||||
.HP
|
||||
\fB\-chain=\fR<chain>
|
||||
.IP
|
||||
Use the chain <chain> (default: main). Allowed values: main, test,
|
||||
regtest
|
||||
.HP
|
||||
\fB\-testnet\fR
|
||||
.IP
|
||||
Use the test chain
|
||||
Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR.
|
||||
.PP
|
||||
Node relay options:
|
||||
.HP
|
||||
@@ -495,13 +542,16 @@ mining and transaction creation (default: 0.00001)
|
||||
.HP
|
||||
\fB\-whitelistforcerelay\fR
|
||||
.IP
|
||||
Force relay of transactions from whitelisted peers even if they violate
|
||||
local relay policy (default: 0)
|
||||
Add 'forcerelay' permission to whitelisted inbound peers with default
|
||||
permissions. This will relay transactions even if the
|
||||
transactions were already in the mempool or violate local relay
|
||||
policy. (default: 0)
|
||||
.HP
|
||||
\fB\-whitelistrelay\fR
|
||||
.IP
|
||||
Accept relayed transactions received from whitelisted peers even when
|
||||
not relaying transactions (default: 1)
|
||||
Add 'relay' permission to whitelisted inbound peers with default
|
||||
permissions. The will accept relayed transactions even when not
|
||||
relaying transactions (default: 1)
|
||||
.PP
|
||||
Block creation options:
|
||||
.HP
|
||||
|
||||
@@ -45,7 +45,7 @@ static bool AppInit(int argc, char* argv[])
|
||||
|
||||
bool fRet = false;
|
||||
|
||||
util::ThreadRename("init");
|
||||
util::ThreadSetInternalName("init");
|
||||
|
||||
//
|
||||
// Parameters
|
||||
|
||||
@@ -416,7 +416,7 @@ int GuiMain(int argc, char* argv[])
|
||||
std::tie(argc, argv) = winArgs.get();
|
||||
#endif
|
||||
SetupEnvironment();
|
||||
util::ThreadRename("main");
|
||||
util::ThreadSetInternalName("main");
|
||||
|
||||
std::unique_ptr<interfaces::Node> node = interfaces::MakeNode();
|
||||
|
||||
|
||||
@@ -69,6 +69,10 @@
|
||||
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
|
||||
<translation>Dies sind Ihre Bitcoin-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Adresse des Empfängers, bevor Sie Bitcoins überweisen.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.</source>
|
||||
<translation>Dies sind Ihre Bitcoin-Adressen zum Empfangen von Zahlungen. Benutze den 'Neue Empfangsadresse erstellen' Button im Empfangen-Tab, um eine neue Addresse zu erstellen.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Copy Address</source>
|
||||
<translation>&Adresse kopieren</translation>
|
||||
@@ -175,10 +179,30 @@
|
||||
<source>Wallet encrypted</source>
|
||||
<translation>Wallet verschlüsselt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Enter the new passphrase for the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source>
|
||||
<translation>Geben Sie die neue Passphrase für die Wallet ein.<br/>Bitte benutzen Sie eine Passphrase bestehend aus <b>zehn oder mehr zufälligen Zeichen</b> oder <b>acht oder mehr Wörtern</b>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Enter the old passphrase and new passphrase for the wallet.</source>
|
||||
<translation>Geben Sie die alte und die neue Wallet-Passphrase ein.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
|
||||
<translation>Beachten Sie, dass das Verschlüsseln Ihrer Brieftasche nicht komplett vor Diebstahl Ihrer Bitcoins durch Malware schützt, die Ihren Computer infiziert hat.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Wallet to be encrypted</source>
|
||||
<translation>Wallet zu verschlüsseln</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Your wallet is about to be encrypted. </source>
|
||||
<translation>Wallet wird verschlüsselt.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Your wallet is now encrypted. </source>
|
||||
<translation>Deine Wallet ist jetzt verschlüsselt.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
|
||||
<translation>WICHTIG: Alle vorherigen Wallet-Backups sollten durch die neu erzeugte, verschlüsselte Wallet ersetzt werden. Aus Sicherheitsgründen werden vorherige Backups der unverschlüsselten Wallet nutzlos, sobald Sie die neue, verschlüsselte Wallet verwenden.</translation>
|
||||
@@ -301,6 +325,14 @@
|
||||
<source>Open &URI...</source>
|
||||
<translation>&URI öffnen...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create Wallet...</source>
|
||||
<translation>Wallet erstellen...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create a new wallet</source>
|
||||
<translation>Neue Wallet erstellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Wallet:</source>
|
||||
<translation>Wallet:</translation>
|
||||
@@ -529,6 +561,10 @@
|
||||
<source>Error: %1</source>
|
||||
<translation>Fehler: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Warning: %1</source>
|
||||
<translation>Warnung: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Date: %1
|
||||
</source>
|
||||
@@ -751,13 +787,29 @@
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateWalletActivity</name>
|
||||
</context>
|
||||
<message>
|
||||
<source>Creating Wallet <b>%1</b>...</source>
|
||||
<translation>Erstelle Wallet<b>%1</b> ...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create wallet failed</source>
|
||||
<translation>Fehler beim Wallet erstellen aufgetreten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create wallet warning</source>
|
||||
<translation>Warnung beim Wallet erstellen aufgetreten</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateWalletDialog</name>
|
||||
<message>
|
||||
<source>Create Wallet</source>
|
||||
<translation>Wallet erstellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Wallet Name</source>
|
||||
<translation>Wallet Name</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
|
||||
<translation>Verschlüssele das Wallet. Das Wallet wird mit einer Passphrase deiner Wahl verschlüsselt.</translation>
|
||||
@@ -770,6 +822,10 @@
|
||||
<source>Disable Private Keys</source>
|
||||
<translation>Private Keys deaktivieren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Make Blank Wallet</source>
|
||||
<translation>Eine leere Wallet erstellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create</source>
|
||||
<translation>Erstellen</translation>
|
||||
@@ -942,7 +998,11 @@
|
||||
<source>(of %n GB needed)</source>
|
||||
<translation><numerusform>(von %n GB benötigt)</numerusform><numerusform>(von %n GB benötigt)</numerusform></translation>
|
||||
</message>
|
||||
</context>
|
||||
<message numerus="yes">
|
||||
<source>(%n GB needed for full chain)</source>
|
||||
<translation><numerusform>(%n GB benötigt für komplette Blockchain)</numerusform><numerusform>(%n GB benötigt für komplette Blockchain)</numerusform></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ModalOverlay</name>
|
||||
<message>
|
||||
@@ -1019,6 +1079,14 @@
|
||||
</context>
|
||||
<context>
|
||||
<name>OpenWalletActivity</name>
|
||||
<message>
|
||||
<source>Open wallet failed</source>
|
||||
<translation>Wallet öffnen fehlgeschlagen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Open wallet warning</source>
|
||||
<translation>Wallet öffnen Warnung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>default wallet</source>
|
||||
<translation>Standard Wallet</translation>
|
||||
@@ -1629,6 +1697,10 @@
|
||||
<source>Error encoding URI into QR Code.</source>
|
||||
<translation>Beim Enkodieren der URI in den QR-Code ist ein Fehler aufgetreten.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>QR code support not available.</source>
|
||||
<translation>QR Code Funktionalität nicht vorhanden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save QR Code</source>
|
||||
<translation>QR-Code speichern</translation>
|
||||
@@ -1987,6 +2059,10 @@
|
||||
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
|
||||
<translation>Ein optional angeforderter Betrag. Lassen Sie dieses Feld leer oder setzen Sie es auf 0, um keinen spezifischen Betrag anzufordern.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Create new receiving address</source>
|
||||
<translation>Neue Empfangsadresse erstellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Clear all fields of the form.</source>
|
||||
<translation>Alle Formularfelder zurücksetzen.</translation>
|
||||
@@ -2308,6 +2384,14 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
|
||||
<source>%1 (%2 blocks)</source>
|
||||
<translation>%1 (%2 Blöcke)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source> from wallet '%1'</source>
|
||||
<translation>von der Wallet '%1'</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>%1 to '%2'</source>
|
||||
<translation>%1 an '%2'</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>%1 to %2</source>
|
||||
<translation>%1 an %2</translation>
|
||||
@@ -2340,6 +2424,10 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
|
||||
<source>Total Amount</source>
|
||||
<translation>Gesamtbetrag</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>To review recipient list click "Show Details..."</source>
|
||||
<translation>Um die Empfängerliste anzuzeigen, klicke auf "Details anzeigen..."</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Confirm send coins</source>
|
||||
<translation>Überweisung bestätigen</translation>
|
||||
@@ -3113,6 +3201,10 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
|
||||
<source>Close wallet</source>
|
||||
<translation>Wallet schließen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Are you sure you wish to close the wallet <i>%1</i>?</source>
|
||||
<translation>Sind Sie sich sicher, dass Sie die Wallet <i>%1</i> schließen möchten?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
|
||||
<translation>Wenn Sie die Wallet zu lange schließen, kann es dazu kommen, dass Sie die gesamte Chain neu synchronisieren müssen, wenn Pruning aktiviert ist.</translation>
|
||||
@@ -3387,6 +3479,10 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
|
||||
<source>Initialization sanity check failed. %s is shutting down.</source>
|
||||
<translation>Initialisierungsplausibilitätsprüfung fehlgeschlagen. %s wird beendet.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Invalid P2P permission: '%s'</source>
|
||||
<translation>Ungültige P2P Genehmigung: '%s'</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Invalid amount for -%s=<amount>: '%s'</source>
|
||||
<translation>Ungültiger Betrag für -%s=<amount>: '%s'</translation>
|
||||
@@ -3419,6 +3515,10 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
|
||||
<source>Loading P2P addresses...</source>
|
||||
<translation>Lade P2P-Adressen...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Error: Disk space is too low!</source>
|
||||
<translation>Fehler: Zu wenig freier Speicherplatz auf dem Datenträger!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Loading banlist...</source>
|
||||
<translation>Lade Sperrliste...</translation>
|
||||
@@ -3527,6 +3627,10 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
|
||||
<source>Need to specify a port with -whitebind: '%s'</source>
|
||||
<translation>Angabe eines Ports benötigt für -whitebind: '%s'</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Prune mode is incompatible with -blockfilterindex.</source>
|
||||
<translation>Kürzungsmodus ist nicht mit -blockfilterindex kompatibel.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
|
||||
<translation>Reduziere -maxconnections von %d zu %d, aufgrund von Systemlimitierungen.</translation>
|
||||
|
||||
@@ -69,6 +69,10 @@
|
||||
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
|
||||
<translation>Nämä ovat Bitcoin-osoitteesi maksujen lähettämistä varten. Tarkista aina määrä ja vastaanotto-osoite ennen kolikoiden lähettämistä.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.</source>
|
||||
<translation>Nämä ovat sinun Bitcoin osoitteesi maksujen vastaanottamista varten. Käytä 'Luo uusi vastaanotto-osoite' painiketta vastaantto tabissä luodaksesi uuden osoitteen.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Copy Address</source>
|
||||
<translation>&Kopioi osoite</translation>
|
||||
@@ -131,6 +135,10 @@
|
||||
<source>Repeat new passphrase</source>
|
||||
<translation>Toista uusi tunnuslause</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Show passphrase</source>
|
||||
<translation>Näytä salasanalause</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Encrypt wallet</source>
|
||||
<translation>Salaa lompakko</translation>
|
||||
@@ -171,6 +179,26 @@
|
||||
<source>Wallet encrypted</source>
|
||||
<translation>Lompakko salattiin</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Enter the new passphrase for the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source>
|
||||
<translation>Syötä uusi salasanalause lompakolle <br/>Ole hyvä ja käytä salasanalausetta, jossa on <b>kymmenen tai enemmän sattumanvaraisia merkkjä tai <b>kahdeksan tai enemmän sanoja</b> .</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Enter the old passphrase and new passphrase for the wallet.</source>
|
||||
<translation>Syötä vanha ja uusi salasanalause lompakolle.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
|
||||
<translation>Muista, että salaamalla lompakkosi et täysin pysty suojaamaan bitcoineja varkaudelta, jotka aiheutuvat koneellasi olevista haittaohjelmista.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Wallet to be encrypted</source>
|
||||
<translation>Lompakko tulee salata</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Your wallet is about to be encrypted. </source>
|
||||
<translation>Lompakkosi tulee kohta salatuksi.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
|
||||
<translation>TÄRKEÄÄ: Kaikki tekemäsi vanhan lompakon varmuuskopiot pitäisi korvata uusilla suojatuilla varmuuskopioilla. Turvallisuussyistä edelliset varmuuskopiot muuttuvat turhiksi, kun aloitat uuden suojatun lompakon käytön.</translation>
|
||||
|
||||
@@ -1494,7 +1494,7 @@
|
||||
</message>
|
||||
<message>
|
||||
<source>Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.</source>
|
||||
<translation>由于BIP70具有广泛的安全缺陷,强烈建议您忽略任何要求更换钱包的商家指引。</translation>
|
||||
<translation>由于BIP70具有广泛的安全缺陷,无论哪个商家指引要求您更换钱包,我们都建议您不要听信。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -82,7 +82,7 @@ static QString ipcServerName()
|
||||
// the main GUI window is up and ready to ask the user
|
||||
// to send payment.
|
||||
|
||||
static QList<QString> savedPaymentRequests;
|
||||
static QSet<QString> savedPaymentRequests;
|
||||
|
||||
//
|
||||
// Sending to the server is done synchronously, at startup.
|
||||
@@ -107,7 +107,8 @@ void PaymentServer::ipcParseCommandLine(interfaces::Node& node, int argc, char*
|
||||
// will start a mainnet instance and throw a "wrong network" error.
|
||||
if (arg.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // bitcoin: URI
|
||||
{
|
||||
savedPaymentRequests.append(arg);
|
||||
if (savedPaymentRequests.contains(arg)) continue;
|
||||
savedPaymentRequests.insert(arg);
|
||||
|
||||
SendCoinsRecipient r;
|
||||
if (GUIUtil::parseBitcoinURI(arg, &r) && !r.address.isEmpty())
|
||||
@@ -127,7 +128,8 @@ void PaymentServer::ipcParseCommandLine(interfaces::Node& node, int argc, char*
|
||||
#ifdef ENABLE_BIP70
|
||||
else if (QFile::exists(arg)) // Filename
|
||||
{
|
||||
savedPaymentRequests.append(arg);
|
||||
if (savedPaymentRequests.contains(arg)) continue;
|
||||
savedPaymentRequests.insert(arg);
|
||||
|
||||
PaymentRequestPlus request;
|
||||
if (readPaymentRequestFromFile(arg, request))
|
||||
@@ -280,7 +282,7 @@ void PaymentServer::handleURIOrFile(const QString& s)
|
||||
{
|
||||
if (saveURIs)
|
||||
{
|
||||
savedPaymentRequests.append(s);
|
||||
savedPaymentRequests.insert(s);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -60,3 +60,8 @@ void util::ThreadRename(std::string&& name)
|
||||
SetThreadName(("b-" + name).c_str());
|
||||
SetInternalName(std::move(name));
|
||||
}
|
||||
|
||||
void util::ThreadSetInternalName(std::string&& name)
|
||||
{
|
||||
SetInternalName(std::move(name));
|
||||
}
|
||||
|
||||
@@ -10,8 +10,13 @@
|
||||
namespace util {
|
||||
//! Rename a thread both in terms of an internal (in-memory) name as well
|
||||
//! as its system thread name.
|
||||
//! @note Do not call this for the main thread, as this will interfere with
|
||||
//! UNIX utilities such as top and killall. Use ThreadSetInternalName instead.
|
||||
void ThreadRename(std::string&&);
|
||||
|
||||
//! Set the internal (in-memory) name of the current thread only.
|
||||
void ThreadSetInternalName(std::string&&);
|
||||
|
||||
//! Get the thread's internal (in-memory) name; used e.g. for identification in
|
||||
//! logging.
|
||||
const std::string& ThreadGetInternalName();
|
||||
|
||||
Reference in New Issue
Block a user