From bf40254a7e3738adface1578625725c238e7446d Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 18 Jul 2019 03:04:20 -1100 Subject: [PATCH 1/5] Fix spurious prints of deactivate --- src/komodo_utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index a9a06c80f..65601e655 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1769,6 +1769,8 @@ void komodo_args(char *argv0) { int32_t ecode = ccEnablesHeight[i]; int32_t ht = ccEnablesHeight[i+1]; + if ( i > 1 && ccEnablesHeight[i-2] == ecode ) + break; if ( ecode > 255 || ecode < 0 ) fprintf(stderr, "ac_ccactivateht: invalid evalcode.%i must be between 0 and 256.\n", ecode); else if ( ht > 0 ) From 49b564f18fcbdb706ed5ec90b09860f2c59de414 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 18 Jul 2019 05:11:06 -1100 Subject: [PATCH 2/5] Autoset cc for ccEnableHeights[0] !=0 --- src/komodo_utils.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 65601e655..bd625cdc2 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -2277,10 +2277,18 @@ void komodo_args(char *argv0) //printf("created (%s)\n",fname); } else printf("error creating (%s)\n",fname); #endif - if ( KOMODO_CCACTIVATE != 0 && ASSETCHAINS_CC < 2 ) + if ( ASSETCHAINS_CC < 2 ) { - ASSETCHAINS_CC = 2; - fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE); + if ( KOMODO_CCACTIVATE != 0 ) + { + ASSETCHAINS_CC = 2; + fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE); + } + else if ( ccEnableHeights[0] != 0 ) + { + ASSETCHAINS_CC = 2; + fprintf(stderr,"smart utxo CC contract %d will activate at height.%d\n",ccEnableHeights[0],ccEnableHeights[1]); + } } } else From efb2b798ad9bb52e11ab92969ca8599f13ac7648 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 18 Jul 2019 05:24:49 -1100 Subject: [PATCH 3/5] S --- src/komodo_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index bd625cdc2..cee024be3 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -2284,7 +2284,7 @@ void komodo_args(char *argv0) ASSETCHAINS_CC = 2; fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE); } - else if ( ccEnableHeights[0] != 0 ) + else if ( ccEnablesHeights[0] != 0 ) { ASSETCHAINS_CC = 2; fprintf(stderr,"smart utxo CC contract %d will activate at height.%d\n",ccEnableHeights[0],ccEnableHeights[1]); From 6a98239840fc1b30a49278503e523af7b9ac9d45 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 18 Jul 2019 05:28:47 -1100 Subject: [PATCH 4/5] Syntax --- src/komodo_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index cee024be3..11d5e87c4 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -2284,10 +2284,10 @@ void komodo_args(char *argv0) ASSETCHAINS_CC = 2; fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE); } - else if ( ccEnablesHeights[0] != 0 ) + else if ( ccEnablesHeight[0] != 0 ) { ASSETCHAINS_CC = 2; - fprintf(stderr,"smart utxo CC contract %d will activate at height.%d\n",ccEnableHeights[0],ccEnableHeights[1]); + fprintf(stderr,"smart utxo CC contract %d will activate at height.%d\n",ccEnablesHeight[0],ccEnablesHeight[1]); } } } From 3207059e3d35c6301b74ac81125d2ef5b026cee7 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 18 Jul 2019 05:29:27 -1100 Subject: [PATCH 5/5] Clear ccEnablesHeight --- src/komodo_utils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 11d5e87c4..d069733c1 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1697,6 +1697,7 @@ void komodo_args(char *argv0) IS_STAKED_NOTARY = GetArg("-stakednotary", -1); memset(ccenables,0,sizeof(ccenables)); memset(disablebits,0,sizeof(disablebits)); + memset(ccEnablesHeight,0,sizeof(ccEnablesHeight)); if ( GetBoolArg("-gen", false) != 0 ) { KOMODO_MININGTHREADS = GetArg("-genproclimit",-1);