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

Merge pull request #101 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2016-12-22 23:40:36 +02:00
committed by GitHub
parent ad49b83c3e 5fc94d71a8
commit 3e76e0e5ba
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/komodo_gateway.h
View File

@@ -494,7 +494,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to
}*/ }*/
if ( ASSETCHAINS_SYMBOL[0] != 0 && (strcmp(pax->symbol,symbol) != 0 || pax->validated == 0) ) if ( ASSETCHAINS_SYMBOL[0] != 0 && (strcmp(pax->symbol,symbol) != 0 || pax->validated == 0) )
{ {
printf("pax->symbol.%s != %s or null pax->validated %.8f\n",pax->symbol,symbol,dstr(pax->validated)); //printf("pax->symbol.%s != %s or null pax->validated %.8f\n",pax->symbol,symbol,dstr(pax->validated));
continue; continue;
} }
if ( pax->ready == 0 ) if ( pax->ready == 0 )
@@ -636,7 +636,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
printf(" kht.%d ht.%d %.8f %.8f blockhash couldnt find vout.[%d]\n",kmdheights[i-1],otherheights[i-1],dstr(values[i-1]),dstr(srcvalues[i]),i); printf(" kht.%d ht.%d %.8f %.8f blockhash couldnt find vout.[%d]\n",kmdheights[i-1],otherheights[i-1],dstr(values[i-1]),dstr(srcvalues[i]),i);
} }
} }
if ( matched != num ) if ( height <= chainActive.Tip()->nHeight && matched != num )
{ {
printf("WOULD REJECT %s: ht.%d (%c) matched.%d vs num.%d\n",symbol,height,opcode,matched,num); printf("WOULD REJECT %s: ht.%d (%c) matched.%d vs num.%d\n",symbol,height,opcode,matched,num);
// can easily happen depending on order of loading // can easily happen depending on order of loading
@@ -855,7 +855,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
//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 ( baseids[i] < 0 ) if ( baseids[i] < 0 )
{ {
printf("baseids[%d] %d\n",i,baseids[i]); //printf("baseids[%d] %d\n",i,baseids[i]);
continue; continue;
} }
didstats = 0; didstats = 0;
@@ -926,12 +926,12 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
if ( (pax= komodo_paxfind(txids[i],vouts[i],'X')) != 0 ) if ( (pax= komodo_paxfind(txids[i],vouts[i],'X')) != 0 )
{ {
pax->type = opretbuf[0]; pax->type = opretbuf[0];
if ( baseids[i] >= 0 && values[i] != 0 && (basesp= komodo_stateptrget(CURRENCIES[baseids[i]])) != 0 ) if ( baseids[i] >= 0 && srcvalues[i] != 0 && (basesp= komodo_stateptrget(CURRENCIES[baseids[i]])) != 0 )
{ {
basesp->redeemed += values[i]; basesp->redeemed += srcvalues[i];
pax->didstats = 1; pax->didstats = 1;
//if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 ) //if ( strcmp(CURRENCIES[baseids[i]],ASSETCHAINS_SYMBOL) == 0 )
printf("########### %p redeemed %s += %.8f\n",basesp,CURRENCIES[baseids[i]],dstr(values[i])); printf("########### %p redeemed %s += %.8f\n",basesp,CURRENCIES[baseids[i]],dstr(srcvalues[i]));
} }
} }
if ( (pax= komodo_paxmark(height,txids[i],vouts[i],'W',height)) != 0 ) if ( (pax= komodo_paxmark(height,txids[i],vouts[i],'W',height)) != 0 )
@@ -1006,12 +1006,12 @@ void komodo_passport_iteration()
if ( fread(buf,1,sizeof(buf),fp) == sizeof(buf) ) if ( fread(buf,1,sizeof(buf),fp) == sizeof(buf) )
{ {
sp->CURRENT_HEIGHT = buf[0]; 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)-60 )
{ {
isrealtime = 1; isrealtime = 1;
RTmask |= (1LL << baseid); RTmask |= (1LL << baseid);
memcpy(refsp->RTbufs[baseid+1],buf,sizeof(refsp->RTbufs[baseid+1])); memcpy(refsp->RTbufs[baseid+1],buf,sizeof(refsp->RTbufs[baseid+1]));
} //else fprintf(stderr,"%s not RT\n",base); } 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 size error RT\n",base); } //else fprintf(stderr,"%s size error RT\n",base);
fclose(fp); fclose(fp);
} //else fprintf(stderr,"%s open error RT\n",base); } //else fprintf(stderr,"%s open error RT\n",base);

4
src/komodo_pax.h
View File

@@ -481,8 +481,8 @@ uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uin
} }
if ( nonz <= (numvotes >> 1) ) if ( nonz <= (numvotes >> 1) )
{ {
printf("kmdbtc %llu btcusd %llu\n",(long long)kmdbtc,(long long)btcusd); //printf("kmdbtc %llu btcusd %llu\n",(long long)kmdbtc,(long long)btcusd);
printf("komodo_paxprice nonz.%d of numvotes.%d\n",nonz,numvotes); //printf("komodo_paxprice nonz.%d of numvotes.%d\n",nonz,numvotes);
return(0); return(0);
} }
return(komodo_paxcorrelation(votes,numvotes,*seedp) * basevolume / 100000); return(komodo_paxcorrelation(votes,numvotes,*seedp) * basevolume / 100000);