Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion yarn-project/acir-simulator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yay!

"levelup": "^5.1.1",
"memdown": "^6.1.1",
"tslib": "^2.4.0"
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/acir-simulator/src/acvm/acvm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
WasmBlackBoxFunctionSolver,
WitnessMap,
executeCircuitWithBlackBoxSolver,
} from 'acvm_js';
} from '@noir-lang/acvm_js';

import { traverseCauseChain } from '../common/errors.js';

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/acir-simulator/src/acvm/deserialize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/acir-simulator/src/client/debug.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ForeignCallInput } from 'acvm_js';
import { ForeignCallInput } from '@noir-lang/acvm_js';

import { ACVMField } from '../acvm/index.js';

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/acir-simulator/src/client/simulator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
16 changes: 8 additions & 8 deletions yarn-project/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down