feat(libzkp): upgrade to v0.10.0k to support blob DA (#1212)

Co-authored-by: kunxian-xia <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]>
scroll-tech · Apr 2, 2024 · ed0e0e4 · ed0e0e4
1 parent d203033
commit ed0e0e4
Show file tree

Hide file tree

Showing 8 changed files with 755 additions and 402 deletions.
diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock
diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml
@@ -8,26 +8,29 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [patch.crates-io]
+gobuild = { git = "https://github.com/scroll-tech/gobuild.git" }
+halo2curves = { git = "https://github.com/scroll-tech/halo2curves", branch = "v0.1.0" }
 ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
+ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
+ethers-signers  = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
+#ethers-etherscan = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
+#ethers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
 [patch."https://github.com/privacy-scaling-explorations/halo2.git"]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
+halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1"  }
 [patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
-poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "scroll-dev-0220" }
-[patch."https://github.com/privacy-scaling-explorations/halo2wrong.git"]
-halo2wrong = { git = "https://github.com/scroll-tech/halo2wrong.git", branch = "halo2-ecc-snark-verifier-0323" }
-maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-ecc-snark-verifier-0323" }
-[patch."https://github.com/privacy-scaling-explorations/halo2curves.git"]
-halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" }
+poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "main" }
+[patch."https://github.com/privacy-scaling-explorations/bls12_381"]
+bls12_381 = { git = "https://github.com/scroll-tech/bls12_381", branch = "feat/impl_scalar_field" }
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
-prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.9.9", default-features = false, features = ["parallel_syn", "scroll", "shanghai", "strict-ccc"] }
+halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" }
+prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.10.0k", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] }
 
 base64 = "0.13.0"
 env_logger = "0.9.0"
 libc = "0.2"
 log = "0.4"
-once_cell = "1.8.0"
+once_cell = "1.19"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0.66"

diff --git a/common/libzkp/impl/rust-toolchain b/common/libzkp/impl/rust-toolchain
@@ -1 +1 @@
-nightly-2022-12-10
+nightly-2023-12-03
diff --git a/common/libzkp/impl/src/batch.rs b/common/libzkp/impl/src/batch.rs
@@ -119,7 +119,7 @@ pub unsafe extern "C" fn gen_batch_proof(
 
         let chunk_hashes_proofs = chunk_hashes
             .into_iter()
-            .zip(chunk_proofs.into_iter())
+            .zip(chunk_proofs)
             .collect();
 
         let proof = PROVER

diff --git a/common/libzkp/impl/src/lib.rs b/common/libzkp/impl/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(once_cell)]
-
 mod batch;
 mod chunk;
 mod types;

diff --git a/common/types/message/message.go b/common/types/message/message.go
@@ -259,6 +259,7 @@ type ChunkInfo struct {
 	WithdrawRoot  common.Hash `json:"withdraw_root"`
 	DataHash      common.Hash `json:"data_hash"`
 	IsPadding     bool        `json:"is_padding"`
+	TxBytes       []byte      `json:"tx_bytes"`
 }
 
 // ChunkProof includes the proof info that are required for chunk verification and rollup.

diff --git a/common/version/version.go b/common/version/version.go
@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.3.79"
+var tag = "v4.3.80"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

diff --git a/prover/core/prover_test.go b/prover/core/prover_test.go
@@ -7,8 +7,11 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"flag"
+	"fmt"
 	"io"
 	"os"
+	"path/filepath"
+	"sort"
 	"testing"
 
 	"github.com/scroll-tech/go-ethereum/core/types"
@@ -24,8 +27,7 @@ var (
 	paramsPath    = flag.String("params", "/assets/test_params", "params dir")
 	assetsPath    = flag.String("assets", "/assets/test_assets", "assets dir")
 	proofDumpPath = flag.String("dump", "/assets/proof_data", "the path proofs dump to")
-	tracePath1    = flag.String("trace1", "/assets/traces/1_transfer.json", "chunk trace 1")
-	tracePath2    = flag.String("trace2", "/assets/traces/10_transfer.json", "chunk trace 2")
+	batchDirPath  = flag.String("batch-dir", "/assets/traces/batch_24", "batch directory")
 	batchVkPath   = flag.String("batch-vk", "/assets/test_assets/agg_vk.vkey", "batch vk")
 	chunkVkPath   = flag.String("chunk-vk", "/assets/test_assets/chunk_vk.vkey", "chunk vk")
 )
@@ -46,23 +48,34 @@ func TestFFI(t *testing.T) {
 	as.Equal(chunkProverCore.VK, readVk(*chunkVkPath, as))
 	t.Log("Chunk VK must be available when init")
 
-	chunkTrace1 := readChunkTrace(*tracePath1, as)
-	chunkTrace2 := readChunkTrace(*tracePath2, as)
-	t.Log("Loaded chunk traces")
-
-	chunkInfo1, err := chunkProverCore.TracesToChunkInfo(chunkTrace1)
-	as.NoError(err)
-	chunkInfo2, err := chunkProverCore.TracesToChunkInfo(chunkTrace2)
-	as.NoError(err)
-	t.Log("Converted to chunk infos")
-
-	chunkProof1, err := chunkProverCore.ProveChunk("chunk_proof1", chunkTrace1)
-	as.NoError(err)
-	t.Log("Generated and dumped chunk proof 1")
-
-	chunkProof2, err := chunkProverCore.ProveChunk("chunk_proof2", chunkTrace2)
+	// Get the list of subdirectories (chunks)
+	chunkDirs, err := os.ReadDir(*batchDirPath)
 	as.NoError(err)
-	t.Log("Generated and dumped chunk proof 2")
+	sort.Slice(chunkDirs, func(i, j int) bool {
+		return chunkDirs[i].Name() < chunkDirs[j].Name()
+	})
+
+	chunkInfos := make([]*message.ChunkInfo, 0, len(chunkDirs))
+	chunkProofs := make([]*message.ChunkProof, 0, len(chunkDirs))
+
+	for i, dir := range chunkDirs {
+		if dir.IsDir() {
+			chunkPath := filepath.Join(*batchDirPath, dir.Name())
+
+			chunkTrace := readChunkTrace(chunkPath, as)
+			t.Logf("Loaded chunk trace %d", i+1)
+
+			chunkInfo, err := chunkProverCore.TracesToChunkInfo(chunkTrace)
+			as.NoError(err)
+			chunkInfos = append(chunkInfos, chunkInfo)
+			t.Logf("Converted to chunk info %d", i+1)
+
+			chunkProof, err := chunkProverCore.ProveChunk(fmt.Sprintf("chunk_proof%d", i+1), chunkTrace)
+			as.NoError(err)
+			chunkProofs = append(chunkProofs, chunkProof)
+			t.Logf("Generated and dumped chunk proof %d", i+1)
+		}
+	}
 
 	as.Equal(chunkProverCore.VK, readVk(*chunkVkPath, as))
 	t.Log("Chunk VKs must be equal after proving")
@@ -79,29 +92,53 @@ func TestFFI(t *testing.T) {
 	as.Equal(batchProverCore.VK, readVk(*batchVkPath, as))
 	t.Log("Batch VK must be available when init")
 
-	chunkInfos := []*message.ChunkInfo{chunkInfo1, chunkInfo2}
-	chunkProofs := []*message.ChunkProof{chunkProof1, chunkProof2}
 	_, err = batchProverCore.ProveBatch("batch_proof", chunkInfos, chunkProofs)
 	as.NoError(err)
 	t.Log("Generated and dumped batch proof")
 
 	as.Equal(batchProverCore.VK, readVk(*batchVkPath, as))
 	t.Log("Batch VKs must be equal after proving")
 }
-
 func readChunkTrace(filePat string, as *assert.Assertions) []*types.BlockTrace {
-	f, err := os.Open(filePat)
-	as.NoError(err)
-	defer func() {
-		as.NoError(f.Close())
-	}()
-	byt, err := io.ReadAll(f)
+	fileInfo, err := os.Stat(filePat)
 	as.NoError(err)
 
-	trace := &types.BlockTrace{}
-	as.NoError(json.Unmarshal(byt, trace))
+	var traces []*types.BlockTrace
+
+	readFile := func(path string) {
+		f, err := os.Open(path)
+		as.NoError(err)
+		defer func() {
+			as.NoError(f.Close())
+		}()
+		byt, err := io.ReadAll(f)
+		as.NoError(err)
+
+		trace := &types.BlockTrace{}
+		as.NoError(json.Unmarshal(byt, trace))
+
+		traces = append(traces, trace)
+	}
+
+	if fileInfo.IsDir() {
+		files, err := os.ReadDir(filePat)
+		as.NoError(err)
+
+		// Sort files alphabetically
+		sort.Slice(files, func(i, j int) bool {
+			return files[i].Name() < files[j].Name()
+		})
+
+		for _, file := range files {
+			if !file.IsDir() {
+				readFile(filepath.Join(filePat, file.Name()))
+			}
+		}
+	} else {
+		readFile(filePat)
+	}
 
-	return []*types.BlockTrace{trace}
+	return traces
 }
 
 func readVk(filePat string, as *assert.Assertions) string {