forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-10 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(miner,rpc): fix updateSnapshot (#916)

Browse source 
* fix `updateSnapshot`

* fix

* chore: auto version bump [bot]

---------

Co-authored-by: HAOYUatHZ <HAOYUatHZ@users.noreply.github.com>
This commit is contained in:
HAOYUatHZ 2024-07-23 22:22:51 +08:00 committed by GitHub
parent de0385e7d2
commit 9ee6976fe5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
miner/scroll_worker.go
View file

@ -541,12 +541,13 @@ func (w *worker) handlePipelineResult(res *pipeline.Result) error {
w.currentPipeline.Release() w.currentPipeline.Release()
w.currentPipeline = nil 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, // 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. // which means that we are not the sequencer. Do not attempt to commit.
if res.Rows == nil && res.OverflowingTx == nil { if res.Rows == nil && res.OverflowingTx == nil {
if res.FinalBlock != nil {
w.updateSnapshot(res.FinalBlock)
}
return nil return nil
} }

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const ( const (
VersionMajor = 5 // Major version component of the current release VersionMajor = 5 // Major version component of the current release
VersionMinor = 5 // Minor 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 VersionMeta = "mainnet" // Version metadata to append to the version string
) )