DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'dev' into nSPV

Browse Source
This commit is contained in:
jl777
2019-07-24 02:04:41 -11:00
parent f8221a0c76 3207059e3d
commit 13b1075e3a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/komodo_utils.h
View File

@@ -1700,6 +1700,7 @@ void komodo_args(char *argv0)
KOMODO_NSPV = GetArg("-nSPV",0); KOMODO_NSPV = GetArg("-nSPV",0);
memset(ccenables,0,sizeof(ccenables)); memset(ccenables,0,sizeof(ccenables));
memset(disablebits,0,sizeof(disablebits)); memset(disablebits,0,sizeof(disablebits));
memset(ccEnablesHeight,0,sizeof(ccEnablesHeight));
if ( GetBoolArg("-gen", false) != 0 ) if ( GetBoolArg("-gen", false) != 0 )
{ {
KOMODO_MININGTHREADS = GetArg("-genproclimit",-1); KOMODO_MININGTHREADS = GetArg("-genproclimit",-1);
@@ -2296,10 +2297,18 @@ fprintf(stderr,"extralen.%d before disable bits\n",extralen);
//printf("created (%s)\n",fname); //printf("created (%s)\n",fname);
} else printf("error creating (%s)\n",fname); } else printf("error creating (%s)\n",fname);
#endif #endif
if ( KOMODO_CCACTIVATE != 0 && ASSETCHAINS_CC < 2 ) if ( ASSETCHAINS_CC < 2 )
{ {
ASSETCHAINS_CC = 2; if ( KOMODO_CCACTIVATE != 0 )
fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE); {
ASSETCHAINS_CC = 2;
fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE);
}
else if ( ccEnablesHeight[0] != 0 )
{
ASSETCHAINS_CC = 2;
fprintf(stderr,"smart utxo CC contract %d will activate at height.%d\n",ccEnablesHeight[0],ccEnablesHeight[1]);
}
} }
} }
else else