Skip to content

[DO NOT MERGE] For prover 4.7 #1761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

[DO NOT MERGE] For prover 4.7 #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdf7826
rollback dep of zkvm-prover
noel2004 Nov 25, 2025
9839bf7
prover quit while proving process has panicked
noel2004 Nov 25, 2025
d262a63
Merge remote-tracking branch 'origin/develop' into feat/prover_4.7
noel2004 Nov 25, 2025
dc29c8c
Merge remote-tracking branch 'origin/develop' into feat/prover_4.7
noel2004 Nov 25, 2025
af63bc0
fix wrong configuration
noel2004 Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll"
version = "4.7.1"

[workspace.dependencies]
scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0" }
scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0" }
scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0" }
scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0-rc.4" }
scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0-rc.4" }
scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0-rc.4" }

sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91", features = ["scroll", "rkyv"] }
sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" }
Expand Down
2 changes: 1 addition & 1 deletion crates/prover-bin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition.workspace = true
scroll-zkvm-types.workspace = true
scroll-zkvm-prover.workspace = true
libzkp = { path = "../libzkp"}
scroll-proving-sdk = { git = "https://github.com/scroll-tech/scroll-proving-sdk.git", rev = "05648db" }
scroll-proving-sdk = { git = "https://github.com/scroll-tech/scroll-proving-sdk.git", rev = "22ad34e" }
serde.workspace = true
serde_json.workspace = true
once_cell.workspace =true
Expand Down
20 changes: 14 additions & 6 deletions crates/prover-bin/src/prover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,20 @@ impl ProvingService for LocalProver {
error: Some(format!("proving task failed: {}", e)),
..Default::default()
},
Err(e) => QueryTaskResponse {
task_id: req.task_id,
status: TaskStatus::Failed,
error: Some(format!("proving task panicked: {}", e)),
..Default::default()
},
Err(e) => {
if e.is_panic() {
// simply re-throw panic for any panicking in proving prrocess,
// cause worker loop and the whole prover exit
std::panic::resume_unwind(e.into_panic());
}

QueryTaskResponse {
task_id: req.task_id,
status: TaskStatus::Failed,
error: Some(format!("proving task panicked: {}", e)),
..Default::default()
}
}
Comment on lines +205 to +218
Copy link

@coderabbitai coderabbitai bot Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Incorrect error message for non-panic JoinError.

The else branch (lines 212-217) handles non-panic JoinErrors (e.g., task cancellation), but the error message incorrectly states "proving task panicked". This branch is only reached when e.is_panic() is false.

Also, minor typo on line 207: "prrocess" → "process".

                     Err(e) => {
                         if e.is_panic() {
-                            // simply re-throw panic for any panicking in proving prrocess,
+                            // simply re-throw panic for any panicking in proving process,
                             // cause worker loop and the whole prover exit
                             std::panic::resume_unwind(e.into_panic());
                         }

                         QueryTaskResponse {
                             task_id: req.task_id,
                             status: TaskStatus::Failed,
-                            error: Some(format!("proving task panicked: {}", e)),
+                            error: Some(format!("proving task failed: {}", e)),
                             ..Default::default()
                         }
                     }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Err(e) => {
if e.is_panic() {
// simply re-throw panic for any panicking in proving prrocess,
// cause worker loop and the whole prover exit
std::panic::resume_unwind(e.into_panic());
}
QueryTaskResponse {
task_id: req.task_id,
status: TaskStatus::Failed,
error: Some(format!("proving task panicked: {}", e)),
..Default::default()
}
}
Err(e) => {
if e.is_panic() {
// simply re-throw panic for any panicking in proving process,
// cause worker loop and the whole prover exit
std::panic::resume_unwind(e.into_panic());
}
QueryTaskResponse {
task_id: req.task_id,
status: TaskStatus::Failed,
error: Some(format!("proving task failed: {}", e)),
..Default::default()
}
}
🤖 Prompt for AI Agents 
In crates/prover-bin/src/prover.rs around lines 205 to 218, the non-panic
JoinError branch logs "proving task panicked" which is incorrect and there is a
typo "prrocess". Change the error message to reflect non-panic JoinError cases
(e.g., cancelled or join error) and include the JoinError details (e.g., via
e.to_string() or debug formatting) in the error field, and correct the comment
typo to "process". Keep the existing resume_unwind call for the is_panic() case
unchanged.

};
} else {
return QueryTaskResponse {
Expand Down
2 changes: 1 addition & 1 deletion crates/prover-bin/src/zk_circuits_handler/universal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl UniversalHandler {
pub fn new(workspace_path: impl AsRef<Path>, is_openvm_v13: bool) -> Result<Self> {
let path_app_exe = workspace_path.as_ref().join("app.vmexe");
let path_app_config = workspace_path.as_ref().join("openvm.toml");
let segment_len = Some((1 << 21) - 100);
let segment_len = Some((1 << 22) - 100);
let config = ProverConfig {
path_app_config,
path_app_exe,
Expand Down