Skip to content

Commit 839d274

Browse files
committed
upgrade go-ethereum
1 parent f62fdbb commit 839d274

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

bridge-history-api/go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ require (
1818
gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
1919
)
2020

21-
replace github.com/scroll-tech/go-ethereum => github.com/scroll-tech/go-ethereum v1.10.14-0.20251017081611-2bc7a5482dcc // It's a hotfix for the header hash incompatibility issue, pls change this with caution
21+
// Hotfix for header hash incompatibility issue.
22+
// PR: https://github.com/scroll-tech/go-ethereum/pull/1133/
23+
// CAUTION: Requires careful handling. When upgrading go-ethereum, ensure this fix remains up-to-date in this branch.
24+
replace github.com/scroll-tech/go-ethereum => github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-47c22325665e
2225

2326
require (
2427
dario.cat/mergo v1.0.0 // indirect

common/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/modern-go/reflect2 v1.0.2
1616
github.com/orcaman/concurrent-map v1.0.0
1717
github.com/prometheus/client_golang v1.19.0
18-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251017054300-9aa8b3f38f63
18+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-b5c3dd1aa975
1919
github.com/stretchr/testify v1.10.0
2020
github.com/testcontainers/testcontainers-go v0.30.0
2121
github.com/testcontainers/testcontainers-go/modules/compose v0.30.0

coordinator/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/mitchellh/mapstructure v1.5.0
1111
github.com/prometheus/client_golang v1.19.0
1212
github.com/scroll-tech/da-codec v0.9.0
13-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251017054300-9aa8b3f38f63
13+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-b5c3dd1aa975
1414
github.com/shopspring/decimal v1.3.1
1515
github.com/stretchr/testify v1.10.0
1616
github.com/urfave/cli/v2 v2.25.7

database/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/jmoiron/sqlx v1.3.5
99
github.com/lib/pq v1.10.9
1010
github.com/pressly/goose/v3 v3.16.0
11-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251017054300-9aa8b3f38f63
11+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251017054300-b5c3dd1aa975
1212
github.com/stretchr/testify v1.10.0
1313
github.com/urfave/cli/v2 v2.25.7
1414
)

go.work.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,6 +1421,8 @@ github.com/scroll-tech/go-ethereum v1.10.14-0.20240821074444-b3fa00861e5e/go.mod
14211421
github.com/scroll-tech/go-ethereum v1.10.14-0.20241010064814-3d88e870ae22/go.mod h1:r9FwtxCtybMkTbWYCyBuevT9TW3zHmOTHqD082Uh+Oo=
14221422
github.com/scroll-tech/go-ethereum v1.10.14-0.20250206083728-ea43834c198f/go.mod h1:Ik3OBLl7cJxPC+CFyCBYNXBPek4wpdzkWehn/y5qLM8=
14231423
github.com/scroll-tech/go-ethereum v1.10.14-0.20250225152658-bcfdb48dd939/go.mod h1:AgU8JJxC7+nfs7R7ma35AU7dMAGW7wCw3dRZRefIKyQ=
1424+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-47c22325665e h1:7U1/JilCPIqJTYNgKzlfBEkRNORRwJ8+PCmdR8/XK6A=
1425+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-47c22325665e/go.mod h1:6BVek7YliYh+YeHOSjguPw9GT9BhVBfThArxzVlpqdQ=
14241426
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
14251427
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
14261428
github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=

rollup/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/mitchellh/mapstructure v1.5.0
1717
github.com/prometheus/client_golang v1.16.0
1818
github.com/scroll-tech/da-codec v0.9.0
19-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251017054300-9aa8b3f38f63
19+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-b5c3dd1aa975
2020
github.com/smartystreets/goconvey v1.8.0
2121
github.com/spf13/viper v1.19.0
2222
github.com/stretchr/testify v1.10.0

tests/integration-test/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.2
66

77
require (
88
github.com/scroll-tech/da-codec v0.1.3-0.20250826112206-b4cce5c5d178
9-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251017054300-9aa8b3f38f63
9+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-b5c3dd1aa975
1010
github.com/stretchr/testify v1.10.0
1111
gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
1212
)

0 commit comments

Comments
 (0)