From 7fe1ffc79290b059ef7f76862bfbfe63a5847c0b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 28 Aug 2018 09:05:37 -1100
Subject: [PATCH] Update ASSETCHAINS_CC to 2

---
 src/cc/CCutils.cpp | 4 ++--
 src/komodo_utils.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 3cbc04799..87d5b7672 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -58,10 +58,10 @@ CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk)
     return(vout);
 }
 
-CTxOut MakeCC1of2vout(uint8_t evalcode,CAmount nValue,CPubKey pk,CPubKey pk2)
+CTxOut MakeCC1of2vout(uint8_t evalcode,CAmount nValue,CPubKey pk1,CPubKey pk2)
 {
     CTxOut vout;
-    CC *payoutCond = MakeCCcond1of2(evalcode,pk,pk2);
+    CC *payoutCond = MakeCCcond1of2(evalcode,pk1,pk2);
     vout = CTxOut(nValue,CCPubKey(payoutCond));
     cc_free(payoutCond);
     return(vout);
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index 23e6b280e..d98418c82 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1651,7 +1651,7 @@ void komodo_args(char *argv0)
             //printf("created (%s)\n",fname);
         } else printf("error creating (%s)\n",fname);
 #endif
-        if ( KOMODO_CCACTIVATE != 0 && ASSETCHAINS_CC == 0 )
+        if ( KOMODO_CCACTIVATE != 0 && ASSETCHAINS_CC < 2 )
         {
             ASSETCHAINS_CC = 2;
             fprintf(stderr,"smart utxo CC contracts will activate at height.%d\n",KOMODO_CCACTIVATE);