From 9aba95eb1d0ca3f6bf5bb9203f68f7a1647574df Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 9 Jun 2019 22:12:54 -1100 Subject: [PATCH 1/6] Asset chains dust --- src/cc/dapps/zmigrate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 056d2c402..6e5cffba1 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -315,6 +315,8 @@ cJSON *get_komodocli(char *refcoin,char **retstrp,char *acname,char *method,char { long fsize; cJSON *retjson = 0; char cmdstr[32768],*jsonstr,fname[256]; sprintf(fname,"/tmp/zmigrate.%s",method); + if ( (acname == 0 || acname[0] == 0) && strcmp(refcoin,"KMD") != 0 ) + acname = refcoin; if ( acname[0] != 0 ) { if ( refcoin[0] != 0 && strcmp(refcoin,"KMD") != 0 ) @@ -1328,7 +1330,7 @@ int32_t main(int32_t argc,char **argv) } printf("total disputed %.8f\n",dstr(totaldisputed)); totaldisputed2 = 0; - if ( (retjson= get_listunspent(coinstr,"")) != 0 ) + if ( strcmp(coinstr,"KMD") == 0 && (retjson= get_listunspent(coinstr,"")) != 0 ) { if ( (n= cJSON_GetArraySize(retjson)) > 0 ) { From 4993e1c4778d85b1cb0cba674a905c4d89f3d74b Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 10 Jun 2019 00:06:04 -1100 Subject: [PATCH 2/6] +pritns --- src/cc/dapps/zmigrate.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 6e5cffba1..0d1dcd5b7 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -1246,7 +1246,7 @@ int64_t sum_of_vins(char *refcoin,int32_t *totalvinsp,int32_t *uniqaddrsp,bits25 { if ( update_addrstats(srcaddr,amount) < 0 ) (*uniqaddrsp)++; - //printf("add %s <- %.8f\n",srcaddr,dstr(amount)); + printf("add %s <- %.8f\n",srcaddr,dstr(amount)); total += amount; (*totalvinsp)++; } @@ -1391,6 +1391,7 @@ int32_t main(int32_t argc,char **argv) } else if ( (retjson= get_listunspent(coinstr,"")) != 0 ) { + printf("unspents.(%s)\n",jprint(retjson,0)); if ( (n= cJSON_GetArraySize(retjson)) > 0 ) { for (i=0; i= 7 ) - { - numsmall++; - smallpayout += payout; + //if ( payout >= 7 ) + //{ + // numsmall++; + //smallpayout += payout; genpayout(coinstr,ADDRESSES[i].addr,payout); - } + //} //printf("%-4d: %-64s numutxos.%-4lld %llu\n",i,ADDRESSES[i].addr,ADDRESSES[i].numutxos,(long long)payout); } } From 553f53f11f972ada1f55fc8a88ba3f29ec63ec23 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 10 Jun 2019 00:11:59 -1100 Subject: [PATCH 3/6] +prints --- src/cc/dapps/zmigrate.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 0d1dcd5b7..9880cd437 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -331,6 +331,7 @@ cJSON *get_komodocli(char *refcoin,char **retstrp,char *acname,char *method,char //printf("ref.(%s) REFCOIN_CLI (%s)\n",refcoin,cmdstr); } system(cmdstr); + printf("cmdstr(%s)\n",cmdstr); *retstrp = 0; if ( (jsonstr= filestr(&fsize,fname)) != 0 ) { @@ -1299,7 +1300,7 @@ void reconcile_claims(char *fname) int32_t main(int32_t argc,char **argv) { - char *coinstr,*addr,buf[64],srcaddr[64],str[65]; cJSON *retjson,*item; int32_t i,n,disputed,numdisputed,numsmall=0,numpayouts=0,numclaims=0,num=0,totalvins=0,uniqaddrs=0; int64_t amount,total = 0,total2 = 0,payout,maxpayout,smallpayout=0,totalpayout = 0,totaldisputed = 0,totaldisputed2 = 0,fundingamount = 0; + char *coinstr,*acstr,*addr,buf[64],srcaddr[64],str[65]; cJSON *retjson,*item; int32_t i,n,disputed,numdisputed,numsmall=0,numpayouts=0,numclaims=0,num=0,totalvins=0,uniqaddrs=0; int64_t amount,total = 0,total2 = 0,payout,maxpayout,smallpayout=0,totalpayout = 0,totaldisputed = 0,totaldisputed2 = 0,fundingamount = 0; if ( argc != 2 ) { printf("argc needs to be 2: coin\n"); @@ -1309,12 +1310,14 @@ int32_t main(int32_t argc,char **argv) { REFCOIN_CLI = "./komodo-cli"; coinstr = clonestr("KMD"); + acstr = ""; } else { sprintf(buf,"./komodo-cli -ac_name=%s",argv[1]); REFCOIN_CLI = clonestr(buf); coinstr = clonestr(argv[1]); + acstr = coinstr; } if ( 1 ) { @@ -1330,7 +1333,7 @@ int32_t main(int32_t argc,char **argv) } printf("total disputed %.8f\n",dstr(totaldisputed)); totaldisputed2 = 0; - if ( strcmp(coinstr,"KMD") == 0 && (retjson= get_listunspent(coinstr,"")) != 0 ) + if ( strcmp(coinstr,"KMD") == 0 && (retjson= get_listunspent(coinstr,acstr)) != 0 ) { if ( (n= cJSON_GetArraySize(retjson)) > 0 ) { @@ -1389,7 +1392,7 @@ int32_t main(int32_t argc,char **argv) scan_claims(0,coinstr,2); //scan_claims(0,coinstr,3); } - else if ( (retjson= get_listunspent(coinstr,"")) != 0 ) + else if ( (retjson= get_listunspent(coinstr,acstr)) != 0 ) { printf("unspents.(%s)\n",jprint(retjson,0)); if ( (n= cJSON_GetArraySize(retjson)) > 0 ) From 5197c502e92696bc488161fdfa53f52b5ec4f3a6 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 10 Jun 2019 00:13:50 -1100 Subject: [PATCH 4/6] Fix ac --- src/cc/dapps/zmigrate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 9880cd437..4f5efc5ac 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -331,7 +331,6 @@ cJSON *get_komodocli(char *refcoin,char **retstrp,char *acname,char *method,char //printf("ref.(%s) REFCOIN_CLI (%s)\n",refcoin,cmdstr); } system(cmdstr); - printf("cmdstr(%s)\n",cmdstr); *retstrp = 0; if ( (jsonstr= filestr(&fsize,fname)) != 0 ) { @@ -1319,7 +1318,7 @@ int32_t main(int32_t argc,char **argv) coinstr = clonestr(argv[1]); acstr = coinstr; } - if ( 1 ) + if ( strcmp(coinstr,"KMD") == 0 ) { sprintf(buf,"%s-Claims.csv",coinstr); reconcile_claims(buf); @@ -1333,7 +1332,7 @@ int32_t main(int32_t argc,char **argv) } printf("total disputed %.8f\n",dstr(totaldisputed)); totaldisputed2 = 0; - if ( strcmp(coinstr,"KMD") == 0 && (retjson= get_listunspent(coinstr,acstr)) != 0 ) + if ( (retjson= get_listunspent(coinstr,acstr)) != 0 ) { if ( (n= cJSON_GetArraySize(retjson)) > 0 ) { From eb99b6f6623a00d1c4ad94355b2db22110cf602a Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 10 Jun 2019 00:14:48 -1100 Subject: [PATCH 5/6] -print --- src/cc/dapps/zmigrate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cc/dapps/zmigrate.c b/src/cc/dapps/zmigrate.c index 4f5efc5ac..aaad17a39 100644 --- a/src/cc/dapps/zmigrate.c +++ b/src/cc/dapps/zmigrate.c @@ -315,8 +315,8 @@ cJSON *get_komodocli(char *refcoin,char **retstrp,char *acname,char *method,char { long fsize; cJSON *retjson = 0; char cmdstr[32768],*jsonstr,fname[256]; sprintf(fname,"/tmp/zmigrate.%s",method); - if ( (acname == 0 || acname[0] == 0) && strcmp(refcoin,"KMD") != 0 ) - acname = refcoin; + //if ( (acname == 0 || acname[0] == 0) && strcmp(refcoin,"KMD") != 0 ) + // acname = refcoin; if ( acname[0] != 0 ) { if ( refcoin[0] != 0 && strcmp(refcoin,"KMD") != 0 ) @@ -1393,7 +1393,6 @@ int32_t main(int32_t argc,char **argv) } else if ( (retjson= get_listunspent(coinstr,acstr)) != 0 ) { - printf("unspents.(%s)\n",jprint(retjson,0)); if ( (n= cJSON_GetArraySize(retjson)) > 0 ) { for (i=0; i Date: Mon, 10 Jun 2019 23:32:12 +0300 Subject: [PATCH 6/6] dev --- src/komodo_defs.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/komodo_defs.h b/src/komodo_defs.h index 778b8c101..f30b24481 100644 --- a/src/komodo_defs.h +++ b/src/komodo_defs.h @@ -201,20 +201,20 @@ static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] = {"cryptoeconomy_EU", "0290ab4937e85246e048552df3e9a66cba2c1602db76e03763e16c671e750145d1" }, {"etszombi_EU", "0293ea48d8841af7a419a24d9da11c34b39127ef041f847651bae6ab14dcd1f6b4" }, // 20 {"karasugoi_NA", "02a348b03b9c1a8eac1b56f85c402b041c9bce918833f2ea16d13452309052a982" }, - {"pirate_AR", "02a5e865af771eee0c6bd3bd238f01f5eb589907ba52efa9f37e5102375c8eb7a0" }, + {"pirate_AR", "03e29c90354815a750db8ea9cb3c1b9550911bb205f83d0355a061ac47c4cf2fde" }, {"metaphilibert_AR", "02adad675fae12b25fdd0f57250b0caf7f795c43f346153a31fe3e72e7db1d6ac6" }, {"zatjum_SH", "02d6b0c89cacd58a0af038139a9a90c9e02cd1e33803a1f15fceabea1f7e9c263a" }, {"madmax_AR", "03c5941fe49d673c094bc8e9bb1a95766b4670c88be76d576e915daf2c30a454d3" }, {"lukechilds_NA", "03f1051e62c2d280212481c62fe52aab0a5b23c95de5b8e9ad5f80d8af4277a64b" }, {"cipi_AR", "02c4f89a5b382750836cb787880d30e23502265054e1c327a5bfce67116d757ce8" }, {"tonyl_AR", "02cc8bc862f2b65ad4f99d5f68d3011c138bf517acdc8d4261166b0be8f64189e1" }, - {"infotech_DEV", "02d7d63ac441dbcd5535bcad741701519c190e89e17e4180aa0f61fdda0b6195ea" }, + {"infotech_DEV", "0345ad4ab5254782479f6322c369cec77a7535d2f2162d103d666917d5e4f30c4c" }, {"fullmoon_NA", "032c716701fe3a6a3f90a97b9d874a9d6eedb066419209eed7060b0cc6b710c60b" }, // 30 {"etszombi_AR", "02e55e104aa94f70cde68165d7df3e162d4410c76afd4643b161dea044aa6d06ce" }, - {"node-9_EU", "02e90f0528f8fd7d2b7f28d53ed7368cc4b1dfc5814c70c486c533862ee05e37dc" }, + {"node-9_EU", "0372e5b51e86e2392bb15039bac0c8f975b852b45028a5e43b324c294e9f12e411" }, {"phba2061_EU", "03f6bd15dba7e986f0c976ea19d8a9093cb7c989d499f1708a0386c5c5659e6c4e" }, {"indenodes_AR", "02ec0fa5a40f47fd4a38ea5c89e375ad0b6ddf4807c99733c9c3dc15fb978ee147" }, - {"and1-89_EU", "02f2af778c62888cfb106c0ef5c89cefe012ef3e6abed3ef28425092637d7ae3cc" }, + {"and1-89_EU", "02736cbf8d7b50835afd50a319f162dd4beffe65f2b1dc6b90e64b32c8e7849ddd" }, {"komodopioneers_SH", "032a238a5747777da7e819cfa3c859f3677a2daf14e4dce50916fc65d00ad9c52a" }, {"komodopioneers_EU", "036d02425916444fff8cc7203fcbfc155c956dda5ceb647505836bef59885b6866" }, {"d0ct0r_NA", "0303725d8525b6f969122faf04152653eb4bf34e10de92182263321769c334bf58" }, @@ -224,7 +224,7 @@ static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] = {"webworker01_NA", "032735e9cad1bb00eaababfa6d27864fa4c1db0300c85e01e52176be2ca6a243ce" }, {"pbca26_NA", "03a97606153d52338bcffd1bf19bb69ef8ce5a7cbdc2dbc3ff4f89d91ea6bbb4dc" }, {"indenodes_SH", "0334e6e1ec8285c4b85bd6dae67e17d67d1f20e7328efad17ce6fd24ae97cdd65e" }, - {"pirate_NA", "033c8cef71f704f357c9ac1aeaafde3acd7bbfd0a09494e5e129ee0999fb2bc368" }, + {"pirate_NA", "0255e32d8a56671dee8aa7f717debb00efa7f0086ee802de0692f2d67ee3ee06ee" }, {"lukechilds_AR", "025c6a73ff6d750b9ddf6755b390948cffdd00f344a639472d398dd5c6b4735d23" }, {"dragonhound_NA", "0224a9d951d3a06d8e941cc7362b788bb1237bb0d56cc313e797eb027f37c2d375" }, {"fullmoon_AR", "03da64dd7cd0db4c123c2f79d548a96095a5a103e5b9d956e9832865818ffa7872" }, @@ -233,7 +233,7 @@ static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] = {"jeezy_EU", "037f182facbad35684a6e960699f5da4ba89e99f0d0d62a87e8400dd086c8e5dd7" }, {"titomane_SH", "03850fdddf2413b51790daf51dd30823addb37313c8854b508ea6228205047ef9b" }, {"alien_AR", "03911a60395801082194b6834244fa78a3c30ff3e888667498e157b4aa80b0a65f" }, - {"pirate_EU", "03986339bebe3891e369a528356a220bc17a5bef3d337edfcf0114e66e6b1c120f" }, + {"pirate_EU", "03fff24efd5648870a23badf46e26510e96d9e79ce281b27cfe963993039dd1351" }, {"thegaltmines_NA", "02db1a16c7043f45d6033ccfbd0a51c2d789b32db428902f98b9e155cf0d7910ed" }, {"computergenie_NA", "03a78ae070a5e9e935112cf7ea8293f18950f1011694ea0260799e8762c8a6f0a4" }, {"nutellalicka_SH", "02f7d90d0510c598ce45915e6372a9cd0ba72664cb65ce231f25d526fc3c5479fc" },