From 89ef4f3fecd8f2c9edbbdaf44529588a643f4465 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 17 Jan 2024 16:44:11 -0300 Subject: [PATCH] Remove noir version exported from noir-compiler --- yarn-project/aztec.js/src/contract/contract.test.ts | 1 - yarn-project/cli/src/cmds/get_node_info.ts | 1 - yarn-project/end-to-end/src/cli_docs_sandbox.test.ts | 1 - yarn-project/noir-compiler/package.json | 4 +--- yarn-project/noir-compiler/src/index.ts | 2 -- yarn-project/noir-compiler/src/versions.ts | 5 ----- yarn-project/pxe/src/pxe_service/pxe_service.ts | 2 -- yarn-project/types/src/interfaces/node-info.ts | 4 ---- yarn-project/yarn.lock | 9 --------- 9 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 yarn-project/noir-compiler/src/versions.ts diff --git a/yarn-project/aztec.js/src/contract/contract.test.ts b/yarn-project/aztec.js/src/contract/contract.test.ts index 14bdbe71f29..eea65713c5e 100644 --- a/yarn-project/aztec.js/src/contract/contract.test.ts +++ b/yarn-project/aztec.js/src/contract/contract.test.ts @@ -30,7 +30,6 @@ describe('Contract Class', () => { }; const mockNodeInfo: NodeInfo = { nodeVersion: 'vx.x.x', - compatibleNargoVersion: 'vx.x.x-aztec.x', chainId: 1, protocolVersion: 2, l1ContractAddresses: l1Addresses, diff --git a/yarn-project/cli/src/cmds/get_node_info.ts b/yarn-project/cli/src/cmds/get_node_info.ts index 4d98da411cd..2f14d5f5a24 100644 --- a/yarn-project/cli/src/cmds/get_node_info.ts +++ b/yarn-project/cli/src/cmds/get_node_info.ts @@ -10,7 +10,6 @@ export async function getNodeInfo(rpcUrl: string, debugLogger: DebugLogger, log: const info = await client.getNodeInfo(); log(`\nNode Info:\n`); log(`Node Version: ${info.nodeVersion}\n`); - log(`Compatible Nargo Version: ${info.compatibleNargoVersion}\n`); log(`Chain Id: ${info.chainId}\n`); log(`Protocol Version: ${info.protocolVersion}\n`); log(`Rollup Address: ${info.l1ContractAddresses.rollupAddress.toString()}`); diff --git a/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts b/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts index 46411f3e3af..c03353a9a88 100644 --- a/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts +++ b/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts @@ -30,7 +30,6 @@ describe('CLI docs sandbox', () => { Node Info: Node Version: #include_aztec_short_version -Compatible Nargo Version: #include_noir_version Chain Id: 31337 Protocol Version: 1 Rollup Address: 0x0dcd1bf9a1b36ce34237eeafef220932846bcd82 diff --git a/yarn-project/noir-compiler/package.json b/yarn-project/noir-compiler/package.json index 71c96a4db41..dc90ce3ca62 100644 --- a/yarn-project/noir-compiler/package.json +++ b/yarn-project/noir-compiler/package.json @@ -4,8 +4,7 @@ "type": "module", "exports": { ".": "./dest/index.js", - "./cli": "./dest/cli/index.js", - "./versions": "./dest/versions.js" + "./cli": "./dest/cli/index.js" }, "typedocOptions": { "entryPoints": [ @@ -49,7 +48,6 @@ "@aztec/foundation": "workspace:^", "@aztec/types": "workspace:^", "@iarna/toml": "^2.2.5", - "@noir-lang/noir_wasm": "portal:../../noir/packages/noir_wasm", "base64-js": "^1.5.1", "commander": "^9.0.0", "fs-extra": "^11.1.1", diff --git a/yarn-project/noir-compiler/src/index.ts b/yarn-project/noir-compiler/src/index.ts index 88416ef4282..a28e4f09303 100644 --- a/yarn-project/noir-compiler/src/index.ts +++ b/yarn-project/noir-compiler/src/index.ts @@ -1,4 +1,2 @@ -export * from './versions.js'; - export { generateTypescriptContractInterface } from './contract-interface-gen/typescript.js'; export { generateNoirContractInterface } from './contract-interface-gen/noir.js'; diff --git a/yarn-project/noir-compiler/src/versions.ts b/yarn-project/noir-compiler/src/versions.ts deleted file mode 100644 index 99a4015967c..00000000000 --- a/yarn-project/noir-compiler/src/versions.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { readFile } from 'node:fs/promises'; - -// read package.json at runtime instead of compile time so that we keep rootDir as-is in tsconfig -const pkg = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf-8')); -export const NoirWasmVersion = pkg.dependencies['@noir-lang/noir_wasm']; diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts index 5ae775e29b9..871f50b137f 100644 --- a/yarn-project/pxe/src/pxe_service/pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts @@ -52,7 +52,6 @@ import { Fr } from '@aztec/foundation/fields'; import { SerialQueue } from '@aztec/foundation/fifo'; import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; -import { NoirWasmVersion } from '@aztec/noir-compiler/versions'; import { NodeInfo } from '@aztec/types/interfaces'; import { PXEServiceConfig, getPackageInfo } from '../config/index.js'; @@ -488,7 +487,6 @@ export class PXEService implements PXE { const nodeInfo: NodeInfo = { nodeVersion: this.nodeVersion, - compatibleNargoVersion: NoirWasmVersion, chainId, protocolVersion: version, l1ContractAddresses: contractAddresses, diff --git a/yarn-project/types/src/interfaces/node-info.ts b/yarn-project/types/src/interfaces/node-info.ts index 1831263c0e3..48d77996d89 100644 --- a/yarn-project/types/src/interfaces/node-info.ts +++ b/yarn-project/types/src/interfaces/node-info.ts @@ -8,10 +8,6 @@ export interface NodeInfo { * Version as tracked in the aztec-packages repository. */ nodeVersion: string; - /** - * The nargo version compatible with this node version - */ - compatibleNargoVersion: string; /** * L1 chain id. */ diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index b5e32659fad..305751891f5 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -611,7 +611,6 @@ __metadata: "@aztec/types": "workspace:^" "@iarna/toml": ^2.2.5 "@jest/globals": ^29.5.0 - "@noir-lang/noir_wasm": "portal:../../noir/packages/noir_wasm" "@types/fs-extra": ^11.0.1 "@types/jest": ^29.5.0 "@types/lodash.camelcase": ^4.3.7 @@ -2814,14 +2813,6 @@ __metadata: languageName: node linkType: soft -"@noir-lang/noir_wasm@portal:../noir/packages/noir_wasm::locator=%40aztec%2Faztec3-packages%40workspace%3A.": - version: 0.0.0-use.local - resolution: "@noir-lang/noir_wasm@portal:../noir/packages/noir_wasm::locator=%40aztec%2Faztec3-packages%40workspace%3A." - dependencies: - pako: ^2.1.0 - languageName: node - linkType: soft - "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A.": version: 0.0.0-use.local resolution: "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A."