Skip to content

Commit 6b4c106

Browse files
lightsinglightsing
committed
Merge branch 'develop' into feat/axiom
# Conflicts: # Cargo.lock # Cargo.toml # crates/libzkp/src/tasks/batch.rs # crates/prover-bin/src/prover.rs # tests/prover-e2e/sepolia-galileo/.make.env # tests/prover-e2e/sepolia-galileo/00100_import_blocks.sql # zkvm-prover/Makefile
2 parents 43f1895 + 7de388e commit 6b4c106

File tree

63 files changed

+1198
-782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1198
-782
lines changed

‎Cargo.lock‎

Lines changed: 537 additions & 467 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ repository = "https://github.com/scroll-tech/scroll"
1717
version = "4.7.1"
1818

1919
[workspace.dependencies]
20-
scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0" }
21-
scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0" }
22-
scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0" }
20+
scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.1" }
21+
scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.1" }
22+
scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.1" }
2323

24-
sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91", features = ["scroll", "rkyv"] }
25-
sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" }
26-
sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91", features = ["scroll"] }
24+
sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2", features = ["scroll", "rkyv"] }
25+
sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2" }
26+
sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2", features = ["scroll"] }
2727
axiom-sdk = { git = "https://github.com/axiom-crypto/axiom-api-cli.git", branch = "feat/upload-exe-raw" }
2828

2929
alloy = { version = "1", default-features = false }

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: fmt dev_docker build_test_docker run_test_docker clean update
22

3-
L2GETH_TAG=scroll-v5.9.7
3+
L2GETH_TAG=scroll-v5.9.17
44

55
help: ## Display this help message
66
@grep -h \

‎bridge-history-api/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
github.com/go-redis/redis/v8 v8.11.5
1111
github.com/pressly/goose/v3 v3.16.0
1212
github.com/prometheus/client_golang v1.19.0
13-
github.com/scroll-tech/da-codec v0.9.0
14-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251113125950-906b730d541d
13+
github.com/scroll-tech/da-codec v0.10.0
14+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251128092113-8629f088d78f
1515
github.com/stretchr/testify v1.10.0
1616
github.com/urfave/cli/v2 v2.25.7
1717
golang.org/x/sync v0.11.0
@@ -21,7 +21,7 @@ require (
2121
// Hotfix for header hash incompatibility issue.
2222
// PR: https://github.com/scroll-tech/go-ethereum/pull/1133/
2323
// 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
24+
replace github.com/scroll-tech/go-ethereum => github.com/scroll-tech/go-ethereum v1.10.14-0.20251128092359-25d5bf6b817b
2525

2626
require (
2727
dario.cat/mergo v1.0.0 // indirect

‎bridge-history-api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
309309
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
310310
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
311311
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
312-
github.com/scroll-tech/da-codec v0.9.0 h1:UvHNdSJuVhi/j9pOH7SXkRck52/zeE8T35Fx6qTPW70=
313-
github.com/scroll-tech/da-codec v0.9.0/go.mod h1:w+vwIvNiWdiNHVE9yIY2Klx6G4s+SQhEJVSmVG/IsEQ=
314-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-47c22325665e h1:7U1/JilCPIqJTYNgKzlfBEkRNORRwJ8+PCmdR8/XK6A=
315-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117071111-47c22325665e/go.mod h1:6BVek7YliYh+YeHOSjguPw9GT9BhVBfThArxzVlpqdQ=
312+
github.com/scroll-tech/da-codec v0.10.0 h1:IPHxyTyXTWPV0Q+DZ08cod2fWkhUvrfysmj/VBpB+WU=
313+
github.com/scroll-tech/da-codec v0.10.0/go.mod h1:MBlIP4wCXPcUDZ/Ci2B7n/2IbVU1WBo9OTFTZ5ffE0U=
314+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251128092359-25d5bf6b817b h1:pMQKnroJoS/FeL1aOWkz7/u1iBHUP8PWjZstNuzoUGE=
315+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251128092359-25d5bf6b817b/go.mod h1:Aa/kD1XB+OV/7rRxMQrjcPCB4b0pKyLH0gsTrtuHi38=
316316
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
317317
github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
318318
github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=

‎common/go.mod‎

Lines changed: 2 additions & 2 deletions
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.20251117065849-b5c3dd1aa975
18+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251128092113-8629f088d78f
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
@@ -184,7 +184,7 @@ require (
184184
github.com/rjeczalik/notify v0.9.1 // indirect
185185
github.com/rs/cors v1.7.0 // indirect
186186
github.com/russross/blackfriday/v2 v2.1.0 // indirect
187-
github.com/scroll-tech/da-codec v0.9.0 // indirect
187+
github.com/scroll-tech/da-codec v0.10.0 // indirect
188188
github.com/scroll-tech/zktrie v0.8.4 // indirect
189189
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
190190
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect

‎common/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,10 +636,10 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
636636
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
637637
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
638638
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
639-
github.com/scroll-tech/da-codec v0.9.0 h1:UvHNdSJuVhi/j9pOH7SXkRck52/zeE8T35Fx6qTPW70=
640-
github.com/scroll-tech/da-codec v0.9.0/go.mod h1:w+vwIvNiWdiNHVE9yIY2Klx6G4s+SQhEJVSmVG/IsEQ=
641-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117065849-b5c3dd1aa975 h1:KluZffkRRJ4K9UyvH/r2g8Lp16/NSK8j26MR33hHmoQ=
642-
github.com/scroll-tech/go-ethereum v1.10.14-0.20251117065849-b5c3dd1aa975/go.mod h1:6BVek7YliYh+YeHOSjguPw9GT9BhVBfThArxzVlpqdQ=
639+
github.com/scroll-tech/da-codec v0.10.0 h1:IPHxyTyXTWPV0Q+DZ08cod2fWkhUvrfysmj/VBpB+WU=
640+
github.com/scroll-tech/da-codec v0.10.0/go.mod h1:MBlIP4wCXPcUDZ/Ci2B7n/2IbVU1WBo9OTFTZ5ffE0U=
641+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251128092113-8629f088d78f h1:j6SjP98MoWFFX9TwB1/nFYEkayqHQsrtE66Ll2C+oT0=
642+
github.com/scroll-tech/go-ethereum v1.10.14-0.20251128092113-8629f088d78f/go.mod h1:Aa/kD1XB+OV/7rRxMQrjcPCB4b0pKyLH0gsTrtuHi38=
643643
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
644644
github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
645645
github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=

‎common/testcontainers/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434

3535
# Sets up the genesis configuration for the go-ethereum client from a JSON file.
3636
geth-genesis:
37-
image: "ethereum/client-go:v1.13.14"
37+
image: "ethereum/client-go:v1.14.0"
3838
command: --datadir=/data/execution init /data/execution/genesis.json
3939
volumes:
4040
- data:/data
@@ -80,7 +80,7 @@ services:
8080
# Runs the go-ethereum execution client with the specified, unlocked account and necessary
8181
# APIs to allow for proof-of-stake consensus via Prysm.
8282
geth:
83-
image: "ethereum/client-go:v1.13.14"
83+
image: "ethereum/client-go:v1.14.0"
8484
command:
8585
- --http
8686
- --http.api=eth,net,web3

‎common/testcontainers/docker/l1geth/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ethereum/client-go:v1.13.14
1+
FROM ethereum/client-go:v1.14.0
22

33
COPY password /l1geth/
44
COPY genesis.json /l1geth/

‎common/testcontainers/testcontainers.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ func (t *TestcontainerApps) GetPoSL1EndPoint() (string, error) {
167167
return contrainer.PortEndpoint(context.Background(), "8545/tcp", "http")
168168
}
169169

170-
// GetPoSL1Client returns a ethclient by dialing running PoS L1 client
171-
func (t *TestcontainerApps) GetPoSL1Client() (*ethclient.Client, error) {
170+
// GetPoSL1Client returns a raw rpc client by dialing the L1 node
171+
func (t *TestcontainerApps) GetPoSL1Client() (*rpc.Client, error) {
172172
endpoint, err := t.GetPoSL1EndPoint()
173173
if err != nil {
174174
return nil, err
175175
}
176-
return ethclient.Dial(endpoint)
176+
return rpc.Dial(endpoint)
177177
}
178178

179179
// GetDBEndPoint returns the endpoint of the running postgres container
@@ -221,7 +221,6 @@ func (t *TestcontainerApps) GetGormDBClient() (*gorm.DB, error) {
221221

222222
// GetL2GethClient returns a ethclient by dialing running L2Geth
223223
func (t *TestcontainerApps) GetL2GethClient() (*ethclient.Client, error) {
224-
225224
rpcCli, err := t.GetL2Client()
226225
if err != nil {
227226
return nil, err

0 commit comments

Comments
 (0)