diff --git a/src/chainparams.cpp b/src/chainparams.cpp index e7febf524..74cffc0b9 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -568,7 +568,7 @@ void *chainparams_commandline() if ( ASSETCHAINS_BLOCKTIME != 60 ) { pCurrentParams->consensus.nMaxFutureBlockTime = 7 * ASSETCHAINS_BLOCKTIME; // 7 blocks - pCurrentParams->consensus.nPowTargetSpacing = ASSETCHAINS_BLOCKTIME; + pCurrentParams->consensus.nPowTargetSpacing = ASSETCHAINS_BLOCKTIME; } pCurrentParams->SetDefaultPort(ASSETCHAINS_P2PPORT); if ( ASSETCHAINS_NK[0] != 0 && ASSETCHAINS_NK[1] != 0 ) @@ -577,7 +577,7 @@ void *chainparams_commandline() pCurrentParams->SetNValue(ASSETCHAINS_NK[0]); pCurrentParams->SetKValue(ASSETCHAINS_NK[1]); } - if ( KOMODO_TESTNODE != 0 ) + if ( HUSH_TESTNODE != 0 ) pCurrentParams->SetMiningRequiresPeers(false); if ( ASSETCHAINS_RPCPORT == 0 ) ASSETCHAINS_RPCPORT = ASSETCHAINS_P2PPORT + 1; diff --git a/src/hush_defs.h b/src/hush_defs.h index c65be82e9..6c846e73d 100644 --- a/src/hush_defs.h +++ b/src/hush_defs.h @@ -525,7 +525,7 @@ extern uint8_t ASSETCHAINS_PRIVATE; extern int32_t USE_EXTERNAL_PUBKEY; extern char NOTARYADDRS[64][64]; extern char NOTARY_ADDRESSES[NUM_HUSH_SEASONS][64][64]; -extern int32_t KOMODO_TESTNODE, KOMODO_SNAPSHOT_INTERVAL; +extern int32_t HUSH_TESTNODE, KOMODO_SNAPSHOT_INTERVAL; extern int32_t ASSETCHAINS_EARLYTXIDCONTRACT; extern int32_t ASSETCHAINS_STAKED_SPLIT_PERCENTAGE; int tx_height( const uint256 &hash ); diff --git a/src/hush_globals.h b/src/hush_globals.h index 87bb50bcf..96c4e3dc0 100644 --- a/src/hush_globals.h +++ b/src/hush_globals.h @@ -95,23 +95,18 @@ uint32_t ASSETCHAINS_MINDIFF[] = {537857807}; int32_t ASSETCHAINS_LWMAPOS = 0; // percentage of blocks should be PoS int32_t ASSETCHAINS_SAPLING = -1; int32_t ASSETCHAINS_OVERWINTER = -1; - uint64_t KOMODO_INTERESTSUM,KOMODO_WALLETBALANCE; int32_t ASSETCHAINS_STAKED; uint64_t ASSETCHAINS_COMMISSION,ASSETCHAINS_SUPPLY = 10,ASSETCHAINS_FOUNDERS_REWARD; - uint32_t HUSH_INITDONE; char KMDUSERPASS[8192+512+1],BTCUSERPASS[8192]; uint16_t KMD_PORT = 7771,BITCOIND_RPCPORT = 7771; uint64_t PENDING_KOMODO_TX; extern int32_t KOMODO_LOADINGBLOCKS; unsigned int MAX_BLOCK_SIGOPS = 20000; - -int32_t KOMODO_TESTNODE, KOMODO_SNAPSHOT_INTERVAL; +int32_t HUSH_TESTNODE, KOMODO_SNAPSHOT_INTERVAL; CScript KOMODO_EARLYTXID_SCRIPTPUB; int32_t ASSETCHAINS_EARLYTXIDCONTRACT; - std::map mapHeightEvalActivate; - struct komodo_kv *KOMODO_KV; pthread_mutex_t KOMODO_KV_mutex,KOMODO_CC_mutex; diff --git a/src/hush_utils.h b/src/hush_utils.h index 387d30e01..e27ef01a4 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -1787,7 +1787,7 @@ void hush_args(char *argv0) DONATION_PUBKEY = GetArg("-donation", ""); NOTARY_PUBKEY = GetArg("-pubkey", ""); KOMODO_DEALERNODE = GetArg("-dealer",0); - KOMODO_TESTNODE = GetArg("-testnode",0); + HUSH_TESTNODE = GetArg("-testnode",0); if ( strlen(NOTARY_PUBKEY.c_str()) == 66 ) { decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str()); diff --git a/src/wallet-utility.cpp b/src/wallet-utility.cpp index 8a2c6a01b..46cbb1e28 100644 --- a/src/wallet-utility.cpp +++ b/src/wallet-utility.cpp @@ -21,7 +21,7 @@ uint32_t ASSETCHAINS_ALGO = 0; int32_t ASSETCHAINS_LWMAPOS = 0; int32_t ASSETCHAINS_OVERWINTER = 227520; int32_t ASSETCHAINS_SAPLING = 227520; -int32_t KOMODO_TESTNODE = 0; +int32_t HUSH_TESTNODE = 0; int32_t KOMODO_BLOCK_POSUNITS = 1000; unsigned int MAX_BLOCK_SIGOPS = 20000;