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

Merge branch 'duke' of https://git.hush.is/hush/hush3 into duke

Browse Source
This commit is contained in:
Duke
2023-04-27 07:10:08 -04:00
parent 053e9156a7 519743f704
commit 18eea5cb03
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/addrman.cpp
View File

@@ -499,7 +499,12 @@ CAddrInfo CAddrMan::Select_(bool newOnly)
MilliSleep(kRetrySleepInterval); MilliSleep(kRetrySleepInterval);
} }
int nId = vvTried[nKBucket][nKBucketPos]; int nId = vvTried[nKBucket][nKBucketPos];
assert(mapInfo.count(nId) == 1); // assert(mapInfo.count(nId) == 1);
if(mapInfo.count(nId) != 1) {
fprintf(stderr,"%s: Could not find tried node with nId=%d=vvTried[%d][%d], mapInfo.count(%d)=%lu\n", __func__, nId, nKBucket, nKBucketPos, nId, mapInfo.count(nId) );
continue;
}
CAddrInfo& info = mapInfo[nId]; CAddrInfo& info = mapInfo[nId];
if (info.IsReachableNetwork()) { if (info.IsReachableNetwork()) {
//deprioritize unreachable networks //deprioritize unreachable networks
@@ -534,7 +539,12 @@ CAddrInfo CAddrMan::Select_(bool newOnly)
MilliSleep(kRetrySleepInterval); MilliSleep(kRetrySleepInterval);
} }
int nId = vvNew[nUBucket][nUBucketPos]; int nId = vvNew[nUBucket][nUBucketPos];
assert(mapInfo.count(nId) == 1);
if(mapInfo.count(nId) != 1) {
fprintf(stderr,"%s: Could not find new node with nId=%d=vvNew[%d][%d], mapInfo.count(%d)=%lu\n", __func__, nId, nUBucket, nUBucketPos, nId, mapInfo.count(nId) );
continue;
}
// assert(mapInfo.count(nId) == 1);
CAddrInfo& info = mapInfo[nId]; CAddrInfo& info = mapInfo[nId];
if (info.IsReachableNetwork()) { if (info.IsReachableNetwork()) {
//deprioritize unreachable networks //deprioritize unreachable networks

4
src/main.cpp
View File

@@ -5114,7 +5114,9 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
// changing at run-time, from Consensus::Params being a const struct // changing at run-time, from Consensus::Params being a const struct
unsigned int nNextWork = GetNextWorkRequired(pindexPrev, &block, consensusParams); unsigned int nNextWork = GetNextWorkRequired(pindexPrev, &block, consensusParams);
LogPrintf("%s: nbits ,%d,%lu,%lu,%d\n",__func__, nHeight, nNextWork, block.nBits, nNextWork - block.nBits ); if (fDebug) {
LogPrintf("%s: nbits ,%d,%lu,%lu,%d\n",__func__, nHeight, nNextWork, block.nBits, nNextWork - block.nBits );
}
if (block.nBits != nNextWork) { if (block.nBits != nNextWork) {
// Enforce correct nbits at DAA fork height, before that, ignore // Enforce correct nbits at DAA fork height, before that, ignore
if (nHeight > daaForkHeight) { if (nHeight > daaForkHeight) {

11
src/pow.cpp
View File

@@ -503,8 +503,9 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
nbits = bnTarget.GetCompact(); nbits = bnTarget.GetCompact();
nbits = (nbits & 0xfffffffc) | zawyflag; nbits = (nbits & 0xfffffffc) | zawyflag;
} }
//if(fDebug) if(fDebug) {
fprintf(stderr,"%s: nbits=%d\n", __func__, nbits); fprintf(stderr,"%s: nbits=%d\n", __func__, nbits);
}
return(nbits); return(nbits);
} }
@@ -537,11 +538,15 @@ unsigned int CalculateNextWorkRequired(arith_uint256 bnAvg,
if ( ASSETCHAINS_ADAPTIVEPOW <= 0 ) { if ( ASSETCHAINS_ADAPTIVEPOW <= 0 ) {
if (nActualTimespan < params.MinActualTimespan()) { if (nActualTimespan < params.MinActualTimespan()) {
fprintf(stderr,"%s: Adjusting nActualTimespan up to min value %li\n", __func__, params.MinActualTimespan() ); if(fDebug) {
fprintf(stderr,"%s: Adjusting nActualTimespan up to min value %li\n", __func__, params.MinActualTimespan() );
}
nActualTimespan = params.MinActualTimespan(); nActualTimespan = params.MinActualTimespan();
} }
if (nActualTimespan > params.MaxActualTimespan()) { if (nActualTimespan > params.MaxActualTimespan()) {
fprintf(stderr,"%s: Adjusting nActualTimespan down to max value %li\n", __func__, params.MaxActualTimespan() ); if(fDebug) {
fprintf(stderr,"%s: Adjusting nActualTimespan down to max value %li\n", __func__, params.MaxActualTimespan() );
}
nActualTimespan = params.MaxActualTimespan(); nActualTimespan = params.MaxActualTimespan();
} }
} }