Remove unused CLI options and update debian example config

contrib/debian/examples/HUSH3.conf

@@ -4,6 +4,11 @@
 
 # Run a regression test network
 #regtest=0
+# Run a test node (which means you can mine with no peers)
+#testnode=1
+
+# Rescan from block height
+#rescan=123
 
 # Connect via a SOCKS5 proxy
 #proxy=127.0.0.1:9050
@@ -63,8 +68,9 @@
 #rpcbind=<addr>
 
 # You must set rpcuser and rpcpassword to secure the JSON-RPC api
-#rpcuser=Ulysses
-#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
+# These will automatically be created for you
+#rpcuser=user
+#rpcpassword=supersecretpassword
 
 # How many seconds node will wait for a complete RPC HTTP request.
 # after the HTTP connection is established. 
@@ -83,7 +89,7 @@
 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96
 
 # Listen for RPC connections on this TCP port:
-#rpcport=8232
+#rpcport=1234
 
 # You can use hushd to send commands to hushd
 # running on another host using this option:
@@ -100,8 +106,8 @@
 
 # Miscellaneous options
 
-# Enable attempt to mine HUSH
-#gen=0
+# Enable mining at startup
+#gen=1
 
 # Set the number of threads to be used for mining (-1 = all cores).
 #genproclimit=1
@@ -121,7 +127,7 @@
 #paytxfee=0.00
 
 #Rewind the chain to specific block height. This is useful for creating snapshots at a given block height.
-#rewind=777777
+#rewind=555
 
 #Stop the chain a specific block height. This is useful for creating snapshots at a given block height.
 #stopat=1000000
@@ -129,9 +135,54 @@
 #Set an address to use as change address for all transactions. This value must be set to a 33 byte pubkey. All mined coins will also be sent to this address.
 #pubkey=027dc7b5cfb5efca96674b45e9fda18df069d040b9fd9ff32c35df56005e330392
 
-#Forfeit all user rewards to miners. Set this to explicitly not claim user rewards.
-#exchange=1
+# Disable clearnet (ipv4 and ipv6) connections to this node
+#clearnet=0
 
-#Donate all user rewards to a a specific address. This value must be set to a 33 byte pubkey.
-#donation=027dc7b5cfb5efca96674b45e9fda18df069d040b9fd9ff32c35df56005e330392
+# Disable ipv4
+#disableipv4=1
+# Disable ipv6
+#disableipv6=1
 
+# Enable transaction index
+#txindex=1
+# Enable address index
+#addressindex=1
+# Enable spent index
+#spentindex=1
+
+# Enable shielded stats index
+#zindex=1
+
+# Attempt to salvage a corrupt wallet
+# salvagewallet=1
+
+# Mine all blocks to this address (not good for your privacy and not recommended!)
+# Disallowed if clearnet=0
+# mineraddress=XXX
+
+# Disable wallet
+#disablewallet=1
+
+# Allow mining to an address that is not in the current wallet
+#minetolocalwallet=0
+
+# Delete all wallet transactions
+#zapwallettxes=1
+
+# Enable sapling consolidation
+# consolidation=1
+
+# Enable stratum server
+# stratum=1
+
+# Run a command each time a new block is seen
+# %s in command is replaced by block hash
+#blocknotify=/my/awesome/script.sh %s
+
+# Run a command when wallet gets a new tx
+# %s in command is replaced with txid
+#walletnotify=/my/cool/script.sh %s
+
+# Run a command when tx expires
+# %s in command is replaced with txid
+#txexpirynotify=/my/elite/script.sh %s

src/hush_defs.h

@@ -577,13 +577,12 @@ extern std::string NOTARY_PUBKEY,ASSETCHAINS_OVERRIDE_PUBKEY,ASSETCHAINS_SCRIPTP
 extern uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33],ASSETCHAINS_MARMARA;
 extern std::vector<std::string> ASSETCHAINS_PRICES,ASSETCHAINS_STOCKS;
 extern uint256 HUSH_EARLYTXID;
-extern int32_t HUSH_CONNECTING,HUSH_CCACTIVATE,HUSH_DEALERNODE;
+extern int32_t HUSH_CONNECTING,HUSH_CCACTIVATE;
 extern uint32_t ASSETCHAINS_CC;
 extern std::string CCerror,ASSETCHAINS_CCLIB;
 extern uint8_t ASSETCHAINS_CCDISABLES[256];
 extern int32_t USE_EXTERNAL_PUBKEY;
 extern std::string NOTARY_PUBKEY,NOTARY_ADDRESS;
-extern std::string DONATION_PUBKEY;
 extern uint8_t ASSETCHAINS_PRIVATE;
 extern int32_t USE_EXTERNAL_PUBKEY;
 extern char NOTARYADDRS[64][64];

src/hush_globals.h

@@ -45,9 +45,9 @@ int COINBASE_MATURITY = _COINBASE_MATURITY;//100;
 unsigned int WITNESS_CACHE_SIZE = _COINBASE_MATURITY+10;
 uint256 HUSH_EARLYTXID;
 
-int32_t HUSH_MININGTHREADS = -1,IS_HUSH_NOTARY,USE_EXTERNAL_PUBKEY,HUSH_CHOSEN_ONE,ASSETCHAINS_SEED,HUSH_ON_DEMAND,HUSH_EXTERNAL_NOTARIES,HUSH_PASSPORT_INITDONE,HUSH_PAX,HUSH_EXCHANGEWALLET,HUSH_REWIND,HUSH_CONNECTING = -1,HUSH_DEALERNODE,HUSH_EXTRASATOSHI,ASSETCHAINS_FOUNDERS,ASSETCHAINS_CBMATURITY,HUSH_NSPV;
+int32_t HUSH_MININGTHREADS = -1,IS_HUSH_NOTARY,USE_EXTERNAL_PUBKEY,HUSH_CHOSEN_ONE,ASSETCHAINS_SEED,HUSH_ON_DEMAND,HUSH_EXTERNAL_NOTARIES,HUSH_PASSPORT_INITDONE,HUSH_PAX,HUSH_EXCHANGEWALLET,HUSH_REWIND,HUSH_CONNECTING = -1,HUSH_EXTRASATOSHI,ASSETCHAINS_FOUNDERS,ASSETCHAINS_CBMATURITY,HUSH_NSPV;
 int32_t HUSH_INSYNC,HUSH_LASTMINED,prevHUSH_LASTMINED,HUSH_CCACTIVATE;
-std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY,DONATION_PUBKEY,ASSETCHAINS_SCRIPTPUB,NOTARY_ADDRESS,ASSETCHAINS_SELFIMPORT,ASSETCHAINS_CCLIB;
+std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY,ASSETCHAINS_SCRIPTPUB,NOTARY_ADDRESS,ASSETCHAINS_SELFIMPORT,ASSETCHAINS_CCLIB;
 uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEYHASH[20],ASSETCHAINS_PUBLIC,ASSETCHAINS_PRIVATE,ASSETCHAINS_TXPOW,ASSETCHAINS_MARMARA;
 int8_t ASSETCHAINS_ADAPTIVEPOW;
 uint8_t ASSETCHAINS_CLEARNET = 1;

src/hush_utils.h

@@ -1763,9 +1763,7 @@ void hush_args(char *argv0)
     {
         HUSH_MININGTHREADS = GetArg("-genproclimit",-1);
     }
-    DONATION_PUBKEY   = GetArg("-donation", "");
     NOTARY_PUBKEY     = GetArg("-pubkey", "");
-    HUSH_DEALERNODE   = GetArg("-dealer",0);
     HUSH_TESTNODE     = GetArg("-testnode",0);
 
     if ( strlen(NOTARY_PUBKEY.c_str()) == 66 )

src/wallet/wallet.cpp

@@ -66,7 +66,6 @@ bool fPayAtLeastCustomFee = true;
 #include "hush_defs.h"
 
 CBlockIndex *hush_chainactive(int32_t height);
-extern std::string DONATION_PUBKEY;
 extern int32_t HUSH_LOADINGBLOCKS;
 int32_t hush_dpowconfs(int32_t height,int32_t numconfs);
 int tx_height( const uint256 &hash );