From 2e2e49fc660e47eb73fa01d830b2701ff94f70b3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 07:49:55 +0200 Subject: [PATCH 1/8] test --- src/komodo_utils.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 4d62f5e9a..f32a6c56c 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1466,7 +1466,10 @@ void komodo_args() if ( name.c_str()[0] != 0 ) { ASSETCHAINS_SUPPLY = GetArg("-ac_supply",10); - MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN; + if ( (baseid= komodo_baseid(ASSETCHAINS_SYMBOL)) >= 0 && baseid < 32 ) + MAX_MONEY = komodo_maxallowed(baseid) * SATOSHIDEN; + else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN; + printf("MAX_MONEY.%s %.8f\n",(double)MAX_MONEY/SATOSHIDEN); addn = GetArg("-seednode",""); if ( strlen(addn.c_str()) > 0 ) ASSETCHAINS_SEED = 1; From afacf361e87a68756ee5da4ec45e50672e6ba960 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 07:51:47 +0200 Subject: [PATCH 2/8] test --- src/komodo_globals.h | 1 + src/komodo_utils.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/komodo_globals.h b/src/komodo_globals.h index a63c4c754..b908e0669 100644 --- a/src/komodo_globals.h +++ b/src/komodo_globals.h @@ -23,6 +23,7 @@ int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33) int32_t komodo_isrealtime(int32_t *kmdheightp); uint64_t komodo_paxtotal(); int32_t komodo_longestchain(); +uint64_t komodo_maxallowed(int32_t baseid); pthread_mutex_t komodo_mutex; diff --git a/src/komodo_utils.h b/src/komodo_utils.h index f32a6c56c..21ae2338c 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1452,7 +1452,7 @@ int32_t komodo_whoami(char *pubkeystr,int32_t height) void komodo_args() { extern int64_t MAX_MONEY; - std::string name,addn; char *dirname,fname[512],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,len; + std::string name,addn; char *dirname,fname[512],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,baseid,len; IS_KOMODO_NOTARY = GetBoolArg("-notary", false); NOTARY_PUBKEY = GetArg("-pubkey", ""); if ( strlen(NOTARY_PUBKEY.c_str()) == 66 ) @@ -1467,7 +1467,7 @@ void komodo_args() { ASSETCHAINS_SUPPLY = GetArg("-ac_supply",10); if ( (baseid= komodo_baseid(ASSETCHAINS_SYMBOL)) >= 0 && baseid < 32 ) - MAX_MONEY = komodo_maxallowed(baseid) * SATOSHIDEN; + MAX_MONEY = komodo_maxallowed(baseid); else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN; printf("MAX_MONEY.%s %.8f\n",(double)MAX_MONEY/SATOSHIDEN); addn = GetArg("-seednode",""); From d0e89458ae18ff0fba652c1ba926a59201b5d2ab Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 07:53:27 +0200 Subject: [PATCH 3/8] test --- 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 21ae2338c..0c7350006 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1469,7 +1469,7 @@ void komodo_args() if ( (baseid= komodo_baseid(ASSETCHAINS_SYMBOL)) >= 0 && baseid < 32 ) MAX_MONEY = komodo_maxallowed(baseid); else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN; - printf("MAX_MONEY.%s %.8f\n",(double)MAX_MONEY/SATOSHIDEN); + printf("MAX_MONEY.%s %.8f\n",ASSETCHAINS_SYMBOL,(double)MAX_MONEY/SATOSHIDEN); addn = GetArg("-seednode",""); if ( strlen(addn.c_str()) > 0 ) ASSETCHAINS_SEED = 1; From 7aab5c70861cf3b0fe77d3dd9bb242d080182b76 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 07:57:14 +0200 Subject: [PATCH 4/8] test --- src/bitcoin-cli.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index bf9ce3422..e000776e6 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -15,6 +15,7 @@ using namespace std; using namespace json_spirit; int64_t MAX_MONEY = 200000000 * 100000000LL; +uint64_t komodo_maxallowed(int32_t baseid) { return(100000000LL * 1000000); } // stub std::string HelpMessageCli() { From 4e5442b54d8b8ae0a3c49834e3878adf942fafa4 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 08:01:55 +0200 Subject: [PATCH 5/8] test --- src/komodo_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 0c7350006..f5920cd60 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1466,14 +1466,14 @@ void komodo_args() if ( name.c_str()[0] != 0 ) { ASSETCHAINS_SUPPLY = GetArg("-ac_supply",10); - if ( (baseid= komodo_baseid(ASSETCHAINS_SYMBOL)) >= 0 && baseid < 32 ) - MAX_MONEY = komodo_maxallowed(baseid); - else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN; - printf("MAX_MONEY.%s %.8f\n",ASSETCHAINS_SYMBOL,(double)MAX_MONEY/SATOSHIDEN); addn = GetArg("-seednode",""); if ( strlen(addn.c_str()) > 0 ) ASSETCHAINS_SEED = 1; strncpy(ASSETCHAINS_SYMBOL,name.c_str(),sizeof(ASSETCHAINS_SYMBOL)-1); + if ( (baseid= komodo_baseid(ASSETCHAINS_SYMBOL)) >= 0 && baseid < 32 ) + MAX_MONEY = komodo_maxallowed(baseid); + else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN; + printf("baseid.%d MAX_MONEY.%s %.8f\n",baseid,ASSETCHAINS_SYMBOL,(double)MAX_MONEY/SATOSHIDEN); ASSETCHAINS_PORT = komodo_port(ASSETCHAINS_SYMBOL,ASSETCHAINS_SUPPLY,&ASSETCHAINS_MAGIC); while ( (dirname= (char *)GetDataDir(false).string().c_str()) == 0 || dirname[0] == 0 ) { From 0a31d0158ae563fa129b2d5b0cd1fdfc21d03d79 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 08:05:18 +0200 Subject: [PATCH 6/8] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 10b07cd46..75b4d8ce7 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -768,7 +768,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 } } else if ( kmdheight > 91800 && strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) - printf("pax %s deposit %.8f rejected kmdheight.%d %.8f KMD\n",base,dstr(fiatoshis),kmdheight,dstr(value)); + printf("pax %s deposit %.8f rejected kmdheight.%d %.8f KMD check %.8f seed.%llu\n",base,dstr(fiatoshis),kmdheight,dstr(value),dstr(checktoshis),(long long)seed); } } } From f27b48a3aa4e4ac1745c7adbfbcf12c9024ad441 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 08:07:45 +0200 Subject: [PATCH 7/8] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 75b4d8ce7..f6795661e 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -767,7 +767,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 } } } - else if ( kmdheight > 91800 && strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) + else if ( seed != 0 && kmdheight > 91800 && strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) printf("pax %s deposit %.8f rejected kmdheight.%d %.8f KMD check %.8f seed.%llu\n",base,dstr(fiatoshis),kmdheight,dstr(value),dstr(checktoshis),(long long)seed); } } From 9cdcf7ab47cf2900a823d0ac2db099a88882251e Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Jan 2017 08:08:01 +0200 Subject: [PATCH 8/8] test --- 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 f5920cd60..62d26d75b 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1473,7 +1473,7 @@ void komodo_args() if ( (baseid= komodo_baseid(ASSETCHAINS_SYMBOL)) >= 0 && baseid < 32 ) MAX_MONEY = komodo_maxallowed(baseid); else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN; - printf("baseid.%d MAX_MONEY.%s %.8f\n",baseid,ASSETCHAINS_SYMBOL,(double)MAX_MONEY/SATOSHIDEN); + //printf("baseid.%d MAX_MONEY.%s %.8f\n",baseid,ASSETCHAINS_SYMBOL,(double)MAX_MONEY/SATOSHIDEN); ASSETCHAINS_PORT = komodo_port(ASSETCHAINS_SYMBOL,ASSETCHAINS_SUPPLY,&ASSETCHAINS_MAGIC); while ( (dirname= (char *)GetDataDir(false).string().c_str()) == 0 || dirname[0] == 0 ) {