feat: update to stepwise ACVM

noir-lang · Jul 10, 2023 · 2fdd5fe · 2fdd5fe
1 parent b91e953
commit 2fdd5fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,4 +57,6 @@ wasm-bindgen = { version = "0.2.83", features = ["serde-serialize"] }
 wasm-bindgen-test = "0.3.33"
 
 [patch.crates-io]
+acvm = { git = "https://github.com/noir-lang/acvm", rev = "fefa4fbf52f92050946f2ff605798e032a4b91c9" }
+acvm-backend-barretenberg = { git = "https://github.com/noir-lang/acvm-backend-barretenberg", rev = "447515eff1bed7522c55ec24053b9168bf628553" }
 async-lsp = { git = "https://github.com/oxalica/async-lsp", rev = "09dbcc11046f7a188a80137f8d36484d86c78c78" }
diff --git a/crates/nargo/src/ops/execute.rs b/crates/nargo/src/ops/execute.rs
@@ -21,11 +21,10 @@ pub fn execute_circuit<B: BlackBoxFunctionSolver + Default>(
                 unreachable!("Execution should not stop while in `InProgress` state.")
             }
             ACVMStatus::Failure(error) => return Err(error.into()),
-            ACVMStatus::RequiresForeignCall => {
-                while let Some(foreign_call) = acvm.get_pending_foreign_call() {
-                    let foreign_call_result = execute_foreign_call(foreign_call);
-                    acvm.resolve_pending_foreign_call(foreign_call_result);
-                }
+            ACVMStatus::RequiresForeignCall(unresolved_brillig_call) => {
+                let foreign_call_result =
+                    execute_foreign_call(&unresolved_brillig_call.foreign_call_wait_info);
+                acvm.resolve_pending_foreign_call(foreign_call_result);
             }
         }
     }