Renamed:
1. zcutil -> btcputil 2. zcashd -> btcpd 3. zcash-cli -> btcp-cli 4. Misc. messages: Zcash -> Bitcoin Private and so on
This commit is contained in:
airk42
parent
bfc3959c06
commit
157e0e64e5
|
|
@ -2,8 +2,8 @@
|
|||
*.deb
|
||||
*.exe
|
||||
src/bitcoin
|
||||
src/zcashd
|
||||
src/zcash-cli
|
||||
src/btcpd
|
||||
src/btcp-cli
|
||||
src/zcash-gtest
|
||||
src/zcash-tx
|
||||
src/test/test_bitcoin
|
||||
|
|
|
|||
4
INSTALL
4
INSTALL
|
|
@ -1,5 +1,5 @@
|
|||
Building Zcash
|
||||
|
||||
See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zcashd,
|
||||
See the Bitcoin Private github wiki (https://github.com/BTCPrivate/BitcoinPrivate/wiki) for instructions on building btcpd,
|
||||
the intended-for-services, no-graphical-interface, reference
|
||||
implementation of Zcash.
|
||||
implementation of Bitcoin Private.
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ pkgconfigdir = $(libdir)/pkgconfig
|
|||
pkgconfig_DATA = libzcashconsensus.pc
|
||||
endif
|
||||
|
||||
BITCOIND_BIN=$(top_builddir)/src/zcashd$(EXEEXT)
|
||||
BITCOIN_CLI_BIN=$(top_builddir)/src/zcash-cli$(EXEEXT)
|
||||
BITCOIND_BIN=$(top_builddir)/src/btcpd$(EXEEXT)
|
||||
BITCOIN_CLI_BIN=$(top_builddir)/src/btcp-cli$(EXEEXT)
|
||||
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
|
||||
|
||||
##OSX_APP=Bitcoin-Qt.app
|
||||
|
|
@ -267,8 +267,8 @@ check-local:
|
|||
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
|
||||
endif
|
||||
|
||||
dist_bin_SCRIPTS = zcutil/fetch-params.sh
|
||||
dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh
|
||||
dist_bin_SCRIPTS = btcputil/fetch-params.sh
|
||||
dist_noinst_SCRIPTS = autogen.sh btcputil/build-debian-package.sh btcputil/build.sh
|
||||
|
||||
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(BIN_CHECKS)
|
||||
|
||||
|
|
|
|||
16
README.md
16
README.md
|
|
@ -21,11 +21,11 @@ sudo apt-get install \
|
|||
Install
|
||||
```{r, engine='bash'}
|
||||
# Build
|
||||
./zcutil/build.sh -j$(nproc)
|
||||
./btcputil/build.sh -j$(nproc)
|
||||
# fetch key
|
||||
./zcutil/fetch-params.sh
|
||||
./btcputil/fetch-params.sh
|
||||
# Run
|
||||
./src/zcashd
|
||||
./src/btcpd
|
||||
```
|
||||
|
||||
### Windows
|
||||
|
|
@ -40,7 +40,7 @@ sudo apt-get install \
|
|||
Install (Cross-Compiled, building on Windows is not supported yet)
|
||||
```{r, engine='bash'}
|
||||
# Build
|
||||
./zcutil/build-win.sh -j$(nproc)
|
||||
./btcputil/build-win.sh -j$(nproc)
|
||||
```
|
||||
The exe will save to `src` which you can then move to a windows machine
|
||||
|
||||
|
|
@ -59,11 +59,11 @@ brew install gcc5 --without-multilib
|
|||
Install
|
||||
```{r, engine='bash'}
|
||||
# Build
|
||||
./zcutil/build-mac.sh -j$(nproc)
|
||||
./btcputil/build-mac.sh -j$(nproc)
|
||||
# fetch key
|
||||
./zcutil/fetch-params.sh
|
||||
./btcputil/fetch-params.sh
|
||||
# Run
|
||||
./src/zcashd
|
||||
./src/btcpd
|
||||
```
|
||||
|
||||
About
|
||||
|
|
@ -120,7 +120,7 @@ Building
|
|||
--------
|
||||
|
||||
Build Zcash along with most dependencies from source by running
|
||||
./zcutil/build.sh. Currently only Linux is officially supported.
|
||||
./btcputil/build.sh. Currently only Linux is officially supported.
|
||||
|
||||
License
|
||||
-------
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
#!/bin/bash
|
||||
## Usage:
|
||||
## ./zcutil/build-debian-package.sh
|
||||
## ./btcputil/build-debian-package.sh
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
BUILD_PATH="/tmp/zcbuild"
|
||||
PACKAGE_NAME="zcash"
|
||||
PACKAGE_NAME="btcp"
|
||||
SRC_PATH=`pwd`
|
||||
SRC_DEB=$SRC_PATH/contrib/debian
|
||||
SRC_DOC=$SRC_PATH/doc
|
||||
|
|
@ -17,7 +17,7 @@ if [ ! -d $BUILD_PATH ]; then
|
|||
mkdir $BUILD_PATH
|
||||
fi
|
||||
|
||||
PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v)
|
||||
PACKAGE_VERSION=$($SRC_PATH/src/btcpd --version | grep version | cut -d' ' -f4 | tr -d v)
|
||||
DEBVERSION=$(echo $PACKAGE_VERSION | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/')
|
||||
BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64"
|
||||
|
||||
|
|
@ -38,32 +38,32 @@ chmod 0755 -R $BUILD_DIR/*
|
|||
#cp $SRC_DEB/preinst $BUILD_DIR/DEBIAN
|
||||
#cp $SRC_DEB/prerm $BUILD_DIR/DEBIAN
|
||||
# Copy binaries
|
||||
cp $SRC_PATH/src/zcashd $DEB_BIN
|
||||
cp $SRC_PATH/src/zcash-cli $DEB_BIN
|
||||
cp $SRC_PATH/zcutil/fetch-params.sh $DEB_BIN/zcash-fetch-params
|
||||
cp $SRC_PATH/src/btcpd $DEB_BIN
|
||||
cp $SRC_PATH/src/btcp-cli $DEB_BIN
|
||||
cp $SRC_PATH/btcputil/fetch-params.sh $DEB_BIN/zcash-fetch-params
|
||||
# Copy docs
|
||||
cp $SRC_PATH/doc/release-notes/release-notes-1.0.0.md $DEB_DOC/changelog
|
||||
cp $SRC_DEB/changelog $DEB_DOC/changelog.Debian
|
||||
cp $SRC_DEB/copyright $DEB_DOC
|
||||
cp -r $SRC_DEB/examples $DEB_DOC
|
||||
# Copy manpages
|
||||
cp $SRC_DOC/man/zcashd.1 $DEB_MAN
|
||||
cp $SRC_DOC/man/zcash-cli.1 $DEB_MAN
|
||||
cp $SRC_DOC/man/btcpd.1 $DEB_MAN
|
||||
cp $SRC_DOC/man/btcp-cli.1 $DEB_MAN
|
||||
cp $SRC_DOC/man/zcash-fetch-params.1 $DEB_MAN
|
||||
# Copy bash completion files
|
||||
cp $SRC_PATH/contrib/bitcoind.bash-completion $DEB_CMP/zcashd
|
||||
cp $SRC_PATH/contrib/bitcoin-cli.bash-completion $DEB_CMP/zcash-cli
|
||||
cp $SRC_PATH/contrib/bitcoind.bash-completion $DEB_CMP/btcpd
|
||||
cp $SRC_PATH/contrib/bitcoin-cli.bash-completion $DEB_CMP/btcp-cli
|
||||
# Gzip files
|
||||
gzip --best -n $DEB_DOC/changelog
|
||||
gzip --best -n $DEB_DOC/changelog.Debian
|
||||
gzip --best -n $DEB_MAN/zcashd.1
|
||||
gzip --best -n $DEB_MAN/zcash-cli.1
|
||||
gzip --best -n $DEB_MAN/btcpd.1
|
||||
gzip --best -n $DEB_MAN/btcp-cli.1
|
||||
gzip --best -n $DEB_MAN/zcash-fetch-params.1
|
||||
|
||||
cd $SRC_PATH/contrib
|
||||
|
||||
# Create the control file
|
||||
dpkg-shlibdeps $DEB_BIN/zcashd $DEB_BIN/zcash-cli
|
||||
dpkg-shlibdeps $DEB_BIN/btcpd $DEB_BIN/btcp-cli
|
||||
dpkg-gencontrol -P$BUILD_DIR -v$DEBVERSION
|
||||
|
||||
# Create the Debian package
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
set -eu -o pipefail
|
||||
|
||||
# Allow user overrides to $MAKE. Typical usage for users who need it:
|
||||
# MAKE=gmake ./zcutil/build.sh -j$(nproc)
|
||||
# MAKE=gmake ./btcputil/build.sh -j$(nproc)
|
||||
if [[ -z "${MAKE-}" ]]; then
|
||||
MAKE=make
|
||||
fi
|
||||
|
||||
# Allow overrides to $BUILD and $HOST for porters. Most users will not need it.
|
||||
# BUILD=i686-pc-linux-gnu ./zcutil/build.sh
|
||||
# BUILD=i686-pc-linux-gnu ./btcputil/build.sh
|
||||
if [[ -z "${BUILD-}" ]]; then
|
||||
BUILD=x86_64-unknown-linux-gnu
|
||||
fi
|
||||
|
|
@ -15,7 +15,7 @@ from functools import wraps
|
|||
|
||||
def main(args=sys.argv[1:]):
|
||||
"""
|
||||
Perform the final Zcash release process up to the git tag.
|
||||
Perform the final Bitcoin Private release process up to the git tag.
|
||||
"""
|
||||
opts = parse_args(args)
|
||||
chdir_to_repo(opts.REPO)
|
||||
|
|
@ -178,7 +178,7 @@ def patch_release_height(releaseheight):
|
|||
@phase('Building...')
|
||||
def build():
|
||||
nproc = sh_out('nproc').strip()
|
||||
sh_log('./zcutil/build.sh', '-j', nproc)
|
||||
sh_log('./btcp/build.sh', '-j', nproc)
|
||||
|
||||
|
||||
@phase('Generating manpages.')
|
||||
|
|
@ -188,7 +188,7 @@ def gen_manpages():
|
|||
|
||||
@phase('Generating release notes.')
|
||||
def gen_release_notes(release):
|
||||
sh_log('python', './zcutil/release-notes.py', '--version', release.novtext)
|
||||
sh_log('python', './btcp/release-notes.py', '--version', release.novtext)
|
||||
sh_log(
|
||||
'git',
|
||||
'add',
|
||||
|
|
@ -199,8 +199,8 @@ def gen_release_notes(release):
|
|||
|
||||
@phase('Updating debian changelog.')
|
||||
def update_debian_changelog(release):
|
||||
os.environ['DEBEMAIL'] = 'team@z.cash'
|
||||
os.environ['DEBFULLNAME'] = 'Zcash Company'
|
||||
os.environ['DEBEMAIL'] = 'team@'
|
||||
os.environ['DEBFULLNAME'] = 'Bitcoin Private'
|
||||
sh_log(
|
||||
'debchange',
|
||||
'--newversion', release.debversion,
|
||||
|
|
@ -227,10 +227,10 @@ def chdir_to_repo(repo):
|
|||
def patch_README(release, releaseprev):
|
||||
with PathPatcher('README.md') as (inf, outf):
|
||||
firstline = inf.readline()
|
||||
assert firstline == 'Zcash {}\n'.format(releaseprev.novtext), \
|
||||
assert firstline == 'Bitcoin Private {}\n'.format(releaseprev.novtext), \
|
||||
repr(firstline)
|
||||
|
||||
outf.write('Zcash {}\n'.format(release.novtext))
|
||||
outf.write('Bitcoin Private {}\n'.format(release.novtext))
|
||||
outf.write(inf.read())
|
||||
|
||||
|
||||
|
|
@ -258,11 +258,11 @@ def patch_gitian_linux_yml(release, releaseprev):
|
|||
outf.write(inf.readline())
|
||||
|
||||
secondline = inf.readline()
|
||||
assert secondline == 'name: "zcash-{}"\n'.format(
|
||||
assert secondline == 'name: "btcp-{}"\n'.format(
|
||||
releaseprev.novtext
|
||||
), repr(secondline)
|
||||
|
||||
outf.write('name: "zcash-{}"\n'.format(release.novtext))
|
||||
outf.write('name: "btcp-{}"\n'.format(release.novtext))
|
||||
outf.write(inf.read())
|
||||
|
||||
|
||||
|
|
@ -288,7 +288,7 @@ def _patch_build_defs(release, path, pattern):
|
|||
|
||||
|
||||
def initialize_logging():
|
||||
logname = './zcash-make-release.log'
|
||||
logname = './btcp-make-release.log'
|
||||
fmtr = logging.Formatter(
|
||||
'%(asctime)s L%(lineno)-4d %(levelname)-5s | %(message)s',
|
||||
'%Y-%m-%d %H:%M:%S'
|
||||
|
|
@ -306,7 +306,7 @@ def initialize_logging():
|
|||
root.setLevel(logging.DEBUG)
|
||||
root.addHandler(hout)
|
||||
root.addHandler(hpath)
|
||||
logging.info('zcash make-release.py debug log: %r', logname)
|
||||
logging.info('btcp make-release.py debug log: %r', logname)
|
||||
|
||||
|
||||
def sh_out(*args):
|
||||
|
|
@ -47,12 +47,12 @@ def authors_in_release_notes(filename):
|
|||
authors[apply_author_aliases(name)] = commits
|
||||
return authors
|
||||
|
||||
## Sums commits made by contributors in each Zcash release note in ./doc/release-notes and writes to authors.md
|
||||
## Sums commits made by contributors in each Bitcoin Private release note in ./doc/release-notes and writes to authors.md
|
||||
def document_authors():
|
||||
print "Writing contributors documented in release-notes directory to authors.md."
|
||||
authors_file = os.path.join(doc_dir, 'authors.md')
|
||||
with open(authors_file, 'w') as f:
|
||||
f.write('Zcash Contributors\n==================\n\n')
|
||||
f.write('Bitcoin Private Contributors\n==================\n\n')
|
||||
total_contrib = {}
|
||||
for notes in os.listdir(os.path.join(doc_dir, 'release-notes')):
|
||||
authors = authors_in_release_notes(notes)
|
||||
|
|
@ -199,7 +199,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
|
|||
|
||||
AC_ARG_WITH([utils],
|
||||
[AS_HELP_STRING([--with-utils],
|
||||
[build zcash-cli zcash-tx (default=yes)])],
|
||||
[build btcp-cli zcash-tx (default=yes)])],
|
||||
[build_bitcoin_utils=$withval],
|
||||
[build_bitcoin_utils=yes])
|
||||
|
||||
|
|
@ -812,7 +812,7 @@ AC_MSG_CHECKING([whether to build bitcoind])
|
|||
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
|
||||
AC_MSG_RESULT($build_bitcoind)
|
||||
|
||||
AC_MSG_CHECKING([whether to build utils (zcash-cli zcash-tx)])
|
||||
AC_MSG_CHECKING([whether to build utils (btcp-cli zcash-tx)])
|
||||
AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
|
||||
AC_MSG_RESULT($build_bitcoin_utils)
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ _zcash_accounts() {
|
|||
COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) )
|
||||
}
|
||||
|
||||
_zcash_cli() {
|
||||
_btcp_cli() {
|
||||
local cur prev words=() cword
|
||||
local bitcoin_cli
|
||||
|
||||
|
|
@ -145,7 +145,7 @@ _zcash_cli() {
|
|||
;;
|
||||
esac
|
||||
} &&
|
||||
complete -F _zcash_cli zcash-cli
|
||||
complete -F _btcp_cli btcp-cli
|
||||
|
||||
# Local variables:
|
||||
# mode: shell-script
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
# bash programmable completion for zcashd(1)
|
||||
# bash programmable completion for btcpd(1)
|
||||
# Copyright (c) 2012-2017 The Bitcoin Core developers
|
||||
# Copyright (c) 2016-2017 The Zcash developers
|
||||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
_zcashd() {
|
||||
_btcpd() {
|
||||
local cur prev words=() cword
|
||||
local bitcoind
|
||||
|
||||
# save and use original argument to invoke zcashd for -help
|
||||
# save and use original argument to invoke btcpd for -help
|
||||
# it might not be in $PATH
|
||||
bitcoind="$1"
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ _zcashd() {
|
|||
;;
|
||||
esac
|
||||
} &&
|
||||
complete -F _zcashd zcashd
|
||||
complete -F _btcpd btcpd
|
||||
|
||||
# Local variables:
|
||||
# mode: shell-script
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ Description: HTTPS for money.
|
|||
Based on Bitcoin's code, it intends to offer a far higher standard
|
||||
of privacy and anonymity through a sophisticiated zero-knowledge
|
||||
proving scheme which preserves confidentiality of transaction metadata.
|
||||
This package provides the daemon, zcashd, and the CLI tool,
|
||||
zcash-cli, to interact with the daemon.
|
||||
This package provides the daemon, btcpd, and the CLI tool,
|
||||
btcp-cli, to interact with the daemon.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
##
|
||||
## zcash.conf configuration file. Lines beginning with # are comments.
|
||||
## btcprivate.conf configuration file. Lines beginning with # are comments.
|
||||
##
|
||||
|
||||
# Network-related settings:
|
||||
|
||||
# Run on the test network instead of the real zcash network.
|
||||
# Run on the test network instead of the real Bitcoin Private network.
|
||||
#testnet=0
|
||||
|
||||
# Run a regression test network
|
||||
|
|
@ -57,10 +57,10 @@
|
|||
#maxconnections=
|
||||
|
||||
#
|
||||
# JSON-RPC options (for controlling a running Zcash/zcashd process)
|
||||
# JSON-RPC options (for controlling a running Bitcoin Private/btcpd process)
|
||||
#
|
||||
|
||||
# server=1 tells zcashd to accept JSON-RPC commands (set as default if not specified)
|
||||
# server=1 tells btcpd to accept JSON-RPC commands (set as default if not specified)
|
||||
#server=1
|
||||
|
||||
# Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6.
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
#rpcuser=Ulysses
|
||||
#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
|
||||
|
||||
# How many seconds zcash will wait for a complete RPC HTTP request.
|
||||
# How many seconds Bitcoin Private will wait for a complete RPC HTTP request.
|
||||
# after the HTTP connection is established.
|
||||
#rpcclienttimeout=30
|
||||
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
|
||||
# NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED,
|
||||
# because the rpcpassword is transmitted over the network unencrypted and also because anyone
|
||||
# that can authenticate on the RPC port can steal your keys + take over the account running zcashd
|
||||
# that can authenticate on the RPC port can steal your keys + take over the account running btcpd
|
||||
# For more information see https://github.com/zcash/zcash/issues/1497
|
||||
|
||||
#rpcallowip=10.1.1.34/255.255.255.0
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
# Listen for RPC connections on this TCP port:
|
||||
#rpcport=8232
|
||||
|
||||
# You can use Zcash or zcashd to send commands to Zcash/zcashd
|
||||
# You can use Bitcoin Private or btcpd to send commands to btcpd
|
||||
# running on another host using this option:
|
||||
#rpcconnect=127.0.0.1
|
||||
|
||||
|
|
@ -106,13 +106,13 @@
|
|||
|
||||
# Miscellaneous options
|
||||
|
||||
# Enable attempt to mine zcash.
|
||||
# Enable attempt to mine Bitcoin Private.
|
||||
#gen=0
|
||||
|
||||
# Set the number of threads to be used for mining zcash (-1 = all cores).
|
||||
# Set the number of threads to be used for mining Bitcoin Private (-1 = all cores).
|
||||
#genproclimit=1
|
||||
|
||||
# Specify a different Equihash solver (e.g. "tromp") to try to mine zcash
|
||||
# Specify a different Equihash solver (e.g. "tromp") to try to mine Bitcoin Private
|
||||
# faster when gen=1.
|
||||
#equihashsolver=default
|
||||
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
# both prior transactions and several dozen future transactions.
|
||||
#keypool=100
|
||||
|
||||
# Pay an optional transaction fee every time you send zcash. Transactions with fees
|
||||
# Pay an optional transaction fee every time you send Bitcoin Private. Transactions with fees
|
||||
# are more likely than free transactions to be included in generated blocks, so may
|
||||
# be validated sooner. This setting does not affect private transactions created with
|
||||
# 'z_sendmany'.
|
||||
|
|
@ -1 +1 @@
|
|||
DEBIAN/examples/zcash.conf
|
||||
DEBIAN/examples/btcprivate.conf
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
usr/bin/zcashd
|
||||
usr/bin/zcash-cli
|
||||
usr/bin/btcpd
|
||||
usr/bin/btcp-cli
|
||||
usr/bin/zcash-fetch-params
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
DEBIAN/manpages/zcash-cli.1
|
||||
DEBIAN/manpages/zcashd.1
|
||||
DEBIAN/manpages/btcp-cli.1
|
||||
DEBIAN/manpages/btcpd.1
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)}
|
|||
SRCDIR=${SRCDIR:-$TOPDIR/src}
|
||||
MANDIR=${MANDIR:-$TOPDIR/doc/man}
|
||||
|
||||
ZCASHD=${ZCASHD:-$SRCDIR/zcashd}
|
||||
ZCASHCLI=${ZCASHCLI:-$SRCDIR/zcash-cli}
|
||||
BTCPD=${BTCPD:-$SRCDIR/btcpd}
|
||||
ZCASHCLI=${ZCASHCLI:-$SRCDIR/btcp-cli}
|
||||
ZCASHTX=${ZCASHTX:-$SRCDIR/zcash-tx}
|
||||
|
||||
[ ! -x $ZCASHD ] && echo "$ZCASHD not found or not executable." && exit 1
|
||||
[ ! -x $BTCPD ] && echo "$BTCPD not found or not executable." && exit 1
|
||||
|
||||
# The autodetected version git tag can screw up manpage output a little bit
|
||||
ZECVERSTR=$($ZCASHCLI --version | head -n1 | awk '{ print $NF }')
|
||||
|
|
@ -16,12 +16,12 @@ ZECVER=$(echo $ZECVERSTR | awk -F- '{ OFS="-"; NF--; print $0; }')
|
|||
ZECCOMMIT=$(echo $ZECVERSTR | awk -F- '{ print $NF }')
|
||||
|
||||
# Create a footer file with copyright content.
|
||||
# This gets autodetected fine for zcashd if --version-string is not set,
|
||||
# but has different outcomes for zcash-cli.
|
||||
# This gets autodetected fine for btcpd if --version-string is not set,
|
||||
# but has different outcomes for btcp-cli.
|
||||
echo "[COPYRIGHT]" > footer.h2m
|
||||
$ZCASHD --version | sed -n '1!p' >> footer.h2m
|
||||
$BTCPD --version | sed -n '1!p' >> footer.h2m
|
||||
|
||||
for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do
|
||||
for cmd in $BTCPD $ZCASHCLI $ZCASHTX; do
|
||||
cmdname="${cmd##*/}"
|
||||
help2man -N --version-string=$ZECVER --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
|
||||
sed -i "s/\\\-$ZECCOMMIT//g" ${MANDIR}/${cmdname}.1
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
|
|||
CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')
|
||||
# Allowed NEEDED libraries
|
||||
ALLOWED_LIBRARIES = {
|
||||
# zcashd
|
||||
# btcpd
|
||||
'libgcc_s.so.1', # GCC base support
|
||||
'libc.so.6', # C library
|
||||
'libstdc++.so.6', # C++ standard library
|
||||
|
|
|
|||
26
doc/amqp.md
26
doc/amqp.md
|
|
@ -6,8 +6,8 @@ transactions between applications. AMQP supports both broker and
|
|||
brokerless messaging. AMQP 1.0 is an open standard and has been
|
||||
ratified as ISO/IEC 19464.
|
||||
|
||||
The Zcash daemon can be configured to act as a trusted "border
|
||||
router", implementing the Zcash P2P protocol and relay, making
|
||||
The Bitcoin Private daemon can be configured to act as a trusted "border
|
||||
router", implementing the Bitcoin Private P2P protocol and relay, making
|
||||
consensus decisions, maintaining the local blockchain database,
|
||||
broadcasting locally generated transactions into the network, and
|
||||
providing a queryable RPC interface to interact on a polled basis for
|
||||
|
|
@ -31,7 +31,7 @@ buffering or reassembly.
|
|||
|
||||
## Prerequisites
|
||||
|
||||
The AMQP feature in Zcash requires [Qpid Proton](https://qpid.apache.org/proton/)
|
||||
The AMQP feature in Bitcoin Private requires [Qpid Proton](https://qpid.apache.org/proton/)
|
||||
version 0.17 or newer, which you will need to install if you are not
|
||||
using the depends system. Typically, it is packaged by distributions as
|
||||
something like *libqpid-proton*. The C++ wrapper for AMQP *is* required.
|
||||
|
|
@ -44,7 +44,7 @@ daemon operation.
|
|||
|
||||
By default, the AMQP feature is automatically compiled in if the
|
||||
necessary prerequisites are found. To disable, use --disable-proton
|
||||
during the *configure* step of building zcashd:
|
||||
during the *configure* step of building btcpd:
|
||||
|
||||
$ ./configure --disable-proton (other options)
|
||||
|
||||
|
|
@ -69,13 +69,13 @@ The address must be a valid AMQP address, where the same address can be
|
|||
used in more than notification. Note that SSL and SASL addresses are
|
||||
not currently supported.
|
||||
|
||||
Launch zcashd like this:
|
||||
Launch btcpd like this:
|
||||
|
||||
$ zcashd -amqppubhashtx=amqp://127.0.0.1:5672
|
||||
$ btcpd -amqppubhashtx=amqp://127.0.0.1:5672
|
||||
|
||||
Or this:
|
||||
|
||||
$ zcashd -amqppubhashtx=amqp://127.0.0.1:5672 \
|
||||
$ btcpd -amqppubhashtx=amqp://127.0.0.1:5672 \
|
||||
-amqppubrawtx=amqp://127.0.0.1:5672 \
|
||||
-amqppubrawblock=amqp://127.0.0.1:5672 \
|
||||
-amqppubhashblock=amqp://127.0.0.1:5672 \
|
||||
|
|
@ -89,23 +89,23 @@ the topic is `hashtx` (no null terminator) and the body is the hexadecimal
|
|||
transaction hash (32 bytes). This transaction hash and the block hash
|
||||
found in `hashblock` are in RPC byte order.
|
||||
|
||||
These options can also be provided in zcash.conf.
|
||||
These options can also be provided in btcprivate.conf.
|
||||
|
||||
Please see `contrib/amqp/amqp_sub.py` for a working example of an
|
||||
AMQP server listening for messages.
|
||||
|
||||
## Remarks
|
||||
|
||||
From the perspective of zcashd, the local end of an AMQP link is write-only.
|
||||
From the perspective of btcpd, the local end of an AMQP link is write-only.
|
||||
|
||||
No information is broadcast that wasn't already received from the public
|
||||
P2P network.
|
||||
|
||||
No authentication or authorization is done on peers that zcashd connects
|
||||
No authentication or authorization is done on peers that btcpd connects
|
||||
to; it is assumed that the AMQP link is exposed only to trusted entities,
|
||||
using other means such as firewalling.
|
||||
|
||||
TLS support may be added once OpenSSL has been removed from the Zcash
|
||||
TLS support may be added once OpenSSL has been removed from the Bitcoin Private
|
||||
project and alternative TLS implementations have been evaluated.
|
||||
|
||||
SASL support may be added in a future update for secure communication.
|
||||
|
|
@ -114,10 +114,10 @@ Note that when the block chain tip changes, a reorganisation may occur
|
|||
and just the tip will be notified. It is up to the subscriber to
|
||||
retrieve the chain from the last known block to the new tip.
|
||||
|
||||
At present, zcashd does not try to resend a notification if there was
|
||||
At present, btcpd does not try to resend a notification if there was
|
||||
a problem confirming receipt. Support for delivery guarantees such as
|
||||
*at-least-once* and *exactly-once* will be added in in a future update.
|
||||
|
||||
Currently, zcashd appends an up-counting sequence number to each notification
|
||||
Currently, btcpd appends an up-counting sequence number to each notification
|
||||
which allows listeners to detect lost notifications.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
* zcash.conf: contains configuration settings for zcashd
|
||||
* zcashd.pid: stores the process id of zcashd while running
|
||||
* btcprivate.conf: contains configuration settings for btcpd
|
||||
* btcpd.pid: stores the process id of btcpd while running
|
||||
* blocks/blk000??.dat: block data (custom, 128 MiB per file)
|
||||
* blocks/rev000??.dat; block undo data (custom)
|
||||
* blocks/index/*; block index (LevelDB)
|
||||
* chainstate/*; block chain state database (LevelDB)
|
||||
* database/*: BDB database environment
|
||||
* db.log: wallet database log file
|
||||
* debug.log: contains debug information and general logging generated by zcashd
|
||||
* debug.log: contains debug information and general logging generated by btcpd
|
||||
* fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation
|
||||
* peers.dat: peer IP address database (custom format)
|
||||
* wallet.dat: personal wallet (BDB) with keys and transactions
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
dist_man1_MANS=zcashd.1 zcash-cli.1 zcash-fetch-params.1 zcash-tx.1
|
||||
dist_man1_MANS=btcpd.1 btcp-cli.1 zcash-fetch-params.1 zcash-tx.1
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
|
||||
.TH ZCASH-CLI "1" "June 2017" "zcash-cli v1.0.10-1" "User Commands"
|
||||
.TH BTCP-CLI "1" "June 2017" "btcp-cli v1.0.10-1" "User Commands"
|
||||
.SH NAME
|
||||
zcash-cli \- manual page for zcash-cli v1.0.10-1
|
||||
btcp-cli \- manual page for btcp-cli v1.0.10-1
|
||||
.SH DESCRIPTION
|
||||
Zcash RPC client version v1.0.10\-1
|
||||
Bitcoin Private RPC client version v1.0.10\-1
|
||||
.PP
|
||||
In order to ensure you are adequately protecting your privacy when using Bitcoin Private,
|
||||
please see <https://z.cash/support/security/index.html>.
|
||||
.SS "Usage:"
|
||||
.TP
|
||||
zcash\-cli [options] <command> [params]
|
||||
Send command to Zcash
|
||||
btcp\-cli [options] <command> [params]
|
||||
Send command to Bitcoin Private
|
||||
.TP
|
||||
zcash\-cli [options] help
|
||||
btcp\-cli [options] help
|
||||
List commands
|
||||
.TP
|
||||
zcash\-cli [options] help <command>
|
||||
btcp\-cli [options] help <command>
|
||||
Get help for a command
|
||||
.SH OPTIONS
|
||||
.HP
|
||||
|
|
@ -25,7 +25,7 @@ This help message
|
|||
.HP
|
||||
\fB\-conf=\fR<file>
|
||||
.IP
|
||||
Specify configuration file (default: zcash.conf)
|
||||
Specify configuration file (default: btcprivate.conf)
|
||||
.HP
|
||||
\fB\-datadir=\fR<dir>
|
||||
.IP
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
|
||||
.TH ZCASHD "1" "June 2017" "zcashd v1.0.10-1" "User Commands"
|
||||
.TH BTCPD "1" "June 2017" "btcpd v1.0.10-1" "User Commands"
|
||||
.SH NAME
|
||||
zcashd \- manual page for zcashd v1.0.10-1
|
||||
btcpd \- manual page for btcpd v1.0.10-1
|
||||
.SH DESCRIPTION
|
||||
Zcash Daemon version v1.0.10\-1
|
||||
.PP
|
||||
|
|
@ -9,7 +9,7 @@ In order to ensure you are adequately protecting your privacy when using Bitcoin
|
|||
please see <https://z.cash/support/security/index.html>.
|
||||
.SS "Usage:"
|
||||
.TP
|
||||
zcashd [options]
|
||||
btcpd [options]
|
||||
Start Zcash Daemon
|
||||
.SH OPTIONS
|
||||
.HP
|
||||
|
|
@ -41,7 +41,7 @@ How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
|
|||
.HP
|
||||
\fB\-conf=\fR<file>
|
||||
.IP
|
||||
Specify configuration file (default: zcash.conf)
|
||||
Specify configuration file (default: btcprivate.conf)
|
||||
.HP
|
||||
\fB\-daemon\fR
|
||||
.IP
|
||||
|
|
@ -84,7 +84,7 @@ leave that many cores free, default: 0)
|
|||
.HP
|
||||
\fB\-pid=\fR<file>
|
||||
.IP
|
||||
Specify pid file (default: zcashd.pid)
|
||||
Specify pid file (default: btcpd.pid)
|
||||
.HP
|
||||
\fB\-prune=\fR<n>
|
||||
.IP
|
||||
|
|
@ -64,7 +64,7 @@ Command | Parameters | Description
|
|||
z_exportkey | zaddr | _Requires an unlocked wallet or an unencrypted wallet._<br><br>Return a zkey for a given zaddr belonging to the node’s wallet.<br><br>The key will be returned as a string formatted using Base58Check as described in the Zcash protocol spec.<br><br>Output:AKWUAkypwQjhZ6LLNaMuuuLcmZ6gt5UFyo8m3jGutvALmwZKLdR5
|
||||
z_importkey | zkey [rescan=true] | _Wallet must be unlocked._<br><br>Add a zkey as returned by z_exportkey to a node's wallet.<br><br>The key should be formatted using Base58Check as described in the Zcash protocol spec.<br><br>Set rescan to true (the default) to rescan the entire local block database for transactions affecting any address or pubkey script in the wallet (including transactions affecting the newly-added address for this spending key).
|
||||
z_exportwallet | filename | _Requires an unlocked wallet or an unencrypted wallet._<br><br>Creates or overwrites a file with taddr private keys and zaddr private keys in a human-readable format.<br><br>Filename is the file in which the wallet dump will be placed. May be prefaced by an absolute file path. An existing file with that name will be overwritten.<br><br>No value is returned but a JSON-RPC error will be reported if a failure occurred.
|
||||
z_importwallet | filename | _Requires an unlocked wallet or an unencrypted wallet._<br><br>Imports private keys from a file in wallet export file format (see z_exportwallet). These keys will be added to the keys currently in the wallet. This call may need to rescan all or parts of the block chain for transactions affecting the newly-added keys, which may take several minutes.<br><br>Filename is the file to import. The path is relative to zcashd’s working directory.<br><br>No value is returned but a JSON-RPC error will be reported if a failure occurred.
|
||||
z_importwallet | filename | _Requires an unlocked wallet or an unencrypted wallet._<br><br>Imports private keys from a file in wallet export file format (see z_exportwallet). These keys will be added to the keys currently in the wallet. This call may need to rescan all or parts of the block chain for transactions affecting the newly-added keys, which may take several minutes.<br><br>Filename is the file to import. The path is relative to btcpd’s working directory.<br><br>No value is returned but a JSON-RPC error will be reported if a failure occurred.
|
||||
|
||||
### Payment
|
||||
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ Run the release script, which will verify you are on the latest clean
|
|||
checkout of master, create a branch, then commit standard automated
|
||||
changes to that branch locally:
|
||||
|
||||
$ ./zcutil/make-release.py <RELEASE> <RELEASE_PREV> <APPROX_RELEASE_HEIGHT>
|
||||
$ ./btcputil/make-release.py <RELEASE> <RELEASE_PREV> <APPROX_RELEASE_HEIGHT>
|
||||
|
||||
Example:
|
||||
|
||||
$ ./zcutil/make-release.py v1.0.9 v1.0.8-1 120000
|
||||
$ ./btcputil/make-release.py v1.0.9 v1.0.8-1 120000
|
||||
|
||||
### Create, Review, and Merge the release branch pull request
|
||||
|
||||
|
|
@ -86,8 +86,8 @@ signed. **CAUTION:** Remember the `v` at the beginning here:
|
|||
|
||||
## Make and deploy deterministic builds
|
||||
|
||||
- Run the [Gitian deterministic build environment](https://github.com/zcash/zcash-gitian)
|
||||
- Compare the uploaded [build manifests on gitian.sigs](https://github.com/zcash/gitian.sigs)
|
||||
- Run the [Gitian deterministic build environment](https://github.com/BitcoinPrivate/zcash-gitian)
|
||||
- Compare the uploaded [build manifests on gitian.sigs](https://github.com/BitcoinPrivate/gitian.sigs)
|
||||
- If all is well, the DevOps engineer will build the Debian packages and update the
|
||||
[apt.z.cash package repository](https://apt.z.cash).
|
||||
|
||||
|
|
@ -95,17 +95,17 @@ signed. **CAUTION:** Remember the `v` at the beginning here:
|
|||
|
||||
### Deploy testnet
|
||||
|
||||
Notify the Zcash DevOps engineer/sysadmin that the release has been tagged. They update some variables in the company's automation code and then run an Ansible playbook, which:
|
||||
Notify the Bitcoin Private DevOps engineer/sysadmin that the release has been tagged. They update some variables in the company's automation code and then run an Ansible playbook, which:
|
||||
|
||||
* builds Zcash based on the specified branch
|
||||
* builds Bitcoin Private based on the specified branch
|
||||
* deploys it as a public service (e.g. betatestnet.z.cash, mainnet.z.cash)
|
||||
* often the same server can be re-used, and the role idempotently handles upgrades, but if not then they also need to update DNS records
|
||||
* possible manual steps: blowing away the `testnet3` dir, deleting old parameters, restarting DNS seeder
|
||||
|
||||
Then, verify that nodes can connect to the testnet server, and update the guide on the wiki to ensure the correct hostname is listed in the recommended zcash.conf.
|
||||
Then, verify that nodes can connect to the testnet server, and update the guide on the wiki to ensure the correct hostname is listed in the recommended btcprivate.conf.
|
||||
|
||||
### Update the 1.0 User Guide
|
||||
|
||||
### Publish the release announcement (blog, zcash-dev, slack)
|
||||
### Publish the release announcement (blog, btcp-dev, slack)
|
||||
|
||||
## Celebrate
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ Side-Channel Attacks
|
|||
|
||||
This implementation of Zcash is not resistant to side-channel attacks. You
|
||||
should assume (even unprivileged) users who are running on the hardware, or who
|
||||
are physically near the hardware, that your `zcashd` process is running on will
|
||||
are physically near the hardware, that your `btcpd` process is running on will
|
||||
be able to:
|
||||
|
||||
- Determine the values of your secret spending keys, as well as which notes you
|
||||
|
|
@ -64,7 +64,7 @@ be able to:
|
|||
each note ciphertext on the blockchain.
|
||||
|
||||
You should ensure no other users have the ability to execute code (even
|
||||
unprivileged) on the hardware your `zcashd` process runs on until these
|
||||
unprivileged) on the hardware your `btcpd` process runs on until these
|
||||
vulnerabilities are fully analyzed and fixed.
|
||||
|
||||
REST Interface
|
||||
|
|
@ -77,9 +77,9 @@ security review.
|
|||
RPC Interface
|
||||
---------------
|
||||
|
||||
Users should choose a strong RPC password. If no RPC username and password are set, zcashd will not start and will print an error message with a suggestion for a strong random password. If the client knows the RPC password, they have at least full access to the node. In addition, certain RPC commands can be misused to overwrite files and/or take over the account that is running zcashd. (In the future we may restrict these commands, but full node access – including the ability to spend from and export keys held by the wallet – would still be possible unless wallet methods are disabled.)
|
||||
Users should choose a strong RPC password. If no RPC username and password are set, btcpd will not start and will print an error message with a suggestion for a strong random password. If the client knows the RPC password, they have at least full access to the node. In addition, certain RPC commands can be misused to overwrite files and/or take over the account that is running btcpd. (In the future we may restrict these commands, but full node access – including the ability to spend from and export keys held by the wallet – would still be possible unless wallet methods are disabled.)
|
||||
|
||||
Users should also refrain from changing the default setting that only allows RPC connections from localhost. Allowing connections from remote hosts would enable a MITM to execute arbitrary RPC commands, which could lead to compromise of the account running zcashd and loss of funds. For multi-user services that use one or more zcashd instances on the backend, the parameters passed in by users should be controlled to prevent confused-deputy attacks which could spend from any keys held by that zcashd.
|
||||
Users should also refrain from changing the default setting that only allows RPC connections from localhost. Allowing connections from remote hosts would enable a MITM to execute arbitrary RPC commands, which could lead to compromise of the account running btcpd and loss of funds. For multi-user services that use one or more btcpd instances on the backend, the parameters passed in by users should be controlled to prevent confused-deputy attacks which could spend from any keys held by that btcpd.
|
||||
|
||||
Block Chain Reorganization: Major Differences
|
||||
-------------------------------------------------
|
||||
|
|
|
|||
28
doc/tor.md
28
doc/tor.md
|
|
@ -33,7 +33,7 @@ outgoing connections be anonymized, but more is possible.
|
|||
|
||||
In a typical situation, this suffices to run behind a Tor proxy:
|
||||
|
||||
./zcashd -proxy=127.0.0.1:9050
|
||||
./btcpd -proxy=127.0.0.1:9050
|
||||
|
||||
|
||||
2. Run a Zcash hidden server
|
||||
|
|
@ -48,7 +48,7 @@ config file):
|
|||
HiddenServicePort 18233 127.0.0.1:18233
|
||||
|
||||
The directory can be different of course, but (both) port numbers should be equal to
|
||||
your zcashd's P2P listen port (8233 by default).
|
||||
your btcpd's P2P listen port (8233 by default).
|
||||
|
||||
-externalip=X You can tell Zcash about its publicly reachable address using
|
||||
this option, and this can be a .onion address. Given the above
|
||||
|
|
@ -70,25 +70,25 @@ your zcashd's P2P listen port (8233 by default).
|
|||
|
||||
In a typical situation, where you're only reachable via Tor, this should suffice:
|
||||
|
||||
./zcashd -proxy=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -listen
|
||||
./btcpd -proxy=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -listen
|
||||
|
||||
(obviously, replace the Onion address with your own). It should be noted that you still
|
||||
listen on all devices and another node could establish a clearnet connection, when knowing
|
||||
your address. To mitigate this, additionally bind the address of your Tor proxy:
|
||||
|
||||
./zcashd ... -bind=127.0.0.1
|
||||
./btcpd ... -bind=127.0.0.1
|
||||
|
||||
If you don't care too much about hiding your node, and want to be reachable on IPv4
|
||||
as well, use `discover` instead:
|
||||
|
||||
./zcashd ... -discover
|
||||
./btcpd ... -discover
|
||||
|
||||
and open port 8233 on your firewall (or use -upnp).
|
||||
|
||||
If you only want to use Tor to reach onion addresses, but not use it as a proxy
|
||||
for normal IPv4/IPv6 communication, use:
|
||||
|
||||
./zcashd -onion=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -discover
|
||||
./btcpd -onion=127.0.0.1:9050 -externalip=zctestseie6wxgio.onion -discover
|
||||
|
||||
|
||||
3. Automatically listen on Tor
|
||||
|
|
@ -110,12 +110,12 @@ and, if not disabled, configured using the `-torcontrol` and `-torpassword` sett
|
|||
To show verbose debugging information, pass `-debug=tor`.
|
||||
|
||||
Connecting to Tor's control socket API requires one of two authentication methods to be
|
||||
configured. For cookie authentication the user running zcashd must have write access
|
||||
configured. For cookie authentication the user running btcpd must have write access
|
||||
to the `CookieAuthFile` specified in Tor configuration. In some cases this is
|
||||
preconfigured and the creation of a hidden service is automatic. If permission problems
|
||||
are seen with `-debug=tor` they can be resolved by adding both the user running tor and
|
||||
the user running zcashd to the same group and setting permissions appropriately. On
|
||||
Debian-based systems the user running zcashd can be added to the debian-tor group,
|
||||
the user running btcpd to the same group and setting permissions appropriately. On
|
||||
Debian-based systems the user running btcpd can be added to the debian-tor group,
|
||||
which has the appropriate permissions. An alternative authentication method is the use
|
||||
of the `-torpassword` flag and a `hash-password` which can be enabled and specified in
|
||||
Tor configuration.
|
||||
|
|
@ -125,13 +125,13 @@ Tor configuration.
|
|||
-----------------------------------
|
||||
|
||||
To test your set-up, you might want to try connecting via Tor on a different computer to just a
|
||||
a single Zcash hidden server. Launch zcashd as follows:
|
||||
a single Zcash hidden server. Launch btcpd as follows:
|
||||
|
||||
./zcashd -onion=127.0.0.1:9050 -connect=zctestseie6wxgio.onion
|
||||
./btcpd -onion=127.0.0.1:9050 -connect=zctestseie6wxgio.onion
|
||||
|
||||
Now use zcash-cli to verify there is only a single peer connection.
|
||||
Now use btcp-cli to verify there is only a single peer connection.
|
||||
|
||||
zcash-cli getpeerinfo
|
||||
btcp-cli getpeerinfo
|
||||
|
||||
[
|
||||
{
|
||||
|
|
@ -146,4 +146,4 @@ Now use zcash-cli to verify there is only a single peer connection.
|
|||
|
||||
To connect to multiple Tor nodes, use:
|
||||
|
||||
./zcashd -onion=127.0.0.1:9050 -addnode=zctestseie6wxgio.onion -dnsseed=0 -onlynet=onion
|
||||
./btcpd -onion=127.0.0.1:9050 -addnode=zctestseie6wxgio.onion -dnsseed=0 -onlynet=onion
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
## Overview
|
||||
|
||||
Backing up your Zcash private keys is the best way to be proactive about preventing loss of access to your ZEC.
|
||||
Backing up your Bitcoind Private private keys is the best way to be proactive about preventing loss of access to your btcp.
|
||||
|
||||
Problems resulting from bugs in the code, user error, device failure, etc. may lead to losing access to your wallet (and as a result, the private keys of addresses which are required to spend from them).
|
||||
|
||||
|
|
@ -12,23 +12,23 @@ Note that a backup is a duplicate of data needed to spend ZEC so where you keep
|
|||
|
||||
## Instructions for backing up your wallet and/or private keys
|
||||
|
||||
These instructions are specific for the officially supported Zcash Linux client. For backing up with third-party wallets, please consult with user guides or support channels provided for those services.
|
||||
These instructions are specific for the officially supported Bitcoind Private Linux client. For backing up with third-party wallets, please consult with user guides or support channels provided for those services.
|
||||
|
||||
There are multiple ways to make sure you have at least one other copy of the private keys needed to spend your ZEC and view your shielded ZEC.
|
||||
|
||||
For all methods, you will need to include an export directory setting in your config file (`zcash.conf` located in the data directory which is `~/.zcash/` unless it's been overridden with `datadir=` setting):
|
||||
For all methods, you will need to include an export directory setting in your config file (`btcprivate.conf` located in the data directory which is `~/.btcp/` unless it's been overridden with `datadir=` setting):
|
||||
|
||||
`exportdir=/path/to/chosen/export/directory`
|
||||
|
||||
You may chose any directory within the home directory as the location for export & backup files. If the directory doesn't exist, it will be created.
|
||||
|
||||
Note that zcashd will need to be stopped and restarted for edits in the config file to take effect.
|
||||
Note that btcpd will need to be stopped and restarted for edits in the config file to take effect.
|
||||
|
||||
### Using `backupwallet`
|
||||
|
||||
To create a backup of your wallet, use:
|
||||
|
||||
`zcash-cli backupwallet <nameofbackup>`.
|
||||
`btcp-cli backupwallet <nameofbackup>`.
|
||||
|
||||
The backup will be an exact copy of the current state of your wallet.dat file stored in the export directory you specified in the config file. The file path will also be returned.
|
||||
|
||||
|
|
@ -40,51 +40,51 @@ If your original `wallet.dat` file becomes inaccessible for whatever reason, you
|
|||
|
||||
If you prefer to have an export of your private keys in human readable format, you can use:
|
||||
|
||||
`zcash-cli z_exportwallet <nameofbackup>`
|
||||
`btcp-cli z_exportwallet <nameofbackup>`
|
||||
|
||||
This will generate a file in the export directory listing all transparent and shielded private keys with their associated public addresses. The file path will be returned in the command line.
|
||||
|
||||
To import keys into a wallet which were previously exported to a file, use:
|
||||
|
||||
`zcash-cli z_importwallet </path/to/exportdir/nameofbackup>`
|
||||
`btcp-cli z_importwallet </path/to/exportdir/nameofbackup>`
|
||||
|
||||
### Using `z_exportkey`, `z_importkey`, `dumpprivkey` & `importprivkey`
|
||||
|
||||
If you prefer to export a single private key for a shielded address, you can use:
|
||||
|
||||
`zcash-cli z_exportkey <z-address>`
|
||||
`btcp-cli z_exportkey <z-address>`
|
||||
|
||||
This will return the private key and will not create a new file.
|
||||
|
||||
For exporting a single private key for a transparent address, you can use the command inherited from Bitcoin:
|
||||
|
||||
`zcash-cli dumpprivkey <t-address>`
|
||||
`btcp-cli dumpprivkey <t-address>`
|
||||
|
||||
This will return the private key and will not create a new file.
|
||||
|
||||
To import a private key for a shielded address, use:
|
||||
|
||||
`zcash-cli z_importkey <z-priv-key>`
|
||||
`btcp-cli z_importkey <z-priv-key>`
|
||||
|
||||
This will add the key to your wallet and rescan the wallet for associated transactions if it is not already part of the wallet.
|
||||
|
||||
The rescanning process can take a few minutes for a new private key. To skip it, instead use:
|
||||
|
||||
`zcash-cli z_importkey <z-private-key> no`
|
||||
`btcp-cli z_importkey <z-private-key> no`
|
||||
|
||||
For other instructions on fine-tuning the wallet rescan, see the command's help documentation:
|
||||
|
||||
`zcash-cli help z_importkey`
|
||||
`btcp-cli help z_importkey`
|
||||
|
||||
To import a private key for a transparent address, use:
|
||||
|
||||
`zcash-cli importprivkey <t-priv-key>`
|
||||
`btcp-cli importprivkey <t-priv-key>`
|
||||
|
||||
This has the same functionality as `z_importkey` but works with transparent addresses.
|
||||
|
||||
See the command's help documentation for instructions on fine-tuning the wallet rescan:
|
||||
|
||||
`zcash-cli help importprivkey`
|
||||
`btcp-cli help importprivkey`
|
||||
|
||||
### Using `dumpwallet`
|
||||
|
||||
|
|
|
|||
14
doc/zmq.md
14
doc/zmq.md
|
|
@ -46,7 +46,7 @@ operation.
|
|||
|
||||
By default, the ZeroMQ feature is automatically compiled in if the
|
||||
necessary prerequisites are found. To disable, use --disable-zmq
|
||||
during the *configure* step of building zcashd:
|
||||
during the *configure* step of building btcpd:
|
||||
|
||||
$ ./configure --disable-zmq (other options)
|
||||
|
||||
|
|
@ -67,8 +67,8 @@ address. The same address can be used in more than one notification.
|
|||
|
||||
For instance:
|
||||
|
||||
$ zcashd -zmqpubhashtx=tcp://127.0.0.1:28332 \
|
||||
-zmqpubrawtx=ipc:///tmp/zcashd.tx.raw
|
||||
$ btcpd -zmqpubhashtx=tcp://127.0.0.1:28332 \
|
||||
-zmqpubrawtx=ipc:///tmp/btcpd.tx.raw
|
||||
|
||||
Each PUB notification has a topic and body, where the header
|
||||
corresponds to the notification type. For instance, for the
|
||||
|
|
@ -76,7 +76,7 @@ notification `-zmqpubhashtx` the topic is `hashtx` (no null
|
|||
terminator) and the body is the hexadecimal transaction hash (32
|
||||
bytes).
|
||||
|
||||
These options can also be provided in zcash.conf.
|
||||
These options can also be provided in btcprivate.conf.
|
||||
|
||||
ZeroMQ endpoint specifiers for TCP (and others) are documented in the
|
||||
[ZeroMQ API](http://api.zeromq.org/4-0:_start).
|
||||
|
|
@ -88,9 +88,9 @@ arriving. Please see `contrib/zmq/zmq_sub.py` for a working example.
|
|||
|
||||
## Remarks
|
||||
|
||||
From the perspective of zcashd, the ZeroMQ socket is write-only; PUB
|
||||
From the perspective of btcpd, the ZeroMQ socket is write-only; PUB
|
||||
sockets don't even have a read function. Thus, there is no state
|
||||
introduced into zcashd directly. Furthermore, no information is
|
||||
introduced into btcpd directly. Furthermore, no information is
|
||||
broadcast that wasn't already received from the public P2P network.
|
||||
|
||||
No authentication or authorization is done on connecting clients; it
|
||||
|
|
@ -103,5 +103,5 @@ retrieve the chain from the last known block to the new tip.
|
|||
|
||||
There are several possibilities that ZMQ notification can get lost
|
||||
during transmission depending on the communication type your are
|
||||
using. Zcashd appends an up-counting sequence number to each
|
||||
using. btcpd appends an up-counting sequence number to each
|
||||
notification which allows listeners to detect lost notifications.
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
#
|
||||
ZCASH_LOAD_TIMEOUT=500
|
||||
DATADIR="@abs_top_builddir@/.zcash"
|
||||
DATADIR="@abs_top_builddir@/.btcp"
|
||||
rm -rf "$DATADIR"
|
||||
mkdir -p "$DATADIR"/regtest
|
||||
touch "$DATADIR/zcash.conf"
|
||||
touch "$DATADIR/btcprivate.conf"
|
||||
touch "$DATADIR/regtest/debug.log"
|
||||
tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" &
|
||||
WAITER=$!
|
||||
PORT=`expr 10000 + $$ % 55536`
|
||||
"@abs_top_builddir@/src/zcashd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` &
|
||||
"@abs_top_builddir@/src/btcpd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` &
|
||||
BITCOIND=$!
|
||||
|
||||
#Install a watchdog.
|
||||
|
|
|
|||
|
|
@ -13,6 +13,6 @@ EXEEXT="@EXEEXT@"
|
|||
@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1
|
||||
@ENABLE_PROTON_TRUE@ENABLE_PROTON=1
|
||||
|
||||
REAL_BITCOIND="$BUILDDIR/src/zcashd${EXEEXT}"
|
||||
REAL_BITCOINCLI="$BUILDDIR/src/zcash-cli${EXEEXT}"
|
||||
REAL_BITCOIND="$BUILDDIR/src/btcpd${EXEEXT}"
|
||||
REAL_BITCOINCLI="$BUILDDIR/src/btcp-cli${EXEEXT}"
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ def initialize_datadir(dirname, n):
|
|||
datadir = os.path.join(dirname, "node"+str(n))
|
||||
if not os.path.isdir(datadir):
|
||||
os.makedirs(datadir)
|
||||
with open(os.path.join(datadir, "zcash.conf"), 'w') as f:
|
||||
with open(os.path.join(datadir, "btcprivate.conf"), 'w') as f:
|
||||
f.write("regtest=1\n");
|
||||
f.write("showmetrics=0\n");
|
||||
f.write("rpcuser=rt\n");
|
||||
|
|
@ -145,7 +145,7 @@ def initialize_chain(test_dir):
|
|||
from_dir = os.path.join("cache", "node"+str(i))
|
||||
to_dir = os.path.join(test_dir, "node"+str(i))
|
||||
shutil.copytree(from_dir, to_dir)
|
||||
initialize_datadir(test_dir, i) # Overwrite port/rpcport in zcash.conf
|
||||
initialize_datadir(test_dir, i) # Overwrite port/rpcport in btcprivate.conf
|
||||
|
||||
def initialize_chain_clean(test_dir, num_nodes):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ function test_fortify_source {
|
|||
# PIE, RELRO, Canary, and NX are tested by make check-security.
|
||||
make -C "$REPOROOT/src" check-security
|
||||
|
||||
test_rpath_runpath "${REPOROOT}/src/zcashd"
|
||||
test_rpath_runpath "${REPOROOT}/src/zcash-cli"
|
||||
test_rpath_runpath "${REPOROOT}/src/btcpd"
|
||||
test_rpath_runpath "${REPOROOT}/src/btcp-cli"
|
||||
test_rpath_runpath "${REPOROOT}/src/zcash-gtest"
|
||||
test_rpath_runpath "${REPOROOT}/src/zcash-tx"
|
||||
test_rpath_runpath "${REPOROOT}/src/test/test_bitcoin"
|
||||
|
|
@ -38,8 +38,8 @@ test_rpath_runpath "${REPOROOT}/src/zcash/GenerateParams"
|
|||
|
||||
# NOTE: checksec.sh does not reliably determine whether FORTIFY_SOURCE is
|
||||
# enabled for the entire binary. See issue #915.
|
||||
test_fortify_source "${REPOROOT}/src/zcashd"
|
||||
test_fortify_source "${REPOROOT}/src/zcash-cli"
|
||||
test_fortify_source "${REPOROOT}/src/btcpd"
|
||||
test_fortify_source "${REPOROOT}/src/btcp-cli"
|
||||
test_fortify_source "${REPOROOT}/src/zcash-gtest"
|
||||
test_fortify_source "${REPOROOT}/src/zcash-tx"
|
||||
test_fortify_source "${REPOROOT}/src/test/test_bitcoin"
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ import sys
|
|||
import tarfile
|
||||
import time
|
||||
|
||||
ZCASH_CLI = './src/zcash-cli'
|
||||
ZCASH_CLI = './src/btcp-cli'
|
||||
USAGE = """
|
||||
Requirements:
|
||||
- find
|
||||
- xz
|
||||
- %s (edit ZCASH_CLI in this script to alter the path)
|
||||
- A running mainnet zcashd using the default datadir with -txindex=1
|
||||
- A running mainnet btcpd using the default datadir with -txindex=1
|
||||
|
||||
Example usage:
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ SHA256CMD="$(command -v sha256sum || echo shasum)"
|
|||
SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')"
|
||||
|
||||
function zcash_rpc {
|
||||
./src/zcash-cli -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 "$@"
|
||||
./src/btcp-cli -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 "$@"
|
||||
}
|
||||
|
||||
function zcash_rpc_slow {
|
||||
|
|
@ -24,53 +24,53 @@ function zcash_rpc_wait_for_start {
|
|||
zcash_rpc -rpcwait getinfo > /dev/null
|
||||
}
|
||||
|
||||
function zcashd_generate {
|
||||
function btcpd_generate {
|
||||
zcash_rpc generate 101 > /dev/null
|
||||
}
|
||||
|
||||
function zcashd_start {
|
||||
function btcpd_start {
|
||||
rm -rf "$DATADIR"
|
||||
mkdir -p "$DATADIR/regtest"
|
||||
touch "$DATADIR/zcash.conf"
|
||||
./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 &
|
||||
ZCASHD_PID=$!
|
||||
touch "$DATADIR/btcprivate.conf"
|
||||
./src/btcpd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 &
|
||||
BTCPD_PID=$!
|
||||
zcash_rpc_wait_for_start
|
||||
}
|
||||
|
||||
function zcashd_stop {
|
||||
function btcpd_stop {
|
||||
zcash_rpc stop > /dev/null
|
||||
wait $ZCASHD_PID
|
||||
wait $BTCPD_PID
|
||||
}
|
||||
|
||||
function zcashd_massif_start {
|
||||
function btcpd_massif_start {
|
||||
rm -rf "$DATADIR"
|
||||
mkdir -p "$DATADIR/regtest"
|
||||
touch "$DATADIR/zcash.conf"
|
||||
touch "$DATADIR/btcprivate.conf"
|
||||
rm -f massif.out
|
||||
valgrind --tool=massif --time-unit=ms --massif-out-file=massif.out ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 &
|
||||
ZCASHD_PID=$!
|
||||
valgrind --tool=massif --time-unit=ms --massif-out-file=massif.out ./src/btcpd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 &
|
||||
BTCPD_PID=$!
|
||||
zcash_rpc_wait_for_start
|
||||
}
|
||||
|
||||
function zcashd_massif_stop {
|
||||
function btcpd_massif_stop {
|
||||
zcash_rpc stop > /dev/null
|
||||
wait $ZCASHD_PID
|
||||
wait $BTCPD_PID
|
||||
ms_print massif.out
|
||||
}
|
||||
|
||||
function zcashd_valgrind_start {
|
||||
function btcpd_valgrind_start {
|
||||
rm -rf "$DATADIR"
|
||||
mkdir -p "$DATADIR/regtest"
|
||||
touch "$DATADIR/zcash.conf"
|
||||
touch "$DATADIR/btcprivate.conf"
|
||||
rm -f valgrind.out
|
||||
valgrind --leak-check=yes -v --error-limit=no --log-file="valgrind.out" ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 &
|
||||
ZCASHD_PID=$!
|
||||
valgrind --leak-check=yes -v --error-limit=no --log-file="valgrind.out" ./src/btcpd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 &
|
||||
BTCPD_PID=$!
|
||||
zcash_rpc_wait_for_start
|
||||
}
|
||||
|
||||
function zcashd_valgrind_stop {
|
||||
function btcpd_valgrind_stop {
|
||||
zcash_rpc stop > /dev/null
|
||||
wait $ZCASHD_PID
|
||||
wait $BTCPD_PID
|
||||
cat valgrind.out
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ EOF
|
|||
ARCHIVE_RESULT=1
|
||||
fi
|
||||
if [ $ARCHIVE_RESULT -ne 0 ]; then
|
||||
zcashd_stop
|
||||
btcpd_stop
|
||||
echo
|
||||
echo "Please generate it using qa/zcash/create_benchmark_archive.py"
|
||||
echo "and place it in the base directory of the repository."
|
||||
|
|
@ -101,15 +101,15 @@ case "$1" in
|
|||
*)
|
||||
case "$2" in
|
||||
verifyjoinsplit)
|
||||
zcashd_start
|
||||
btcpd_start
|
||||
RAWJOINSPLIT=$(zcash_rpc zcsamplejoinsplit)
|
||||
zcashd_stop
|
||||
btcpd_stop
|
||||
esac
|
||||
esac
|
||||
|
||||
case "$1" in
|
||||
time)
|
||||
zcashd_start
|
||||
btcpd_start
|
||||
case "$2" in
|
||||
sleep)
|
||||
zcash_rpc zcbenchmark sleep 10
|
||||
|
|
@ -143,14 +143,14 @@ case "$1" in
|
|||
zcash_rpc zcbenchmark connectblockslow 10
|
||||
;;
|
||||
*)
|
||||
zcashd_stop
|
||||
btcpd_stop
|
||||
echo "Bad arguments."
|
||||
exit 1
|
||||
esac
|
||||
zcashd_stop
|
||||
btcpd_stop
|
||||
;;
|
||||
memory)
|
||||
zcashd_massif_start
|
||||
btcpd_massif_start
|
||||
case "$2" in
|
||||
sleep)
|
||||
zcash_rpc zcbenchmark sleep 1
|
||||
|
|
@ -181,15 +181,15 @@ case "$1" in
|
|||
zcash_rpc zcbenchmark connectblockslow 1
|
||||
;;
|
||||
*)
|
||||
zcashd_massif_stop
|
||||
btcpd_massif_stop
|
||||
echo "Bad arguments."
|
||||
exit 1
|
||||
esac
|
||||
zcashd_massif_stop
|
||||
btcpd_massif_stop
|
||||
rm -f massif.out
|
||||
;;
|
||||
valgrind)
|
||||
zcashd_valgrind_start
|
||||
btcpd_valgrind_start
|
||||
case "$2" in
|
||||
sleep)
|
||||
zcash_rpc zcbenchmark sleep 1
|
||||
|
|
@ -220,11 +220,11 @@ case "$1" in
|
|||
zcash_rpc zcbenchmark connectblockslow 1
|
||||
;;
|
||||
*)
|
||||
zcashd_valgrind_stop
|
||||
btcpd_valgrind_stop
|
||||
echo "Bad arguments."
|
||||
exit 1
|
||||
esac
|
||||
zcashd_valgrind_stop
|
||||
btcpd_valgrind_stop
|
||||
rm -f valgrind.out
|
||||
;;
|
||||
valgrind-tests)
|
||||
|
|
|
|||
|
|
@ -71,11 +71,11 @@ noinst_PROGRAMS =
|
|||
TESTS =
|
||||
|
||||
if BUILD_BITCOIND
|
||||
bin_PROGRAMS += zcashd
|
||||
bin_PROGRAMS += btcpd
|
||||
endif
|
||||
|
||||
if BUILD_BITCOIN_UTILS
|
||||
bin_PROGRAMS += zcash-cli zcash-tx
|
||||
bin_PROGRAMS += btcp-cli zcash-tx
|
||||
endif
|
||||
|
||||
LIBZCASH_H = \
|
||||
|
|
@ -202,7 +202,7 @@ obj/build.h: FORCE
|
|||
$(abs_top_srcdir)
|
||||
libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
|
||||
|
||||
# server: zcashd
|
||||
# server: btcpd
|
||||
libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
|
||||
libbitcoin_server_a_SOURCES = \
|
||||
sendalert.cpp \
|
||||
|
|
@ -263,7 +263,7 @@ libbitcoin_proton_a_SOURCES = \
|
|||
amqp/amqppublishnotifier.cpp
|
||||
endif
|
||||
|
||||
# wallet: zcashd, but only linked when wallet enabled
|
||||
# wallet: btcpd, but only linked when wallet enabled
|
||||
libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||
libbitcoin_wallet_a_SOURCES = \
|
||||
utiltest.cpp \
|
||||
|
|
@ -313,7 +313,7 @@ crypto_libbitcoin_crypto_a_SOURCES += \
|
|||
${EQUIHASH_TROMP_SOURCES}
|
||||
endif
|
||||
|
||||
# common: shared between zcashd and non-server tools
|
||||
# common: shared between btcpd and non-server tools
|
||||
libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||
libbitcoin_common_a_SOURCES = \
|
||||
amount.cpp \
|
||||
|
|
@ -368,7 +368,7 @@ if GLIBC_BACK_COMPAT
|
|||
libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
|
||||
endif
|
||||
|
||||
# cli: zcash-cli
|
||||
# cli: btcp-cli
|
||||
libbitcoin_cli_a_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||
libbitcoin_cli_a_SOURCES = \
|
||||
rpcclient.cpp \
|
||||
|
|
@ -379,15 +379,15 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
|
|||
#
|
||||
|
||||
# bitcoind binary #
|
||||
zcashd_SOURCES = bitcoind.cpp
|
||||
zcashd_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||
zcashd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
btcpd_SOURCES = bitcoind.cpp
|
||||
btcpd_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||
btcpd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
if TARGET_WINDOWS
|
||||
zcashd_SOURCES += bitcoind-res.rc
|
||||
btcpd_SOURCES += bitcoind-res.rc
|
||||
endif
|
||||
|
||||
zcashd_LDADD = \
|
||||
btcpd_LDADD = \
|
||||
$(LIBBITCOIN_SERVER) \
|
||||
$(LIBBITCOIN_COMMON) \
|
||||
$(LIBUNIVALUE) \
|
||||
|
|
@ -399,14 +399,14 @@ zcashd_LDADD = \
|
|||
$(LIBSECP256K1)
|
||||
|
||||
if ENABLE_ZMQ
|
||||
zcashd_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
|
||||
btcpd_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
|
||||
endif
|
||||
|
||||
if ENABLE_WALLET
|
||||
zcashd_LDADD += libbitcoin_wallet.a
|
||||
btcpd_LDADD += libbitcoin_wallet.a
|
||||
endif
|
||||
|
||||
zcashd_LDADD += \
|
||||
btcpd_LDADD += \
|
||||
$(BOOST_LIBS) \
|
||||
$(BDB_LIBS) \
|
||||
$(SSL_LIBS) \
|
||||
|
|
@ -419,19 +419,19 @@ zcashd_LDADD += \
|
|||
$(LIBZCASH_LIBS)
|
||||
|
||||
if ENABLE_PROTON
|
||||
zcashd_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)
|
||||
btcpd_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)
|
||||
endif
|
||||
|
||||
# bitcoin-cli binary #
|
||||
zcash_cli_SOURCES = bitcoin-cli.cpp
|
||||
zcash_cli_CPPFLAGS = $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
|
||||
zcash_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
btcp_cli_SOURCES = bitcoin-cli.cpp
|
||||
btcp_cli_CPPFLAGS = $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
|
||||
btcp_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
if TARGET_WINDOWS
|
||||
zcash_cli_SOURCES += bitcoin-cli-res.rc
|
||||
btcp_cli_SOURCES += bitcoin-cli-res.rc
|
||||
endif
|
||||
|
||||
zcash_cli_LDADD = \
|
||||
btcp_cli_LDADD = \
|
||||
$(LIBBITCOIN_CLI) \
|
||||
$(LIBUNIVALUE) \
|
||||
$(LIBBITCOIN_UTIL) \
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ BEGIN
|
|||
BLOCK "040904E4" // U.S. English - multilingual (hex)
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Zcash"
|
||||
VALUE "FileDescription", "zcash-cli (JSON-RPC client for Zcash)"
|
||||
VALUE "FileDescription", "btcp-cli (JSON-RPC client for Zcash)"
|
||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||
VALUE "InternalName", "zcash-cli"
|
||||
VALUE "InternalName", "btcp-cli"
|
||||
VALUE "LegalCopyright", COPYRIGHT_STR
|
||||
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
||||
VALUE "OriginalFilename", "zcash-cli.exe"
|
||||
VALUE "ProductName", "zcash-cli"
|
||||
VALUE "OriginalFilename", "btcp-cli.exe"
|
||||
VALUE "ProductName", "btcp-cli"
|
||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ std::string HelpMessageCli()
|
|||
string strUsage;
|
||||
strUsage += HelpMessageGroup(_("Options:"));
|
||||
strUsage += HelpMessageOpt("-?", _("This help message"));
|
||||
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "zcash.conf"));
|
||||
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "btcprivate.conf"));
|
||||
strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
|
||||
strUsage += HelpMessageOpt("-testnet", _("Use the test network"));
|
||||
strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be "
|
||||
|
|
@ -72,9 +72,9 @@ static bool AppInitRPC(int argc, char* argv[])
|
|||
std::string strUsage = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
|
||||
if (!mapArgs.count("-version")) {
|
||||
strUsage += "\n" + _("Usage:") + "\n" +
|
||||
" zcash-cli [options] <command> [params] " + _("Send command to Zcash") + "\n" +
|
||||
" zcash-cli [options] help " + _("List commands") + "\n" +
|
||||
" zcash-cli [options] help <command> " + _("Get help for a command") + "\n";
|
||||
" btcp-cli [options] <command> [params] " + _("Send command to Zcash") + "\n" +
|
||||
" btcp-cli [options] help " + _("List commands") + "\n" +
|
||||
" btcp-cli [options] help <command> " + _("Get help for a command") + "\n";
|
||||
|
||||
strUsage += "\n" + HelpMessageCli();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ BEGIN
|
|||
BLOCK "040904E4" // U.S. English - multilingual (hex)
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Zcash"
|
||||
VALUE "FileDescription", "zcashd (Zcash node with a JSON-RPC server)"
|
||||
VALUE "FileDescription", "btcpd (Zcash node with a JSON-RPC server)"
|
||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||
VALUE "InternalName", "zcashd"
|
||||
VALUE "InternalName", "btcpd"
|
||||
VALUE "LegalCopyright", COPYRIGHT_STR
|
||||
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
||||
VALUE "OriginalFilename", "zcashd.exe"
|
||||
VALUE "ProductName", "zcashd"
|
||||
VALUE "OriginalFilename", "btcpd.exe"
|
||||
VALUE "ProductName", "btcpd"
|
||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ bool AppInit(int argc, char* argv[])
|
|||
else
|
||||
{
|
||||
strUsage += "\n" + _("Usage:") + "\n" +
|
||||
" zcashd [options] " + _("Start Zcash Daemon") + "\n";
|
||||
" btcpd [options] " + _("Start Zcash Daemon") + "\n";
|
||||
|
||||
strUsage += "\n" + HelpMessage(HMM_BITCOIND);
|
||||
}
|
||||
|
|
@ -103,21 +103,21 @@ bool AppInit(int argc, char* argv[])
|
|||
ReadConfigFile(mapArgs, mapMultiArgs);
|
||||
} catch (const missing_zcash_conf& e) {
|
||||
fprintf(stderr,
|
||||
(_("Before starting zcashd, you need to create a configuration file:\n"
|
||||
(_("Before starting btcpd, you need to create a configuration file:\n"
|
||||
"%s\n"
|
||||
"It can be completely empty! That indicates you are happy with the default\n"
|
||||
"configuration of zcashd. But requiring a configuration file to start ensures\n"
|
||||
"that zcashd won't accidentally compromise your privacy if there was a default\n"
|
||||
"configuration of btcpd. But requiring a configuration file to start ensures\n"
|
||||
"that btcpd won't accidentally compromise your privacy if there was a default\n"
|
||||
"option you needed to change.\n"
|
||||
"\n"
|
||||
"You can look at the example configuration file for suggestions of default\n"
|
||||
"options that you may want to change. It should be in one of these locations,\n"
|
||||
"depending on how you installed Zcash:\n") +
|
||||
"depending on how you installed Bitcoin Private:\n") +
|
||||
_("- Source code: %s\n"
|
||||
"- .deb package: %s\n")).c_str(),
|
||||
GetConfigFile().string().c_str(),
|
||||
"contrib/debian/examples/zcash.conf",
|
||||
"/usr/share/doc/zcash/examples/zcash.conf");
|
||||
"contrib/debian/examples/btcprivate.conf",
|
||||
"/usr/share/doc/btcp/examples/btcprivate.conf");
|
||||
return false;
|
||||
} catch (const std::exception& e) {
|
||||
fprintf(stderr,"Error reading configuration file: %s\n", e.what());
|
||||
|
|
@ -137,7 +137,7 @@ bool AppInit(int argc, char* argv[])
|
|||
|
||||
if (fCommandLine)
|
||||
{
|
||||
fprintf(stderr, "Error: There is no RPC client functionality in zcashd. Use the zcash-cli utility instead.\n");
|
||||
fprintf(stderr, "Error: There is no RPC client functionality in btcpd. Use the btcp-cli utility instead.\n");
|
||||
exit(1);
|
||||
}
|
||||
#ifndef WIN32
|
||||
|
|
|
|||
20
src/init.cpp
20
src/init.cpp
|
|
@ -338,7 +338,7 @@ std::string HelpMessage(HelpMessageMode mode)
|
|||
strUsage += HelpMessageOpt("-blocknotify=<cmd>", _("Execute command when the best block changes (%s in cmd is replaced by block hash)"));
|
||||
strUsage += HelpMessageOpt("-checkblocks=<n>", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), 288));
|
||||
strUsage += HelpMessageOpt("-checklevel=<n>", strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), 3));
|
||||
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "zcash.conf"));
|
||||
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "btcprivate.conf"));
|
||||
if (mode == HMM_BITCOIND)
|
||||
{
|
||||
#if !defined(WIN32)
|
||||
|
|
@ -356,7 +356,7 @@ std::string HelpMessage(HelpMessageMode mode)
|
|||
strUsage += HelpMessageOpt("-par=<n>", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"),
|
||||
-GetNumCores(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS));
|
||||
#ifndef WIN32
|
||||
strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), "zcashd.pid"));
|
||||
strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), "btcpd.pid"));
|
||||
#endif
|
||||
strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. "
|
||||
"Warning: Reverting this setting requires re-downloading the entire blockchain. "
|
||||
|
|
@ -684,9 +684,9 @@ static void ZC_LoadParams()
|
|||
|
||||
if (!(boost::filesystem::exists(pk_path) && boost::filesystem::exists(vk_path))) {
|
||||
uiInterface.ThreadSafeMessageBox(strprintf(
|
||||
_("Cannot find the Zcash network parameters in the following directory:\n"
|
||||
_("Cannot find the Bitcoin Private network parameters in the following directory:\n"
|
||||
"%s\n"
|
||||
"Please run 'zcash-fetch-params' or './zcutil/fetch-params.sh' and then restart."),
|
||||
"Please run 'zcash-fetch-params' or './btcp/fetch-params.sh' and then restart."),
|
||||
ZC_GetParamsDir()),
|
||||
"", CClientUIInterface::MSG_ERROR);
|
||||
StartShutdown();
|
||||
|
|
@ -804,7 +804,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
|||
fLogIPs = GetBoolArg("-logips", false);
|
||||
|
||||
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
|
||||
LogPrintf("Zcash version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
|
||||
LogPrintf("Bitcoin Private version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
|
||||
|
||||
// when specifying an explicit binding address, you want to listen on it
|
||||
// even when -connect or -proxy is specified
|
||||
|
|
@ -1061,7 +1061,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
|||
|
||||
// Sanity check
|
||||
if (!InitSanityCheck())
|
||||
return InitError(_("Initialization sanity check failed. Zcash is shutting down."));
|
||||
return InitError(_("Initialization sanity check failed. Bitcoin Private is shutting down."));
|
||||
|
||||
std::string strDataDir = GetDataDir().string();
|
||||
#ifdef ENABLE_WALLET
|
||||
|
|
@ -1077,9 +1077,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
|||
try {
|
||||
static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
|
||||
if (!lock.try_lock())
|
||||
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Zcash is probably already running."), strDataDir));
|
||||
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Private is probably already running."), strDataDir));
|
||||
} catch(const boost::interprocess::interprocess_exception& e) {
|
||||
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Zcash is probably already running.") + " %s.", strDataDir, e.what()));
|
||||
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Private is probably already running.") + " %s.", strDataDir, e.what()));
|
||||
}
|
||||
|
||||
#ifndef WIN32
|
||||
|
|
@ -1600,10 +1600,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
|||
#ifdef ENABLE_MINING
|
||||
#ifndef ENABLE_WALLET
|
||||
if (GetBoolArg("-minetolocalwallet", false)) {
|
||||
return InitError(_("Zcash was not built with wallet support. Set -minetolocalwallet=0 to use -mineraddress, or rebuild Zcash with wallet support."));
|
||||
return InitError(_("Bitcoin Private was not built with wallet support. Set -minetolocalwallet=0 to use -mineraddress, or rebuild Bitcoin Private with wallet support."));
|
||||
}
|
||||
if (GetArg("-mineraddress", "").empty() && GetBoolArg("-gen", false)) {
|
||||
return InitError(_("Zcash was not built with wallet support. Set -mineraddress, or rebuild Zcash with wallet support."));
|
||||
return InitError(_("Bitcoin Private was not built with wallet support. Set -mineraddress, or rebuild Bitcoin Private with wallet support."));
|
||||
}
|
||||
#endif // !ENABLE_WALLET
|
||||
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ int printMiningStatus(bool mining)
|
|||
lines++;
|
||||
} else {
|
||||
std::cout << _("You are currently not mining.") << std::endl;
|
||||
std::cout << _("To enable mining, add 'gen=1' to your zcash.conf and restart.") << std::endl;
|
||||
std::cout << _("To enable mining, add 'gen=1' to your btcprivate.conf and restart.") << std::endl;
|
||||
lines += 2;
|
||||
}
|
||||
std::cout << std::endl;
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ UniValue getgenerate(const UniValue& params, bool fHelp)
|
|||
throw runtime_error(
|
||||
"getgenerate\n"
|
||||
"\nReturn if the server is set to generate coins or not. The default is false.\n"
|
||||
"It is set with the command line argument -gen (or zcash.conf setting gen)\n"
|
||||
"It is set with the command line argument -gen (or btcprivate.conf setting gen)\n"
|
||||
"It can also be set with the setgenerate call.\n"
|
||||
"\nResult\n"
|
||||
"true|false (boolean) If the server is set to generate coins or not\n"
|
||||
|
|
@ -179,7 +179,7 @@ UniValue generate(const UniValue& params, bool fHelp)
|
|||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set");
|
||||
}
|
||||
#else
|
||||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set");
|
||||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "btcpd compiled without wallet and -mineraddress not set");
|
||||
#endif
|
||||
}
|
||||
if (!Params().MineBlocksOnDemand())
|
||||
|
|
@ -294,7 +294,7 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
|
|||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set");
|
||||
}
|
||||
#else
|
||||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set");
|
||||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "btcpd compiled without wallet and -mineraddress not set");
|
||||
#endif
|
||||
}
|
||||
if (Params().MineBlocksOnDemand())
|
||||
|
|
@ -496,7 +496,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
|
|||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set");
|
||||
}
|
||||
#else
|
||||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set");
|
||||
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "btcpd compiled without wallet and -mineraddress not set");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@ UniValue CRPCTable::execute(const std::string &strMethod, const UniValue ¶ms
|
|||
|
||||
std::string HelpExampleCli(const std::string& methodname, const std::string& args)
|
||||
{
|
||||
return "> zcash-cli " + methodname + " " + args + "\n";
|
||||
return "> btcp-cli " + methodname + " " + args + "\n";
|
||||
}
|
||||
|
||||
std::string HelpExampleRpc(const std::string& methodname, const std::string& args)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ Modify the alert parameters, id and message found in this file.
|
|||
|
||||
Build and run with -sendalert or -printalert.
|
||||
|
||||
./zcashd -printtoconsole -sendalert
|
||||
./btcpd -printtoconsole -sendalert
|
||||
|
||||
One minute after starting up, the alert will be broadcast. It is then
|
||||
flooded through the network until the nRelayUntil time, and will be
|
||||
|
|
|
|||
|
|
@ -601,7 +601,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
|
|||
|
||||
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
|
||||
{
|
||||
// Don't overwrite existing settings so command line settings override zcash.conf
|
||||
// Don't overwrite existing settings so command line settings override btcprivate.conf
|
||||
string strKey = string("-") + it->string_key;
|
||||
if (mapSettingsRet.count(strKey) == 0)
|
||||
{
|
||||
|
|
@ -618,7 +618,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
|
|||
#ifndef WIN32
|
||||
boost::filesystem::path GetPidFile()
|
||||
{
|
||||
boost::filesystem::path pathPidFile(GetArg("-pid", "zcashd.pid"));
|
||||
boost::filesystem::path pathPidFile(GetArg("-pid", "btcpd.pid"));
|
||||
if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile;
|
||||
return pathPidFile;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ void CreatePidFile(const boost::filesystem::path &path, pid_t pid);
|
|||
#endif
|
||||
class missing_zcash_conf : public std::runtime_error {
|
||||
public:
|
||||
missing_zcash_conf() : std::runtime_error("Missing zcash.conf") { }
|
||||
missing_zcash_conf() : std::runtime_error("Missing btcprivate.conf") { }
|
||||
};
|
||||
void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
|
||||
#ifdef WIN32
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ UniValue z_exportwallet(const UniValue& params, bool fHelp)
|
|||
"z_exportwallet \"filename\"\n"
|
||||
"\nExports all wallet keys, for taddr and zaddr, in a human-readable format.\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"filename\" (string, required) The filename, saved in folder set by zcashd -exportdir option\n"
|
||||
"1. \"filename\" (string, required) The filename, saved in folder set by btcpd -exportdir option\n"
|
||||
"\nResult:\n"
|
||||
"\"path\" (string) The full path of the destination file\n"
|
||||
"\nExamples:\n"
|
||||
|
|
@ -450,7 +450,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
|
|||
"dumpwallet \"filename\"\n"
|
||||
"\nDumps taddr wallet keys in a human-readable format.\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"filename\" (string, required) The filename, saved in folder set by zcashd -exportdir option\n"
|
||||
"1. \"filename\" (string, required) The filename, saved in folder set by btcpd -exportdir option\n"
|
||||
"\nResult:\n"
|
||||
"\"path\" (string) The full path of the destination file\n"
|
||||
"\nExamples:\n"
|
||||
|
|
@ -474,7 +474,7 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys)
|
|||
throw JSONRPCError(RPC_INTERNAL_ERROR, e.what());
|
||||
}
|
||||
if (exportdir.empty()) {
|
||||
throw JSONRPCError(RPC_WALLET_ERROR, "Cannot export wallet until the zcashd -exportdir option has been set");
|
||||
throw JSONRPCError(RPC_WALLET_ERROR, "Cannot export wallet until the btcpd -exportdir option has been set");
|
||||
}
|
||||
std::string unclean = params[0].get_str();
|
||||
std::string clean = SanitizeFilename(unclean);
|
||||
|
|
|
|||
Loading…
Reference in New Issue