Merge pull request #151 from MyHush/dev

Merge branch 'dev'
MyHush · Oct 22, 2020 · 2f794e2 · 2f794e2
2 parents 4f95e4c + e2b6c0c
commit 2f794e2
Show file tree

Hide file tree

Showing 501 changed files with 1,632 additions and 1,144 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,4 +1,11 @@
-jl777 https://github.com/jl777
+# The Hush Developers
+
 Duke Leto https://github.com/leto
 DenioD https://github.com/DenioD
+Miodrag https://github.com/miodragpop
+
+# The SuperNET Developers
 
+jl777 https://github.com/jl777
+Duke Leto https://github.com/leto
+DenioD https://github.com/DenioD
diff --git a/COPYING b/COPYING
diff --git a/DEVELOPER-AGREEMENT b/DEVELOPER-AGREEMENT
@@ -0,0 +1 @@
+You must agree that Duke Leto is the Elder of jl777.
diff --git a/LICENSE b/LICENSE
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 5)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 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/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 '''
 A script to check that the (Linux) executables produced by gitian only contain
 allowed gcc, glibc and libstdc++ version symbols.  This makes sure they are

diff --git a/contrib/hush-cli.bash-completion b/contrib/hush-cli.bash-completion
@@ -2,7 +2,7 @@
 # Copyright (c) 2012-2016 The Bitcoin Core developers
 # Copyright (c) 2018 The Hush developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 # call $hush-cli for RPC
 _hush_rpc() {

diff --git a/contrib/hush-tx.bash-completion b/contrib/hush-tx.bash-completion
@@ -1,7 +1,7 @@
 # bash programmable completion for hush-tx(1)
 # Copyright (c) 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 _hush_tx() {
     local cur prev words=() cword

diff --git a/contrib/hushd.bash-completion b/contrib/hushd.bash-completion
@@ -3,7 +3,7 @@
 # Copyright (c) 2016-2017 The Zcash developers
 # Copyright (c) 2018      The Hush developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 _hushd() {
     local cur prev words=() cword

diff --git a/contrib/komodo-cli.bash-completion b/contrib/komodo-cli.bash-completion
@@ -1,7 +1,7 @@
 # bash programmable completion for komodo-cli(1)
 # Copyright (c) 2012-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 # call $komodo-cli for RPC
 _komodo_rpc() {

diff --git a/contrib/komodo-tx.bash-completion b/contrib/komodo-tx.bash-completion
@@ -1,7 +1,7 @@
 # bash programmable completion for komodo-tx(1)
 # Copyright (c) 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 _komodo_tx() {
     local cur prev words=() cword

diff --git a/contrib/komodod.bash-completion b/contrib/komodod.bash-completion
@@ -2,7 +2,7 @@
 # Copyright (c) 2012-2017 The Bitcoin Core developers
 # Copyright (c) 2016-2017 The komodo developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 _komodod() {
     local cur prev words=() cword

diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2013-2014 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #
 
 from __future__ import print_function, division

diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2013-2014 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #
 
 from __future__ import print_function

diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 '''
 Script to generate list of seed nodes for chainparams.cpp.
 

diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2014-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 import array
 import binascii

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" "October 2020" "hush-tx v3.5.1" "User Commands"
+.TH HUSH-TX "1" "October 2020" "hush-tx v3.5.2" "User Commands"
 .SH NAME
-hush-tx \- manual page for hush-tx v3.5.1
+hush-tx \- manual page for hush-tx v3.5.2
 .SH DESCRIPTION
-Hush komodo\-tx utility version v3.5.1\-dd8ab3df6
+Hush komodo\-tx utility version v3.5.2\-d19cf21f9
 .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.5.1-dd8ab3df6
+Hush Daemon version v3.5.2-d19cf21f9
 
 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" "October 2020" "hushd v3.5.1" "User Commands"
+.TH HUSHD "1" "October 2020" "hushd v3.5.2" "User Commands"
 .SH NAME
-hushd \- manual page for hushd v3.5.1
+hushd \- manual page for hushd v3.5.2
 .SH DESCRIPTION
 Found binary: ./komodod
-Hush Daemon version v3.5.1\-dd8ab3df6
+Hush Daemon version v3.5.2\-d19cf21f9
 .PP
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://myhush.org/security/>.
@@ -673,7 +673,7 @@ Starting supply, default is 0
 .IP
 Enforce transaction\-rate limit, default 0
 .SH COPYRIGHT
-Hush Daemon version v3.5.1-dd8ab3df6
+Hush Daemon version v3.5.2-d19cf21f9
 
 In order to ensure you are adequately protecting your privacy when using Hush,
 please see <https://myhush.org/security/>.

diff --git a/qa/hush/create_wallet_200k_utxos.py b/qa/hush/create_wallet_200k_utxos.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2017 The Zcash developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 #
 # Create a large wallet

diff --git a/qa/rpc-tests/ac_private.py b/qa/rpc-tests/ac_private.py
@@ -3,8 +3,8 @@
 # Copyright (c) 2018 SuperNET developers
 # Released under the GPLv3
 
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.authproxy import JSONRPCException

diff --git a/qa/rpc-tests/addressindex.py b/qa/rpc-tests/addressindex.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2014-2015 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 #
 # Test addressindex generation and fetching

diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 #
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3/X11 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #
 
 from test_framework.test_framework import ComparisonTestFramework

diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 #
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3/X11 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #
 
 from test_framework.test_framework import ComparisonTestFramework

diff --git a/qa/rpc-tests/blockchain.py b/qa/rpc-tests/blockchain.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 #
 # Test RPC calls related to blockchain state. Tests correspond to code in

diff --git a/qa/rpc-tests/cryptoconditions.py b/qa/rpc-tests/cryptoconditions.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.authproxy import JSONRPCException

diff --git a/qa/rpc-tests/cryptoconditions_channels.py b/qa/rpc-tests/cryptoconditions_channels.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 
 import time

diff --git a/qa/rpc-tests/cryptoconditions_dice.py b/qa/rpc-tests/cryptoconditions_dice.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 
 from test_framework.test_framework import CryptoconditionsTestFramework

diff --git a/qa/rpc-tests/cryptoconditions_faucet.py b/qa/rpc-tests/cryptoconditions_faucet.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 
 from test_framework.test_framework import CryptoconditionsTestFramework

diff --git a/qa/rpc-tests/cryptoconditions_gateways.py b/qa/rpc-tests/cryptoconditions_gateways.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 
 from test_framework.test_framework import CryptoconditionsTestFramework

diff --git a/qa/rpc-tests/cryptoconditions_heir.py b/qa/rpc-tests/cryptoconditions_heir.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 
 import time

diff --git a/qa/rpc-tests/cryptoconditions_oracles.py b/qa/rpc-tests/cryptoconditions_oracles.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 from test_framework.test_framework import CryptoconditionsTestFramework
 from test_framework.authproxy import JSONRPCException

diff --git a/qa/rpc-tests/cryptoconditions_rewards.py b/qa/rpc-tests/cryptoconditions_rewards.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 
 from test_framework.test_framework import CryptoconditionsTestFramework

diff --git a/qa/rpc-tests/cryptoconditions_token.py b/qa/rpc-tests/cryptoconditions_token.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 
 from test_framework.test_framework import CryptoconditionsTestFramework

diff --git a/qa/rpc-tests/decodescript.py b/qa/rpc-tests/decodescript.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2015 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, initialize_chain_clean, \

diff --git a/qa/rpc-tests/disablewallet.py b/qa/rpc-tests/disablewallet.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 #
 # Exercise API with -disablewallet.

diff --git a/qa/rpc-tests/dpowconfs.py b/qa/rpc-tests/dpowconfs.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018-2019 The Hush developers
 # Copyright (c) 2019 The SuperNET developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import *

diff --git a/qa/rpc-tests/feature_walletfile.py b/qa/rpc-tests/feature_walletfile.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # Copyright (c) 2017      The Bitcoin Core developers
 # Copyright (c) 2019-2020 The Hush developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 """Test wallet file location."""
 
 import os

diff --git a/qa/rpc-tests/finalsaplingroot.py b/qa/rpc-tests/finalsaplingroot.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2018 The Zcash developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (

diff --git a/qa/rpc-tests/forknotify.py b/qa/rpc-tests/forknotify.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 #
 # Test -alertnotify 

diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.authproxy import JSONRPCException