From 5b489b55b802a6569a6789bcf6e9f88a4b599a45 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:11:27 +0200 Subject: [PATCH 1/5] 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 b9276a102..7c314acef 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -811,8 +811,8 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 { basesp->withdrawn += value; didstats = 1; - if ( strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) - printf("########### %p withdrawn %s += %.8f\n",basesp,base,dstr(value)); + //if ( strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) + printf("########### %p withdrawn %s += %.8f check %.8f\n",basesp,base,dstr(value),dstr(checktoshis)); } if ( 0 && strcmp(base,"RUB") == 0 && (pax == 0 || pax->approved == 0) ) printf("notarize %s %.8f -> %.8f kmd.%d other.%d\n",ASSETCHAINS_SYMBOL,dstr(value),dstr(komodoshis),kmdheight,height); From 2405bc66fdfa0d5b32931ad12a29ef79d7b6d4ea Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:14:53 +0200 Subject: [PATCH 2/5] test --- src/komodo_gateway.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 7c314acef..372ba5e94 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -319,8 +319,8 @@ uint64_t komodo_paxtotal() else if ( pax->validated == 0 ) { pax->validated = pax->komodoshis = checktoshis; - if ( strcmp(str,ASSETCHAINS_SYMBOL) == 0 ) - printf("got WITHDRAW.%s kmd.%d ht.%d %.8f -> %.8f/%.8f\n",pax->source,pax->height,pax->otherheight,dstr(pax->fiatoshis),dstr(pax->komodoshis),dstr(checktoshis)); + //if ( strcmp(str,ASSETCHAINS_SYMBOL) == 0 ) + printf("%p got WITHDRAW.%s kmd.%d ht.%d %.8f -> %.8f/%.8f\n",pax,pax->source,pax->height,pax->otherheight,dstr(pax->fiatoshis),dstr(pax->komodoshis),dstr(checktoshis)); } } } @@ -800,7 +800,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 ( 0 && strcmp(base,"RUB") == 0 ) + if ( 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 ) @@ -811,7 +811,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 { basesp->withdrawn += value; didstats = 1; - //if ( strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) + if ( strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) printf("########### %p withdrawn %s += %.8f check %.8f\n",basesp,base,dstr(value),dstr(checktoshis)); } if ( 0 && strcmp(base,"RUB") == 0 && (pax == 0 || pax->approved == 0) ) From ac4eb454e33e1e02e5d5aedf9d94057ac5ee4fd0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:18:34 +0200 Subject: [PATCH 3/5] test --- src/komodo_gateway.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 372ba5e94..381fa8d01 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -419,9 +419,13 @@ int32_t komodo_pending_withdraws(char *opretstr) // todo: enforce deterministic if ( pax->marked == 0 && strcmp((char *)"KMD",pax->symbol) == 0 && pax->approved == 0 && pax->validated != 0 ) { if ( n < sizeof(paxes)/sizeof(*paxes) ) + { paxes[n++] = pax; + int32_t j; for (j=0; j<32; j++) + printf("%02x",((uint8_t *)&pax->txid)[j]); + printf("%s.(kmdht.%d ht.%d marked.%u approved.%d validated %.8f) %.8f\n",pax->source,pax->height,pax->otherheight,pax->marked,pax->approved,dstr(pax->validated),dstr(pax->komodoshis)); + } } - printf("%s.(kmdht.%d ht.%d marked.%u approved.%d validated %.8f) %.8f\n",pax->source,pax->height,pax->otherheight,pax->marked,pax->approved,dstr(pax->validated),dstr(pax->komodoshis)); } } opretstr[0] = 0; @@ -851,9 +855,9 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 //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 ) { - /*for (j=0; j<32; j++) + for (j=0; j<32; j++) printf("%02x",((uint8_t *)&txids[i])[j]); - printf(" v%d %.8f k.%d ht.%d base.%d\n",vouts[i],dstr(values[i]),kmdheights[i],otherheights[i],baseids[i]);*/ + printf(" v%d %.8f k.%d ht.%d base.%d\n",vouts[i],dstr(values[i]),kmdheights[i],otherheights[i],baseids[i]); if ( (pax= komodo_paxfind(txids[i],vouts[i],'A')) == 0 ) { bitcoin_address(coinaddr,60,&rmd160s[i*20],20); @@ -870,7 +874,7 @@ 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)); + 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])); } From ea9639b1d10b039c05f6a3edb8588a4515e75503 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:22:51 +0200 Subject: [PATCH 4/5] test --- src/komodo_gateway.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 381fa8d01..f127bb0ec 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -319,8 +319,10 @@ uint64_t komodo_paxtotal() else if ( pax->validated == 0 ) { pax->validated = pax->komodoshis = checktoshis; + int32_t j; for (j=0; j<32; j++) + printf("%02x",((uint8_t *)&pax->txid)[j]); //if ( strcmp(str,ASSETCHAINS_SYMBOL) == 0 ) - printf("%p got WITHDRAW.%s kmd.%d ht.%d %.8f -> %.8f/%.8f\n",pax,pax->source,pax->height,pax->otherheight,dstr(pax->fiatoshis),dstr(pax->komodoshis),dstr(checktoshis)); + printf(" %p got WITHDRAW.%s kmd.%d ht.%d %.8f -> %.8f/%.8f\n",pax,pax->source,pax->height,pax->otherheight,dstr(pax->fiatoshis),dstr(pax->komodoshis),dstr(checktoshis)); } } } From bbfaec41d97f319c73e5ffbe84f3e3e071e47529 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:25:02 +0200 Subject: [PATCH 5/5] test --- src/komodo_gateway.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index f127bb0ec..991cd4c0f 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -89,6 +89,7 @@ struct pax_transaction *komodo_paxmark(int32_t height,uint256 txid,uint16_t vout void komodo_paxdelete(struct pax_transaction *pax) { + return; pthread_mutex_lock(&komodo_mutex); HASH_DELETE(hh,PAX,pax); pthread_mutex_unlock(&komodo_mutex); @@ -322,7 +323,7 @@ uint64_t komodo_paxtotal() int32_t j; for (j=0; j<32; j++) printf("%02x",((uint8_t *)&pax->txid)[j]); //if ( strcmp(str,ASSETCHAINS_SYMBOL) == 0 ) - printf(" %p got WITHDRAW.%s kmd.%d ht.%d %.8f -> %.8f/%.8f\n",pax,pax->source,pax->height,pax->otherheight,dstr(pax->fiatoshis),dstr(pax->komodoshis),dstr(checktoshis)); + printf(" v%d %p got WITHDRAW.%s kmd.%d ht.%d %.8f -> %.8f/%.8f\n",pax->vout,pax,pax->source,pax->height,pax->otherheight,dstr(pax->fiatoshis),dstr(pax->komodoshis),dstr(checktoshis)); } } }