diff --git a/.pnp.cjs b/.pnp.cjs index eccb40e52..c7f89b6d8 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -70,6 +70,19 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@aztec/bb.js", [\ + ["npm:0.19.0", {\ + "packageLocation": "../../../.yarn/berry/cache/@aztec-bb.js-npm-0.19.0-f79c8f9743-10c0.zip/node_modules/@aztec/bb.js/",\ + "packageDependencies": [\ + ["@aztec/bb.js", "npm:0.19.0"],\ + ["comlink", "npm:4.4.1"],\ + ["commander", "npm:10.0.1"],\ + ["debug", "virtual:1ff4b5f90832ba0a9c93ba1223af226e44ba70c1126a3740d93562b97bc36544e896a5e95908196f7458713e6a6089a34bfc67362fc6df7fa093bd06c878be47#npm:4.3.4"],\ + ["tslib", "npm:2.6.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@esbuild/aix-ppc64", [\ ["npm:0.19.12", {\ "packageLocation": "./.yarn/unplugged/@esbuild-aix-ppc64-npm-0.19.12-20acbc4c27/node_modules/@esbuild/aix-ppc64/",\ @@ -530,6 +543,18 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@noir-lang/backend_barretenberg", [\ + ["npm:0.23.0", {\ + "packageLocation": "../../../.yarn/berry/cache/@noir-lang-backend_barretenberg-npm-0.23.0-3ca716994c-10c0.zip/node_modules/@noir-lang/backend_barretenberg/",\ + "packageDependencies": [\ + ["@noir-lang/backend_barretenberg", "npm:0.23.0"],\ + ["@aztec/bb.js", "npm:0.19.0"],\ + ["@noir-lang/types", "npm:0.23.0"],\ + ["fflate", "npm:0.8.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@noir-lang/noir_js", [\ ["npm:0.23.0", {\ "packageLocation": "../../../.yarn/berry/cache/@noir-lang-noir_js-npm-0.23.0-5a7542fd4c-10c0.zip/node_modules/@noir-lang/noir_js/",\ @@ -1713,6 +1738,24 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["comlink", [\ + ["npm:4.4.1", {\ + "packageLocation": "../../../.yarn/berry/cache/comlink-npm-4.4.1-b05bb2527d-10c0.zip/node_modules/comlink/",\ + "packageDependencies": [\ + ["comlink", "npm:4.4.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["commander", [\ + ["npm:10.0.1", {\ + "packageLocation": "../../../.yarn/berry/cache/commander-npm-10.0.1-f17613b72b-10c0.zip/node_modules/commander/",\ + "packageDependencies": [\ + ["commander", "npm:10.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["concat-map", [\ ["npm:0.0.1", {\ "packageLocation": "../../../.yarn/berry/cache/concat-map-npm-0.0.1-85a921b7ee-10c0.zip/node_modules/concat-map/",\ @@ -2773,6 +2816,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["fflate", [\ + ["npm:0.8.2", {\ + "packageLocation": "../../../.yarn/berry/cache/fflate-npm-0.8.2-5129f303f0-10c0.zip/node_modules/fflate/",\ + "packageDependencies": [\ + ["fflate", "npm:0.8.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["file-entry-cache", [\ ["npm:6.0.1", {\ "packageLocation": "../../../.yarn/berry/cache/file-entry-cache-npm-6.0.1-31965cf0af-10c0.zip/node_modules/file-entry-cache/",\ @@ -4075,6 +4127,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./ethereum_history_api/tests/",\ "packageDependencies": [\ ["noir-ethereum-api-e2e-tests", "workspace:ethereum_history_api/tests"],\ + ["@noir-lang/backend_barretenberg", "npm:0.23.0"],\ ["@noir-lang/noirc_abi", "npm:0.23.0"],\ ["@types/node", "npm:20.11.17"],\ ["eslint", "npm:8.56.0"],\ diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index fb5f2cfe1..d3404e3f4 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/ethereum_history_api/tests/package.json b/ethereum_history_api/tests/package.json index f8ddcc40d..1b37428e5 100644 --- a/ethereum_history_api/tests/package.json +++ b/ethereum_history_api/tests/package.json @@ -12,6 +12,7 @@ "format:ci": "prettier --check src" }, "dependencies": { + "@noir-lang/backend_barretenberg": "0.23.0", "@noir-lang/noirc_abi": "^0.23.0", "noir-ethereum-api-oracles": "^1.0.0", "toml": "^3.0.0", diff --git a/ethereum_history_api/tests/src/main.ts b/ethereum_history_api/tests/src/main.ts index 087411e0f..87b9c679d 100644 --- a/ethereum_history_api/tests/src/main.ts +++ b/ethereum_history_api/tests/src/main.ts @@ -1,10 +1,9 @@ import { type CompiledCircuit } from '@noir-lang/backend_barretenberg'; -import { WitnessMap } from '@noir-lang/noir_js'; import { promises as fs } from 'fs'; import toml from 'toml'; import noir_ethereum_history_api from '../../../target/ethereum_history_api.json'; import { encodeHexString } from 'noir-ethereum-api-oracles'; -import { abiEncode, type InputMap } from '@noir-lang/noirc_abi'; +import { abiEncode, type InputMap, WitnessMap } from '@noir-lang/noirc_abi'; export const circuit = noir_ethereum_history_api as unknown as CompiledCircuit; diff --git a/yarn.lock b/yarn.lock index ae36f12c7..b363d3ecb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,6 +19,20 @@ __metadata: languageName: node linkType: hard +"@aztec/bb.js@npm:0.19.0": + version: 0.19.0 + resolution: "@aztec/bb.js@npm:0.19.0" + dependencies: + comlink: "npm:^4.4.1" + commander: "npm:^10.0.1" + debug: "npm:^4.3.4" + tslib: "npm:^2.4.0" + bin: + bb.js: dest/node/main.js + checksum: 10c0/7f0df00d5fcc9c7a027c8fa4d02aa9ad36cfeb69dcee91770f207816fa00c1f9744113cbdc0921c43b48793ae56f1269b8300a081aa336b5971b0337af459bcf + languageName: node + linkType: hard + "@esbuild/aix-ppc64@npm:0.19.12": version: 0.19.12 resolution: "@esbuild/aix-ppc64@npm:0.19.12" @@ -370,6 +384,17 @@ __metadata: languageName: node linkType: hard +"@noir-lang/backend_barretenberg@npm:0.23.0": + version: 0.23.0 + resolution: "@noir-lang/backend_barretenberg@npm:0.23.0" + dependencies: + "@aztec/bb.js": "npm:0.19.0" + "@noir-lang/types": "npm:0.23.0" + fflate: "npm:^0.8.0" + checksum: 10c0/52170513bae7e09df4bc88d6c020cddab47b91ab3c56c4dcb2183d2b091bcb95c557606e338daf22ee415fe61b8b218cdf6ec7971a5548804d11f83cd7795086 + languageName: node + linkType: hard + "@noir-lang/noir_js@npm:0.23.0": version: 0.23.0 resolution: "@noir-lang/noir_js@npm:0.23.0" @@ -1306,6 +1331,20 @@ __metadata: languageName: node linkType: hard +"comlink@npm:^4.4.1": + version: 4.4.1 + resolution: "comlink@npm:4.4.1" + checksum: 10c0/a7a2004030768d13ec9373f780aa0edae57616095cb453ec8950d9f97e5fa654c0e84030ac87173b818843a04a5fa9ce9749d48b6bd453cfbfb5e6a9ebb6b2ff + languageName: node + linkType: hard + +"commander@npm:^10.0.1": + version: 10.0.1 + resolution: "commander@npm:10.0.1" + checksum: 10c0/53f33d8927758a911094adadda4b2cbac111a5b377d8706700587650fd8f45b0bbe336de4b5c3fe47fd61f420a3d9bd452b6e0e6e5600a7e74d7bf0174f6efe3 + languageName: node + linkType: hard + "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1" @@ -2146,6 +2185,13 @@ __metadata: languageName: node linkType: hard +"fflate@npm:^0.8.0": + version: 0.8.2 + resolution: "fflate@npm:0.8.2" + checksum: 10c0/03448d630c0a583abea594835a9fdb2aaf7d67787055a761515bf4ed862913cfd693b4c4ffd5c3f3b355a70cf1e19033e9ae5aedcca103188aaff91b8bd6e293 + languageName: node + linkType: hard + "file-entry-cache@npm:^6.0.1": version: 6.0.1 resolution: "file-entry-cache@npm:6.0.1" @@ -3298,6 +3344,7 @@ __metadata: version: 0.0.0-use.local resolution: "noir-ethereum-api-e2e-tests@workspace:ethereum_history_api/tests" dependencies: + "@noir-lang/backend_barretenberg": "npm:0.23.0" "@noir-lang/noirc_abi": "npm:^0.23.0" "@types/node": "npm:^20.10.5" eslint: "npm:^8.56.0" @@ -4470,7 +4517,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.6.2": +"tslib@npm:^2.4.0, tslib@npm:^2.6.2": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb