Skip to content

Commit e1b9f57

Browse files
authored
Explicit DefaultSnapshotGitBranch release/3.0 (#14196)
Cherry pick PR #14188 and set DefaultSnapshotGitBranch to release/3.0
1 parent d3a91ec commit e1b9f57

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

erigon-lib/chain/snapcfg/util.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,15 @@ import (
3535
"github.com/erigontech/erigon-snapshot/webseed"
3636

3737
"github.com/erigontech/erigon-lib/chain/networkname"
38+
"github.com/erigontech/erigon-lib/common/dbg"
3839
"github.com/erigontech/erigon-lib/downloader/snaptype"
3940
)
4041

42+
// TODO(yperbasis) move into params/version.go
43+
const DefaultSnapshotGitBranch = "release/3.0"
44+
45+
var snapshotGitBranch = dbg.EnvString("SNAPS_GIT_BRANCH", DefaultSnapshotGitBranch)
46+
4147
var (
4248
Mainnet = fromToml(snapshothashes.Mainnet)
4349
Holesky = fromToml(snapshothashes.Holesky)
@@ -553,7 +559,7 @@ func webseedsParse(in []byte) (res []string) {
553559
}
554560

555561
func LoadRemotePreverified(ctx context.Context) (loaded bool, err error) {
556-
loaded, err = snapshothashes.LoadSnapshots(ctx)
562+
loaded, err = snapshothashes.LoadSnapshots(ctx, snapshotGitBranch)
557563
if err != nil {
558564
return false, err
559565
}

erigon-lib/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace (
99
)
1010

1111
require (
12-
github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89
12+
github.com/erigontech/erigon-snapshot v1.3.1-0.20250317154231-2ce6d6e9e6fc
1313
github.com/erigontech/interfaces v0.0.0-20241120074553-214b5fd396ed
1414
github.com/erigontech/mdbx-go v0.38.6-0.20250205222432-e4dd01978d7f
1515
github.com/erigontech/secp256k1 v1.1.0

erigon-lib/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
150150
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
151151
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
152152
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
153-
github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89 h1:7NYivXuTuHccvDDpaeVid3Sp21T7VFcNVWyJtKaYe6Y=
154-
github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
153+
github.com/erigontech/erigon-snapshot v1.3.1-0.20250317154231-2ce6d6e9e6fc h1:MAuInN3QwppF4OXno4JkhwjMD1ece29ayvDFIUELQ6k=
154+
github.com/erigontech/erigon-snapshot v1.3.1-0.20250317154231-2ce6d6e9e6fc/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
155155
github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86 h1:UKcIbFZUGIKzK4aQbkv/dYiOVxZSUuD3zKadhmfwdwU=
156156
github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86/go.mod h1:JolLjpSff1tCCJKaJx4psrlEdlXuJEC996PL3tTAFks=
157157
github.com/erigontech/interfaces v0.0.0-20241120074553-214b5fd396ed h1:un44S8Tuol4LBIC6R94t93GShM53BYjz7GsNPziDLQ8=

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ require (
173173
github.com/docker/go-units v0.5.0 // indirect
174174
github.com/dustin/go-humanize v1.0.1 // indirect
175175
github.com/elastic/gosigar v0.14.3 // indirect
176-
github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89 // indirect
176+
github.com/erigontech/erigon-snapshot v1.3.1-0.20250317154231-2ce6d6e9e6fc // indirect
177177
github.com/flynn/noise v1.1.0 // indirect
178178
github.com/francoispqt/gojay v1.2.13 // indirect
179179
github.com/fsnotify/fsnotify v1.6.0 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
265265
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
266266
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
267267
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
268-
github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89 h1:7NYivXuTuHccvDDpaeVid3Sp21T7VFcNVWyJtKaYe6Y=
269-
github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
268+
github.com/erigontech/erigon-snapshot v1.3.1-0.20250317154231-2ce6d6e9e6fc h1:MAuInN3QwppF4OXno4JkhwjMD1ece29ayvDFIUELQ6k=
269+
github.com/erigontech/erigon-snapshot v1.3.1-0.20250317154231-2ce6d6e9e6fc/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
270270
github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116 h1:KCFa2uXEfZoBjV4buzjWmCmoqVLXiGCq0ZmQ2OjeRvQ=
271271
github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116/go.mod h1:8vQ+VjvLu2gkPs8EwdPrOTAAo++WuLuBi54N7NuAF0I=
272272
github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86 h1:UKcIbFZUGIKzK4aQbkv/dYiOVxZSUuD3zKadhmfwdwU=

0 commit comments

Comments
 (0)