diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index 2b781ade3..50845f9ef 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -186,21 +186,6 @@ void CCaddr3set(struct CCcontract_info *cp,uint8_t evalcode,CPubKey pk,uint8_t * strcpy(cp->unspendableaddr3,coinaddr); } -/*bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey) -{ - CTxDestination address; - txnouttype whichType; - std::vector> vvch = std::vector>(); - if (Solver(scriptPubKey, whichType, vvch) && vvch[0].size() == 20) - { - address = CKeyID(uint160(vvch[0])); - strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str()); - return(true); - } - fprintf(stderr,"Solver for scriptPubKey failed\n%s\n", scriptPubKey.ToString().c_str()); - return(false); -}*/ - bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey) { CTxDestination address; txnouttype whichType; diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 28916f8dc..253e1ab64 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1776,7 +1776,7 @@ void komodo_args(char *argv0) if ( (ASSETCHAINS_LWMAPOS = GetArg("-ac_veruspos",0)) != 0 ) ASSETCHAINS_LWMAPOS = 50; - ASSETCHAINS_SAPLING = GetArg("-ac_sapling", 10000000); + ASSETCHAINS_SAPLING = GetArg("-ac_sapling", -1); if (ASSETCHAINS_SAPLING == -1) { ASSETCHAINS_OVERWINTER = GetArg("-ac_overwinter", -1); @@ -1916,7 +1916,7 @@ void komodo_args(char *argv0) if ( (port= komodo_userpass(ASSETCHAINS_USERPASS,ASSETCHAINS_SYMBOL)) != 0 ) ASSETCHAINS_RPCPORT = port; else komodo_configfile(ASSETCHAINS_SYMBOL,ASSETCHAINS_P2PPORT + 1); - //if (ASSETCHAINS_LASTERA == 0 && ASSETCHAINS_REWARD[0] == 0) + if (ASSETCHAINS_LASTERA == 0) COINBASE_MATURITY = 1; //fprintf(stderr,"ASSETCHAINS_RPCPORT (%s) %u\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_RPCPORT); } diff --git a/src/main.cpp b/src/main.cpp index c29ff8257..5fabb00dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1335,6 +1335,8 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio //fprintf(stderr,"private chain nValue %.8f iscoinbase.%d\n",(double)txout.nValue/COIN,iscoinbase); if (iscoinbase == 0 && txout.nValue > 0) { + // TODO: if we are upgraded to Sapling, we can allow Sprout sourced funds to sit in a transparent address + // char destaddr[65]; Getscriptaddress(destaddr,txout.scriptPubKey); if ( komodo_isnotaryvout(destaddr) == 0 ) diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index b33b9b90f..faf7deedf 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -56,7 +56,7 @@ uint32_t komodo_segid32(char *coinaddr); int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height); int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp); #define KOMODO_VERSION "0.3.1" -#define VERUS_VERSION "0.4.0c" +#define VERUS_VERSION "0.4.0g" extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT; extern uint32_t ASSETCHAINS_CC; extern uint32_t ASSETCHAINS_MAGIC;