Merge pull request #117 from MyHush/dev

Hush 3.4.0
MyHush · Jun 18, 2020 · 13e4ffa · 13e4ffa
2 parents a0e36da + a7cd2b3
commit 13e4ffa
Show file tree

Hide file tree

Showing 136 changed files with 3,750 additions and 9,479 deletions.
diff --git a/build.sh b/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+# Copyright (c) 2019-2020 The Hush developers
+
+set -eu -o pipefail
+./zcutil/build.sh $@
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_MINOR, 4)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 50)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))

diff --git a/contrib/block_time.pl b/contrib/block_time.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright 2019 The Hush developers
+# Copyright 2019-2020 The Hush developers
 # Released under the GPLv3
 use warnings;
 use strict;
@@ -9,6 +9,11 @@
 my $hush       = "./src/hush-cli";
 my $blockcount = qx{$hush getblockcount};
 
+unless ($blockcount = int($blockcount)) {
+    print "Invalid response from hush-cli\n";
+    exit 1;
+}
+
 if ($block <= $blockcount) {
 	die "That block has already happened!";
 } else {

diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
@@ -1,7 +1,7 @@
 package=boost
 
 $(package)_version=1_72_0
-$(package)_download_path=https://dl.bintray.com/boostorg/release/1.72.0/source/
+$(package)_download_path=https://github.com/MyHush/boost/releases/download/v1.72.0/
 $(package)_sha256_hash=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
 

diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk
@@ -1,8 +1,8 @@
 package=native_ccache
-$(package)_version=3.7.7
+$(package)_version=3.7.9
 $(package)_download_path=https://github.com/ccache/ccache/releases/download/v$($(package)_version)
-$(package)_file_name=ccache-$($(package)_version).tar.xz
-$(package)_sha256_hash=b7c1d6d6fe42f18e424de92746af863e0bc85794da3d69e44300840c478c98cd
+$(package)_file_name=ccache-$($(package)_version).tar.gz
+$(package)_sha256_hash=92838e2133c9e704fdab9ee2608dad86c99021278b9ac47d065aa8ff2ea8ce36
 
 define $(package)_set_vars
 $(package)_config_opts=

diff --git a/doc/man/hush-cli.1 b/doc/man/hush-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH HUSH-CLI "1" "March 2020" "hush-cli v3.3.2" "User Commands"
+.TH HUSH-CLI "1" "June 2020" "hush-cli v3.4.0" "User Commands"
 .SH NAME
-hush-cli \- manual page for hush-cli v3.3.2
+hush-cli \- manual page for hush-cli v3.4.0
 .SH DESCRIPTION
-Komodo RPC client version v3.3.2\-699b59037
+Komodo RPC client version v3.4.0\-2fbcca416\-dirty
 .PP
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://myhush.org/security/>.
@@ -71,7 +71,7 @@ Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
 Read extra arguments from standard input, one per line until EOF/Ctrl\-D
 (recommended for sensitive information such as passphrases)
 .SH COPYRIGHT
-Hush Daemon version v3.3.2-699b59037
+Hush Daemon version v3.4.0-2fbcca416-dirty
 
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://myhush.org/security/>.

diff --git a/doc/man/hush-tx.1 b/doc/man/hush-tx.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH HUSH-TX "1" "March 2020" "hush-tx v3.3.2" "User Commands"
+.TH HUSH-TX "1" "June 2020" "hush-tx v3.4.0" "User Commands"
 .SH NAME
-hush-tx \- manual page for hush-tx v3.3.2
+hush-tx \- manual page for hush-tx v3.4.0
 .SH DESCRIPTION
-Hush komodo\-tx utility version v3.3.2\-699b59037
+Hush komodo\-tx utility version v3.4.0\-2fbcca416\-dirty
 .SS "Usage:"
 .TP
 komodo\-tx [options] <hex\-tx> [commands]
@@ -84,7 +84,7 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Hush Daemon version v3.3.2-699b59037
+Hush Daemon version v3.4.0-2fbcca416-dirty
 
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://myhush.org/security/>.

diff --git a/doc/man/hushd.1 b/doc/man/hushd.1
@@ -1,10 +1,10 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH HUSHD "1" "March 2020" "hushd v3.3.2" "User Commands"
+.TH HUSHD "1" "June 2020" "hushd v3.4.0" "User Commands"
 .SH NAME
-hushd \- manual page for hushd v3.3.2
+hushd \- manual page for hushd v3.4.0
 .SH DESCRIPTION
 Found binary: ./komodod
-Hush Daemon version v3.3.2\-699b59037
+Hush Daemon version v3.4.0\-2fbcca416\-dirty
 .PP
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://myhush.org/security/>.
@@ -87,6 +87,11 @@ leave that many cores free, default: 0)
 .IP
 Specify pid file (default: komodod.pid)
 .HP
+\fB\-txexpirynotify=\fR<cmd>
+.IP
+Execute command when transaction expires (%s in cmd is replaced by
+transaction id)
+.HP
 \fB\-prune=\fR<n>
 .IP
 Reduce storage requirements by pruning (deleting) old blocks. This mode
@@ -295,6 +300,11 @@ Keep the last <n> transactions (default: 200)
 .IP
 Keep transactions for at least <n> blocks (default: 10000)
 .HP
+\fB\-opretmintxfee=\fR<amt>
+.IP
+Minimum fee (in KMD/kB) to allow for OP_RETURN transactions (default:
+400000)
+.HP
 \fB\-paytxfee=\fR<amt>
 .IP
 Fee (in KMD/kB) to add to transactions you send (default: 0.00)
@@ -629,7 +639,7 @@ Starting supply, default is 0
 .IP
 Enforce transaction\-rate limit, default 0
 .SH COPYRIGHT
-Hush Daemon version v3.3.2-699b59037
+Hush Daemon version v3.4.0-2fbcca416-dirty
 
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://myhush.org/security/>.

diff --git a/doc/payment-disclosure.md b/doc/payment-disclosure.md
diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
@@ -17,14 +17,12 @@ testScripts=(
     'dpow.py'
     'dpowconfs.py'
     'ac_private.py'
-    'paymentdisclosure.py'
     'prioritisetransaction.py'
     'wallet_treestate.py'
     'wallet_anchorfork.py'
     'wallet_changeindicator.py'
     'wallet_import_export.py'
     'wallet_protectcoinbase.py'
-    'wallet_shieldcoinbase_sprout.py'
     'wallet_shieldcoinbase_sapling.py'
     'wallet_listreceived.py'
     'wallet_mergetoaddress.py'
@@ -65,14 +63,11 @@ testScripts=(
     'decodescript.py'
     'blockchain.py'
     'disablewallet.py'
-    'zcjoinsplit.py'
-    'zcjoinsplitdoublespend.py'
     'ivk_import_export.py'
     'zkey_import_export.py'
     'getblocktemplate.py'
     'bip65-cltv-p2p.py'
     'bipdersig-p2p.py'
-    'p2p_nu_peer_management.py'
     'rewind_index.py'
     'p2p_txexpiry_dos.py'
     'p2p_node_bloom.py'