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-12-01 18:00:52 -03:00
parent 6246c726f5
commit eb92848685
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/komodo_gateway.h
View File

@@ -551,18 +551,18 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
bitcoin_address(coinaddr,addrtype,rmd160,20); bitcoin_address(coinaddr,addrtype,rmd160,20);
checktoshis = PAX_fiatdest(&seed,tokomodo,destaddr,pubkey33,coinaddr,kmdheight,base,fiatoshis); checktoshis = PAX_fiatdest(&seed,tokomodo,destaddr,pubkey33,coinaddr,kmdheight,base,fiatoshis);
typestr = "deposit"; typestr = "deposit";
printf("(%s) (%s) kmdheight.%d vs height.%d check %.8f vs %.8f tokomodo.%d %d seed.%llx\n",ASSETCHAINS_SYMBOL,base,kmdheight,height,dstr(checktoshis),dstr(value),komodo_is_issuer(),strncmp(ASSETCHAINS_SYMBOL,base,strlen(base)) == 0,(long long)seed);
if ( kmdheight <= height ) if ( kmdheight <= height )
{ {
for (i=0; i<32; i++)
printf("%02x",((uint8_t *)&txid)[i]);
printf(" <- txid.v%u ",vout);
for (i=0; i<33; i++)
printf("%02x",pubkey33[i]);
printf(" checkpubkey check %.8f v %.8f dest.(%s) kmdheight.%d height.%d\n",dstr(checktoshis),dstr(value),destaddr,kmdheight,height);
didstats = 0; didstats = 0;
if ( komodo_paxcmp(base,kmdheight,value,checktoshis,seed) == 0 ) if ( komodo_paxcmp(base,kmdheight,value,checktoshis,seed) == 0 )
{ {
printf("(%s) (%s) kmdheight.%d vs height.%d check %.8f vs %.8f tokomodo.%d %d seed.%llx\n",ASSETCHAINS_SYMBOL,base,kmdheight,height,dstr(checktoshis),dstr(value),komodo_is_issuer(),strncmp(ASSETCHAINS_SYMBOL,base,strlen(base)) == 0,(long long)seed);
for (i=0; i<32; i++)
printf("%02x",((uint8_t *)&txid)[i]);
printf(" <- txid.v%u ",vout);
for (i=0; i<33; i++)
printf("%02x",pubkey33[i]);
printf(" checkpubkey check %.8f v %.8f dest.(%s) kmdheight.%d height.%d\n",dstr(checktoshis),dstr(value),destaddr,kmdheight,height);
if ( (pax= komodo_paxfind(txid,vout,'D')) == 0 ) if ( (pax= komodo_paxfind(txid,vout,'D')) == 0 )
{ {
if ( (basesp= komodo_stateptrget(base)) != 0 ) if ( (basesp= komodo_stateptrget(base)) != 0 )
@@ -576,6 +576,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
} }
if ( (pax= komodo_paxfind(txid,vout,'D')) != 0 ) if ( (pax= komodo_paxfind(txid,vout,'D')) != 0 )
{ {
pax->validated = kmdheight;
if ( didstats == 0 && pax->didstats == 0 ) if ( didstats == 0 && pax->didstats == 0 )
{ {
if ( (basesp= komodo_stateptrget(base)) != 0 ) if ( (basesp= komodo_stateptrget(base)) != 0 )
@@ -589,7 +590,9 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
if ( didstats != 0 ) if ( didstats != 0 )
pax->didstats = 1; pax->didstats = 1;
} }
} else printf("pax %s deposit %.8f rejected\n",base,dstr(fiatoshis)); }
else if ( kmdheight > 91800 )
printf("pax %s deposit %.8f rejected\n",base,dstr(fiatoshis));
} }
} }
} }
@@ -622,6 +625,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
if ( didstats != 0 ) if ( didstats != 0 )
pax->didstats = 1; pax->didstats = 1;
pax->type = opretbuf[0]; pax->type = opretbuf[0];
pax->validated = kmdheight;
} }
} }
} }

2
src/komodo_pax.h
View File

@@ -527,7 +527,7 @@ uint64_t PAX_fiatdest(uint64_t *seedp,int32_t tokomodo,char *destaddr,uint8_t pu
if ( fiatoshis < 0 ) if ( fiatoshis < 0 )
shortflag = 1, fiatoshis = -fiatoshis; shortflag = 1, fiatoshis = -fiatoshis;
komodoshis = komodo_paxprice(seedp,height,base,(char *)"KMD",(uint64_t)fiatoshis); komodoshis = komodo_paxprice(seedp,height,base,(char *)"KMD",(uint64_t)fiatoshis);
printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f seed.%llx\n",height,base,(double)fiatoshis/COIN,(double)komodoshis/COIN,(long long)*seedp); //printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f seed.%llx\n",height,base,(double)fiatoshis/COIN,(double)komodoshis/COIN,(long long)*seedp);
if ( bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr) == 20 ) if ( bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr) == 20 )
{ {
PAX_pubkey(1,pubkey33,&addrtype,rmd160,base,&shortflag,tokomodo != 0 ? &komodoshis : &fiatoshis); PAX_pubkey(1,pubkey33,&addrtype,rmd160,base,&shortflag,tokomodo != 0 ? &komodoshis : &fiatoshis);

2
src/miner.cpp
View File

@@ -133,7 +133,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
} }
else if ( deposits != 0 ) else if ( deposits != 0 )
{ {
//fprintf(stderr,"start CreateNewBlock %s initdone.%d deposit %.8f mempool.%d RT.%u KOMODO_ON_DEMAND.%d\n",ASSETCHAINS_SYMBOL,KOMODO_INITDONE,(double)komodo_paxtotal()/COIN,(int32_t)mempool.GetTotalTxSize(),isrealtime,KOMODO_ON_DEMAND); fprintf(stderr,"start CreateNewBlock %s initdone.%d deposit %.8f mempool.%d RT.%u KOMODO_ON_DEMAND.%d\n",ASSETCHAINS_SYMBOL,KOMODO_INITDONE,(double)komodo_paxtotal()/COIN,(int32_t)mempool.GetTotalTxSize(),isrealtime,KOMODO_ON_DEMAND);
break; break;
} }
sleep(10); sleep(10);