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

-cache

Browse Source
This commit is contained in:
jl777
2018-04-13 22:41:35 +03:00
parent 4323ab1cfb
commit 54f7311d4e
3 changed files with 114 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -626,6 +626,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
LogPrintf("Reindexing finished\n"); LogPrintf("Reindexing finished\n");
// To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked): // To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked):
InitBlockIndex(); InitBlockIndex();
KOMODO_LOADINGBLOCKS = 0;
} }
// hardcoded $DATADIR/bootstrap.dat // hardcoded $DATADIR/bootstrap.dat
@@ -1485,6 +1486,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
} }
} }
} }
KOMODO_LOADINGBLOCKS = 0;
// As LoadBlockIndex can take several minutes, it's possible the user // As LoadBlockIndex can take several minutes, it's possible the user
// requested to kill the GUI during the last operation. If so, exit. // requested to kill the GUI during the last operation. If so, exit.

199
src/komodo_bitcoind.h
View File

@@ -659,21 +659,21 @@ int32_t komodo_block2height(CBlock *block)
return(height); return(height);
} }
void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block) void komodo_block2pubkey33(uint8_t *pubkey33,CBlock *block)
{ {
int32_t n; int32_t n;
if ( KOMODO_LOADINGBLOCKS == 0 ) if ( KOMODO_LOADINGBLOCKS == 0 )
memset(pubkey33,0xff,33); memset(pubkey33,0xff,33);
else memset(pubkey33,0,33); else memset(pubkey33,0,33);
if ( block.vtx[0].vout.size() > 0 ) if ( block->vtx[0].vout.size() > 0 )
{ {
#ifdef KOMODO_ZCASH #ifdef KOMODO_ZCASH
uint8_t *ptr = (uint8_t *)block.vtx[0].vout[0].scriptPubKey.data(); uint8_t *ptr = (uint8_t *)block->vtx[0].vout[0].scriptPubKey.data();
#else #else
uint8_t *ptr = (uint8_t *)&block.vtx[0].vout[0].scriptPubKey[0]; uint8_t *ptr = (uint8_t *)&block->vtx[0].vout[0].scriptPubKey[0];
#endif #endif
//komodo_init(0); //komodo_init(0);
n = block.vtx[0].vout[0].scriptPubKey.size(); n = block->vtx[0].vout[0].scriptPubKey.size();
if ( n == 35 ) if ( n == 35 )
memcpy(pubkey33,ptr+1,33); memcpy(pubkey33,ptr+1,33);
} }
@@ -724,111 +724,108 @@ uint32_t komodo_heightstamp(int32_t height)
return(0); return(0);
} }
void komodo_pindex_init(CBlockIndex *pindex,int32_t height) /*void komodo_pindex_init(CBlockIndex *pindex,int32_t height) gets data corrupted
{ {
int32_t i,num; uint8_t pubkeys[64][33]; CBlock block; int32_t i,num; uint8_t pubkeys[64][33]; CBlock block;
if ( pindex->didinit != 0 ) if ( pindex->didinit != 0 )
return; return;
//printf("pindex.%d komodo_pindex_init notary.%d from height.%d\n",pindex->nHeight,pindex->notaryid,height); //printf("pindex.%d komodo_pindex_init notary.%d from height.%d\n",pindex->nHeight,pindex->notaryid,height);
if ( pindex->didinit == 0 ) if ( pindex->didinit == 0 )
{ {
pindex->notaryid = -1; pindex->notaryid = -1;
if ( KOMODO_LOADINGBLOCKS == 0 ) if ( KOMODO_LOADINGBLOCKS == 0 )
memset(pindex->pubkey33,0xff,33); memset(pindex->pubkey33,0xff,33);
else memset(pindex->pubkey33,0,33); else memset(pindex->pubkey33,0,33);
if ( komodo_blockload(block,pindex) == 0 ) if ( komodo_blockload(block,pindex) == 0 )
{ {
komodo_block2pubkey33(pindex->pubkey33,block); komodo_block2pubkey33(pindex->pubkey33,&block);
//for (i=0; i<33; i++) //for (i=0; i<33; i++)
// fprintf(stderr,"%02x",pindex->pubkey33[i]); // fprintf(stderr,"%02x",pindex->pubkey33[i]);
//fprintf(stderr," set pubkey at height %d/%d\n",pindex->nHeight,height); //fprintf(stderr," set pubkey at height %d/%d\n",pindex->nHeight,height);
pindex->didinit = (KOMODO_LOADINGBLOCKS == 0); //if ( pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3 )
} // else fprintf(stderr,"error loading block at %d/%d",pindex->nHeight,height); // pindex->didinit = (KOMODO_LOADINGBLOCKS == 0);
} } // else fprintf(stderr,"error loading block at %d/%d",pindex->nHeight,height);
if ( pindex->didinit != 0 && pindex->nHeight >= 0 && (num= komodo_notaries(pubkeys,(int32_t)pindex->nHeight,(uint32_t)pindex->nTime)) > 0 ) }
{ if ( pindex->didinit != 0 && pindex->nHeight >= 0 && (num= komodo_notaries(pubkeys,(int32_t)pindex->nHeight,(uint32_t)pindex->nTime)) > 0 )
for (i=0; i<num; i++) {
{ for (i=0; i<num; i++)
if ( memcmp(pubkeys[i],pindex->pubkey33,33) == 0 ) {
{ if ( memcmp(pubkeys[i],pindex->pubkey33,33) == 0 )
pindex->notaryid = i; {
break; pindex->notaryid = i;
} break;
} }
if ( 0 && i == num ) }
{ if ( 0 && i == num )
for (i=0; i<33; i++) {
fprintf(stderr,"%02x",pindex->pubkey33[i]); for (i=0; i<33; i++)
fprintf(stderr," unmatched pubkey at height %d/%d\n",pindex->nHeight,height); fprintf(stderr,"%02x",pindex->pubkey33[i]);
} fprintf(stderr," unmatched pubkey at height %d/%d\n",pindex->nHeight,height);
} }
} }
}*/
void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height) void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
{ {
CBlock block; int32_t num,i; int32_t num,i; CBlock block;
memset(pubkey33,0,33); memset(pubkey33,0,33);
if ( pindex != 0 ) if ( pindex != 0 )
{ {
if ( pindex->didinit != 0 ) if ( komodo_blockload(block,pindex) == 0 )
{ komodo_block2pubkey33(pubkey33,&block);
memcpy(pubkey33,pindex->pubkey33,33);
return;
}
komodo_pindex_init(pindex,height);
memcpy(pubkey33,pindex->pubkey33,33);
} }
} }
int8_t komodo_minerid(int32_t height,uint8_t *pubkey33) /*int8_t komodo_minerid(int32_t height,uint8_t *destpubkey33)
{ {
int32_t num,i,numnotaries; CBlockIndex *pindex; uint32_t timestamp=0; uint8_t _pubkey33[33],pubkeys[64][33]; int32_t num,i,numnotaries; CBlockIndex *pindex; uint32_t timestamp=0; uint8_t pubkey33[33],pubkeys[64][33];
if ( (pindex= chainActive[height]) != 0 ) if ( (pindex= chainActive[height]) != 0 )
{ {
if ( pindex->didinit != 0 ) if ( pindex->didinit != 0 )
{ {
if ( pubkey33 != 0 ) if ( destpubkey33 != 0 )
memcpy(pubkey33,pindex->pubkey33,33); memcpy(destpubkey33,pindex->pubkey33,33);
return(pindex->notaryid); return(pindex->notaryid);
} }
if ( pubkey33 != 0 ) komodo_index2pubkey33(pubkey33,pindex,height);
komodo_index2pubkey33(pubkey33,pindex,height); if ( destpubkey33 != 0 )
timestamp = pindex->GetBlockTime(); memcpy(destpubkey33,pindex->pubkey33,33);
if ( (num= komodo_notaries(pubkeys,height,timestamp)) > 0 ) if ( pindex->didinit != 0 )
{ return(pindex->notaryid);
for (i=0; i<num; i++) timestamp = pindex->GetBlockTime();
if ( memcmp(pubkeys[i],pubkey33,33) == 0 ) if ( (num= komodo_notaries(pubkeys,height,timestamp)) > 0 )
return(i); {
} for (i=0; i<num; i++)
} if ( memcmp(pubkeys[i],pubkey33,33) == 0 )
return(komodo_electednotary(&numnotaries,pubkey33,height,timestamp)); return(i);
} }
}
fprintf(stderr,"komodo_minerid height.%d null pindex\n",height);
return(komodo_electednotary(&numnotaries,pubkey33,height,timestamp));
}*/
int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height) int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height)
{ {
int32_t i,j,duplicate; CBlockIndex *pindex; uint8_t pubkey33[33]; int32_t i,j,n,duplicate; CBlock block; CBlockIndex *pindex; uint8_t notarypubs33[64][33];
memset(mids,-1,sizeof(*mids)*66); memset(mids,-1,sizeof(*mids)*66);
n = komodo_notaries(notarypubs33,height,0);
for (i=duplicate=0; i<66; i++) for (i=duplicate=0; i<66; i++)
{ {
if ( (pindex= komodo_chainactive(height-i)) != 0 ) if ( (pindex= komodo_chainactive(height-i)) != 0 )
{ {
if ( pindex->notaryid >= 0 && pindex->didinit != 0 ) if ( komodo_blockload(block,pindex) == 0 )
{ {
memcpy(pubkeys[i],pindex->pubkey33,33); komodo_block2pubkey33(pubkeys[i],&block);
mids[i] = pindex->notaryid; for (j=0; j<n; j++)
(*nonzpkeysp)++;
}
else
{
komodo_pindex_init(pindex,height-i);
//komodo_index2pubkey33(pubkey33,pindex,height-i);
memcpy(pubkeys[i],pindex->pubkey33,33);
if ( (mids[i]= komodo_minerid(height-i,pubkey33)) >= 0 )
{ {
//mids[i] = *(int32_t *)pubkey33; if ( memcmp(notarypubs33[j],pubkeys[i],33) == 0 )
(*nonzpkeysp)++; {
mids[i] = j;
(*nonzpkeysp)++;
break;
}
} }
} } else fprintf(stderr,"couldnt load block.%d\n",height);
if ( mids[0] >= 0 && i > 0 && mids[i] == mids[0] ) if ( mids[0] >= 0 && i > 0 && mids[i] == mids[0] )
duplicate++; duplicate++;
} }
@@ -854,17 +851,20 @@ int32_t komodo_minerids(uint8_t *minerids,int32_t height,int32_t width) // depre
int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t height,uint8_t pubkey33[33],uint32_t timestamp) int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t height,uint8_t pubkey33[33],uint32_t timestamp)
{ {
int32_t i,notaryid=0,minerid,limit,nid; //uint8_t _pubkey33[33]; int32_t i,j,notaryid=0,minerid,limit,nid; uint8_t destpubkey33[33];
if ( height >= 700000 ) komodo_chosennotary(&notaryid,height,pubkey33,timestamp);
if ( height >= 82000 )
{ {
if ( mids[0] >= 0 ) if ( notaryid >= 0 )
{ {
for (i=1; i<66; i++) for (i=1; i<66; i++)
{ {
if ( mids[i] == mids[0] ) if ( mids[i] == notaryid )
{ {
fprintf(stderr,"ht.%d repeat notaryid.%d in mids[%d]\n",height,mids[0],i); for (j=0; j<66; j++)
if ( height > 790000 ) fprintf(stderr,"%d ",mids[j]);
fprintf(stderr,"ht.%d repeat notaryid.%d in mids[%d]\n",height,notaryid,i);
if ( height > 792000 )
return(-1); return(-1);
else break; else break;
} }
@@ -876,8 +876,6 @@ int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t heigh
{ {
if ( height >= 34000 && notaryid >= 0 ) if ( height >= 34000 && notaryid >= 0 )
{ {
if ( height >= 225000 )
komodo_chosennotary(&notaryid,height,pubkey33,timestamp);
if ( height < 79693 ) if ( height < 79693 )
limit = 64; limit = 64;
else if ( height < 82000 ) else if ( height < 82000 )
@@ -888,8 +886,9 @@ int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t heigh
komodo_chosennotary(&nid,height-i,pubkey33,timestamp); komodo_chosennotary(&nid,height-i,pubkey33,timestamp);
if ( nid == notaryid ) if ( nid == notaryid )
{ {
if ( (0) && notaryid > 0 ) //for (j=0; j<66; j++)
fprintf(stderr,"ht.%d notaryid.%d already mined -i.%d nid.%d\n",height,notaryid,i,nid); // fprintf(stderr,"%d ",mids[j]);
//fprintf(stderr,"ht.%d repeat mids[%d] nid.%d notaryid.%d\n",height-i,i,nid,notaryid);
if ( height > 225000 ) if ( height > 225000 )
return(-1); return(-1);
} }

33
src/pow.cpp
View File

@@ -116,7 +116,6 @@ bool CheckEquihashSolution(const CBlockHeader *pblock, const CChainParams& param
return true; return true;
} }
void komodo_pindex_init(CBlockIndex *pindex,int32_t height);
int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp); int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp);
int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t height,uint8_t pubkey33[33],uint32_t timestamp); int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t height,uint8_t pubkey33[33],uint32_t timestamp);
int32_t komodo_currentheight(); int32_t komodo_currentheight();
@@ -128,15 +127,16 @@ extern char ASSETCHAINS_SYMBOL[];
#define KOMODO_ELECTION_GAP 2000 #define KOMODO_ELECTION_GAP 2000
int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height); int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height);
int32_t KOMODO_LOADINGBLOCKS; int32_t KOMODO_LOADINGBLOCKS = 1;
extern std::string NOTARY_PUBKEY; extern std::string NOTARY_PUBKEY;
bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params) bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params)
{ {
extern int32_t KOMODO_REWIND; extern int32_t KOMODO_REWIND;
bool fNegative,fOverflow; int32_t i,nonzpkeys=0,nonz=0,special=0,special2=0,notaryid=-1,flag = 0, mids[66]; uint32_t timestamp = 0; CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t origpubkey33[33]; int32_t i,nonzpkeys=0,nonz=0,special=0,special2=0,notaryid=-1,flag = 0, mids[66]; uint32_t timestamp = 0; CBlockIndex *pindex=0;
arith_uint256 bnTarget; uint8_t pubkeys[66][33]; arith_uint256 bnTarget; uint8_t pubkeys[66][33];
memcpy(origpubkey33,pubkey33,33);
timestamp = komodo_chainactive_timestamp(); timestamp = komodo_chainactive_timestamp();
bnTarget.SetCompact(nBits, &fNegative, &fOverflow); bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
if ( height == 0 ) if ( height == 0 )
@@ -146,13 +146,6 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
} }
if ( height > 34000 && ASSETCHAINS_SYMBOL[0] == 0 ) // 0 -> non-special notary if ( height > 34000 && ASSETCHAINS_SYMBOL[0] == 0 ) // 0 -> non-special notary
{ {
if ( KOMODO_LOADINGBLOCKS != 0 )
return(true);
if ( (pindex= komodo_chainactive(height)) != 0 )
{
komodo_pindex_init(pindex,height);
memcpy(pubkey33,pindex->pubkey33,33);
}
special = komodo_chosennotary(&notaryid,height,pubkey33,timestamp); special = komodo_chosennotary(&notaryid,height,pubkey33,timestamp);
for (i=0; i<33; i++) for (i=0; i<33; i++)
{ {
@@ -166,7 +159,6 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
} }
flag = komodo_eligiblenotary(pubkeys,mids,&nonzpkeys,height); flag = komodo_eligiblenotary(pubkeys,mids,&nonzpkeys,height);
special2 = komodo_is_special(pubkeys,mids,height,pubkey33,timestamp); special2 = komodo_is_special(pubkeys,mids,height,pubkey33,timestamp);
fprintf(stderr,"ht.%d notaryid.%d special.%d flag.%d special2.%d\n",height,notaryid,special,flag,special2);
if ( notaryid >= 0 ) if ( notaryid >= 0 )
{ {
if ( height > 10000 && height < 80000 && (special != 0 || special2 > 0) ) if ( height > 10000 && height < 80000 && (special != 0 || special2 > 0) )
@@ -177,8 +169,12 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
flag = ((height % KOMODO_ELECTION_GAP) > 64 || (height % KOMODO_ELECTION_GAP) == 0); flag = ((height % KOMODO_ELECTION_GAP) > 64 || (height % KOMODO_ELECTION_GAP) == 0);
else if ( height == 790833 ) else if ( height == 790833 )
flag = 1; flag = 1;
else if ( special2 < 0 && height > 792000 ) else if ( special2 < 0 )
flag = 0; {
if ( height > 792000 )
flag = 0;
else fprintf(stderr,"ht.%d notaryid.%d special.%d flag.%d special2.%d\n",height,notaryid,special,flag,special2);
}
if ( flag != 0 || special2 > 0 ) if ( flag != 0 || special2 > 0 )
{ {
//fprintf(stderr,"EASY MINING ht.%d\n",height); //fprintf(stderr,"EASY MINING ht.%d\n",height);
@@ -191,17 +187,14 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
// Check proof of work matches claimed amount // Check proof of work matches claimed amount
if ( UintToArith256(hash) > bnTarget ) if ( UintToArith256(hash) > bnTarget )
{ {
if ( pindex != 0 ) if ( KOMODO_LOADINGBLOCKS != 0 )
{ return true;
pindex->didinit = 0; if ( height > 792000 )
komodo_pindex_init(pindex,height); return false;
}
return false;
} }
return true; return true;
} }
arith_uint256 GetBlockProof(const CBlockIndex& block) arith_uint256 GetBlockProof(const CBlockIndex& block)
{ {
arith_uint256 bnTarget; arith_uint256 bnTarget;