Fix/validium prover #1794
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| use async_trait::async_trait; | ||
| use libzkp::ProvingTaskExt; | ||
| use scroll_proving_sdk::prover::{ | ||
| proving_service::{ | ||
| GetVkRequest, GetVkResponse, ProveRequest, ProveResponse, QueryTaskRequest, | ||
| QueryTaskResponse, TaskStatus, | ||
| }, | ||
| ProvingService, | ||
| }; | ||
| use scroll_zkvm_types::ProvingTask; | ||
|
|
||
| #[derive(Default)] | ||
| pub struct Dumper { | ||
| #[allow(dead_code)] | ||
| pub target_path: String, | ||
| pub json_mode: bool, | ||
| } | ||
|
Comment on lines
+13
to
+17
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: # Find main.rs and look for Dumper initialization
find . -name "main.rs" -path "*/prover-bin/*" -type fRepository: scroll-tech/scroll Length of output: 93 🏁 Script executed: # Check the dumper.rs file to see the full context
cat -n crates/prover-bin/src/dumper.rs | head -80Repository: scroll-tech/scroll Length of output: 3195 🏁 Script executed: # Search for all references to target_path in the codebase
rg "target_path" --type rust -B 2 -A 2Repository: scroll-tech/scroll Length of output: 321 🏁 Script executed: # Check main.rs to see how Dumper is constructed
cat -n crates/prover-bin/src/main.rsRepository: scroll-tech/scroll Length of output: 5268 🏁 Script executed: # Check if target_path is ever set anywhere else in the prover-bin crate
rg -r "target_path\s*=" crates/prover-bin --type rustRepository: scroll-tech/scroll Length of output: 44
The 🐛 Proposed fix — join filenames against `target_path` impl Dumper {
fn dump(&self, input_string: &str) -> eyre::Result<()> {
let task: ProvingTaskExt = serde_json::from_str(input_string)?;
let task = ProvingTask::from(task);
+ let base = std::path::Path::new(&self.target_path);
+
if self.json_mode {
- let file = std::fs::File::create("input_task.json")?;
+ let file = std::fs::File::create(base.join("input_task.json"))?;
serde_json::to_writer(std::io::BufWriter::new(file), &task)?;
} else {
- let input_file = std::fs::File::create("input_task.bin")?;
+ let input_file = std::fs::File::create(base.join("input_task.bin"))?;
let mut input_writer = std::io::BufWriter::new(input_file);
bincode::encode_into_std_write(
&task.serialized_witness,
&mut input_writer,
bincode::config::standard(),
)?;
+ input_writer.flush()?;
- let agg_file = std::fs::File::create("agg_proofs.bin")?;
+ let agg_file = std::fs::File::create(base.join("agg_proofs.bin"))?;
let mut agg_writer = std::io::BufWriter::new(agg_file);
for proof in &task.aggregated_proofs {
let sz = bincode::serde::encode_into_std_write(
&proof.proofs,
&mut agg_writer,
bincode::config::standard(),
)?;
println!("written {sz} bytes for proof");
}
+ agg_writer.flush()?;
}
Ok(())
}
}Also add a 🤖 Prompt for AI Agents |
||
|
|
||
| impl Dumper { | ||
| fn dump(&self, input_string: &str) -> eyre::Result<()> { | ||
| let task: ProvingTaskExt = serde_json::from_str(input_string)?; | ||
| let task = ProvingTask::from(task); | ||
|
|
||
| if self.json_mode { | ||
| let file = std::fs::File::create("input_task.json")?; | ||
| serde_json::to_writer(std::io::BufWriter::new(file), &task)?; | ||
| } else { | ||
| // stream-encode serialized_witness to input_task.bin using bincode 2.0 | ||
| let input_file = std::fs::File::create("input_task.bin")?; | ||
| let mut input_writer = std::io::BufWriter::new(input_file); | ||
| bincode::encode_into_std_write( | ||
| &task.serialized_witness, | ||
| &mut input_writer, | ||
| bincode::config::standard(), | ||
| )?; | ||
|
|
||
| // stream-encode aggregated_proofs to agg_proofs.bin using bincode 2.0 | ||
| let agg_file = std::fs::File::create("agg_proofs.bin")?; | ||
| let mut agg_writer = std::io::BufWriter::new(agg_file); | ||
| for proof in &task.aggregated_proofs { | ||
| let sz = bincode::serde::encode_into_std_write( | ||
| &proof.proofs, | ||
| &mut agg_writer, | ||
| bincode::config::standard(), | ||
| )?; | ||
| println!("written {sz} bytes for proof"); | ||
| } | ||
|
Comment on lines
+29
to
+47
There was a problem hiding this comment.
Rust's 🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| #[async_trait] | ||
| impl ProvingService for Dumper { | ||
| fn is_local(&self) -> bool { | ||
| true | ||
| } | ||
| async fn get_vks(&self, _: GetVkRequest) -> GetVkResponse { | ||
| // get vk has been deprecated in new prover with dynamic asset loading scheme | ||
| GetVkResponse { | ||
| vks: vec![], | ||
| error: None, | ||
| } | ||
| } | ||
| async fn prove(&mut self, req: ProveRequest) -> ProveResponse { | ||
| let error = if let Err(e) = self.dump(&req.input) { | ||
| Some(format!("failed to dump: {}", e)) | ||
| } else { | ||
| None | ||
| }; | ||
|
|
||
| ProveResponse { | ||
| status: TaskStatus::Failed, | ||
| error, | ||
| ..Default::default() | ||
| } | ||
| } | ||
|
|
||
| async fn query_task(&mut self, req: QueryTaskRequest) -> QueryTaskResponse { | ||
| QueryTaskResponse { | ||
| task_id: req.task_id, | ||
| status: TaskStatus::Failed, | ||
| error: Some("dump file finished but need a fail return to exit".to_string()), | ||
| ..Default::default() | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: scroll-tech/scroll
Length of output: 3165
Update OpenVM version in comment.
The comment on line 20 states "with openvm 1.4.2", but the zkvm-prover dependency at rev
b527310actually uses OpenVM v1.4.3. Update the comment to reflect the correct version.🤖 Prompt for AI Agents