chore: @aztec/stdlib pt. 3: aztec-address out of foundation

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

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

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

@@ -38,8 +38,8 @@ import {
   isValidPrivateFunctionMembershipProof,
   isValidUnconstrainedFunctionMembershipProof,
 } from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { createEthereumChain } from '@aztec/ethereum';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';

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

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

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

@@ -20,7 +20,7 @@ import {
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/circuits.js/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
 import { type AztecAsyncKVStore, type StoreSize } from '@aztec/kv-store';

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

@@ -29,13 +29,13 @@ import {
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/circuits.js/abi';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 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';
 
 import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js';

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

@@ -45,6 +45,7 @@ import {
   type PrivateLog,
   type ProtocolContractAddresses,
 } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/circuits.js/hash';
 import {
   type NullifierLeafPreimage,
@@ -62,7 +63,6 @@ import {
 } from '@aztec/constants';
 import { EpochCache } from '@aztec/epoch-cache';
 import { type L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { compactArray } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { DateProvider, Timer } from '@aztec/foundation/timer';

yarn-project/aztec.js/src/api/addresses.ts

@@ -1,2 +1,2 @@
-export { AztecAddress } from '@aztec/foundation/aztec-address';
+export { AztecAddress } from '@aztec/circuits.js/aztec-address';
 export { CompleteAddress } from '@aztec/circuits.js';

yarn-project/aztec.js/src/api/ethereum/portal_manager.ts

@@ -1,8 +1,8 @@
 import { type SiblingPath } from '@aztec/circuit-types';
 import { type PXE } from '@aztec/circuit-types/interfaces/client';
+import type { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { computeSecretHash } from '@aztec/circuits.js/hash';
 import { extractEvent } from '@aztec/ethereum/utils';
-import type { AztecAddress } from '@aztec/foundation/aztec-address';
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';

yarn-project/aztec.js/src/contract/contract.ts

@@ -1,6 +1,6 @@
 import { PublicKeys, getContractClassFromArtifact } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/circuits.js/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 
 import { type Wallet } from '../account/index.js';
 import { ContractBase } from './contract_base.js';

yarn-project/aztec.js/src/contract/contract_function_interaction.ts

@@ -7,7 +7,7 @@ import {
   decodeFromAbi,
   encodeArguments,
 } from '@aztec/circuits.js/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 
 import { type Wallet } from '../account/wallet.js';
 import { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';

yarn-project/aztec.js/src/contract/deploy_proven_tx.ts

@@ -1,7 +1,7 @@
 import { type Tx } from '@aztec/circuit-types';
 import { type PXE } from '@aztec/circuit-types/interfaces/client';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js/contract';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 
 import { type Wallet } from '../account/index.js';
 import { type Contract } from './contract.js';

yarn-project/aztec.js/src/fee/fee_payment_method.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { type GasSettings } from '@aztec/circuits.js';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 
 /**
  * Holds information about how the fee for a transaction is to be paid.

yarn-project/aztec.js/src/fee/private_fee_payment_method.ts

@@ -1,7 +1,7 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { type GasSettings } from '@aztec/circuits.js';
 import { FunctionSelector, FunctionType, U128 } from '@aztec/circuits.js/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
 import { type Wallet } from '../account/wallet.js';

yarn-project/aztec.js/src/fee/public_fee_payment_method.ts

@@ -1,7 +1,7 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { type GasSettings } from '@aztec/circuits.js';
 import { FunctionSelector, FunctionType, U128 } from '@aztec/circuits.js/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';

yarn-project/aztec.js/src/wallet/index.ts

@@ -1,5 +1,5 @@
 import { type PXE } from '@aztec/circuit-types/interfaces/client';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 
 import { type AccountContract } from '../account/contract.js';
 import { AccountWallet } from './account_wallet.js';

yarn-project/aztec/src/sandbox.ts

@@ -6,6 +6,7 @@ import { AnvilTestWatcher, EthCheatCodes, SignerlessWallet, type Wallet } from '
 import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
 import { type AztecNode, type PXE } from '@aztec/circuit-types/interfaces/client';
 import { type ContractInstanceWithAddress, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { type PublicDataTreeLeaf } from '@aztec/circuits.js/trees';
 import { setupCanonicalL2FeeJuice } from '@aztec/cli/setup-contracts';
 import { GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH } from '@aztec/constants';
@@ -16,7 +17,6 @@ import {
   getL1ContractsConfigEnvVars,
   waitForPublicClient,
 } from '@aztec/ethereum';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type LogFn, createLogger } from '@aztec/foundation/log';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
@@ -67,7 +67,7 @@ export async function deployContractsToL1(
     {
       ...getL1ContractsConfigEnvVars(), // TODO: We should not need to be loading config from env again, caller should handle this
       ...aztecNodeConfig,
-      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice,
+      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
       vkTreeRoot: getVKTreeRoot(),
       protocolContractTreeRoot,
       genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit1.test.ts

@@ -1,12 +1,12 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import {
   MAX_L2_TO_L1_MSGS_PER_TX,
   MAX_NOTE_HASHES_PER_TX,
   MAX_NULLIFIERS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MAX_PUBLIC_LOGS_PER_TX,
 } from '@aztec/constants';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit2.test.ts

@@ -1,5 +1,5 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit3.test.ts

@@ -1,5 +1,5 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 

yarn-project/bb-prover/src/avm_proving_tests/avm_contract_updates.test.ts

@@ -1,10 +1,10 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import {
   ScheduledDelayChange,
   ScheduledValueChange,
   SharedMutableValuesWithHash,
 } from '@aztec/circuits.js/shared-mutable';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';

yarn-project/bb-prover/src/avm_proving_tests/avm_proven_amm.test.ts

@@ -1,5 +1,5 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AMMContractArtifact } from '@aztec/noir-contracts.js/AMM';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';

yarn-project/bb-prover/src/avm_proving_tests/avm_proven_token.test.ts

@@ -1,5 +1,5 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
 import { type PublicTxResult } from '@aztec/simulator/server';

yarn-project/bb-prover/src/avm_proving_tests/avm_proving_and_verification.test.ts

@@ -1,5 +1,5 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 

yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts

@@ -1,7 +1,7 @@
 import { type MerkleTreeWriteOperations } from '@aztec/circuit-types/interfaces/server';
 import { VerificationKeyData } from '@aztec/circuits.js';
 import { type AvmCircuitInputs } from '@aztec/circuits.js/avm';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { PublicTxSimulationTester, type TestEnqueuedCall } from '@aztec/simulator/public/fixtures';
 import { WorldStateDB } from '@aztec/simulator/server';
 import { NativeWorldStateService } from '@aztec/world-state';

yarn-project/bb-prover/src/avm_proving_tests/avm_public_fee_payment.test.ts

@@ -1,5 +1,5 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 

yarn-project/bb-prover/src/avm_proving_tests/avm_v2.test.ts

@@ -1,5 +1,5 @@
 import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 

yarn-project/circuit-types/src/interfaces/aztec-node.ts

@@ -11,6 +11,8 @@ import {
   type ProtocolContractAddresses,
   ProtocolContractAddressesSchema,
 } from '@aztec/circuits.js';
+import type { AztecAddress } from '@aztec/circuits.js/aztec-address';
+import { type ApiSchemaFor, optional, schemas } from '@aztec/circuits.js/schemas';
 import {
   ARCHIVE_HEIGHT,
   L1_TO_L2_MSG_TREE_HEIGHT,
@@ -19,10 +21,8 @@ import {
   PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/constants';
 import { type L1ContractAddresses, L1ContractAddressesSchema } from '@aztec/ethereum/l1-contract-addresses';
-import type { AztecAddress } from '@aztec/foundation/aztec-address';
 import type { Fr } from '@aztec/foundation/fields';
 import { createSafeJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
-import { type ApiSchemaFor, optional, schemas } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 

yarn-project/circuit-types/src/logs/log_filter.ts

@@ -1,5 +1,5 @@
 import { type AztecAddress } from '@aztec/circuits.js';
-import { schemas } from '@aztec/foundation/schemas';
+import { schemas } from '@aztec/circuits.js/schemas';
 
 import { z } from 'zod';
 

yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts

@@ -1,6 +1,6 @@
 import { AztecAddress } from '@aztec/circuits.js';
+import { schemas } from '@aztec/circuits.js/schemas';
 import { randomBytes, sha256Trunc } from '@aztec/foundation/crypto';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, prefixBufferWithLength, toHumanReadable } from '@aztec/foundation/serialize';
 
 import { z } from 'zod';

yarn-project/circuit-types/src/messaging/l1_to_l2_message.ts

@@ -1,6 +1,6 @@
+import { type AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { computeL1ToL2MessageNullifier } from '@aztec/circuits.js/hash';
 import { type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';

yarn-project/circuit-types/src/messaging/l2_actor.ts

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/circuits.js/aztec-address';
 import { randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';

yarn-project/circuit-types/src/notes/notes_filter.ts

@@ -1,5 +1,5 @@
 import { type AztecAddress, type Fr } from '@aztec/circuits.js';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
+import { type ZodFor, schemas } from '@aztec/circuits.js/schemas';
 
 import { z } from 'zod';
 

yarn-project/circuits.js/package.json

@@ -8,6 +8,7 @@
   ],
   "exports": {
     ".": "./dest/index.js",
+    "./aztec-address": "./dest/aztec-address/index.js",
     "./abi": "./dest/abi/index.js",
     "./hash": "./dest/hash/index.js",
     "./keys": "./dest/keys/index.js",

yarn-project/circuits.js/src/abi/decoder.ts

@@ -1,6 +1,6 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
+import { AztecAddress } from '../aztec-address/index.js';
 import { type ABIParameter, type ABIVariable, type AbiType } from './abi.js';
 import { U128 } from './u128.js';
 import { isAztecAddressStruct, isU128Struct, parseSignedInt } from './utils.js';

yarn-project/circuits.js/src/abi/encoder.test.ts

@@ -1,8 +1,8 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
-import { schemas } from '@aztec/foundation/schemas';
 
+import { AztecAddress } from '../aztec-address/index.js';
+import { schemas } from '../schemas/index.js';
 import { type FunctionAbi, FunctionType } from './abi.js';
 import { encodeArguments } from './encoder.js';
 

yarn-project/foundation/src/aztec-address/aztec-address.test.ts → yarn-project/circuits.js/src/aztec-address/aztec-address.test.ts

@@ -1,4 +1,5 @@
-import { Fr } from '../fields/fields.js';
+import { Fr } from '@aztec/foundation/fields';
+
 import { AztecAddress } from './index.js';
 
 describe('aztec-address', () => {

yarn-project/foundation/src/aztec-address/index.ts → yarn-project/circuits.js/src/aztec-address/index.ts

@@ -1,11 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
-import { inspect } from 'util';
+import { Fr, Point, fromBuffer } from '@aztec/foundation/fields';
+import { hexSchemaFor } from '@aztec/foundation/schemas';
+import { type BufferReader, FieldReader, TypeRegistry } from '@aztec/foundation/serialize';
+import { hexToBuffer } from '@aztec/foundation/string';
 
-import { Fr, Point, fromBuffer } from '../fields/index.js';
-import { hexSchemaFor } from '../schemas/utils.js';
-import { type BufferReader, FieldReader } from '../serialize/index.js';
-import { TypeRegistry } from '../serialize/type_registry.js';
-import { hexToBuffer } from '../string/index.js';
+import { inspect } from 'util';
 
 /** Branding to ensure fields are not interchangeable types. */
 export interface AztecAddress {

yarn-project/circuits.js/src/contract/contract_address.ts

@@ -1,9 +1,9 @@
 import { GeneratorIndex } from '@aztec/constants';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 
 import { type FunctionAbi, FunctionSelector, encodeArguments } from '../abi/index.js';
+import { type AztecAddress } from '../aztec-address/index.js';
 import { computeVarArgsHash } from '../hash/hash.js';
 import { computeAddress } from '../keys/index.js';
 import { type ContractInstance } from './interfaces/contract_instance.js';

yarn-project/circuits.js/src/contract/contract_instance.ts

@@ -1,9 +1,9 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
 import { type ContractArtifact, type FunctionArtifact, FunctionSelector, getDefaultInitializer } from '../abi/index.js';
+import { AztecAddress } from '../aztec-address/index.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { PublicKeys } from '../types/public_keys.js';
 import {

yarn-project/circuits.js/src/contract/interfaces/contract_data_source.ts

@@ -1,7 +1,7 @@
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
 
 import { FunctionSelector } from '../../abi/index.js';
+import { type AztecAddress } from '../../aztec-address/index.js';
 import { type ContractClassPublic, type PublicFunction } from './contract_class.js';
 import { type ContractInstanceWithAddress } from './contract_instance.js';
 

yarn-project/circuits.js/src/contract/interfaces/contract_instance.ts

@@ -1,9 +1,9 @@
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
+import { type AztecAddress } from '../../aztec-address/index.js';
+import { type ZodFor, schemas } from '../../schemas/index.js';
 import { PublicKeys } from '../../types/public_keys.js';
 
 const VERSION = 1 as const;