Skip to content

Commit

Permalink
fix preimage import bugs (#4529)
Browse files Browse the repository at this point in the history
* fix preimage import bugs
* fix typo
  • Loading branch information
diego1q2w authored Oct 12, 2023
1 parent 88e033a commit b143085
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions core/preimages.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/internal/utils"
"github.com/pkg/errors"
"github.com/syndtr/goleveldb/leveldb"
)

// ImportPreimages is public so `main.go` can call it directly`
Expand All @@ -42,7 +43,9 @@ func ImportPreimages(chain BlockChain, path string) error {
// set this value in database, and prometheus, if needed
prev, err := rawdb.ReadPreimageImportBlock(dbReader)
if err != nil {
return fmt.Errorf("no prior value found, overwriting: %s", err)
if !errors.Is(err, leveldb.ErrNotFound) {
return fmt.Errorf("no prior value found, overwriting: %s", err)
}
}
if blockNumber > prev {
if rawdb.WritePreimageImportBlock(dbReader, blockNumber) != nil {
Expand Down Expand Up @@ -230,7 +233,7 @@ func GeneratePreimages(chain BlockChain, start, end uint64) error {

if stateAt != nil {
if root, err := endingState.Commit(false); err != nil {
return fmt.Errorf("unabe to commit state for block '%d': %w", i, err)
return fmt.Errorf("unable to commit state for block '%d': %w", i, err)
} else if root.Hex() != block.Root().Hex() {
return fmt.Errorf("block root hashes different after commit commitRoot='%s' blockRoot='%s'", root.Hex(), block.Root().Hex())
}
Expand All @@ -245,10 +248,11 @@ func GeneratePreimages(chain BlockChain, start, end uint64) error {
}
// force any pre-images in memory so far to go to disk, if they haven't already
fmt.Println("committing images")
if _, err := endingState.Commit(false); err != nil {
return fmt.Errorf("unabe to commit state for block: %w", err)
if endingState != nil {
if _, err := endingState.Commit(false); err != nil {
return fmt.Errorf("unable to commit state for block: %w", err)
}
}

if err := chain.CommitPreimages(); err != nil {
return fmt.Errorf("error committing preimages %s", err)
}
Expand Down

0 comments on commit b143085

Please sign in to comment.