Skip to content

fix: return error rather instead of panicking on invalid circuit #3976

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

Merged
kevaundray merged 2 commits into from
Jan 8, 2024
Merged

fix: return error rather instead of panicking on invalid circuit #3976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7605fa
fix: return error rather instead of panicking on invalid circuit.
TomAFrench Jan 8, 2024
8adcfe3
chore: cspell
TomAFrench Jan 8, 2024
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
4 changes: 2 additions & 2 deletions acvm-repo/acvm_js/src/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ pub async fn execute_circuit_with_black_box_solver(
foreign_call_handler: ForeignCallHandler,
) -> Result<JsWitnessMap, Error> {
console_error_panic_hook::set_once();
let circuit: Circuit =
Circuit::deserialize_circuit(&circuit).expect("Failed to deserialize circuit");
let circuit: Circuit = Circuit::deserialize_circuit(&circuit)
.map_err(|_| JsExecutionError::new("Failed to deserialize circuit. This is likely due to differing serialization formats between ACVM_JS and your compiler".to_string(), None))?;

let mut acvm = ACVM::new(&solver.0, &circuit.opcodes, initial_witness.into());

Expand Down
5 changes: 3 additions & 2 deletions cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"arity",
"arkworks",
"arraysort",
"barebones",
"barretenberg",
"bincode",
"bindgen",
Expand Down Expand Up @@ -82,6 +83,7 @@
"jmpif",
"jmpifs",
"jmps",
"jsdoc",
"Jubjub",
"keccak",
"krate",
Expand Down Expand Up @@ -154,8 +156,7 @@
"vecmap",
"wasi",
"Weierstraß",
"zshell",
"barebones"
"zshell"
],
"ignorePaths": [
"./**/node_modules/**"
Expand Down