From b689054fd0abf7d32b61a0f77a0c08c24b0cb52a Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 14:54:49 +0200 Subject: [PATCH] Test --- src/komodo_gateway.h | 5 +++-- src/komodo_pax.h | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a1480f83b..4de2cbca0 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -495,9 +495,10 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to continue; { #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE - if ( kmdsp != 0 && (kmdsp->NOTARIZED_HEIGHT >= pax->height || kmdsp->CURRENT_HEIGHT > pax->height+30) ) // 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; + else if ( kmdsp->CURRENT_HEIGHT > pax->height+30 ) + pax->validated = pax->ready = 0; #else pax->validated = pax->komodoshis; #endif diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 3e2a8aab4..e971b32b6 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -514,10 +514,10 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint zeroes++; else nonz++; } + printf("kmdbtc %llu btcusd %llu ",(long long)kmdbtc,(long long)btcusd); + printf("komodo_paxprice nonz.%d of numvotes.%d seed.%llu\n",nonz,numvotes,(long long)seed); if ( nonz <= (numvotes >> 1) ) { - //printf("kmdbtc %llu btcusd %llu ",(long long)kmdbtc,(long long)btcusd); - //printf("komodo_paxprice nonz.%d of numvotes.%d seed.%llu\n",nonz,numvotes,(long long)seed); return(0); } return(komodo_paxcorrelation(votes,numvotes,seed) * basevolume / 100000); @@ -567,7 +567,7 @@ uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uin portable_mutex_unlock(&komodo_mutex); if ( nonz != 0 ) sum /= nonz; - //printf("-> %lld %s/%s i.%d ht.%d\n",(long long)sum,base,rel,i,height); + printf("-> %lld %s/%s i.%d ht.%d\n",(long long)sum,base,rel,i,height); return(sum); }