Remove noir version exported from noir-compiler

AztecProtocol · Jan 17, 2024 · 89ef4f3 · 89ef4f3
1 parent ddaf77a
commit 89ef4f3
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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."