-
Notifications
You must be signed in to change notification settings - Fork 171
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove invalid headers on chain repair #1856
Open
kushti
wants to merge
3
commits into
master
Choose a base branch
from
remove-invalid-status
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev
Previous commit
different fixes
- Loading branch information
commit dd19e41c92452178d27706613361543f8b7c4342
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -260,7 +260,7 @@ object ErgoHistory extends ScorexLogging { | |
|
||
// check if there is possible database corruption when there is header after | ||
// recognized blockchain tip marked as invalid | ||
protected[nodeView] def repairIfNeeded(history: ErgoHistory): Boolean = history.historyStorage.synchronized { | ||
protected[nodeView] def repairIfNeeded(history: ErgoHistory): Unit = history.historyStorage.synchronized { | ||
val RepairDepth = 128 | ||
|
||
val bestHeaderHeight = history.headersHeight | ||
|
@@ -272,16 +272,21 @@ object ErgoHistory extends ScorexLogging { | |
val notInvalidHeaders = headerIds.filter { headerId => | ||
if (history.isSemanticallyValid(headerId) == Invalid) { | ||
log.warn(s"Clearing invalid header: $headerId at height $h") | ||
history.forgetHeader() | ||
history.forgetHeader(headerId) | ||
false | ||
} else { | ||
true | ||
} | ||
} | ||
val updatedHeightIdsValue = notInvalidHeaders.foldLeft(Array[Byte].empty) { case (acc, id) => | ||
val updatedHeightIdsValue: Array[Byte] = notInvalidHeaders.foldLeft(Array.empty[Byte]) { case (acc, id) => | ||
acc ++ idToBytes(id) | ||
} | ||
history.historyStorage.insert(Array(history.heightIdsKey(h), updatedHeightIdsValue), Nil) | ||
if(updatedHeightIdsValue.isEmpty) { | ||
//could be the case after bestHeaderHeight | ||
history.historyStorage.remove(Array(history.heightIdsKey(h)), Nil) | ||
} else { | ||
history.historyStorage.insert(Array(history.heightIdsKey(h) -> updatedHeightIdsValue), Nil) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't understand what we are updating the valid header index with and why, that would need at least a comment |
||
} | ||
checkHeightsFrom(h + 1) | ||
} | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we also remove the Modifier at this height? Not just index? Or is there an idempotency in place that the modifer gets overriden if index is empty?