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
2016-10-26 12:37:55 -03:00
parent 58085d21bd
commit 1bf821543e
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/komodo.h
View File

@@ -201,6 +201,12 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
} }
//#ifdef KOMODO_PAX //#ifdef KOMODO_PAX
else if ( pvals != 0 && numpvals > 0 ) else if ( pvals != 0 && numpvals > 0 )
{
int32_t nonz = 0;
for (i=0; i<32; i++)
if ( pvals[i] != 0 )
nonz++;
if ( nonz >= 32 )
{ {
fputc('V',fp); fputc('V',fp);
if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) ) if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) )
@@ -209,6 +215,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
if ( fwrite(pvals,sizeof(uint32_t),numpvals,fp) != numpvals ) if ( fwrite(pvals,sizeof(uint32_t),numpvals,fp) != numpvals )
errs++; errs++;
komodo_pvals(height,pvals,numpvals); komodo_pvals(height,pvals,numpvals);
}
//printf("save pvals height.%d numpvals.%d\n",height,numpvals); //printf("save pvals height.%d numpvals.%d\n",height,numpvals);
} }
//#endif //#endif

2
src/komodo_gateway.h
View File

@@ -92,7 +92,7 @@ int32_t komodo_gateway_tx(char *symbol,int32_t height,int32_t txi,char *txidstr,
{ {
len = (int32_t)strlen(hexstr) >> 1; len = (int32_t)strlen(hexstr) >> 1;
if ( len != 74 ) if ( len != 74 )
printf("ht.%d txi.%d vout.%d/%d %s script\n",height,txi,vout,n,hexstr); printf("ht.%d txi.%d vout.%d/%d %s script (%d %d)\n",height,txi,vout,n,hexstr,memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66),memcmp(&hexstr[6],CRYPTO777_RMD160STR,40));
if ( vout == 0 && ((memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66) == 0 && len == 35) || (memcmp(&hexstr[6],CRYPTO777_RMD160STR,40) == 0 && len == 25)) ) if ( vout == 0 && ((memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66) == 0 && len == 35) || (memcmp(&hexstr[6],CRYPTO777_RMD160STR,40) == 0 && len == 25)) )
isspecial = 1; isspecial = 1;
else if ( isspecial != 0 && len <= sizeof(script) ) else if ( isspecial != 0 && len <= sizeof(script) )

12
src/komodo_pax.h
View File

@@ -71,7 +71,7 @@ void pax_rank(uint64_t *ranked,uint32_t *pvals)
int32_t dpow_readprices(uint8_t *data,uint32_t *timestampp,double *KMDBTCp,double *BTCUSDp,double *CNYUSDp,uint32_t *pvals) int32_t dpow_readprices(uint8_t *data,uint32_t *timestampp,double *KMDBTCp,double *BTCUSDp,double *CNYUSDp,uint32_t *pvals)
{ {
uint32_t kmdbtc,btcusd,cnyusd; int32_t i,n,len = 0; uint32_t kmdbtc,btcusd,cnyusd; int32_t i,n,nonz,len = 0;
len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)timestampp); len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)timestampp);
len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)&n); len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)&n);
len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)&kmdbtc); // /= 1000 len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)&kmdbtc); // /= 1000
@@ -80,11 +80,15 @@ int32_t dpow_readprices(uint8_t *data,uint32_t *timestampp,double *KMDBTCp,doubl
*KMDBTCp = ((double)kmdbtc / (1000000000. * 1000.)); *KMDBTCp = ((double)kmdbtc / (1000000000. * 1000.));
*BTCUSDp = ((double)btcusd / (1000000000. / 1000.)); *BTCUSDp = ((double)btcusd / (1000000000. / 1000.));
*CNYUSDp = ((double)cnyusd / 1000000000.); *CNYUSDp = ((double)cnyusd / 1000000000.);
for (i=0; i<n-3; i++) for (i=nonz=0; i<n-3; i++)
{ {
if ( pvals[i] != 0 )
nonz++;
len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)&pvals[i]); len += iguana_rwnum(0,&data[len],sizeof(uint32_t),(void *)&pvals[i]);
//printf("%u ",pvals[i]); //printf("%u ",pvals[i]);
} }
if ( nonz < n-3 )
return(-1);
pvals[i++] = kmdbtc; pvals[i++] = kmdbtc;
pvals[i++] = btcusd; pvals[i++] = btcusd;
pvals[i++] = cnyusd; pvals[i++] = cnyusd;
@@ -115,7 +119,8 @@ int32_t komodo_pax_opreturn(uint8_t *opret,int32_t maxsize)
if ( check == crc32 ) if ( check == crc32 )
{ {
double KMDBTC,BTCUSD,CNYUSD; uint32_t pvals[128]; double KMDBTC,BTCUSD,CNYUSD; uint32_t pvals[128];
dpow_readprices(&data[len],&timestamp,&KMDBTC,&BTCUSD,&CNYUSD,pvals); if ( dpow_readprices(&data[len],&timestamp,&KMDBTC,&BTCUSD,&CNYUSD,pvals) > 0 )
{
if ( 0 && lastcrc != crc32 ) if ( 0 && lastcrc != crc32 )
{ {
for (i=0; i<32; i++) for (i=0; i<32; i++)
@@ -133,6 +138,7 @@ int32_t komodo_pax_opreturn(uint8_t *opret,int32_t maxsize)
} }
} //else printf("t%u too old for %u\n",timestamp,(uint32_t)time(NULL)); } //else printf("t%u too old for %u\n",timestamp,(uint32_t)time(NULL));
lastcrc = crc32; lastcrc = crc32;
}
} else printf("crc32 %u mismatch %u\n",crc32,check); } else printf("crc32 %u mismatch %u\n",crc32,check);
} else printf("fread.%d error != fsize.%d\n",retval,fsize); } else printf("fread.%d error != fsize.%d\n",retval,fsize);
} else printf("fsize.%d > maxsize.%d or data[%d]\n",fsize,maxsize,(int32_t)sizeof(data)); } else printf("fsize.%d > maxsize.%d or data[%d]\n",fsize,maxsize,(int32_t)sizeof(data));