Update versions, copyrights and man pages

configure.ac

@@ -1,13 +1,13 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 2)
+define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 15)
+define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 26)
+define(_CLIENT_VERSION_BUILD, 1)
 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)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2018)
+define(_COPYRIGHT_YEAR, 2019)
 AC_INIT([Verus-CLI],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/VerusCoin/VerusCoin/issues],[verus-cli])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])

doc/man/komodo-cli.1

@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH KOMODO-CLI "1" "March 2018" "komodo-cli v1.0.8" "User Commands"
+.TH KOMODO-CLI "1" "June 2019" "komodo-cli v3.0.0" "User Commands"
 .SH NAME
-komodo-cli \- manual page for komodo-cli v1.0.8
+komodo-cli \- manual page for komodo-cli v3.0.0
 .SH DESCRIPTION
-Komodo RPC client version v1.0.8
+Komodo RPC client version v3.0.0\-beta2\-ab9d87166\-dirty
 .PP
-In order to ensure you are adequately protecting your privacy when using Zcash,
+In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://z.cash/support/security/index.html>.
+please see <https://myhush.org/security/>.
 .SS "Usage:"
 .TP
 komodo\-cli [options] <command> [params]
@@ -65,14 +65,21 @@ Password for JSON\-RPC connections
 .IP
 Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
 900)
+.HP
+\fB\-stdin\fR
+.IP
+Read extra arguments from standard input, one per line until EOF/Ctrl\-D
+(recommended for sensitive information such as passphrases)
 .SH COPYRIGHT
 
-In order to ensure you are adequately protecting your privacy when using Zcash,
+In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://z.cash/support/security/index.html>.
+please see <https://myhush.org/security/>.
 
-Copyright (C) 2009-2017 The Bitcoin Core Developers
+Copyright (C) 2009-2019 The Bitcoin Core Developers
-Copyright (C) 2015-2017 The Zcash Developers
+Copyright (C) 2015-2019 The Zcash Developers
-Copyright (C) 2015-2017 jl777 and SuperNET developers
+Copyright (C) 2015-2019 jl777 and SuperNET developers
+Copyright (C) 2018-2019 The Hush developers
+Copyright (C) 2018-2019 The Verus developers
 
 This is experimental software.
 
@@ -81,4 +88,4 @@ or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
 OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+by Eric Young.

doc/man/komodo-tx.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH KOMODO-TX "1" "March 2018" "komodo-tx v1.0.8" "User Commands"
+.TH KOMODO-TX "1" "June 2019" "komodo-tx v3.0.0" "User Commands"
 .SH NAME
-komodo-tx \- manual page for komodo-tx v1.0.8
+komodo-tx \- manual page for komodo-tx v3.0.0
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v1.0.8
+Zcash zcash\-tx utility version v3.0.0\-beta2\-ab9d87166\-dirty
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]
@@ -48,7 +48,7 @@ delout=N
 .IP
 Delete output N from TX
 .IP
-in=TXID:VOUT
+in=TXID:VOUT(:SEQUENCE_NUMBER)
 .IP
 Add input to TX
 .IP
@@ -68,7 +68,7 @@ outscript=VALUE:SCRIPT
 .IP
 Add raw script output to TX
 .IP
-sign=SIGHASH\-FLAGS
+sign=HEIGHT:SIGHASH\-FLAGS
 .IP
 Add zero or more signatures to transaction. This command requires JSON
 registers:prevtxs=JSON object, privatekeys=JSON object. See
@@ -85,12 +85,14 @@ set=NAME:JSON\-STRING
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
 
-In order to ensure you are adequately protecting your privacy when using Zcash,
+In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://z.cash/support/security/index.html>.
+please see <https://myhush.org/security/>.
 
-Copyright (C) 2009-2017 The Bitcoin Core Developers
+Copyright (C) 2009-2019 The Bitcoin Core Developers
-Copyright (C) 2015-2017 The Zcash Developers
+Copyright (C) 2015-2019 The Zcash Developers
-Copyright (C) 2015-2017 jl777 and SuperNET developers
+Copyright (C) 2015-2019 jl777 and SuperNET developers
+Copyright (C) 2018-2019 The Hush developers
+Copyright (C) 2018-2019 The Verus developers
 
 This is experimental software.
 
@@ -99,4 +101,4 @@ or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
 OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+by Eric Young.

doc/man/komodod.1

@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH KOMODOD "1" "March 2018" "komodod v1.0.8" "User Commands"
+.TH KOMODOD "1" "June 2019" "komodod v3.0.0" "User Commands"
 .SH NAME
-komodod \- manual page for komodod v1.0.8
+komodod \- manual page for komodod v3.0.0
 .SH DESCRIPTION
-Komodo Daemon version v1.0.8
+Komodo Daemon version v3.0.0\-beta2\-ab9d87166\-dirty
 .PP
-In order to ensure you are adequately protecting your privacy when using Zcash,
+In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://z.cash/support/security/index.html>.
+please see <https://myhush.org/security/>.
 .SS "Usage:"
 .TP
 komodod [options]
@@ -39,6 +39,10 @@ How many blocks to check at startup (default: 288, 0 = all)
 .IP
 How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3)
 .HP
+\fB\-clientname=\fR<SomeName>
+.IP
+Full node client name, default 'MagicBean'
+.HP
 \fB\-conf=\fR<file>
 .IP
 Specify configuration file (default: komodo.conf)
@@ -57,7 +61,7 @@ Specify directory to be used when exporting data
 .HP
 \fB\-dbcache=\fR<n>
 .IP
-Set database cache size in megabytes (4 to 16384, default: 100)
+Set database cache size in megabytes (4 to 16384, default: 450)
 .HP
 \fB\-loadblock=\fR<file>
 .IP
@@ -67,9 +71,15 @@ Imports blocks from external blk000??.dat file on startup
 .IP
 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)
+.HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -97,6 +107,21 @@ Create new files with system default permissions, instead of umask 077
 .IP
 Maintain a full transaction index, used by the getrawtransaction rpc
 call (default: 0)
+.HP
+\fB\-addressindex\fR
+.IP
+Maintain a full address index, used to query for the balance, txids and
+unspent outputs for addresses (default: 0)
+.HP
+\fB\-timestampindex\fR
+.IP
+Maintain a timestamp index for block hashes, used to query blocks hashes
+by a range of timestamps (default: 0)
+.HP
+\fB\-spentindex\fR
+.IP
+Maintain a full spent index, used to query the spending txid and input
+index for an outpoint (default: 0)
 .PP
 Connection options:
 .HP
@@ -154,7 +179,7 @@ Automatically create Tor hidden service (default: 1)
 .HP
 \fB\-maxconnections=\fR<n>
 .IP
-Maintain at most <n> connections to peers (default: 125)
+Maintain at most <n> connections to peers (default: 384)
 .HP
 \fB\-maxreceivebuffer=\fR<n>
 .IP
@@ -177,6 +202,11 @@ Only connect to nodes in network <net> (ipv4, ipv6 or onion)
 .IP
 Relay non\-P2SH multisig (default: 1)
 .HP
+\fB\-peerbloomfilters\fR
+.IP
+Support filtering of blocks and transaction with Bloom filters (default:
+1)
+.HP
 \fB\-port=\fR<port>
 .IP
 Listen for connections on <port> (default: 7770 or testnet: 17770)
@@ -207,10 +237,6 @@ Tor control port to use if onion listening enabled (default:
 .IP
 Tor control port password (default: empty)
 .HP
-\fB\-upnp\fR
-.IP
-Use UPnP to map the listening port (default: 0)
-.HP
 \fB\-whitebind=\fR<addr>
 .IP
 Bind to given address and whitelist peers connecting to it. Use
@@ -235,11 +261,11 @@ Set key pool size to <n> (default: 100)
 .HP
 \fB\-paytxfee=\fR<amt>
 .IP
-Fee (in BTC/kB) to add to transactions you send (default: 0.00)
+Fee (in KMD/kB) to add to transactions you send (default: 0.00)
 .HP
 \fB\-rescan\fR
 .IP
-Rescan the blockchain for missing wallet transactions on startup
+Rescan the block chain for missing wallet transactions on startup
 .HP
 \fB\-salvagewallet\fR
 .IP
@@ -258,10 +284,15 @@ Spend unconfirmed change when sending transactions (default: 1)
 If paytxfee is not set, include enough fee so transactions begin
 confirmation on average within n blocks (default: 2)
 .HP
+\fB\-txexpirydelta\fR
+.IP
+Set the number of blocks after which a transaction that has not been
+mined will become invalid (default: 200)
+.HP
 \fB\-maxtxfee=\fR<amt>
 .IP
-Maximum total fees to use in a single wallet transaction; setting this
+Maximum total fees (in KMD) to use in a single wallet transaction;
-too low may abort large transactions (default: 0.10)
+setting this too low may abort large transactions (default: 0.10)
 .HP
 \fB\-upgradewallet\fR
 .IP
@@ -280,6 +311,16 @@ Make the wallet broadcast transactions (default: 1)
 Execute command when a wallet transaction changes (%s in cmd is replaced
 by TxID)
 .HP
+\fB\-whitelistaddress=\fR<Raddress>
+.IP
+Enable the wallet filter for notary nodes and add one Raddress to the
+whitelist of the wallet filter. If \fB\-whitelistaddress=\fR is used, then the
+wallet filter is automatically activated. Several Raddresses can be
+defined using several \fB\-whitelistaddress=\fR (similar to \fB\-addnode\fR). The
+wallet filter will filter the utxo to only ones coming from my own
+Raddress (derived from pubkey) and each Raddress defined using
+\fB\-whitelistaddress=\fR this option is mostly for Notary Nodes).
+.HP
 \fB\-zapwallettxes=\fR<mode>
 .IP
 Delete all wallet transactions and only recover those parts of the
@@ -333,7 +374,7 @@ Prepend debug output with timestamp (default: 1)
 .HP
 \fB\-minrelaytxfee=\fR<amt>
 .IP
-Fees (in BTC/Kb) smaller than this are considered zero fee for relaying
+Fees (in KMD/kB) smaller than this are considered zero fee for relaying
 (default: 0.000001)
 .HP
 \fB\-printtoconsole\fR
@@ -376,14 +417,18 @@ Set maximum size of high\-priority/low\-fee transactions in bytes
 .PP
 Mining options:
 .HP
+\fB\-mint\fR
+.IP
+Mint/stake coins automatically (default: 0)
+.HP
 \fB\-gen\fR
 .IP
-Generate coins (default: 0)
+Mine/generate coins (default: 0)
 .HP
 \fB\-genproclimit=\fR<n>
 .IP
-Set the number of threads for coin generation if enabled (\fB\-1\fR = all
+Set the number of threads for coin mining if enabled (\fB\-1\fR = all cores,
-cores, default: 1)
+default: 0)
 .HP
 \fB\-equihashsolver=\fR<name>
 .IP
@@ -453,14 +498,134 @@ output (default: 1 if running in a console, 0 otherwise)
 .IP
 Number of seconds between metrics refreshes (default: 1 if running in a
 console, 600 otherwise)
+.PP
+Komodo Asset Chain options:
+.HP
+\fB\-ac_algo\fR
+.IP
+Choose PoW mining algorithm, default is Equihash
+.HP
+\fB\-ac_blocktime\fR
+.IP
+Block time in seconds, default is 60
+.HP
+\fB\-ac_cc\fR
+.IP
+Cryptoconditions, default 0
+.HP
+\fB\-ac_beam\fR
+.IP
+BEAM integration
+.HP
+\fB\-ac_coda\fR
+.IP
+CODA integration
+.HP
+\fB\-ac_cclib\fR
+.IP
+Cryptoconditions dynamicly loadable library
+.HP
+\fB\-ac_ccenable\fR
+.IP
+Cryptoconditions to enable
+.HP
+\fB\-ac_ccactivate\fR
+.IP
+Block height to enable Cryptoconditions
+.HP
+\fB\-ac_decay\fR
+.IP
+Percentage of block reward decrease at each halving
+.HP
+\fB\-ac_end\fR
+.IP
+Block height at which block rewards will end
+.HP
+\fB\-ac_eras\fR
+.IP
+Block reward eras
+.HP
+\fB\-ac_founders\fR
+.IP
+Number of blocks between founders reward payouts
+.HP
+\fB\-ac_halving\fR
+.IP
+Number of blocks between each block reward halving
+.HP
+\fB\-ac_name\fR
+.IP
+Name of asset chain
+.HP
+\fB\-ac_notarypay\fR
+.IP
+Pay notaries, default 0
+.HP
+\fB\-ac_perc\fR
+.IP
+Percentage of block rewards paid to the founder
+.HP
+\fB\-ac_private\fR
+.IP
+Shielded transactions only (except coinbase + notaries), default is 0
+.HP
+\fB\-ac_pubkey\fR
+.IP
+Public key for receiving payments on the network
+.HP
+\fB\-ac_public\fR
+.IP
+Transparent transactions only, default 0
+.HP
+\fB\-ac_reward\fR
+.IP
+Block reward in satoshis, default is 0
+.HP
+\fB\-ac_sapling\fR
+.IP
+Sapling activation block height
+.HP
+\fB\-ac_script\fR
+.IP
+P2SH/multisig address to receive founders rewards
+.HP
+\fB\-ac_staked\fR
+.IP
+Percentage of blocks that are Proof\-Of\-Stake, default 0
+.HP
+\fB\-ac_supply\fR
+.IP
+Starting supply, default is 0
+.HP
+\fB\-ac_timelockfrom\fR
+.IP
+Timelocked coinbase start height
+.HP
+\fB\-ac_timelockgte\fR
+.IP
+Timelocked coinbase minimum amount to be locked
+.HP
+\fB\-ac_timelockto\fR
+.IP
+Timelocked coinbase stop height
+.HP
+\fB\-ac_txpow\fR
+.IP
+Enforce transaction\-rate limit, default 0
+.HP
+\fB\-ac_veruspos\fR
+.IP
+Use Verus Proof\-Of\-Stake (\fB\-ac_veruspos\fR=\fI\,50\/\fR) default 0
 .SH COPYRIGHT
 
-In order to ensure you are adequately protecting your privacy when using Zcash,
+In order to ensure you are adequately protecting your privacy when using Hush,
-please see <https://z.cash/support/security/index.html>.
+please see <https://myhush.org/security/>.
 
-Copyright (C) 2009-2017 The Bitcoin Core Developers
+Copyright (C) 2009-2019 The Bitcoin Core Developers
-Copyright (C) 2015-2017 The Zcash Developers
+Copyright (C) 2015-2019 The Zcash Developers
-Copyright (C) 2015-2017 jl777 and SuperNET developers
+Copyright (C) 2015-2019 jl777 and SuperNET developers
+Copyright (C) 2018-2019 The Hush developers
+Copyright (C) 2018-2019 The Verus developers
 
 This is experimental software.
 
@@ -469,4 +634,4 @@ or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
 OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+by Eric Young.

src/clientversion.h

@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2014 The Bitcoin Core developers
 // Copyright (c) 2016-2017 The Zcash developers
+// Copyright (c) 2019      The Hush developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -30,10 +31,11 @@
  */
 
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
-#define CLIENT_VERSION_MAJOR 2
+// Must be kept in sync with configure.ac !
+#define CLIENT_VERSION_MAJOR 3
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 15
+#define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 26
+#define CLIENT_VERSION_BUILD 50
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true
@@ -42,7 +44,7 @@
  * Copyright year (2009-this)
  * Todo: update this when changing our copyright comments in the source
  */
-#define COPYRIGHT_YEAR 2018
+#define COPYRIGHT_YEAR 2019
 
 #endif //HAVE_CONFIG_H
 

src/util.cpp

@@ -1014,8 +1014,8 @@ void SetThreadPriority(int nPriority)
 std::string PrivacyInfo()
 {
     return "\n" +
-           FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Zcash, please see <%s>."),
+           FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Hush, please see <%s>."),
-                                     "https://z.cash/support/security/")) + "\n";
+                                     "https://myhush.org/security/")) + "\n";
 }
 
 std::string LicenseInfo()
@@ -1024,6 +1024,7 @@ std::string LicenseInfo()
            FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
            FormatParagraph(strprintf(_("Copyright (C) 2015-%i The Zcash Developers"), COPYRIGHT_YEAR)) + "\n" +
            FormatParagraph(strprintf(_("Copyright (C) 2015-%i jl777 and SuperNET developers"), COPYRIGHT_YEAR)) + "\n" +
+           FormatParagraph(strprintf(_("Copyright (C) 2018-%i The Hush developers"), COPYRIGHT_YEAR)) + "\n" +
            FormatParagraph(strprintf(_("Copyright (C) 2018-%i The Verus developers"), COPYRIGHT_YEAR)) + "\n" +
            "\n" +
            FormatParagraph(_("This is experimental software.")) + "\n" +