DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' of https://git.hush.is/hush/hush3 into dev

Browse Source
This commit is contained in:
Duke Leto
2021-10-30 12:22:43 -04:00
parent e04465983c b2cf132f0c
commit 1ce50447ba
10 changed files with 6320 additions and 6290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -17,8 +17,8 @@ pkgconfig_DATA = libzcashconsensus.pc
endif
BITCOIND_BIN=$(top_builddir)/src/komodod$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/komodo-cli$(EXEEXT)
BITCOIND_BIN=$(top_builddir)/src/hushd$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/hush-cli$(EXEEXT)
#WALLET_UTILITY_BIN=$(top_builddir)/src/wallet-utility$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

6254
contrib/snapshot/airdrop_hush3.sh
View File

File diff suppressed because it is too large Load Diff

6254
contrib/snapshot/testnet_airdrop_hush3.sh
View File

File diff suppressed because it is too large Load Diff

12
doc/man/hush-cli.1
View File

@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH HUSH-CLI "1" "July 2021" "hush-cli v3.8.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH HUSH-CLI "1" "October 2021" "hush-cli v3.9.0" "User Commands"
.SH NAME
hush-cli \- manual page for hush-cli v3.8.0
hush-cli \- manual page for hush-cli v3.9.0
.SH DESCRIPTION
Hush RPC client version v3.8.0\-10a6706e7\-dirty
Hush RPC client version v3.9.0\-44ed2bd07\-dirty
.PP
In order to ensure you are adequately protecting your privacy when using Hush,
please see <https://hush.is/security/>.
@@ -25,7 +25,7 @@ This help message
.HP
\fB\-conf=\fR<file>
.IP
Specify configuration file (default: komodo.conf)
Specify configuration file (default: HUSH3.conf)
.HP
\fB\-datadir=\fR<dir>
.IP
@@ -47,7 +47,7 @@ Send commands to node running on <ip> (default: 127.0.0.1)
.HP
\fB\-rpcport=\fR<port>
.IP
Connect to JSON\-RPC on <port> (default: 8232 or testnet: 18232)
Connect to JSON\-RPC on <port> (default: 18030 )
.HP
\fB\-rpcwait\fR
.IP

8
doc/man/hush-tx.1
View File

@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH HUSH-TX "1" "July 2021" "hush-tx v3.8.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH HUSH-TX "1" "October 2021" "hush-tx v3.9.0" "User Commands"
.SH NAME
hush-tx \- manual page for hush-tx v3.8.0
hush-tx \- manual page for hush-tx v3.9.0
.SH DESCRIPTION
hush\-tx utility version v3.8.0\-10a6706e7\-dirty
hush\-tx utility version v3.9.0\-44ed2bd07\-dirty
.SS "Usage:"
.TP
hush\-tx [options] <hex\-tx> [commands]

57
doc/man/hushd.1
View File

@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH HUSHD "1" "July 2021" "hushd v3.8.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH HUSHD "1" "October 2021" "hushd v3.9.0" "User Commands"
.SH NAME
hushd \- manual page for hushd v3.8.0
hushd \- manual page for hushd v3.9.0
.SH DESCRIPTION
Hush Daemon version v3.8.0\-10a6706e7\-dirty
Hush Daemon version v3.9.0\-44ed2bd07\-dirty
.PP
In order to ensure you are adequately protecting your privacy when using Hush,
please see <https://hush.is/security/>.
@@ -69,13 +69,12 @@ Keep at most <n> unconnectable transactions in memory (default: 100)
.HP
\fB\-mempooltxinputlimit=\fR<n>
.IP
[DEPRECATED FROM OVERWINTER] Set the maximum number of transparent
inputs in a transaction that the mempool will accept (default: 0 = no
limit applied)
[DEPRECATED/IGNORED] Set the maximum number of transparent inputs in a
transaction that the mempool will accept (default: 0 = no limit applied)
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-16\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
@@ -117,7 +116,7 @@ is replaced by transaction hex)
\fB\-addressindex\fR
.IP
Maintain a full address index, used to query for the balance, txids and
unspent outputs for addresses (default: 1)
unspent outputs for addresses (default: 0)
.HP
\fB\-timestampindex\fR
.IP
@@ -127,7 +126,7 @@ by a range of timestamps (default: 0)
\fB\-spentindex\fR
.IP
Maintain a full spent index, used to query the spending txid and input
index for an outpoint (default: 1)
index for an outpoint (default: 0)
.HP
\fB\-zindex\fR
.IP
@@ -142,7 +141,7 @@ Add a node to connect to and attempt to keep the connection open
.HP
\fB\-asmap=\fR<file>
.IP
Specify asn mapping used for bucketing of the peers (default:
Specify ASN mapping used for bucketing of the peers (default:
asmap.dat). Relative paths will be prefixed by the net\-specific datadir
location.
.HP
@@ -442,7 +441,7 @@ optional). If <category> is not supplied or if <category> = 1, output
all debugging information. <category> can be: addrman, alert, bench,
coindb, db, deletetx, estimatefee, http, libevent, lock, mempool, net,
tls, partitioncheck, pow, proxy, prune, rand, reindex, rpc, selectcoins,
tor, zmq, zrpc, zrpcunsafe (implies zrpc).
stratum, tor, zmq, zrpc, zrpcunsafe (implies zrpc).
.HP
\fB\-experimentalfeatures\fR
.IP
@@ -553,8 +552,7 @@ Password for JSON\-RPC connections
.HP
\fB\-rpcport=\fR<port>
.IP
Listen for JSON\-RPC connections on <port> (default: 7771 or testnet:
17771)
Listen for JSON\-RPC connections on <port> (default: 0 or testnet: 10000)
.HP
\fB\-rpcallowip=\fR<ip>
.IP
@@ -583,11 +581,40 @@ output (default: 1 if running in a console, 0 otherwise)
Number of seconds between metrics refreshes (default: 1 if running in a
console, 600 otherwise)
.PP
Stratum server options:
.HP
\fB\-stratum\fR
.IP
Enable stratum server (default: off)
.HP
\fB\-stratumaddress=\fR<address>
.IP
Mining address to use when special address of 'x' is sent by miner
(default: none)
.HP
\fB\-stratumbind=\fR<ipaddr>
.IP
Bind to given address to listen for Stratum work requests. Use
[host]:port notation for IPv6. This option can be specified multiple
times (default: bind to all interfaces)
.HP
\fB\-stratumport=\fR<port>
.IP
Listen for Stratum work requests on <port> (default: 19031 or testnet:
19031)
.HP
\fB\-stratumallowip=\fR<ip>
.IP
Allow Stratum work requests from specified source. Valid for <ip> are a
single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0)
or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified
multiple times
.PP
Hush Smart Chain options:
.HP
\fB\-ac_algo\fR
.IP
Choose PoW mining algorithm, default is Equihash
Choose PoW mining algorithm, default is Equihash (200,9)
.HP
\fB\-ac_blocktime\fR
.IP

6
migratecoin.sh
View File

@@ -11,7 +11,7 @@ address="Rxxx"
amount=1
# Alias for running cli on source chain
cli_source="komodo-cli -ac_name=$source"
cli_source="hush-cli -ac_name=$source"
# Raw tx that we will work with
txraw=`$cli_source createrawtransaction "[]" "{\"$address\":$amount}"`
@@ -37,7 +37,7 @@ read -p "Wait for a notarization to HUSH, and then two more notarizations from t
# Create import
importTx=`$cli_source migrate_createimporttransaction $exportSignedTx $payouts`
importTx=`komodo-cli migrate_completeimporttransaction $importTx`
importTx=`hush-cli migrate_completeimporttransaction $importTx`
# Send import
komodo-cli -ac_name=$target sendrawtransaction $importTx
hush-cli -ac_name=$target sendrawtransaction $importTx

2
qa/hush/full_test_suite.py
View File

@@ -145,7 +145,7 @@ STAGES = [
STAGE_COMMANDS = {
'btest': [repofile('src/test/test_bitcoin'), '-p'],
'gtest': [repofile('src/komodo-gtest')],
'gtest': [repofile('src/hush-gtest')],
'sec-hard': check_security_hardening,
'no-dot-so': ensure_no_dot_so_in_depends,
'util-test': util_test,

4
qa/pull-tester/run-bitcoind-for-test.sh.in
View File

@@ -5,7 +5,9 @@
# Released under the GPLv3
#
HUSH_LOAD_TIMEOUT=500
DATADIR="@abs_top_builddir@/.komodo/HUSH3"
# TODO: support legacy directory. For now, those that want
# to run tests must use the non-legacy directory
DATADIR="@abs_top_builddir@/.hush/HUSH3"
rm -rf "$DATADIR"
mkdir -p "$DATADIR"/regtest
touch "$DATADIR/HUSH3.conf"

9
zcutil/docker-entrypoint.sh
View File

@@ -6,12 +6,13 @@
#set -ex
echo "...Checking HUSH3.conf"
if [ ! -e "$HOME/.komodo/HUSH3/HUSH3.conf" ]; then
mkdir -p $HOME/.komodo/HUSH3
# TODO: support legacy location?
if [ ! -e "$HOME/.hush/HUSH3/HUSH3.conf" ]; then
mkdir -p $HOME/.hush/HUSH3
DATE=$(date)
echo "...Creating HUSH3.conf"
cat <<EOF > $HOME/.komodo/HUSH3.conf
cat <<EOF > $HOME/.hush/HUSH3.conf
# Generated by docker-entrypoint.sh at $DATE
rpcuser=hush
rpcpassword=${rpcpassword:-`dd if=/dev/urandom bs=33 count=1 2>/dev/null | base64`}
@@ -24,7 +25,7 @@ zdebug=0
zindex=0
EOF
cat $HOME/.komodo/HUSH3/HUSH3.conf
cat $HOME/.hush/HUSH3/HUSH3.conf
fi
if [ $# -gt 0 ]; then