diff --git a/boxes/package.json b/boxes/package.json index 282622f14fba..9b0417032dee 100644 --- a/boxes/package.json +++ b/boxes/package.json @@ -18,6 +18,7 @@ "@aztec/foundation": "portal:../yarn-project/foundation", "@aztec/bb.js": "portal:../barretenberg/ts", "@aztec/circuit-types": "portal:../yarn-project/circuit-types", - "@aztec/ethereum": "portal:../yarn-project/ethereum" + "@aztec/ethereum": "portal:../yarn-project/ethereum", + "@aztec/types": "portal:../yarn-project/types" } } diff --git a/boxes/yarn.lock b/boxes/yarn.lock index 52561d05d8db..5719e430a8d2 100644 --- a/boxes/yarn.lock +++ b/boxes/yarn.lock @@ -34,10 +34,11 @@ __metadata: resolution: "@aztec/accounts@portal:../yarn-project/accounts::locator=%40aztec%2Fboxes%40workspace%3A." dependencies: "@aztec/aztec.js": "workspace:^" + "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" "@aztec/foundation": "workspace:^" - "@aztec/circuit-types": "workspace:^" + "@aztec/types": "workspace:^" tslib: "npm:^2.4.0" languageName: node linkType: soft @@ -65,12 +66,11 @@ __metadata: version: 0.0.0-use.local resolution: "@aztec/aztec.js@portal:../yarn-project/aztec.js::locator=%40aztec%2Fboxes%40workspace%3A." dependencies: + "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" "@aztec/foundation": "workspace:^" - "@aztec/circuit-types": "workspace:^" - lodash.every: "npm:^4.6.0" - lodash.partition: "npm:^4.6.0" + "@aztec/types": "workspace:^" tslib: "npm:^2.4.0" languageName: node linkType: soft @@ -231,6 +231,22 @@ __metadata: languageName: unknown linkType: soft +"@aztec/circuit-types@portal:../yarn-project/circuit-types::locator=%40aztec%2Fboxes%40workspace%3A.": + version: 0.0.0-use.local + resolution: "@aztec/circuit-types@portal:../yarn-project/circuit-types::locator=%40aztec%2Fboxes%40workspace%3A." + dependencies: + "@aztec/circuits.js": "workspace:^" + "@aztec/ethereum": "workspace:^" + "@aztec/foundation": "workspace:^" + "@aztec/types": "workspace:^" + browserify-cipher: "npm:^1.0.1" + lodash.clonedeep: "npm:^4.5.0" + lodash.isequal: "npm:^4.5.0" + lodash.times: "npm:^4.3.2" + tslib: "npm:^2.5.0" + languageName: node + linkType: soft + "@aztec/circuits.js@portal:../yarn-project/circuits.js::locator=%40aztec%2Fboxes%40workspace%3A.": version: 0.0.0-use.local resolution: "@aztec/circuits.js@portal:../yarn-project/circuits.js::locator=%40aztec%2Fboxes%40workspace%3A." @@ -281,18 +297,11 @@ __metadata: languageName: node linkType: soft -"@aztec/circuit-types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A.": +"@aztec/types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A.": version: 0.0.0-use.local - resolution: "@aztec/circuit-types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A." + resolution: "@aztec/types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A." dependencies: - "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" - "@aztec/foundation": "workspace:^" - browserify-cipher: "npm:^1.0.1" - lodash.clonedeep: "npm:^4.5.0" - lodash.isequal: "npm:^4.5.0" - lodash.times: "npm:^4.3.2" - tslib: "npm:^2.5.0" languageName: node linkType: soft @@ -9438,13 +9447,6 @@ __metadata: languageName: node linkType: hard -"lodash.every@npm:^4.6.0": - version: 4.6.0 - resolution: "lodash.every@npm:4.6.0" - checksum: 67dd78cf01e3a4dbeaf6095d766e6868a229bb71a9a438d4a0bf5425326fd8e8ceee97c0079961697dae984e1052db6c31d4e7c54da7899f36a88702ed13cee1 - languageName: node - linkType: hard - "lodash.isarguments@npm:^3.1.0": version: 3.1.0 resolution: "lodash.isarguments@npm:3.1.0" @@ -9473,13 +9475,6 @@ __metadata: languageName: node linkType: hard -"lodash.partition@npm:^4.6.0": - version: 4.6.0 - resolution: "lodash.partition@npm:4.6.0" - checksum: a65f48f5f11a009656b3441a063948316923a48f7bfc9454064ba81f75e72ac038c61450c263f4874d8413052a20aacfc18a46dd6d8a9a287221a46e78733f45 - languageName: node - linkType: hard - "lodash.times@npm:^4.3.2": version: 4.3.2 resolution: "lodash.times@npm:4.3.2" diff --git a/yarn-project/accounts/package.json b/yarn-project/accounts/package.json index b4424cab7a14..2a59abcc1b3a 100644 --- a/yarn-project/accounts/package.json +++ b/yarn-project/accounts/package.json @@ -50,6 +50,7 @@ "@aztec/circuits.js": "workspace:^", "@aztec/ethereum": "workspace:^", "@aztec/foundation": "workspace:^", + "@aztec/types": "workspace:^", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/yarn-project/accounts/src/defaults/account_contract.ts b/yarn-project/accounts/src/defaults/account_contract.ts index 1247248995cb..eed3e159e6cd 100644 --- a/yarn-project/accounts/src/defaults/account_contract.ts +++ b/yarn-project/accounts/src/defaults/account_contract.ts @@ -1,6 +1,7 @@ import { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { CompleteAddress, NodeInfo } from '@aztec/circuit-types'; +import { CompleteAddress } from '@aztec/circuit-types'; import { ContractArtifact } from '@aztec/foundation/abi'; +import { NodeInfo } from '@aztec/types/interfaces'; import { DefaultAccountInterface } from '../defaults/account_interface.js'; diff --git a/yarn-project/accounts/src/defaults/account_interface.ts b/yarn-project/accounts/src/defaults/account_interface.ts index f4bbd465cf20..d04ab0630e0c 100644 --- a/yarn-project/accounts/src/defaults/account_interface.ts +++ b/yarn-project/accounts/src/defaults/account_interface.ts @@ -1,6 +1,7 @@ import { AccountInterface, AuthWitnessProvider, EntrypointInterface } from '@aztec/aztec.js/account'; -import { AuthWitness, FunctionCall, NodeInfo, TxExecutionRequest } from '@aztec/circuit-types'; +import { AuthWitness, FunctionCall, TxExecutionRequest } from '@aztec/circuit-types'; import { CompleteAddress, Fr } from '@aztec/circuits.js'; +import { NodeInfo } from '@aztec/types/interfaces'; import { DefaultAccountEntrypoint } from './account_entrypoint.js'; diff --git a/yarn-project/accounts/tsconfig.json b/yarn-project/accounts/tsconfig.json index ad4468866e20..2adb9ec62d70 100644 --- a/yarn-project/accounts/tsconfig.json +++ b/yarn-project/accounts/tsconfig.json @@ -20,6 +20,9 @@ }, { "path": "../foundation" + }, + { + "path": "../types" } ], "include": ["src", "src/**/*.json"] diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json index 6448985e33fd..7b6d167eef2a 100644 --- a/yarn-project/aztec.js/package.json +++ b/yarn-project/aztec.js/package.json @@ -52,6 +52,7 @@ "@aztec/circuits.js": "workspace:^", "@aztec/ethereum": "workspace:^", "@aztec/foundation": "workspace:^", + "@aztec/types": "workspace:^", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/yarn-project/aztec.js/src/account/contract.ts b/yarn-project/aztec.js/src/account/contract.ts index 59c295d59984..5f697cdbdfb6 100644 --- a/yarn-project/aztec.js/src/account/contract.ts +++ b/yarn-project/aztec.js/src/account/contract.ts @@ -1,5 +1,6 @@ -import { CompleteAddress, NodeInfo } from '@aztec/circuit-types'; +import { CompleteAddress } from '@aztec/circuit-types'; import { ContractArtifact } from '@aztec/foundation/abi'; +import { NodeInfo } from '@aztec/types/interfaces'; import { AccountInterface } from './interface.js'; diff --git a/yarn-project/aztec.js/src/contract/contract.test.ts b/yarn-project/aztec.js/src/contract/contract.test.ts index ced851c4c070..524eb778393d 100644 --- a/yarn-project/aztec.js/src/contract/contract.test.ts +++ b/yarn-project/aztec.js/src/contract/contract.test.ts @@ -1,7 +1,8 @@ -import { ExtendedContractData, NodeInfo, Tx, TxExecutionRequest, TxHash, TxReceipt } from '@aztec/circuit-types'; +import { ExtendedContractData, Tx, TxExecutionRequest, TxHash, TxReceipt } from '@aztec/circuit-types'; import { AztecAddress, CompleteAddress, EthAddress } from '@aztec/circuits.js'; import { L1ContractAddresses } from '@aztec/ethereum'; import { ABIParameterVisibility, ContractArtifact, FunctionType } from '@aztec/foundation/abi'; +import { NodeInfo } from '@aztec/types/interfaces'; import { MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/aztec.js/src/index.ts b/yarn-project/aztec.js/src/index.ts index 721b08bf15fc..d0f2ba7a8a26 100644 --- a/yarn-project/aztec.js/src/index.ts +++ b/yarn-project/aztec.js/src/index.ts @@ -91,7 +91,6 @@ export { LogId, LogType, MerkleTreeId, - NodeInfo, Note, PXE, PackedArguments, @@ -110,6 +109,8 @@ export { mockTx, } from '@aztec/circuit-types'; +export { NodeInfo } from '@aztec/types/interfaces'; + // TODO: These kinds of things have no place on our public api. // External devs will almost certainly have their own methods of doing these things. // If we want to use them in our own "aztec.js consuming code", import them from foundation as needed. diff --git a/yarn-project/aztec.js/src/wallet/base_wallet.ts b/yarn-project/aztec.js/src/wallet/base_wallet.ts index eec9239e8f0d..af00daacb55e 100644 --- a/yarn-project/aztec.js/src/wallet/base_wallet.ts +++ b/yarn-project/aztec.js/src/wallet/base_wallet.ts @@ -9,7 +9,6 @@ import { L2Block, L2Tx, LogFilter, - NodeInfo, NoteFilter, PXE, SyncStatus, @@ -19,6 +18,7 @@ import { TxReceipt, } from '@aztec/circuit-types'; import { AztecAddress, CompleteAddress, Fr, GrumpkinPrivateKey, PartialAddress } from '@aztec/circuits.js'; +import { NodeInfo } from '@aztec/types/interfaces'; import { Wallet } from '../account/wallet.js'; diff --git a/yarn-project/aztec.js/tsconfig.json b/yarn-project/aztec.js/tsconfig.json index bf1c63c497fc..b6f148a8e0d4 100644 --- a/yarn-project/aztec.js/tsconfig.json +++ b/yarn-project/aztec.js/tsconfig.json @@ -17,6 +17,9 @@ }, { "path": "../foundation" + }, + { + "path": "../types" } ], "include": ["src", "src/**/*.json"] diff --git a/yarn-project/circuit-types/README.md b/yarn-project/circuit-types/README.md index 0b72be149ded..f0893003d7ee 100644 --- a/yarn-project/circuit-types/README.md +++ b/yarn-project/circuit-types/README.md @@ -1,2 +1,2 @@ -# Types -A package containing types which are relevant through all the Aztec Typescript codebase (L2Block, Tx etc.). +# Circuit Types +A package containing circuit dependent types which are relevant through all the Aztec Typescript codebase. diff --git a/yarn-project/circuit-types/package.json b/yarn-project/circuit-types/package.json index 2a6ff691c0a1..fbf2b25be3b5 100644 --- a/yarn-project/circuit-types/package.json +++ b/yarn-project/circuit-types/package.json @@ -14,7 +14,7 @@ "entryPoints": [ "./src/index.ts" ], - "name": "Aztec 3 Types", + "name": "Aztec 3 Circuit Types", "tsconfig": "./tsconfig.json" }, "scripts": { @@ -40,6 +40,7 @@ "@aztec/circuits.js": "workspace:^", "@aztec/ethereum": "workspace:^", "@aztec/foundation": "workspace:^", + "@aztec/types": "workspace:^", "browserify-cipher": "^1.0.1", "lodash.clonedeep": "^4.5.0", "lodash.isequal": "^4.5.0", diff --git a/yarn-project/circuit-types/src/interfaces/index.ts b/yarn-project/circuit-types/src/interfaces/index.ts index cf18112e9b44..411b81df6e32 100644 --- a/yarn-project/circuit-types/src/interfaces/index.ts +++ b/yarn-project/circuit-types/src/interfaces/index.ts @@ -3,7 +3,6 @@ export * from './hasher.js'; export * from './aztec-node.js'; export * from './pxe.js'; export * from './deployed-contract.js'; -export * from './node-info.js'; export * from './sync-status.js'; export * from './configs.js'; export * from './nullifier_tree.js'; diff --git a/yarn-project/circuit-types/src/interfaces/pxe.ts b/yarn-project/circuit-types/src/interfaces/pxe.ts index ca21564c751b..657a1e819f91 100644 --- a/yarn-project/circuit-types/src/interfaces/pxe.ts +++ b/yarn-project/circuit-types/src/interfaces/pxe.ts @@ -1,4 +1,5 @@ import { AztecAddress, CompleteAddress, Fr, GrumpkinPrivateKey, PartialAddress } from '@aztec/circuits.js'; +import { NodeInfo } from '@aztec/types/interfaces'; import { AuthWitness } from '../auth_witness.js'; import { ContractData, ExtendedContractData } from '../contract_data.js'; @@ -10,7 +11,6 @@ import { NoteFilter } from '../notes/note_filter.js'; import { Tx, TxHash, TxReceipt } from '../tx/index.js'; import { TxExecutionRequest } from '../tx_execution_request.js'; import { DeployedContract } from './deployed-contract.js'; -import { NodeInfo } from './node-info.js'; import { SyncStatus } from './sync-status.js'; // docs:start:pxe-interface diff --git a/yarn-project/circuit-types/tsconfig.json b/yarn-project/circuit-types/tsconfig.json index e7053342b34b..15a8206d1cb4 100644 --- a/yarn-project/circuit-types/tsconfig.json +++ b/yarn-project/circuit-types/tsconfig.json @@ -14,6 +14,9 @@ }, { "path": "../foundation" + }, + { + "path": "../types" } ], "include": ["src"] diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json index 1da551f23760..25d262383576 100644 --- a/yarn-project/cli/package.json +++ b/yarn-project/cli/package.json @@ -42,6 +42,7 @@ "@aztec/l1-artifacts": "workspace:^", "@aztec/noir-compiler": "workspace:^", "@aztec/noir-contracts": "workspace:^", + "@aztec/types": "workspace:^", "@iarna/toml": "^2.2.5", "@libp2p/peer-id-factory": "^3.0.4", "commander": "^9.0.0", diff --git a/yarn-project/cli/src/client.test.ts b/yarn-project/cli/src/client.test.ts index 11823a90b250..526c218ac35a 100644 --- a/yarn-project/cli/src/client.test.ts +++ b/yarn-project/cli/src/client.test.ts @@ -1,4 +1,5 @@ -import { NodeInfo, PXE } from '@aztec/circuit-types'; +import { PXE } from '@aztec/circuit-types'; +import { NodeInfo } from '@aztec/types/interfaces'; import { MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/cli/src/cmds/unbox.ts b/yarn-project/cli/src/cmds/unbox.ts index 0d70ea42a558..169025b6b4ac 100644 --- a/yarn-project/cli/src/cmds/unbox.ts +++ b/yarn-project/cli/src/cmds/unbox.ts @@ -16,6 +16,7 @@ const resolutions: { [key: string]: string } = { '@aztec/bb.js': 'portal:.aztec-packages/barretenberg/ts', '@aztec/circuit-types': 'portal:.aztec-packages/yarn-project/circuit-types', '@aztec/ethereum': 'portal:.aztec-packages/yarn-project/ethereum', + '@aztec/types': 'portal:.aztec-packages/yarn-project/types', }; /** @@ -67,6 +68,7 @@ function copyDependenciesToBox(dirName: string, destPath: string) { 'yarn-project/circuits.js', 'yarn-project/foundation', 'yarn-project/types', + 'yarn-project/circuit-types', 'yarn-project/ethereum', ].forEach(path => cpSync(dirName + '/../../../../' + path, destPath + '/.aztec-packages/' + path, { diff --git a/yarn-project/cli/tsconfig.json b/yarn-project/cli/tsconfig.json index debdd0ba3c74..d90429154452 100644 --- a/yarn-project/cli/tsconfig.json +++ b/yarn-project/cli/tsconfig.json @@ -29,6 +29,9 @@ }, { "path": "../noir-contracts" + }, + { + "path": "../types" } ], "include": ["src"], diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh index 68b1812195a2..66e1c78de2f3 100755 --- a/yarn-project/deploy_npm.sh +++ b/yarn-project/deploy_npm.sh @@ -80,6 +80,7 @@ function deploy_package() { # New packages here should be added after the last package that they depend on deploy_package foundation +deploy_package types deploy_package circuits.js deploy_package circuit-types deploy_package aztec.js diff --git a/yarn-project/package.json b/yarn-project/package.json index fe89fde14ec3..8bd7ef891ce7 100644 --- a/yarn-project/package.json +++ b/yarn-project/package.json @@ -43,6 +43,7 @@ "rollup-provider", "sequencer-client", "scripts", + "types", "world-state", "yarn-project-base", "kv-store" diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json index 45cc91169a5a..223b5f7abd47 100644 --- a/yarn-project/pxe/package.json +++ b/yarn-project/pxe/package.json @@ -42,6 +42,7 @@ "@aztec/kv-store": "workspace:^", "@aztec/noir-compiler": "workspace:^", "@aztec/noir-protocol-circuits": "workspace:^", + "@aztec/types": "workspace:^", "koa": "^2.14.2", "koa-router": "^12.0.0", "lodash.omit": "^4.5.0", diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts index 8a995517b3d4..5ae775e29b90 100644 --- a/yarn-project/pxe/src/pxe_service/pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts @@ -21,7 +21,6 @@ import { L2Tx, LogFilter, MerkleTreeId, - NodeInfo, NoteFilter, PXE, SimulationError, @@ -54,6 +53,7 @@ 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'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; diff --git a/yarn-project/pxe/tsconfig.json b/yarn-project/pxe/tsconfig.json index cfd0f2109fac..f78f8c2e76ab 100644 --- a/yarn-project/pxe/tsconfig.json +++ b/yarn-project/pxe/tsconfig.json @@ -32,6 +32,9 @@ }, { "path": "../noir-protocol-circuits" + }, + { + "path": "../types" } ], "include": ["src"] diff --git a/yarn-project/tsconfig.json b/yarn-project/tsconfig.json index 474964835e37..2ffee350c7ed 100644 --- a/yarn-project/tsconfig.json +++ b/yarn-project/tsconfig.json @@ -41,6 +41,7 @@ { "path": "p2p-bootstrap/tsconfig.json" }, { "path": "prover-client/tsconfig.json" }, { "path": "sequencer-client/tsconfig.json" }, + { "path": "types/tsconfig.json" }, { "path": "world-state/tsconfig.json" }, { "path": "scripts/tsconfig.json" } ], diff --git a/yarn-project/types/.eslintrc.cjs b/yarn-project/types/.eslintrc.cjs new file mode 100644 index 000000000000..30064fcb134d --- /dev/null +++ b/yarn-project/types/.eslintrc.cjs @@ -0,0 +1 @@ +module.exports = require('@aztec/foundation/eslint'); \ No newline at end of file diff --git a/yarn-project/types/README.md b/yarn-project/types/README.md new file mode 100644 index 000000000000..e17b76a37a44 --- /dev/null +++ b/yarn-project/types/README.md @@ -0,0 +1,2 @@ +# Types +A package containing non circuit dependent types which are relevant through all the Aztec Typescript codebase. \ No newline at end of file diff --git a/yarn-project/types/package.json b/yarn-project/types/package.json new file mode 100644 index 000000000000..97f8acc0d8e6 --- /dev/null +++ b/yarn-project/types/package.json @@ -0,0 +1,63 @@ +{ + "name": "@aztec/types", + "version": "0.1.0", + "packageManager": "yarn@3.4.1", + "type": "module", + "main": "./dest/index.js", + "types": "./dest/index.d.ts", + "exports": { + "./interfaces": "./dest/interfaces/index.js" + }, + "scripts": { + "build": "yarn clean && tsc -b", + "build:dev": "tsc -b --watch", + "clean": "rm -rf ./dest .tsbuildinfo", + "formatting": "run -T prettier --check ./src && run -T eslint ./src", + "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", + "test:light": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests", + "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" + }, + "inherits": [ + "../package.common.json" + ], + "jest": { + "preset": "ts-jest/presets/default-esm", + "moduleNameMapper": { + "^(\\.{1,2}/.*)\\.[cm]?js$": "$1" + }, + "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$", + "rootDir": "./src" + }, + "dependencies": { + "@aztec/ethereum": "workspace:^" + }, + "devDependencies": { + "@jest/globals": "^29.5.0", + "@types/debug": "^4.1.7", + "@types/detect-node": "^2.0.0", + "@types/jest": "^29.5.0", + "@types/supertest": "^2.0.12", + "@typescript-eslint/eslint-plugin": "^6.2.1", + "@typescript-eslint/parser": "^6.2.1", + "comlink": "^4.4.1", + "eslint": "^8.21.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-jsdoc": "^40.1.0", + "eslint-plugin-no-only-tests": "^3.1.0", + "eslint-plugin-tsdoc": "^0.2.17", + "jest": "^29.5.0", + "prettier": "^2.7.1", + "supertest": "^6.3.3", + "ts-jest": "^29.1.0", + "ts-node": "^10.9.1", + "typescript": "^5.0.4" + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "engines": { + "node": ">=18" + } +} diff --git a/yarn-project/types/src/index.ts b/yarn-project/types/src/index.ts new file mode 100644 index 000000000000..a3df311a4691 --- /dev/null +++ b/yarn-project/types/src/index.ts @@ -0,0 +1 @@ +export * from './interfaces/index.js'; diff --git a/yarn-project/types/src/interfaces/index.ts b/yarn-project/types/src/interfaces/index.ts new file mode 100644 index 000000000000..46da7a96f90e --- /dev/null +++ b/yarn-project/types/src/interfaces/index.ts @@ -0,0 +1 @@ +export * from './node-info.js'; diff --git a/yarn-project/circuit-types/src/interfaces/node-info.ts b/yarn-project/types/src/interfaces/node-info.ts similarity index 100% rename from yarn-project/circuit-types/src/interfaces/node-info.ts rename to yarn-project/types/src/interfaces/node-info.ts diff --git a/yarn-project/types/tsconfig.json b/yarn-project/types/tsconfig.json new file mode 100644 index 000000000000..d59d9edb2a7c --- /dev/null +++ b/yarn-project/types/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "..", + "compilerOptions": { + "outDir": "dest", + "rootDir": "src", + "tsBuildInfoFile": ".tsbuildinfo" + }, + "include": ["src"], + "references": [ + { + "path": "../ethereum" + } + ] +} diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 9c0efe6bdcc4..06f0a3f09e77 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -66,6 +66,7 @@ __metadata: "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" "@aztec/foundation": "workspace:^" + "@aztec/types": "workspace:^" "@jest/globals": ^29.5.0 "@types/jest": ^29.5.0 "@types/node": ^18.7.23 @@ -238,6 +239,7 @@ __metadata: "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" "@aztec/foundation": "workspace:^" + "@aztec/types": "workspace:^" "@jest/globals": ^29.5.0 "@types/jest": ^29.5.0 "@types/node": ^18.7.23 @@ -296,6 +298,7 @@ __metadata: "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" "@aztec/foundation": "workspace:^" + "@aztec/types": "workspace:^" "@jest/globals": ^29.5.0 "@types/jest": ^29.5.0 "@types/lodash.clonedeep": ^4.5.7 @@ -350,6 +353,7 @@ __metadata: "@aztec/l1-artifacts": "workspace:^" "@aztec/noir-compiler": "workspace:^" "@aztec/noir-contracts": "workspace:^" + "@aztec/types": "workspace:^" "@iarna/toml": ^2.2.5 "@jest/globals": ^29.5.0 "@libp2p/peer-id-factory": ^3.0.4 @@ -756,6 +760,7 @@ __metadata: "@aztec/kv-store": "workspace:^" "@aztec/noir-compiler": "workspace:^" "@aztec/noir-protocol-circuits": "workspace:^" + "@aztec/types": "workspace:^" "@jest/globals": ^29.5.0 "@types/jest": ^29.5.0 "@types/lodash.omit": ^4.5.7 @@ -842,6 +847,33 @@ __metadata: languageName: unknown linkType: soft +"@aztec/types@workspace:^, @aztec/types@workspace:types": + version: 0.0.0-use.local + resolution: "@aztec/types@workspace:types" + dependencies: + "@aztec/ethereum": "workspace:^" + "@jest/globals": ^29.5.0 + "@types/debug": ^4.1.7 + "@types/detect-node": ^2.0.0 + "@types/jest": ^29.5.0 + "@types/supertest": ^2.0.12 + "@typescript-eslint/eslint-plugin": ^6.2.1 + "@typescript-eslint/parser": ^6.2.1 + comlink: ^4.4.1 + eslint: ^8.21.0 + eslint-config-prettier: ^8.5.0 + eslint-plugin-jsdoc: ^40.1.0 + eslint-plugin-no-only-tests: ^3.1.0 + eslint-plugin-tsdoc: ^0.2.17 + jest: ^29.5.0 + prettier: ^2.7.1 + supertest: ^6.3.3 + ts-jest: ^29.1.0 + ts-node: ^10.9.1 + typescript: ^5.0.4 + languageName: unknown + linkType: soft + "@aztec/world-state@workspace:^, @aztec/world-state@workspace:world-state": version: 0.0.0-use.local resolution: "@aztec/world-state@workspace:world-state"