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

Merge pull request #86 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2016-12-13 12:22:15 +02:00
committed by GitHub
parent 0849b00b66 a6fa105447
commit 8a4247110a
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/chainparams.cpp
View File

@@ -120,10 +120,11 @@ public:
checkpointData = (Checkpoints::CCheckpointData) checkpointData = (Checkpoints::CCheckpointData)
{ {
boost::assign::map_list_of boost::assign::map_list_of
(0, consensus.hashGenesisBlock) (0, consensus.hashGenesisBlock),
(2500, uint256S("0x00000006dc968f600be11a86cbfbf7feb61c7577f45caced2e82b6d261d19744")) //(2500, uint256S("0x0e6a3d5a46eba97c4e7618d66a39f115729e1176433c98481124c2bf733aa54e"))
(15000, uint256S("0x00000000b6bc56656812a5b8dcad69d6ad4446dec23b5ec456c18641fb5381ba")), //(15000, uint256S("0x00f0bd236790e903321a2d22f85bd6bf8a505f6ef4eddb20458a65d37e14d142")),
1479851027, // * UNIX timestamp of last checkpoint block //(100000, uint256S("0x0f02eb1f3a4b89df9909fec81a4bd7d023e32e24e1f5262d9fc2cc36a715be6f")),
1481120910, // * UNIX timestamp of last checkpoint block
110415, // * total number of transactions between genesis and last checkpoint 110415, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines) // (the tx=... number in the SetBestChain debug.log lines)
4240 // * estimated number of transactions per day after checkpoint 4240 // * estimated number of transactions per day after checkpoint

3
src/komodo.h
View File

@@ -194,7 +194,10 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
static FILE *fp; static int32_t errs; static FILE *fp; static int32_t errs;
struct komodo_state *sp; char fname[512],symbol[16],dest[16]; int32_t ht,func; uint8_t num,pubkeys[64][33]; struct komodo_state *sp; char fname[512],symbol[16],dest[16]; int32_t ht,func; uint8_t num,pubkeys[64][33];
if ( (sp= komodo_stateptr(symbol,dest)) == 0 ) if ( (sp= komodo_stateptr(symbol,dest)) == 0 )
{
KOMODO_INITDONE = (uint32_t)time(NULL);
return; return;
}
if ( fp == 0 ) if ( fp == 0 )
{ {
komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate");

5
src/komodo_gateway.h
View File

@@ -843,7 +843,7 @@ void komodo_passport_iteration()
//printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); //printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL);
while ( KOMODO_INITDONE == 0 ) while ( KOMODO_INITDONE == 0 )
{ {
fprintf(stderr,"PASSPORT iteration waiting for KOMODO_INITDONE\n"); fprintf(stderr,"[%s] PASSPORT iteration waiting for KOMODO_INITDONE\n",ASSETCHAINS_SYMBOL);
sleep(3); sleep(3);
} }
refsp = komodo_stateptr(symbol,dest); refsp = komodo_stateptr(symbol,dest);
@@ -868,7 +868,8 @@ void komodo_passport_iteration()
{ {
komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"komodostate"); komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"komodostate");
komodo_nameset(symbol,dest,base); komodo_nameset(symbol,dest,base);
if ( (fp= fopen(fname,"rb")) != 0 && (sp= komodo_stateptrget(symbol)) != 0 ) sp = komodo_stateptrget(symbol);
if ( (fp= fopen(fname,"rb")) != 0 && sp != 0 )
{ {
fseek(fp,0,SEEK_END); fseek(fp,0,SEEK_END);
if ( ftell(fp) > lastpos[baseid] ) if ( ftell(fp) > lastpos[baseid] )