Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…

…at/upgrade4_mock
scroll-tech · Jul 19, 2024 · 1d5a2b8 · 1d5a2b8
2 parents 37af5ef + 17b7e5c
commit 1d5a2b8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/common/version/version.go b/common/version/version.go
@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.4.32"
+var tag = "v4.4.33"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

diff --git a/prover/Cargo.lock b/prover/Cargo.lock
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -29,7 +29,7 @@ ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "
 ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" }
 snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
-prover_curie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.4", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
+prover_curie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.5", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 prover_darwin = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "release/v0.12.0", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 base64 = "0.13.1"
 reqwest = { version = "0.12.4", features = ["gzip"] }

diff --git a/prover/src/prover.rs b/prover/src/prover.rs
@@ -148,7 +148,7 @@ impl<'a> Prover<'a> {
             task_type: task.task_type,
             status: ProofStatus::Error,
             failure_type: Some(failure_type),
-            failure_msg: Some(error.to_string()),
+            failure_msg: Some(format!("{:#}", error)),
             ..Default::default()
         };
         self.do_submit(&request)

diff --git a/rollup/internal/utils/utils.go b/rollup/internal/utils/utils.go
@@ -108,7 +108,7 @@ func CalculateChunkMetrics(chunk *encoding.Chunk, codecVersion encoding.CodecVer
 		metrics.L1CommitUncompressedBatchBytesSize, metrics.L1CommitBlobSize, err = codecv3.EstimateChunkL1CommitBatchSizeAndBlobSize(chunk)
 		metrics.EstimateBlobSizeTime = time.Since(start)
 		if err != nil {
-			return nil, fmt.Errorf("failed to estimate codecv3 chunk L1 commit blob size: %w", err)
+			return nil, fmt.Errorf("failed to estimate codecv3 chunk L1 commit batch size and blob size: %w", err)
 		}
 		return metrics, nil
 	default:
@@ -232,7 +232,7 @@ func CalculateBatchMetrics(batch *encoding.Batch, codecVersion encoding.CodecVer
 		metrics.L1CommitUncompressedBatchBytesSize, metrics.L1CommitBlobSize, err = codecv3.EstimateBatchL1CommitBatchSizeAndBlobSize(batch)
 		metrics.EstimateBlobSizeTime = time.Since(start)
 		if err != nil {
-			return nil, fmt.Errorf("failed to estimate codecv3 batch L1 commit blob size: %w", err)
+			return nil, fmt.Errorf("failed to estimate codecv3 batch L1 commit batch size and blob size: %w", err)
 		}
 		return metrics, nil
 	default: