chore: Move types to circuit-types

CHANGELOG.md

@@ -614,7 +614,7 @@
 * Noir circuit tests ([#3229](https://github.com/AztecProtocol/aztec-packages/issues/3229)) ([dbfb086](https://github.com/AztecProtocol/aztec-packages/commit/dbfb0862a26944e240c84406c7d856c022b25f47))
 * Private kernel circuits ([#3240](https://github.com/AztecProtocol/aztec-packages/issues/3240)) ([b7fbe19](https://github.com/AztecProtocol/aztec-packages/commit/b7fbe19a04a1097df7597ac8a32996994840f57c))
 * Prune 0 values from L2Tx ([#3224](https://github.com/AztecProtocol/aztec-packages/issues/3224)) ([2de206d](https://github.com/AztecProtocol/aztec-packages/commit/2de206d7959078f5289441e35788d83661a2c9f6))
-* Refactor e2e to not use @aztec/types ([#3175](https://github.com/AztecProtocol/aztec-packages/issues/3175)) ([006a07a](https://github.com/AztecProtocol/aztec-packages/commit/006a07a1dd89e4e4e792d7a3e8332351f8b32351)), closes [#3157](https://github.com/AztecProtocol/aztec-packages/issues/3157)
+* Refactor e2e to not use @aztec/circuit-types ([#3175](https://github.com/AztecProtocol/aztec-packages/issues/3175)) ([006a07a](https://github.com/AztecProtocol/aztec-packages/commit/006a07a1dd89e4e4e792d7a3e8332351f8b32351)), closes [#3157](https://github.com/AztecProtocol/aztec-packages/issues/3157)
 * Remove extra println in noir protoco circuit ([#3219](https://github.com/AztecProtocol/aztec-packages/issues/3219)) ([3295fdd](https://github.com/AztecProtocol/aztec-packages/commit/3295fdd99d92b215f2cbc2707980a7055557cb2a))
 * Split out relations, PG, Honk variants ([#3238](https://github.com/AztecProtocol/aztec-packages/issues/3238)) ([8abd39f](https://github.com/AztecProtocol/aztec-packages/commit/8abd39f5f8a434d96fe259df9c5940787bd705f1))
 * Update Noir version ([#3082](https://github.com/AztecProtocol/aztec-packages/issues/3082)) ([59eb6af](https://github.com/AztecProtocol/aztec-packages/commit/59eb6af2da9801fb6927f4b98615b2c3f8f3ec28))

boxes/package.json

@@ -17,7 +17,7 @@
     "@aztec/circuits.js": "portal:../yarn-project/circuits.js",
     "@aztec/foundation": "portal:../yarn-project/foundation",
     "@aztec/bb.js": "portal:../barretenberg/ts",
-    "@aztec/types": "portal:../yarn-project/types",
+    "@aztec/circuit-types": "portal:../yarn-project/circuit-types",
     "@aztec/ethereum": "portal:../yarn-project/ethereum"
   }
 }

boxes/yarn.lock

@@ -37,7 +37,7 @@ __metadata:
     "@aztec/circuits.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
-    "@aztec/types": "workspace:^"
+    "@aztec/circuit-types": "workspace:^"
     tslib: "npm:^2.4.0"
   languageName: node
   linkType: soft
@@ -68,7 +68,7 @@ __metadata:
     "@aztec/circuits.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
-    "@aztec/types": "workspace:^"
+    "@aztec/circuit-types": "workspace:^"
     lodash.every: "npm:^4.6.0"
     lodash.partition: "npm:^4.6.0"
     tslib: "npm:^2.4.0"
@@ -281,9 +281,9 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@aztec/types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A.":
+"@aztec/circuit-types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A.":
   version: 0.0.0-use.local
-  resolution: "@aztec/types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A."
+  resolution: "@aztec/circuit-types@portal:../yarn-project/types::locator=%40aztec%2Fboxes%40workspace%3A."
   dependencies:
     "@aztec/circuits.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"

docs/docs/dev_docs/aztecjs/main.md

@@ -14,7 +14,7 @@ Aztec.js is a library that provides APIs for managing accounts and interacting w
 
 ```typescript
 import { getSchnorrAccount } from "@aztec/aztec.js";
-import { GrumpkinPrivateKey } from "@aztec/types";
+import { GrumpkinPrivateKey } from "@aztec/circuit-types";
 
 const encryptionPrivateKey = GrumpkinPrivateKey.random();
 const signingPrivateKey = GrumpkinPrivateKey.random();

docs/docs/dev_docs/tutorials/token_portal/setup.md

@@ -130,7 +130,7 @@ Inside the `packages` directory, run
 
 ```bash
 mkdir src && cd src && yarn init -yp
-yarn add @aztec/aztec.js @aztec/accounts @aztec/noir-contracts @aztec/types @aztec/foundation @aztec/l1-artifacts viem "@types/node@^20.8.2"
+yarn add @aztec/aztec.js @aztec/accounts @aztec/noir-contracts @aztec/circuit-types @aztec/foundation @aztec/l1-artifacts viem "@types/node@^20.8.2"
 yarn add -D jest @jest/globals ts-jest
 ```
 
@@ -159,7 +159,7 @@ Your `package.json` should look something like this:
     "@aztec/aztec.js": "^0.8.7",
     "@aztec/foundation": "^0.8.7",
     "@aztec/noir-contracts": "^0.8.7",
-    "@aztec/types": "^0.8.7",
+    "@aztec/circuit-types": "^0.8.7",
     "@types/node": "^20.8.2",
     "ethers": "^5.7"
   },

docs/docs/dev_docs/wallets/architecture.md

@@ -24,7 +24,7 @@ Refer to the page on [writing an account contract](./writing_an_account_contract
 
 A wallet exposes the PXE interface to dapps by running an PXE instance. The PXE requires a keystore and a database implementation for storing keys, private state, and recipient encryption public keys.
 
-#include_code pxe-interface /yarn-project/types/src/interfaces/pxe.ts typescript
+#include_code pxe-interface /yarn-project/circuit-types/src/interfaces/pxe.ts typescript
 
 
 

docs/docusaurus.config.js

@@ -127,8 +127,8 @@ const config = {
       "docusaurus-plugin-typedoc",
       {
         id: "apis/pxe",
-        entryPoints: ["../yarn-project/types/src/interfaces/pxe.ts"],
-        tsconfig: "../yarn-project/types/tsconfig.json",
+        entryPoints: ["../yarn-project/circuit-types/src/interfaces/pxe.ts"],
+        tsconfig: "../yarn-project/circuit-types/tsconfig.json",
         entryPointStrategy: "expand",
         out: "apis/pxe",
         disableSources: true,

yarn-project/accounts/README.md

@@ -20,7 +20,7 @@ npm install @aztec/accounts
 
 ```typescript
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { GrumpkinPrivateKey } from '@aztec/types';
+import { GrumpkinPrivateKey } from '@aztec/circuit-types';
 
 const encryptionPrivateKey = GrumpkinPrivateKey.random();
 const signingPrivateKey = GrumpkinPrivateKey.random();

yarn-project/accounts/package.json

@@ -46,10 +46,10 @@
   },
   "dependencies": {
     "@aztec/aztec.js": "workspace:^",
+    "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/types": "workspace:^",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

yarn-project/accounts/src/defaults/account_contract.ts

@@ -1,6 +1,6 @@
 import { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { CompleteAddress, NodeInfo } from '@aztec/circuit-types';
 import { ContractArtifact } from '@aztec/foundation/abi';
-import { CompleteAddress, NodeInfo } from '@aztec/types';
 
 import { DefaultAccountInterface } from '../defaults/account_interface.js';
 

yarn-project/accounts/src/defaults/account_entrypoint.ts

@@ -1,7 +1,7 @@
 import { AuthWitnessProvider, EntrypointInterface } from '@aztec/aztec.js/account';
+import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
 import { AztecAddress, Fr, FunctionData, TxContext } from '@aztec/circuits.js';
 import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
-import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types';
 
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
 import { buildPayload, hashPayload } from './entrypoint_payload.js';

yarn-project/accounts/src/defaults/account_interface.ts

@@ -1,6 +1,6 @@
 import { AccountInterface, AuthWitnessProvider, EntrypointInterface } from '@aztec/aztec.js/account';
+import { AuthWitness, FunctionCall, NodeInfo, TxExecutionRequest } from '@aztec/circuit-types';
 import { CompleteAddress, Fr } from '@aztec/circuits.js';
-import { AuthWitness, FunctionCall, NodeInfo, TxExecutionRequest } from '@aztec/types';
 
 import { DefaultAccountEntrypoint } from './account_entrypoint.js';
 

yarn-project/accounts/src/defaults/entrypoint_payload.ts

@@ -1,7 +1,7 @@
+import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/circuit-types';
 import { Fr, GeneratorIndex } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { pedersenHash } from '@aztec/foundation/crypto';
-import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/types';
 
 // These must match the values defined in yarn-project/aztec-nr/aztec/src/entrypoint.nr
 const ACCOUNT_MAX_CALLS = 4;

yarn-project/accounts/src/ecdsa/account_contract.ts

@@ -1,8 +1,8 @@
 import { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { AuthWitness, CompleteAddress } from '@aztec/circuit-types';
 import { Ecdsa } from '@aztec/circuits.js/barretenberg';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { AuthWitness, CompleteAddress } from '@aztec/types';
 
 import { DefaultAccountContract } from '../defaults/account_contract.js';
 import { EcdsaAccountContractArtifact } from './artifact.js';

yarn-project/accounts/src/ecdsa/index.ts

@@ -6,8 +6,8 @@
  */
 import { AccountManager, Salt } from '@aztec/aztec.js/account';
 import { AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
+import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/circuit-types';
 import { AztecAddress } from '@aztec/circuits.js';
-import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/types';
 
 import { EcdsaAccountContract } from './account_contract.js';
 

yarn-project/accounts/src/schnorr/account_contract.ts

@@ -1,8 +1,8 @@
 import { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/circuit-types';
 import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/types';
 
 import { DefaultAccountContract } from '../defaults/account_contract.js';
 import { SchnorrAccountContractArtifact } from './artifact.js';

yarn-project/accounts/src/schnorr/index.ts

@@ -6,8 +6,8 @@
  */
 import { AccountManager, Salt } from '@aztec/aztec.js/account';
 import { AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
+import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/circuit-types';
 import { AztecAddress } from '@aztec/circuits.js';
-import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/types';
 
 import { SchnorrAccountContract } from './account_contract.js';
 

yarn-project/accounts/src/single_key/account_contract.ts

@@ -1,10 +1,10 @@
 import { generatePublicKey } from '@aztec/aztec.js';
 import { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/circuit-types';
 import { PartialAddress } from '@aztec/circuits.js';
 import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/types';
 
 import { DefaultAccountContract } from '../defaults/account_contract.js';
 import { SchnorrSingleKeyAccountContractArtifact } from './artifact.js';

yarn-project/accounts/src/single_key/index.ts

@@ -6,8 +6,8 @@
  */
 import { AccountManager, Salt } from '@aztec/aztec.js/account';
 import { AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
+import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/circuit-types';
 import { AztecAddress } from '@aztec/circuits.js';
-import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/types';
 
 import { SingleKeyAccountContract } from './account_contract.js';
 

yarn-project/accounts/src/testing/configuration.ts

@@ -1,7 +1,7 @@
 import { generatePublicKey } from '@aztec/aztec.js';
 import { AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet';
+import { PXE } from '@aztec/circuit-types';
 import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
-import { PXE } from '@aztec/types';
 
 import { getSchnorrAccount } from '../schnorr/index.js';
 

yarn-project/accounts/src/testing/create_account.ts

@@ -1,6 +1,6 @@
 import { AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet';
+import { PXE } from '@aztec/circuit-types';
 import { GrumpkinScalar } from '@aztec/circuits.js';
-import { PXE } from '@aztec/types';
 
 import { getSchnorrAccount } from '../schnorr/index.js';
 

yarn-project/accounts/tsconfig.dest.json

@@ -11,7 +11,7 @@
       "path": "../foundation/tsconfig.dest.json"
     },
     {
-      "path": "../types/tsconfig.dest.json"
+      "path": "../circuit-types/tsconfig.dest.json"
     }
   ],
   "exclude": ["src/**/*.test.ts"]

yarn-project/accounts/tsconfig.json

@@ -9,6 +9,9 @@
     {
       "path": "../aztec.js"
     },
+    {
+      "path": "../circuit-types"
+    },
     {
       "path": "../circuits.js"
     },
@@ -17,9 +20,6 @@
     },
     {
       "path": "../foundation"
-    },
-    {
-      "path": "../types"
     }
   ],
   "include": ["src", "src/**/*.json"]

yarn-project/acir-simulator/package.json

@@ -30,9 +30,9 @@
     "rootDir": "./src"
   },
   "dependencies": {
+    "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/types": "workspace:^",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "levelup": "^5.1.1",
     "memdown": "^6.1.1",

yarn-project/acir-simulator/src/acvm/acvm.ts

@@ -1,6 +1,6 @@
+import { NoirCallStack, SourceCodeLocation } from '@aztec/circuit-types';
 import { FunctionDebugMetadata, OpcodeLocation } from '@aztec/foundation/abi';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { NoirCallStack, SourceCodeLocation } from '@aztec/types';
 
 import {
   ExecutionError,

yarn-project/acir-simulator/src/acvm/oracle/oracle.ts

@@ -1,10 +1,10 @@
+import { MerkleTreeId, UnencryptedL2Log } from '@aztec/circuit-types';
 import { RETURN_VALUES_LENGTH } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { MerkleTreeId, UnencryptedL2Log } from '@aztec/types';
 
 import { ACVMField } from '../acvm_types.js';
 import { frToNumber, fromACVMField } from '../deserialize.js';

yarn-project/acir-simulator/src/acvm/oracle/typed_oracle.ts

@@ -1,8 +1,3 @@
-import { BlockHeader, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
-import { FunctionSelector } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
 import {
   CompleteAddress,
   MerkleTreeId,
@@ -11,7 +6,12 @@ import {
   PublicDataWitness,
   PublicKey,
   UnencryptedL2Log,
-} from '@aztec/types';
+} from '@aztec/circuit-types';
+import { BlockHeader, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
+import { FunctionSelector } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
 
 /**
  * Information about a note needed during execution.

yarn-project/acir-simulator/src/client/client_execution_context.ts

@@ -1,3 +1,4 @@
+import { AuthWitness, FunctionL2Logs, L1NotePayload, Note, UnencryptedL2Log } from '@aztec/circuit-types';
 import {
   BlockHeader,
   CallContext,
@@ -15,7 +16,6 @@ import { FunctionAbi, FunctionArtifact, countArgumentsSize } from '@aztec/founda
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AuthWitness, FunctionL2Logs, L1NotePayload, Note, UnencryptedL2Log } from '@aztec/types';
 
 import {
   NoteData,

yarn-project/acir-simulator/src/client/db_oracle.ts

@@ -1,9 +1,9 @@
+import { L2Block, MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/circuit-types';
 import { BlockHeader, CompleteAddress, GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js';
 import { FunctionArtifact, FunctionDebugMetadata, FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { L2Block, MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/types';
 
 import { NoteData } from '../acvm/index.js';
 import { CommitmentsDB } from '../public/db.js';

yarn-project/acir-simulator/src/client/execution_result.test.ts

@@ -1,5 +1,5 @@
+import { FunctionL2Logs } from '@aztec/circuit-types';
 import { PrivateCallStackItem } from '@aztec/circuits.js';
-import { FunctionL2Logs } from '@aztec/types';
 
 import { ExecutionResult, collectEncryptedLogs, collectUnencryptedLogs } from './execution_result.js';
 

yarn-project/acir-simulator/src/client/execution_result.ts

@@ -1,7 +1,7 @@
+import { FunctionL2Logs, Note } from '@aztec/circuit-types';
 import { PrivateCallStackItem, PublicCallRequest, ReadRequestMembershipWitness } from '@aztec/circuits.js';
 import { DecodedReturn } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { FunctionL2Logs, Note } from '@aztec/types';
 
 import { ACVMField } from '../acvm/index.js';
 

yarn-project/acir-simulator/src/client/pick_notes.test.ts

@@ -1,5 +1,5 @@
+import { Note } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
-import { Note } from '@aztec/types';
 
 import { SortOrder, pickNotes } from './pick_notes.js';
 

yarn-project/acir-simulator/src/client/pick_notes.ts

@@ -1,5 +1,5 @@
+import { Note } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
-import { Note } from '@aztec/types';
 
 /**
  * Configuration for selecting values.

yarn-project/acir-simulator/src/client/private_execution.test.ts

@@ -1,3 +1,4 @@
+import { Note, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
 import {
   BlockHeader,
   CallContext,
@@ -38,7 +39,6 @@ import {
   TestContractArtifact,
   TokenContractArtifact,
 } from '@aztec/noir-contracts';
-import { Note, PackedArguments, TxExecutionRequest } from '@aztec/types';
 
 import { jest } from '@jest/globals';
 import { MockProxy, mock } from 'jest-mock-extended';

yarn-project/acir-simulator/src/client/simulator.test.ts

@@ -1,11 +1,11 @@
+import { Note } from '@aztec/circuit-types';
 import { CompleteAddress } from '@aztec/circuits.js';
 import { computeUniqueCommitment, siloCommitment } from '@aztec/circuits.js/abis';
 import { ABIParameterVisibility } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
 import { TokenContractArtifact } from '@aztec/noir-contracts/Token';
-import { Note } from '@aztec/types';
 
 import { MockProxy, mock } from 'jest-mock-extended';