From 456ea63994f2beea1053dda877ac1ed5f96606a3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 18:58:43 +0200 Subject: [PATCH 1/4] 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 e8c275dce..55496eedd 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -414,7 +414,7 @@ int32_t komodo_pending_withdraws(char *opretstr) // todo: enforce deterministic if ( n < sizeof(paxes)/sizeof(*paxes) ) paxes[n++] = pax; } - //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; From 6b3eb2c4379dc4ee1f9eacf54c765106f8297239 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:02:49 +0200 Subject: [PATCH 2/4] test --- src/komodo_gateway.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 55496eedd..b4c7067f5 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -398,7 +398,7 @@ static int _paxorder(const void *a,const void *b) int32_t komodo_pending_withdraws(char *opretstr) // todo: enforce deterministic order { - struct pax_transaction *pax,*tmp,*paxes[64]; uint8_t opretbuf[16384]; int32_t i,n,ht,len=0; uint64_t total = 0; + struct pax_transaction *pax,*pax2,*tmp,*paxes[64]; uint8_t opretbuf[16384]; int32_t i,n,ht,len=0; uint64_t total = 0; if ( KOMODO_PAX == 0 ) return(0); if ( komodo_isrealtime(&ht) == 0 || ASSETCHAINS_SYMBOL[0] != 0 ) @@ -408,7 +408,14 @@ int32_t komodo_pending_withdraws(char *opretstr) // todo: enforce deterministic { if ( pax->type == 'W' ) { - //printf("pax %s marked.%u approved.%u validated.%llu\n",pax->symbol,pax->marked,pax->approved,(long long)pax->validated); + if ( (pax2= komodo_paxfind(pax->txid,pax->vout,'A')) != 0 ) + { + if ( pax2->approved != 0 ) + pax->approved = pax2->approved; + } + else if ( (pax2= komodo_paxfind(pax->txid,pax->vout,'X')) != 0 ) + pax->approved = pax->heightl\; + //printf("pax %s marked.%u approved.%u validated.%llu\n",pax->symbol,pax->marked,pax->approved,(long long)pax->validated); if ( pax->marked == 0 && strcmp((char *)"KMD",pax->symbol) == 0 && pax->approved == 0 && pax->validated != 0 ) { if ( n < sizeof(paxes)/sizeof(*paxes) ) From 0b262b65ad6893eb3e919b738523a58cb55a1d9b Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:03:33 +0200 Subject: [PATCH 3/4] 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 b4c7067f5..ff70200c6 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -414,7 +414,7 @@ int32_t komodo_pending_withdraws(char *opretstr) // todo: enforce deterministic pax->approved = pax2->approved; } else if ( (pax2= komodo_paxfind(pax->txid,pax->vout,'X')) != 0 ) - pax->approved = pax->heightl\; + pax->approved = pax->height; //printf("pax %s marked.%u approved.%u validated.%llu\n",pax->symbol,pax->marked,pax->approved,(long long)pax->validated); if ( pax->marked == 0 && strcmp((char *)"KMD",pax->symbol) == 0 && pax->approved == 0 && pax->validated != 0 ) { From 7aadf9a95f9e04808bf40ceb71c3cd80ef81ea38 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Dec 2016 19:07:23 +0200 Subject: [PATCH 4/4] 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 ff70200c6..b9276a102 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -863,7 +863,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 else pax->validated = checktoshis; if ( (pax2= komodo_paxfind(txids[i],vouts[i],'W')) != 0 ) pax2->approved = kmdheights[i]; - //komodo_paxmark(height,txids[i],vouts[i],'W',height); + 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 ) {