Skip to content

1.1zation (cp from 3.1) #16389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 7, 2025
Merged

1.1zation (cp from 3.1) #16389

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc03d88
[r3.1] v1.1zation of e3.1 snapshots (#16346)
JkLondon Jul 29, 2025
a0614aa
[r3.1] 1.1zation ci fix (#16365)
JkLondon Jul 30, 2025
09198e7
Merge branch 'main' into jklondon/1-1-zation-main
Aug 5, 2025
4a8fd10
Merge branch 'main' into jklondon/1-1-zation-main
Aug 6, 2025
32e7eb6
Merge branch 'main' into jklondon/1-1-zation-main
Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 8 additions & 32 deletions erigon-db/snaptype/block_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ var (
Headers = snaptype.RegisterType(
Enums.Headers,
"headers",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
[]snaptype.Index{Indexes.HeaderHash},
snaptype.IndexBuilderFunc(
Expand Down Expand Up @@ -145,10 +142,7 @@ var (
Bodies = snaptype.RegisterType(
Enums.Bodies,
"bodies",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
[]snaptype.Index{Indexes.BodyHash},
snaptype.IndexBuilderFunc(
Expand Down Expand Up @@ -182,10 +176,7 @@ var (
Transactions = snaptype.RegisterType(
Enums.Transactions,
"transactions",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
[]snaptype.Index{Indexes.TxnHash, Indexes.TxnHash2BlockNum},
snaptype.IndexBuilderFunc(
Expand Down Expand Up @@ -352,32 +343,23 @@ var (
Domains = snaptype.RegisterType(
Enums.Domains,
"domain",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
nil,
nil,
)
Histories = snaptype.RegisterType(
Enums.Histories,
"history",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
nil,
nil,
)
InvertedIndicies = snaptype.RegisterType(
Enums.InvertedIndicies,
"idx",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
nil,
nil,
Expand All @@ -386,10 +368,7 @@ var (
Accessors = snaptype.RegisterType(
Enums.Accessor,
"accessor",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
nil,
nil,
Expand All @@ -398,10 +377,7 @@ var (
Txt = snaptype.RegisterType(
Enums.Txt,
"txt",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
nil,
nil,
nil,
Expand Down
22 changes: 8 additions & 14 deletions erigon-lib/snaptype/caplin_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,16 @@ import "github.com/erigontech/erigon-lib/version"

var (
BeaconBlocks = snapType{
enum: CaplinEnums.BeaconBlocks,
name: "beaconblocks",
versions: Versions{
Current: version.V1_0,
MinSupported: version.V1_0,
},
indexes: []Index{CaplinIndexes.BeaconBlockSlot},
enum: CaplinEnums.BeaconBlocks,
name: "beaconblocks",
versions: version.V1_1_standart,
indexes: []Index{CaplinIndexes.BeaconBlockSlot},
}
BlobSidecars = snapType{
enum: CaplinEnums.BlobSidecars,
name: "blobsidecars",
versions: Versions{
Current: version.V1_0,
MinSupported: version.V1_0,
},
indexes: []Index{CaplinIndexes.BlobSidecarSlot},
enum: CaplinEnums.BlobSidecars,
name: "blobsidecars",
versions: version.V1_1_standart,
indexes: []Index{CaplinIndexes.BlobSidecarSlot},
}

CaplinSnapshotTypes = []Type{BeaconBlocks, BlobSidecars}
Expand Down
9 changes: 5 additions & 4 deletions erigon-lib/state/domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,10 @@ 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.0-accounts.0-1.kv"))
require.True(t, strings.HasSuffix(c.valuesPath, "v1.1-accounts.0-1.kv"))
require.Equal(t, 2, c.valuesCount)
require.True(t, strings.HasSuffix(c.historyPath, "v1.0-accounts.0-1.v"))
require.True(t, strings.HasSuffix(c.historyPath, "v1.1"+
"-accounts.0-1.v"))
require.Equal(t, seg.WordsAmount2PagesAmount(3, d.historyValuesOnCompressedPage), c.historyComp.Count())
require.Equal(t, 2*c.valuesCount, c.efHistoryComp.Count())

Expand Down Expand Up @@ -1136,9 +1137,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.0-accounts.0-1.kv"))
require.True(t, strings.HasSuffix(c.valuesPath, "v1.1-accounts.0-1.kv"))
require.Equal(t, 3, c.valuesCount)
require.True(t, strings.HasSuffix(c.historyPath, "v1.0-accounts.0-1.v"))
require.True(t, strings.HasSuffix(c.historyPath, "v1.1-accounts.0-1.v"))
require.Equal(t, seg.WordsAmount2PagesAmount(int(3*maxTx), d.hist.historyValuesOnCompressedPage), c.historyComp.Count())
require.Equal(t, 3, c.efHistoryComp.Count()/2)

Expand Down
44 changes: 22 additions & 22 deletions erigon-lib/state/version_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,49 @@ import (
)

func InitSchemas() {
Schema.AccountsDomain.version.DataKV = version.V1_0_standart
Schema.AccountsDomain.version.AccessorBT = version.V1_0_standart
Schema.AccountsDomain.version.AccessorKVEI = version.V1_0_standart
Schema.AccountsDomain.hist.version.DataV = version.V1_0_standart
Schema.AccountsDomain.hist.version.AccessorVI = version.V1_0_standart
Schema.AccountsDomain.version.DataKV = version.V1_1_standart
Schema.AccountsDomain.version.AccessorBT = version.V1_1_standart
Schema.AccountsDomain.version.AccessorKVEI = version.V1_1_standart
Schema.AccountsDomain.hist.version.DataV = version.V1_1_standart
Schema.AccountsDomain.hist.version.AccessorVI = version.V1_1_standart
Schema.AccountsDomain.hist.iiCfg.version.DataEF = version.V2_0_standart
Schema.AccountsDomain.hist.iiCfg.version.AccessorEFI = version.V2_0_standart

Schema.StorageDomain.version.DataKV = version.V1_0_standart
Schema.StorageDomain.version.AccessorBT = version.V1_0_standart
Schema.StorageDomain.version.AccessorKVEI = version.V1_0_standart
Schema.StorageDomain.hist.version.DataV = version.V1_0_standart
Schema.StorageDomain.hist.version.AccessorVI = version.V1_0_standart
Schema.StorageDomain.version.DataKV = version.V1_1_standart
Schema.StorageDomain.version.AccessorBT = version.V1_1_standart
Schema.StorageDomain.version.AccessorKVEI = version.V1_1_standart
Schema.StorageDomain.hist.version.DataV = version.V1_1_standart
Schema.StorageDomain.hist.version.AccessorVI = version.V1_1_standart
Schema.StorageDomain.hist.iiCfg.version.DataEF = version.V2_0_standart
Schema.StorageDomain.hist.iiCfg.version.AccessorEFI = version.V2_0_standart

Schema.CodeDomain.version.DataKV = version.V1_0_standart
Schema.CodeDomain.version.AccessorBT = version.V1_0_standart
Schema.CodeDomain.version.AccessorKVEI = version.V1_0_standart
Schema.CodeDomain.hist.version.DataV = version.V1_0_standart
Schema.CodeDomain.hist.version.AccessorVI = version.V1_0_standart
Schema.CodeDomain.version.DataKV = version.V1_1_standart
Schema.CodeDomain.version.AccessorBT = version.V1_1_standart
Schema.CodeDomain.version.AccessorKVEI = version.V1_1_standart
Schema.CodeDomain.hist.version.DataV = version.V1_1_standart
Schema.CodeDomain.hist.version.AccessorVI = version.V1_1_standart
Schema.CodeDomain.hist.iiCfg.version.DataEF = version.V2_0_standart
Schema.CodeDomain.hist.iiCfg.version.AccessorEFI = version.V2_0_standart

Schema.CommitmentDomain.version.DataKV = version.V1_0_standart
Schema.CommitmentDomain.version.DataKV = version.V1_1_standart
Schema.CommitmentDomain.version.AccessorKVI = version.V2_0_standart
Schema.CommitmentDomain.hist.version.DataV = version.V1_0_standart
Schema.CommitmentDomain.hist.version.AccessorVI = version.V1_0_standart
Schema.CommitmentDomain.hist.version.DataV = version.V1_1_standart
Schema.CommitmentDomain.hist.version.AccessorVI = version.V1_1_standart
Schema.CommitmentDomain.hist.iiCfg.version.DataEF = version.V2_0_standart
Schema.CommitmentDomain.hist.iiCfg.version.AccessorEFI = version.V2_0_standart

Schema.ReceiptDomain.version.DataKV = version.V2_0_standart
Schema.ReceiptDomain.version.AccessorBT = version.V1_0_standart
Schema.ReceiptDomain.version.AccessorKVEI = version.V1_0_standart
Schema.ReceiptDomain.version.AccessorBT = version.V1_1_standart
Schema.ReceiptDomain.version.AccessorKVEI = version.V1_1_standart
Schema.ReceiptDomain.hist.version.DataV = version.V2_0_standart
Schema.ReceiptDomain.hist.version.AccessorVI = version.V1_0_standart
Schema.ReceiptDomain.hist.version.AccessorVI = version.V1_1_standart
Schema.ReceiptDomain.hist.iiCfg.version.DataEF = version.V2_0_standart
Schema.ReceiptDomain.hist.iiCfg.version.AccessorEFI = version.V2_0_standart

Schema.RCacheDomain.version.DataKV = version.V2_0_standart
Schema.RCacheDomain.version.AccessorKVI = version.V2_0_standart
Schema.RCacheDomain.hist.version.DataV = version.V2_0_standart
Schema.RCacheDomain.hist.version.AccessorVI = version.V1_0_standart
Schema.RCacheDomain.hist.version.AccessorVI = version.V1_1_standart
Schema.RCacheDomain.hist.iiCfg.version.DataEF = version.V2_0_standart
Schema.RCacheDomain.hist.iiCfg.version.AccessorEFI = version.V2_0_standart

Expand Down
20 changes: 4 additions & 16 deletions polygon/heimdall/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,7 @@ var (
Events = snaptype.RegisterType(
Enums.Events,
"borevents",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
EventRangeExtractor{},
[]snaptype.Index{Indexes.BorTxnHash},
snaptype.IndexBuilderFunc(
Expand Down Expand Up @@ -259,10 +256,7 @@ var (
Spans = snaptype.RegisterType(
Enums.Spans,
"borspans",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
snaptype.RangeExtractorFunc(
func(ctx context.Context, blockFrom, blockTo uint64, firstKeyGetter snaptype.FirstKeyGetter, db kv.RoDB, _ *chain.Config, collect func([]byte) error, workers int, lvl log.Lvl, logger log.Logger, hashResolver snaptype.BlockHashResolver) (uint64, error) {
spanFrom := uint64(SpanIdAt(blockFrom))
Expand Down Expand Up @@ -291,10 +285,7 @@ var (
Checkpoints = snaptype.RegisterType(
Enums.Checkpoints,
"borcheckpoints",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
snaptype.RangeExtractorFunc(
func(ctx context.Context, blockFrom, blockTo uint64, firstKeyGetter snaptype.FirstKeyGetter, db kv.RoDB, _ *chain.Config, collect func([]byte) error, workers int, lvl log.Lvl, logger log.Logger, hashResolver snaptype.BlockHashResolver) (uint64, error) {
var checkpointTo, checkpointFrom CheckpointId
Expand Down Expand Up @@ -359,10 +350,7 @@ var (
Milestones = snaptype.RegisterType(
Enums.Milestones,
"bormilestones",
snaptype.Versions{
Current: version.V1_0, //2,
MinSupported: version.V1_0,
},
version.V1_1_standart,
snaptype.RangeExtractorFunc(
func(ctx context.Context, blockFrom, blockTo uint64, firstKeyGetter snaptype.FirstKeyGetter, db kv.RoDB, _ *chain.Config, collect func([]byte) error, workers int, lvl log.Lvl, logger log.Logger, hashResolver snaptype.BlockHashResolver) (uint64, error) {
var milestoneFrom, milestoneTo MilestoneId
Expand Down
Loading