From 9f1a3a5e4b72506489645f8be8c8aa5129a2e179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bene=C5=A1?= <janbenes1234@gmail.com>
Date: Wed, 13 Sep 2023 09:57:35 -0400
Subject: [PATCH] chore: updated `acvm_js` (#2272)

Bumped version of `acvm_js`. The package is now published to npm so the
dependency no longer points directly to the github repo.
---
 yarn-project/acir-simulator/package.json         |  2 +-
 yarn-project/acir-simulator/src/acvm/acvm.ts     |  2 +-
 .../acir-simulator/src/acvm/deserialize.ts       |  2 +-
 yarn-project/acir-simulator/src/client/debug.ts  |  2 +-
 .../acir-simulator/src/client/simulator.ts       |  2 +-
 yarn-project/yarn.lock                           | 16 ++++++++--------
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/yarn-project/acir-simulator/package.json b/yarn-project/acir-simulator/package.json
index 8b0b06821c9..ef6fd4d3bfc 100644
--- a/yarn-project/acir-simulator/package.json
+++ b/yarn-project/acir-simulator/package.json
@@ -35,7 +35,7 @@
     "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/types": "workspace:^",
-    "acvm_js": "github:noir-lang/acvm-js-wasm#arv/0.25.0",
+    "@noir-lang/acvm_js": "0.26.1",
     "levelup": "^5.1.1",
     "memdown": "^6.1.1",
     "tslib": "^2.4.0"
diff --git a/yarn-project/acir-simulator/src/acvm/acvm.ts b/yarn-project/acir-simulator/src/acvm/acvm.ts
index 82c0e53e22b..e806f22618c 100644
--- a/yarn-project/acir-simulator/src/acvm/acvm.ts
+++ b/yarn-project/acir-simulator/src/acvm/acvm.ts
@@ -12,7 +12,7 @@ import {
   WasmBlackBoxFunctionSolver,
   WitnessMap,
   executeCircuitWithBlackBoxSolver,
-} from 'acvm_js';
+} from '@noir-lang/acvm_js';
 
 import { traverseCauseChain } from '../common/errors.js';
 
diff --git a/yarn-project/acir-simulator/src/acvm/deserialize.ts b/yarn-project/acir-simulator/src/acvm/deserialize.ts
index 538b14e4a76..c9d0f540526 100644
--- a/yarn-project/acir-simulator/src/acvm/deserialize.ts
+++ b/yarn-project/acir-simulator/src/acvm/deserialize.ts
@@ -22,7 +22,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { Tuple } from '@aztec/foundation/serialize';
 
-import { getReturnWitness } from 'acvm_js';
+import { getReturnWitness } from '@noir-lang/acvm_js';
 
 import { ACVMField, ACVMWitness, fromACVMField } from './acvm.js';
 
diff --git a/yarn-project/acir-simulator/src/client/debug.ts b/yarn-project/acir-simulator/src/client/debug.ts
index f03a1f251c8..21efa0e576c 100644
--- a/yarn-project/acir-simulator/src/client/debug.ts
+++ b/yarn-project/acir-simulator/src/client/debug.ts
@@ -1,4 +1,4 @@
-import { ForeignCallInput } from 'acvm_js';
+import { ForeignCallInput } from '@noir-lang/acvm_js';
 
 import { ACVMField } from '../acvm/index.js';
 
diff --git a/yarn-project/acir-simulator/src/client/simulator.ts b/yarn-project/acir-simulator/src/client/simulator.ts
index b07b156319f..4326437987e 100644
--- a/yarn-project/acir-simulator/src/client/simulator.ts
+++ b/yarn-project/acir-simulator/src/client/simulator.ts
@@ -7,7 +7,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { AztecNode, FunctionCall, TxExecutionRequest } from '@aztec/types';
 
-import { WasmBlackBoxFunctionSolver, createBlackBoxSolver } from 'acvm_js';
+import { WasmBlackBoxFunctionSolver, createBlackBoxSolver } from '@noir-lang/acvm_js';
 
 import { createSimulationError } from '../common/errors.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index a5d244830e3..c634d40c204 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -67,10 +67,10 @@ __metadata:
     "@aztec/noir-contracts": "workspace:^"
     "@aztec/types": "workspace:^"
     "@jest/globals": ^29.5.0
+    "@noir-lang/acvm_js": 0.26.1
     "@rushstack/eslint-patch": ^1.1.4
     "@types/jest": ^29.5.0
     "@types/node": ^18.7.23
-    acvm_js: "github:noir-lang/acvm-js-wasm#arv/0.25.0"
     jest: ^29.5.0
     jest-mock-extended: ^3.0.4
     levelup: ^5.1.1
@@ -2509,6 +2509,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noir-lang/acvm_js@npm:0.26.1":
+  version: 0.26.1
+  resolution: "@noir-lang/acvm_js@npm:0.26.1"
+  checksum: ae8cb6e31610cd8aa392855342d0c953a1bc4cd9e07236340341afa5815696a69a6635c38241f1d6a5dd30c5a8ae49234f2ba8b71d46c5d1a46756ff6f4dde3a
+  languageName: node
+  linkType: hard
+
 "@npmcli/fs@npm:^3.1.0":
   version: 3.1.0
   resolution: "@npmcli/fs@npm:3.1.0"
@@ -3969,13 +3976,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acvm_js@github:noir-lang/acvm-js-wasm#arv/0.25.0":
-  version: 0.0.0-9d02637
-  resolution: "acvm_js@https://github.com/noir-lang/acvm-js-wasm.git#commit=73cc4c22f4d443c9b287ebd3824a80b912fd0e58"
-  checksum: 2a2923073a9835ec0200a7bc7818023e8ab2cc87aef6238c9ee3af2a844d535dfadfd2dbc75ed82593ea4cd26a0288f91989ee7bb3a37481f63be21b76628574
-  languageName: node
-  linkType: hard
-
 "agent-base@npm:6, agent-base@npm:^6.0.2":
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"