Merge branch 'master' of https://github.com/xpc-wg/xpchain into girl_…

…wallet

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,12 @@
-<!-- This issue tracker is only for technical issues related to Bitcoin Core.
+<!-- This issue tracker is only for technical issues related to XPChain Core.
 
-General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
+General XPChain questions and/or support requests are best directed to
+the XPChain's topic on Bitcoin Forum at https://bitcointalk.org/index.php?topic=4022431
+or the Global Discord server (https://discord.gg/DbfBWZY) (require Discord client)
 
-For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
+You can also ask a quick question of the official Twitter account (@XPChain_Global).
+
+For reporting security issues, contact the team at contact(at)xpchain.io
 
 If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
 
@@ -13,7 +17,7 @@ If the node is "stuck" during sync or giving "block checksum mismatch" errors, p
 
 <!--- How reliably can you reproduce the issue, what are the steps to do so? -->
 
-<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
+<!-- What version of XPChain Core are you using, where did you get it (website, self-compiled, etc)? -->
 
 <!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
 

COPYING

@@ -2,7 +2,7 @@ The MIT License (MIT)
 
 Copyright (c) 2009-2018 The Bitcoin Core developers
 Copyright (c) 2009-2018 Bitcoin Developers
-Copyright (c) 2018 The XPChain Core Developers
+Copyright (c) 2018-2019 The XPChain Core Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Dockerfile

@@ -35,7 +35,7 @@ COPY . /usr/src/xpchain
 WORKDIR /usr/src/xpchain
 RUN \
   ./autogen.sh && \
-  ./configure --without-gui && \
+  ./configure --without-gui --disable-tests --disable-bench && \
   make -j$(nproc) && \
   make install && \
   make clean
@@ -82,7 +82,6 @@ RUN \
 
 # Copy build xpchaind (and other tools)
 COPY --from=build \
-  /usr/local/bin/bench_bitcoin  /usr/local/bin/test_bitcoin \
   /usr/local/bin/xpchain-cli /usr/local/bin/xpchain-tx /usr/local/bin/xpchaind \
   /usr/local/bin/
 

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 17)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 2)
+define(_CLIENT_VERSION_BUILD, 3)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

contrib/devtools/gen-manpages.sh

@@ -7,26 +7,26 @@ BUILDDIR=${BUILDDIR:-$TOPDIR}
 BINDIR=${BINDIR:-$BUILDDIR/src}
 MANDIR=${MANDIR:-$TOPDIR/doc/man}
 
-BITCOIND=${BITCOIND:-$BINDIR/bitcoind}
-BITCOINCLI=${BITCOINCLI:-$BINDIR/bitcoin-cli}
-BITCOINTX=${BITCOINTX:-$BINDIR/bitcoin-tx}
-BITCOINQT=${BITCOINQT:-$BINDIR/qt/bitcoin-qt}
+XPCHAIND=${XPCHAIND:-$BINDIR/xpchaind}
+XPCHAINCLI=${XPCHAINCLI:-$BINDIR/xpchain-cli}
+XPCHAINTX=${XPCHAINTX:-$BINDIR/xpchain-tx}
+XPCHAINQT=${XPCHAINQT:-$BINDIR/qt/xpchain-qt}
 
-[ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1
+[ ! -x $XPCHAIND ] && echo "$XPCHAIND not found or not executable." && exit 1
 
 # The autodetected version git tag can screw up manpage output a little bit
-BTCVER=($($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
+XPCVER=($($XPCHAINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
 
 # Create a footer file with copyright content.
-# This gets autodetected fine for bitcoind if --version-string is not set,
-# but has different outcomes for bitcoin-qt and bitcoin-cli.
+# This gets autodetected fine for xpchaind if --version-string is not set,
+# but has different outcomes for xpchain-qt and xpchain-cli.
 echo "[COPYRIGHT]" > footer.h2m
-$BITCOIND --version | sed -n '1!p' >> footer.h2m
+$XPCHAIND --version | sed -n '1!p' >> footer.h2m
 
-for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do
+for cmd in $XPCHAIND $XPCHAINCLI $XPCHAINTX $XPCHAINQT; do
   cmdname="${cmd##*/}"
-  help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
-  sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1
+  help2man -N --version-string=${XPCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
+  sed -i "s/\\\-${XPCVER[1]}//g" ${MANDIR}/${cmdname}.1
 done
 
 rm -f footer.h2m

doc/man/Makefile.am

@@ -1,13 +1,13 @@
 dist_man1_MANS=
 
 if BUILD_XPCHAIND
-  dist_man1_MANS+=bitcoind.1
+  dist_man1_MANS+=xpchaind.1
 endif
 
 if ENABLE_QT
-  dist_man1_MANS+=bitcoin-qt.1
+  dist_man1_MANS+=xpchain-qt.1
 endif
 
 if BUILD_BITCOIN_UTILS
-  dist_man1_MANS+=bitcoin-cli.1 bitcoin-tx.1
+  dist_man1_MANS+=xpchain-cli.1 xpchain-tx.1
 endif

doc/man/bitcoin-cli.1 → doc/man/xpchain-cli.1

@@ -1,21 +1,21 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BITCOIN-CLI "1" "August 2018" "bitcoin-cli v0.17.0.0" "User Commands"
+.TH XPCHAIN-CLI "1" "March 2019" "xpchain-cli v0.17.0.3" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v0.17.0.0
+xpchain-cli \- manual page for xpchain-cli v0.17.0.3
 .SH SYNOPSIS
-.B bitcoin-cli
-[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Bitcoin Core\/\fR
+.B xpchain-cli
+[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to XPChain Core\/\fR
 .br
-.B bitcoin-cli
-[\fI\,options\/\fR] \fI\,-named <command> \/\fR[\fI\,name=value\/\fR]...  \fI\,Send command to Bitcoin Core (with named arguments)\/\fR
+.B xpchain-cli
+[\fI\,options\/\fR] \fI\,-named <command> \/\fR[\fI\,name=value\/\fR]...  \fI\,Send command to XPChain Core (with named arguments)\/\fR
 .br
-.B bitcoin-cli
+.B xpchain-cli
 [\fI\,options\/\fR] \fI\,help                List commands\/\fR
 .br
-.B bitcoin-cli
+.B xpchain-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v0.17.0.0
+XPChain Core RPC client version v0.17.0.3
 .SH OPTIONS
 .HP
 \-?
@@ -25,7 +25,7 @@ This help message
 \fB\-conf=\fR<file>
 .IP
 Specify configuration file. Relative paths will be prefixed by datadir
-location. (default: bitcoin.conf)
+location. (default: xpchain.conf)
 .HP
 \fB\-datadir=\fR<dir>
 .IP
@@ -76,7 +76,7 @@ Wait for RPC server to start
 \fB\-rpcwallet=\fR<walletname>
 .IP
 Send RPC for non\-default wallet on RPC server (needs to exactly match
-corresponding \fB\-wallet\fR option passed to bitcoind)
+corresponding \fB\-wallet\fR option passed to xpchaind)
 .HP
 \fB\-stdin\fR
 .IP
@@ -101,11 +101,12 @@ Chain selection options:
 .IP
 Use the test chain
 .SH COPYRIGHT
-Copyright (C) 2009-2018 The Bitcoin Core developers
+Copyright (C) 2018-2019 The XPChain Core developers
+Copyright (C) 2009-2019 The Bitcoin Core developers
 
-Please contribute if you find Bitcoin Core useful. Visit
-<https://bitcoincore.org> for further information about the software.
-The source code is available from <https://github.com/bitcoin/bitcoin>.
+Please contribute if you find XPChain Core useful. Visit
+<https://www.xpchain.io/> for further information about the software.
+The source code is available from <https://github.com/xpc-wg/xpchain>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING

doc/man/bitcoin-qt.1 → doc/man/xpchain-qt.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BITCOIN-QT "1" "August 2018" "bitcoin-qt v0.17.0.0" "User Commands"
+.TH XPCHAIN-QT "1" "March 2019" "xpchain-qt v0.17.0.3" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v0.17.0.0
+xpchain-qt \- manual page for xpchain-qt v0.17.0.3
 .SH SYNOPSIS
-.B bitcoin-qt
+.B xpchain-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v0.17.0.0 (64\-bit)
+XPChain Core version v0.17.0.3 (64\-bit)
 .SH OPTIONS
 .HP
 \-?
@@ -23,9 +23,9 @@ 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,
+0000000000000000000000000000000000000000000000000000000000000000,
 testnet:
-0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75)
+0000000000000000000000000000000000000000000000000000000000000000)
 .HP
 \fB\-blocknotify=\fR<cmd>
 .IP
@@ -44,7 +44,7 @@ Specify blocks directory (default: <datadir>/blocks)
 \fB\-conf=\fR<file>
 .IP
 Specify configuration file. Relative paths will be prefixed by datadir
-location. (default: bitcoin.conf)
+location. (default: xpchain.conf)
 .HP
 \fB\-daemon\fR
 .IP
@@ -97,7 +97,7 @@ Whether to save the mempool on shutdown and load on restart (default: 1)
 \fB\-pid=\fR<file>
 .IP
 Specify pid file. Relative paths will be prefixed by a net\-specific
-datadir location. (default: bitcoind.pid)
+datadir location. (default: xpchaind.pid)
 .HP
 \fB\-prune=\fR<n>
 .IP
@@ -294,7 +294,7 @@ Wallet options:
 \fB\-addresstype\fR
 .IP
 What type of addresses to use ("legacy", "p2sh\-segwit", or "bech32",
-default: "p2sh\-segwit")
+default: "bech32")
 .HP
 \fB\-avoidpartialspends\fR
 .IP
@@ -317,29 +317,29 @@ Do not load the wallet and disable wallet RPC calls
 .HP
 \fB\-discardfee=\fR<amt>
 .IP
-The fee rate (in BTC/kB) that indicates your tolerance for discarding
-change by adding it to the fee (default: 0.0001). Note: An output
+The fee rate (in XPC/kB) that indicates your tolerance for discarding
+change by adding it to the fee (default: 1.00). 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
 .HP
 \fB\-fallbackfee=\fR<amt>
 .IP
-A fee rate (in BTC/kB) that will be used when fee estimation has
-insufficient data (default: 0.0002)
+A fee rate (in XPC/kB) that will be used when fee estimation has
+insufficient data (default: 2.00)
 .HP
 \fB\-keypool=\fR<n>
 .IP
 Set key pool size to <n> (default: 1000)
 .HP
 \fB\-mintxfee=\fR<amt>
 .IP
-Fees (in BTC/kB) smaller than this are considered zero fee for
-transaction creation (default: 0.00001)
+Fees (in XPC/kB) smaller than this are considered zero fee for
+transaction creation (default: 0.10)
 .HP
 \fB\-paytxfee=\fR<amt>
 .IP
-Fee (in BTC/kB) to add to transactions you send (default: 0.00)
+Fee (in XPC/kB) to add to transactions you send (default: 0.00)
 .HP
 \fB\-rescan\fR
 .IP
@@ -445,9 +445,9 @@ 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
+Maximum total fees (in XPC) to use in a single wallet transaction or raw
 transaction; setting this too low may abort large transactions
-(default: 0.10)
+(default: 100.00)
 .HP
 \fB\-printtoconsole\fR
 .IP
@@ -490,8 +490,8 @@ Enable transaction replacement in the memory pool (default: 1)
 .HP
 \fB\-minrelaytxfee=\fR<amt>
 .IP
-Fees (in BTC/kB) smaller than this are considered zero fee for relaying,
-mining and transaction creation (default: 0.00001)
+Fees (in XPC/kB) smaller than this are considered zero fee for relaying,
+mining and transaction creation (default: 0.10)
 .HP
 \fB\-whitelistforcerelay\fR
 .IP
@@ -511,8 +511,8 @@ Set maximum BIP141 block weight (default: 3996000)
 .HP
 \fB\-blockmintxfee=\fR<amt>
 .IP
-Set lowest fee rate (in BTC/kB) for transactions to be included in block
-creation. (default: 0.00001)
+Set lowest fee rate (in XPC/kB) for transactions to be included in block
+creation. (default: 0.10)
 .PP
 RPC server options:
 .HP
@@ -601,12 +601,20 @@ Set SSL root certificates for payment request (default: \fB\-system\-\fR)
 \fB\-splash\fR
 .IP
 Show splash screen on startup (default: 1)
+.PP
+Minting Options:
+.HP
+\fB\-minting\fR
+.IP
+Whether to mint blocks when the wallet is not locked (0 = no, default:
+1)
 .SH COPYRIGHT
-Copyright (C) 2009-2018 The Bitcoin Core developers
+Copyright (C) 2018-2019 The XPChain Core developers
+Copyright (C) 2009-2019 The Bitcoin Core developers
 
-Please contribute if you find Bitcoin Core useful. Visit
-<https://bitcoincore.org> for further information about the software.
-The source code is available from <https://github.com/bitcoin/bitcoin>.
+Please contribute if you find XPChain Core useful. Visit
+<https://www.xpchain.io/> for further information about the software.
+The source code is available from <https://github.com/xpc-wg/xpchain>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING

doc/man/bitcoin-tx.1 → doc/man/xpchain-tx.1

@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BITCOIN-TX "1" "August 2018" "bitcoin-tx v0.17.0.0" "User Commands"
+.TH XPCHAIN-TX "1" "March 2019" "xpchain-tx v0.17.0.3" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v0.17.0.0
+xpchain-tx \- manual page for xpchain-tx v0.17.0.3
 .SH SYNOPSIS
-.B bitcoin-tx
-[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
+.B xpchain-tx
+[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded xpchain transaction\/\fR
 .br
-.B bitcoin-tx
-[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
+.B xpchain-tx
+[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded xpchain transaction\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v0.17.0.0
+XPChain Core xpchain\-tx utility version v0.17.0.3
 .SH OPTIONS
 .HP
 \-?
@@ -105,11 +105,12 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2009-2018 The Bitcoin Core developers
+Copyright (C) 2018-2019 The XPChain Core developers
+Copyright (C) 2009-2019 The Bitcoin Core developers
 
-Please contribute if you find Bitcoin Core useful. Visit
-<https://bitcoincore.org> for further information about the software.
-The source code is available from <https://github.com/bitcoin/bitcoin>.
+Please contribute if you find XPChain Core useful. Visit
+<https://www.xpchain.io/> for further information about the software.
+The source code is available from <https://github.com/xpc-wg/xpchain>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING