feat!: Update to ACVM 0.21.0

Cargo.toml

@@ -57,4 +57,6 @@ wasm-bindgen-test = "0.3.33"
 base64 = "0.21.2"
 
 [patch.crates-io]
+acvm = { git = "https://github.com/noir-lang/acvm", rev = "5198b1cba0a981179fa76fd13b9df5619b8491d1" }
+acvm-backend-barretenberg = { git = "https://github.com/noir-lang/acvm-backend-barretenberg", rev = "1008155593f30d6061af6c8507e5955cd28ea802" }
 async-lsp = { git = "https://github.com/oxalica/async-lsp", rev = "09dbcc11046f7a188a80137f8d36484d86c78c78" }

crates/nargo/src/ops/execute.rs

@@ -22,11 +22,9 @@ 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 = ForeignCall::execute(foreign_call)?;
-                    acvm.resolve_pending_foreign_call(foreign_call_result);
-                }
+            ACVMStatus::RequiresForeignCall(foreign_call) => {
+                let foreign_call_result = ForeignCall::execute(&foreign_call)?;
+                acvm.resolve_pending_foreign_call(foreign_call_result);
             }
         }
     }

crates/nargo_cli/tests/test_data_ssa_refactor/1327_concrete_in_generic/target/main.json

@@ -1 +1 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"input","type":{"kind":"field"},"visibility":"private"}],"param_witnesses":{"input":[1]},"return_type":{"kind":"field"},"return_witnesses":[2]},"bytecode":"H4sIAAAAAAAA/62PQQ6AIAwEi36opS20N78isfz/CcYEY8JV5rJ7muzuAJDg4+3HSPwHpeGcvYxFJGoOYjoxezNF0VaMjNT0ysYcJla9eUUn4aCuzn2It3Ubcf7+uG/100MmGAEAAA==","proving_key":null,"verification_key":null}
+{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"input","type":{"kind":"field"},"visibility":"private"}],"param_witnesses":{"input":[1]},"return_type":{"kind":"field"},"return_witnesses":[2]},"bytecode":"H4sIAAAAAAAA/62PwQ2AMAwDU1goaZI2+bEKFen+IyCkIlC/4I/9OtsrACR4dOdtOH4TpcGcuYxFJGoOYtoxezNF0VaMjNT0yMYcJla9eUUn4aCuzn2Al/82Ypq+v/PVcwJ2MvbyJAEAAA==","proving_key":null,"verification_key":null}

crates/nargo_cli/tests/test_data_ssa_refactor/1_mul/target/main.json

@@ -1 +1 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/9WUTW6DMBSEJ/yFhoY26bYLjoAxBLPrVYpK7n+EgmoHamWXeShYQsYSvJ+Z9/kDwCf+1m58ArsXi3PgnUN7dt/u7P9fdi8fW8rlATduCW89GFe5l2iMES90YBd+EyTyjIjtGYIm+HF1eanroa0GpdV3WXW9acq66S9GGdWY5qcyWg+mNm3Xd23ZqVoP6tp0+moDJ5AxNOTUWdk6VUTsOSb6wtRPCuDYziaZAzGA92OMFCsAPCUqMAOcQg5gZwIb4BdsA+A9seeU6AtTPymAUzubZA7EAD6MMTKsAPCUqMAMcAY5gJ0JbIBfsQ2AD8SeM6IvTP2kAM7sbJI5EAP4OMbIsQLAU6ICM8A55AB2JrABfsM2AD4Se86Jvjy5freeQ2LPObGud6J+Ce5ADz6LzJqX9Z4W75HdgzszkQj0BC+Pr6PohSpl0kkg7hm84Zfq+8z36N/l9OyaLtcv2EfpKJUUAAA=","proving_key":null,"verification_key":null}
+{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/9WYTW6DMBSEJ/yFhoY26bYLjoAxBLPrVYpK7n+EgmoHamWXeShYQsYSvJ+Z97HgA8An/tZuvAK7F4tz4J1De3bP7uz7X3YvH1vK5QE3bglvPRhXuZtojBEvdGAXfhMk8oyI7RmCJvhxdXmp66GtBqXVd1l1vWnKuukvRhnVmOanMloPpjZt13dt2alaD+radPpqAyeQMTTk1FnZOlVE7Dkm+sLUTwrg2M4mmQMxgPdjjBQrADwlKjADnEIOYGcCG+AXbAPgPbHnlOgLUz8pgFM7m2QOxAA+jDEyrADwlKjADHAGOYCdCWyAX7ENgA/EnjOiL0z9pADO7GySORAD+DjGyLECwFOiAjPAOeQAdiawAX7DNgA+EnvOib48uX63nkNizzmxrneifgnuQA8+i8yal/WeFveR3YM7M5EI9AQvj6+j6AdVyqSTQNwzeMMv1feZ79G/j9MzaxouanQ/GP31Cz0tIEGpFAAA","proving_key":null,"verification_key":null}

crates/nargo_cli/tests/test_data_ssa_refactor/2_div/target/main.json

@@ -1 +1 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/+1Y7U7CMBQ9bANB5UNAYowm++ffdh+w/fNVJI73fwS32EGpxpjs3KUk3IRsTeD09NzbnlteAbzhOwb1JzDP2BoHzjg04/a7sH7fxLt5qm6hBzwsJcUxIHKMaoyhoyld0IZw5CR0aMZ2hIJCpWqbZdUuqXSqP1RS7otcZfl+W+hC50X+mRRpWhVZsSv35U6VOksrfcjL9GDAhkSsERGr1XNk6SlRcNEvuF25P4G/2STqiJn7GyIvKf0Csn4DP/VTVzPhmsm4xpigBzNpJopxMpMJLstMJkSsW/DN5BayZjIG30yegYswE2bu74i8pPTz2UyI+v1ZM115hkT9xkRe90T9mgb2h3GAf/4wOdt8p9Z7hPPat2tiJLAmOPO4Os4gaMpSSZoK4M7AK36pdc/4OTo7nHzWtO3I2RybTREI60rA1e3LvMZYoIdOupkoxqmTXkC28wvB7/we4LWLJ4annhPXvCDmhalfgPOi9bn7I2h43LBwgoW7rDFW6OEgWOJ08gZm0tiZk30V8iyZR14vQoXBPlCWRP1WRCyCfuo/+qluQf1fl6nfmqhfX9cqJmeb76P1fr1WdcRcG0HZuBv4fa1q1r3h50j0WsXW1I4vUWBTFYIfAAA=","proving_key":null,"verification_key":null}
+{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/+1Y7U7CMBQ9bAMB5UNAYowm++ffdh+w/fNVJI73fwTX2Empxpjs3GUk3IRsTeD09NzbnlteALziKwb1J7DP2BkH3ji04+a7cH5v4s0+VbvQAx6WkuIYEDlGNcbQ05QuqCEceQkd2rEboaBQqdplWbVPKp3qd5WUhyJXWX7YFbrQeZF/JEWaVkVW7MtDuVelztJKH/MyPVqwIRFrRMRq9Bw5ekoUXPQLblvuj+BvNok6Yub+hshLSr+ArN+gn/qpq5lwzWRcY0zQgZmYiWKczGSCyzKTCRFrCr6ZTCFrJmPwzeQJuAgzYeb+lshLSr8+mwlRvz9rpi3PkKjfmMjrjqifaWB/GAf45w+Ts8t35rxHOK99tyZGAmuCN4+v4xyCpiyVpJkA7hy84pda95yfo7PDqc+aNh05m6PZFIGwrgRc3bwsaowlOuikzUQxTp30ErKdXwh+53ePXrt4YnnqBXHNS2JemPoFOC/aPnd/BA2/Nyy8YOGuaow1OjgIVjidvIGdNPbmZF+FpJLZFusZl3GgrIhrXhPzStBP/0c/1S6o/+uuiVgbYv11da1icnb5Pjjv12tVS8yNFZSNu0W/r1Vm3Vt+jkSvVUxNQ4dj04X78QnVhTiFlh8AAA==","proving_key":null,"verification_key":null}

crates/nargo_cli/tests/test_data_ssa_refactor/3_add/target/main.json

@@ -1 +1 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/+VX226DMAx1A/QCqHvbcz8hIUlx3vYrQ6P//wkDzenSbFIrYVdItYSMETqxj4+MeQOAd/ixzXQp8qckVllcUBzfjabIf5DXy8xsGLEUH5aGzBbimnhTThhVxik7oTMRJR0S44oamlrxGs00R5ARRs6f1Wfnxr4bjTWfugsDeu38cEaDxqP/6tDaER32YQi9DsbZ0Vx86C6UZ7kcyxKWrhixVs7fNc+CUTOc/G0Z+Zux/gyP5BlX/Zw5p/nukvuSvPpHE1uBmiA7J+fxCIKDWapJOwHcPfCJX6ruPX+PbobTmjnNtzLmXLGC9W9ShwmjhidsUvNBJ/jdpGoQ36SQ4etz3SoOjMKr+Wq8K+IV5BrFFkBIxM2E0cITRNzA7e9A+4CIORuwVMQNY16tkDC4BdyA3BT+BuQ1+5wUEAAA","proving_key":null,"verification_key":null}
+{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/9VX226DMAx1A/QCqHvbcz8hIUlJ3vYrQ6P//wkDLenSbNKmclxRS8gYoZNj+5CYFyJ6pS/bTJcI/pTEIouLEMd3o4ng34KXy0xtgFgChyUps4W4Kt6UE0aV1RRe0LkQZVgkxlVoaGrFkzRTy7MxY9+NSqt32fnBWWnscHbKKevsR+e0Hp1xvR98L70yelQX6/UlgB2JRxh5/e7k2QWeqgTmXAF7sfL6XXMugDlXQF5bYP1mrB+bR/IMlT+Sc8p3l9yXwYtfNLFlyImydfI6HolxY+Zq0o4Bd0848XPlvcf36GZzWnNN86kMzNUBDw+2SeowYdT0gElqXuhE35NUTeyTlAOcPtep4gAUXo3L8U8Rr4BrFJsnJhE3E0ZLDxBxQ7e/A+0/RIxswFIRN0BeLZMw0AJuCPexFQlHkfQ6tU/BaJ2WKBAAAA==","proving_key":null,"verification_key":null}

crates/nargo_cli/tests/test_data_ssa_refactor/4_sub/target/main.json

@@ -1 +1 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/91UbQ7CIAxljH1Eo2fwCJSPDf55FRfZ/Y/gFsuC6C9XEuNLltKFPPpemx4ZYyf2RLV8HOMlyXmW15jHuxEc4xWj3AeoEi4tB2PCqAJouEnlJ2elsdPgwIF19q6c1sEZN/rJj9KD0QFm6/WMZHx/XRAPLAMVr1g4msxTckNXIwQ+EvMGG5qi/u9mbnUdCg1G7t+XmhVqBkHoX0PIReCfLOjfVmdNODOU/rWE/q1cb8sj+Ueln7LmtN4uOQuM/MNMtAU0seyd3MczK7iYSzWpK8DbM7rhL6W7p+/Ry3L6dU9TPABrAlFP4gkAAA==","proving_key":null,"verification_key":null}
+{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2],"z":[3]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/9VWbQ6CMAwdgwHR6Bk8wroP2P55FYnj/kcQYmfmNP6QLtEmpCshb++9Ng17xtiB3aNaHo75lNQ8q2us47cxOOYzZrktoEqwtByMCaMKoOEilZ+clcZOgwMH1tmrcloHZ9zoJz9KD0YHmK3XM4Lx7bwgHlgWVLjNgiEyT8kNXY1o8JJYC2xoGvWfNHMr1o5Oo/zk35c8FfKEhlCzIOwrgX9Q0L+H5ppQsyDk1RLO34r1sjySd1T6KTmnfLvk3GDmb2aiLaCJZffkPh5ZwcVcqkldAdye0Q1/Kd09fY+eltMve1onHOPfWh43WwrASvYJAAA=","proving_key":null,"verification_key":null}

crates/nargo_cli/tests/test_data_ssa_refactor/5_over/target/main.json

@@ -1 +1 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/81XUW6DMAx1A6MtdPvb56QdISYJJH+7ytDC/Y8waINKo/7xjGoJJRHo2X5+Scw7EX3SzQ7To9L4vVqrtF7eHdL3P2nU24zXmEBcTZltxOVlUkwYZRYznJCZ7CIrRJnWJFiEHNfoztrYt5EN/+o2DN5p64bOs2fn3V/rjYne+j4ModeBrYk8umDGBPxGMgUtMHG2KU4ugDmXwLrsxZ/eZqyE+NuKVQH5q+jJpif8XkTGvI73uJqXaVRPNFEJ5ESZn5zHDxI8UKWKdBTAPRFO/FJ5n/A1ejicXplTRY9CRccKvDzQHdBi/jxh1LRDBzQ7+qJ7BzQ7LTKf6JsMcfvE8WrhDBRejctRXMTAWDsSEnEzYVxoBxE3dG+tVXIqLeIaKOIGKOKLkDDQvy0NyZ3C/3XzYDN0DwAA","proving_key":null,"verification_key":null}
+{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"}],"param_witnesses":{"x":[1],"y":[2]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/81XS27DIBCdgOskdtpdl5V6BDBgw65XqVV8/yPUTrBCUHZ+Y2UkC5CtN5/3gPE7EX3SzQ7zI9L4na1FWq/vDun7nzSqbaZzTCCuosI24up1ImeMqogZXpCl2LIgokprYiShxDWqtzYOXdRG/6oujN4p68bea6+dd3+dNyZ664cwhkEFbU3UkwtmSsBvxEOoxMTZpTi1BOZcAXnZq35qm2nBVL+tWDWwfjU92fSE34vImPN4j9m8SqN4oomaIScq/JR1/CDGA5WLpCMD7olw4ufK+4Tn6OFweuWaCnoUKjpW4OWB7oBW8+cZo6EdOqDF0RfdO6DFqSx8om8yxO0Tp6uFM1B4DS5HdhEDY+2JScTtjHGhHUTc0r21Fskpt4gboIhboIgvTMJA/7a0hN1slPFf2j9CdWJVhA8AAA==","proving_key":null,"verification_key":null}