diff --git a/.golangci.yml b/.golangci.yml index 2b408743a1..7c75529f61 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,7 @@ # This file configures github.com/golangci/golangci-lint. version: '2' run: - go: 1.25.4 + go: 1.25.5 tests: true linters: default: none diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go index 7b4a307930..3bb7919f1f 100644 --- a/core/rawdb/freezer.go +++ b/core/rawdb/freezer.go @@ -125,6 +125,8 @@ func NewFreezer(datadir string, namespace string, readonly bool, offset uint64, instanceLock: lock, } + freezer.offset.Store(offset) + // Create the tables. for name, config := range tables { table, err := newTable(datadir, name, readMeter, writeMeter, sizeGauge, maxTableSize, config, readonly) @@ -154,6 +156,10 @@ func NewFreezer(datadir string, namespace string, readonly bool, offset uint64, return nil, err } + // Some blocks in ancientDB may have already been frozen and been pruned, so adding the offset to + // represent the absolute number of blocks already frozen. + freezer.frozen.Add(offset) + // Create the write batch. freezer.writeBatch = newFreezerBatch(freezer) diff --git a/go.mod b/go.mod index 51ae707efc..92691d6a48 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/ethereum/go-ethereum // Note: Change the go image version in Dockerfile if you change this. -go 1.25.4 +go 1.25.5 require ( github.com/0xPolygon/crand v1.0.3 diff --git a/params/version.go b/params/version.go index ca157b66db..013e045f8c 100644 --- a/params/version.go +++ b/params/version.go @@ -25,7 +25,7 @@ import ( const ( VersionMajor = 2 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release - VersionPatch = 2 // Patch version component of the current release + VersionPatch = 3 // Patch version component of the current release VersionMeta = "" // Version metadata to append to the version string )