From 22b09834bb4bb96cdf486dd5cf9579878cdb4f07 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Dec 2016 11:38:04 +0200 Subject: [PATCH 1/5] test --- src/komodo_gateway.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 992cf1cf0..3c0db2518 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -868,7 +868,8 @@ void komodo_passport_iteration() { komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"komodostate"); 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); if ( ftell(fp) > lastpos[baseid] ) From e40060c24309c8ffa1043d55b54627706f05ab73 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Dec 2016 11:43:17 +0200 Subject: [PATCH 2/5] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 3c0db2518..3c50527c5 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -843,7 +843,7 @@ void komodo_passport_iteration() //printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); 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); } refsp = komodo_stateptr(symbol,dest); From 15373725e70ed053da1ff21afb53a37d7cb28e1b Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Dec 2016 12:09:52 +0200 Subject: [PATCH 3/5] test --- src/chainparams.cpp | 7 ++++--- src/komodo.h | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c3f9bf0a4..688bc15c6 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -121,9 +121,10 @@ public: { boost::assign::map_list_of (0, consensus.hashGenesisBlock) - (2500, uint256S("0x00000006dc968f600be11a86cbfbf7feb61c7577f45caced2e82b6d261d19744")) - (15000, uint256S("0x00000000b6bc56656812a5b8dcad69d6ad4446dec23b5ec456c18641fb5381ba")), - 1479851027, // * UNIX timestamp of last checkpoint block + (2500, uint256S("0x0e6a3d5a46eba97c4e7618d66a39f115729e1176433c98481124c2bf733aa54e")) + (15000, uint256S("0x00f0bd236790e903321a2d22f85bd6bf8a505f6ef4eddb20458a65d37e14d142")), + (100000, uint256S("0x0f02eb1f3a4b89df9909fec81a4bd7d023e32e24e1f5262d9fc2cc36a715be6f")), + 1481120910, // * UNIX timestamp of last checkpoint block 110415, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) 4240 // * estimated number of transactions per day after checkpoint diff --git a/src/komodo.h b/src/komodo.h index 2d978d443..b6aaa4c2d 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -194,7 +194,10 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar 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]; if ( (sp= komodo_stateptr(symbol,dest)) == 0 ) + { + KOMODO_INITDONE = (uint32_t)time(NULL); return; + } if ( fp == 0 ) { komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); From fd5bb9fb53963f0ad75f3359b310c8db00e4acb1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Dec 2016 12:11:29 +0200 Subject: [PATCH 4/5] test --- src/chainparams.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 688bc15c6..875042500 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -121,9 +121,9 @@ public: { boost::assign::map_list_of (0, consensus.hashGenesisBlock) - (2500, uint256S("0x0e6a3d5a46eba97c4e7618d66a39f115729e1176433c98481124c2bf733aa54e")) - (15000, uint256S("0x00f0bd236790e903321a2d22f85bd6bf8a505f6ef4eddb20458a65d37e14d142")), - (100000, uint256S("0x0f02eb1f3a4b89df9909fec81a4bd7d023e32e24e1f5262d9fc2cc36a715be6f")), + //(2500, uint256S("0x0e6a3d5a46eba97c4e7618d66a39f115729e1176433c98481124c2bf733aa54e")) + //(15000, uint256S("0x00f0bd236790e903321a2d22f85bd6bf8a505f6ef4eddb20458a65d37e14d142")), + //(100000, uint256S("0x0f02eb1f3a4b89df9909fec81a4bd7d023e32e24e1f5262d9fc2cc36a715be6f")), 1481120910, // * UNIX timestamp of last checkpoint block 110415, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) From a6fa1054472cdde76a8ec6dac62f36b44660dcea Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Dec 2016 12:15:33 +0200 Subject: [PATCH 5/5] test --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 875042500..41e54d752 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -120,7 +120,7 @@ public: checkpointData = (Checkpoints::CCheckpointData) { boost::assign::map_list_of - (0, consensus.hashGenesisBlock) + (0, consensus.hashGenesisBlock), //(2500, uint256S("0x0e6a3d5a46eba97c4e7618d66a39f115729e1176433c98481124c2bf733aa54e")) //(15000, uint256S("0x00f0bd236790e903321a2d22f85bd6bf8a505f6ef4eddb20458a65d37e14d142")), //(100000, uint256S("0x0f02eb1f3a4b89df9909fec81a4bd7d023e32e24e1f5262d9fc2cc36a715be6f")),