From ec1171ab6809d2cad1973b268dd15d7e027c791e Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 07:56:44 +0200 Subject: [PATCH 01/17] relax asset chain RT check --- 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 27af234cb..0c9d8d47c 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1006,7 +1006,7 @@ void komodo_passport_iteration() if ( fread(buf,1,sizeof(buf),fp) == sizeof(buf) ) { sp->CURRENT_HEIGHT = buf[0]; - if ( buf[0] != 0 && buf[0] >= buf[1] && buf[2] > time(NULL)-60 ) + if ( buf[0] != 0 && buf[0] >= buf[1] && buf[2] > time(NULL)-600 ) { isrealtime = 1; RTmask |= (1LL << baseid); From 43d45898951c32d1a03501e700ad967ee0086a78 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 07:57:41 +0200 Subject: [PATCH 02/17] test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 0c9d8d47c..4ca6fb5ae 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1006,12 +1006,12 @@ void komodo_passport_iteration() if ( fread(buf,1,sizeof(buf),fp) == sizeof(buf) ) { sp->CURRENT_HEIGHT = buf[0]; - if ( buf[0] != 0 && buf[0] >= buf[1] && buf[2] > time(NULL)-600 ) + if ( buf[0] != 0 && buf[0] >= buf[1] && buf[2] > time(NULL)-300 ) { isrealtime = 1; RTmask |= (1LL << baseid); memcpy(refsp->RTbufs[baseid+1],buf,sizeof(refsp->RTbufs[baseid+1])); - } else fprintf(stderr,"%s not RT %u %u %d\n",base,buf[0],buf[1],(int32_t)(time(NULL)-buf[2])); + } else fprintf(stderr,"[%s]: %s not RT %u %u %d\n",ASSETCHAINS_SYMBOL,base,buf[0],buf[1],(int32_t)(time(NULL)-buf[2])); } //else fprintf(stderr,"%s size error RT\n",base); fclose(fp); } //else fprintf(stderr,"%s open error RT\n",base); From 35695eda74f69f1407063deb8dda8a5af14b615b Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 14:52:08 +0200 Subject: [PATCH 03/17] test --- src/komodo_gateway.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 4ca6fb5ae..63a058d09 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -209,8 +209,16 @@ int32_t komodo_issued_opreturn(char *base,uint256 *txids,uint16_t *vouts,int64_t { txids[n] = p.txid; vouts[n] = p.vout; - values[n] = (strcmp("KMD",base) == 0) ? p.komodoshis : p.fiatoshis; - srcvalues[n] = (strcmp("KMD",base) == 0) ? p.fiatoshis : p.komodoshis; + if ( iskomodo == 1 ) + { + values[n] = p.komodoshis; + srcvalues[n] = p.fiatoshis; + } + else + { + values[n] = p.fiatoshis; + srcvalues[n] = p.komodoshis; + } kmdheights[n] = p.height; otherheights[n] = p.otherheight; memcpy(&rmd160s[n * 20],p.rmd160,20); @@ -912,7 +920,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 else if ( opretbuf[0] == 'X' ) { tokomodo = 1; - if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,1)) > 0 ) + if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,2)) > 0 ) { for (i=0; i Date: Fri, 30 Dec 2016 14:53:31 +0200 Subject: [PATCH 04/17] test --- src/komodo_gateway.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 63a058d09..48aff712e 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -626,7 +626,13 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above { printf(">>>>>>>>>>> %c errs.%d i.%d match %.8f vs %.8f pax.%p\n",opcode,errs,i,dstr(opcode == 'I' ? pax->fiatoshis : pax->komodoshis),dstr(block.vtx[0].vout[i].nValue),pax); errs++; - } else matched++; + } + else + { + if ( opcode == 'X' ) + printf("check deposit validates %s %.8f -> %.8f\n",CURRENCIES[baseids[i]],dstr(srcvalues[i]),dstr(values[i])); + matched++; + } } else { From 387e3c58c0b631f8824c9e5b14cf6b71805069ad Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 14:57:24 +0200 Subject: [PATCH 05/17] 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 48aff712e..6a5d2f98a 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -209,7 +209,7 @@ int32_t komodo_issued_opreturn(char *base,uint256 *txids,uint16_t *vouts,int64_t { txids[n] = p.txid; vouts[n] = p.vout; - if ( iskomodo == 1 ) + if ( iskomodo != 0 ) { values[n] = p.komodoshis; srcvalues[n] = p.fiatoshis; From c65d08684897ab67276a63b3c5acc4f7d3804d06 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 15:00:10 +0200 Subject: [PATCH 06/17] test --- src/komodo_gateway.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 6a5d2f98a..c9d2a5eb1 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -209,16 +209,8 @@ int32_t komodo_issued_opreturn(char *base,uint256 *txids,uint16_t *vouts,int64_t { txids[n] = p.txid; vouts[n] = p.vout; - if ( iskomodo != 0 ) - { - values[n] = p.komodoshis; - srcvalues[n] = p.fiatoshis; - } - else - { - values[n] = p.fiatoshis; - srcvalues[n] = p.komodoshis; - } + values[n] = (strcmp("KMD",base) == 0) ? p.komodoshis : p.fiatoshis; + srcvalues[n] = (strcmp("KMD",base) == 0) ? p.fiatoshis : p.komodoshis; kmdheights[n] = p.height; otherheights[n] = p.otherheight; memcpy(&rmd160s[n * 20],p.rmd160,20); @@ -926,7 +918,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 else if ( opretbuf[0] == 'X' ) { tokomodo = 1; - if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,2)) > 0 ) + if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,1)) > 0 ) { for (i=0; i Date: Fri, 30 Dec 2016 15:05:12 +0200 Subject: [PATCH 07/17] test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index c9d2a5eb1..f6b87b12d 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -881,7 +881,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 pax2->approved = kmdheights[i]; komodo_paxmark(height,txids[i],vouts[i],'W',height); //komodo_paxmark(height,txids[i],vouts[i],'A',height); - if ( srcvalues[i] != 0 && (basesp= komodo_stateptrget(CURRENCIES[baseids[i]])) != 0 ) + if ( values[i] != 0 && (basesp= komodo_stateptrget(CURRENCIES[baseids[i]])) != 0 ) { basesp->approved += values[i]; didstats = 1; @@ -937,7 +937,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 basesp->redeemed += srcvalues[i]; pax->didstats = 1; //if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) - printf("########### %p redeemed %s += %.8f\n",basesp,CURRENCIES[baseids[i]],dstr(srcvalues[i])); + printf("########### %p redeemed %s += %.8f kht.%d ht.%d\n",basesp,CURRENCIES[baseids[i]],dstr(srcvalues[i]),kmdheights[i],otherheights[i]); } } if ( (pax= komodo_paxmark(height,txids[i],vouts[i],'W',height)) != 0 ) From bd737014954ccd88e631bef5c59426d321f7588c Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 15:11:35 +0200 Subject: [PATCH 08/17] 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 f6b87b12d..95ba979df 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -937,7 +937,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 basesp->redeemed += srcvalues[i]; pax->didstats = 1; //if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) - printf("########### %p redeemed %s += %.8f kht.%d ht.%d\n",basesp,CURRENCIES[baseids[i]],dstr(srcvalues[i]),kmdheights[i],otherheights[i]); + printf("ht.%d %.8f ########### %p redeemed %s += %.8f kht.%d ht.%d\n",height,dstr(value),basesp,CURRENCIES[baseids[i]],dstr(srcvalues[i]),kmdheights[i],otherheights[i]); } } if ( (pax= komodo_paxmark(height,txids[i],vouts[i],'W',height)) != 0 ) From 2ee39faeaa01b7ab8eedf8af2035234aff24a40b Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 15:18:43 +0200 Subject: [PATCH 09/17] test --- src/komodo_gateway.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 95ba979df..abea4a949 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -932,12 +932,15 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( (pax= komodo_paxfind(txids[i],vouts[i],'X')) != 0 ) { pax->type = opretbuf[0]; - if ( baseids[i] >= 0 && srcvalues[i] != 0 && (basesp= komodo_stateptrget(CURRENCIES[baseids[i]])) != 0 ) + if ( height < 121842 ) + value = srcvalues[i]; + else value = values[i]; + if ( baseids[i] >= 0 && value != 0 && (basesp= komodo_stateptrget(CURRENCIES[baseids[i]])) != 0 ) { - basesp->redeemed += srcvalues[i]; + basesp->redeemed += value; pax->didstats = 1; //if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) - printf("ht.%d %.8f ########### %p redeemed %s += %.8f kht.%d ht.%d\n",height,dstr(value),basesp,CURRENCIES[baseids[i]],dstr(srcvalues[i]),kmdheights[i],otherheights[i]); + printf("ht.%d %.8f ########### %p redeemed %s += %.8f kht.%d ht.%d\n",height,dstr(value),basesp,CURRENCIES[baseids[i]],dstr(value),kmdheights[i],otherheights[i]); } } if ( (pax= komodo_paxmark(height,txids[i],vouts[i],'W',height)) != 0 ) From 6276f75559ef96f66137bc42fef858d752de6353 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 15:21:47 +0200 Subject: [PATCH 10/17] test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index abea4a949..015f2689c 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -867,7 +867,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 didstats = 0; seed = 0; checktoshis = komodo_paxprice(&seed,kmdheights[i],CURRENCIES[baseids[i]],(char *)"KMD",(uint64_t)values[i]); - //printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f vs %.8f\n",kmdheights[i],CURRENCIES[baseids[i]],(double)values[i]/COIN,(double)srcvalues[i]/COIN,(double)checktoshis/COIN); + printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f vs %.8f\n",kmdheights[i],CURRENCIES[baseids[i]],(double)values[i]/COIN,(double)srcvalues[i]/COIN,(double)checktoshis/COIN); if ( srcvalues[i] == checktoshis ) { if ( (pax= komodo_paxfind(txids[i],vouts[i],'A')) == 0 ) @@ -932,7 +932,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( (pax= komodo_paxfind(txids[i],vouts[i],'X')) != 0 ) { pax->type = opretbuf[0]; - if ( height < 121842 ) + if ( height < 121842 ) // fields got switched around due to legacy issues and approves value = srcvalues[i]; else value = values[i]; if ( baseids[i] >= 0 && value != 0 && (basesp= komodo_stateptrget(CURRENCIES[baseids[i]])) != 0 ) From 2b9a57d7373e322fa1a8efa54bc599903d53b342 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 15:25:00 +0200 Subject: [PATCH 11/17] test --- src/komodo_gateway.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 015f2689c..c3d096dc2 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -856,9 +856,9 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 { for (i=0; i Date: Fri, 30 Dec 2016 15:29:17 +0200 Subject: [PATCH 12/17] test --- src/komodo_gateway.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index c3d096dc2..d3dd38c33 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -862,7 +862,13 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( baseids[i] < 0 ) { //printf("baseids[%d] %d\n",i,baseids[i]); - continue; + if ( (pax= komodo_paxfind(txids[i],vouts[i],'W')) != 0 ) + { + baseids[i] = komodo_baseid(pax->symbol); + printf("override neg1 with (%s)\n",pax->symbol); + } + if ( baseids[i] < 0 ) + continue; } didstats = 0; seed = 0; From afdb28f33e0b9a014e7aa02f02bccdd166447f5e Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 15:34:29 +0200 Subject: [PATCH 13/17] test --- src/komodo_gateway.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index d3dd38c33..e0f49ddd7 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -861,8 +861,11 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 printf(" v%d %.8f %.8f k.%d ht.%d base.%d\n",vouts[i],dstr(values[i]),dstr(srcvalues[i]),kmdheights[i],otherheights[i],baseids[i]); if ( baseids[i] < 0 ) { + for (i=0; isymbol); printf("override neg1 with (%s)\n",pax->symbol); From 085c4ee47ae662b42fd4cb22519fac28e2159ef5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 15:45:45 +0200 Subject: [PATCH 14/17] test --- src/assetchains | 86 ++++++++++++++++++++++---------------------- src/komodo_gateway.h | 1 + 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/assetchains b/src/assetchains index 10129742e..16f3004d5 100755 --- a/src/assetchains +++ b/src/assetchains @@ -3,48 +3,48 @@ set -x source pubkey.txt echo $pubkey -./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=SUPERNET -ac_supply=816061 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=999999 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=999999 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=JUMBLR -ac_supply=999999 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=999999 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=9999999 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=SHARK -ac_supply=1401 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=999999 -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=MGW -ac_supply=999999 -addnode=78.47.196.146 $1 & +./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=SUPERNET -ac_supply=816061 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=JUMBLR -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=9999999 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=SHARK -ac_supply=1401 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=MGW -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1 & -./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1 & +./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1 -gen & diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index e0f49ddd7..98352a9d1 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -191,6 +191,7 @@ int32_t komodo_issued_opreturn(char *base,uint256 *txids,uint16_t *vouts,int64_t if ( KOMODO_PAX == 0 ) return(0); incr = 34 + (iskomodo * (2*sizeof(fiatoshis) + 2*sizeof(height) + 20)); + //41e77b91cb68dc2aa02fa88550eae6b6d44db676a7e935337b6d1392d9718f03cb0200305c90660400000000fbcbeb1f000000bde801006201000058e7945ad08ddba1eac9c9b6c8e1e97e8016a2d152 //for (i=0; i Date: Fri, 30 Dec 2016 15:51:02 +0200 Subject: [PATCH 15/17] test --- src/komodo_gateway.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 98352a9d1..8cadc891b 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -814,7 +814,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 bitcoin_address(coinaddr,addrtype,rmd160,20); checktoshis = PAX_fiatdest(&seed,tokomodo,destaddr,pubkey33,coinaddr,kmdheight,base,value); typestr = "withdraw"; - if ( strcmp(base,"RUB") == 0 ) + if ( 0 && strcmp(base,"RUB") == 0 ) printf("RUB WITHDRAW %s.height.%d vs height.%d check %.8f/%.8f vs %.8f tokomodo.%d %d seed.%llx -> (%s) len.%d\n",ASSETCHAINS_SYMBOL,kmdheight,height,dstr(checktoshis),dstr(komodoshis),dstr(value),komodo_is_issuer(),strncmp(ASSETCHAINS_SYMBOL,base,strlen(base)) == 0,(long long)seed,coinaddr,opretlen); didstats = 0; //if ( komodo_paxcmp(base,kmdheight,komodoshis,checktoshis,seed) == 0 ) @@ -857,9 +857,9 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 { for (i=0; i KMD %.8f vs %.8f\n",kmdheights[i],CURRENCIES[baseids[i]],(double)values[i]/COIN,(double)srcvalues[i]/COIN,(double)checktoshis/COIN); + //printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f vs %.8f\n",kmdheights[i],CURRENCIES[baseids[i]],(double)values[i]/COIN,(double)srcvalues[i]/COIN,(double)checktoshis/COIN); if ( srcvalues[i] == checktoshis ) { if ( (pax= komodo_paxfind(txids[i],vouts[i],'A')) == 0 ) @@ -895,8 +895,8 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 { basesp->approved += values[i]; didstats = 1; - //if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) - printf("pax.%p ########### %p approved %s += %.8f -> %.8f/%.8f kht.%d %d\n",pax,basesp,CURRENCIES[baseids[i]],dstr(values[i]),dstr(srcvalues[i]),dstr(checktoshis),kmdheights[i],otherheights[i]); + if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) + printf("pax.%p ########### %p approved %s += %.8f -> %.8f/%.8f kht.%d %d\n",pax,basesp,CURRENCIES[baseids[i]],dstr(values[i]),dstr(srcvalues[i]),dstr(checktoshis),kmdheights[i],otherheights[i]); } //printf(" i.%d (%s) <- %.8f ADDFLAG APPROVED\n",i,coinaddr,dstr(values[i])); } @@ -906,8 +906,8 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 { basesp->approved += values[i]; didstats = 1; - //if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) - printf("pax.%p ########### %p approved %s += %.8f -> %.8f/%.8f\n",pax,basesp,CURRENCIES[baseids[i]],dstr(values[i]),dstr(srcvalues[i]),dstr(checktoshis)); + if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) + printf("pax.%p ########### %p approved %s += %.8f -> %.8f/%.8f\n",pax,basesp,CURRENCIES[baseids[i]],dstr(values[i]),dstr(srcvalues[i]),dstr(checktoshis)); } } //else printf(" i.%d of n.%d pax.%p baseids[] %d\n",i,n,pax,baseids[i]); if ( (pax= komodo_paxfind(txids[i],vouts[i],'A')) != 0 ) From e62f71143ab4a81522a8afd4640a757d42d7bd53 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Dec 2016 16:58:49 +0200 Subject: [PATCH 16/17] 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 8cadc891b..ea3481aae 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -950,7 +950,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 basesp->redeemed += value; pax->didstats = 1; //if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) - printf("ht.%d %.8f ########### %p redeemed %s += %.8f kht.%d ht.%d\n",height,dstr(value),basesp,CURRENCIES[baseids[i]],dstr(value),kmdheights[i],otherheights[i]); + printf("ht.%d %.8f ########### %p redeemed %s += %.8f %.8f kht.%d ht.%d\n",height,dstr(value),basesp,CURRENCIES[baseids[i]],dstr(value),dstr(srcvalues[i]),kmdheights[i],otherheights[i]); } } if ( (pax= komodo_paxmark(height,txids[i],vouts[i],'W',height)) != 0 ) From 26ac06c4f5a6b4dc3163b36a1e5d24bfa7eccbd2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 1 Jan 2017 15:40:42 +0200 Subject: [PATCH 17/17] need to delay issuing fiat chain coins so it will have the deposit event in time and not reject --- src/komodo.h | 2 +- src/komodo_gateway.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 8e84a6e02..207e38808 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -23,7 +23,7 @@ // a. automate notarization fee payouts // b. automated distribution of test REVS snapshot -//#define KOMODO_ASSETCHAINS_WAITNOTARIZE +#define KOMODO_ASSETCHAINS_WAITNOTARIZE #define KOMODO_PAXMAX (10000 * COIN) #include diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ea3481aae..b944f861e 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -476,7 +476,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to { { #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE - if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) // assumes same chain as notarize + if ( kmdsp != 0 && (kmdsp->NOTARIZED_HEIGHT >= pax->height || kmdsp->CURRENT_HEIGHT > pax->height+30) ) // assumes same chain as notarize pax->validated = pax->komodoshis; //kmdsp->NOTARIZED_HEIGHT; else pax->validated = pax->ready = 0; #endif