From cab05f7f01889b93aa23d05475b78dc1fde0725d Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 10 Jun 2019 23:53:11 +0800 Subject: [PATCH] fix --- src/cc/CCinclude.h | 4 ++-- src/komodo_utils.h | 50 ++++++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h index d9f08f624..1d8cf669e 100644 --- a/src/cc/CCinclude.h +++ b/src/cc/CCinclude.h @@ -59,8 +59,8 @@ one other technical note is that komodod has the insight-explorer extensions bui #define SMALLVAL 0.000000000000001 #define SATOSHIDEN ((uint64_t)100000000L) #define dstr(x) ((double)(x) / SATOSHIDEN) -#define CCDISABLE memset(ASSETCHAINS_CCDISABLES,1,sizeof(ASSETCHAINS_CCDISABLES)) -#define CCENABLE 0 +#define CCDISABLEALL memset(ASSETCHAINS_CCDISABLES,1,sizeof(ASSETCHAINS_CCDISABLES)) +#define CCENABLE(x) ASSETCHAINS_CCDISABLES[((uint8_t)x)] = 0 #ifndef _BITS256 #define _BITS256 diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 4bcd9d7da..94ac60515 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -2322,59 +2322,61 @@ void komodo_args(char *argv0) if ( strcmp("AXO",ASSETCHAINS_SYMBOL) == 0 ) { // No CCs used on this chain yet. - CCDISABLE; + CCDISABLEALL; } if ( strcmp("CCL",ASSETCHAINS_SYMBOL) == 0 ) { // No CCs used on this chain yet. - CCDISABLE; + CCDISABLEALL; } if ( strcmp("COQUI",ASSETCHAINS_SYMBOL) == 0 ) { - CCDISABLE; - ASSETCHAINS_CCDISABLES[230] = CCENABLE;; // DICE - ASSETCHAINS_CCDISABLES[235] = CCENABLE;; // CHANNELS - ASSETCHAINS_CCDISABLES[236] = CCENABLE;; // ORACLES - ASSETCHAINS_CCDISABLES[227] = CCENABLE;; // ASSETS - ASSETCHAINS_CCDISABLES[242] = CCENABLE;; // TOKENS + CCDISABLEALL; + CCENABLE(EVAL_DICE); + CCENABLE(EVAL_CHANNELS); + CCENABLE(EVAL_ORACLES); + CCENABLE(EVAL_ASSETS); + CCENABLE(EVAL_TOKENS); } if ( strcmp("DION",ASSETCHAINS_SYMBOL) == 0 ) { // No CCs used on this chain yet. - CCDISABLE; + CCDISABLEALL; } + if ( strcmp("EQL",ASSETCHAINS_SYMBOL) == 0 ) { // No CCs used on this chain yet. - CCDISABLE; + CCDISABLEALL; } if ( strcmp("ILN",ASSETCHAINS_SYMBOL) == 0 ) { // No CCs used on this chain yet. - CCDISABLE; + CCDISABLEALL; } - if ( strcmp("MORTY",ASSETCHAINS_SYMBOL) == 0 ) + if ( strcmp("OUR",ASSETCHAINS_SYMBOL) == 0 ) { - CCDISABLE; - ASSETCHAINS_CCDISABLES[228] = CCENABLE;; // FAUCET + // No CCs used on this chain yet. + CCDISABLEALL; } - if ( strcmp("RICK",ASSETCHAINS_SYMBOL) == 0 ) + if ( strcmp("ZEXO",ASSETCHAINS_SYMBOL) == 0 ) { - CCDISABLE; - ASSETCHAINS_CCDISABLES[228] = CCENABLE;; // FAUCET + // No CCs used on this chain yet. + CCDISABLEALL; } if ( strcmp("SEC",ASSETCHAINS_SYMBOL) == 0 ) { - CCDISABLE; - ASSETCHAINS_CCDISABLES[227] = CCENABLE;; // ASSETS - ASSETCHAINS_CCDISABLES[242] = CCENABLE;; // TOKENS + CCDISABLEALL; + CCENABLE(EVAL_ASSETS); + CCENABLE(EVAL_TOKENS); + CCENABLE(EVAL_ORACLES); } if ( strcmp("KMDICE",ASSETCHAINS_SYMBOL) == 0 ) { - CCDISABLE; - ASSETCHAINS_CCDISABLES[228] = CCENABLE;; // FAUCET - ASSETCHAINS_CCDISABLES[230] = CCENABLE;; // DICE - ASSETCHAINS_CCDISABLES[236] = CCENABLE;; // ORACLES + CCDISABLEALL; + CCENABLE(EVAL_FAUCET); + CCENABLE(EVAL_DICE); + CCENABLE(EVAL_ORACLES); } } else BITCOIND_RPCPORT = GetArg("-rpcport", BaseParams().RPCPort()); KOMODO_DPOWCONFS = GetArg("-dpowconfs",dpowconfs);