From d6b4c96bf1b66e3f5a806875782a47ca498f7440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Faruk=20Irmak?= Date: Thu, 3 Apr 2025 01:18:49 +0300 Subject: [PATCH] fix: ignore key-not-found errors in testWitness (#1164) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: ignore key-not-found errors in testWitness * chore: auto version bump [bot] --------- Co-authored-by: omerfirmak <10325815+omerfirmak@users.noreply.github.com> --- eth/api.go | 5 +++-- params/version.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eth/api.go b/eth/api.go index 0b380a57b2..cd8df1111e 100644 --- a/eth/api.go +++ b/eth/api.go @@ -44,6 +44,7 @@ import ( "github.com/scroll-tech/go-ethereum/rollup/rcfg" "github.com/scroll-tech/go-ethereum/rpc" "github.com/scroll-tech/go-ethereum/trie" + "github.com/syndtr/goleveldb/leveldb" ) // PublicEthereumAPI provides an API to access Ethereum full node-related @@ -384,7 +385,7 @@ func generateWitness(blockchain *core.BlockChain, block *types.Block) (*stateles func testWitness(blockchain *core.BlockChain, block *types.Block, witness *stateless.Witness) error { stateRoot := witness.Root() diskRoot, err := rawdb.ReadDiskStateRoot(blockchain.Database(), stateRoot) - if err != nil { + if err != nil && !errors.Is(err, leveldb.ErrNotFound) { return fmt.Errorf("failed to read disk state root for stateRoot %s: %w", stateRoot.Hex(), err) } if diskRoot != (common.Hash{}) { @@ -409,7 +410,7 @@ func testWitness(blockchain *core.BlockChain, block *types.Block, witness *state postStateRoot := block.Root() diskRoot, err = rawdb.ReadDiskStateRoot(blockchain.Database(), postStateRoot) - if err != nil { + if err != nil && !errors.Is(err, leveldb.ErrNotFound) { return fmt.Errorf("failed to read disk state root for postStateRoot %s: %w", postStateRoot.Hex(), err) } if diskRoot != (common.Hash{}) { diff --git a/params/version.go b/params/version.go index b9cfc5ce6b..4b80652f5b 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 8 // Minor version component of the current release - VersionPatch = 34 // Patch version component of the current release + VersionPatch = 35 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )