chore: @aztec/stdlib pt1 -> cleanup circuits js (#12039)

This initial PR focuses on:

- Moving generic stuff from `circuits.js` to `foundation`: merkle tree
calculator is general enough to be on foundation, same with crypto
functions.
- Extracting references to blobs from `circuits.js` so they're not
accidentally imported into browser bundles again. Still work to do here,
this will only be completely realized once the "catchall" export is
removed.
- Extracting `constants` to its own package to deal with circular
references -> `blob-lib` and `circuits.js` need them, this opens the
door to cleaner and more advanced anti "I forgot to update constants"
measures.
- Prepare `foundation` and `circuits.js` so aztec-specific code is moved
from the former to the latter (will be done in a new PR, specifically
targetting aztec-address, abi already moved).
- Preparing `circuits.js` for a reorg, specifically targeting the
removal of the "catchall" export and moving to granular approach. This
will end with the renaming of `circuits.js` to `stdlib`.
- Preparing for the removal of a lot of reexports. They will be kept to
a minimum, with the exception of outwards-facing APIs such as `aztec.js`

bootstrap.sh

@@ -100,7 +100,7 @@ function install_hooks {
   echo "(cd barretenberg/cpp && ./format.sh staged)" >$hooks_dir/pre-commit
   echo "./yarn-project/precommit.sh" >>$hooks_dir/pre-commit
   echo "./noir-projects/precommit.sh" >>$hooks_dir/pre-commit
-  echo "./yarn-project/circuits.js/precommit.sh" >>$hooks_dir/pre-commit
+  echo "./yarn-project/constants/precommit.sh" >>$hooks_dir/pre-commit
   chmod +x $hooks_dir/pre-commit
 }
 

playground/src/components/common/fnParameter.tsx

@@ -3,7 +3,7 @@ import {
   type AbiType,
   isAddressStruct,
   isU128Struct,
-} from "@aztec/foundation/abi";
+} from "@aztec/circuits.js/abi";
 import {
   Autocomplete,
   CircularProgress,

playground/src/components/contract/components/deployContractDialog.tsx

@@ -24,7 +24,7 @@ import {
   encodeArguments,
   getDefaultInitializer,
   getInitializer,
-} from "@aztec/foundation/abi";
+} from "@aztec/circuits.js/abi";
 import { AztecContext } from "../../../aztecEnv";
 import { parseAliasedBuffersAsString } from "../../../utils/conversion";
 import { FunctionParameter } from "../../common/fnParameter";

yarn-project/accounts/scripts/copy-contracts.sh

@@ -5,7 +5,7 @@ mkdir -p ./artifacts
 contracts=(schnorr_account_contract-SchnorrAccount ecdsa_k_account_contract-EcdsaKAccount ecdsa_r_account_contract-EcdsaRAccount schnorr_single_key_account_contract-SchnorrSingleKeyAccount)
 
 decl=$(cat <<EOF
-import { type NoirCompiledContract } from '@aztec/types/noir';
+import { type NoirCompiledContract } from '@aztec/circuits.js/noir';
 const circuit: NoirCompiledContract;
 export = circuit;
 EOF
@@ -14,4 +14,4 @@ EOF
 for contract in "${contracts[@]}"; do
   cp "../../noir-projects/noir-contracts/target/$contract.json" ./artifacts/${contract#*-}.json
   echo "$decl" > ./artifacts/${contract#*-}.d.json.ts
-done
+done

yarn-project/accounts/src/dapp/dapp_interface.ts

@@ -1,5 +1,5 @@
 import { type AccountWallet, type AuthWitnessProvider } from '@aztec/aztec.js';
-import { type AztecAddress, type CompleteAddress, type NodeInfo } from '@aztec/circuits.js';
+import type { AztecAddress, CompleteAddress, NodeInfo } from '@aztec/circuits.js';
 import { DefaultDappEntrypoint } from '@aztec/entrypoints/dapp';
 
 import { DefaultAccountInterface } from '../defaults/account_interface.js';

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

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

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

@@ -1,8 +1,9 @@
 import { type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account';
 import { type EntrypointInterface, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
 import { type AuthWitness, type TxExecutionRequest } from '@aztec/circuit-types';
-import { type AztecAddress, type CompleteAddress, Fr, type NodeInfo } from '@aztec/circuits.js';
+import { type AztecAddress, type CompleteAddress, type NodeInfo } from '@aztec/circuits.js';
 import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import { Fr } from '@aztec/foundation/fields';
 
 /**
  * Default implementation for an account interface. Requires that the account uses the default

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

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

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

@@ -6,7 +6,7 @@
  */
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
-import { type PXE } from '@aztec/circuit-types';
+import { type PXE } from '@aztec/circuit-types/interfaces/client';
 import { type AztecAddress, type Fr } from '@aztec/circuits.js';
 
 import { EcdsaKAccountContract } from './account_contract.js';

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

@@ -1,7 +1,7 @@
 import { type AuthWitnessProvider } from '@aztec/aztec.js/account';
 import { AuthWitness, type CompleteAddress } from '@aztec/circuit-types';
-import { EcdsaSignature } from '@aztec/circuits.js/barretenberg';
-import { type ContractArtifact } from '@aztec/foundation/abi';
+import { type ContractArtifact } from '@aztec/circuits.js/abi';
+import { EcdsaSignature } from '@aztec/foundation/crypto';
 import { type Fr } from '@aztec/foundation/fields';
 
 import { DefaultAccountContract } from '../../defaults/account_contract.js';

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

@@ -6,7 +6,7 @@
  */
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
-import { type PXE } from '@aztec/circuit-types';
+import { type PXE } from '@aztec/circuit-types/interfaces/client';
 import { type AztecAddress, type Fr } from '@aztec/circuits.js';
 
 import { EcdsaRSSHAccountContract } from './account_contract.js';

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

@@ -1,9 +1,9 @@
 import { getAccountContractAddress } from '@aztec/aztec.js';
 import { type AuthWitnessProvider } from '@aztec/aztec.js/account';
 import { AuthWitness, type CompleteAddress, type GrumpkinScalar } from '@aztec/circuit-types';
-import { Schnorr } from '@aztec/circuits.js/barretenberg';
+import { type ContractArtifact } from '@aztec/circuits.js/abi';
 import { deriveSigningKey } from '@aztec/circuits.js/keys';
-import { type ContractArtifact } from '@aztec/foundation/abi';
+import { Schnorr } from '@aztec/foundation/crypto';
 import { type Fr } from '@aztec/foundation/fields';
 
 import { DefaultAccountContract } from '../defaults/account_contract.js';

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

@@ -6,7 +6,8 @@
  */
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, type AccountWalletWithSecretKey, getWallet } from '@aztec/aztec.js/wallet';
-import { type GrumpkinScalar, type PXE } from '@aztec/circuit-types';
+import { type GrumpkinScalar } from '@aztec/circuit-types';
+import { type PXE } from '@aztec/circuit-types/interfaces/client';
 import { type AztecAddress, type Fr } from '@aztec/circuits.js';
 
 import { SchnorrAccountContract } from './account_contract.js';

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

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

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

@@ -6,8 +6,10 @@
  */
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
-import { type GrumpkinScalar, type PXE } from '@aztec/circuit-types';
-import { type AztecAddress, type Fr, deriveMasterIncomingViewingSecretKey } from '@aztec/circuits.js';
+import { type GrumpkinScalar } from '@aztec/circuit-types';
+import { type PXE } from '@aztec/circuit-types/interfaces/client';
+import { type AztecAddress, type Fr } from '@aztec/circuits.js';
+import { deriveMasterIncomingViewingSecretKey } from '@aztec/circuits.js/keys';
 
 import { SingleKeyAccountContract } from './account_contract.js';
 

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

@@ -1,5 +1,5 @@
+import { type PXE } from '@aztec/aztec.js';
 import { type AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
-import { type PXE } from '@aztec/circuit-types';
 import { deriveMasterIncomingViewingSecretKey } from '@aztec/circuits.js/keys';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, type GrumpkinScalar } from '@aztec/foundation/fields';

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

@@ -1,6 +1,6 @@
-import { type AccountManager, FeeJuicePaymentMethod, type WaitOpts } from '@aztec/aztec.js';
-import { type PXE } from '@aztec/circuit-types';
-import { Fr, deriveSigningKey } from '@aztec/circuits.js';
+import { type AccountManager, FeeJuicePaymentMethod, type PXE, type WaitOpts } from '@aztec/aztec.js';
+import { deriveSigningKey } from '@aztec/circuits.js/keys';
+import { Fr } from '@aztec/foundation/fields';
 
 import { getSchnorrAccountContractAddress } from '../schnorr/account_contract.js';
 import { getSchnorrAccount } from '../schnorr/index.js';

yarn-project/archiver/package.json

@@ -68,6 +68,7 @@
     "@aztec/blob-sink": "workspace:^",
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
+    "@aztec/constants": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",

yarn-project/archiver/src/archiver/archiver.test.ts

@@ -1,7 +1,8 @@
 import { Blob } from '@aztec/blob-lib';
 import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { InboxLeaf, type L1RollupConstants, L2Block } from '@aztec/circuit-types';
-import { GENESIS_ARCHIVE_ROOT, PrivateLog } from '@aztec/circuits.js';
+import { PrivateLog } from '@aztec/circuits.js';
+import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { DefaultL1ContractsConfig } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';

yarn-project/archiver/src/archiver/archiver_store.ts

@@ -20,7 +20,7 @@ import {
   type PrivateLog,
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
-import { type FunctionSelector } from '@aztec/foundation/abi';
+import { type FunctionSelector } from '@aztec/circuits.js/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 
 import { type DataRetrieval } from './structs/data_retrieval.js';

yarn-project/archiver/src/archiver/archiver_store_test_suite.ts

@@ -5,11 +5,6 @@ import {
   type ContractClassPublic,
   type ContractInstanceWithAddress,
   Fr,
-  INITIAL_L2_BLOCK_NUM,
-  L1_TO_L2_MSG_SUBTREE_HEIGHT,
-  MAX_NULLIFIERS_PER_TX,
-  PRIVATE_LOG_SIZE_IN_FIELDS,
-  PUBLIC_LOG_DATA_SIZE_IN_FIELDS,
   PrivateLog,
   PublicLog,
   SerializableContractInstance,
@@ -20,6 +15,13 @@ import {
   makeExecutablePrivateFunctionWithMembershipProof,
   makeUnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js/testing';
+import {
+  INITIAL_L2_BLOCK_NUM,
+  L1_TO_L2_MSG_SUBTREE_HEIGHT,
+  MAX_NULLIFIERS_PER_TX,
+  PRIVATE_LOG_SIZE_IN_FIELDS,
+  PUBLIC_LOG_DATA_SIZE_IN_FIELDS,
+} from '@aztec/constants';
 import { times, timesParallel } from '@aztec/foundation/collection';
 import { randomInt } from '@aztec/foundation/crypto';
 

yarn-project/archiver/src/archiver/data_retrieval.ts

@@ -1,7 +1,8 @@
 import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
 import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { Body, InboxLeaf, L2Block } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, BlockHeader, Fr, Proof } from '@aztec/circuits.js';
+import { BlockHeader, Fr, Proof } from '@aztec/circuits.js';
+import { AppendOnlyTreeSnapshot } from '@aztec/circuits.js/trees';
 import { asyncPool } from '@aztec/foundation/async-pool';
 import { type EthAddress } from '@aztec/foundation/eth-address';
 import { type ViemSignature } from '@aztec/foundation/eth-signature';

yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts

@@ -1,5 +1,7 @@
 import { Body, type InBlock, L2Block, L2BlockHash, type TxEffect, type TxHash, TxReceipt } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, type AztecAddress, BlockHeader, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
+import { type AztecAddress, BlockHeader } from '@aztec/circuits.js';
+import { AppendOnlyTreeSnapshot } from '@aztec/circuits.js/trees';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton, Range } from '@aztec/kv-store';

yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -19,7 +19,7 @@ import {
   type PrivateLog,
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
-import { FunctionSelector } from '@aztec/foundation/abi';
+import { FunctionSelector } from '@aztec/circuits.js/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';

yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts

@@ -11,11 +11,7 @@ import {
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import { type Fr, PrivateLog, PublicLog } from '@aztec/circuits.js';
-import {
-  INITIAL_L2_BLOCK_NUM,
-  MAX_NOTE_HASHES_PER_TX,
-  PUBLIC_LOG_DATA_SIZE_IN_FIELDS,
-} from '@aztec/circuits.js/constants';
+import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';

yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts

@@ -1,5 +1,6 @@
 import { InboxLeaf } from '@aztec/circuit-types';
-import { Fr, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
+import { Fr } from '@aztec/circuits.js';
+import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
 

yarn-project/archiver/src/archiver/kv_archiver_store/nullifier_store.ts

@@ -1,5 +1,6 @@
 import { type InBlock, type L2Block } from '@aztec/circuit-types';
-import { type Fr, MAX_NULLIFIERS_PER_TX } from '@aztec/circuits.js';
+import { type Fr } from '@aztec/circuits.js';
+import { MAX_NULLIFIERS_PER_TX } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
 

yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.test.ts

@@ -1,5 +1,5 @@
 import { InboxLeaf } from '@aztec/circuit-types';
-import { INITIAL_L2_BLOCK_NUM, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
+import { INITIAL_L2_BLOCK_NUM, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 
 import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';

yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts

@@ -1,5 +1,5 @@
 import { InboxLeaf } from '@aztec/circuit-types';
-import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js/constants';
+import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
 import { type Fr } from '@aztec/foundation/fields';
 
 /**

yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts

@@ -24,15 +24,17 @@ import {
   type ContractInstanceWithAddress,
   type ExecutablePrivateFunctionWithMembershipProof,
   Fr,
-  INITIAL_L2_BLOCK_NUM,
-  MAX_NOTE_HASHES_PER_TX,
-  MAX_NULLIFIERS_PER_TX,
-  PUBLIC_LOG_DATA_SIZE_IN_FIELDS,
   type PrivateLog,
   type PublicLog,
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
-import { FunctionSelector } from '@aztec/foundation/abi';
+import { FunctionSelector } from '@aztec/circuits.js/abi';
+import {
+  INITIAL_L2_BLOCK_NUM,
+  MAX_NOTE_HASHES_PER_TX,
+  MAX_NULLIFIERS_PER_TX,
+  PUBLIC_LOG_DATA_SIZE_IN_FIELDS,
+} from '@aztec/constants';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { createLogger } from '@aztec/foundation/log';
 

yarn-project/archiver/src/factory.ts

@@ -1,11 +1,12 @@
 import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
-import { type ArchiverApi, type Service, getComponentsVersionsFromConfig } from '@aztec/circuit-types';
+import { getComponentsVersionsFromConfig } from '@aztec/circuit-types';
+import { type ArchiverApi, type Service } from '@aztec/circuit-types/interfaces/server';
 import {
   type ContractClassPublic,
   computePublicBytecodeCommitment,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
-import { FunctionType, decodeFunctionSignature } from '@aztec/foundation/abi';
+import { FunctionType, decodeFunctionSignature } from '@aztec/circuits.js/abi';
 import { createLogger } from '@aztec/foundation/log';
 import { type Maybe } from '@aztec/foundation/types';
 import { type DataStoreConfig } from '@aztec/kv-store/config';

yarn-project/archiver/src/rpc/index.ts

@@ -1,9 +1,5 @@
-import {
-  type ArchiverApi,
-  ArchiverApiSchema,
-  type ComponentsVersions,
-  getVersioningResponseHandler,
-} from '@aztec/circuit-types';
+import { type ComponentsVersions, getVersioningResponseHandler } from '@aztec/circuit-types';
+import { type ArchiverApi, ArchiverApiSchema } from '@aztec/circuit-types/interfaces/server';
 import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
 import { createTracedJsonRpcServer, makeTracedFetch } from '@aztec/telemetry-client';
 

yarn-project/archiver/tsconfig.json

@@ -18,6 +18,9 @@
     {
       "path": "../circuits.js"
     },
+    {
+      "path": "../constants"
+    },
     {
       "path": "../ethereum"
     },

yarn-project/aztec-node/package.json

@@ -67,6 +67,7 @@
     "@aztec/blob-sink": "workspace:^",
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
+    "@aztec/constants": "workspace:^",
     "@aztec/epoch-cache": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",

yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts

@@ -1,4 +1,4 @@
-import { type AztecNode, AztecNodeApiSchema } from '@aztec/circuit-types';
+import { type AztecNode, AztecNodeApiSchema } from '@aztec/circuit-types/interfaces/client';
 import { createTracedJsonRpcServer } from '@aztec/telemetry-client';
 
 /**

yarn-project/aztec-node/src/aztec-node/server.test.ts

@@ -1,25 +1,24 @@
 import { TestCircuitVerifier } from '@aztec/bb-prover';
 import {
-  type AztecNode,
   type L1ToL2MessageSource,
   type L2BlockSource,
   type L2LogsSource,
   MerkleTreeId,
-  type MerkleTreeReadOperations,
   type NullifierWithBlockSource,
-  type WorldStateSynchronizer,
-  mockTx,
 } from '@aztec/circuit-types';
+import { type AztecNode } from '@aztec/circuit-types/interfaces/client';
+import { type MerkleTreeReadOperations, type WorldStateSynchronizer } from '@aztec/circuit-types/interfaces/server';
+import { mockTx } from '@aztec/circuit-types/testing';
 import {
   AztecAddress,
   type ContractDataSource,
   EthAddress,
   Fr,
   GasFees,
   MaxBlockNumber,
-  PublicDataTreeLeafPreimage,
   RollupValidationRequests,
 } from '@aztec/circuits.js';
+import { PublicDataTreeLeafPreimage } from '@aztec/circuits.js/trees';
 import { type P2P } from '@aztec/p2p';
 import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
 import { type GlobalVariableBuilder } from '@aztec/sequencer-client';