From f80fc3c0022681679af84b05689cbff0d76f306e Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Mon, 4 Nov 2019 11:01:52 -0500 Subject: [PATCH] update manpages and other junk --- doc/man/komodo-cli.1 | 7 +++---- doc/man/komodo-tx.1 | 7 +++---- doc/man/komodod.1 | 11 +++-------- src/chainparams.cpp | 2 +- src/primitives/nonce.cpp | 1 + 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/doc/man/komodo-cli.1 b/doc/man/komodo-cli.1 index 8297286ed..1a6db770c 100644 --- a/doc/man/komodo-cli.1 +++ b/doc/man/komodo-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH KOMODO-CLI "1" "October 2019" "komodo-cli v3.2.1" "User Commands" +.TH KOMODO-CLI "1" "November 2019" "komodo-cli v3.2.1" "User Commands" .SH NAME komodo-cli \- manual page for komodo-cli v3.2.1 .SH DESCRIPTION -Komodo RPC client version v3.2.1\-659ebb148 +Komodo RPC client version v3.2.1\-7965ffc29\-dirty .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . @@ -79,9 +79,8 @@ Copyright (C) 2009-2019 The Bitcoin Core Developers Copyright (C) 2015-2019 The Zcash 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. +This is experimental software!!! Distributed under the MIT software license, see the accompanying file COPYING or . diff --git a/doc/man/komodo-tx.1 b/doc/man/komodo-tx.1 index df0808515..52073d0f3 100644 --- a/doc/man/komodo-tx.1 +++ b/doc/man/komodo-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH KOMODO-TX "1" "October 2019" "komodo-tx v3.2.1" "User Commands" +.TH KOMODO-TX "1" "November 2019" "komodo-tx v3.2.1" "User Commands" .SH NAME komodo-tx \- manual page for komodo-tx v3.2.1 .SH DESCRIPTION -Hush komodo\-tx utility version v3.2.1\-659ebb148 +Hush komodo\-tx utility version v3.2.1\-7965ffc29\-dirty .SS "Usage:" .TP komodo\-tx [options] [commands] @@ -92,9 +92,8 @@ Copyright (C) 2009-2019 The Bitcoin Core Developers Copyright (C) 2015-2019 The Zcash 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. +This is experimental software!!! Distributed under the MIT software license, see the accompanying file COPYING or . diff --git a/doc/man/komodod.1 b/doc/man/komodod.1 index 0caab5b23..dd7b5d854 100644 --- a/doc/man/komodod.1 +++ b/doc/man/komodod.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH KOMODOD "1" "October 2019" "komodod v3.2.1" "User Commands" +.TH KOMODOD "1" "November 2019" "komodod v3.2.1" "User Commands" .SH NAME komodod \- manual page for komodod v3.2.1 .SH DESCRIPTION -Hush Daemon version v3.2.1\-659ebb148 +Hush Daemon version v3.2.1\-7965ffc29\-dirty .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . @@ -617,10 +617,6 @@ Timelocked coinbase stop height \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 Hush, @@ -630,9 +626,8 @@ Copyright (C) 2009-2019 The Bitcoin Core Developers Copyright (C) 2015-2019 The Zcash 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. +This is experimental software!!! Distributed under the MIT software license, see the accompanying file COPYING or . diff --git a/src/chainparams.cpp b/src/chainparams.cpp index cfcf48313..28c738891 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -105,7 +105,7 @@ public: strNetworkID = "main"; strCurrencyUnits = "KMD"; bip44CoinType = 141; // As registered in https://github.com/satoshilabs/slips/blob/master/slip-0044.md - consensus.fCoinbaseMustBeProtected = false; // true this is only true wuth Verus and enforced after block 12800 + consensus.fCoinbaseMustBeProtected = false; consensus.nSubsidySlowStartInterval = 20000; consensus.nSubsidyHalvingInterval = 840000; consensus.nMajorityEnforceBlockUpgrade = 750; diff --git a/src/primitives/nonce.cpp b/src/primitives/nonce.cpp index a512b757d..a1fbd667d 100644 --- a/src/primitives/nonce.cpp +++ b/src/primitives/nonce.cpp @@ -1,3 +1,4 @@ +// Copyright (c) 2019 The Hush Developers // Copyright (c) 2018 Michael Toutonghi // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php.