feat: openvm euclid v2

common/libzkp/impl/Cargo.toml

@@ -14,8 +14,8 @@ ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" }
 tiny-keccak = { git = "https://github.com/scroll-tech/tiny-keccak", branch = "scroll-patch-v2.0.2-openvm-v1.0.0-rc.1" }
 
 [dependencies]
-euclid_prover = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.1.0-rc.6", package = "scroll-zkvm-prover" }
-euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.1.0-rc.6", package = "scroll-zkvm-verifier" }
+euclid_prover = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.2.0", package = "scroll-zkvm-prover" }
+euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.2.0", package = "scroll-zkvm-verifier" }
 
 base64 = "0.13.0"
 env_logger = "0.9.0"

common/libzkp/impl/src/verifier.rs

@@ -1,9 +1,11 @@
 #![allow(static_mut_refs)]
 
 mod euclid;
+mod euclidv2;
 
 use anyhow::{bail, Result};
 use euclid::EuclidVerifier;
+use euclidv2::EuclidV2Verifier;
 use serde::{Deserialize, Serialize};
 use std::{cell::OnceCell, path::Path, rc::Rc};
 
@@ -51,7 +53,17 @@ pub fn init(config: VerifierConfig) {
  unsafe {
  VERIFIER_LOW
  .set(VerifierPair(
- config.high_version_circuit.fork_name,
+ "euclid".to_string(),
+ Rc::new(Box::new(verifier)),
+ ))
+ .unwrap_unchecked();
+ }
+
+ let verifier = EuclidV2Verifier::new(&config.high_version_circuit.assets_path);
+ unsafe {
+ VERIFIER_HIGH
+ .set(VerifierPair(
+ "euclidV2".to_string(),
  Rc::new(Box::new(verifier)),
  ))
  .unwrap_unchecked();

common/libzkp/impl/src/verifier/euclid.rs

@@ -4,13 +4,13 @@ use anyhow::Result;
 
 use crate::utils::panic_catch;
 use euclid_prover::{BatchProof, BundleProof, ChunkProof};
-use euclid_verifier::verifier::{BatchVerifier, BundleVerifier, ChunkVerifier};
+use euclid_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV1, ChunkVerifier};
 use std::{fs::File, path::Path};
 
 pub struct EuclidVerifier {
  chunk_verifier: ChunkVerifier,
  batch_verifier: BatchVerifier,
- bundle_verifier: BundleVerifier,
+ bundle_verifier: BundleVerifierEuclidV1,
 }
 
 impl EuclidVerifier {
@@ -24,7 +24,7 @@ impl EuclidVerifier {
  .expect("Setting up chunk verifier"),
  batch_verifier: BatchVerifier::setup(&config, &exe, &verifier_bin)
  .expect("Setting up batch verifier"),
- bundle_verifier: BundleVerifier::setup(&config, &exe, &verifier_bin)
+ bundle_verifier: BundleVerifierEuclidV1::setup(&config, &exe, &verifier_bin)
  .expect("Setting up bundle verifier"),
  }
  }

common/libzkp/impl/src/verifier/euclidv2.rs

@@ -0,0 +1,65 @@
+use super::{ProofVerifier, TaskType, VKDump};
+
+use anyhow::Result;
+
+use crate::utils::panic_catch;
+use euclid_prover::{BatchProof, BundleProof, ChunkProof};
+use euclid_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV2, ChunkVerifier};
+use std::{fs::File, path::Path};
+
+pub struct EuclidV2Verifier {
+ chunk_verifier: ChunkVerifier,
+ batch_verifier: BatchVerifier,
+ bundle_verifier: BundleVerifierEuclidV2,
+}
+
+impl EuclidV2Verifier {
+ pub fn new(assets_dir: &str) -> Self {
+ let verifier_bin = Path::new(assets_dir).join("verifier.bin");
+ let config = Path::new(assets_dir).join("root-verifier-vm-config");
+ let exe = Path::new(assets_dir).join("root-verifier-committed-exe");
+
+ Self {
+ chunk_verifier: ChunkVerifier::setup(&config, &exe, &verifier_bin)
+ .expect("Setting up chunk verifier"),
+ batch_verifier: BatchVerifier::setup(&config, &exe, &verifier_bin)
+ .expect("Setting up batch verifier"),
+ bundle_verifier: BundleVerifierEuclidV2::setup(&config, &exe, &verifier_bin)
+ .expect("Setting up bundle verifier"),
+ }
+ }
+}
+
+impl ProofVerifier for EuclidV2Verifier {
+ fn verify(&self, task_type: super::TaskType, proof: Vec<u8>) -> Result<bool> {
+ panic_catch(|| match task_type {
+ TaskType::Chunk => {
+ let proof = serde_json::from_slice::<ChunkProof>(proof.as_slice()).unwrap();
+ self.chunk_verifier
+ .verify_proof(proof.proof.as_root_proof().unwrap())
+ }
+ TaskType::Batch => {
+ let proof = serde_json::from_slice::<BatchProof>(proof.as_slice()).unwrap();
+ self.batch_verifier
+ .verify_proof(proof.proof.as_root_proof().unwrap())
+ }
+ TaskType::Bundle => {
+ let proof = serde_json::from_slice::<BundleProof>(proof.as_slice()).unwrap();
+ self.bundle_verifier
+ .verify_proof_evm(&proof.proof.as_evm_proof().unwrap())
+ }
+ })
+ .map_err(|err_str: String| anyhow::anyhow!(err_str))
+ }
+
+ fn dump_vk(&self, file: &Path) {
+ let f = File::create(file).expect("Failed to open file to dump VK");
+
+ let dump = VKDump {
+ chunk_vk: base64::encode(self.chunk_verifier.get_app_vk()),
+ batch_vk: base64::encode(self.batch_verifier.get_app_vk()),
+ bundle_vk: base64::encode(self.bundle_verifier.get_app_vk()),
+ };
+ serde_json::to_writer(f, &dump).expect("Failed to dump VK");
+ }
+}

common/types/message/message.go

@@ -4,12 +4,18 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"math/big"
 
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/hexutil"
 )
 
 const (
-	euclidFork = "euclid"
+	EuclidFork = "euclid"
+	EuclidV2Fork = "euclidV2"
+
+	EuclidForkNameForProver = "euclidv1"
+	EuclidV2ForkNameForProver = "euclidv2"
 )
 
 // ProofType represents the type of task.
@@ -39,38 +45,102 @@ const (
 	ProofTypeBundle
 )
 
-// ChunkTaskDetail is a type containing ChunkTask detail.
+// ChunkTaskDetail is a type containing ChunkTask detail for chunk task.
 type ChunkTaskDetail struct {
-	BlockHashes []common.Hash `json:"block_hashes"`
+	// use one of the string of EuclidFork / EuclidV2Fork
+	ForkName string `json:"fork_name"`
+	BlockHashes []common.Hash `json:"block_hashes"`
+	PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"`
+}
+
+// it is a hex encoded big with fixed length on 48 bytes
+type Byte48 struct {
+	hexutil.Big
+}
+
+func (e Byte48) MarshalText() ([]byte, error) {
+	i := e.ToInt()
+	// overrite encode big
+	if sign := i.Sign(); sign < 0 {
+ // sanity check
+ return nil, errors.New("Byte48 must be positive integer")
+	} else {
+ s := i.Text(16)
+ if len(s) > 96 {
+ return nil, errors.New("integer Exceed 384bit")
+ }
+ return []byte(fmt.Sprintf("0x%0*s", 96, s)), nil
+	}
+}
+
+func isString(input []byte) bool {
+	return len(input) >= 2 && input[0] == '"' && input[len(input)-1] == '"'
+}
+
+// hexutil.Big has limition of 256bit so we have to override it ...
+func (e *Byte48) UnmarshalJSON(input []byte) error {
+	if !isString(input) {
+ return errors.New("not hex string")
+	}
+
+	b, err := hexutil.Decode(string(input[1 : len(input)-1]))
+	if err != nil {
+ return err
+	}
+	if len(b) != 48 {
+ return fmt.Errorf("not a 48 bytes hex string: %d", len(b))
+	}
+	var dec big.Int
+	dec.SetBytes(b)
+	*e = Byte48{(hexutil.Big)(dec)}
+	return nil
 }
 
 // BatchTaskDetail is a type containing BatchTask detail.
 type BatchTaskDetail struct {
-	ChunkInfos []*ChunkInfo `json:"chunk_infos"`
-	ChunkProofs []ChunkProof `json:"chunk_proofs"`
-	BatchHeader interface{} `json:"batch_header"`
-	BlobBytes []byte `json:"blob_bytes"`
-	KzgProof []byte `json:"kzg_proof"`
-	KzgCommitment []byte `json:"kzg_commitment"`
-	Challenge common.Hash `json:"challenge"`
+	// use one of the string of EuclidFork / EuclidV2Fork
+	ForkName string `json:"fork_name"`
+	ChunkInfos []*ChunkInfo `json:"chunk_infos"`
+	ChunkProofs []ChunkProof `json:"chunk_proofs"`
+	BatchHeader interface{} `json:"batch_header"`
+	BlobBytes []byte `json:"blob_bytes"`
+	KzgProof Byte48 `json:"kzg_proof,omitempty"`
+	KzgCommitment Byte48 `json:"kzg_commitment,omitempty"`
+	ChallengeDigest common.Hash `json:"challenge_digest,omitempty"`
 }
 
 // BundleTaskDetail consists of all the information required to describe the task to generate a proof for a bundle of batches.
 type BundleTaskDetail struct {
-	BatchProofs []BatchProof `json:"batch_proofs"`
+	// use one of the string of EuclidFork / EuclidV2Fork
+	ForkName string `json:"fork_name"`
+	BatchProofs []BatchProof `json:"batch_proofs"`
+	BundleInfo *OpenVMBundleInfo `json:"bundle_info,omitempty"`
 }
 
 // ChunkInfo is for calculating pi_hash for chunk
 type ChunkInfo struct {
-	ChainID uint64 `json:"chain_id"`
-	PrevStateRoot common.Hash `json:"prev_state_root"`
-	PostStateRoot common.Hash `json:"post_state_root"`
-	WithdrawRoot common.Hash `json:"withdraw_root"`
-	DataHash common.Hash `json:"data_hash"`
-	IsPadding bool `json:"is_padding"`
-	TxBytes []byte `json:"tx_bytes"`
-	TxBytesHash common.Hash `json:"tx_data_digest"`
-	PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"`
+	ChainID uint64 `json:"chain_id"`
+	PrevStateRoot common.Hash `json:"prev_state_root"`
+	PostStateRoot common.Hash `json:"post_state_root"`
+	WithdrawRoot common.Hash `json:"withdraw_root"`
+	DataHash common.Hash `json:"data_hash"`
+	IsPadding bool `json:"is_padding"`
+	TxBytes []byte `json:"tx_bytes"`
+	TxBytesHash common.Hash `json:"tx_data_digest"`
+	PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"`
+	PostMsgQueueHash common.Hash `json:"post_msg_queue_hash"`
+	TxDataLength uint64 `json:"tx_data_length"`
+	InitialBlockNumber uint64 `json:"initial_block_number"`
+	BlockCtxs []BlockContextV2 `json:"block_ctxs"`
+}
+
+// BlockContextV2 is the block context for euclid v2
+type BlockContextV2 struct {
+	Timestamp uint64 `json:"timestamp"`
+	BaseFee hexutil.Big `json:"base_fee"`
+	GasLimit uint64 `json:"gas_limit"`
+	NumTxs uint16 `json:"num_txs"`
+	NumL1Msgs uint16 `json:"num_l1_msgs"`
 }
 
 // SubCircuitRowUsage tracing info added in v0.11.0rc8
@@ -87,7 +157,7 @@ type ChunkProof interface {
 // NewChunkProof creates a new ChunkProof instance.
 func NewChunkProof(hardForkName string) ChunkProof {
 	switch hardForkName {
-	case euclidFork:
+	case EuclidFork, EuclidV2Fork:
  return &OpenVMChunkProof{}
 	default:
  return &Halo2ChunkProof{}
@@ -121,7 +191,7 @@ type BatchProof interface {
 // NewBatchProof creates a new BatchProof instance.
 func NewBatchProof(hardForkName string) BatchProof {
 	switch hardForkName {
-	case euclidFork:
+	case EuclidFork, EuclidV2Fork:
  return &OpenVMBatchProof{}
 	default:
  return &Halo2BatchProof{}
@@ -178,7 +248,7 @@ type BundleProof interface {
 // NewBundleProof creates a new BundleProof instance.
 func NewBundleProof(hardForkName string) BundleProof {
 	switch hardForkName {
-	case euclidFork:
+	case EuclidFork, EuclidV2Fork:
  return &OpenVMBundleProof{}
 	default:
  return &Halo2BundleProof{}
@@ -258,12 +328,14 @@ func (p *OpenVMChunkProof) Proof() []byte {
 
 // OpenVMBatchInfo is for calculating pi_hash for batch header
 type OpenVMBatchInfo struct {
-	ParentBatchHash common.Hash `json:"parent_batch_hash"`
-	ParentStateRoot common.Hash `json:"parent_state_root"`
-	StateRoot common.Hash `json:"state_root"`
-	WithdrawRoot common.Hash `json:"withdraw_root"`
-	BatchHash common.Hash `json:"batch_hash"`
-	ChainID uint64 `json:"chain_id"`
+	ParentBatchHash common.Hash `json:"parent_batch_hash"`
+	ParentStateRoot common.Hash `json:"parent_state_root"`
+	StateRoot common.Hash `json:"state_root"`
+	WithdrawRoot common.Hash `json:"withdraw_root"`
+	BatchHash common.Hash `json:"batch_hash"`
+	ChainID uint64 `json:"chain_id"`
+	PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"`
+	PostMsgQueueHash common.Hash `json:"post_msg_queue_hash"`
 }
 
 // BatchProof includes the proof info that are required for batch verification and rollup.
@@ -323,6 +395,7 @@ type OpenVMBundleInfo struct {
 	NumBatches uint32 `json:"num_batches"`
 	PrevBatchHash common.Hash `json:"prev_batch_hash"`
 	BatchHash common.Hash `json:"batch_hash"`
+	MsgQueueHash common.Hash `json:"msg_queue_hash"`
 }
 
 // OpenVMBundleProof includes the proof info that are required for verification of a bundle of batch proofs.

common/types/message/message_test.go

@@ -0,0 +1,22 @@
+package message
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestBytes48(t *testing.T) {
+	ti := &Byte48{}
+	ti.UnmarshalText([]byte("0x1"))
+	if s, err := ti.MarshalText(); err == nil {
+ if len(s) != 98 {
+ panic(fmt.Sprintf("wrong str: %s", s))
+ }
+	}
+	ti.UnmarshalText([]byte("0x0"))
+	if s, err := ti.MarshalText(); err == nil {
+ if len(s) != 98 {
+ panic(fmt.Sprintf("wrong str: %s", s))
+ }
+	}
+}

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.4.99"
+var tag = "v4.5.0"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

coordinator/go.mod

@@ -2,16 +2,14 @@ module scroll-tech/coordinator
 
 go 1.22
 
-toolchain go1.22.2
-
 require (
 	github.com/appleboy/gin-jwt/v2 v2.9.1
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/google/uuid v1.6.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/prometheus/client_golang v1.19.0
-	github.com/scroll-tech/da-codec v0.1.3-0.20250310095435-012aaee6b435
+	github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493
 	github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601
 	github.com/shopspring/decimal v1.3.1
 	github.com/stretchr/testify v1.10.0

coordinator/go.sum

@@ -177,8 +177,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/da-codec v0.1.3-0.20250310095435-012aaee6b435 h1:X9fkvjrYBY79lGgKEPpUhuiJ4vWpWwzOVw4H8CU8L54=
-github.com/scroll-tech/da-codec v0.1.3-0.20250310095435-012aaee6b435/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY=
+github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493 h1:Ioc01J0WEMxuwFvEPGJeBKXdf2KY4Yc3XbFky/IxLlI=
+github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY=
 github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 h1:NEsjCG6uSvLRBlsP3+x6PL1kM+Ojs3g8UGotIPgJSz8=
 github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601/go.mod h1:OblWe1+QrZwdpwO0j/LY3BSGuKT3YPUFBDQQgvvfStQ=
 github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=