Skip to content

trigger heal in case of bad code #5103

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 20, 2023
Merged

trigger heal in case of bad code #5103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04d6064
trigger heal in case of bad code
matkt Feb 16, 2023
6cab7ef
Merge branch 'main' into feature/fix-code
matkt Feb 17, 2023
6a2e07c
Merge branch 'main' into feature/fix-code
matkt Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...reum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,12 @@ public void commit() {
public Optional<Bytes> getCode(final Address address, final Hash codeHash) {
final BonsaiValue<Bytes> localCode = codeToUpdate.get(address);
if (localCode == null) {
return wrappedWorldView().getCode(address, codeHash);
final Optional<Bytes> code = wrappedWorldView().getCode(address, codeHash);
if (code.isEmpty() && !codeHash.equals(Hash.EMPTY)) {
Copy link
Contributor

@garyschulte garyschulte Feb 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this instead hash code and compare it to codeHash rather than just checking empty? or is the hashing prohibitively expensive

Copy link
Contributor Author

@matkt matkt Feb 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is enough because the hash check is already done at the storage level. And if it is not good we will have an Empty. So I prefer to avoid adding an unnecessary extra shot for this check

throw new MerkleTrieException(
"invalid account code", Optional.of(address), codeHash, Bytes.EMPTY);
}
return code;
} else {
return Optional.ofNullable(localCode.getUpdated());
}
Expand Down