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 10:36:13 -03:00
parent b338ea90fa
commit 8985164dec
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo.h
View File

@@ -501,7 +501,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
numvouts = block.vtx[i].vout.size(); numvouts = block.vtx[i].vout.size();
notaryid = -1; notaryid = -1;
voutmask = specialtx = notarizedheight = isratification = notarized = 0; voutmask = specialtx = notarizedheight = isratification = notarized = 0;
signedmask = 1; signedmask = (height < 100000) ? 1 : 0;
numvins = block.vtx[i].vin.size(); numvins = block.vtx[i].vin.size();
for (j=0; j<numvins; j++) for (j=0; j<numvins; j++)
{ {
@@ -512,7 +512,6 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
} }
} }
numvalid = bitweight(signedmask); numvalid = bitweight(signedmask);
printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts);
if ( (((height < 90000 || (signedmask & 1) != 0) && numvalid >= KOMODO_MINRATIFY) || numvalid > (numnotaries/3)) ) if ( (((height < 90000 || (signedmask & 1) != 0) && numvalid >= KOMODO_MINRATIFY) || numvalid > (numnotaries/3)) )
{ {
printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d <<<<<<<<<<< notarized\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts); printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d <<<<<<<<<<< notarized\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts);
@@ -537,6 +536,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
} }
} }
} }
printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d notarized.%d special.%d isratification.%d\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts,notarized,specialtx,isratification);
if ( notarized != 0 && (notarizedheight != 0 || specialtx != 0) ) if ( notarized != 0 && (notarizedheight != 0 || specialtx != 0) )
{ {
if ( isratification != 0 ) if ( isratification != 0 )

10
src/main.cpp
View File

@@ -2703,7 +2703,15 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
if (!DisconnectTip(state)) if (!DisconnectTip(state))
return false; return false;
} }
if ( 1 )
{
while (chainActive.Tip()->nHeight > 91419 )
{
fprintf(stderr,"rewind ht.%d\n",chainActive.Tip()->nHeight);
if (!DisconnectTip(state))
return false;
}
}
// Build list of new blocks to connect. // Build list of new blocks to connect.
std::vector<CBlockIndex*> vpindexToConnect; std::vector<CBlockIndex*> vpindexToConnect;
bool fContinue = true; bool fContinue = true;