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

Update ASSETCHAINS_CC to 2

Browse Source
This commit is contained in:
jl777
2018-08-28 09:05:37 -11:00
parent d56f1389e9
commit 7fe1ffc792
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/CCutils.cpp
View File

@@ -58,10 +58,10 @@ CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk)
return(vout); 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; CTxOut vout;
CC *payoutCond = MakeCCcond1of2(evalcode,pk,pk2); CC *payoutCond = MakeCCcond1of2(evalcode,pk1,pk2);
vout = CTxOut(nValue,CCPubKey(payoutCond)); vout = CTxOut(nValue,CCPubKey(payoutCond));
cc_free(payoutCond); cc_free(payoutCond);
return(vout); return(vout);

2
src/komodo_utils.h
View File

@@ -1651,7 +1651,7 @@ void komodo_args(char *argv0)
//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 == 0 ) if ( KOMODO_CCACTIVATE != 0 && ASSETCHAINS_CC < 2 )
{ {
ASSETCHAINS_CC = 2; 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",KOMODO_CCACTIVATE);