forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-28 07:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: use non-overlapping DB prefix for L1 messages (#532)

Browse source 
* fix: use non-overlapping db prefix for L1 messages

* bump version
This commit is contained in:
Péter Garamvölgyi 2023-10-04 19:28:26 +02:00 committed by GitHub
parent fea7d94ebd
commit 68697b0fee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/utils/flags.go
View file

@ -1828,6 +1828,12 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
SetDNSDiscoveryDefaults(cfg, params.MainnetGenesisHash)
}
}
// set db prefix for backward-compatibility
if cfg.NetworkId == 534351 {
log.Warn("Using legacy db prefix for L1 messages")
rawdb.SetL1MessageLegacyPrefix()
}
}
// SetDNSDiscoveryDefaults configures DNS discovery with the given URL if

4
core/rawdb/database.go
View file

@ -324,6 +324,7 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
bloomBits stat
cliqueSnaps stat
l1Messages stat
l1MessagesOld stat
lastL1Message stat
// Ancient store statistics
@ -386,6 +387,8 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
cliqueSnaps.Add(size)
case bytes.HasPrefix(key, l1MessagePrefix) && len(key) == len(l1MessagePrefix)+8:
l1Messages.Add(size)
case bytes.HasPrefix(key, l1MessageLegacyPrefix) && len(key) == len(l1MessageLegacyPrefix)+8:
l1MessagesOld.Add(size)
case bytes.HasPrefix(key, firstQueueIndexNotInL2BlockPrefix) && len(key) == len(firstQueueIndexNotInL2BlockPrefix)+common.HashLength:
lastL1Message.Add(size)
case bytes.HasPrefix(key, []byte("cht-")) ||
@ -451,6 +454,7 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
{"Key-Value store", "Clique snapshots", cliqueSnaps.Size(), cliqueSnaps.Count()},
{"Key-Value store", "Singleton metadata", metadata.Size(), metadata.Count()},
{"Key-Value store", "L1 messages", l1Messages.Size(), l1Messages.Count()},
{"Key-Value store", "L1 messages (legacy prefix)", l1MessagesOld.Size(), l1MessagesOld.Count()},
{"Key-Value store", "Last L1 message", lastL1Message.Size(), lastL1Message.Count()},
{"Ancient store", "Headers", ancientHeadersSize.String(), ancients.String()},
{"Ancient store", "Bodies", ancientBodiesSize.String(), ancients.String()},

10
core/rawdb/schema.go
View file

@ -105,7 +105,8 @@ var (
// Scroll L1 message store
syncedL1BlockNumberKey = []byte("LastSyncedL1BlockNumber")
l1MessagePrefix = []byte("l1") // l1MessagePrefix + queueIndex (uint64 big endian) -> L1MessageTx
l1MessageLegacyPrefix = []byte("l1")
l1MessagePrefix = []byte("L1") // l1MessagePrefix + queueIndex (uint64 big endian) -> L1MessageTx
firstQueueIndexNotInL2BlockPrefix = []byte("q") // firstQueueIndexNotInL2BlockPrefix + L2 block hash -> enqueue index
highestSyncedQueueIndexKey = []byte("HighestSyncedQueueIndex")
@ -118,6 +119,13 @@ var (
skippedTransactionHashPrefix = []byte("sh") // skippedTransactionHashPrefix + index -> tx hash
)
// Use the updated "L1" prefix on all new networks
// to avoid overlap with txLookupPrefix.
// Use the legacy "l1" prefix on Scroll Sepolia.
func SetL1MessageLegacyPrefix() {
l1MessagePrefix = l1MessageLegacyPrefix
}
const (
// freezerHeaderTable indicates the name of the freezer header table.
freezerHeaderTable = "headers"

4
params/version.go
View file

@ -23,8 +23,8 @@ import (
const (
VersionMajor = 4 // Major version component of the current release
VersionMinor = 4 // Minor version component of the current release
VersionPatch = 19 // Patch version component of the current release
VersionMinor = 5 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "sepolia" // Version metadata to append to the version string
)