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
2018-04-13 19:13:46 +03:00
parent c9cfa52798
commit 008f47c204
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/komodo_bitcoind.h
View File

@@ -854,9 +854,7 @@ 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,notaryid=0,minerid,limit,nid;
if ( height >= 225000 )
komodo_chosennotary(&notaryid,height,pubkey33,timestamp);
if ( height >= 700000 ) if ( height >= 700000 )
{ {
if ( mids[0] >= 0 ) if ( mids[0] >= 0 )
@@ -878,6 +876,8 @@ 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 )

2
src/pow.cpp
View File

@@ -146,7 +146,7 @@ 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 ) if ( KOMODO_LOADINGBLOCKS != 0 )
return(true); return(true);
if ( (pindex= komodo_chainactive(height)) != 0 ) if ( (pindex= komodo_chainactive(height)) != 0 )
{ {