From 9089ec6926c11c64f54203af90c88a84a6c4f8b8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 17 Nov 2018 23:55:16 -1100 Subject: [PATCH 1/4] ac_sapling default to 10000000 --- 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 7bf95d578..99a1196c5 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", -1); + ASSETCHAINS_SAPLING = GetArg("-ac_sapling", 10000000); if (ASSETCHAINS_SAPLING == -1) { ASSETCHAINS_OVERWINTER = GetArg("-ac_overwinter", -1); From ecc94d66c31a455fa9b54aa9ae15cd4ad0f49053 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 18 Nov 2018 00:20:22 -1100 Subject: [PATCH 2/4] 0.3.1 KMDVERSION --- src/rpc/misc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index be8df2b33..b33b9b90f 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -55,7 +55,7 @@ extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; 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.2.1" +#define KOMODO_VERSION "0.3.1" #define VERUS_VERSION "0.4.0c" extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT; extern uint32_t ASSETCHAINS_CC; From 28029a846f420114feea33845069f72ad85b61c8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 18 Nov 2018 04:28:51 -1100 Subject: [PATCH 3/4] Revert GetScriptaddres --- src/cc/CCutils.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index 3ce1d5eeb..2b781ade3 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -186,7 +186,7 @@ void CCaddr3set(struct CCcontract_info *cp,uint8_t evalcode,CPubKey pk,uint8_t * strcpy(cp->unspendableaddr3,coinaddr); } -bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey) +/*bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey) { CTxDestination address; txnouttype whichType; @@ -199,6 +199,18 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey) } 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; + if ( ExtractDestination(scriptPubKey,address) != 0 ) + { + strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str()); + return(true); + } + //fprintf(stderr,"ExtractDestination failed\n"); + return(false); } bool GetCCParams(Eval* eval, const CTransaction &tx, uint32_t nIn, From c82f5899696c64170436de248574dc33ec92bc6e Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 18 Nov 2018 04:38:57 -1100 Subject: [PATCH 4/4] Asset chains maturity default --- 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 99a1196c5..28916f8dc 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 && ASSETCHAINS_REWARD[0] == 0) COINBASE_MATURITY = 1; //fprintf(stderr,"ASSETCHAINS_RPCPORT (%s) %u\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_RPCPORT); }