diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index 3ce1d5eeb..50845f9ef 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -188,16 +188,13 @@ void CCaddr3set(struct CCcontract_info *cp,uint8_t evalcode,CPubKey pk,uint8_t * 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) + CTxDestination address; txnouttype whichType; + if ( ExtractDestination(scriptPubKey,address) != 0 ) { - 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()); + //fprintf(stderr,"ExtractDestination failed\n"); return(false); } diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 7bf95d578..253e1ab64 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -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 )