chore: @aztec/stdlib pt.2 -> remove @aztec/types

boxes/package.json

@@ -29,8 +29,7 @@
     "@aztec/pxe": "link:../yarn-project/pxe",
     "@aztec/simulator": "link:../yarn-project/simulator",
     "@aztec/ethereum": "link:../yarn-project/ethereum",
-    "@aztec/protocol-contracts": "link:../yarn-project/protocol-contracts",
-    "@aztec/types": "link:../yarn-project/types"
+    "@aztec/protocol-contracts": "link:../yarn-project/protocol-contracts"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",

yarn-project/accounts/package.json

@@ -79,7 +79,6 @@
     "@aztec/entrypoints": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/types": "workspace:^",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

yarn-project/accounts/tsconfig.json

@@ -23,9 +23,6 @@
     },
     {
       "path": "../foundation"
-    },
-    {
-      "path": "../types"
     }
   ],
   "include": ["src", "artifacts/*.d.json.ts"]

yarn-project/archiver/package.json

@@ -77,7 +77,6 @@
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
-    "@aztec/types": "workspace:^",
     "debug": "^4.3.4",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",

yarn-project/archiver/tsconfig.json

@@ -44,9 +44,6 @@
     },
     {
       "path": "../telemetry-client"
-    },
-    {
-      "path": "../types"
     }
   ],
   "include": ["src"]

yarn-project/aztec-node/package.json

@@ -79,7 +79,6 @@
     "@aztec/sequencer-client": "workspace:^",
     "@aztec/simulator": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
-    "@aztec/types": "workspace:^",
     "@aztec/validator-client": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "koa": "^2.14.2",

yarn-project/aztec-node/tsconfig.json

@@ -57,9 +57,6 @@
     {
       "path": "../telemetry-client"
     },
-    {
-      "path": "../types"
-    },
     {
       "path": "../validator-client"
     },

yarn-project/aztec.js/package.json

@@ -85,7 +85,6 @@
     "@aztec/foundation": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
-    "@aztec/types": "workspace:^",
     "axios": "^1.7.2",
     "tslib": "^2.4.0",
     "viem": "2.22.8"

yarn-project/aztec.js/tsconfig.json

@@ -26,9 +26,6 @@
     },
     {
       "path": "../protocol-contracts"
-    },
-    {
-      "path": "../types"
     }
   ],
   "include": ["src", "src/**/*.json"]

yarn-project/aztec/package.json

@@ -58,7 +58,6 @@
     "@aztec/pxe": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/txe": "workspace:^",
-    "@aztec/types": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",

yarn-project/aztec/src/cli/cmds/start_pxe.ts

@@ -6,6 +6,7 @@ import {
   getContractClassFromArtifact,
 } from '@aztec/aztec.js';
 import { type AztecNode, PXESchema, createAztecNodeClient } from '@aztec/circuit-types/interfaces/client';
+import { L2BasicContractsMap, Network } from '@aztec/circuits.js/network';
 import { getContractArtifact } from '@aztec/cli/cli-utils';
 import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
@@ -18,7 +19,6 @@ import {
   createPXEService,
 } from '@aztec/pxe';
 import { makeTracedFetch } from '@aztec/telemetry-client';
-import { L2BasicContractsMap, Network } from '@aztec/types/network';
 
 import { extractRelevantOptions } from '../util.js';
 import { getVersions } from '../versioning.js';

yarn-project/aztec/tsconfig.json

@@ -93,9 +93,6 @@
     {
       "path": "../txe"
     },
-    {
-      "path": "../types"
-    },
     {
       "path": "../world-state"
     }

yarn-project/bb-prover/package.json

@@ -89,7 +89,6 @@
     "@aztec/kv-store": "workspace:^",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
-    "@aztec/types": "workspace:^",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/memdown": "^3.0.0",

yarn-project/bb-prover/tsconfig.json

@@ -41,9 +41,6 @@
     },
     {
       "path": "../protocol-contracts"
-    },
-    {
-      "path": "../types"
     }
   ],
   "include": ["src"]

yarn-project/bootstrap.sh

@@ -48,7 +48,7 @@ function compile_all {
   # hack, after running prettier foundation may fail to resolve hash.js dependency.
   # it is only currently foundation, presumably because hash.js looks like a js file.
   rm -rf foundation/node_modules
-  compile_project ::: constants foundation circuits.js types builder ethereum l1-artifacts
+  compile_project ::: constants foundation circuits.js builder ethereum l1-artifacts
 
   # Call all projects that have a generation stage.
   parallel --joblog joblog.txt --line-buffered --tag 'cd {} && yarn generate' ::: \
@@ -61,8 +61,7 @@ function compile_all {
     noir-contracts.js \
     noir-protocol-circuits-types \
     protocol-contracts \
-    pxe \
-    types
+    pxe
   cat joblog.txt
 
   get_projects | compile_project

yarn-project/bot/package.json

@@ -63,7 +63,6 @@
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
-    "@aztec/types": "workspace:^",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"

yarn-project/bot/tsconfig.json

@@ -38,9 +38,6 @@
     },
     {
       "path": "../telemetry-client"
-    },
-    {
-      "path": "../types"
     }
   ],
   "include": ["src"]

yarn-project/circuit-types/package.json

@@ -71,7 +71,6 @@
     "@aztec/constants": "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",

yarn-project/circuit-types/src/sibling_path/sibling_path.ts

@@ -1,3 +1,4 @@
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
@@ -8,7 +9,6 @@ import {
   serializeArrayOfBufferableToVector,
 } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { type Hasher } from '@aztec/types/interfaces';
 
 /**
  * Contains functionality to compute and serialize/deserialize a sibling path.

yarn-project/circuit-types/tsconfig.json

@@ -17,9 +17,6 @@
     },
     {
       "path": "../foundation"
-    },
-    {
-      "path": "../types"
     }
   ],
   "include": ["src"]

yarn-project/circuits.js/package.json

@@ -15,6 +15,7 @@
     "./testing": "./dest/tests/index.js",
     "./testing/fixtures": "./dest/tests/fixtures.js",
     "./interfaces": "./dest/interfaces/index.js",
+    "./network": "./dest/network/index.js",
     "./utils": "./dest/utils/index.js",
     "./types": "./dest/types/index.js",
     "./contract": "./dest/contract/index.js",

yarn-project/circuits.js/src/interfaces/index.ts

@@ -11,3 +11,23 @@ export interface Ordered {
 export interface Positioned {
   position: Fr;
 }
+
+/**
+ * Defines hasher interface used by Merkle trees.
+ */
+export interface Hasher {
+  /**
+   * Hash two arrays.
+   * @param lhs - The first array.
+   * @param rhs - The second array.
+   * @returns The new 32-byte hash.
+   */
+  hash(lhs: Uint8Array, rhs: Uint8Array): Buffer;
+
+  /**
+   * Hashes an array of buffers.
+   * @param inputs - The array of buffers to hash.
+   * @returns The resulting 32-byte hash.
+   */
+  hashInputs(inputs: Buffer[]): Buffer;
+}

yarn-project/cli/package.json

@@ -73,7 +73,6 @@
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
-    "@aztec/types": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",

yarn-project/cli/tsconfig.json

@@ -24,9 +24,6 @@
     {
       "path": "../l1-artifacts"
     },
-    {
-      "path": "../types"
-    },
     {
       "path": "../world-state"
     },

yarn-project/end-to-end/package.json

@@ -55,7 +55,6 @@
     "@aztec/sequencer-client": "workspace:^",
     "@aztec/simulator": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
-    "@aztec/types": "workspace:^",
     "@aztec/validator-client": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "@iarna/toml": "^2.2.5",

yarn-project/end-to-end/tsconfig.json

@@ -93,9 +93,6 @@
     {
       "path": "../telemetry-client"
     },
-    {
-      "path": "../types"
-    },
     {
       "path": "../validator-client"
     },

yarn-project/ivc-integration/package.json

@@ -64,7 +64,6 @@
     "@aztec/circuits.js": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/types": "workspace:^",
     "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen",
     "@noir-lang/noir_js": "file:../../noir/packages/noir_js",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",

yarn-project/ivc-integration/tsconfig.json

@@ -16,9 +16,6 @@
     {
       "path": "../foundation"
     },
-    {
-      "path": "../types"
-    },
     {
       "path": "../bb-prover"
     },

yarn-project/merkle-tree/package.json

@@ -59,7 +59,6 @@
     "@aztec/circuit-types": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/types": "workspace:^",
     "sha256": "^0.2.0",
     "tslib": "^2.4.0"
   },

yarn-project/merkle-tree/src/hasher_with_stats.ts

@@ -1,4 +1,4 @@
-import { type Hasher } from '@aztec/types/interfaces';
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 
 import { createHistogram, performance } from 'perf_hooks';
 

yarn-project/merkle-tree/src/load_tree.ts

@@ -1,6 +1,6 @@
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { type Bufferable, type FromBuffer } from '@aztec/foundation/serialize';
 import { type AztecKVStore } from '@aztec/kv-store';
-import { type Hasher } from '@aztec/types/interfaces';
 
 import { type TreeBase, getTreeMeta } from './tree_base.js';
 

yarn-project/merkle-tree/src/new_tree.ts

@@ -1,6 +1,6 @@
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { type Bufferable, type FromBuffer } from '@aztec/foundation/serialize';
 import { type AztecKVStore } from '@aztec/kv-store';
-import { type Hasher } from '@aztec/types/interfaces';
 
 import { type TreeBase } from './tree_base.js';
 

yarn-project/merkle-tree/src/pedersen.ts

@@ -1,6 +1,6 @@
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { pedersenHash } from '@aztec/foundation/crypto/sync';
 import { Fr } from '@aztec/foundation/fields';
-import { type Hasher } from '@aztec/types/interfaces';
 
 /**
  * A helper class encapsulating Pedersen hash functionality.

yarn-project/merkle-tree/src/poseidon.ts

@@ -1,6 +1,6 @@
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { poseidon2Hash } from '@aztec/foundation/crypto/sync';
 import { Fr } from '@aztec/foundation/fields';
-import { type Hasher } from '@aztec/types/interfaces';
 
 /**
  * A helper class encapsulating poseidon2 hash functionality.

yarn-project/merkle-tree/src/sha_256.ts

@@ -1,6 +1,6 @@
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { sha256 } from '@aztec/foundation/crypto';
 import { truncateAndPad } from '@aztec/foundation/serialize';
-import { type Hasher } from '@aztec/types/interfaces';
 
 /**
  * A helper class encapsulating SHA256 hash functionality.

yarn-project/merkle-tree/src/snapshots/append_only_snapshot.ts

@@ -1,7 +1,7 @@
 import { SiblingPath } from '@aztec/circuit-types';
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
-import { type Hasher } from '@aztec/types/interfaces';
 
 import { type AppendOnlyTree } from '../interfaces/append_only_tree.js';
 import { type TreeBase } from '../tree_base.js';

yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.test.ts

@@ -1,8 +1,8 @@
 import { Fr } from '@aztec/circuits.js';
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { NullifierLeaf, NullifierLeafPreimage } from '@aztec/circuits.js/trees';
 import { type AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
-import { type Hasher } from '@aztec/types/interfaces';
 
 import { Pedersen, newTree } from '../index.js';
 import { StandardIndexedTreeWithAppend } from '../standard_indexed_tree/test/standard_indexed_tree_with_append.js';

yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts

@@ -1,10 +1,10 @@
 import { SiblingPath } from '@aztec/circuit-types';
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { randomBigInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { type AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
-import { type Hasher } from '@aztec/types/interfaces';
 
 import { INITIAL_LEAF, newTree } from '../index.js';
 import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js';

yarn-project/merkle-tree/src/standard_indexed_tree/standard_indexed_tree.ts

@@ -1,12 +1,12 @@
 import { SiblingPath } from '@aztec/circuit-types';
 import { type BatchInsertionResult, type LeafUpdateWitnessData } from '@aztec/circuit-types/interfaces/server';
 import { type TreeInsertionStats } from '@aztec/circuit-types/stats';
+import { type Hasher } from '@aztec/circuits.js/interfaces';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { type FromBuffer } from '@aztec/foundation/serialize';
 import { Timer } from '@aztec/foundation/timer';
 import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
-import { type Hasher } from '@aztec/types/interfaces';
 
 import { type IndexedTree, type PreimageFactory } from '../interfaces/indexed_tree.js';
 import { IndexedTreeSnapshotBuilder } from '../snapshots/indexed_tree_snapshot.js';