DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2017-03-14 14:54:49 +02:00
parent c40ec31dc8
commit b689054fd0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/komodo_gateway.h
View File

@@ -495,9 +495,10 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to
continue; continue;
{ {
#ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE #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; 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 #else
pax->validated = pax->komodoshis; pax->validated = pax->komodoshis;
#endif #endif

6
src/komodo_pax.h
View File

@@ -514,10 +514,10 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
zeroes++; zeroes++;
else nonz++; 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) ) 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(0);
} }
return(komodo_paxcorrelation(votes,numvotes,seed) * basevolume / 100000); 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); portable_mutex_unlock(&komodo_mutex);
if ( nonz != 0 ) if ( nonz != 0 )
sum /= nonz; 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); return(sum);
} }