From e705c445336e2ca2a3b4a66199700d3a6958454b Mon Sep 17 00:00:00 2001 From: eastorski Date: Mon, 26 Jan 2026 21:47:47 +0000 Subject: [PATCH] Bumped major version of snapshot files --- db/state/domain_test.go | 8 ++--- db/state/statecfg/version_schema_gen.go | 44 ++++++++++++------------- db/state/statecfg/versions.yaml | 44 ++++++++++++------------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/db/state/domain_test.go b/db/state/domain_test.go index a24cb5289d2..82d121fee8d 100644 --- a/db/state/domain_test.go +++ b/db/state/domain_test.go @@ -208,9 +208,9 @@ func testCollationBuild(t *testing.T, compressDomainVals bool) { c, err := d.collate(ctx, 0, 0, 16, tx) require.NoError(t, err) - require.True(t, strings.HasSuffix(c.valuesPath, "v1.1-accounts.0-1.kv")) + require.True(t, strings.HasSuffix(c.valuesPath, "v2.0-accounts.0-1.kv")) require.Equal(t, 2, c.valuesCount) - require.True(t, strings.HasSuffix(c.historyPath, "v1.2"+ + require.True(t, strings.HasSuffix(c.historyPath, "v2.0"+ "-accounts.0-1.v")) require.Equal(t, seg.WordsAmount2PagesAmount(3, d.CompressorCfg.ValuesOnCompressedPage), 1) // 16 valus per page @@ -1150,9 +1150,9 @@ func TestDomain_CollationBuildInMem(t *testing.T) { c, err := d.collate(ctx, 0, 0, maxTx, tx) require.NoError(t, err) - require.True(t, strings.HasSuffix(c.valuesPath, "v1.1-accounts.0-1.kv")) + require.True(t, strings.HasSuffix(c.valuesPath, "v2.0-accounts.0-1.kv")) require.Equal(t, 3, c.valuesCount) - require.True(t, strings.HasSuffix(c.historyPath, "v1.2-accounts.0-1.v")) + require.True(t, strings.HasSuffix(c.historyPath, "v2.0-accounts.0-1.v")) require.Equal(t, seg.WordsAmount2PagesAmount(int(3*maxTx), d.CompressorCfg.ValuesOnCompressedPage), 469) // because 646 values at one page require.Equal(t, int(3*maxTx), c.historyComp.Count()/2) diff --git a/db/state/statecfg/version_schema_gen.go b/db/state/statecfg/version_schema_gen.go index a4d3cc3a31c..74648f26bec 100644 --- a/db/state/statecfg/version_schema_gen.go +++ b/db/state/statecfg/version_schema_gen.go @@ -6,56 +6,56 @@ import "github.com/erigontech/erigon/db/version" func InitSchemasGen() { Schema.AccountsDomain.FileVersion.AccessorBT = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.AccountsDomain.FileVersion.DataKV = version.Versions{version.Version{1, 1}, version.Version{1, 0}} + Schema.AccountsDomain.FileVersion.DataKV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.AccountsDomain.FileVersion.AccessorKVEI = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.AccountsDomain.Hist.FileVersion.DataV = version.Versions{version.Version{1, 2}, version.Version{1, 0}} + Schema.AccountsDomain.Hist.FileVersion.DataV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.AccountsDomain.Hist.FileVersion.AccessorVI = version.Versions{version.Version{1, 2}, version.Version{1, 0}} - Schema.AccountsDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.AccountsDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.AccountsDomain.Hist.IiCfg.FileVersion.AccessorEFI = version.Versions{version.Version{2, 1}, version.Version{1, 0}} Schema.BodiesBlock.FileVersion.AccessorIdx = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.BodiesBlock.FileVersion.DataSeg = version.Versions{version.Version{1, 1}, version.Version{1, 0}} Schema.CodeDomain.FileVersion.AccessorBT = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.CodeDomain.FileVersion.DataKV = version.Versions{version.Version{1, 1}, version.Version{1, 0}} + Schema.CodeDomain.FileVersion.DataKV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.CodeDomain.FileVersion.AccessorKVEI = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.CodeDomain.Hist.FileVersion.DataV = version.Versions{version.Version{1, 1}, version.Version{1, 0}} + Schema.CodeDomain.Hist.FileVersion.DataV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.CodeDomain.Hist.FileVersion.AccessorVI = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.CodeDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{2, 0}, version.Version{1, 0}} + Schema.CodeDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.CodeDomain.Hist.IiCfg.FileVersion.AccessorEFI = version.Versions{version.Version{2, 0}, version.Version{1, 0}} - Schema.CommitmentDomain.FileVersion.DataKV = version.Versions{version.Version{1, 1}, version.Version{1, 0}} + Schema.CommitmentDomain.FileVersion.DataKV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.CommitmentDomain.FileVersion.AccessorKVI = version.Versions{version.Version{2, 0}, version.Version{1, 0}} - Schema.CommitmentDomain.Hist.FileVersion.DataV = version.Versions{version.Version{1, 1}, version.Version{1, 0}} + Schema.CommitmentDomain.Hist.FileVersion.DataV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.CommitmentDomain.Hist.FileVersion.AccessorVI = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.CommitmentDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{2, 0}, version.Version{1, 0}} + Schema.CommitmentDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.CommitmentDomain.Hist.IiCfg.FileVersion.AccessorEFI = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.HeadersBlock.FileVersion.AccessorIdx = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.HeadersBlock.FileVersion.DataSeg = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.LogAddrIdx.FileVersion.DataEF = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.LogAddrIdx.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.LogAddrIdx.FileVersion.AccessorEFI = version.Versions{version.Version{2, 1}, version.Version{1, 0}} - Schema.LogTopicIdx.FileVersion.DataEF = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.LogTopicIdx.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.LogTopicIdx.FileVersion.AccessorEFI = version.Versions{version.Version{2, 1}, version.Version{1, 0}} - Schema.RCacheDomain.FileVersion.DataKV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} + Schema.RCacheDomain.FileVersion.DataKV = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.RCacheDomain.FileVersion.AccessorKVI = version.Versions{version.Version{2, 0}, version.Version{1, 0}} - Schema.RCacheDomain.Hist.FileVersion.DataV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} + Schema.RCacheDomain.Hist.FileVersion.DataV = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.RCacheDomain.Hist.FileVersion.AccessorVI = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.RCacheDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{2, 0}, version.Version{1, 0}} + Schema.RCacheDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.RCacheDomain.Hist.IiCfg.FileVersion.AccessorEFI = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.ReceiptDomain.FileVersion.AccessorBT = version.Versions{version.Version{1, 2}, version.Version{1, 0}} - Schema.ReceiptDomain.FileVersion.DataKV = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.ReceiptDomain.FileVersion.DataKV = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.ReceiptDomain.FileVersion.AccessorKVEI = version.Versions{version.Version{1, 2}, version.Version{1, 0}} - Schema.ReceiptDomain.Hist.FileVersion.DataV = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.ReceiptDomain.Hist.FileVersion.DataV = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.ReceiptDomain.Hist.FileVersion.AccessorVI = version.Versions{version.Version{1, 2}, version.Version{1, 0}} - Schema.ReceiptDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.ReceiptDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.ReceiptDomain.Hist.IiCfg.FileVersion.AccessorEFI = version.Versions{version.Version{2, 1}, version.Version{1, 0}} Schema.StorageDomain.FileVersion.AccessorBT = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.StorageDomain.FileVersion.DataKV = version.Versions{version.Version{1, 1}, version.Version{1, 0}} + Schema.StorageDomain.FileVersion.DataKV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.StorageDomain.FileVersion.AccessorKVEI = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.StorageDomain.Hist.FileVersion.DataV = version.Versions{version.Version{1, 1}, version.Version{1, 0}} + Schema.StorageDomain.Hist.FileVersion.DataV = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.StorageDomain.Hist.FileVersion.AccessorVI = version.Versions{version.Version{1, 1}, version.Version{1, 0}} - Schema.StorageDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{2, 0}, version.Version{1, 0}} + Schema.StorageDomain.Hist.IiCfg.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.StorageDomain.Hist.IiCfg.FileVersion.AccessorEFI = version.Versions{version.Version{2, 0}, version.Version{1, 0}} - Schema.TracesFromIdx.FileVersion.DataEF = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.TracesFromIdx.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.TracesFromIdx.FileVersion.AccessorEFI = version.Versions{version.Version{2, 1}, version.Version{1, 0}} - Schema.TracesToIdx.FileVersion.DataEF = version.Versions{version.Version{2, 1}, version.Version{1, 0}} + Schema.TracesToIdx.FileVersion.DataEF = version.Versions{version.Version{3, 0}, version.Version{1, 0}} Schema.TracesToIdx.FileVersion.AccessorEFI = version.Versions{version.Version{2, 1}, version.Version{1, 0}} Schema.TransactionsBlock.FileVersion.AccessorIdx = version.Versions{version.Version{2, 0}, version.Version{1, 0}} Schema.TransactionsBlock.FileVersion.DataSeg = version.Versions{version.Version{1, 1}, version.Version{1, 0}} diff --git a/db/state/statecfg/versions.yaml b/db/state/statecfg/versions.yaml index 105d7bfb3f1..7d04ba6c711 100644 --- a/db/state/statecfg/versions.yaml +++ b/db/state/statecfg/versions.yaml @@ -4,21 +4,21 @@ accounts: current: v1.1 min: v1.0 kv: - current: v1.1 + current: v2.0 min: v1.0 kvei: current: v1.1 min: v1.0 hist: v: - current: v1.2 + current: v2.0 min: v1.0 vi: current: v1.2 min: v1.0 ii: ef: - current: v2.1 + current: v3.0 min: v1.0 efi: current: v2.1 @@ -37,21 +37,21 @@ code: current: v1.1 min: v1.0 kv: - current: v1.1 + current: v2.0 min: v1.0 kvei: current: v1.1 min: v1.0 hist: v: - current: v1.1 + current: v2.0 min: v1.0 vi: current: v1.1 min: v1.0 ii: ef: - current: v2.0 + current: v3.0 min: v1.0 efi: current: v2.0 @@ -59,21 +59,21 @@ code: commitment: domain: kv: - current: v1.1 + current: v2.0 min: v1.0 kvi: current: v2.0 min: v1.0 hist: v: - current: v1.1 + current: v2.0 min: v1.0 vi: current: v1.1 min: v1.0 ii: ef: - current: v2.0 + current: v3.0 min: v1.0 efi: current: v2.0 @@ -89,7 +89,7 @@ headers: logaddrs: ii: ef: - current: v2.1 + current: v3.0 min: v1.0 efi: current: v2.1 @@ -97,7 +97,7 @@ logaddrs: logtopics: ii: ef: - current: v2.1 + current: v3.0 min: v1.0 efi: current: v2.1 @@ -105,21 +105,21 @@ logtopics: rcache: domain: kv: - current: v2.0 + current: v3.0 min: v1.0 kvi: current: v2.0 min: v1.0 hist: v: - current: v2.0 + current: v3.0 min: v1.0 vi: current: v1.1 min: v1.0 ii: ef: - current: v2.0 + current: v3.0 min: v1.0 efi: current: v2.0 @@ -130,21 +130,21 @@ receipt: current: v1.2 min: v1.0 kv: - current: v2.1 + current: v3.0 min: v1.0 kvei: current: v1.2 min: v1.0 hist: v: - current: v2.1 + current: v3.0 min: v1.0 vi: current: v1.2 min: v1.0 ii: ef: - current: v2.1 + current: v3.0 min: v1.0 efi: current: v2.1 @@ -155,21 +155,21 @@ storage: current: v1.1 min: v1.0 kv: - current: v1.1 + current: v2.0 min: v1.0 kvei: current: v1.1 min: v1.0 hist: v: - current: v1.1 + current: v2.0 min: v1.0 vi: current: v1.1 min: v1.0 ii: ef: - current: v2.0 + current: v3.0 min: v1.0 efi: current: v2.0 @@ -177,7 +177,7 @@ storage: tracesfrom: ii: ef: - current: v2.1 + current: v3.0 min: v1.0 efi: current: v2.1 @@ -185,7 +185,7 @@ tracesfrom: tracesto: ii: ef: - current: v2.1 + current: v3.0 min: v1.0 efi: current: v2.1