Skip to content

Commit 4725d8a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into coordinator_proxy
2 parents 322766f + 7ff5b19 commit 4725d8a

File tree

45 files changed

+931
-949
lines changed

Some content is hidden

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

45 files changed

+931
-949
lines changed

Cargo.lock

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

Cargo.toml

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

1919
[workspace.dependencies]
20-
scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1", package = "scroll-zkvm-prover" }
21-
scroll-zkvm-verifier-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1", package = "scroll-zkvm-verifier" }
22-
scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1" }
20+
scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "89a2dc1" }
21+
scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "89a2dc1" }
22+
scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "89a2dc1" }
2323

2424
sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3", features = ["scroll"] }
2525
sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3" }

bridge-history-api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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.1.3-0.20250626091118-58b899494da6
13+
github.com/scroll-tech/da-codec v0.1.3-0.20250826112206-b4cce5c5d178
1414
github.com/scroll-tech/go-ethereum v1.10.14-0.20250729113104-bd8f141bb3e9
1515
github.com/stretchr/testify v1.9.0
1616
github.com/urfave/cli/v2 v2.25.7

bridge-history-api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ 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.1.3-0.20250626091118-58b899494da6 h1:vb2XLvQwCf+F/ifP6P/lfeiQrHY6+Yb/E3R4KHXLqSE=
313-
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6/go.mod h1:Z6kN5u2khPhiqHyk172kGB7o38bH/nj7Ilrb/46wZGg=
312+
github.com/scroll-tech/da-codec v0.1.3-0.20250826112206-b4cce5c5d178 h1:4utngmJHXSOS5FoSdZhEV1xMRirpArbXvyoCZY9nYj0=
313+
github.com/scroll-tech/da-codec v0.1.3-0.20250826112206-b4cce5c5d178/go.mod h1:Z6kN5u2khPhiqHyk172kGB7o38bH/nj7Ilrb/46wZGg=
314314
github.com/scroll-tech/go-ethereum v1.10.14-0.20250729113104-bd8f141bb3e9 h1:u371VK8eOU2Z/0SVf5KDI3eJc8msHSpJbav4do/8n38=
315315
github.com/scroll-tech/go-ethereum v1.10.14-0.20250729113104-bd8f141bb3e9/go.mod h1:pDCZ4iGvEGmdIe4aSAGBrb7XSrKEML6/L/wEMmNxOdk=
316316
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=

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.20250305151038-478940e79601
18+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250625112225-a67863c65587
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.1.3-0.20250310095435-012aaee6b435 // indirect
187+
github.com/scroll-tech/da-codec v0.1.3-0.20250826112206-b4cce5c5d178 // 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.1.3-0.20250310095435-012aaee6b435 h1:X9fkvjrYBY79lGgKEPpUhuiJ4vWpWwzOVw4H8CU8L54=
640-
github.com/scroll-tech/da-codec v0.1.3-0.20250310095435-012aaee6b435/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY=
641-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 h1:NEsjCG6uSvLRBlsP3+x6PL1kM+Ojs3g8UGotIPgJSz8=
642-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601/go.mod h1:OblWe1+QrZwdpwO0j/LY3BSGuKT3YPUFBDQQgvvfStQ=
639+
github.com/scroll-tech/da-codec v0.1.3-0.20250826112206-b4cce5c5d178 h1:4utngmJHXSOS5FoSdZhEV1xMRirpArbXvyoCZY9nYj0=
640+
github.com/scroll-tech/da-codec v0.1.3-0.20250826112206-b4cce5c5d178/go.mod h1:Z6kN5u2khPhiqHyk172kGB7o38bH/nj7Ilrb/46wZGg=
641+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250625112225-a67863c65587 h1:wG1+gb+K4iLtxAHhiAreMdIjP5x9hB64duraN2+u1QU=
642+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250625112225-a67863c65587/go.mod h1:YyfB2AyAtphlbIuDQgaxc2b9mo0zE4EBA1+qtXvzlmg=
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/types/message/message.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,18 @@ type BlockContextV2 struct {
135135
NumL1Msgs uint16 `json:"num_l1_msgs"`
136136
}
137137

138+
// Metric data carried with OpenVMProof
139+
type OpenVMProofStat struct {
140+
TotalCycle uint64 `json:"total_cycles"`
141+
ExecutionTimeMills uint64 `json:"execution_time_mills"`
142+
ProvingTimeMills uint64 `json:"proving_time_mills"`
143+
}
144+
138145
// Proof for flatten VM proof
139146
type OpenVMProof struct {
140-
Proof []byte `json:"proofs"`
141-
PublicValues []byte `json:"public_values"`
147+
Proof []byte `json:"proofs"`
148+
PublicValues []byte `json:"public_values"`
149+
Stat *OpenVMProofStat `json:"stat,omitempty"`
142150
}
143151

144152
// Proof for flatten EVM proof
@@ -150,7 +158,8 @@ type OpenVMEvmProof struct {
150158
// OpenVMChunkProof includes the proof info that are required for chunk verification and rollup.
151159
type OpenVMChunkProof struct {
152160
MetaData struct {
153-
ChunkInfo *ChunkInfo `json:"chunk_info"`
161+
ChunkInfo *ChunkInfo `json:"chunk_info"`
162+
TotalGasUsed uint64 `json:"chunk_total_gas"`
154163
} `json:"metadata"`
155164

156165
VmProof *OpenVMProof `json:"proof"`

common/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"runtime/debug"
66
)
77

8-
var tag = "v4.5.41"
8+
var tag = "v4.5.44"
99

1010
var commit = func() string {
1111
if info, ok := debug.ReadBuildInfo(); ok {

coordinator/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ coordinator_cron:
3434
coordinator_tool:
3535
go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator_tool ./cmd/tool
3636

37+
localsetup: coordinator_api ## Local setup: build coordinator_api, copy config, and setup releases
38+
@echo "Copying configuration files..."
39+
cp -r $(PWD)/conf $(PWD)/build/bin/
40+
@echo "Setting up releases..."
41+
cd $(PWD)/build && bash setup_releases.sh
42+
43+
3744
#coordinator_api_skip_libzkp:
3845
# go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator_api ./cmd/api
3946

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#!/bin/bash
2+
3+
# release version
4+
if [ -z "${SCROLL_ZKVM_VERSION}" ]; then
5+
echo "SCROLL_ZKVM_VERSION not set"
6+
exit 1
7+
fi
8+
9+
# set ASSET_DIR by reading from config.json
10+
CONFIG_FILE="bin/conf/config.json"
11+
if [ ! -f "$CONFIG_FILE" ]; then
12+
echo "Config file $CONFIG_FILE not found"
13+
exit 1
14+
fi
15+
16+
# get the number of verifiers in the array
17+
VERIFIER_COUNT=$(jq -r '.prover_manager.verifier.verifiers | length' "$CONFIG_FILE")
18+
19+
if [ "$VERIFIER_COUNT" = "null" ] || [ "$VERIFIER_COUNT" -eq 0 ]; then
20+
echo "No verifiers found in config file"
21+
exit 1
22+
fi
23+
24+
echo "Found $VERIFIER_COUNT verifier(s) in config"
25+
26+
# iterate through each verifier entry
27+
for ((i=0; i<$VERIFIER_COUNT; i++)); do
28+
# extract assets_path for current verifier
29+
ASSETS_PATH=$(jq -r ".prover_manager.verifier.verifiers[$i].assets_path" "$CONFIG_FILE")
30+
FORK_NAME=$(jq -r ".prover_manager.verifier.verifiers[$i].fork_name" "$CONFIG_FILE")
31+
32+
if [ "$ASSETS_PATH" = "null" ]; then
33+
echo "Warning: Could not find assets_path for verifier $i, skipping..."
34+
continue
35+
fi
36+
37+
echo "Processing verifier $i ($FORK_NAME): assets_path=$ASSETS_PATH"
38+
39+
# check if it's an absolute path (starts with /)
40+
if [[ "$ASSETS_PATH" = /* ]]; then
41+
# absolute path, use as is
42+
ASSET_DIR="$ASSETS_PATH"
43+
else
44+
# relative path, prefix with "bin/"
45+
ASSET_DIR="bin/$ASSETS_PATH"
46+
fi
47+
48+
echo "Using ASSET_DIR: $ASSET_DIR"
49+
50+
# create directory if it doesn't exist
51+
mkdir -p "$ASSET_DIR"
52+
53+
# assets for verifier-only mode
54+
echo "Downloading assets for $FORK_NAME to $ASSET_DIR..."
55+
wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/verifier/verifier.bin -O ${ASSET_DIR}/verifier.bin
56+
wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/verifier/openVmVk.json -O ${ASSET_DIR}/openVmVk.json
57+
58+
echo "Completed downloading assets for $FORK_NAME"
59+
echo "---"
60+
done
61+
62+
echo "All verifier assets downloaded successfully"

0 commit comments

Comments
 (0)