From 9ee6976fe536b62fa13c1f2e97d007dca64b0cb4 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Date: Tue, 23 Jul 2024 22:22:51 +0800 Subject: [PATCH] fix(miner,rpc): fix `updateSnapshot` (#916) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix `updateSnapshot` * fix * chore: auto version bump [bot] --------- Co-authored-by: HAOYUatHZ --- miner/scroll_worker.go | 7 ++++--- params/version.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/miner/scroll_worker.go b/miner/scroll_worker.go index 036718062a..9b1be0c9c9 100644 --- a/miner/scroll_worker.go +++ b/miner/scroll_worker.go @@ -541,12 +541,13 @@ func (w *worker) handlePipelineResult(res *pipeline.Result) error { w.currentPipeline.Release() w.currentPipeline = nil + if res.FinalBlock != nil { + w.updateSnapshot(res.FinalBlock) + } + // Rows being nil without an OverflowingTx means that block didn't go thru CCC, // which means that we are not the sequencer. Do not attempt to commit. if res.Rows == nil && res.OverflowingTx == nil { - if res.FinalBlock != nil { - w.updateSnapshot(res.FinalBlock) - } return nil } diff --git a/params/version.go b/params/version.go index 6abfdd8406..500e4dc033 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 = 5 // Minor version component of the current release - VersionPatch = 14 // Patch version component of the current release + VersionPatch = 15 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )