From 8f70c5c356794039989d2b083f2ac6d9e977f623 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 23 Jan 2021 20:47:44 -0500 Subject: [PATCH] HUSHCC --- src/cc/CCutils.cpp | 6 +++--- src/cc/eval.cpp | 6 +++--- src/hush.h | 2 +- src/hush_ccdata.h | 16 ++++++++-------- src/hush_defs.h | 2 +- src/hush_globals.h | 4 ++-- src/hush_utils.h | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index d0e085c85..852c2e4ee 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -826,7 +826,7 @@ bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector param height = HUSH_CONNECTING; if ( HUSH_CONNECTING < 0 ) // always comes back with > 0 for final confirmation return(true); - if ( ASSETCHAINS_CC == 0 || (height & ~(1<<30)) < KOMODO_CCACTIVATE ) + if ( ASSETCHAINS_CC == 0 || (height & ~(1<<30)) < HUSH_CCACTIVATE ) return eval->Invalid("CC are disabled or not active yet"); if ( (HUSH_CONNECTING & (1<<30)) != 0 ) { @@ -836,7 +836,7 @@ bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector param if (cp->validate == NULL) return eval->Invalid("validation not supported for eval code"); - //fprintf(stderr,"HUSH_CONNECTING.%d mempool.%d vs CCactive.%d\n",height,from_mempool,KOMODO_CCACTIVATE); + //fprintf(stderr,"HUSH_CONNECTING.%d mempool.%d vs CCactive.%d\n",height,from_mempool,HUSH_CCACTIVATE); // there is a chance CC tx is valid in mempool, but invalid when in block, so we cant filter duplicate requests. if any of the vins are spent, for example //txid = ctx.GetHash(); //if ( txid == cp->prevtxid ) @@ -872,7 +872,7 @@ bool CClib_Dispatch(const CC *cond,Eval *eval,std::vector paramsNull,co height = HUSH_CONNECTING; if ( HUSH_CONNECTING < 0 ) // always comes back with > 0 for final confirmation return(true); - if ( ASSETCHAINS_CC == 0 || (height & ~(1<<30)) < KOMODO_CCACTIVATE ) + if ( ASSETCHAINS_CC == 0 || (height & ~(1<<30)) < HUSH_CCACTIVATE ) return eval->Invalid("CC are disabled or not active yet"); if ( (HUSH_CONNECTING & (1<<30)) != 0 ) { diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp index 1c4812727..c24bc612f 100644 --- a/src/cc/eval.cpp +++ b/src/cc/eval.cpp @@ -33,14 +33,14 @@ char *CClib_name(); Eval* EVAL_TEST = 0; struct CCcontract_info CCinfos[0x100]; -extern pthread_mutex_t KOMODO_CC_mutex; +extern pthread_mutex_t HUSH_CC_mutex; bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn) { EvalRef eval; - pthread_mutex_lock(&KOMODO_CC_mutex); + pthread_mutex_lock(&HUSH_CC_mutex); bool out = eval->Dispatch(cond, tx, nIn); - pthread_mutex_unlock(&KOMODO_CC_mutex); + pthread_mutex_unlock(&HUSH_CC_mutex); if ( eval->state.IsValid() != out) fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid()); //assert(eval->state.IsValid() == out); diff --git a/src/hush.h b/src/hush.h index 06e755d1b..650cb4379 100644 --- a/src/hush.h +++ b/src/hush.h @@ -360,7 +360,7 @@ void hush_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotarie if ( didinit == 0 ) { portable_mutex_init(&HUSH_KV_mutex); - portable_mutex_init(&KOMODO_CC_mutex); + portable_mutex_init(&HUSH_CC_mutex); didinit = 1; } if ( (sp= hush_stateptr(symbol,dest)) == 0 ) diff --git a/src/hush_ccdata.h b/src/hush_ccdata.h index aa64da448..b38062f22 100644 --- a/src/hush_ccdata.h +++ b/src/hush_ccdata.h @@ -46,7 +46,7 @@ struct komodo_ccdata_entry *komodo_allMoMs(int32_t *nump,uint256 *MoMoMp,int32_t struct komodo_ccdata_entry *allMoMs=0; struct komodo_ccdata *ccdata,*tmpptr; int32_t i,num,max; bool fMutated; std::vector tree, leaves; num = max = 0; - portable_mutex_lock(&KOMODO_CC_mutex); + portable_mutex_lock(&HUSH_CC_mutex); DL_FOREACH_SAFE(CC_data,ccdata,tmpptr) { if ( ccdata->MoMdata.height <= kmdendi && ccdata->MoMdata.height >= kmdstarti ) @@ -66,7 +66,7 @@ struct komodo_ccdata_entry *komodo_allMoMs(int32_t *nump,uint256 *MoMoMp,int32_t if ( ccdata->MoMdata.height < kmdstarti ) break; } - portable_mutex_unlock(&KOMODO_CC_mutex); + portable_mutex_unlock(&HUSH_CC_mutex); if ( (*nump= num) > 0 ) { for (i=0; iMoMdata.height < kmdheight ) @@ -135,7 +135,7 @@ int32_t hush_MoMoMdata(char *hexstr,int32_t hexsize,struct komodo_ccdataMoMoM *m starti = ccdata->MoMdata.height; } } - portable_mutex_unlock(&KOMODO_CC_mutex); + portable_mutex_unlock(&HUSH_CC_mutex); mdata->kmdstarti = starti; mdata->kmdendi = endi; if ( starti != 0 && endi != 0 && endi >= starti ) @@ -184,7 +184,7 @@ void komodo_purge_ccdata(int32_t height) struct komodo_ccdata *ccdata,*tmpptr; if ( SMART_CHAIN_SYMBOL[0] == 0 ) { - portable_mutex_lock(&KOMODO_CC_mutex); + portable_mutex_lock(&HUSH_CC_mutex); DL_FOREACH_SAFE(CC_data,ccdata,tmpptr) { if ( ccdata->MoMdata.height >= height ) @@ -194,7 +194,7 @@ void komodo_purge_ccdata(int32_t height) free(ccdata); } else break; } - portable_mutex_unlock(&KOMODO_CC_mutex); + portable_mutex_unlock(&HUSH_CC_mutex); } else { @@ -236,9 +236,9 @@ int32_t komodo_rwccdata(char *thischain,int32_t rwflag,struct komodo_ccdata *ccd { ptr = (struct komodo_ccdata *)calloc(1,sizeof(*ptr)); *ptr = *ccdata; - portable_mutex_lock(&KOMODO_CC_mutex); + portable_mutex_lock(&HUSH_CC_mutex); DL_PREPEND(CC_data,ptr); - portable_mutex_unlock(&KOMODO_CC_mutex); + portable_mutex_unlock(&HUSH_CC_mutex); } } else diff --git a/src/hush_defs.h b/src/hush_defs.h index 871c0bd5c..bdcba7296 100644 --- a/src/hush_defs.h +++ b/src/hush_defs.h @@ -515,7 +515,7 @@ extern std::vector ASSETCHAINS_PRICES,ASSETCHAINS_STOCKS; extern uint256 HUSH_EARLYTXID; -extern int32_t HUSH_CONNECTING,KOMODO_CCACTIVATE,KOMODO_DEALERNODE; +extern int32_t HUSH_CONNECTING,HUSH_CCACTIVATE,KOMODO_DEALERNODE; extern uint32_t ASSETCHAINS_CC; extern std::string CCerror,ASSETCHAINS_CCLIB; extern uint8_t ASSETCHAINS_CCDISABLES[256]; diff --git a/src/hush_globals.h b/src/hush_globals.h index af08935b3..ee442c7e7 100644 --- a/src/hush_globals.h +++ b/src/hush_globals.h @@ -48,7 +48,7 @@ unsigned int WITNESS_CACHE_SIZE = _COINBASE_MATURITY+10; uint256 HUSH_EARLYTXID; int32_t HUSH_MININGTHREADS = -1,IS_HUSH_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,HUSH_EXTERNAL_NOTARIES,HUSH_PASSPORT_INITDONE,KOMODO_PAX,HUSH_EXCHANGEWALLET,HUSH_REWIND,HUSH_CONNECTING = -1,KOMODO_DEALERNODE,HUSH_EXTRASATOSHI,ASSETCHAINS_FOUNDERS,ASSETCHAINS_CBMATURITY,HUSH_NSPV; -int32_t HUSH_INSYNC,KOMODO_LASTMINED,prevKOMODO_LASTMINED,KOMODO_CCACTIVATE,JUMBLR_PAUSE = 1; +int32_t HUSH_INSYNC,KOMODO_LASTMINED,prevKOMODO_LASTMINED,HUSH_CCACTIVATE,JUMBLR_PAUSE = 1; std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY,DONATION_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; @@ -105,7 +105,7 @@ CScript HUSH_EARLYTXID_SCRIPTPUB; int32_t ASSETCHAINS_EARLYTXIDCONTRACT; std::map mapHeightEvalActivate; struct komodo_kv *HUSH_KV; -pthread_mutex_t HUSH_KV_mutex,KOMODO_CC_mutex; +pthread_mutex_t HUSH_KV_mutex,HUSH_CC_mutex; #define MAX_CURRENCIES 32 char CURRENCIES[][8] = { "USD", "EUR", "JPY", "GBP", "AUD", "CAD", "CHF", "NZD", // major currencies diff --git a/src/hush_utils.h b/src/hush_utils.h index ad444538f..1de2e0ae8 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -1825,7 +1825,7 @@ void hush_args(char *argv0) MAX_REORG_LENGTH = GetArg("-maxreorg",MAX_REORG_LENGTH); WITNESS_CACHE_SIZE = MAX_REORG_LENGTH+10; ASSETCHAINS_CC = GetArg("-ac_cc",0); - KOMODO_CCACTIVATE = GetArg("-ac_ccactivate",0); + HUSH_CCACTIVATE = GetArg("-ac_ccactivate",0); ASSETCHAINS_BLOCKTIME = GetArg("-ac_blocktime",60); ASSETCHAINS_PUBLIC = GetArg("-ac_public",0); ASSETCHAINS_PRIVATE = GetArg("-ac_private",0); @@ -2387,10 +2387,10 @@ void hush_args(char *argv0) #endif if ( ASSETCHAINS_CC < 2 ) { - if ( KOMODO_CCACTIVATE != 0 ) + if ( HUSH_CCACTIVATE != 0 ) { ASSETCHAINS_CC = 2; - fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE); + fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",HUSH_CCACTIVATE); } else if ( ccEnablesHeight[0] != 0 ) { ASSETCHAINS_CC = 2; fprintf(stderr,"smart utxo CC contract %d will activate at height.%d\n",(int32_t)ccEnablesHeight[0],(int32_t)ccEnablesHeight[1]);