From dd83d520c9925f00de155bddf0cf95852c971995 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Mon, 11 Nov 2024 16:49:46 +0700
Subject: [PATCH] chore: Revert "chore: Validate RPC inputs" (#9875)

Reverts AztecProtocol/aztec-packages#9672 as it broke some e2e tests and
boxes
---
 yarn-project/.earthlyignore                   |   1 -
 yarn-project/.gitignore                       |   1 -
 yarn-project/archiver/src/factory.ts          |   6 +-
 .../archiver/src/rpc/archiver_client.ts       |  29 +
 .../archiver/src/rpc/archiver_server.ts       |  35 ++
 yarn-project/archiver/src/rpc/index.ts        |  13 +-
 .../src/aztec-node/http_rpc_server.ts         |  61 +-
 .../aztec-node/src/aztec-node/server.ts       |   6 +-
 .../aztec.js/src/contract/batch_call.ts       |   5 +-
 .../fee_juice_payment_method_with_claim.ts    |   7 +-
 .../src/fee/private_fee_payment_method.ts     |   4 +-
 .../src/fee/public_fee_payment_method.ts      |   4 +-
 .../aztec.js/src/rpc_clients/pxe_client.ts    |  95 ++-
 yarn-project/aztec.js/src/utils/abi_types.ts  |   2 +-
 yarn-project/aztec.js/src/utils/authwit.ts    |   2 +-
 .../aztec.js/src/utils/cheat_codes.ts         |   3 +-
 yarn-project/aztec.js/src/utils/pxe.ts        |   3 +-
 .../aztec.js/src/wallet/base_wallet.ts        |  23 +-
 yarn-project/aztec/src/cli/cli.ts             |  48 +-
 .../aztec/src/cli/cmds/start_archiver.ts      |  25 +-
 yarn-project/aztec/src/cli/cmds/start_bot.ts  |  20 +-
 yarn-project/aztec/src/cli/cmds/start_node.ts |  27 +-
 .../src/cli/cmds/start_proof_verifier.ts      |  10 +-
 .../aztec/src/cli/cmds/start_prover_agent.ts  |  38 +-
 .../aztec/src/cli/cmds/start_prover_node.ts   |  23 +-
 yarn-project/aztec/src/cli/cmds/start_pxe.ts  |  20 +-
 yarn-project/aztec/src/cli/cmds/start_txe.ts  |  23 +-
 yarn-project/aztec/src/cli/util.ts            |   5 +
 .../bb-prover/src/avm_proving.test.ts         |   3 +-
 .../src/prover/bb_private_kernel_prover.ts    |   5 +-
 yarn-project/bot/package.json                 |   3 +-
 yarn-project/bot/src/config.ts                |  40 +-
 yarn-project/bot/src/index.ts                 |   3 +-
 yarn-project/bot/src/interface.ts             |  23 -
 yarn-project/bot/src/rpc.ts                   |  13 +-
 yarn-project/bot/src/runner.ts                |   5 +-
 yarn-project/circuit-types/package.json       |  12 +-
 yarn-project/circuit-types/package.local.json |  12 -
 .../scripts/copy-test-artifacts.sh            |  16 -
 .../circuit-types/src/auth_witness.ts         |  13 -
 .../src/aztec_node/rpc/aztec_node_client.ts   |  64 ++
 .../circuit-types/src/aztec_node/rpc/index.ts |   1 +
 yarn-project/circuit-types/src/body.ts        |  13 -
 yarn-project/circuit-types/src/index.ts       |   1 +
 .../src/interfaces/archiver.test.ts           | 352 -----------
 .../circuit-types/src/interfaces/archiver.ts  |  72 ---
 .../src/interfaces/aztec-node.test.ts         | 526 ----------------
 .../src/interfaces/aztec-node.ts              | 184 +-----
 .../circuit-types/src/interfaces/configs.ts   |  27 -
 .../circuit-types/src/interfaces/index.ts     |  12 +-
 .../src/interfaces/l2_block_number.ts         |   8 +-
 .../src/interfaces/nullifier_tree.ts          |  25 +-
 .../src/interfaces/private_kernel_prover.ts   |  17 +-
 .../src/interfaces/prover-agent.test.ts       |  57 --
 .../src/interfaces/prover-agent.ts            |  20 -
 .../src/interfaces/prover-client.ts           |  17 +-
 .../src/interfaces/prover-coordination.ts     |  20 +-
 .../src/interfaces/prover-node.test.ts        |  70 ---
 .../src/interfaces/prover-node.ts             |  16 +-
 .../src/interfaces/proving-job-source.test.ts |  90 ---
 .../src/interfaces/proving-job-source.ts      |  48 --
 .../src/interfaces/proving-job.ts             | 265 ++++-----
 .../circuit-types/src/interfaces/pxe.test.ts  | 560 ------------------
 .../circuit-types/src/interfaces/pxe.ts       | 202 ++-----
 .../circuit-types/src/interfaces/service.ts   |  25 -
 .../src/interfaces/sync-status.ts             |   9 -
 yarn-project/circuit-types/src/l2_block.ts    |  20 -
 .../circuit-types/src/l2_block_source.ts      |  44 +-
 .../src/logs/encrypted_l2_log.ts              |   9 -
 .../src/logs/encrypted_l2_note_log.ts         |  13 +-
 .../circuit-types/src/logs/event_metadata.ts  |  36 +-
 .../src/logs/extended_unencrypted_l2_log.ts   |  23 -
 .../src/logs/function_l2_logs.test.ts         |   4 +-
 .../src/logs/function_l2_logs.ts              |  29 +-
 .../src/logs/get_logs_response.ts             |  42 +-
 .../src/logs/l1_payload/payload.ts            |  11 +-
 .../src/logs/l2_block_l2_logs.test.ts         |  24 +-
 .../src/logs/l2_block_l2_logs.ts              |  45 +-
 .../circuit-types/src/logs/log_filter.ts      |  15 +-
 yarn-project/circuit-types/src/logs/log_id.ts |  29 -
 .../circuit-types/src/logs/tx_l2_logs.test.ts |   6 +-
 .../circuit-types/src/logs/tx_l2_logs.ts      |  22 +-
 .../src/logs/unencrypted_l2_log.ts            |   9 -
 yarn-project/circuit-types/src/mocks.ts       |   7 +-
 .../circuit-types/src/notes/extended_note.ts  |  36 --
 .../src/notes/incoming_notes_filter.ts        |  17 +-
 .../circuit-types/src/notes/note_status.ts    |   2 +-
 .../src/notes/outgoing_notes_filter.ts        |  12 +-
 .../circuit-types/src/packed_values.test.ts   |  11 -
 .../circuit-types/src/packed_values.ts        |  15 -
 .../src/private_execution_result.test.ts      |   6 -
 .../src/private_execution_result.ts           | 139 -----
 .../prover_coordination/epoch_proof_quote.ts  |   8 -
 .../epoch_proof_quote_payload.ts              |  10 -
 .../circuit-types/src/public_data_witness.ts  |  21 -
 .../src/public_execution_request.ts           |  22 -
 .../src/sibling_path/sibling_path.ts          |  48 +-
 .../circuit-types/src/simulation_error.ts     |  42 +-
 yarn-project/circuit-types/src/stats/stats.ts |  15 -
 .../src/tx/public_simulation_output.ts        |  53 +-
 .../circuit-types/src/tx/simulated_tx.test.ts |   4 +-
 .../circuit-types/src/tx/simulated_tx.ts      |  52 +-
 yarn-project/circuit-types/src/tx/tx.ts       |  56 +-
 yarn-project/circuit-types/src/tx/tx_hash.ts  |  13 +-
 .../circuit-types/src/tx/tx_receipt.ts        |  76 +--
 yarn-project/circuit-types/src/tx_effect.ts   |  13 +-
 .../src/tx_execution_request.test.ts          |  12 -
 .../circuit-types/src/tx_execution_request.ts |  27 -
 yarn-project/circuits.js/package.json         |   4 +-
 .../src/contract/artifact_hash.test.ts        |   2 +-
 .../circuits.js/src/contract/artifact_hash.ts |  18 +-
 .../src/contract/interfaces/contract_class.ts | 118 +---
 .../interfaces/contract_data_source.ts        |   3 -
 .../contract/interfaces/contract_instance.ts  |  25 +-
 .../src/contract/interfaces/node-info.ts      |  46 +-
 .../interfaces/protocol_contract_addresses.ts |  17 -
 .../circuits.js/src/keys/derivation.ts        |   8 +-
 .../circuits.js/src/structs/avm/avm.ts        |  27 +-
 .../circuits.js/src/structs/call_context.ts   |  23 -
 .../src/structs/client_ivc_proof.ts           |  10 -
 .../src/structs/complete_address.test.ts      |   4 +-
 .../src/structs/complete_address.ts           |  13 +-
 .../src/structs/content_commitment.ts         |  25 -
 yarn-project/circuits.js/src/structs/gas.ts   |  15 -
 .../circuits.js/src/structs/gas_fees.ts       |  11 -
 .../circuits.js/src/structs/gas_settings.ts   |  14 -
 .../src/structs/global_variables.ts           |  17 -
 .../circuits.js/src/structs/header.ts         |  24 -
 .../kernel/combined_accumulated_data.ts       |   9 -
 .../structs/kernel/combined_constant_data.ts  |  16 -
 .../kernel/kernel_circuit_public_inputs.ts    |  11 -
 .../private_kernel_circuit_public_inputs.ts   |   9 -
 .../kernel/private_kernel_empty_inputs.ts     |  11 -
 ...ivate_kernel_tail_circuit_public_inputs.ts |  27 -
 .../src/structs/parity/base_parity_inputs.ts  |  11 -
 .../src/structs/parity/root_parity_input.ts   |  11 -
 .../src/structs/parity/root_parity_inputs.ts  |  11 -
 .../src/structs/partial_state_reference.ts    |  23 -
 .../structs/private_circuit_public_inputs.ts  |   9 -
 .../src/structs/public_data_write.ts          |  13 +-
 .../src/structs/recursive_proof.ts            |  11 -
 .../rollup/append_only_tree_snapshot.ts       |  15 -
 .../base_or_merge_rollup_public_inputs.ts     |  27 +-
 .../src/structs/rollup/block_merge_rollup.ts  |  11 -
 ...block_root_or_block_merge_public_inputs.ts |  11 -
 .../src/structs/rollup/block_root_rollup.ts   |  11 -
 .../rollup/empty_block_root_rollup_inputs.ts  |  11 -
 .../src/structs/rollup/merge_rollup.ts        |  11 -
 .../rollup/private_base_rollup_inputs.ts      |  11 -
 .../rollup/public_base_rollup_inputs.ts       |  11 -
 .../src/structs/rollup/root_rollup.ts         |  21 -
 .../src/structs/rollup/tube_inputs.ts         |  11 -
 ...ed_key_validation_request_and_generator.ts |   2 +-
 .../src/structs/state_reference.ts            |  14 -
 .../circuits.js/src/structs/tagging_secret.ts |   4 +-
 .../src/structs/trees/nullifier_leaf.ts       |  31 +-
 .../src/structs/trees/public_data_leaf.ts     |  25 -
 .../src/structs/tx_context.test.ts            |   6 -
 .../circuits.js/src/structs/tx_context.ts     |  21 -
 .../src/structs/verification_key.ts           |  25 -
 .../src/structs/vk_witness_data.ts            |   6 +-
 .../circuits.js/src/tests/factories.ts        |  10 +-
 .../circuits.js/src/types/public_keys.ts      |  25 +-
 yarn-project/circuits.js/tsconfig.json        |   3 -
 yarn-project/cli/src/utils/inspect.ts         |   4 +-
 .../src/composed/e2e_sandbox_example.test.ts  |   6 +-
 .../end-to-end/src/devnet/e2e_smoke.test.ts   |   7 +-
 .../src/e2e_deploy_contract/legacy.test.ts    |   2 +-
 .../end-to-end/src/e2e_event_logs.test.ts     |  40 +-
 .../end-to-end/src/e2e_fees/failures.test.ts  |   4 +-
 .../end-to-end/src/e2e_synching.test.ts       |   4 +-
 .../private_transfer_recursion.test.ts        |  11 +-
 .../transfer_private.test.ts                  |   8 +-
 .../end-to-end/src/sample-dapp/index.mjs      |   2 +-
 .../src/shared/cross_chain_test_harness.ts    |   7 +-
 yarn-project/ethereum/package.json            |   3 +-
 .../ethereum/src/l1_contract_addresses.ts     |  24 +-
 yarn-project/foundation/package.json          |   4 +-
 yarn-project/foundation/src/abi/abi.ts        | 439 +++++++-------
 .../foundation/src/abi/encoder.test.ts        |  11 +-
 yarn-project/foundation/src/abi/encoder.ts    |   2 -
 .../foundation/src/abi/event_selector.ts      |   7 -
 .../foundation/src/aztec-address/index.ts     |  82 +--
 .../foundation/src/buffer/buffer32.ts         |   5 -
 yarn-project/foundation/src/fields/fields.ts  |   5 +-
 .../foundation/src/fields/point.test.ts       |   8 -
 .../src/json-rpc/class_converter.ts           | 213 +++++++
 .../foundation/src/json-rpc/client/fetch.ts   |  81 ---
 .../foundation/src/json-rpc/client/index.ts   |   2 +-
 .../json-rpc/client/json_rpc_client.test.ts   |  39 ++
 .../src/json-rpc/client/json_rpc_client.ts    | 151 +++++
 .../json-rpc/client/safe_json_rpc_client.ts   |   9 +-
 .../foundation/src/json-rpc/convert.test.ts   | 119 ++--
 .../foundation/src/json-rpc/convert.ts        | 172 +++++-
 .../src/json-rpc/fixtures/test_state.ts       |  35 +-
 yarn-project/foundation/src/json-rpc/index.ts |   7 +
 .../foundation/src/json-rpc/server/index.ts   |   2 +
 .../src/json-rpc/server/json_proxy.ts         |  68 +++
 .../json-rpc/server/json_rpc_server.test.ts   |  52 ++
 .../src/json-rpc/server/json_rpc_server.ts    | 337 +++++++++++
 .../server/safe_json_rpc_server.test.ts       |   4 +-
 .../json-rpc/server/safe_json_rpc_server.ts   | 119 +---
 .../foundation/src/json-rpc/test/index.ts     |   1 -
 .../src/json-rpc/test/integration.test.ts     |  62 +-
 .../src/json-rpc/test/integration.ts          |  24 -
 yarn-project/foundation/src/schemas/api.ts    |  27 +-
 yarn-project/foundation/src/schemas/index.ts  |   2 -
 .../foundation/src/schemas/parse.test.ts      |  62 --
 yarn-project/foundation/src/schemas/parse.ts  |  23 -
 .../foundation/src/schemas/schemas.test.ts    |  36 --
 .../foundation/src/schemas/schemas.ts         |  99 +---
 yarn-project/foundation/src/schemas/types.ts  |   3 -
 yarn-project/foundation/src/schemas/utils.ts  |  85 ---
 yarn-project/foundation/src/string/index.ts   |  12 -
 yarn-project/foundation/src/types/index.ts    |   3 -
 .../src/avm_integration.test.ts               |   3 +-
 .../src/build_protocol_contract_tree.ts       |   2 +-
 .../src/protocol_contract_data.ts             |   4 +-
 .../src/protocol_contract_tree.ts             |   2 +-
 .../src/scripts/generate_data.ts              |   8 +-
 .../agent-queue-rpc-integration.test.ts       |  11 +-
 .../prover-agent/memory-proving-queue.test.ts |  15 +-
 .../src/prover-agent/memory-proving-queue.ts  |  20 +-
 .../src/prover-agent/prover-agent.ts          |  45 +-
 .../prover-client/src/prover-agent/rpc.ts     | 129 +++-
 .../prover-client/src/tx-prover/tx-prover.ts  |   2 +-
 yarn-project/prover-node/src/http.ts          |  18 +-
 yarn-project/prover-node/src/prover-node.ts   |  11 +-
 ...ild_private_kernel_reset_private_inputs.ts |   4 +-
 .../kernel_prover/test/test_circuit_prover.ts |   7 +-
 .../pxe/src/pxe_http/pxe_http_server.ts       |  89 ++-
 .../pxe/src/pxe_service/pxe_service.ts        |  41 +-
 .../src/pxe_service/test/pxe_test_suite.ts    |   2 +-
 .../src/tx_validator/gas_validator.test.ts    |   4 +-
 .../src/tx_validator/gas_validator.ts         |   2 +-
 .../simulator/src/acvm/oracle/oracle.ts       |   2 +-
 .../simulator/src/acvm/oracle/typed_oracle.ts |   2 +-
 .../src/avm/avm_execution_environment.test.ts |   4 +-
 .../simulator/src/avm/avm_memory_types.ts     |   5 -
 .../simulator/src/avm/avm_simulator.test.ts   |  16 +-
 .../simulator/src/avm/journal/journal.test.ts |   8 +-
 .../simulator/src/avm/journal/journal.ts      |  30 +-
 .../src/avm/journal/nullifiers.test.ts        |  21 +-
 .../simulator/src/avm/journal/nullifiers.ts   |  14 +-
 .../src/avm/journal/public_storage.test.ts    |  15 +-
 .../src/avm/journal/public_storage.ts         |  10 +-
 .../src/avm/opcodes/accrued_substate.test.ts  |   8 +-
 .../src/avm/opcodes/accrued_substate.ts       |   2 +-
 .../src/avm/opcodes/contract.test.ts          |   8 +-
 .../simulator/src/avm/opcodes/contract.ts     |   2 +-
 .../src/avm/opcodes/external_calls.ts         |   2 +-
 .../src/client/private_execution.test.ts      |  17 +-
 .../simulator/src/client/view_data_oracle.ts  |   2 +-
 .../src/public/dual_side_effect_trace.ts      |  29 +-
 .../enqueued_call_side_effect_trace.test.ts   |  89 ++-
 .../public/enqueued_call_side_effect_trace.ts |  55 +-
 .../simulator/src/public/public_processor.ts  |   3 +-
 .../src/public/side_effect_trace.test.ts      |  64 +-
 .../simulator/src/public/side_effect_trace.ts |  39 +-
 .../src/public/side_effect_trace_interface.ts |  33 +-
 yarn-project/txe/package.json                 |   3 +-
 yarn-project/txe/src/bin/index.ts             |  26 +-
 yarn-project/txe/src/index.ts                 |  35 +-
 yarn-project/txe/src/oracle/txe_oracle.ts     |  16 +-
 .../txe/src/txe_service/txe_service.ts        |  43 +-
 yarn-project/txe/src/util/encoding.ts         |  24 +-
 .../types/src/abi/contract_artifact.ts        |   5 +-
 yarn-project/yarn.lock                        |   7 -
 268 files changed, 3007 insertions(+), 5990 deletions(-)
 create mode 100644 yarn-project/archiver/src/rpc/archiver_client.ts
 create mode 100644 yarn-project/archiver/src/rpc/archiver_server.ts
 delete mode 100644 yarn-project/bot/src/interface.ts
 delete mode 100644 yarn-project/circuit-types/package.local.json
 delete mode 100755 yarn-project/circuit-types/scripts/copy-test-artifacts.sh
 create mode 100644 yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts
 create mode 100644 yarn-project/circuit-types/src/aztec_node/rpc/index.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/archiver.test.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/archiver.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/aztec-node.test.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/prover-agent.test.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/prover-agent.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/prover-node.test.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/proving-job-source.test.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/proving-job-source.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/pxe.test.ts
 delete mode 100644 yarn-project/circuit-types/src/interfaces/service.ts
 delete mode 100644 yarn-project/circuit-types/src/packed_values.test.ts
 delete mode 100644 yarn-project/circuit-types/src/tx_execution_request.test.ts
 create mode 100644 yarn-project/foundation/src/json-rpc/class_converter.ts
 delete mode 100644 yarn-project/foundation/src/json-rpc/client/fetch.ts
 create mode 100644 yarn-project/foundation/src/json-rpc/client/json_rpc_client.test.ts
 create mode 100644 yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts
 create mode 100644 yarn-project/foundation/src/json-rpc/server/json_proxy.ts
 create mode 100644 yarn-project/foundation/src/json-rpc/server/json_rpc_server.test.ts
 create mode 100644 yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts
 delete mode 100644 yarn-project/foundation/src/json-rpc/test/index.ts
 delete mode 100644 yarn-project/foundation/src/json-rpc/test/integration.ts
 delete mode 100644 yarn-project/foundation/src/schemas/parse.test.ts
 delete mode 100644 yarn-project/foundation/src/schemas/schemas.test.ts
 delete mode 100644 yarn-project/foundation/src/schemas/types.ts
 delete mode 100644 yarn-project/foundation/src/schemas/utils.ts

diff --git a/yarn-project/.earthlyignore b/yarn-project/.earthlyignore
index 0fc5487b6b8..bd9d331e9a6 100644
--- a/yarn-project/.earthlyignore
+++ b/yarn-project/.earthlyignore
@@ -44,7 +44,6 @@ aztec-faucet/data*
 aztec-node/data*
 aztec/log
 circuits.js/fixtures/*.json
-circuit-types/src/test/artifacts
 docs/dist
 end-to-end/addresses.json
 end-to-end/log
diff --git a/yarn-project/.gitignore b/yarn-project/.gitignore
index 5969baa4dc3..a6182305e1e 100644
--- a/yarn-project/.gitignore
+++ b/yarn-project/.gitignore
@@ -17,7 +17,6 @@ aztec-faucet/data*
 aztec-node/data*
 aztec/log
 circuits.js/fixtures/*.json
-circuit-types/src/test/artifacts
 docs/dist
 end-to-end/addresses.json
 end-to-end/flame_graph
diff --git a/yarn-project/archiver/src/factory.ts b/yarn-project/archiver/src/factory.ts
index ac5b2786757..b7f5d8d8ab8 100644
--- a/yarn-project/archiver/src/factory.ts
+++ b/yarn-project/archiver/src/factory.ts
@@ -1,7 +1,5 @@
-import { type ArchiverApi, type Service } from '@aztec/circuit-types';
 import { type ContractClassPublic } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { type Maybe } from '@aztec/foundation/types';
 import { createStore } from '@aztec/kv-store/utils';
 import { getCanonicalProtocolContract, protocolContractNames } from '@aztec/protocol-contracts';
 import { type TelemetryClient } from '@aztec/telemetry-client';
@@ -10,13 +8,13 @@ import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { Archiver } from './archiver/archiver.js';
 import { type ArchiverConfig } from './archiver/config.js';
 import { KVArchiverDataStore } from './archiver/index.js';
-import { createArchiverClient } from './rpc/index.js';
+import { createArchiverClient } from './rpc/archiver_client.js';
 
 export async function createArchiver(
   config: ArchiverConfig,
   telemetry: TelemetryClient = new NoopTelemetryClient(),
   opts: { blockUntilSync: boolean } = { blockUntilSync: true },
-): Promise<ArchiverApi & Maybe<Service>> {
+) {
   if (!config.archiverUrl) {
     const store = await createStore('archiver', config, createDebugLogger('aztec:archiver:lmdb'));
     const archiverStore = new KVArchiverDataStore(store, config.maxLogs);
diff --git a/yarn-project/archiver/src/rpc/archiver_client.ts b/yarn-project/archiver/src/rpc/archiver_client.ts
new file mode 100644
index 00000000000..562b89148c2
--- /dev/null
+++ b/yarn-project/archiver/src/rpc/archiver_client.ts
@@ -0,0 +1,29 @@
+import {
+  EncryptedNoteL2BlockL2Logs,
+  ExtendedUnencryptedL2Log,
+  L2Block,
+  NullifierMembershipWitness,
+  TxReceipt,
+  UnencryptedL2BlockL2Logs,
+} from '@aztec/circuit-types';
+import { EthAddress, Fr } from '@aztec/circuits.js';
+import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
+
+import { type ArchiveSource } from '../archiver/archiver.js';
+
+export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], true)): ArchiveSource =>
+  createJsonRpcClient<ArchiveSource>(
+    url,
+    {
+      EthAddress,
+      ExtendedUnencryptedL2Log,
+      Fr,
+      L2Block,
+      EncryptedNoteL2BlockL2Logs,
+      UnencryptedL2BlockL2Logs,
+    },
+    { TxReceipt, NullifierMembershipWitness },
+    false,
+    'archiver',
+    fetch,
+  ) as ArchiveSource;
diff --git a/yarn-project/archiver/src/rpc/archiver_server.ts b/yarn-project/archiver/src/rpc/archiver_server.ts
new file mode 100644
index 00000000000..be18f647e79
--- /dev/null
+++ b/yarn-project/archiver/src/rpc/archiver_server.ts
@@ -0,0 +1,35 @@
+import {
+  EncryptedNoteL2BlockL2Logs,
+  ExtendedUnencryptedL2Log,
+  L2Block,
+  NullifierMembershipWitness,
+  TxEffect,
+  TxReceipt,
+  UnencryptedL2BlockL2Logs,
+} from '@aztec/circuit-types';
+import { EthAddress, Fr } from '@aztec/circuits.js';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
+
+import { type Archiver } from '../archiver/archiver.js';
+
+/**
+ * Wrap an Archiver instance with a JSON RPC HTTP server.
+ * @param archiverService - The Archiver instance
+ * @returns An JSON-RPC HTTP server
+ */
+export function createArchiverRpcServer(archiverService: Archiver): JsonRpcServer {
+  return new JsonRpcServer(
+    archiverService,
+    {
+      EthAddress,
+      ExtendedUnencryptedL2Log,
+      Fr,
+      L2Block,
+      EncryptedNoteL2BlockL2Logs,
+      UnencryptedL2BlockL2Logs,
+      TxEffect,
+    },
+    { TxReceipt, NullifierMembershipWitness },
+    ['start', 'stop'],
+  );
+}
diff --git a/yarn-project/archiver/src/rpc/index.ts b/yarn-project/archiver/src/rpc/index.ts
index 5845eacb4b8..726d9120af8 100644
--- a/yarn-project/archiver/src/rpc/index.ts
+++ b/yarn-project/archiver/src/rpc/index.ts
@@ -1,11 +1,2 @@
-import { type ArchiverApi, ArchiverApiSchema } from '@aztec/circuit-types';
-import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
-import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
-
-export function createArchiverClient(url: string, fetch = makeFetch([1, 2, 3], true)): ArchiverApi {
-  return createSafeJsonRpcClient<ArchiverApi>(url, ArchiverApiSchema, false, 'archiver', fetch);
-}
-
-export function createArchiverRpcServer(handler: ArchiverApi) {
-  return createSafeJsonRpcServer(handler, ArchiverApiSchema);
-}
+export * from './archiver_client.js';
+export * from './archiver_server.js';
diff --git a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
index 3ceaf4c6c69..00553b4d004 100644
--- a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
@@ -1,5 +1,28 @@
-import { type AztecNode, AztecNodeApiSchema } from '@aztec/circuit-types';
-import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import {
+  type AztecNode,
+  EncryptedL2NoteLog,
+  EncryptedNoteL2BlockL2Logs,
+  EpochProofQuote,
+  ExtendedUnencryptedL2Log,
+  L2Block,
+  LogId,
+  NullifierMembershipWitness,
+  PublicDataWitness,
+  PublicSimulationOutput,
+  SiblingPath,
+  Tx,
+  TxEffect,
+  TxHash,
+  TxReceipt,
+  UnencryptedL2BlockL2Logs,
+} from '@aztec/circuit-types';
+import { FunctionSelector, Header, PublicKeys } from '@aztec/circuits.js';
+import { NoteSelector } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 
 /**
  * Wrap an AztecNode instance with a JSON RPC HTTP server.
@@ -7,5 +30,37 @@ import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
  * @returns An JSON-RPC HTTP server
  */
 export function createAztecNodeRpcServer(node: AztecNode) {
-  return createSafeJsonRpcServer(node, AztecNodeApiSchema);
+  const rpc = new JsonRpcServer(
+    node,
+    {
+      AztecAddress,
+      EthAddress,
+      ExtendedUnencryptedL2Log,
+      Fr,
+      FunctionSelector,
+      Header,
+      L2Block,
+      TxEffect,
+      LogId,
+      TxHash,
+      Buffer32,
+      PublicDataWitness,
+      PublicKeys,
+      SiblingPath,
+    },
+    {
+      EncryptedNoteL2BlockL2Logs,
+      EncryptedL2NoteLog,
+      NoteSelector,
+      NullifierMembershipWitness,
+      PublicSimulationOutput,
+      Tx,
+      TxReceipt,
+      UnencryptedL2BlockL2Logs,
+      EpochProofQuote,
+    },
+    // disable methods not part of the AztecNode interface
+    ['start', 'stop'],
+  );
+  return rpc;
 }
diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index 0f8e30f584d..2340fd6f2d4 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -21,7 +21,6 @@ import {
   PublicDataWitness,
   PublicSimulationOutput,
   type SequencerConfig,
-  type Service,
   SiblingPath,
   type Tx,
   type TxEffect,
@@ -31,7 +30,6 @@ import {
   TxStatus,
   type TxValidator,
   type WorldStateSynchronizer,
-  tryStop,
 } from '@aztec/circuit-types';
 import {
   type ARCHIVE_HEIGHT,
@@ -91,7 +89,7 @@ export class AztecNodeService implements AztecNode {
   constructor(
     protected config: AztecNodeConfig,
     protected readonly p2pClient: P2P,
-    protected readonly blockSource: L2BlockSource & Partial<Service>,
+    protected readonly blockSource: L2BlockSource,
     protected readonly encryptedLogsSource: L2LogsSource,
     protected readonly unencryptedLogsSource: L2LogsSource,
     protected readonly contractDataSource: ContractDataSource,
@@ -375,7 +373,7 @@ export class AztecNodeService implements AztecNode {
     await this.sequencer?.stop();
     await this.p2pClient.stop();
     await this.worldStateSynchronizer.stop();
-    await tryStop(this.blockSource);
+    await this.blockSource.stop();
     await this.telemetry.stop();
     this.log.info(`Stopped`);
   }
diff --git a/yarn-project/aztec.js/src/contract/batch_call.ts b/yarn-project/aztec.js/src/contract/batch_call.ts
index 31f6ce37df1..89cc0beb8ae 100644
--- a/yarn-project/aztec.js/src/contract/batch_call.ts
+++ b/yarn-project/aztec.js/src/contract/batch_call.ts
@@ -70,10 +70,7 @@ export class BatchCall extends BaseContractInteraction {
 
     const unconstrainedCalls = unconstrained.map(async indexedCall => {
       const call = indexedCall[0];
-      return [
-        await this.wallet.simulateUnconstrained(call.name, call.args, call.to, options?.from),
-        indexedCall[1],
-      ] as const;
+      return [await this.wallet.simulateUnconstrained(call.name, call.args, call.to, options?.from), indexedCall[1]];
     });
 
     const [unconstrainedResults, simulatedTx] = await Promise.all([
diff --git a/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts b/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts
index f69f515388e..2c3fa87bb59 100644
--- a/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts
+++ b/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts
@@ -32,12 +32,7 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
         name: 'claim',
         selector,
         isStatic: false,
-        args: [
-          this.sender.toField(),
-          this.claim.claimAmount,
-          this.claim.claimSecret,
-          new Fr(this.claim.messageLeafIndex),
-        ],
+        args: [this.sender, this.claim.claimAmount, this.claim.claimSecret, new Fr(this.claim.messageLeafIndex)],
         returnTypes: [],
         type: FunctionType.PRIVATE,
       },
diff --git a/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts
index e505901da36..0578179ef1c 100644
--- a/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts
+++ b/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts
@@ -65,7 +65,7 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
       caller: this.paymentContract,
       action: {
         name: 'setup_refund',
-        args: [this.feeRecipient.toField(), this.wallet.getAddress().toField(), maxFee, nonce],
+        args: [this.feeRecipient, this.wallet.getAddress(), maxFee, nonce],
         selector: FunctionSelector.fromSignature('setup_refund((Field),(Field),Field,Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
@@ -81,7 +81,7 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
         selector: FunctionSelector.fromSignature('fee_entrypoint_private(Field,(Field),Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        args: [maxFee, this.asset.toField(), nonce],
+        args: [maxFee, this.asset, nonce],
         returnTypes: [],
       },
     ];
diff --git a/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts
index 13842e36131..dae20d5fe8a 100644
--- a/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts
+++ b/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts
@@ -54,7 +54,7 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
             caller: this.paymentContract,
             action: {
               name: 'transfer_public',
-              args: [this.wallet.getAddress().toField(), this.paymentContract.toField(), maxFee, nonce],
+              args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
               selector: FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
               type: FunctionType.PUBLIC,
               isStatic: false,
@@ -71,7 +71,7 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
         selector: FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        args: [maxFee, this.asset.toField(), nonce],
+        args: [maxFee, this.asset, nonce],
         returnTypes: [],
       },
     ]);
diff --git a/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts b/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts
index b95c3802fff..0e7a81a0714 100644
--- a/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts
+++ b/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts
@@ -1,5 +1,45 @@
-import { type PXE, PXESchema } from '@aztec/circuit-types';
-import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
+import {
+  AuthWitness,
+  CountedNoteLog,
+  CountedPublicExecutionRequest,
+  EncryptedL2Log,
+  EncryptedL2NoteLog,
+  EncryptedNoteL2BlockL2Logs,
+  EventMetadata,
+  ExtendedNote,
+  ExtendedUnencryptedL2Log,
+  L2Block,
+  LogId,
+  Note,
+  NullifierMembershipWitness,
+  type PXE,
+  PrivateExecutionResult,
+  SiblingPath,
+  Tx,
+  TxEffect,
+  TxExecutionRequest,
+  TxHash,
+  TxProvingResult,
+  TxReceipt,
+  TxSimulationResult,
+  UnencryptedL2BlockL2Logs,
+  UnencryptedL2Log,
+  UniqueNote,
+} from '@aztec/circuit-types';
+import {
+  AztecAddress,
+  CompleteAddress,
+  EthAddress,
+  Fr,
+  FunctionSelector,
+  GrumpkinScalar,
+  Point,
+  PrivateCircuitPublicInputs,
+  PublicKeys,
+} from '@aztec/circuits.js';
+import { EventSelector, NoteSelector } from '@aztec/foundation/abi';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
 
 /**
  * Creates a JSON-RPC client to remotely talk to PXE.
@@ -7,6 +47,51 @@ import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/c
  * @param fetch - The fetch implementation to use.
  * @returns A JSON-RPC client of PXE.
  */
-export function createPXEClient(url: string, fetch = makeFetch([1, 2, 3], false)): PXE {
-  return createSafeJsonRpcClient<PXE>(url, PXESchema, false, 'pxe', fetch);
-}
+export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)): PXE =>
+  createJsonRpcClient<PXE>(
+    url,
+    {
+      AuthWitness,
+      AztecAddress,
+      CompleteAddress,
+      FunctionSelector,
+      EthAddress,
+      EventSelector,
+      ExtendedNote,
+      UniqueNote,
+      ExtendedUnencryptedL2Log,
+      Fr,
+      GrumpkinScalar,
+      L2Block,
+      TxEffect,
+      LogId,
+      Note,
+      Point,
+      PublicKeys,
+      TxExecutionRequest,
+      TxHash,
+      Buffer32,
+      SiblingPath,
+    },
+    {
+      EncryptedNoteL2BlockL2Logs,
+      EncryptedL2NoteLog,
+      EncryptedL2Log,
+      EventMetadata,
+      UnencryptedL2Log,
+      NoteSelector,
+      NullifierMembershipWitness,
+      TxSimulationResult,
+      TxProvingResult,
+      PrivateCircuitPublicInputs,
+      PrivateExecutionResult,
+      CountedPublicExecutionRequest,
+      CountedNoteLog,
+      Tx,
+      TxReceipt,
+      UnencryptedL2BlockL2Logs,
+    },
+    false,
+    'pxe',
+    fetch,
+  ) as PXE;
diff --git a/yarn-project/aztec.js/src/utils/abi_types.ts b/yarn-project/aztec.js/src/utils/abi_types.ts
index 96f43ac5de3..304c109899b 100644
--- a/yarn-project/aztec.js/src/utils/abi_types.ts
+++ b/yarn-project/aztec.js/src/utils/abi_types.ts
@@ -13,7 +13,7 @@ export type FieldLike = Fr | Buffer | bigint | number | { /** Converts to field
 export type EthAddressLike = { /** Wrapped address */ address: FieldLike } | EthAddress;
 
 /** Any type that can be converted into an AztecAddress Aztec.nr struct. */
-export type AztecAddressLike = { /** Wrapped address */ address: FieldLike } | AztecAddress | Fr;
+export type AztecAddressLike = { /** Wrapped address */ address: FieldLike } | AztecAddress;
 
 /** Any type that can be converted into a FunctionSelector Aztec.nr struct. */
 export type FunctionSelectorLike = FieldLike | FunctionSelector;
diff --git a/yarn-project/aztec.js/src/utils/authwit.ts b/yarn-project/aztec.js/src/utils/authwit.ts
index 51c62370891..d59ef37e3d0 100644
--- a/yarn-project/aztec.js/src/utils/authwit.ts
+++ b/yarn-project/aztec.js/src/utils/authwit.ts
@@ -57,7 +57,7 @@ export const computeAuthWitMessageHash = (intent: IntentInnerHash | IntentAction
   if ('caller' in intent) {
     const action = intent.action instanceof ContractFunctionInteraction ? intent.action.request() : intent.action;
     return computeOuterAuthWitHash(
-      action.to,
+      action.to.toField(),
       chainId,
       version,
       computeInnerAuthWitHashFromAction(intent.caller, action),
diff --git a/yarn-project/aztec.js/src/utils/cheat_codes.ts b/yarn-project/aztec.js/src/utils/cheat_codes.ts
index f35ae53c25f..7bbc95044cc 100644
--- a/yarn-project/aztec.js/src/utils/cheat_codes.ts
+++ b/yarn-project/aztec.js/src/utils/cheat_codes.ts
@@ -444,8 +444,7 @@ export class AztecCheatCodes {
    * @returns The storage slot of the value in the map
    */
   public computeSlotInMap(mapSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr {
-    const keyFr = typeof key === 'bigint' ? new Fr(key) : key.toField();
-    return deriveStorageSlotInMap(mapSlot, keyFr);
+    return deriveStorageSlotInMap(mapSlot, new Fr(key));
   }
 
   /**
diff --git a/yarn-project/aztec.js/src/utils/pxe.ts b/yarn-project/aztec.js/src/utils/pxe.ts
index 57d79ce15ae..700a003d217 100644
--- a/yarn-project/aztec.js/src/utils/pxe.ts
+++ b/yarn-project/aztec.js/src/utils/pxe.ts
@@ -5,9 +5,8 @@ import { retryUntil } from '@aztec/foundation/retry';
 export const waitForPXE = async (pxe: PXE, logger?: DebugLogger) => {
   await retryUntil(async () => {
     try {
-      logger?.verbose('Attempting to contact PXE...');
+      logger?.debug('Attempting to contact PXE...');
       await pxe.getNodeInfo();
-      logger?.verbose('Contacted PXE');
       return true;
     } catch (error) {
       logger?.verbose('Failed to contact PXE');
diff --git a/yarn-project/aztec.js/src/wallet/base_wallet.ts b/yarn-project/aztec.js/src/wallet/base_wallet.ts
index 9e5156f01d2..bc896799004 100644
--- a/yarn-project/aztec.js/src/wallet/base_wallet.ts
+++ b/yarn-project/aztec.js/src/wallet/base_wallet.ts
@@ -1,6 +1,6 @@
 import {
   type AuthWitness,
-  type EventMetadataDefinition,
+  type EventType,
   type ExtendedNote,
   type GetUnencryptedLogsResponse,
   type IncomingNotesFilter,
@@ -33,7 +33,7 @@ import {
   type PartialAddress,
   type Point,
 } from '@aztec/circuits.js';
-import type { AbiDecoded, ContractArtifact } from '@aztec/foundation/abi';
+import type { AbiType, ContractArtifact, EventSelector } from '@aztec/foundation/abi';
 
 import { type Wallet } from '../account/wallet.js';
 import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
@@ -152,7 +152,7 @@ export abstract class BaseWallet implements Wallet {
     args: any[],
     to: AztecAddress,
     from?: AztecAddress | undefined,
-  ): Promise<AbiDecoded> {
+  ): Promise<any> {
     return this.pxe.simulateUnconstrained(functionName, args, to, from);
   }
   getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
@@ -197,8 +197,16 @@ export abstract class BaseWallet implements Wallet {
   getPXEInfo(): Promise<PXEInfo> {
     return this.pxe.getPXEInfo();
   }
-  getEncryptedEvents<T>(
-    event: EventMetadataDefinition,
+  getEvents<T>(
+    type: EventType,
+    event: {
+      /** The event selector */
+      eventSelector: EventSelector;
+      /** The event's abi type */
+      abiType: AbiType;
+      /** The field names */
+      fieldNames: string[];
+    },
     from: number,
     limit: number,
     vpks: Point[] = [
@@ -206,10 +214,7 @@ export abstract class BaseWallet implements Wallet {
       this.getCompleteAddress().publicKeys.masterOutgoingViewingPublicKey,
     ],
   ): Promise<T[]> {
-    return this.pxe.getEncryptedEvents(event, from, limit, vpks);
-  }
-  getUnencryptedEvents<T>(event: EventMetadataDefinition, from: number, limit: number): Promise<T[]> {
-    return this.pxe.getUnencryptedEvents(event, from, limit);
+    return this.pxe.getEvents(type, event, from, limit, vpks);
   }
   public getL1ToL2MembershipWitness(
     contractAddress: AztecAddress,
diff --git a/yarn-project/aztec/src/cli/cli.ts b/yarn-project/aztec/src/cli/cli.ts
index 57650fede28..24251b0165e 100644
--- a/yarn-project/aztec/src/cli/cli.ts
+++ b/yarn-project/aztec/src/cli/cli.ts
@@ -1,13 +1,11 @@
 import { deployInitialTestAccounts } from '@aztec/accounts/testing';
-import { AztecNodeApiSchema, PXESchema } from '@aztec/circuit-types';
-import {
-  type NamespacedApiHandlers,
-  createNamespacedSafeJsonRpcServer,
-  startHttpRpcServer,
-} from '@aztec/foundation/json-rpc/server';
+import { createAztecNodeRpcServer } from '@aztec/aztec-node';
+import { type ServerList, createNamespacedJsonRpcServer, createStatusRouter } from '@aztec/foundation/json-rpc/server';
 import { type DebugLogger, type LogFn } from '@aztec/foundation/log';
+import { createPXERpcServer } from '@aztec/pxe';
 
 import { Command } from 'commander';
+import http from 'http';
 
 import { setupConsoleJsonLog } from '../logging.js';
 import { createSandbox } from '../sandbox.js';
@@ -46,7 +44,7 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
 
     // list of 'stop' functions to call when process ends
     const signalHandlers: Array<() => Promise<void>> = [];
-    const services: NamespacedApiHandlers = {};
+    let services: ServerList = [];
 
     if (options.sandbox) {
       const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
@@ -71,37 +69,38 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
       }
 
       // Start Node and PXE JSON-RPC server
+      const nodeServer = createAztecNodeRpcServer(node);
+      const pxeServer = createPXERpcServer(pxe);
       signalHandlers.push(stop);
-      services.node = [node, AztecNodeApiSchema];
-      services.pxe = [pxe, PXESchema];
+      services = [{ node: nodeServer }, { pxe: pxeServer }];
     } else {
       if (options.node) {
         const { startNode } = await import('./cmds/start_node.js');
-        await startNode(options, signalHandlers, services, userLog);
+        services = await startNode(options, signalHandlers, userLog);
       } else if (options.proofVerifier) {
         const { startProofVerifier } = await import('./cmds/start_proof_verifier.js');
-        await startProofVerifier(options, signalHandlers, userLog);
+        services = await startProofVerifier(options, signalHandlers, userLog);
       } else if (options.bot) {
         const { startBot } = await import('./cmds/start_bot.js');
-        await startBot(options, signalHandlers, services, userLog);
+        services = await startBot(options, signalHandlers, userLog);
       } else if (options.proverNode) {
         const { startProverNode } = await import('./cmds/start_prover_node.js');
-        await startProverNode(options, signalHandlers, services, userLog);
+        services = await startProverNode(options, signalHandlers, userLog);
       } else if (options.pxe) {
         const { startPXE } = await import('./cmds/start_pxe.js');
-        await startPXE(options, signalHandlers, services, userLog);
+        services = await startPXE(options, signalHandlers, userLog);
       } else if (options.archiver) {
         const { startArchiver } = await import('./cmds/start_archiver.js');
-        await startArchiver(options, signalHandlers, services);
+        services = await startArchiver(options, signalHandlers);
       } else if (options.p2pBootstrap) {
         const { startP2PBootstrap } = await import('./cmds/start_p2p_bootstrap.js');
         await startP2PBootstrap(options, userLog, debugLogger);
       } else if (options.prover) {
         const { startProverAgent } = await import('./cmds/start_prover_agent.js');
-        await startProverAgent(options, signalHandlers, services, userLog);
+        services = await startProverAgent(options, signalHandlers, userLog);
       } else if (options.txe) {
         const { startTXE } = await import('./cmds/start_txe.js');
-        await startTXE(options, debugLogger);
+        startTXE(options, debugLogger);
       } else if (options.sequencer) {
         userLog(`Cannot run a standalone sequencer without a node`);
         process.exit(1);
@@ -113,10 +112,17 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
 
     installSignalHandlers(debugLogger.info, signalHandlers);
 
-    if (Object.entries(services).length > 0) {
-      const rpcServer = createNamespacedSafeJsonRpcServer(services, debugLogger);
-      const { port } = await startHttpRpcServer(rpcServer, { port: options.port });
-      debugLogger.info(`Aztec Server listening on port ${port}`);
+    if (services.length) {
+      const rpcServer = createNamespacedJsonRpcServer(services, debugLogger);
+
+      const app = rpcServer.getApp(options.apiPrefix);
+      // add status route
+      const statusRouter = createStatusRouter(() => rpcServer.isHealthy(), options.apiPrefix);
+      app.use(statusRouter.routes()).use(statusRouter.allowedMethods());
+
+      const httpServer = http.createServer(app.callback());
+      httpServer.listen(options.port);
+      debugLogger.info(`Aztec Server listening on port ${options.port}`);
     }
   });
 
diff --git a/yarn-project/aztec/src/cli/cmds/start_archiver.ts b/yarn-project/aztec/src/cli/cmds/start_archiver.ts
index cdee55cc214..d9e0c092aa7 100644
--- a/yarn-project/aztec/src/cli/cmds/start_archiver.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_archiver.ts
@@ -1,7 +1,12 @@
-import { Archiver, type ArchiverConfig, KVArchiverDataStore, archiverConfigMappings } from '@aztec/archiver';
+import {
+  Archiver,
+  type ArchiverConfig,
+  KVArchiverDataStore,
+  archiverConfigMappings,
+  createArchiverRpcServer,
+} from '@aztec/archiver';
 import { createDebugLogger } from '@aztec/aztec.js';
-import { ArchiverApiSchema } from '@aztec/circuit-types';
-import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
+import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { createStore } from '@aztec/kv-store/utils';
 import {
   createAndStartTelemetryClient,
@@ -10,12 +15,9 @@ import {
 
 import { extractRelevantOptions } from '../util.js';
 
-/** Starts a standalone archiver. */
-export async function startArchiver(
-  options: any,
-  signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
-) {
+export const startArchiver = async (options: any, signalHandlers: (() => Promise<void>)[]) => {
+  const services: ServerList = [];
+  // Start a standalone archiver.
   const archiverConfig = extractRelevantOptions<ArchiverConfig>(options, archiverConfigMappings, 'archiver');
 
   const storeLog = createDebugLogger('aztec:archiver:lmdb');
@@ -24,7 +26,8 @@ export async function startArchiver(
 
   const telemetry = await createAndStartTelemetryClient(getTelemetryClientConfig());
   const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, telemetry, true);
-  services.archiver = [archiver, ArchiverApiSchema];
+  const archiverServer = createArchiverRpcServer(archiver);
+  services.push({ archiver: archiverServer });
   signalHandlers.push(archiver.stop);
   return services;
-}
+};
diff --git a/yarn-project/aztec/src/cli/cmds/start_bot.ts b/yarn-project/aztec/src/cli/cmds/start_bot.ts
index 1d3e110db33..cf61ed0aa95 100644
--- a/yarn-project/aztec/src/cli/cmds/start_bot.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_bot.ts
@@ -1,6 +1,6 @@
-import { type BotConfig, BotRunner, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
+import { type BotConfig, BotRunner, botConfigMappings, createBotRunnerRpcServer } from '@aztec/bot';
 import { type AztecNode, type PXE } from '@aztec/circuit-types';
-import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
+import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
 
 import { extractRelevantOptions } from '../util.js';
@@ -8,9 +8,11 @@ import { extractRelevantOptions } from '../util.js';
 export async function startBot(
   options: any,
   signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
   userLog: LogFn,
-) {
+): Promise<ServerList> {
+  // Services that will be started in a single multi-rpc server
+  const services: ServerList = [];
+
   const { proverNode, archiver, sequencer, p2pBootstrap, txe, prover } = options;
   if (proverNode || archiver || sequencer || p2pBootstrap || txe || prover) {
     userLog(
@@ -22,25 +24,27 @@ export async function startBot(
   let pxe: PXE | undefined;
   if (options.pxe) {
     const { addPXE } = await import('./start_pxe.js');
-    pxe = await addPXE(options, signalHandlers, services, userLog);
+    pxe = await addPXE(options, services, signalHandlers, userLog);
   }
 
-  await addBot(options, signalHandlers, services, { pxe });
+  await addBot(options, services, signalHandlers, { pxe });
+  return services;
 }
 
 export function addBot(
   options: any,
+  services: ServerList,
   signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
   deps: { pxe?: PXE; node?: AztecNode } = {},
 ) {
   const config = extractRelevantOptions<BotConfig>(options, botConfigMappings, 'bot');
 
   const botRunner = new BotRunner(config, deps);
+  const botServer = createBotRunnerRpcServer(botRunner);
   if (!config.noStart) {
     void botRunner.start(); // Do not block since bot setup takes time
   }
-  services.bot = getBotRunnerApiHandler(botRunner);
+  services.push({ bot: botServer });
   signalHandlers.push(botRunner.stop);
   return Promise.resolve();
 }
diff --git a/yarn-project/aztec/src/cli/cmds/start_node.ts b/yarn-project/aztec/src/cli/cmds/start_node.ts
index 939776c345b..ad0cb056257 100644
--- a/yarn-project/aztec/src/cli/cmds/start_node.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_node.ts
@@ -1,7 +1,7 @@
-import { aztecNodeConfigMappings } from '@aztec/aztec-node';
-import { AztecNodeApiSchema, type PXE } from '@aztec/circuit-types';
+import { aztecNodeConfigMappings, createAztecNodeRpcServer } from '@aztec/aztec-node';
+import { type PXE } from '@aztec/circuit-types';
 import { NULL_KEY } from '@aztec/ethereum';
-import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
+import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
 import {
   type TelemetryClientConfig,
@@ -14,12 +14,14 @@ import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { createAztecNode, deployContractsToL1 } from '../../sandbox.js';
 import { extractNamespacedOptions, extractRelevantOptions } from '../util.js';
 
-export async function startNode(
+export const startNode = async (
   options: any,
   signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
   userLog: LogFn,
-) {
+): Promise<ServerList> => {
+  // Services that will be started in a single multi-rpc server
+  const services: ServerList = [];
+
   // options specifically namespaced with --node.<option>
   const nodeSpecificOptions = extractNamespacedOptions(options, 'node');
   // All options that are relevant to the Aztec Node
@@ -90,11 +92,12 @@ export async function startNode(
   const telemetryConfig = extractRelevantOptions<TelemetryClientConfig>(options, telemetryClientConfigMappings, 'tel');
   const telemetryClient = await createAndStartTelemetryClient(telemetryConfig);
 
-  // Create and start Aztec Node
+  // Create and start Aztec Node.
   const node = await createAztecNode(nodeConfig, telemetryClient);
+  const nodeServer = createAztecNodeRpcServer(node);
 
   // Add node to services list
-  services.node = [node, AztecNodeApiSchema];
+  services.push({ node: nodeServer });
 
   // Add node stop function to signal handlers
   signalHandlers.push(node.stop.bind(node));
@@ -103,12 +106,14 @@ export async function startNode(
   let pxe: PXE | undefined;
   if (options.pxe) {
     const { addPXE } = await import('./start_pxe.js');
-    pxe = await addPXE(options, signalHandlers, services, userLog, { node });
+    pxe = await addPXE(options, services, signalHandlers, userLog, { node });
   }
 
   // Add a txs bot if requested
   if (options.bot) {
     const { addBot } = await import('./start_bot.js');
-    await addBot(options, signalHandlers, services, { pxe, node });
+    await addBot(options, services, signalHandlers, { pxe, node });
   }
-}
+
+  return services;
+};
diff --git a/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts b/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts
index 2aa5ce823f5..89477caaffb 100644
--- a/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts
@@ -1,10 +1,17 @@
+import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
 import { ProofVerifier, proofVerifierConfigMappings } from '@aztec/proof-verifier';
 import { createAndStartTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client/start';
 
 import { extractRelevantOptions } from '../util.js';
 
-export async function startProofVerifier(options: any, signalHandlers: (() => Promise<void>)[], userLog: LogFn) {
+export async function startProofVerifier(
+  options: any,
+  signalHandlers: (() => Promise<void>)[],
+  userLog: LogFn,
+): Promise<ServerList> {
+  const services: ServerList = [];
+
   const config = extractRelevantOptions(options, proofVerifierConfigMappings, 'proofVerifier');
 
   const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
@@ -15,4 +22,5 @@ export async function startProofVerifier(options: any, signalHandlers: (() => Pr
   proofVerifier.start();
 
   signalHandlers.push(() => proofVerifier.stop());
+  return services;
 }
diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts b/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts
index 2cbad090b25..d2f583cfd95 100644
--- a/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts
@@ -1,31 +1,28 @@
 import { BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
-import { ProverAgentApiSchema, type ServerCircuitProver } from '@aztec/circuit-types';
-import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { type LogFn } from '@aztec/foundation/log';
+import { type ServerCircuitProver } from '@aztec/circuit-types';
 import { type ProverClientConfig, proverClientConfigMappings } from '@aztec/prover-client';
-import { ProverAgent, createProvingJobSourceClient } from '@aztec/prover-client/prover-agent';
+import {
+  ProverAgent,
+  createProverAgentRpcServer,
+  createProvingJobSourceClient,
+} from '@aztec/prover-client/prover-agent';
 import {
   type TelemetryClientConfig,
   createAndStartTelemetryClient,
   telemetryClientConfigMappings,
 } from '@aztec/telemetry-client/start';
 
-import { extractRelevantOptions } from '../util.js';
+import { type ServiceStarter, extractRelevantOptions } from '../util.js';
 
-export async function startProverAgent(
-  options: any,
-  signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
-  logger: LogFn,
-) {
+export const startProverAgent: ServiceStarter = async (options, signalHandlers, logger) => {
   const proverConfig = extractRelevantOptions<ProverClientConfig>(options, proverClientConfigMappings, 'prover');
   const proverJobSourceUrl = proverConfig.proverJobSourceUrl ?? proverConfig.nodeUrl;
   if (!proverJobSourceUrl) {
-    throw new Error('Starting prover without PROVER_JOB_SOURCE_URL is not supported');
+    throw new Error('Starting prover without PROVER_JOB_PROVIDER_URL is not supported');
   }
 
   logger(`Connecting to prover at ${proverJobSourceUrl}`);
-  const source = createProvingJobSourceClient(proverJobSourceUrl);
+  const source = createProvingJobSourceClient(proverJobSourceUrl, 'provingJobSource');
 
   const telemetryConfig = extractRelevantOptions<TelemetryClientConfig>(options, telemetryClientConfigMappings, 'tel');
   const telemetry = await createAndStartTelemetryClient(telemetryConfig);
@@ -40,12 +37,15 @@ export async function startProverAgent(
     circuitProver = new TestCircuitProver(telemetry, undefined, proverConfig);
   }
 
-  const { proverAgentConcurrency, proverAgentPollInterval } = proverConfig;
-  const agent = new ProverAgent(circuitProver, proverAgentConcurrency, proverAgentPollInterval);
+  const agent = new ProverAgent(
+    circuitProver,
+    proverConfig.proverAgentConcurrency,
+    proverConfig.proverAgentPollInterval,
+  );
   agent.start(source);
+  logger(`Started prover agent with concurrency limit of ${proverConfig.proverAgentConcurrency}`);
 
-  logger(`Started prover agent with concurrency limit of ${proverAgentConcurrency}`);
-
-  services.prover = [agent, ProverAgentApiSchema];
   signalHandlers.push(() => agent.stop());
-}
+
+  return [{ prover: createProverAgentRpcServer(agent) }];
+};
diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_node.ts b/yarn-project/aztec/src/cli/cmds/start_prover_node.ts
index 031298e6890..91ff17b37f2 100644
--- a/yarn-project/aztec/src/cli/cmds/start_prover_node.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_prover_node.ts
@@ -1,10 +1,12 @@
-import { ProverNodeApiSchema, ProvingJobSourceSchema, createAztecNodeClient } from '@aztec/circuit-types';
+import { createAztecNodeClient } from '@aztec/circuit-types';
 import { NULL_KEY } from '@aztec/ethereum';
-import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
+import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
+import { createProvingJobSourceServer } from '@aztec/prover-client/prover-agent';
 import {
   type ProverNodeConfig,
   createProverNode,
+  createProverNodeRpcServer,
   getProverNodeConfigFromEnv,
   proverNodeConfigMappings,
 } from '@aztec/prover-node';
@@ -14,12 +16,14 @@ import { mnemonicToAccount } from 'viem/accounts';
 
 import { extractRelevantOptions } from '../util.js';
 
-export async function startProverNode(
+export const startProverNode = async (
   options: any,
   signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
   userLog: LogFn,
-) {
+): Promise<ServerList> => {
+  // Services that will be started in a single multi-rpc server
+  const services: ServerList = [];
+
   if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
     userLog(`Starting a prover-node with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
     process.exit(1);
@@ -69,14 +73,17 @@ export async function startProverNode(
   );
   const proverNode = await createProverNode(proverConfig, { telemetry });
 
-  services.proverNode = [proverNode, ProverNodeApiSchema];
+  services.push({ node: createProverNodeRpcServer(proverNode) });
 
   if (!options.prover) {
-    services.provingJobSource = [proverNode.getProver().getProvingJobSource(), ProvingJobSourceSchema];
+    const provingJobSource = createProvingJobSourceServer(proverNode.getProver().getProvingJobSource());
+    services.push({ provingJobSource });
   }
 
   signalHandlers.push(proverNode.stop.bind(proverNode));
 
   // Automatically start proving unproven blocks
   await proverNode.start();
-}
+
+  return services;
+};
diff --git a/yarn-project/aztec/src/cli/cmds/start_pxe.ts b/yarn-project/aztec/src/cli/cmds/start_pxe.ts
index f1d8681982c..bffece2414c 100644
--- a/yarn-project/aztec/src/cli/cmds/start_pxe.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_pxe.ts
@@ -5,15 +5,16 @@ import {
   PublicKeys,
   getContractClassFromArtifact,
 } from '@aztec/aztec.js';
-import { type AztecNode, PXESchema, createAztecNodeClient } from '@aztec/circuit-types';
+import { type AztecNode, createAztecNodeClient } from '@aztec/circuit-types';
 import { getContractArtifact } from '@aztec/cli/cli-utils';
-import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
+import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
 import {
   AztecAddress,
   type CliPXEOptions,
   type PXEServiceConfig,
   allPxeConfigMappings,
+  createPXERpcServer,
   createPXEService,
 } from '@aztec/pxe';
 import { L2BasicContractsMap, Network } from '@aztec/types/network';
@@ -22,13 +23,9 @@ import { extractRelevantOptions } from '../util.js';
 
 const contractAddressesUrl = 'http://static.aztec.network';
 
-export async function startPXE(
-  options: any,
-  signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
-  userLog: LogFn,
-) {
-  await addPXE(options, signalHandlers, services, userLog, {});
+export async function startPXE(options: any, signalHandlers: (() => Promise<void>)[], userLog: LogFn) {
+  const services: ServerList = [];
+  await addPXE(options, services, signalHandlers, userLog, {});
   return services;
 }
 
@@ -46,8 +43,8 @@ async function fetchBasicContractAddresses(url: string) {
 
 export async function addPXE(
   options: any,
+  services: ServerList,
   signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
   userLog: LogFn,
   deps: { node?: AztecNode } = {},
 ) {
@@ -78,6 +75,7 @@ export async function addPXE(
 
   const node = deps.node ?? createAztecNodeClient(nodeUrl!);
   const pxe = await createPXEService(node, pxeConfig as PXEServiceConfig);
+  const pxeServer = createPXERpcServer(pxe);
 
   // register basic contracts
   if (pxeConfig.network) {
@@ -115,7 +113,7 @@ export async function addPXE(
   }
 
   // Add PXE to services list
-  services.pxe = [pxe, PXESchema];
+  services.push({ pxe: pxeServer });
 
   // Add PXE stop function to signal handlers
   signalHandlers.push(pxe.stop);
diff --git a/yarn-project/aztec/src/cli/cmds/start_txe.ts b/yarn-project/aztec/src/cli/cmds/start_txe.ts
index 3412ca770a4..64198b580a4 100644
--- a/yarn-project/aztec/src/cli/cmds/start_txe.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_txe.ts
@@ -1,15 +1,20 @@
-import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
+import { createStatusRouter } from '@aztec/foundation/json-rpc/server';
 import { type DebugLogger } from '@aztec/foundation/log';
 import { createTXERpcServer } from '@aztec/txe';
 
-export async function startTXE(options: any, debugLogger: DebugLogger) {
-  debugLogger.info(`Setting up TXE...`);
+import http from 'http';
 
+export const startTXE = (options: any, debugLogger: DebugLogger) => {
+  debugLogger.info(`Setting up TXE...`);
   const txeServer = createTXERpcServer(debugLogger);
-  const { port } = await startHttpRpcServer(txeServer, {
-    port: options.port,
-    timeoutMs: 1e3 * 60 * 5,
-  });
+  const app = txeServer.getApp();
+  // add status route
+  const statusRouter = createStatusRouter(() => txeServer.isHealthy());
+  app.use(statusRouter.routes()).use(statusRouter.allowedMethods());
+
+  const httpServer = http.createServer(app.callback());
+  httpServer.timeout = 1e3 * 60 * 5; // 5 minutes
+  httpServer.listen(options.port);
 
-  debugLogger.info(`TXE listening on port ${port}`);
-}
+  debugLogger.info(`TXE listening on port ${options.port}`);
+};
diff --git a/yarn-project/aztec/src/cli/util.ts b/yarn-project/aztec/src/cli/util.ts
index cb5ab65fcda..9580eeae50d 100644
--- a/yarn-project/aztec/src/cli/util.ts
+++ b/yarn-project/aztec/src/cli/util.ts
@@ -1,5 +1,6 @@
 import { type AccountManager, type Fr } from '@aztec/aztec.js';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
+import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
 import { type PXEService } from '@aztec/pxe';
 
@@ -8,6 +9,10 @@ import { type Command } from 'commander';
 
 import { type AztecStartOption, aztecStartOptions } from './aztec_start_options.js';
 
+export interface ServiceStarter<T = any> {
+  (options: T, signalHandlers: (() => Promise<void>)[], logger: LogFn): Promise<ServerList>;
+}
+
 export const installSignalHandlers = (logFn: LogFn, cb?: Array<() => Promise<void>>) => {
   const shutdown = async () => {
     logFn('Shutting down...');
diff --git a/yarn-project/bb-prover/src/avm_proving.test.ts b/yarn-project/bb-prover/src/avm_proving.test.ts
index 60ab14974dd..4d437e565ba 100644
--- a/yarn-project/bb-prover/src/avm_proving.test.ts
+++ b/yarn-project/bb-prover/src/avm_proving.test.ts
@@ -9,7 +9,6 @@ import {
   VerificationKeyData,
 } from '@aztec/circuits.js';
 import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AvmSimulator, PublicSideEffectTrace, type WorldStateDB } from '@aztec/simulator';
@@ -80,7 +79,7 @@ const proveAndVerifyAvmTestContract = async (
   const instanceGet = new SerializableContractInstance({
     version: 1,
     salt: new Fr(0x123),
-    deployer: new AztecAddress(new Fr(0x456)),
+    deployer: new Fr(0x456),
     contractClassId: new Fr(0x789),
     initializationHash: new Fr(0x101112),
     publicKeys: new PublicKeys(
diff --git a/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts b/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts
index 4de354a0b56..1599610c81b 100644
--- a/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts
+++ b/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts
@@ -276,10 +276,7 @@ export class BBNativePrivateKernelProver implements PrivateKernelProver {
     return await promise;
   }
 
-  private async simulate<
-    I extends { toBuffer: () => Buffer },
-    O extends PrivateKernelCircuitPublicInputs | PrivateKernelTailCircuitPublicInputs,
-  >(
+  private async simulate<I extends { toBuffer: () => Buffer }, O extends { toBuffer: () => Buffer }>(
     inputs: I,
     circuitType: ClientProtocolArtifact,
     convertInputs: (inputs: I) => WitnessMap,
diff --git a/yarn-project/bot/package.json b/yarn-project/bot/package.json
index af35f5befbd..ac515b88218 100644
--- a/yarn-project/bot/package.json
+++ b/yarn-project/bot/package.json
@@ -62,8 +62,7 @@
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/types": "workspace:^",
     "source-map-support": "^0.5.21",
-    "tslib": "^2.4.0",
-    "zod": "^3.23.8"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
diff --git a/yarn-project/bot/src/config.ts b/yarn-project/bot/src/config.ts
index a980e6e42be..2cd14d0d78c 100644
--- a/yarn-project/bot/src/config.ts
+++ b/yarn-project/bot/src/config.ts
@@ -7,12 +7,9 @@ import {
   numberConfigHelper,
   optionalNumberConfigHelper,
 } from '@aztec/foundation/config';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 
-import { z } from 'zod';
-
-const BotFollowChain = ['NONE', 'PENDING', 'PROVEN'] as const;
-type BotFollowChain = (typeof BotFollowChain)[number];
+const botFollowChain = ['NONE', 'PENDING', 'PROVEN'] as const;
+type BotFollowChain = (typeof botFollowChain)[number];
 
 export enum SupportedTokenContracts {
   TokenContract = 'TokenContract',
@@ -62,37 +59,6 @@ export type BotConfig = {
   stopWhenUnhealthy: boolean;
 };
 
-export const BotConfigSchema = z
-  .object({
-    nodeUrl: z.string().optional(),
-    pxeUrl: z.string().optional(),
-    senderPrivateKey: schemas.Fr,
-    recipientEncryptionSecret: schemas.Fr,
-    tokenSalt: schemas.Fr,
-    txIntervalSeconds: z.number(),
-    privateTransfersPerTx: z.number(),
-    publicTransfersPerTx: z.number(),
-    feePaymentMethod: z.union([z.literal('fee_juice'), z.literal('none')]),
-    noStart: z.boolean(),
-    txMinedWaitSeconds: z.number(),
-    followChain: z.enum(BotFollowChain),
-    maxPendingTxs: z.number(),
-    flushSetupTransactions: z.boolean(),
-    skipPublicSimulation: z.boolean(),
-    l2GasLimit: z.number().optional(),
-    daGasLimit: z.number().optional(),
-    contract: z.nativeEnum(SupportedTokenContracts),
-    maxConsecutiveErrors: z.number(),
-    stopWhenUnhealthy: z.boolean(),
-  })
-  .transform(config => ({
-    nodeUrl: undefined,
-    pxeUrl: undefined,
-    l2GasLimit: undefined,
-    daGasLimit: undefined,
-    ...config,
-  })) satisfies ZodFor<BotConfig>;
-
 export const botConfigMappings: ConfigMappingsType<BotConfig> = {
   nodeUrl: {
     env: 'AZTEC_NODE_URL',
@@ -156,7 +122,7 @@ export const botConfigMappings: ConfigMappingsType<BotConfig> = {
     description: 'Which chain the bot follows',
     defaultValue: 'NONE',
     parseEnv(val) {
-      if (!(BotFollowChain as readonly string[]).includes(val.toUpperCase())) {
+      if (!(botFollowChain as readonly string[]).includes(val.toUpperCase())) {
         throw new Error(`Invalid value for BOT_FOLLOW_CHAIN: ${val}`);
       }
       return val as BotFollowChain;
diff --git a/yarn-project/bot/src/index.ts b/yarn-project/bot/src/index.ts
index 96c36924d60..43025b38956 100644
--- a/yarn-project/bot/src/index.ts
+++ b/yarn-project/bot/src/index.ts
@@ -7,5 +7,4 @@ export {
   botConfigMappings,
   SupportedTokenContracts,
 } from './config.js';
-export { createBotRunnerRpcServer, getBotRunnerApiHandler } from './rpc.js';
-export * from './interface.js';
+export { createBotRunnerRpcServer } from './rpc.js';
diff --git a/yarn-project/bot/src/interface.ts b/yarn-project/bot/src/interface.ts
deleted file mode 100644
index d91e3ae0071..00000000000
--- a/yarn-project/bot/src/interface.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { type ApiSchemaFor } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-import { type BotConfig, BotConfigSchema } from './config.js';
-
-export interface BotRunnerApi {
-  start(): Promise<void>;
-  stop(): Promise<void>;
-  run(): Promise<void>;
-  setup(): Promise<void>;
-  getConfig(): Promise<BotConfig>;
-  update(config: BotConfig): Promise<void>;
-}
-
-export const BotRunnerApiSchema: ApiSchemaFor<BotRunnerApi> = {
-  start: z.function().args().returns(z.void()),
-  stop: z.function().args().returns(z.void()),
-  run: z.function().args().returns(z.void()),
-  setup: z.function().args().returns(z.void()),
-  getConfig: z.function().args().returns(BotConfigSchema),
-  update: z.function().args(BotConfigSchema).returns(z.void()),
-};
diff --git a/yarn-project/bot/src/rpc.ts b/yarn-project/bot/src/rpc.ts
index 3fe11e372e1..5c2cd6c5634 100644
--- a/yarn-project/bot/src/rpc.ts
+++ b/yarn-project/bot/src/rpc.ts
@@ -1,6 +1,9 @@
-import { type ApiHandler, createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { TxHash } from '@aztec/circuit-types';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 
-import { BotRunnerApiSchema } from './interface.js';
 import { type BotRunner } from './runner.js';
 
 /**
@@ -9,9 +12,5 @@ import { type BotRunner } from './runner.js';
  * @returns An JSON-RPC HTTP server
  */
 export function createBotRunnerRpcServer(botRunner: BotRunner) {
-  createSafeJsonRpcServer(botRunner, BotRunnerApiSchema, botRunner.isHealthy.bind(botRunner));
-}
-
-export function getBotRunnerApiHandler(botRunner: BotRunner): ApiHandler {
-  return [botRunner, BotRunnerApiSchema, botRunner.isHealthy.bind(botRunner)];
+  return new JsonRpcServer(botRunner, { AztecAddress, EthAddress, Fr, TxHash }, {}, [], () => botRunner.isHealthy());
 }
diff --git a/yarn-project/bot/src/runner.ts b/yarn-project/bot/src/runner.ts
index dbb59212352..54b0e853b1e 100644
--- a/yarn-project/bot/src/runner.ts
+++ b/yarn-project/bot/src/runner.ts
@@ -3,9 +3,8 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
 
 import { Bot } from './bot.js';
 import { type BotConfig } from './config.js';
-import { type BotRunnerApi } from './interface.js';
 
-export class BotRunner implements BotRunnerApi {
+export class BotRunner {
   private log = createDebugLogger('aztec:bot');
   private bot?: Promise<Bot>;
   private pxe?: PXE;
@@ -113,7 +112,7 @@ export class BotRunner implements BotRunnerApi {
 
   /** Returns the current configuration for the bot. */
   public getConfig() {
-    return Promise.resolve(this.config);
+    return this.config;
   }
 
   async #createBot() {
diff --git a/yarn-project/circuit-types/package.json b/yarn-project/circuit-types/package.json
index 76e7250310e..98fa8212637 100644
--- a/yarn-project/circuit-types/package.json
+++ b/yarn-project/circuit-types/package.json
@@ -19,17 +19,15 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && yarn generate && tsc -b",
+    "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
-    "clean": "rm -rf ./dest .tsbuildinfo ./src/test/artifacts",
+    "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": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests",
-    "generate": "./scripts/copy-test-artifacts.sh && run -T prettier -w ./src/test/artifacts --loglevel warn"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests"
   },
   "inherits": [
-    "../package.common.json",
-    "./package.local.json"
+    "../package.common.json"
   ],
   "jest": {
     "moduleNameMapper": {
@@ -82,12 +80,10 @@
     "@types/jest": "^29.5.0",
     "@types/lodash.clonedeep": "^4.5.7",
     "@types/lodash.isequal": "^4.5.6",
-    "@types/lodash.omit": "^4.5.9",
     "@types/lodash.times": "^4.3.7",
     "@types/node": "^18.7.23",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",
-    "lodash.omit": "^4.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4",
     "viem": "^2.7.15"
diff --git a/yarn-project/circuit-types/package.local.json b/yarn-project/circuit-types/package.local.json
deleted file mode 100644
index 993479281b6..00000000000
--- a/yarn-project/circuit-types/package.local.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "scripts": {
-    "build": "yarn clean && yarn generate && tsc -b",
-    "generate": "./scripts/copy-test-artifacts.sh && run -T prettier -w ./src/test/artifacts --loglevel warn",
-    "clean": "rm -rf ./dest .tsbuildinfo ./src/test/artifacts"
-  },
-  "files": [
-    "dest",
-    "src",
-    "!*.test.*"
-  ]
-}
\ No newline at end of file
diff --git a/yarn-project/circuit-types/scripts/copy-test-artifacts.sh b/yarn-project/circuit-types/scripts/copy-test-artifacts.sh
deleted file mode 100755
index 7aacef4fd67..00000000000
--- a/yarn-project/circuit-types/scripts/copy-test-artifacts.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Check for .json files existence
-if ! ls ../../noir-projects/noir-contracts/target/*.json >/dev/null 2>&1; then
-  echo "Error: No .json files found in noir-contracts/target folder."
-  echo "Make sure noir-contracts is built before running this script."
-  exit 1
-fi
-
-# Ensure outdir exists
-mkdir -p ./src/test/artifacts
-
-# Copy the token contract for testing
-cp ../../noir-projects/noir-contracts/target/token_contract-Token.json ./src/test/artifacts/
-echo "Copied token_contract-Token.json to ./src/test/artifacts/"
\ No newline at end of file
diff --git a/yarn-project/circuit-types/src/auth_witness.ts b/yarn-project/circuit-types/src/auth_witness.ts
index f661817edbd..59c575ac31f 100644
--- a/yarn-project/circuit-types/src/auth_witness.ts
+++ b/yarn-project/circuit-types/src/auth_witness.ts
@@ -1,6 +1,5 @@
 import { Vector } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 /**
@@ -19,14 +18,6 @@ export class AuthWitness {
     this.witness = witness.map(x => new Fr(x));
   }
 
-  static get schema() {
-    return hexSchemaFor(AuthWitness);
-  }
-
-  toJSON() {
-    return this.toString();
-  }
-
   toBuffer() {
     return serializeToBuffer(this.requestHash, new Vector(this.witness));
   }
@@ -44,8 +35,4 @@ export class AuthWitness {
     const hex = str.replace(/^0x/, '');
     return AuthWitness.fromBuffer(Buffer.from(hex, 'hex'));
   }
-
-  static random() {
-    return new AuthWitness(Fr.random(), [Fr.random(), Fr.random(), Fr.random()]);
-  }
 }
diff --git a/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts b/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts
new file mode 100644
index 00000000000..aa7b604cfe7
--- /dev/null
+++ b/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts
@@ -0,0 +1,64 @@
+import { FunctionSelector, Header, PublicKeys } from '@aztec/circuits.js';
+import { EventSelector, NoteSelector } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { createJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
+
+import { type AztecNode } from '../../interfaces/aztec-node.js';
+import { NullifierMembershipWitness } from '../../interfaces/nullifier_tree.js';
+import { L2Block } from '../../l2_block.js';
+import {
+  EncryptedNoteL2BlockL2Logs,
+  ExtendedUnencryptedL2Log,
+  LogId,
+  UnencryptedL2BlockL2Logs,
+} from '../../logs/index.js';
+import { EpochProofQuote } from '../../prover_coordination/epoch_proof_quote.js';
+import { PublicDataWitness } from '../../public_data_witness.js';
+import { SiblingPath } from '../../sibling_path/index.js';
+import { PublicSimulationOutput, Tx, TxHash, TxReceipt } from '../../tx/index.js';
+import { TxEffect } from '../../tx_effect.js';
+
+/**
+ * Creates a JSON-RPC client to remotely talk to an Aztec Node.
+ * @param url - The URL of the Aztec Node.
+ * @param fetch - The fetch implementation to use.
+ * @returns A JSON-RPC client of Aztec Node.
+ */
+export function createAztecNodeClient(url: string, fetch = defaultFetch): AztecNode {
+  return createJsonRpcClient<AztecNode>(
+    url,
+    {
+      AztecAddress,
+      Buffer32,
+      EthAddress,
+      EventSelector,
+      ExtendedUnencryptedL2Log,
+      Fr,
+      FunctionSelector,
+      Header,
+      L2Block,
+      LogId,
+      PublicDataWitness,
+      PublicKeys,
+      SiblingPath,
+      TxEffect,
+      TxHash,
+    },
+    {
+      EncryptedNoteL2BlockL2Logs,
+      NoteSelector,
+      NullifierMembershipWitness,
+      PublicSimulationOutput,
+      Tx,
+      TxReceipt,
+      UnencryptedL2BlockL2Logs,
+      EpochProofQuote,
+    },
+    false,
+    'node',
+    fetch,
+  ) as AztecNode;
+}
diff --git a/yarn-project/circuit-types/src/aztec_node/rpc/index.ts b/yarn-project/circuit-types/src/aztec_node/rpc/index.ts
new file mode 100644
index 00000000000..9b73b528764
--- /dev/null
+++ b/yarn-project/circuit-types/src/aztec_node/rpc/index.ts
@@ -0,0 +1 @@
+export * from './aztec_node_client.js';
diff --git a/yarn-project/circuit-types/src/body.ts b/yarn-project/circuit-types/src/body.ts
index fef5d421bd7..dcc41c060b6 100644
--- a/yarn-project/circuit-types/src/body.ts
+++ b/yarn-project/circuit-types/src/body.ts
@@ -8,7 +8,6 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { computeUnbalancedMerkleRoot } from '@aztec/foundation/trees';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 export class Body {
   constructor(public txEffects: TxEffect[]) {
@@ -19,18 +18,6 @@ export class Body {
     });
   }
 
-  static get schema() {
-    return z
-      .object({
-        txEffects: z.array(TxEffect.schema),
-      })
-      .transform(({ txEffects }) => new Body(txEffects));
-  }
-
-  toJSON() {
-    return { txEffects: this.txEffects };
-  }
-
   /**
    * Serializes a block body
    * @returns A serialized L2 block body.
diff --git a/yarn-project/circuit-types/src/index.ts b/yarn-project/circuit-types/src/index.ts
index 86eade75e74..ce3892157ac 100644
--- a/yarn-project/circuit-types/src/index.ts
+++ b/yarn-project/circuit-types/src/index.ts
@@ -1,5 +1,6 @@
 export { CompleteAddress, GrumpkinScalar, type PartialAddress, type PublicKey } from '@aztec/circuits.js';
 export * from './auth_witness.js';
+export * from './aztec_node/rpc/index.js';
 export * from './body.js';
 export * from './function_call.js';
 export * from './global_variable_builder.js';
diff --git a/yarn-project/circuit-types/src/interfaces/archiver.test.ts b/yarn-project/circuit-types/src/interfaces/archiver.test.ts
deleted file mode 100644
index b0c8c4ab2b6..00000000000
--- a/yarn-project/circuit-types/src/interfaces/archiver.test.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-import {
-  AztecAddress,
-  type ContractClassPublic,
-  type ContractInstanceWithAddress,
-  EthAddress,
-  Fr,
-  FunctionSelector,
-  Header,
-  type PublicFunction,
-  PublicKeys,
-  getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
-import { fileURLToPath } from '@aztec/foundation/url';
-import { loadContractArtifact } from '@aztec/types/abi';
-
-import { deepStrictEqual } from 'assert';
-import { readFileSync } from 'fs';
-import omit from 'lodash.omit';
-import { resolve } from 'path';
-
-import { L2Block } from '../l2_block.js';
-import { type L2Tips } from '../l2_block_source.js';
-import { ExtendedUnencryptedL2Log } from '../logs/extended_unencrypted_l2_log.js';
-import { type GetUnencryptedLogsResponse, TxScopedEncryptedL2NoteLog } from '../logs/get_logs_response.js';
-import {
-  EncryptedL2BlockL2Logs,
-  EncryptedNoteL2BlockL2Logs,
-  type L2BlockL2Logs,
-  UnencryptedL2BlockL2Logs,
-} from '../logs/l2_block_l2_logs.js';
-import { type LogFilter } from '../logs/log_filter.js';
-import { type FromLogType, LogType } from '../logs/log_type.js';
-import { TxHash } from '../tx/tx_hash.js';
-import { TxReceipt } from '../tx/tx_receipt.js';
-import { TxEffect } from '../tx_effect.js';
-import { type ArchiverApi, ArchiverApiSchema } from './archiver.js';
-
-describe('ArchiverApiSchema', () => {
-  let handler: MockArchiver;
-  let context: JsonRpcTestContext<ArchiverApi>;
-  let artifact: ContractArtifact;
-
-  const tested: Set<string> = new Set();
-
-  beforeAll(() => {
-    const path = resolve(fileURLToPath(import.meta.url), '../../test/artifacts/token_contract-Token.json');
-    artifact = loadContractArtifact(JSON.parse(readFileSync(path, 'utf-8')));
-  });
-
-  beforeEach(async () => {
-    handler = new MockArchiver(artifact);
-    context = await createJsonRpcTestSetup<ArchiverApi>(handler, ArchiverApiSchema);
-  });
-
-  afterEach(() => {
-    tested.add(/^ArchiverApiSchema\s+([^(]+)/.exec(expect.getState().currentTestName!)![1]);
-    context.httpServer.close();
-  });
-
-  afterAll(() => {
-    const all = Object.keys(ArchiverApiSchema);
-    expect([...tested].sort()).toEqual(all.sort());
-  });
-
-  it('getRollupAddress', async () => {
-    const result = await context.client.getRollupAddress();
-    expect(result).toBeInstanceOf(EthAddress);
-  });
-
-  it('getRegistryAddress', async () => {
-    const result = await context.client.getRegistryAddress();
-    expect(result).toBeInstanceOf(EthAddress);
-  });
-
-  it('getBlockNumber', async () => {
-    const result = await context.client.getBlockNumber();
-    expect(result).toBe(1);
-  });
-
-  it('getProvenBlockNumber', async () => {
-    const result = await context.client.getProvenBlockNumber();
-    expect(result).toBe(1);
-  });
-
-  it('getProvenL2EpochNumber', async () => {
-    const result = await context.client.getProvenL2EpochNumber();
-    expect(result).toBe(1);
-  });
-
-  it('getBlock', async () => {
-    const result = await context.client.getBlock(1);
-    expect(result).toBeInstanceOf(L2Block);
-  });
-
-  it('getBlockHeader', async () => {
-    const result = await context.client.getBlockHeader(1);
-    expect(result).toBeInstanceOf(Header);
-  });
-
-  it('getBlocks', async () => {
-    const result = await context.client.getBlocks(1, 1);
-    expect(result).toEqual([expect.any(L2Block)]);
-  });
-
-  it('getTxEffect', async () => {
-    const result = await context.client.getTxEffect(new TxHash(Buffer.alloc(32, 1)));
-    expect(result).toBeInstanceOf(TxEffect);
-  });
-
-  it('getSettledTxReceipt', async () => {
-    const result = await context.client.getSettledTxReceipt(new TxHash(Buffer.alloc(32, 1)));
-    expect(result).toBeInstanceOf(TxReceipt);
-  });
-
-  it('getL2SlotNumber', async () => {
-    const result = await context.client.getL2SlotNumber();
-    expect(result).toBe(1n);
-  });
-
-  it('getL2EpochNumber', async () => {
-    const result = await context.client.getL2EpochNumber();
-    expect(result).toBe(1n);
-  });
-
-  it('getBlocksForEpoch', async () => {
-    const result = await context.client.getBlocksForEpoch(1n);
-    expect(result).toEqual([expect.any(L2Block)]);
-  });
-
-  it('isEpochComplete', async () => {
-    const result = await context.client.isEpochComplete(1n);
-    expect(result).toBe(true);
-  });
-
-  it('getL2Tips', async () => {
-    const result = await context.client.getL2Tips();
-    expect(result).toEqual({
-      latest: { number: 1, hash: `0x01` },
-      proven: { number: 1, hash: `0x01` },
-      finalized: { number: 1, hash: `0x01` },
-    });
-  });
-
-  it('getLogs(Encrypted)', async () => {
-    const result = await context.client.getLogs(1, 1, LogType.ENCRYPTED);
-    expect(result).toEqual([expect.any(EncryptedL2BlockL2Logs)]);
-  });
-
-  it('getLogs(NoteEncrypted)', async () => {
-    const result = await context.client.getLogs(1, 1, LogType.NOTEENCRYPTED);
-    expect(result).toEqual([expect.any(EncryptedNoteL2BlockL2Logs)]);
-  });
-
-  it('getLogs(Unencrypted)', async () => {
-    const result = await context.client.getLogs(1, 1, LogType.UNENCRYPTED);
-    expect(result).toEqual([expect.any(UnencryptedL2BlockL2Logs)]);
-  });
-
-  it('getLogsByTags', async () => {
-    const result = await context.client.getLogsByTags([Fr.random()]);
-    expect(result).toEqual([[expect.any(TxScopedEncryptedL2NoteLog)]]);
-  });
-
-  it('getUnencryptedLogs', async () => {
-    const result = await context.client.getUnencryptedLogs({
-      txHash: TxHash.random(),
-      contractAddress: AztecAddress.random(),
-    });
-    expect(result).toEqual({ logs: [expect.any(ExtendedUnencryptedL2Log)], maxLogsHit: true });
-  });
-
-  it('getPublicFunction', async () => {
-    const selector = FunctionSelector.random();
-    const result = await context.client.getPublicFunction(AztecAddress.random(), selector);
-    expect(result).toEqual({ selector, bytecode: Buffer.alloc(10, 10) });
-  });
-
-  it('getContractClass', async () => {
-    const contractClass = getContractClassFromArtifact(artifact);
-    const result = await context.client.getContractClass(Fr.random());
-    expect(result).toEqual({
-      ...omit(contractClass, 'publicBytecodeCommitment'),
-      unconstrainedFunctions: [],
-      privateFunctions: [],
-    });
-  });
-
-  it('getContractClassIds', async () => {
-    const result = await context.client.getContractClassIds();
-    expect(result).toEqual([expect.any(Fr)]);
-  });
-
-  it('getL1ToL2Messages', async () => {
-    const result = await context.client.getL1ToL2Messages(1n);
-    expect(result).toEqual([expect.any(Fr)]);
-  });
-
-  it('getL1ToL2MessageIndex', async () => {
-    const result = await context.client.getL1ToL2MessageIndex(Fr.random());
-    expect(result).toBe(1n);
-  });
-
-  it('getContractArtifact', async () => {
-    const result = await context.client.getContractArtifact(AztecAddress.random());
-    deepStrictEqual(result, artifact);
-  });
-
-  it('addContractArtifact', async () => {
-    await context.client.addContractArtifact(AztecAddress.random(), artifact);
-  });
-
-  it('getContract', async () => {
-    const address = AztecAddress.random();
-    const result = await context.client.getContract(address);
-    expect(result).toEqual({
-      address,
-      contractClassId: expect.any(Fr),
-      deployer: expect.any(AztecAddress),
-      initializationHash: expect.any(Fr),
-      publicKeys: expect.any(PublicKeys),
-      salt: expect.any(Fr),
-      version: 1,
-    });
-  });
-});
-
-class MockArchiver implements ArchiverApi {
-  constructor(private artifact: ContractArtifact) {}
-
-  getRollupAddress(): Promise<EthAddress> {
-    return Promise.resolve(EthAddress.random());
-  }
-  getRegistryAddress(): Promise<EthAddress> {
-    return Promise.resolve(EthAddress.random());
-  }
-  getBlockNumber(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  getProvenBlockNumber(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  getProvenL2EpochNumber(): Promise<number | undefined> {
-    return Promise.resolve(1);
-  }
-  getBlock(number: number): Promise<L2Block | undefined> {
-    return Promise.resolve(L2Block.random(number));
-  }
-  getBlockHeader(_number: number | 'latest'): Promise<Header | undefined> {
-    return Promise.resolve(Header.empty());
-  }
-  getBlocks(from: number, _limit: number, _proven?: boolean | undefined): Promise<L2Block[]> {
-    return Promise.resolve([L2Block.random(from)]);
-  }
-  getTxEffect(_txHash: TxHash): Promise<TxEffect | undefined> {
-    expect(_txHash).toBeInstanceOf(TxHash);
-    return Promise.resolve(TxEffect.empty());
-  }
-  getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
-    expect(txHash).toBeInstanceOf(TxHash);
-    return Promise.resolve(TxReceipt.empty());
-  }
-  getL2SlotNumber(): Promise<bigint> {
-    return Promise.resolve(1n);
-  }
-  getL2EpochNumber(): Promise<bigint> {
-    return Promise.resolve(1n);
-  }
-  getBlocksForEpoch(epochNumber: bigint): Promise<L2Block[]> {
-    expect(epochNumber).toEqual(1n);
-    return Promise.resolve([L2Block.random(Number(epochNumber))]);
-  }
-  isEpochComplete(epochNumber: bigint): Promise<boolean> {
-    expect(epochNumber).toEqual(1n);
-    return Promise.resolve(true);
-  }
-  getL2Tips(): Promise<L2Tips> {
-    return Promise.resolve({
-      latest: { number: 1, hash: `0x01` },
-      proven: { number: 1, hash: `0x01` },
-      finalized: { number: 1, hash: `0x01` },
-    });
-  }
-  getLogs<TLogType extends LogType>(
-    _from: number,
-    _limit: number,
-    logType: TLogType,
-  ): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]> {
-    switch (logType) {
-      case LogType.ENCRYPTED:
-        return Promise.resolve([EncryptedL2BlockL2Logs.random(1, 1, 1)] as L2BlockL2Logs<FromLogType<TLogType>>[]);
-      case LogType.NOTEENCRYPTED:
-        return Promise.resolve([EncryptedNoteL2BlockL2Logs.random(1, 1, 1)] as L2BlockL2Logs<FromLogType<TLogType>>[]);
-      case LogType.UNENCRYPTED:
-        return Promise.resolve([UnencryptedL2BlockL2Logs.random(1, 1, 1)] as L2BlockL2Logs<FromLogType<TLogType>>[]);
-      default:
-        throw new Error(`Unexpected log type: ${logType}`);
-    }
-  }
-  getLogsByTags(tags: Fr[]): Promise<TxScopedEncryptedL2NoteLog[][]> {
-    expect(tags[0]).toBeInstanceOf(Fr);
-    return Promise.resolve([Array.from({ length: tags.length }, () => TxScopedEncryptedL2NoteLog.random())]);
-  }
-  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
-    expect(filter.txHash).toBeInstanceOf(TxHash);
-    expect(filter.contractAddress).toBeInstanceOf(AztecAddress);
-    return Promise.resolve({ logs: [ExtendedUnencryptedL2Log.random()], maxLogsHit: true });
-  }
-  getPublicFunction(address: AztecAddress, selector: FunctionSelector): Promise<PublicFunction | undefined> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    expect(selector).toBeInstanceOf(FunctionSelector);
-    return Promise.resolve({ selector, bytecode: Buffer.alloc(10, 10) });
-  }
-  getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
-    expect(id).toBeInstanceOf(Fr);
-    const contractClass = getContractClassFromArtifact(this.artifact);
-    return Promise.resolve({ ...contractClass, unconstrainedFunctions: [], privateFunctions: [] });
-  }
-  getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
-    return Promise.resolve({
-      address,
-      contractClassId: Fr.random(),
-      deployer: AztecAddress.random(),
-      initializationHash: Fr.random(),
-      publicKeys: PublicKeys.random(),
-      salt: Fr.random(),
-      version: 1,
-    });
-  }
-  getContractClassIds(): Promise<Fr[]> {
-    return Promise.resolve([Fr.random()]);
-  }
-  getContractArtifact(address: AztecAddress): Promise<ContractArtifact | undefined> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    return Promise.resolve(this.artifact);
-  }
-  addContractArtifact(address: AztecAddress, contract: ContractArtifact): Promise<void> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    // We use node's native assertion because jest's is too slow
-    deepStrictEqual(contract, this.artifact);
-    return Promise.resolve();
-  }
-  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
-    expect(blockNumber).toEqual(1n);
-    return Promise.resolve([Fr.random()]);
-  }
-  getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
-    expect(l1ToL2Message).toBeInstanceOf(Fr);
-    return Promise.resolve(1n);
-  }
-}
diff --git a/yarn-project/circuit-types/src/interfaces/archiver.ts b/yarn-project/circuit-types/src/interfaces/archiver.ts
deleted file mode 100644
index b4def4dfb2b..00000000000
--- a/yarn-project/circuit-types/src/interfaces/archiver.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  ContractClassPublicSchema,
-  type ContractDataSource,
-  ContractInstanceWithAddressSchema,
-  Header,
-  PublicFunctionSchema,
-} from '@aztec/circuits.js';
-import { ContractArtifactSchema } from '@aztec/foundation/abi';
-import { type ApiSchemaFor, optional, schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-import { L2Block } from '../l2_block.js';
-import { type L2BlockSource, L2TipsSchema } from '../l2_block_source.js';
-import { GetUnencryptedLogsResponseSchema, TxScopedEncryptedL2NoteLog } from '../logs/get_logs_response.js';
-import { L2BlockL2Logs } from '../logs/l2_block_l2_logs.js';
-import { type L2LogsSource } from '../logs/l2_logs_source.js';
-import { LogFilterSchema } from '../logs/log_filter.js';
-import { LogType } from '../logs/log_type.js';
-import { type L1ToL2MessageSource } from '../messaging/l1_to_l2_message_source.js';
-import { TxHash } from '../tx/tx_hash.js';
-import { TxReceipt } from '../tx/tx_receipt.js';
-import { TxEffect } from '../tx_effect.js';
-
-export type ArchiverApi = Omit<
-  L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource,
-  'start' | 'stop'
->;
-
-export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
-  getRollupAddress: z.function().args().returns(schemas.EthAddress),
-  getRegistryAddress: z.function().args().returns(schemas.EthAddress),
-  getBlockNumber: z.function().args().returns(schemas.Integer),
-  getProvenBlockNumber: z.function().args().returns(schemas.Integer),
-  getProvenL2EpochNumber: z.function().args().returns(schemas.Integer.optional()),
-  getBlock: z.function().args(schemas.Integer).returns(L2Block.schema.optional()),
-  getBlockHeader: z
-    .function()
-    .args(z.union([schemas.Integer, z.literal('latest')]))
-    .returns(Header.schema.optional()),
-  getBlocks: z
-    .function()
-    .args(schemas.Integer, schemas.Integer, optional(z.boolean()))
-    .returns(z.array(L2Block.schema)),
-  getTxEffect: z.function().args(TxHash.schema).returns(TxEffect.schema.optional()),
-  getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
-  getL2SlotNumber: z.function().args().returns(schemas.BigInt),
-  getL2EpochNumber: z.function().args().returns(schemas.BigInt),
-  getBlocksForEpoch: z.function().args(schemas.BigInt).returns(z.array(L2Block.schema)),
-  isEpochComplete: z.function().args(schemas.BigInt).returns(z.boolean()),
-  getL2Tips: z.function().args().returns(L2TipsSchema),
-  getLogs: z
-    .function()
-    .args(schemas.Integer, schemas.Integer, z.nativeEnum(LogType))
-    .returns(z.array(L2BlockL2Logs.schema)),
-  getLogsByTags: z
-    .function()
-    .args(z.array(schemas.Fr))
-    .returns(z.array(z.array(TxScopedEncryptedL2NoteLog.schema))),
-  getUnencryptedLogs: z.function().args(LogFilterSchema).returns(GetUnencryptedLogsResponseSchema),
-  getPublicFunction: z
-    .function()
-    .args(schemas.AztecAddress, schemas.FunctionSelector)
-    .returns(PublicFunctionSchema.optional()),
-  getContractClass: z.function().args(schemas.Fr).returns(ContractClassPublicSchema.optional()),
-  getContract: z.function().args(schemas.AztecAddress).returns(ContractInstanceWithAddressSchema.optional()),
-  getContractClassIds: z.function().args().returns(z.array(schemas.Fr)),
-  getContractArtifact: z.function().args(schemas.AztecAddress).returns(ContractArtifactSchema.optional()),
-  addContractArtifact: z.function().args(schemas.AztecAddress, ContractArtifactSchema).returns(z.void()),
-  getL1ToL2Messages: z.function().args(schemas.BigInt).returns(z.array(schemas.Fr)),
-  getL1ToL2MessageIndex: z.function().args(schemas.Fr).returns(schemas.BigInt.optional()),
-};
diff --git a/yarn-project/circuit-types/src/interfaces/aztec-node.test.ts b/yarn-project/circuit-types/src/interfaces/aztec-node.test.ts
deleted file mode 100644
index 569ff2ae75f..00000000000
--- a/yarn-project/circuit-types/src/interfaces/aztec-node.test.ts
+++ /dev/null
@@ -1,526 +0,0 @@
-import {
-  ARCHIVE_HEIGHT,
-  AztecAddress,
-  type ContractClassPublic,
-  type ContractInstanceWithAddress,
-  EthAddress,
-  Fr,
-  Header,
-  L1_TO_L2_MSG_TREE_HEIGHT,
-  NOTE_HASH_TREE_HEIGHT,
-  NULLIFIER_TREE_HEIGHT,
-  PUBLIC_DATA_TREE_HEIGHT,
-  type ProtocolContractAddresses,
-  ProtocolContractsNames,
-  PublicKeys,
-  getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { type L1ContractAddresses, L1ContractsNames } from '@aztec/ethereum';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { memoize } from '@aztec/foundation/decorators';
-import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
-import { fileURLToPath } from '@aztec/foundation/url';
-import { loadContractArtifact } from '@aztec/types/abi';
-
-import { deepStrictEqual } from 'assert';
-import { readFileSync } from 'fs';
-import omit from 'lodash.omit';
-import times from 'lodash.times';
-import { resolve } from 'path';
-
-import { L2Block } from '../l2_block.js';
-import { ExtendedUnencryptedL2Log } from '../logs/extended_unencrypted_l2_log.js';
-import { type GetUnencryptedLogsResponse, TxScopedEncryptedL2NoteLog } from '../logs/get_logs_response.js';
-import {
-  EncryptedL2BlockL2Logs,
-  EncryptedNoteL2BlockL2Logs,
-  type L2BlockL2Logs,
-  UnencryptedL2BlockL2Logs,
-} from '../logs/l2_block_l2_logs.js';
-import { type LogFilter } from '../logs/log_filter.js';
-import { type FromLogType, LogType } from '../logs/log_type.js';
-import { MerkleTreeId } from '../merkle_tree_id.js';
-import { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
-import { PublicDataWitness } from '../public_data_witness.js';
-import { SiblingPath } from '../sibling_path/sibling_path.js';
-import { PublicSimulationOutput } from '../tx/public_simulation_output.js';
-import { Tx } from '../tx/tx.js';
-import { TxHash } from '../tx/tx_hash.js';
-import { TxReceipt } from '../tx/tx_receipt.js';
-import { TxEffect } from '../tx_effect.js';
-import { type AztecNode, AztecNodeApiSchema } from './aztec-node.js';
-import { type SequencerConfig } from './configs.js';
-import { NullifierMembershipWitness } from './nullifier_tree.js';
-import { type ProverConfig } from './prover-client.js';
-
-describe('AztecNodeApiSchema', () => {
-  let handler: MockAztecNode;
-  let context: JsonRpcTestContext<AztecNode>;
-  let artifact: ContractArtifact;
-
-  const tested: Set<string> = new Set();
-
-  beforeAll(() => {
-    const path = resolve(fileURLToPath(import.meta.url), '../../test/artifacts/token_contract-Token.json');
-    artifact = loadContractArtifact(JSON.parse(readFileSync(path, 'utf-8')));
-  });
-
-  beforeEach(async () => {
-    handler = new MockAztecNode(artifact);
-    context = await createJsonRpcTestSetup<AztecNode>(handler, AztecNodeApiSchema);
-  });
-
-  afterEach(() => {
-    tested.add(/^AztecNodeApiSchema\s+([^(]+)/.exec(expect.getState().currentTestName!)![1]);
-    context.httpServer.close();
-  });
-
-  afterAll(() => {
-    const all = Object.keys(AztecNodeApiSchema);
-    expect([...tested].sort()).toEqual(all.sort());
-  });
-
-  it('findLeafIndex', async () => {
-    const response = await context.client.findLeafIndex(1, MerkleTreeId.ARCHIVE, Fr.random());
-    expect(response).toBe(1n);
-  });
-
-  it('getNullifierSiblingPath', async () => {
-    const response = await context.client.getNullifierSiblingPath(1, 1n);
-    expect(response).toBeInstanceOf(SiblingPath);
-  });
-
-  it('getNoteHashSiblingPath', async () => {
-    const response = await context.client.getNoteHashSiblingPath(1, 1n);
-    expect(response).toBeInstanceOf(SiblingPath);
-  });
-
-  it('getL1ToL2MessageMembershipWitness', async () => {
-    const response = await context.client.getL1ToL2MessageMembershipWitness(1, Fr.random());
-    expect(response).toEqual([1n, expect.any(SiblingPath)]);
-  });
-
-  it('isL1ToL2MessageSynced', async () => {
-    const response = await context.client.isL1ToL2MessageSynced(Fr.random());
-    expect(response).toBe(true);
-  });
-
-  it('getL2ToL1MessageMembershipWitness', async () => {
-    const response = await context.client.getL2ToL1MessageMembershipWitness(1, Fr.random());
-    expect(response).toEqual([1n, expect.any(SiblingPath)]);
-  });
-
-  it('getArchiveSiblingPath', async () => {
-    const response = await context.client.getArchiveSiblingPath(1, 1n);
-    expect(response).toBeInstanceOf(SiblingPath);
-  });
-
-  it('getPublicDataSiblingPath', async () => {
-    const response = await context.client.getPublicDataSiblingPath(1, 1n);
-    expect(response).toBeInstanceOf(SiblingPath);
-  });
-
-  it('getNullifierMembershipWitness', async () => {
-    const response = await context.client.getNullifierMembershipWitness(1, Fr.random());
-    expect(response).toBeInstanceOf(NullifierMembershipWitness);
-  });
-
-  it('getLowNullifierMembershipWitness', async () => {
-    const response = await context.client.getLowNullifierMembershipWitness(1, Fr.random());
-    expect(response).toBeInstanceOf(NullifierMembershipWitness);
-  });
-
-  it('getPublicDataTreeWitness', async () => {
-    const response = await context.client.getPublicDataTreeWitness(1, Fr.random());
-    expect(response).toBeInstanceOf(PublicDataWitness);
-  });
-
-  it('getBlock', async () => {
-    const response = await context.client.getBlock(1);
-    expect(response).toBeInstanceOf(L2Block);
-  });
-
-  it('getBlockNumber', async () => {
-    const response = await context.client.getBlockNumber();
-    expect(response).toBe(1);
-  });
-
-  it('getProvenBlockNumber', async () => {
-    const response = await context.client.getProvenBlockNumber();
-    expect(response).toBe(1);
-  });
-
-  it('isReady', async () => {
-    const response = await context.client.isReady();
-    expect(response).toBe(true);
-  });
-
-  it('getBlocks', async () => {
-    const response = await context.client.getBlocks(1, 1);
-    expect(response).toHaveLength(1);
-    expect(response[0]).toBeInstanceOf(L2Block);
-  });
-
-  it('getNodeVersion', async () => {
-    const response = await context.client.getNodeVersion();
-    expect(response).toBe('1.0.0');
-  });
-
-  it('getVersion', async () => {
-    const response = await context.client.getVersion();
-    expect(response).toBe(1);
-  });
-
-  it('getChainId', async () => {
-    const response = await context.client.getChainId();
-    expect(response).toBe(1);
-  });
-
-  it('getL1ContractAddresses', async () => {
-    const response = await context.client.getL1ContractAddresses();
-    expect(response).toEqual(Object.fromEntries(L1ContractsNames.map(name => [name, expect.any(EthAddress)])));
-  });
-
-  it('getProtocolContractAddresses', async () => {
-    const response = await context.client.getProtocolContractAddresses();
-    expect(response).toEqual(Object.fromEntries(ProtocolContractsNames.map(name => [name, expect.any(AztecAddress)])));
-  });
-
-  it('addContractArtifact', async () => {
-    await context.client.addContractArtifact(AztecAddress.random(), artifact);
-  });
-
-  it('getLogs(Encrypted)', async () => {
-    const response = await context.client.getLogs(1, 1, LogType.ENCRYPTED);
-    expect(response).toEqual([expect.any(EncryptedL2BlockL2Logs)]);
-  });
-
-  it('getLogs(NoteEncrypted)', async () => {
-    const response = await context.client.getLogs(1, 1, LogType.NOTEENCRYPTED);
-    expect(response).toEqual([expect.any(EncryptedNoteL2BlockL2Logs)]);
-  });
-
-  it('getLogs(Unencrypted)', async () => {
-    const response = await context.client.getLogs(1, 1, LogType.UNENCRYPTED);
-    expect(response).toEqual([expect.any(UnencryptedL2BlockL2Logs)]);
-  });
-
-  it('getUnencryptedLogs', async () => {
-    const response = await context.client.getUnencryptedLogs({ contractAddress: AztecAddress.random() });
-    expect(response).toEqual({ logs: [expect.any(ExtendedUnencryptedL2Log)], maxLogsHit: true });
-  });
-
-  it('getLogsByTags', async () => {
-    const response = await context.client.getLogsByTags([Fr.random()]);
-    expect(response).toEqual([[expect.any(TxScopedEncryptedL2NoteLog)]]);
-  });
-
-  it('sendTx', async () => {
-    await context.client.sendTx(Tx.random());
-  });
-
-  it('getTxReceipt', async () => {
-    const response = await context.client.getTxReceipt(TxHash.random());
-    expect(response).toBeInstanceOf(TxReceipt);
-  });
-
-  it('getTxEffect', async () => {
-    const response = await context.client.getTxEffect(TxHash.random());
-    expect(response).toBeInstanceOf(TxEffect);
-  });
-
-  it('getPendingTxs', async () => {
-    const response = await context.client.getPendingTxs();
-    expect(response).toEqual([expect.any(Tx)]);
-  });
-
-  it('getPendingTxCount', async () => {
-    const response = await context.client.getPendingTxCount();
-    expect(response).toBe(1);
-  });
-
-  it('getTxByHash', async () => {
-    const response = await context.client.getTxByHash(TxHash.random());
-    expect(response).toBeInstanceOf(Tx);
-  });
-
-  it('getPublicStorageAt', async () => {
-    const response = await context.client.getPublicStorageAt(AztecAddress.random(), Fr.random(), 1);
-    expect(response).toBeInstanceOf(Fr);
-  });
-
-  it('getHeader', async () => {
-    const response = await context.client.getHeader();
-    expect(response).toBeInstanceOf(Header);
-  });
-
-  it('simulatePublicCalls', async () => {
-    const response = await context.client.simulatePublicCalls(Tx.random());
-    expect(response).toBeInstanceOf(PublicSimulationOutput);
-  });
-
-  it('isValidTx', async () => {
-    const response = await context.client.isValidTx(Tx.random());
-    expect(response).toBe(true);
-  });
-
-  it('setConfig', async () => {
-    await context.client.setConfig({ coinbase: EthAddress.random() });
-  });
-
-  it('getContractClass', async () => {
-    const contractClass = getContractClassFromArtifact(artifact);
-    const response = await context.client.getContractClass(Fr.random());
-    expect(response).toEqual({
-      ...omit(contractClass, 'publicBytecodeCommitment'),
-      unconstrainedFunctions: [],
-      privateFunctions: [],
-    });
-  });
-
-  it('getContract', async () => {
-    const response = await context.client.getContract(AztecAddress.random());
-    expect(response).toEqual({
-      address: expect.any(AztecAddress),
-      contractClassId: expect.any(Fr),
-      deployer: expect.any(AztecAddress),
-      initializationHash: expect.any(Fr),
-      publicKeys: expect.any(PublicKeys),
-      salt: expect.any(Fr),
-      version: 1,
-    });
-  });
-
-  it('flushTxs', async () => {
-    await context.client.flushTxs();
-  });
-
-  it('getEncodedEnr', async () => {
-    const response = await context.client.getEncodedEnr();
-    expect(response).toBe('enr:-');
-  });
-
-  it('addEpochProofQuote', async () => {
-    await context.client.addEpochProofQuote(EpochProofQuote.random());
-  });
-
-  it('getEpochProofQuotes', async () => {
-    const response = await context.client.getEpochProofQuotes(1n);
-    expect(response).toEqual([expect.any(EpochProofQuote)]);
-  });
-});
-
-class MockAztecNode implements AztecNode {
-  constructor(private artifact: ContractArtifact) {}
-
-  findLeafIndex(blockNumber: number | 'latest', treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined> {
-    expect(leafValue).toBeInstanceOf(Fr);
-    return Promise.resolve(1n);
-  }
-  getNullifierSiblingPath(
-    blockNumber: number | 'latest',
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof NULLIFIER_TREE_HEIGHT>> {
-    expect(leafIndex).toBe(1n);
-    return Promise.resolve(SiblingPath.random(NULLIFIER_TREE_HEIGHT));
-  }
-  getNoteHashSiblingPath(
-    blockNumber: number | 'latest',
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof NOTE_HASH_TREE_HEIGHT>> {
-    expect(leafIndex).toBe(1n);
-    return Promise.resolve(SiblingPath.random(NOTE_HASH_TREE_HEIGHT));
-  }
-  getL1ToL2MessageMembershipWitness(
-    blockNumber: number | 'latest',
-    l1ToL2Message: Fr,
-  ): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>] | undefined> {
-    expect(l1ToL2Message).toBeInstanceOf(Fr);
-    return Promise.resolve([1n, SiblingPath.random(L1_TO_L2_MSG_TREE_HEIGHT)]);
-  }
-  isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean> {
-    expect(l1ToL2Message).toBeInstanceOf(Fr);
-    return Promise.resolve(true);
-  }
-  getL2ToL1MessageMembershipWitness(
-    blockNumber: number | 'latest',
-    l2ToL1Message: Fr,
-  ): Promise<[bigint, SiblingPath<number>]> {
-    expect(l2ToL1Message).toBeInstanceOf(Fr);
-    return Promise.resolve([1n, SiblingPath.random(4) as SiblingPath<number>]);
-  }
-  getArchiveSiblingPath(
-    blockNumber: number | 'latest',
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof ARCHIVE_HEIGHT>> {
-    expect(leafIndex).toBe(1n);
-    return Promise.resolve(SiblingPath.random(ARCHIVE_HEIGHT));
-  }
-  getPublicDataSiblingPath(
-    blockNumber: number | 'latest',
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>> {
-    expect(leafIndex).toBe(1n);
-    return Promise.resolve(SiblingPath.random(PUBLIC_DATA_TREE_HEIGHT));
-  }
-  getNullifierMembershipWitness(
-    blockNumber: number | 'latest',
-    nullifier: Fr,
-  ): Promise<NullifierMembershipWitness | undefined> {
-    expect(nullifier).toBeInstanceOf(Fr);
-    return Promise.resolve(NullifierMembershipWitness.random());
-  }
-  getLowNullifierMembershipWitness(
-    blockNumber: number | 'latest',
-    nullifier: Fr,
-  ): Promise<NullifierMembershipWitness | undefined> {
-    expect(nullifier).toBeInstanceOf(Fr);
-    return Promise.resolve(NullifierMembershipWitness.random());
-  }
-  getPublicDataTreeWitness(blockNumber: number | 'latest', leafSlot: Fr): Promise<PublicDataWitness | undefined> {
-    expect(leafSlot).toBeInstanceOf(Fr);
-    return Promise.resolve(PublicDataWitness.random());
-  }
-  getBlock(number: number): Promise<L2Block | undefined> {
-    return Promise.resolve(L2Block.random(number));
-  }
-  getBlockNumber(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  getProvenBlockNumber(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  isReady(): Promise<boolean> {
-    return Promise.resolve(true);
-  }
-  getBlocks(from: number, limit: number): Promise<L2Block[]> {
-    return Promise.resolve(times(limit, i => L2Block.random(from + i)));
-  }
-  getNodeVersion(): Promise<string> {
-    return Promise.resolve('1.0.0');
-  }
-  getVersion(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  getChainId(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  @memoize
-  getL1ContractAddresses(): Promise<L1ContractAddresses> {
-    return Promise.resolve(
-      Object.fromEntries(L1ContractsNames.map(name => [name, EthAddress.random()])) as L1ContractAddresses,
-    );
-  }
-  @memoize
-  getProtocolContractAddresses(): Promise<ProtocolContractAddresses> {
-    return Promise.resolve(
-      Object.fromEntries(
-        ProtocolContractsNames.map(name => [name, AztecAddress.random()]),
-      ) as ProtocolContractAddresses,
-    );
-  }
-  addContractArtifact(address: AztecAddress, artifact: ContractArtifact): Promise<void> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    deepStrictEqual(artifact, this.artifact);
-    return Promise.resolve();
-  }
-  getLogs<TLogType extends LogType>(
-    _from: number,
-    _limit: number,
-    logType: TLogType,
-  ): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]> {
-    switch (logType) {
-      case LogType.ENCRYPTED:
-        return Promise.resolve([EncryptedL2BlockL2Logs.random(1, 1, 1)] as L2BlockL2Logs<FromLogType<TLogType>>[]);
-      case LogType.NOTEENCRYPTED:
-        return Promise.resolve([EncryptedNoteL2BlockL2Logs.random(1, 1, 1)] as L2BlockL2Logs<FromLogType<TLogType>>[]);
-      case LogType.UNENCRYPTED:
-        return Promise.resolve([UnencryptedL2BlockL2Logs.random(1, 1, 1)] as L2BlockL2Logs<FromLogType<TLogType>>[]);
-      default:
-        throw new Error(`Unexpected log type: ${logType}`);
-    }
-  }
-  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
-    expect(filter.contractAddress).toBeInstanceOf(AztecAddress);
-    return Promise.resolve({ logs: [ExtendedUnencryptedL2Log.random()], maxLogsHit: true });
-  }
-  getLogsByTags(tags: Fr[]): Promise<TxScopedEncryptedL2NoteLog[][]> {
-    expect(tags).toHaveLength(1);
-    expect(tags[0]).toBeInstanceOf(Fr);
-    return Promise.resolve([[TxScopedEncryptedL2NoteLog.random()]]);
-  }
-  sendTx(tx: Tx): Promise<void> {
-    expect(tx).toBeInstanceOf(Tx);
-    return Promise.resolve();
-  }
-  getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
-    expect(txHash).toBeInstanceOf(TxHash);
-    return Promise.resolve(TxReceipt.empty());
-  }
-  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
-    expect(txHash).toBeInstanceOf(TxHash);
-    return Promise.resolve(TxEffect.random());
-  }
-  getPendingTxs(): Promise<Tx[]> {
-    return Promise.resolve([Tx.random()]);
-  }
-  getPendingTxCount(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  getTxByHash(txHash: TxHash): Promise<Tx | undefined> {
-    expect(txHash).toBeInstanceOf(TxHash);
-    return Promise.resolve(Tx.random());
-  }
-  getPublicStorageAt(contract: AztecAddress, slot: Fr, _blockNumber: number | 'latest'): Promise<Fr> {
-    expect(contract).toBeInstanceOf(AztecAddress);
-    expect(slot).toBeInstanceOf(Fr);
-    return Promise.resolve(Fr.random());
-  }
-  getHeader(_blockNumber?: number | 'latest' | undefined): Promise<Header> {
-    return Promise.resolve(Header.empty());
-  }
-  simulatePublicCalls(tx: Tx): Promise<PublicSimulationOutput> {
-    expect(tx).toBeInstanceOf(Tx);
-    return Promise.resolve(PublicSimulationOutput.random());
-  }
-  isValidTx(tx: Tx, _isSimulation?: boolean | undefined): Promise<boolean> {
-    expect(tx).toBeInstanceOf(Tx);
-    return Promise.resolve(true);
-  }
-  setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void> {
-    expect(config.coinbase).toBeInstanceOf(EthAddress);
-    return Promise.resolve();
-  }
-  getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
-    expect(id).toBeInstanceOf(Fr);
-    const contractClass = getContractClassFromArtifact(this.artifact);
-    return Promise.resolve({ ...contractClass, unconstrainedFunctions: [], privateFunctions: [] });
-  }
-  getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    const instance = {
-      version: 1 as const,
-      contractClassId: Fr.random(),
-      deployer: AztecAddress.random(),
-      initializationHash: Fr.random(),
-      publicKeys: PublicKeys.random(),
-      salt: Fr.random(),
-      address: AztecAddress.random(),
-    };
-    return Promise.resolve(instance);
-  }
-  flushTxs(): Promise<void> {
-    return Promise.resolve();
-  }
-  getEncodedEnr(): Promise<string | undefined> {
-    return Promise.resolve('enr:-');
-  }
-  addEpochProofQuote(quote: EpochProofQuote): Promise<void> {
-    expect(quote).toBeInstanceOf(EpochProofQuote);
-    return Promise.resolve();
-  }
-  getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]> {
-    expect(epoch).toEqual(1n);
-    return Promise.resolve([EpochProofQuote.random()]);
-  }
-}
diff --git a/yarn-project/circuit-types/src/interfaces/aztec-node.ts b/yarn-project/circuit-types/src/interfaces/aztec-node.ts
index 26c1ad73183..e2d2ac343bc 100644
--- a/yarn-project/circuit-types/src/interfaces/aztec-node.ts
+++ b/yarn-project/circuit-types/src/interfaces/aztec-node.ts
@@ -1,48 +1,39 @@
-import {
+import type {
   ARCHIVE_HEIGHT,
-  type ContractClassPublic,
-  ContractClassPublicSchema,
-  type ContractInstanceWithAddress,
-  ContractInstanceWithAddressSchema,
+  ContractClassPublic,
+  ContractInstanceWithAddress,
   Header,
   L1_TO_L2_MSG_TREE_HEIGHT,
   NOTE_HASH_TREE_HEIGHT,
   NULLIFIER_TREE_HEIGHT,
   PUBLIC_DATA_TREE_HEIGHT,
-  type ProtocolContractAddresses,
-  ProtocolContractAddressesSchema,
+  ProtocolContractAddresses,
 } from '@aztec/circuits.js';
-import { type L1ContractAddresses, L1ContractAddressesSchema } from '@aztec/ethereum';
-import { type ContractArtifact, ContractArtifactSchema } from '@aztec/foundation/abi';
+import type { L1ContractAddresses } from '@aztec/ethereum';
+import type { ContractArtifact } from '@aztec/foundation/abi';
 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';
-
-import { L2Block } from '../l2_block.js';
-import {
-  type FromLogType,
-  type GetUnencryptedLogsResponse,
-  GetUnencryptedLogsResponseSchema,
+import type { L2Block } from '../l2_block.js';
+import type {
+  FromLogType,
+  GetUnencryptedLogsResponse,
   L2BlockL2Logs,
-  type LogFilter,
-  LogFilterSchema,
+  LogFilter,
   LogType,
   TxScopedEncryptedL2NoteLog,
 } from '../logs/index.js';
-import { MerkleTreeId } from '../merkle_tree_id.js';
-import { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
-import { PublicDataWitness } from '../public_data_witness.js';
-import { SiblingPath } from '../sibling_path/index.js';
-import { PublicSimulationOutput, Tx, TxHash, TxReceipt } from '../tx/index.js';
-import { TxEffect } from '../tx_effect.js';
-import { type SequencerConfig, SequencerConfigSchema } from './configs.js';
-import { type L2BlockNumber, L2BlockNumberSchema } from './l2_block_number.js';
-import { NullifierMembershipWitness } from './nullifier_tree.js';
-import { type ProverConfig, ProverConfigSchema } from './prover-client.js';
-import { type ProverCoordination, ProverCoordinationApiSchema } from './prover-coordination.js';
+import type { MerkleTreeId } from '../merkle_tree_id.js';
+import type { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
+import type { PublicDataWitness } from '../public_data_witness.js';
+import type { SiblingPath } from '../sibling_path/index.js';
+import type { PublicSimulationOutput, Tx, TxHash, TxReceipt } from '../tx/index.js';
+import type { TxEffect } from '../tx_effect.js';
+import type { SequencerConfig } from './configs.js';
+import type { L2BlockNumber } from './l2_block_number.js';
+import type { NullifierMembershipWitness } from './nullifier_tree.js';
+import type { ProverConfig } from './prover-client.js';
+import { type ProverCoordination } from './prover-coordination.js';
 
 /**
  * The aztec node.
@@ -94,9 +85,13 @@ export interface AztecNode extends ProverCoordination {
   /**
    * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
    * @param l1ToL2Message - The L1 to L2 message to check.
+   * @param startL2BlockNumber - The block number after which we are interested in checking if the message was
+   * included.
+   * @remarks We pass in the minL2BlockNumber because there can be duplicate messages and the block number allow us
+   * to skip the duplicates (we know after which block a given message is to be included).
    * @returns Whether the message is synced and ready to be included in a block.
    */
-  isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean>;
+  isL1ToL2MessageSynced(l1ToL2Message: Fr, startL2BlockNumber: number): Promise<boolean>;
 
   /**
    * Returns a membership witness of an l2ToL1Message in an ephemeral l2 to l1 message tree.
@@ -381,128 +376,3 @@ export interface AztecNode extends ProverCoordination {
    */
   getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]>;
 }
-
-export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
-  ...ProverCoordinationApiSchema,
-
-  findLeafIndex: z
-    .function()
-    .args(L2BlockNumberSchema, z.nativeEnum(MerkleTreeId), schemas.Fr)
-    .returns(schemas.BigInt.optional()),
-
-  getNullifierSiblingPath: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.BigInt)
-    .returns(SiblingPath.schemaFor(NULLIFIER_TREE_HEIGHT)),
-
-  getNoteHashSiblingPath: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.BigInt)
-    .returns(SiblingPath.schemaFor(NOTE_HASH_TREE_HEIGHT)),
-
-  getL1ToL2MessageMembershipWitness: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.Fr)
-    .returns(z.tuple([schemas.BigInt, SiblingPath.schemaFor(L1_TO_L2_MSG_TREE_HEIGHT)]).optional()),
-
-  isL1ToL2MessageSynced: z.function().args(schemas.Fr).returns(z.boolean()),
-
-  getL2ToL1MessageMembershipWitness: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.Fr)
-    .returns(z.tuple([schemas.BigInt, SiblingPath.schema])),
-
-  getArchiveSiblingPath: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.BigInt)
-    .returns(SiblingPath.schemaFor(ARCHIVE_HEIGHT)),
-
-  getPublicDataSiblingPath: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.BigInt)
-    .returns(SiblingPath.schemaFor(PUBLIC_DATA_TREE_HEIGHT)),
-
-  getNullifierMembershipWitness: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.Fr)
-    .returns(NullifierMembershipWitness.schema.optional()),
-
-  getLowNullifierMembershipWitness: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.Fr)
-    .returns(NullifierMembershipWitness.schema.optional()),
-
-  getPublicDataTreeWitness: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.Fr)
-    .returns(PublicDataWitness.schema.optional()),
-
-  getBlock: z.function().args(z.number()).returns(L2Block.schema.optional()),
-
-  getBlockNumber: z.function().returns(z.number()),
-
-  getProvenBlockNumber: z.function().returns(z.number()),
-
-  isReady: z.function().returns(z.boolean()),
-
-  getBlocks: z.function().args(z.number(), z.number()).returns(z.array(L2Block.schema)),
-
-  getNodeVersion: z.function().returns(z.string()),
-
-  getVersion: z.function().returns(z.number()),
-
-  getChainId: z.function().returns(z.number()),
-
-  getL1ContractAddresses: z.function().returns(L1ContractAddressesSchema),
-
-  getProtocolContractAddresses: z.function().returns(ProtocolContractAddressesSchema),
-
-  addContractArtifact: z.function().args(schemas.AztecAddress, ContractArtifactSchema).returns(z.void()),
-
-  getLogs: z.function().args(z.number(), z.number(), z.nativeEnum(LogType)).returns(z.array(L2BlockL2Logs.schema)),
-
-  getUnencryptedLogs: z.function().args(LogFilterSchema).returns(GetUnencryptedLogsResponseSchema),
-
-  getLogsByTags: z
-    .function()
-    .args(z.array(schemas.Fr))
-    .returns(z.array(z.array(TxScopedEncryptedL2NoteLog.schema))),
-
-  sendTx: z.function().args(Tx.schema).returns(z.void()),
-
-  getTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema),
-
-  getTxEffect: z.function().args(TxHash.schema).returns(TxEffect.schema.optional()),
-
-  getPendingTxs: z.function().returns(z.array(Tx.schema)),
-
-  getPendingTxCount: z.function().returns(z.number()),
-
-  getTxByHash: z.function().args(TxHash.schema).returns(Tx.schema.optional()),
-
-  getPublicStorageAt: z.function().args(schemas.AztecAddress, schemas.Fr, L2BlockNumberSchema).returns(schemas.Fr),
-
-  getHeader: z.function().args(optional(L2BlockNumberSchema)).returns(Header.schema),
-
-  simulatePublicCalls: z.function().args(Tx.schema).returns(PublicSimulationOutput.schema),
-
-  isValidTx: z.function().args(Tx.schema, optional(z.boolean())).returns(z.boolean()),
-
-  setConfig: z.function().args(SequencerConfigSchema.merge(ProverConfigSchema).partial()).returns(z.void()),
-
-  getContractClass: z.function().args(schemas.Fr).returns(ContractClassPublicSchema.optional()),
-
-  getContract: z.function().args(schemas.AztecAddress).returns(ContractInstanceWithAddressSchema.optional()),
-
-  flushTxs: z.function().returns(z.void()),
-
-  getEncodedEnr: z.function().returns(z.string().optional()),
-
-  addEpochProofQuote: z.function().args(EpochProofQuote.schema).returns(z.void()),
-
-  getEpochProofQuotes: z.function().args(schemas.BigInt).returns(z.array(EpochProofQuote.schema)),
-};
-
-export function createAztecNodeClient(url: string, fetch = defaultFetch): AztecNode {
-  return createSafeJsonRpcClient<AztecNode>(url, AztecNodeApiSchema, false, 'node', fetch);
-}
diff --git a/yarn-project/circuit-types/src/interfaces/configs.ts b/yarn-project/circuit-types/src/interfaces/configs.ts
index 1c8398033f6..45e6a37ca7c 100644
--- a/yarn-project/circuit-types/src/interfaces/configs.ts
+++ b/yarn-project/circuit-types/src/interfaces/configs.ts
@@ -1,7 +1,4 @@
 import { type AztecAddress, type EthAddress, type Fr, type FunctionSelector } from '@aztec/circuits.js';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 type AllowedInstance = { address: AztecAddress };
 type AllowedInstanceFunction = { address: AztecAddress; selector: FunctionSelector };
@@ -45,27 +42,3 @@ export interface SequencerConfig {
   /** Whether to enforce the time table when building blocks */
   enforceTimeTable?: boolean;
 }
-
-const AllowedElementSchema = z.union([
-  z.object({ address: schemas.AztecAddress, selector: schemas.FunctionSelector }),
-  z.object({ address: schemas.AztecAddress }),
-  z.object({ classId: schemas.Fr, selector: schemas.FunctionSelector }),
-  z.object({ classId: schemas.Fr }),
-]) satisfies ZodFor<AllowedElement>;
-
-export const SequencerConfigSchema = z.object({
-  transactionPollingIntervalMS: z.number().optional(),
-  maxTxsPerBlock: z.number().optional(),
-  minTxsPerBlock: z.number().optional(),
-  minSecondsBetweenBlocks: z.number().optional(),
-  maxSecondsBetweenBlocks: z.number().optional(),
-  coinbase: schemas.EthAddress.optional(),
-  feeRecipient: schemas.AztecAddress.optional(),
-  acvmWorkingDirectory: z.string().optional(),
-  acvmBinaryPath: z.string().optional(),
-  allowedInSetup: z.array(AllowedElementSchema),
-  allowedInTeardown: z.array(AllowedElementSchema),
-  maxBlockSizeInBytes: z.number().optional(),
-  enforceFees: z.boolean().optional(),
-  gerousiaPayload: schemas.EthAddress.optional(),
-}) satisfies ZodFor<SequencerConfig>;
diff --git a/yarn-project/circuit-types/src/interfaces/index.ts b/yarn-project/circuit-types/src/interfaces/index.ts
index c5980197894..06cc98c672e 100644
--- a/yarn-project/circuit-types/src/interfaces/index.ts
+++ b/yarn-project/circuit-types/src/interfaces/index.ts
@@ -1,22 +1,18 @@
-export * from '../private_execution_result.js';
-export * from './archiver.js';
 export * from './aztec-node.js';
+export * from '../private_execution_result.js';
+export * from './l2_block_number.js';
+export * from './pxe.js';
 export * from './block-builder.js';
 export * from './configs.js';
 export * from './epoch-prover.js';
-export * from './l2_block_number.js';
 export * from './merkle_tree_operations.js';
 export * from './nullifier_tree.js';
 export * from './private_kernel_prover.js';
 export * from './processed-tx-handler.js';
-export * from './prover-agent.js';
 export * from './prover-client.js';
 export * from './prover-coordination.js';
-export * from './prover-node.js';
-export * from './proving-job-source.js';
 export * from './proving-job.js';
-export * from './pxe.js';
 export * from './server_circuit_prover.js';
-export * from './service.js';
 export * from './sync-status.js';
 export * from './world_state.js';
+export * from './prover-node.js';
diff --git a/yarn-project/circuit-types/src/interfaces/l2_block_number.ts b/yarn-project/circuit-types/src/interfaces/l2_block_number.ts
index 098c0c7d244..f6aba5eec1a 100644
--- a/yarn-project/circuit-types/src/interfaces/l2_block_number.ts
+++ b/yarn-project/circuit-types/src/interfaces/l2_block_number.ts
@@ -1,8 +1,2 @@
-import { schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-export const L2BlockNumberSchema = z.union([schemas.Integer, z.literal('latest')]);
-
 /** Helper type for a specific L2 block number or the latest block number */
-export type L2BlockNumber = z.infer<typeof L2BlockNumberSchema>;
+export type L2BlockNumber = number | 'latest';
diff --git a/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts b/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts
index bfc6097ab09..5e1dfe80a83 100644
--- a/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts
+++ b/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts
@@ -1,7 +1,4 @@
-import { Fr, NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage } from '@aztec/circuits.js';
-import { schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
+import { Fr, type NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage } from '@aztec/circuits.js';
 
 import { SiblingPath } from '../sibling_path/index.js';
 
@@ -27,26 +24,6 @@ export class NullifierMembershipWitness {
     public readonly siblingPath: SiblingPath<typeof NULLIFIER_TREE_HEIGHT>,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        index: schemas.BigInt,
-        leafPreimage: NullifierLeafPreimage.schema,
-        siblingPath: SiblingPath.schemaFor(NULLIFIER_TREE_HEIGHT),
-      })
-      .transform(
-        ({ index, leafPreimage, siblingPath }) => new NullifierMembershipWitness(index, leafPreimage, siblingPath),
-      );
-  }
-
-  static random() {
-    return new NullifierMembershipWitness(
-      BigInt(Math.floor(Math.random() * 1000)),
-      NullifierLeafPreimage.random(),
-      SiblingPath.random(NULLIFIER_TREE_HEIGHT),
-    );
-  }
-
   /**
    * Returns a field array representation of a nullifier witness.
    * @returns A field array representation of a nullifier witness.
diff --git a/yarn-project/circuit-types/src/interfaces/private_kernel_prover.ts b/yarn-project/circuit-types/src/interfaces/private_kernel_prover.ts
index 9dd399919ce..f51d6caf076 100644
--- a/yarn-project/circuit-types/src/interfaces/private_kernel_prover.ts
+++ b/yarn-project/circuit-types/src/interfaces/private_kernel_prover.ts
@@ -10,22 +10,19 @@ import {
 } from '@aztec/circuits.js';
 
 import { type WitnessMap } from '@noir-lang/acvm_js';
-import { z } from 'zod';
 
-export const PrivateKernelProverProfileResultSchema = z.object({
-  gateCounts: z.array(z.object({ circuitName: z.string(), gateCount: z.number() })),
-});
-
-export type PrivateKernelProverProfileResult = z.infer<typeof PrivateKernelProverProfileResultSchema>;
+export type PrivateKernelProverProfileResult = {
+  gateCounts: { circuitName: string; gateCount: number }[];
+};
 
 /**
  * Represents the output of the proof creation process for init and inner private kernel circuit.
  * Contains the public inputs required for the init and inner private kernel circuit and the generated proof.
  */
-export type PrivateKernelSimulateOutput<
-  PublicInputsType extends PrivateKernelCircuitPublicInputs | PrivateKernelTailCircuitPublicInputs,
-> = {
-  /** The public inputs required for the proof generation process. */
+export type PrivateKernelSimulateOutput<PublicInputsType> = {
+  /**
+   * The public inputs required for the proof generation process.
+   */
   publicInputs: PublicInputsType;
 
   clientIvcProof?: ClientIvcProof;
diff --git a/yarn-project/circuit-types/src/interfaces/prover-agent.test.ts b/yarn-project/circuit-types/src/interfaces/prover-agent.test.ts
deleted file mode 100644
index 9a23df0e18e..00000000000
--- a/yarn-project/circuit-types/src/interfaces/prover-agent.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
-
-import { type ProverAgentApi, ProverAgentApiSchema } from './prover-agent.js';
-
-describe('ProverAgentApiSchema', () => {
-  let handler: MockProverAgent;
-  let context: JsonRpcTestContext<ProverAgentApi>;
-
-  const tested = new Set<string>();
-
-  beforeEach(async () => {
-    handler = new MockProverAgent();
-    context = await createJsonRpcTestSetup<ProverAgentApi>(handler, ProverAgentApiSchema);
-  });
-
-  afterEach(() => {
-    tested.add(/^ProverAgentApiSchema\s+([^(]+)/.exec(expect.getState().currentTestName!)![1]);
-    context.httpServer.close();
-  });
-
-  afterAll(() => {
-    const all = Object.keys(ProverAgentApiSchema);
-    expect([...tested].sort()).toEqual(all.sort());
-  });
-
-  it('setMaxConcurrency', async () => {
-    await context.client.setMaxConcurrency(1);
-  });
-
-  it('isRunning', async () => {
-    const running = await context.client.isRunning();
-    expect(running).toBe(true);
-  });
-
-  it('getCurrentJobs', async () => {
-    const jobs = await context.client.getCurrentJobs();
-    expect(jobs).toEqual([
-      { id: '1', type: 'type1' },
-      { id: '2', type: 'type2' },
-    ]);
-  });
-});
-
-class MockProverAgent implements ProverAgentApi {
-  setMaxConcurrency(_maxConcurrency: number): Promise<void> {
-    return Promise.resolve();
-  }
-  isRunning(): Promise<boolean> {
-    return Promise.resolve(true);
-  }
-  getCurrentJobs(): Promise<{ id: string; type: string }[]> {
-    return Promise.resolve([
-      { id: '1', type: 'type1' },
-      { id: '2', type: 'type2' },
-    ]);
-  }
-}
diff --git a/yarn-project/circuit-types/src/interfaces/prover-agent.ts b/yarn-project/circuit-types/src/interfaces/prover-agent.ts
deleted file mode 100644
index 19142530d43..00000000000
--- a/yarn-project/circuit-types/src/interfaces/prover-agent.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { type ApiSchemaFor } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-export interface ProverAgentApi {
-  setMaxConcurrency(maxConcurrency: number): Promise<void>;
-
-  isRunning(): Promise<boolean>;
-
-  getCurrentJobs(): Promise<{ id: string; type: string }[]>;
-}
-
-export const ProverAgentApiSchema: ApiSchemaFor<ProverAgentApi> = {
-  setMaxConcurrency: z.function().args(z.number().min(1).int()).returns(z.void()),
-  isRunning: z.function().args().returns(z.boolean()),
-  getCurrentJobs: z
-    .function()
-    .args()
-    .returns(z.array(z.object({ id: z.string(), type: z.string() }))),
-};
diff --git a/yarn-project/circuit-types/src/interfaces/prover-client.ts b/yarn-project/circuit-types/src/interfaces/prover-client.ts
index 44d4210a8c8..73f16c833fc 100644
--- a/yarn-project/circuit-types/src/interfaces/prover-client.ts
+++ b/yarn-project/circuit-types/src/interfaces/prover-client.ts
@@ -1,13 +1,10 @@
 import { type TxHash } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
 import { type ConfigMappingsType, booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 import { type EpochProver } from './epoch-prover.js';
 import { type MerkleTreeReadOperations } from './merkle_tree_operations.js';
-import { type ProvingJobSource } from './proving-job-source.js';
+import { type ProvingJobSource } from './proving-job.js';
 
 /**
  * The prover configuration.
@@ -33,18 +30,6 @@ export type ProverConfig = {
   proverId?: Fr;
 };
 
-export const ProverConfigSchema = z.object({
-  nodeUrl: z.string().optional(),
-  realProofs: z.boolean(),
-  proverAgentEnabled: z.boolean(),
-  proverAgentPollInterval: z.number(),
-  proverAgentConcurrency: z.number(),
-  proverJobTimeoutMs: z.number(),
-  proverJobPollIntervalMs: z.number(),
-  proverId: schemas.Fr.optional(),
-  proverTestDelayMs: z.number(),
-}) satisfies ZodFor<ProverConfig>;
-
 export const proverConfigMappings: ConfigMappingsType<ProverConfig> = {
   nodeUrl: {
     env: 'AZTEC_NODE_URL',
diff --git a/yarn-project/circuit-types/src/interfaces/prover-coordination.ts b/yarn-project/circuit-types/src/interfaces/prover-coordination.ts
index f0df43c3451..6413faedeb2 100644
--- a/yarn-project/circuit-types/src/interfaces/prover-coordination.ts
+++ b/yarn-project/circuit-types/src/interfaces/prover-coordination.ts
@@ -1,10 +1,6 @@
-import { type ApiSchemaFor } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-import { EpochProofQuote } from '../prover_coordination/index.js';
-import { Tx } from '../tx/tx.js';
-import { TxHash } from '../tx/tx_hash.js';
+import { type EpochProofQuote } from '../prover_coordination/index.js';
+import { type Tx } from '../tx/tx.js';
+import { type TxHash } from '../tx/tx_hash.js';
 
 /** Provides basic operations for ProverNodes to interact with other nodes in the network. */
 export interface ProverCoordination {
@@ -20,9 +16,9 @@ export interface ProverCoordination {
    * @param quote - The quote to store
    */
   addEpochProofQuote(quote: EpochProofQuote): Promise<void>;
-}
 
-export const ProverCoordinationApiSchema: ApiSchemaFor<ProverCoordination> = {
-  getTxByHash: z.function().args(TxHash.schema).returns(Tx.schema.optional()),
-  addEpochProofQuote: z.function().args(EpochProofQuote.schema).returns(z.void()),
-};
+  /**
+   * Stops the coordination service.
+   */
+  stop(): Promise<void>;
+}
diff --git a/yarn-project/circuit-types/src/interfaces/prover-node.test.ts b/yarn-project/circuit-types/src/interfaces/prover-node.test.ts
deleted file mode 100644
index cbb1314bd54..00000000000
--- a/yarn-project/circuit-types/src/interfaces/prover-node.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
-
-import { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
-import { type EpochProvingJobState, type ProverNodeApi, ProverNodeApiSchema } from './prover-node.js';
-
-describe('ProvingNodeApiSchema', () => {
-  let handler: MockProverNode;
-  let context: JsonRpcTestContext<ProverNodeApi>;
-
-  const tested = new Set<string>();
-
-  beforeEach(async () => {
-    handler = new MockProverNode();
-    context = await createJsonRpcTestSetup<ProverNodeApi>(handler, ProverNodeApiSchema);
-  });
-
-  afterEach(() => {
-    tested.add(/^ProvingNodeApiSchema\s+([^(]+)/.exec(expect.getState().currentTestName!)![1]);
-    context.httpServer.close();
-  });
-
-  afterAll(() => {
-    const all = Object.keys(ProverNodeApiSchema);
-    expect([...tested].sort()).toEqual(all.sort());
-  });
-
-  it('getJobs', async () => {
-    const jobs = await context.client.getJobs();
-    const expected = await handler.getJobs();
-    expect(jobs).toEqual(expected);
-  });
-
-  it('startProof', async () => {
-    await context.client.startProof(1);
-  });
-
-  it('prove', async () => {
-    await context.client.prove(1);
-  });
-
-  it('sendEpochProofQuote', async () => {
-    const quote = EpochProofQuote.empty();
-    await context.client.sendEpochProofQuote(quote);
-  });
-});
-
-class MockProverNode implements ProverNodeApi {
-  getJobs(): Promise<{ uuid: string; status: EpochProvingJobState }[]> {
-    return Promise.resolve([
-      { uuid: 'uuid1', status: 'initialized' },
-      { uuid: 'uuid2', status: 'processing' },
-      { uuid: 'uuid3', status: 'awaiting-prover' },
-      { uuid: 'uuid4', status: 'publishing-proof' },
-      { uuid: 'uuid5', status: 'completed' },
-      { uuid: 'uuid6', status: 'failed' },
-    ]);
-  }
-  startProof(epochNumber: number): Promise<void> {
-    expect(typeof epochNumber).toBe('number');
-    return Promise.resolve();
-  }
-  prove(epochNumber: number): Promise<void> {
-    expect(typeof epochNumber).toBe('number');
-    return Promise.resolve();
-  }
-  sendEpochProofQuote(quote: EpochProofQuote): Promise<void> {
-    expect(quote).toBeInstanceOf(EpochProofQuote);
-    return Promise.resolve();
-  }
-}
diff --git a/yarn-project/circuit-types/src/interfaces/prover-node.ts b/yarn-project/circuit-types/src/interfaces/prover-node.ts
index a27924353c8..c2cb376ff29 100644
--- a/yarn-project/circuit-types/src/interfaces/prover-node.ts
+++ b/yarn-project/circuit-types/src/interfaces/prover-node.ts
@@ -1,5 +1,5 @@
 import { type Signature } from '@aztec/foundation/eth-signature';
-import { type ApiSchemaFor, schemas } from '@aztec/foundation/schemas';
+import { type ApiSchemaFor } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
@@ -31,15 +31,15 @@ export interface ProverNodeApi {
 }
 
 /** Schemas for prover node API functions. */
-export const ProverNodeApiSchema: ApiSchemaFor<ProverNodeApi> = {
-  getJobs: z
+export class ProverNodeApiSchema implements ApiSchemaFor<ProverNodeApi> {
+  getJobs = z
     .function()
     .args()
-    .returns(z.array(z.object({ uuid: z.string(), status: z.enum(EpochProvingJobState) }))),
+    .returns(z.array(z.object({ uuid: z.string().uuid(), status: z.enum(EpochProvingJobState) })));
 
-  startProof: z.function().args(schemas.Integer).returns(z.void()),
+  startProof = z.function().args(z.number()).returns(z.void());
 
-  prove: z.function().args(schemas.Integer).returns(z.void()),
+  prove = z.function().args(z.number()).returns(z.void());
 
-  sendEpochProofQuote: z.function().args(EpochProofQuote.schema).returns(z.void()),
-};
+  sendEpochProofQuote = z.function().args(EpochProofQuote.schema).returns(z.void());
+}
diff --git a/yarn-project/circuit-types/src/interfaces/proving-job-source.test.ts b/yarn-project/circuit-types/src/interfaces/proving-job-source.test.ts
deleted file mode 100644
index eb1388a54d7..00000000000
--- a/yarn-project/circuit-types/src/interfaces/proving-job-source.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import {
-  BaseOrMergeRollupPublicInputs,
-  NESTED_RECURSIVE_PROOF_LENGTH,
-  PrivateBaseRollupInputs,
-  VerificationKeyData,
-  makeRecursiveProof,
-} from '@aztec/circuits.js';
-import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
-
-import { type ProvingJobSource, ProvingJobSourceSchema } from './proving-job-source.js';
-import {
-  type ProvingJob,
-  type ProvingRequest,
-  type ProvingRequestResult,
-  type ProvingRequestResultFor,
-  ProvingRequestType,
-  makePublicInputsAndRecursiveProof,
-} from './proving-job.js';
-
-describe('ProvingJobSourceSchema', () => {
-  let handler: MockProvingJobSource;
-  let context: JsonRpcTestContext<ProvingJobSource>;
-
-  const tested = new Set<string>();
-
-  beforeEach(async () => {
-    handler = new MockProvingJobSource();
-    context = await createJsonRpcTestSetup<ProvingJobSource>(handler, ProvingJobSourceSchema);
-  });
-
-  afterEach(() => {
-    tested.add(/^ProvingJobSourceSchema\s+([^(]+)/.exec(expect.getState().currentTestName!)![1]);
-    context.httpServer.close();
-  });
-
-  afterAll(() => {
-    const all = Object.keys(ProvingJobSourceSchema);
-    expect([...tested].sort()).toEqual(all.sort());
-  });
-
-  it('getProvingJob', async () => {
-    const job = await context.client.getProvingJob();
-    const expected = await handler.getProvingJob();
-    expect(expected).toEqual(expected);
-    expect(job).toEqual(expected);
-  });
-
-  it('heartbeat', async () => {
-    await context.client.heartbeat('a-job-id');
-  });
-
-  it('resolveProvingJob', async () => {
-    await context.client.resolveProvingJob('a-job-id', {
-      type: ProvingRequestType.PRIVATE_BASE_ROLLUP,
-      result: makePublicInputsAndRecursiveProof(
-        BaseOrMergeRollupPublicInputs.empty(),
-        makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
-        VerificationKeyData.makeFake(),
-      ),
-    });
-  });
-
-  it('rejectProvingJob', async () => {
-    await context.client.rejectProvingJob('a-job-id', 'reason');
-  });
-});
-
-class MockProvingJobSource implements ProvingJobSource {
-  getProvingJob(): Promise<ProvingJob<ProvingRequest> | undefined> {
-    return Promise.resolve({
-      id: 'a-job-id',
-      request: { type: ProvingRequestType.PRIVATE_BASE_ROLLUP, inputs: PrivateBaseRollupInputs.empty() },
-    });
-  }
-  heartbeat(jobId: string): Promise<void> {
-    expect(typeof jobId).toEqual('string');
-    return Promise.resolve();
-  }
-  resolveProvingJob(jobId: string, result: ProvingRequestResult): Promise<void> {
-    expect(typeof jobId).toEqual('string');
-    const baseRollupResult = result as ProvingRequestResultFor<typeof ProvingRequestType.PRIVATE_BASE_ROLLUP>;
-    expect(baseRollupResult.result.inputs).toBeInstanceOf(BaseOrMergeRollupPublicInputs);
-    return Promise.resolve();
-  }
-  rejectProvingJob(jobId: string, reason: string): Promise<void> {
-    expect(typeof reason).toEqual('string');
-    expect(typeof jobId).toEqual('string');
-    return Promise.resolve();
-  }
-}
diff --git a/yarn-project/circuit-types/src/interfaces/proving-job-source.ts b/yarn-project/circuit-types/src/interfaces/proving-job-source.ts
deleted file mode 100644
index ebeaa05301a..00000000000
--- a/yarn-project/circuit-types/src/interfaces/proving-job-source.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { type ApiSchemaFor } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-import {
-  JobIdSchema,
-  type ProvingJob,
-  ProvingJobSchema,
-  type ProvingRequest,
-  type ProvingRequestResult,
-  ProvingRequestResultSchema,
-} from './proving-job.js';
-
-export interface ProvingJobSource {
-  /**
-   * Gets the next proving job. `heartbeat` must be called periodically to keep the job alive.
-   * @returns The proving job, or undefined if there are no jobs available.
-   */
-  getProvingJob(): Promise<ProvingJob<ProvingRequest> | undefined>;
-
-  /**
-   * Keeps the job alive. If this isn't called regularly then the job will be
-   * considered abandoned and re-queued for another consumer to pick up
-   * @param jobId The ID of the job to heartbeat.
-   */
-  heartbeat(jobId: string): Promise<void>;
-
-  /**
-   * Resolves a proving job.
-   * @param jobId - The ID of the job to resolve.
-   * @param result - The result of the proving job.
-   */
-  resolveProvingJob(jobId: string, result: ProvingRequestResult): Promise<void>;
-
-  /**
-   * Rejects a proving job.
-   * @param jobId - The ID of the job to reject.
-   * @param reason - The reason for rejecting the job.
-   */
-  rejectProvingJob(jobId: string, reason: string): Promise<void>;
-}
-
-export const ProvingJobSourceSchema: ApiSchemaFor<ProvingJobSource> = {
-  getProvingJob: z.function().args().returns(ProvingJobSchema.optional()),
-  heartbeat: z.function().args(JobIdSchema).returns(z.void()),
-  resolveProvingJob: z.function().args(JobIdSchema, ProvingRequestResultSchema).returns(z.void()),
-  rejectProvingJob: z.function().args(JobIdSchema, z.string()).returns(z.void()),
-};
diff --git a/yarn-project/circuit-types/src/interfaces/proving-job.ts b/yarn-project/circuit-types/src/interfaces/proving-job.ts
index 3089d614916..1814c6a107b 100644
--- a/yarn-project/circuit-types/src/interfaces/proving-job.ts
+++ b/yarn-project/circuit-types/src/interfaces/proving-job.ts
@@ -1,44 +1,35 @@
 import {
-  AVM_PROOF_LENGTH_IN_FIELDS,
-  AvmCircuitInputs,
-  BaseOrMergeRollupPublicInputs,
-  BaseParityInputs,
-  BlockMergeRollupInputs,
-  BlockRootOrBlockMergePublicInputs,
-  BlockRootRollupInputs,
-  EmptyBlockRootRollupInputs,
-  KernelCircuitPublicInputs,
-  MergeRollupInputs,
-  NESTED_RECURSIVE_PROOF_LENGTH,
-  PrivateBaseRollupInputs,
-  PrivateKernelEmptyInputData,
-  PublicBaseRollupInputs,
-  RECURSIVE_PROOF_LENGTH,
-  RecursiveProof,
-  RootParityInput,
-  RootParityInputs,
-  RootRollupInputs,
-  RootRollupPublicInputs,
-  TUBE_PROOF_LENGTH,
-  TubeInputs,
-  VerificationKeyData,
+  type AVM_PROOF_LENGTH_IN_FIELDS,
+  type AvmCircuitInputs,
+  type BaseOrMergeRollupPublicInputs,
+  type BaseParityInputs,
+  type BlockMergeRollupInputs,
+  type BlockRootOrBlockMergePublicInputs,
+  type BlockRootRollupInputs,
+  type EmptyBlockRootRollupInputs,
+  type KernelCircuitPublicInputs,
+  type MergeRollupInputs,
+  type NESTED_RECURSIVE_PROOF_LENGTH,
+  type PrivateBaseRollupInputs,
+  type PrivateKernelEmptyInputData,
+  type PublicBaseRollupInputs,
+  type RECURSIVE_PROOF_LENGTH,
+  type RecursiveProof,
+  type RootParityInput,
+  type RootParityInputs,
+  type RootRollupInputs,
+  type RootRollupPublicInputs,
+  type TUBE_PROOF_LENGTH,
+  type TubeInputs,
+  type VerificationKeyData,
 } from '@aztec/circuits.js';
-import { type ZodFor } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 import { type CircuitName } from '../stats/index.js';
 
-export type ProofAndVerificationKey<P> = { proof: P; verificationKey: VerificationKeyData };
-
-function schemaForRecursiveProofAndVerificationKey<N extends number>(
-  proofLength: N,
-): ZodFor<ProofAndVerificationKey<RecursiveProof<N>>> {
-  return z.object({
-    proof: RecursiveProof.schemaFor(proofLength),
-    verificationKey: VerificationKeyData.schema,
-  }) as ZodFor<ProofAndVerificationKey<RecursiveProof<N>>>;
-}
+export type ProofAndVerificationKey<P> = {
+  proof: P;
+  verificationKey: VerificationKeyData;
+};
 
 export function makeProofAndVerificationKey<P>(
   proof: P,
@@ -53,25 +44,24 @@ export type PublicInputsAndRecursiveProof<T, N extends number = typeof NESTED_RE
   verificationKey: VerificationKeyData;
 };
 
-function schemaForPublicInputsAndRecursiveProof<T extends object>(
-  inputs: ZodFor<T>,
-): ZodFor<PublicInputsAndRecursiveProof<T>> {
-  const proofSize = NESTED_RECURSIVE_PROOF_LENGTH;
-  return z.object({
-    inputs,
-    proof: RecursiveProof.schemaFor(proofSize),
-    verificationKey: VerificationKeyData.schema,
-  }) as ZodFor<PublicInputsAndRecursiveProof<T>>;
-}
-
 export function makePublicInputsAndRecursiveProof<T, N extends number = typeof NESTED_RECURSIVE_PROOF_LENGTH>(
   inputs: T,
   proof: RecursiveProof<N>,
   verificationKey: VerificationKeyData,
-): PublicInputsAndRecursiveProof<T, N> {
-  return { inputs, proof, verificationKey };
+) {
+  const result: PublicInputsAndRecursiveProof<T, N> = {
+    inputs,
+    proof,
+    verificationKey,
+  };
+  return result;
 }
 
+export type ProvingJob<T extends ProvingRequest> = {
+  id: string;
+  request: T;
+};
+
 export enum ProvingRequestType {
   PRIVATE_KERNEL_EMPTY,
   PUBLIC_VM,
@@ -86,7 +76,7 @@ export enum ProvingRequestType {
 
   BASE_PARITY,
   ROOT_PARITY,
-  /** Recursive Client IVC verification to connect private to public or rollup */
+  // Recursive Client IVC verification to connect private -> public or rollup
   TUBE_PROOF,
 }
 
@@ -121,39 +111,59 @@ export function mapProvingRequestTypeToCircuitName(type: ProvingRequestType): Ci
   }
 }
 
-export type AvmProvingRequest = z.infer<typeof AvmProvingRequestSchema>;
-
-export type ProvingRequest = z.infer<typeof ProvingRequestSchema>;
-
-export const AvmProvingRequestSchema = z.object({
-  type: z.literal(ProvingRequestType.PUBLIC_VM),
-  inputs: AvmCircuitInputs.schema,
-});
-
-export const ProvingRequestSchema = z.discriminatedUnion('type', [
-  AvmProvingRequestSchema,
-  z.object({ type: z.literal(ProvingRequestType.BASE_PARITY), inputs: BaseParityInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.ROOT_PARITY), inputs: RootParityInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.PRIVATE_BASE_ROLLUP), inputs: PrivateBaseRollupInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.PUBLIC_BASE_ROLLUP), inputs: PublicBaseRollupInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.MERGE_ROLLUP), inputs: MergeRollupInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.BLOCK_ROOT_ROLLUP), inputs: BlockRootRollupInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP), inputs: EmptyBlockRootRollupInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.BLOCK_MERGE_ROLLUP), inputs: BlockMergeRollupInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.ROOT_ROLLUP), inputs: RootRollupInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.PRIVATE_KERNEL_EMPTY), inputs: PrivateKernelEmptyInputData.schema }),
-  z.object({ type: z.literal(ProvingRequestType.TUBE_PROOF), inputs: TubeInputs.schema }),
-]);
-
-export type JobId = z.infer<typeof JobIdSchema>;
-
-export const JobIdSchema = z.string();
-
-export type ProvingJob<T extends ProvingRequest> = { id: JobId; request: T };
-
-export const ProvingJobSchema = z.object({ id: JobIdSchema, request: ProvingRequestSchema });
+export type AvmProvingRequest = {
+  type: ProvingRequestType.PUBLIC_VM;
+  inputs: AvmCircuitInputs;
+};
 
-type ProvingRequestResultsMap = {
+export type ProvingRequest =
+  | AvmProvingRequest
+  | {
+      type: ProvingRequestType.BASE_PARITY;
+      inputs: BaseParityInputs;
+    }
+  | {
+      type: ProvingRequestType.ROOT_PARITY;
+      inputs: RootParityInputs;
+    }
+  | {
+      type: ProvingRequestType.PRIVATE_BASE_ROLLUP;
+      inputs: PrivateBaseRollupInputs;
+    }
+  | {
+      type: ProvingRequestType.PUBLIC_BASE_ROLLUP;
+      inputs: PublicBaseRollupInputs;
+    }
+  | {
+      type: ProvingRequestType.MERGE_ROLLUP;
+      inputs: MergeRollupInputs;
+    }
+  | {
+      type: ProvingRequestType.BLOCK_ROOT_ROLLUP;
+      inputs: BlockRootRollupInputs;
+    }
+  | {
+      type: ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP;
+      inputs: EmptyBlockRootRollupInputs;
+    }
+  | {
+      type: ProvingRequestType.BLOCK_MERGE_ROLLUP;
+      inputs: BlockMergeRollupInputs;
+    }
+  | {
+      type: ProvingRequestType.ROOT_ROLLUP;
+      inputs: RootRollupInputs;
+    }
+  | {
+      type: ProvingRequestType.PRIVATE_KERNEL_EMPTY;
+      inputs: PrivateKernelEmptyInputData;
+    }
+  | {
+      type: ProvingRequestType.TUBE_PROOF;
+      inputs: TubeInputs;
+    };
+
+export type ProvingRequestResults = {
   [ProvingRequestType.PRIVATE_KERNEL_EMPTY]: PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>;
   [ProvingRequestType.PUBLIC_VM]: ProofAndVerificationKey<RecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>>;
   [ProvingRequestType.PRIVATE_BASE_ROLLUP]: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>;
@@ -168,66 +178,33 @@ type ProvingRequestResultsMap = {
   [ProvingRequestType.TUBE_PROOF]: ProofAndVerificationKey<RecursiveProof<typeof TUBE_PROOF_LENGTH>>;
 };
 
-export type ProvingRequestResultFor<T extends ProvingRequestType> = { type: T; result: ProvingRequestResultsMap[T] };
-
-export type ProvingRequestResult = {
-  [K in keyof ProvingRequestResultsMap]: { type: K; result: ProvingRequestResultsMap[K] };
-}[keyof ProvingRequestResultsMap];
-
-export function makeProvingRequestResult(
-  type: ProvingRequestType,
-  result: ProvingRequestResult['result'],
-): ProvingRequestResult {
-  return { type, result } as ProvingRequestResult;
+export type ProvingRequestResult<T extends ProvingRequestType> = ProvingRequestResults[T];
+
+export interface ProvingJobSource {
+  /**
+   * Gets the next proving job. `heartbeat` must be called periodically to keep the job alive.
+   * @returns The proving job, or undefined if there are no jobs available.
+   */
+  getProvingJob(): Promise<ProvingJob<ProvingRequest> | undefined>;
+
+  /**
+   * Keeps the job alive. If this isn't called regularly then the job will be
+   * considered abandoned and re-queued for another consumer to pick up
+   * @param jobId The ID of the job to heartbeat.
+   */
+  heartbeat(jobId: string): Promise<void>;
+
+  /**
+   * Resolves a proving job.
+   * @param jobId - The ID of the job to resolve.
+   * @param result - The result of the proving job.
+   */
+  resolveProvingJob<T extends ProvingRequestType>(jobId: string, result: ProvingRequestResult<T>): Promise<void>;
+
+  /**
+   * Rejects a proving job.
+   * @param jobId - The ID of the job to reject.
+   * @param reason - The reason for rejecting the job.
+   */
+  rejectProvingJob(jobId: string, reason: Error): Promise<void>;
 }
-
-export const ProvingRequestResultSchema = z.discriminatedUnion('type', [
-  z.object({
-    type: z.literal(ProvingRequestType.PRIVATE_KERNEL_EMPTY),
-    result: schemaForPublicInputsAndRecursiveProof(KernelCircuitPublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.PUBLIC_VM),
-    result: schemaForRecursiveProofAndVerificationKey(AVM_PROOF_LENGTH_IN_FIELDS),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.PRIVATE_BASE_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(BaseOrMergeRollupPublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.PUBLIC_BASE_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(BaseOrMergeRollupPublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.MERGE_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(BaseOrMergeRollupPublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(BlockRootOrBlockMergePublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.BLOCK_ROOT_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(BlockRootOrBlockMergePublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.BLOCK_MERGE_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(BlockRootOrBlockMergePublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.ROOT_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(RootRollupPublicInputs.schema),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.BASE_PARITY),
-    result: RootParityInput.schemaFor(RECURSIVE_PROOF_LENGTH),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.ROOT_PARITY),
-    result: RootParityInput.schemaFor(NESTED_RECURSIVE_PROOF_LENGTH),
-  }),
-  z.object({
-    type: z.literal(ProvingRequestType.TUBE_PROOF),
-    result: schemaForRecursiveProofAndVerificationKey(TUBE_PROOF_LENGTH),
-  }),
-]) satisfies ZodFor<ProvingRequestResult>;
diff --git a/yarn-project/circuit-types/src/interfaces/pxe.test.ts b/yarn-project/circuit-types/src/interfaces/pxe.test.ts
deleted file mode 100644
index 797c183df2f..00000000000
--- a/yarn-project/circuit-types/src/interfaces/pxe.test.ts
+++ /dev/null
@@ -1,560 +0,0 @@
-import {
-  AztecAddress,
-  ClientIvcProof,
-  CompleteAddress,
-  type ContractClassWithId,
-  type ContractInstanceWithAddress,
-  EthAddress,
-  Fr,
-  L1_TO_L2_MSG_TREE_HEIGHT,
-  type NodeInfo,
-  Point,
-  PrivateKernelTailCircuitPublicInputs,
-  type ProtocolContractAddresses,
-  ProtocolContractsNames,
-  PublicKeys,
-  getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { type L1ContractAddresses, L1ContractsNames } from '@aztec/ethereum';
-import { type AbiDecoded, type ContractArtifact, EventSelector } from '@aztec/foundation/abi';
-import { memoize } from '@aztec/foundation/decorators';
-import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
-import { fileURLToPath } from '@aztec/foundation/url';
-import { loadContractArtifact } from '@aztec/types/abi';
-
-import { deepStrictEqual } from 'assert';
-import { readFileSync } from 'fs';
-import omit from 'lodash.omit';
-import times from 'lodash.times';
-import { resolve } from 'path';
-
-import { AuthWitness } from '../auth_witness.js';
-import { L2Block } from '../l2_block.js';
-import { ExtendedUnencryptedL2Log, type GetUnencryptedLogsResponse, type LogFilter } from '../logs/index.js';
-import { type IncomingNotesFilter } from '../notes/incoming_notes_filter.js';
-import { ExtendedNote, type OutgoingNotesFilter, UniqueNote } from '../notes/index.js';
-import { PrivateExecutionResult } from '../private_execution_result.js';
-import { type EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
-import { SiblingPath } from '../sibling_path/sibling_path.js';
-import { type NoteProcessorStats } from '../stats/stats.js';
-import { Tx, TxHash, TxProvingResult, TxReceipt, TxSimulationResult } from '../tx/index.js';
-import { TxEffect } from '../tx_effect.js';
-import { TxExecutionRequest } from '../tx_execution_request.js';
-import { type EventMetadataDefinition, type PXE, type PXEInfo, PXESchema } from './pxe.js';
-import { type SyncStatus } from './sync-status.js';
-
-describe('PXESchema', () => {
-  let handler: MockPXE;
-  let context: JsonRpcTestContext<PXE>;
-
-  let address: AztecAddress;
-  let artifact: ContractArtifact;
-  let instance: ContractInstanceWithAddress;
-
-  const tested = new Set<string>();
-
-  beforeAll(() => {
-    const path = resolve(fileURLToPath(import.meta.url), '../../test/artifacts/token_contract-Token.json');
-    artifact = loadContractArtifact(JSON.parse(readFileSync(path, 'utf-8')));
-  });
-
-  beforeEach(async () => {
-    address = AztecAddress.random();
-    instance = {
-      version: 1,
-      contractClassId: Fr.random(),
-      deployer: AztecAddress.random(),
-      initializationHash: Fr.random(),
-      publicKeys: PublicKeys.random(),
-      salt: Fr.random(),
-      address,
-    };
-    handler = new MockPXE(address, artifact, instance);
-    context = await createJsonRpcTestSetup<PXE>(handler, PXESchema);
-  });
-
-  afterEach(() => {
-    tested.add(/^PXESchema\s+([^(]+)/.exec(expect.getState().currentTestName!)![1]);
-    context.httpServer.close();
-  });
-
-  afterAll(() => {
-    const all = Object.keys(PXESchema);
-    expect([...tested].sort()).toEqual(all.sort());
-  });
-
-  it('addAuthWitness', async () => {
-    await context.client.addAuthWitness(AuthWitness.random());
-  });
-
-  it('getAuthWitness', async () => {
-    const result = await context.client.getAuthWitness(Fr.random());
-    expect(result).toEqual([expect.any(Fr)]);
-  });
-
-  it('addCapsule', async () => {
-    await context.client.addCapsule(times(3, Fr.random));
-  });
-
-  it('registerAccount', async () => {
-    const result = await context.client.registerAccount(Fr.random(), Fr.random());
-    expect(result).toBeInstanceOf(CompleteAddress);
-  });
-
-  it('getRegisteredAccounts', async () => {
-    const result = await context.client.getRegisteredAccounts();
-    expect(result).toEqual([expect.any(CompleteAddress)]);
-  });
-
-  it('getRegisteredAccount', async () => {
-    const result = await context.client.getRegisteredAccount(address);
-    expect(result).toBeInstanceOf(CompleteAddress);
-  });
-
-  it('registerContact', async () => {
-    const result = await context.client.registerContact(address);
-    expect(result).toEqual(address);
-  });
-
-  it('getContacts', async () => {
-    const result = await context.client.getContacts();
-    expect(result).toEqual([address]);
-  });
-
-  it('removeContact', async () => {
-    await context.client.removeContact(address);
-  });
-
-  it('registerContractClass', async () => {
-    await context.client.registerContractClass(artifact);
-  });
-
-  it('registerContract', async () => {
-    await context.client.registerContract({ instance, artifact });
-  });
-
-  it('getContracts', async () => {
-    const result = await context.client.getContracts();
-    expect(result).toEqual([address]);
-  });
-
-  it('proveTx', async () => {
-    const result = await context.client.proveTx(TxExecutionRequest.random(), PrivateExecutionResult.random());
-    expect(result).toBeInstanceOf(TxProvingResult);
-  });
-
-  it('simulateTx(all)', async () => {
-    const result = await context.client.simulateTx(TxExecutionRequest.random(), true, address, false, false, []);
-    expect(result).toBeInstanceOf(TxSimulationResult);
-  });
-
-  it('simulateTx(required)', async () => {
-    const result = await context.client.simulateTx(TxExecutionRequest.random(), true);
-    expect(result).toBeInstanceOf(TxSimulationResult);
-  });
-
-  it('simulateTx(undefined)', async () => {
-    const result = await context.client.simulateTx(
-      TxExecutionRequest.random(),
-      true,
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-    );
-    expect(result).toBeInstanceOf(TxSimulationResult);
-  });
-
-  it('sendTx', async () => {
-    const result = await context.client.sendTx(Tx.random());
-    expect(result).toBeInstanceOf(TxHash);
-  });
-
-  it('getTxReceipt', async () => {
-    const result = await context.client.getTxReceipt(TxHash.random());
-    expect(result).toBeInstanceOf(TxReceipt);
-  });
-
-  it('getTxEffect', async () => {
-    const result = await context.client.getTxEffect(TxHash.random());
-    expect(result).toBeInstanceOf(TxEffect);
-  });
-
-  it('getPublicStorageAt', async () => {
-    const result = await context.client.getPublicStorageAt(address, Fr.random());
-    expect(result).toBeInstanceOf(Fr);
-  });
-
-  it('getIncomingNotes', async () => {
-    const result = await context.client.getIncomingNotes({ contractAddress: address });
-    expect(result).toEqual([expect.any(UniqueNote)]);
-  });
-
-  it('getL1ToL2MembershipWitness', async () => {
-    const result = await context.client.getL1ToL2MembershipWitness(address, Fr.random(), Fr.random());
-    expect(result).toEqual([expect.any(BigInt), expect.any(SiblingPath)]);
-  });
-
-  it('getOutgoingNotes', async () => {
-    const result = await context.client.getOutgoingNotes({ contractAddress: address });
-    expect(result).toEqual([expect.any(UniqueNote)]);
-  });
-
-  it('addNote', async () => {
-    await context.client.addNote(ExtendedNote.random(), address);
-  });
-
-  it('addNullifiedNote', async () => {
-    await context.client.addNullifiedNote(ExtendedNote.random());
-  });
-
-  it('getBlock', async () => {
-    const result = await context.client.getBlock(1);
-    expect(result).toBeInstanceOf(L2Block);
-  });
-
-  it('simulateUnconstrained', async () => {
-    const result = await context.client.simulateUnconstrained('function', [], address, address, [address]);
-    expect(result).toEqual(10n);
-  });
-
-  it('getUnencryptedLogs', async () => {
-    const result = await context.client.getUnencryptedLogs({ contractAddress: address });
-    expect(result).toEqual({ logs: [expect.any(ExtendedUnencryptedL2Log)], maxLogsHit: true });
-  });
-
-  it('getBlockNumber', async () => {
-    const result = await context.client.getBlockNumber();
-    expect(result).toBe(1);
-  });
-
-  it('getProvenBlockNumber', async () => {
-    const result = await context.client.getProvenBlockNumber();
-    expect(result).toBe(1);
-  });
-
-  it('getNodeInfo', async () => {
-    const result = await context.client.getNodeInfo();
-    expect(result).toEqual(await handler.getNodeInfo());
-  });
-
-  it('getPXEInfo', async () => {
-    const result = await context.client.getPXEInfo();
-    expect(result).toEqual(await handler.getPXEInfo());
-  });
-
-  it('isGlobalStateSynchronized', async () => {
-    const result = await context.client.isGlobalStateSynchronized();
-    expect(result).toBe(true);
-  });
-
-  it('isAccountStateSynchronized', async () => {
-    const result = await context.client.isAccountStateSynchronized(address);
-    expect(result).toBe(true);
-  });
-
-  it('getSyncStatus', async () => {
-    const result = await context.client.getSyncStatus();
-    expect(result).toEqual(await handler.getSyncStatus());
-  });
-
-  it('getSyncStats', async () => {
-    const result = await context.client.getSyncStats();
-    expect(result).toEqual(await handler.getSyncStats());
-  });
-
-  it('getContractInstance', async () => {
-    const result = await context.client.getContractInstance(address);
-    expect(result).toEqual(instance);
-  });
-
-  it('getContractClass', async () => {
-    const result = await context.client.getContractClass(Fr.random());
-    const expected = omit(getContractClassFromArtifact(artifact), 'privateFunctionsRoot', 'publicBytecodeCommitment');
-    expect(result).toEqual(expected);
-  });
-
-  it('getContractArtifact', async () => {
-    const result = await context.client.getContractArtifact(Fr.random());
-    deepStrictEqual(result, artifact);
-  });
-
-  it('isContractClassPubliclyRegistered', async () => {
-    const result = await context.client.isContractClassPubliclyRegistered(Fr.random());
-    expect(result).toBe(true);
-  });
-
-  it('isContractPubliclyDeployed', async () => {
-    const result = await context.client.isContractPubliclyDeployed(address);
-    expect(result).toBe(true);
-  });
-
-  it('isContractInitialized', async () => {
-    const result = await context.client.isContractInitialized(address);
-    expect(result).toBe(true);
-  });
-
-  it('getEncryptedEvents', async () => {
-    const result = await context.client.getEncryptedEvents<EpochProofQuote>(
-      { abiType: { kind: 'boolean' }, eventSelector: EventSelector.random(), fieldNames: ['name'] },
-      1,
-      1,
-      [Point.random()],
-    );
-    expect(result).toEqual([{ value: 1n }]);
-  });
-
-  it('getUnencryptedEvents', async () => {
-    const result = await context.client.getUnencryptedEvents<EpochProofQuote>(
-      { abiType: { kind: 'boolean' }, eventSelector: EventSelector.random(), fieldNames: ['name'] },
-      1,
-      1,
-    );
-    expect(result).toEqual([{ value: 1n }]);
-  });
-});
-
-class MockPXE implements PXE {
-  constructor(
-    private address: AztecAddress,
-    private artifact: ContractArtifact,
-    private instance: ContractInstanceWithAddress,
-  ) {}
-  addAuthWitness(authWitness: AuthWitness): Promise<void> {
-    expect(authWitness).toBeInstanceOf(AuthWitness);
-    return Promise.resolve();
-  }
-  getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined> {
-    expect(messageHash).toBeInstanceOf(Fr);
-    return Promise.resolve([Fr.random()]);
-  }
-  addCapsule(capsule: Fr[]): Promise<void> {
-    expect(capsule.every(c => c instanceof Fr)).toBeTruthy();
-    return Promise.resolve();
-  }
-  registerAccount(secretKey: Fr, partialAddress: Fr): Promise<CompleteAddress> {
-    expect(secretKey).toBeInstanceOf(Fr);
-    expect(partialAddress).toBeInstanceOf(Fr);
-    return Promise.resolve(CompleteAddress.random());
-  }
-  getRegisteredAccounts(): Promise<CompleteAddress[]> {
-    return Promise.resolve([CompleteAddress.random()]);
-  }
-  getRegisteredAccount(address: AztecAddress): Promise<CompleteAddress | undefined> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    return Promise.resolve(CompleteAddress.random());
-  }
-  registerContact(address: AztecAddress): Promise<AztecAddress> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    return Promise.resolve(this.address);
-  }
-  getContacts(): Promise<AztecAddress[]> {
-    return Promise.resolve([this.address]);
-  }
-  removeContact(address: AztecAddress): Promise<void> {
-    expect(address).toBeInstanceOf(AztecAddress);
-    return Promise.resolve();
-  }
-  registerContractClass(artifact: ContractArtifact): Promise<void> {
-    deepStrictEqual(artifact, this.artifact);
-    return Promise.resolve();
-  }
-  registerContract(contract: {
-    instance: ContractInstanceWithAddress;
-    artifact?: ContractArtifact | undefined;
-  }): Promise<void> {
-    expect(contract.instance).toEqual(this.instance);
-    deepStrictEqual(contract.artifact, this.artifact);
-    return Promise.resolve();
-  }
-  getContracts(): Promise<AztecAddress[]> {
-    return Promise.resolve([this.address]);
-  }
-  proveTx(txRequest: TxExecutionRequest, privateExecutionResult: PrivateExecutionResult): Promise<TxProvingResult> {
-    expect(txRequest).toBeInstanceOf(TxExecutionRequest);
-    expect(privateExecutionResult).toBeInstanceOf(PrivateExecutionResult);
-    return Promise.resolve(
-      new TxProvingResult(privateExecutionResult, PrivateKernelTailCircuitPublicInputs.empty(), ClientIvcProof.empty()),
-    );
-  }
-  simulateTx(
-    txRequest: TxExecutionRequest,
-    _simulatePublic: boolean,
-    msgSender?: AztecAddress | undefined,
-    _skipTxValidation?: boolean | undefined,
-    _profile?: boolean | undefined,
-    scopes?: AztecAddress[] | undefined,
-  ): Promise<TxSimulationResult> {
-    expect(txRequest).toBeInstanceOf(TxExecutionRequest);
-    if (msgSender) {
-      expect(msgSender).toBeInstanceOf(AztecAddress);
-    }
-    if (scopes) {
-      expect(scopes).toEqual([]);
-    }
-    return Promise.resolve(
-      new TxSimulationResult(PrivateExecutionResult.random(), PrivateKernelTailCircuitPublicInputs.empty()),
-    );
-  }
-  sendTx(tx: Tx): Promise<TxHash> {
-    expect(tx).toBeInstanceOf(Tx);
-    return Promise.resolve(tx.getTxHash());
-  }
-  getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
-    expect(txHash).toBeInstanceOf(TxHash);
-    return Promise.resolve(TxReceipt.empty());
-  }
-  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
-    expect(txHash).toBeInstanceOf(TxHash);
-    return Promise.resolve(TxEffect.random());
-  }
-  getPublicStorageAt(contract: AztecAddress, slot: Fr): Promise<Fr> {
-    expect(contract).toBeInstanceOf(AztecAddress);
-    expect(slot).toBeInstanceOf(Fr);
-    return Promise.resolve(Fr.random());
-  }
-  getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]> {
-    expect(filter.contractAddress).toEqual(this.address);
-    return Promise.resolve([UniqueNote.random()]);
-  }
-  getL1ToL2MembershipWitness(
-    contractAddress: AztecAddress,
-    messageHash: Fr,
-    secret: Fr,
-  ): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]> {
-    expect(contractAddress).toBeInstanceOf(AztecAddress);
-    expect(messageHash).toBeInstanceOf(Fr);
-    expect(secret).toBeInstanceOf(Fr);
-    return Promise.resolve([1n, SiblingPath.random(L1_TO_L2_MSG_TREE_HEIGHT)]);
-  }
-  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]> {
-    expect(filter.contractAddress).toEqual(this.address);
-    return Promise.resolve([UniqueNote.random()]);
-  }
-  addNote(note: ExtendedNote, scope?: AztecAddress | undefined): Promise<void> {
-    expect(note).toBeInstanceOf(ExtendedNote);
-    expect(scope).toEqual(this.address);
-    return Promise.resolve();
-  }
-  addNullifiedNote(note: ExtendedNote): Promise<void> {
-    expect(note).toBeInstanceOf(ExtendedNote);
-    return Promise.resolve();
-  }
-  getBlock(number: number): Promise<L2Block | undefined> {
-    return Promise.resolve(L2Block.random(number));
-  }
-  simulateUnconstrained(
-    _functionName: string,
-    _args: any[],
-    to: AztecAddress,
-    from?: AztecAddress | undefined,
-    scopes?: AztecAddress[] | undefined,
-  ): Promise<AbiDecoded> {
-    expect(to).toEqual(this.address);
-    expect(from).toEqual(this.address);
-    expect(scopes).toEqual([this.address]);
-    return Promise.resolve(10n);
-  }
-  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
-    expect(filter.contractAddress).toEqual(this.address);
-    return Promise.resolve({ logs: [ExtendedUnencryptedL2Log.random()], maxLogsHit: true });
-  }
-  getBlockNumber(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  getProvenBlockNumber(): Promise<number> {
-    return Promise.resolve(1);
-  }
-  @memoize
-  getNodeInfo(): Promise<NodeInfo> {
-    return Promise.resolve({
-      nodeVersion: '1.0',
-      l1ChainId: 1,
-      protocolVersion: 1,
-      enr: 'enr',
-      l1ContractAddresses: Object.fromEntries(
-        L1ContractsNames.map(name => [name, EthAddress.random()]),
-      ) as L1ContractAddresses,
-      protocolContractAddresses: Object.fromEntries(
-        ProtocolContractsNames.map(name => [name, AztecAddress.random()]),
-      ) as ProtocolContractAddresses,
-    });
-  }
-  @memoize
-  getPXEInfo(): Promise<PXEInfo> {
-    return Promise.resolve({
-      protocolContractAddresses: Object.fromEntries(
-        ProtocolContractsNames.map(name => [name, AztecAddress.random()]),
-      ) as ProtocolContractAddresses,
-      pxeVersion: '1.0',
-    });
-  }
-  isGlobalStateSynchronized(): Promise<boolean> {
-    return Promise.resolve(true);
-  }
-  isAccountStateSynchronized(account: AztecAddress): Promise<boolean> {
-    expect(account).toEqual(this.address);
-    return Promise.resolve(true);
-  }
-  getSyncStatus(): Promise<SyncStatus> {
-    return Promise.resolve({
-      blocks: 1,
-      notes: { [this.address.toString()]: 1 },
-    });
-  }
-  getSyncStats(): Promise<{ [key: string]: NoteProcessorStats }> {
-    return Promise.resolve({
-      [this.address.toString()]: {
-        seen: 1,
-        deferredIncoming: 1,
-        deferredOutgoing: 1,
-        decryptedIncoming: 1,
-        decryptedOutgoing: 1,
-        failed: 1,
-        blocks: 1,
-        txs: 1,
-      },
-    });
-  }
-  getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
-    expect(address).toEqual(this.address);
-    return Promise.resolve(this.instance);
-  }
-  getContractClass(id: Fr): Promise<ContractClassWithId | undefined> {
-    expect(id).toBeInstanceOf(Fr);
-    const contractClass = getContractClassFromArtifact(this.artifact);
-    return Promise.resolve(contractClass);
-  }
-  getContractArtifact(id: Fr): Promise<ContractArtifact | undefined> {
-    expect(id).toBeInstanceOf(Fr);
-    return Promise.resolve(this.artifact);
-  }
-  isContractClassPubliclyRegistered(id: Fr): Promise<boolean> {
-    expect(id).toBeInstanceOf(Fr);
-    return Promise.resolve(true);
-  }
-  isContractPubliclyDeployed(address: AztecAddress): Promise<boolean> {
-    expect(address).toEqual(this.address);
-    return Promise.resolve(true);
-  }
-  isContractInitialized(address: AztecAddress): Promise<boolean> {
-    expect(address).toEqual(this.address);
-    return Promise.resolve(true);
-  }
-  getEncryptedEvents<T>(
-    _eventMetadata: EventMetadataDefinition,
-    from: number,
-    limit: number,
-    vpks: Point[],
-  ): Promise<T[]> {
-    expect(from).toBe(1);
-    expect(limit).toBe(1);
-    expect(vpks[0]).toBeInstanceOf(Point);
-    return Promise.resolve([{ value: 1n } as T]);
-  }
-  getUnencryptedEvents<T>(_eventMetadata: EventMetadataDefinition, from: number, limit: number): Promise<T[]> {
-    expect(from).toBe(1);
-    expect(limit).toBe(1);
-    return Promise.resolve([{ value: 1n } as T]);
-  }
-}
diff --git a/yarn-project/circuit-types/src/interfaces/pxe.ts b/yarn-project/circuit-types/src/interfaces/pxe.ts
index 98554237072..cb381ea262e 100644
--- a/yarn-project/circuit-types/src/interfaces/pxe.ts
+++ b/yarn-project/circuit-types/src/interfaces/pxe.ts
@@ -1,48 +1,29 @@
 import {
   type AztecAddress,
-  CompleteAddress,
+  type CompleteAddress,
   type ContractClassWithId,
-  ContractClassWithIdSchema,
   type ContractInstanceWithAddress,
-  ContractInstanceWithAddressSchema,
   type Fr,
-  L1_TO_L2_MSG_TREE_HEIGHT,
+  type L1_TO_L2_MSG_TREE_HEIGHT,
   type NodeInfo,
-  NodeInfoSchema,
   type PartialAddress,
   type Point,
   type ProtocolContractAddresses,
-  ProtocolContractAddressesSchema,
 } from '@aztec/circuits.js';
-import {
-  type AbiDecoded,
-  type AbiType,
-  AbiTypeSchema,
-  type ContractArtifact,
-  ContractArtifactSchema,
-  type EventSelector,
-} from '@aztec/foundation/abi';
-import { AbiDecodedSchema, type ApiSchemaFor, type ZodFor, optional, schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-import { AuthWitness } from '../auth_witness.js';
-import { L2Block } from '../l2_block.js';
-import {
-  type GetUnencryptedLogsResponse,
-  GetUnencryptedLogsResponseSchema,
-  type LogFilter,
-  LogFilterSchema,
-} from '../logs/index.js';
-import { type IncomingNotesFilter, IncomingNotesFilterSchema } from '../notes/incoming_notes_filter.js';
-import { ExtendedNote, type OutgoingNotesFilter, OutgoingNotesFilterSchema, UniqueNote } from '../notes/index.js';
-import { PrivateExecutionResult } from '../private_execution_result.js';
-import { SiblingPath } from '../sibling_path/sibling_path.js';
-import { type NoteProcessorStats, NoteProcessorStatsSchema } from '../stats/stats.js';
-import { Tx, TxHash, TxProvingResult, TxReceipt, TxSimulationResult } from '../tx/index.js';
-import { TxEffect } from '../tx_effect.js';
-import { TxExecutionRequest } from '../tx_execution_request.js';
-import { type SyncStatus, SyncStatusSchema } from './sync-status.js';
+import type { AbiType, ContractArtifact, EventSelector } from '@aztec/foundation/abi';
+
+import { type AuthWitness } from '../auth_witness.js';
+import { type L2Block } from '../l2_block.js';
+import { type GetUnencryptedLogsResponse, type LogFilter } from '../logs/index.js';
+import { type IncomingNotesFilter } from '../notes/incoming_notes_filter.js';
+import { type ExtendedNote, type OutgoingNotesFilter, type UniqueNote } from '../notes/index.js';
+import { type PrivateExecutionResult } from '../private_execution_result.js';
+import { type SiblingPath } from '../sibling_path/sibling_path.js';
+import { type NoteProcessorStats } from '../stats/stats.js';
+import { type Tx, type TxHash, type TxProvingResult, type TxReceipt, type TxSimulationResult } from '../tx/index.js';
+import { type TxEffect } from '../tx_effect.js';
+import { type TxExecutionRequest } from '../tx_execution_request.js';
+import { type SyncStatus } from './sync-status.js';
 
 // docs:start:pxe-interface
 /**
@@ -304,7 +285,7 @@ export interface PXE {
     to: AztecAddress,
     from?: AztecAddress,
     scopes?: AztecAddress[],
-  ): Promise<AbiDecoded>;
+  ): Promise<any>;
 
   /**
    * Gets unencrypted logs based on the provided filter.
@@ -416,155 +397,42 @@ export interface PXE {
   isContractInitialized(address: AztecAddress): Promise<boolean>;
 
   /**
-   * Returns the enctypred events given search parameters.
+   * Returns the events of a specified type given search parameters.
+   * @param type - The type of the event to search for—Encrypted, or Unencrypted.
    * @param eventMetadata - Metadata of the event. This should be the class generated from the contract. e.g. Contract.events.Event
    * @param from - The block number to search from.
    * @param limit - The amount of blocks to search.
-   * @param vpks - The viewing (incoming and outgoing) public keys that correspond to the viewing secret keys that can decrypt the log.
+   * @param vpks - (Used for encrypted logs only) The viewing (incoming and outgoing) public keys that correspond to the viewing secret keys that can decrypt the log.
    * @returns - The deserialized events.
    */
-  getEncryptedEvents<T>(
-    eventMetadata: EventMetadataDefinition,
+  getEvents<T>(
+    type: EventType,
+    eventMetadata: { eventSelector: EventSelector; abiType: AbiType; fieldNames: string[] },
     from: number,
     limit: number,
     vpks: Point[],
   ): Promise<T[]>;
-
-  /**
-   * Returns the unenctypred events given search parameters.
-   * @param eventMetadata - Metadata of the event. This should be the class generated from the contract. e.g. Contract.events.Event
-   * @param from - The block number to search from.
-   * @param limit - The amount of blocks to search.
-   * @returns - The deserialized events.
-   */
-  getUnencryptedEvents<T>(eventMetadata: EventMetadataDefinition, from: number, limit: number): Promise<T[]>;
 }
 // docs:end:pxe-interface
 
-export type EventMetadataDefinition = {
-  eventSelector: EventSelector;
-  abiType: AbiType;
-  fieldNames: string[];
-};
-
-const EventMetadataDefinitionSchema = z.object({
-  eventSelector: schemas.EventSelector,
-  abiType: AbiTypeSchema,
-  fieldNames: z.array(z.string()),
-});
-
-/** This is used in getting events via the filter */
+/**
+ * This is used in getting events via the filter
+ */
 export enum EventType {
   Encrypted = 'Encrypted',
   Unencrypted = 'Unencrypted',
 }
 
-/** Provides basic information about the running PXE. */
+/**
+ * Provides basic information about the running PXE.
+ */
 export interface PXEInfo {
-  /** Version as tracked in the aztec-packages repository. */
+  /**
+   * Version as tracked in the aztec-packages repository.
+   */
   pxeVersion: string;
-  /** Protocol contract addresses */
+  /**
+   * Protocol contract addresses
+   */
   protocolContractAddresses: ProtocolContractAddresses;
 }
-
-const PXEInfoSchema = z.object({
-  pxeVersion: z.string(),
-  protocolContractAddresses: ProtocolContractAddressesSchema,
-}) satisfies ZodFor<PXEInfo>;
-
-export const PXESchema: ApiSchemaFor<PXE> = {
-  addAuthWitness: z.function().args(AuthWitness.schema).returns(z.void()),
-  getAuthWitness: z
-    .function()
-    .args(schemas.Fr)
-    .returns(z.union([z.undefined(), z.array(schemas.Fr)])),
-  addCapsule: z.function().args(z.array(schemas.Fr)).returns(z.void()),
-  registerAccount: z.function().args(schemas.Fr, schemas.Fr).returns(CompleteAddress.schema),
-  getRegisteredAccounts: z.function().returns(z.array(CompleteAddress.schema)),
-  getRegisteredAccount: z
-    .function()
-    .args(schemas.AztecAddress)
-    .returns(z.union([CompleteAddress.schema, z.undefined()])),
-  registerContact: z.function().args(schemas.AztecAddress).returns(schemas.AztecAddress),
-  getContacts: z.function().returns(z.array(schemas.AztecAddress)),
-  removeContact: z.function().args(schemas.AztecAddress).returns(z.void()),
-  registerContractClass: z.function().args(ContractArtifactSchema).returns(z.void()),
-  registerContract: z
-    .function()
-    .args(z.object({ instance: ContractInstanceWithAddressSchema, artifact: z.optional(ContractArtifactSchema) }))
-    .returns(z.void()),
-  getContracts: z.function().returns(z.array(schemas.AztecAddress)),
-  proveTx: z.function().args(TxExecutionRequest.schema, PrivateExecutionResult.schema).returns(TxProvingResult.schema),
-  simulateTx: z
-    .function()
-    .args(
-      TxExecutionRequest.schema,
-      z.boolean(),
-      optional(schemas.AztecAddress),
-      optional(z.boolean()),
-      optional(z.boolean()),
-      optional(z.array(schemas.AztecAddress)),
-    )
-    .returns(TxSimulationResult.schema),
-  sendTx: z.function().args(Tx.schema).returns(TxHash.schema),
-  getTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema),
-  getTxEffect: z
-    .function()
-    .args(TxHash.schema)
-    .returns(z.union([TxEffect.schema, z.undefined()])),
-  getPublicStorageAt: z.function().args(schemas.AztecAddress, schemas.Fr).returns(schemas.Fr),
-  getIncomingNotes: z.function().args(IncomingNotesFilterSchema).returns(z.array(UniqueNote.schema)),
-  getL1ToL2MembershipWitness: z
-    .function()
-    .args(schemas.AztecAddress, schemas.Fr, schemas.Fr)
-    .returns(z.tuple([schemas.BigInt, SiblingPath.schemaFor(L1_TO_L2_MSG_TREE_HEIGHT)])),
-  getOutgoingNotes: z.function().args(OutgoingNotesFilterSchema).returns(z.array(UniqueNote.schema)),
-  addNote: z.function().args(ExtendedNote.schema, optional(schemas.AztecAddress)).returns(z.void()),
-  addNullifiedNote: z.function().args(ExtendedNote.schema).returns(z.void()),
-  getBlock: z
-    .function()
-    .args(z.number())
-    .returns(z.union([L2Block.schema, z.undefined()])),
-  simulateUnconstrained: z
-    .function()
-    .args(
-      z.string(),
-      z.array(z.any()),
-      schemas.AztecAddress,
-      optional(schemas.AztecAddress),
-      optional(z.array(schemas.AztecAddress)),
-    )
-    .returns(AbiDecodedSchema),
-  getUnencryptedLogs: z.function().args(LogFilterSchema).returns(GetUnencryptedLogsResponseSchema),
-  getBlockNumber: z.function().returns(z.number()),
-  getProvenBlockNumber: z.function().returns(z.number()),
-  getNodeInfo: z.function().returns(NodeInfoSchema),
-  getPXEInfo: z.function().returns(PXEInfoSchema),
-  isGlobalStateSynchronized: z.function().returns(z.boolean()),
-  isAccountStateSynchronized: z.function().args(schemas.AztecAddress).returns(z.boolean()),
-  getSyncStatus: z.function().returns(SyncStatusSchema),
-  getSyncStats: z.function().returns(z.record(NoteProcessorStatsSchema)),
-  getContractInstance: z
-    .function()
-    .args(schemas.AztecAddress)
-    .returns(z.union([ContractInstanceWithAddressSchema, z.undefined()])),
-  getContractClass: z
-    .function()
-    .args(schemas.Fr)
-    .returns(z.union([ContractClassWithIdSchema, z.undefined()])),
-  getContractArtifact: z
-    .function()
-    .args(schemas.Fr)
-    .returns(z.union([ContractArtifactSchema, z.undefined()])),
-  isContractClassPubliclyRegistered: z.function().args(schemas.Fr).returns(z.boolean()),
-  isContractPubliclyDeployed: z.function().args(schemas.AztecAddress).returns(z.boolean()),
-  isContractInitialized: z.function().args(schemas.AztecAddress).returns(z.boolean()),
-  getEncryptedEvents: z
-    .function()
-    .args(EventMetadataDefinitionSchema, z.number(), z.number(), z.array(schemas.Point))
-    .returns(z.array(AbiDecodedSchema)),
-  getUnencryptedEvents: z
-    .function()
-    .args(EventMetadataDefinitionSchema, z.number(), z.number())
-    .returns(z.array(AbiDecodedSchema)),
-};
diff --git a/yarn-project/circuit-types/src/interfaces/service.ts b/yarn-project/circuit-types/src/interfaces/service.ts
deleted file mode 100644
index 573dad106cb..00000000000
--- a/yarn-project/circuit-types/src/interfaces/service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { type DebugLogger } from '@aztec/foundation/log';
-import { type Maybe } from '@aztec/foundation/types';
-
-/** Represents a local service that can be started and stopped. */
-export interface Service {
-  /**
-   * Starts the service.
-   * @param waitUntilSynced - Whether to wait until the service is fully synched before returning.
-   */
-  start(waitUntilSynced?: boolean): Promise<void>;
-
-  /** Stops the service. */
-  stop(): Promise<void>;
-}
-
-/** Tries to call stop on a given object and awaits it. Logs any errors and does not rethrow. */
-export async function tryStop(service: Maybe<Service>, logger?: DebugLogger): Promise<void> {
-  try {
-    return typeof service === 'object' && service && 'stop' in service && typeof service.stop === 'function'
-      ? await service.stop()
-      : Promise.resolve();
-  } catch (err) {
-    logger?.error(`Error stopping service ${(service as object).constructor?.name}: ${err}`);
-  }
-}
diff --git a/yarn-project/circuit-types/src/interfaces/sync-status.ts b/yarn-project/circuit-types/src/interfaces/sync-status.ts
index 59696232b5d..0e453b41bfd 100644
--- a/yarn-project/circuit-types/src/interfaces/sync-status.ts
+++ b/yarn-project/circuit-types/src/interfaces/sync-status.ts
@@ -1,7 +1,3 @@
-import { type ZodFor } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
 /** Provides up to which block has been synced by different components. */
 export type SyncStatus = {
   /** Up to which block has been synched for blocks and txs. */
@@ -9,8 +5,3 @@ export type SyncStatus = {
   /** Up to which block has been synched for notes, indexed by each account address being monitored. */
   notes: Record<string, number>;
 };
-
-export const SyncStatusSchema = z.object({
-  blocks: z.number(),
-  notes: z.record(z.number()),
-}) satisfies ZodFor<SyncStatus>;
diff --git a/yarn-project/circuit-types/src/l2_block.ts b/yarn-project/circuit-types/src/l2_block.ts
index 49c47b45461..092b3fdf2de 100644
--- a/yarn-project/circuit-types/src/l2_block.ts
+++ b/yarn-project/circuit-types/src/l2_block.ts
@@ -4,8 +4,6 @@ import { sha256, sha256ToField } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge.js';
 
 /**
@@ -21,24 +19,6 @@ export class L2Block {
     public body: Body,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        archive: AppendOnlyTreeSnapshot.schema,
-        header: Header.schema,
-        body: Body.schema,
-      })
-      .transform(({ archive, header, body }) => new L2Block(archive, header, body));
-  }
-
-  toJSON() {
-    return {
-      archive: this.archive,
-      header: this.header,
-      body: this.body,
-    };
-  }
-
   /**
    * Deserializes a block from a buffer
    * @returns A deserialized L2 block.
diff --git a/yarn-project/circuit-types/src/l2_block_source.ts b/yarn-project/circuit-types/src/l2_block_source.ts
index 4dac6da0db9..6cc0af03059 100644
--- a/yarn-project/circuit-types/src/l2_block_source.ts
+++ b/yarn-project/circuit-types/src/l2_block_source.ts
@@ -1,7 +1,5 @@
 import { type EthAddress, type Header } from '@aztec/circuits.js';
 
-import { z } from 'zod';
-
 import { type L2Block } from './l2_block.js';
 import { type TxHash } from './tx/tx_hash.js';
 import { type TxReceipt } from './tx/tx_receipt.js';
@@ -105,6 +103,19 @@ export interface L2BlockSource {
    * Returns the tips of the L2 chain.
    */
   getL2Tips(): Promise<L2Tips>;
+
+  /**
+   * Starts the L2 block source.
+   * @param blockUntilSynced - If true, blocks until the data source has fully synced.
+   * @returns A promise signalling completion of the start process.
+   */
+  start(blockUntilSynced: boolean): Promise<void>;
+
+  /**
+   * Stops the L2 block source.
+   * @returns A promise signalling completion of the stop process.
+   */
+  stop(): Promise<void>;
 }
 
 /**
@@ -119,21 +130,14 @@ export type L2BlockTag = 'latest' | 'proven' | 'finalized';
 export type L2Tips = Record<L2BlockTag, L2BlockId>;
 
 /** Identifies a block by number and hash. */
-export type L2BlockId = z.infer<typeof L2BlockIdSchema>;
-
-const L2BlockIdSchema = z.union([
-  z.object({
-    number: z.literal(0),
-    hash: z.undefined(),
-  }),
-  z.object({
-    number: z.number(),
-    hash: z.string(),
-  }),
-]);
-
-export const L2TipsSchema = z.object({
-  latest: L2BlockIdSchema,
-  proven: L2BlockIdSchema,
-  finalized: L2BlockIdSchema,
-}) satisfies z.ZodType<L2Tips>;
+export type L2BlockId =
+  | {
+      number: 0;
+      hash: undefined;
+    }
+  | {
+      /** L2 block number. */
+      number: number;
+      /** L2 block hash. */
+      hash: string;
+    };
diff --git a/yarn-project/circuit-types/src/logs/encrypted_l2_log.ts b/yarn-project/circuit-types/src/logs/encrypted_l2_log.ts
index f59b98fa6a6..dd866306c99 100644
--- a/yarn-project/circuit-types/src/logs/encrypted_l2_log.ts
+++ b/yarn-project/circuit-types/src/logs/encrypted_l2_log.ts
@@ -1,8 +1,5 @@
 import { Fr, Point } from '@aztec/circuits.js';
 import { randomBytes, sha256Trunc } from '@aztec/foundation/crypto';
-import { schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 /**
  * Represents an individual encrypted event log entry.
@@ -23,12 +20,6 @@ export class EncryptedL2Log {
     return Buffer.concat([this.maskedContractAddress.toBuffer(), this.data]);
   }
 
-  static get schema() {
-    return z
-      .object({ data: schemas.BufferHex, maskedContractAddress: schemas.Fr })
-      .transform(({ data, maskedContractAddress }) => new EncryptedL2Log(data, maskedContractAddress));
-  }
-
   /** Returns a JSON-friendly representation of the log. */
   public toJSON(): object {
     return {
diff --git a/yarn-project/circuit-types/src/logs/encrypted_l2_note_log.ts b/yarn-project/circuit-types/src/logs/encrypted_l2_note_log.ts
index 23f5a2a99b1..095fe870b29 100644
--- a/yarn-project/circuit-types/src/logs/encrypted_l2_note_log.ts
+++ b/yarn-project/circuit-types/src/logs/encrypted_l2_note_log.ts
@@ -1,8 +1,5 @@
 import { Fr, Point } from '@aztec/circuits.js';
 import { randomBytes, sha256Trunc } from '@aztec/foundation/crypto';
-import { schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 /**
  * Represents an individual encrypted log entry.
@@ -27,13 +24,9 @@ export class EncryptedL2NoteLog {
 
   /** Returns a JSON-friendly representation of the log. */
   public toJSON(): object {
-    return { data: this.data.toString('hex') };
-  }
-
-  static get schema() {
-    return z
-      .object({ data: schemas.HexString })
-      .transform(({ data }) => new EncryptedL2NoteLog(Buffer.from(data, 'hex')));
+    return {
+      data: this.data.toString('hex'),
+    };
   }
 
   /** Converts a plain JSON object into an instance. */
diff --git a/yarn-project/circuit-types/src/logs/event_metadata.ts b/yarn-project/circuit-types/src/logs/event_metadata.ts
index cbf71b28112..9e2e44f7abf 100644
--- a/yarn-project/circuit-types/src/logs/event_metadata.ts
+++ b/yarn-project/circuit-types/src/logs/event_metadata.ts
@@ -1,9 +1,7 @@
-import { L1EventPayload, type UnencryptedL2Log } from '@aztec/circuit-types';
-import { type AbiType, AbiTypeSchema, EventSelector, decodeFromAbi } from '@aztec/foundation/abi';
+import { EventType, L1EventPayload, type UnencryptedL2Log } from '@aztec/circuit-types';
+import { type AbiType } from '@aztec/foundation/abi';
+import { EventSelector, decodeFromAbi } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 /**
  * Represents metadata for an event decoder, including all information needed to reconstruct it.
@@ -15,7 +13,10 @@ export class EventMetadata<T> {
   public readonly abiType: AbiType;
   public readonly fieldNames: string[];
 
-  constructor(event: { eventSelector: EventSelector; abiType: AbiType; fieldNames: string[] }) {
+  constructor(
+    public readonly eventType: EventType,
+    event: { eventSelector: EventSelector; abiType: AbiType; fieldNames: string[] },
+  ) {
     this.eventSelector = event.eventSelector;
     this.abiType = event.abiType;
     this.fieldNames = event.fieldNames;
@@ -52,29 +53,22 @@ export class EventMetadata<T> {
    */
   public toJSON() {
     return {
-      type: 'event_metadata', // TODO(palla/schemas): Remove this type property
-      eventSelector: this.eventSelector,
-      abiType: this.abiType,
+      type: 'event_metadata',
+      eventSelector: this.eventSelector.toString(),
+      eventType: this.eventType,
       fieldNames: this.fieldNames,
     };
   }
 
-  static get schema() {
-    return z
-      .object({
-        eventSelector: schemas.EventSelector,
-        abiType: AbiTypeSchema,
-        fieldNames: z.array(z.string()),
-        type: z.literal('event_metadata').optional(),
-      })
-      .transform(obj => new EventMetadata(obj));
-  }
-
   /**
    * Creates an EventMetadata instance from a JSON representation
    */
   public static fromJSON(json: any): EventMetadata<any> {
-    return new EventMetadata({
+    if (json?.type !== 'event_metadata') {
+      throw new Error('Invalid event metadata format');
+    }
+
+    return new EventMetadata(EventType.Encrypted, {
       eventSelector: EventSelector.fromString(json.eventSelector),
       abiType: json.abiType,
       fieldNames: json.fieldNames,
diff --git a/yarn-project/circuit-types/src/logs/extended_unencrypted_l2_log.ts b/yarn-project/circuit-types/src/logs/extended_unencrypted_l2_log.ts
index b571879aacd..0916f723164 100644
--- a/yarn-project/circuit-types/src/logs/extended_unencrypted_l2_log.ts
+++ b/yarn-project/circuit-types/src/logs/extended_unencrypted_l2_log.ts
@@ -1,8 +1,6 @@
 import { BufferReader } from '@aztec/foundation/serialize';
-import { type FieldsOf } from '@aztec/foundation/types';
 
 import isEqual from 'lodash.isequal';
-import { z } from 'zod';
 
 import { LogId } from './log_id.js';
 import { UnencryptedL2Log } from './unencrypted_l2_log.js';
@@ -18,27 +16,6 @@ export class ExtendedUnencryptedL2Log {
     public readonly log: UnencryptedL2Log,
   ) {}
 
-  static random() {
-    return new ExtendedUnencryptedL2Log(LogId.random(), UnencryptedL2Log.random());
-  }
-
-  toJSON() {
-    return { id: this.id, log: this.log };
-  }
-
-  static get schema() {
-    return z
-      .object({
-        id: LogId.schema,
-        log: UnencryptedL2Log.schema,
-      })
-      .transform(ExtendedUnencryptedL2Log.from);
-  }
-
-  static from(fields: FieldsOf<ExtendedUnencryptedL2Log>) {
-    return new ExtendedUnencryptedL2Log(fields.id, fields.log);
-  }
-
   /**
    * Serializes log to a buffer.
    * @returns A buffer containing the serialized log.
diff --git a/yarn-project/circuit-types/src/logs/function_l2_logs.test.ts b/yarn-project/circuit-types/src/logs/function_l2_logs.test.ts
index 5effe039a0c..e22549d4576 100644
--- a/yarn-project/circuit-types/src/logs/function_l2_logs.test.ts
+++ b/yarn-project/circuit-types/src/logs/function_l2_logs.test.ts
@@ -19,8 +19,8 @@ function shouldBehaveLikeFunctionL2Logs(
     it('can encode L2Logs to JSON and back', () => {
       const l2Logs = FunctionL2Logs.random(3);
 
-      const buffer = JSON.stringify(l2Logs.toJSON());
-      const recovered = FunctionL2Logs.fromJSON(JSON.parse(buffer));
+      const buffer = l2Logs.toJSON();
+      const recovered = FunctionL2Logs.fromJSON(buffer);
 
       expect(recovered).toEqual(l2Logs);
     });
diff --git a/yarn-project/circuit-types/src/logs/function_l2_logs.ts b/yarn-project/circuit-types/src/logs/function_l2_logs.ts
index e3127e63cd6..e45fcbef4e9 100644
--- a/yarn-project/circuit-types/src/logs/function_l2_logs.ts
+++ b/yarn-project/circuit-types/src/logs/function_l2_logs.ts
@@ -4,11 +4,8 @@ import {
   MAX_UNENCRYPTED_LOGS_PER_CALL,
 } from '@aztec/circuits.js';
 import { sha256Trunc } from '@aztec/foundation/crypto';
-import { type ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 import { EncryptedL2Log } from './encrypted_l2_log.js';
 import { EncryptedL2NoteLog } from './encrypted_l2_note_log.js';
 import { UnencryptedL2Log } from './unencrypted_l2_log.js';
@@ -18,7 +15,9 @@ import { UnencryptedL2Log } from './unencrypted_l2_log.js';
  */
 export abstract class FunctionL2Logs<TLog extends UnencryptedL2Log | EncryptedL2NoteLog | EncryptedL2Log> {
   constructor(
-    /** An array of logs. */
+    /**
+     * An array of logs.
+     */
     public readonly logs: TLog[],
   ) {}
 
@@ -68,17 +67,13 @@ export abstract class FunctionL2Logs<TLog extends UnencryptedL2Log | EncryptedL2
    * @returns A plain object with FunctionL2Logs properties.
    */
   public toJSON() {
-    return { logs: this.logs };
+    return {
+      logs: this.logs.map(log => log.toJSON()),
+    };
   }
 }
 
 export class EncryptedNoteFunctionL2Logs extends FunctionL2Logs<EncryptedL2NoteLog> {
-  static get schema() {
-    return z
-      .object({ logs: z.array(EncryptedL2NoteLog.schema) })
-      .transform(({ logs }) => new EncryptedNoteFunctionL2Logs(logs));
-  }
-
   /**
    * Creates an empty L2Logs object with no logs.
    * @returns A new FunctionL2Logs object with no logs.
@@ -131,12 +126,6 @@ export class EncryptedNoteFunctionL2Logs extends FunctionL2Logs<EncryptedL2NoteL
 }
 
 export class EncryptedFunctionL2Logs extends FunctionL2Logs<EncryptedL2Log> {
-  static get schema(): ZodFor<EncryptedFunctionL2Logs> {
-    return z
-      .object({ logs: z.array(EncryptedL2Log.schema) })
-      .transform(({ logs }) => new EncryptedFunctionL2Logs(logs));
-  }
-
   /**
    * Creates an empty L2Logs object with no logs.
    * @returns A new FunctionL2Logs object with no logs.
@@ -189,12 +178,6 @@ export class EncryptedFunctionL2Logs extends FunctionL2Logs<EncryptedL2Log> {
 }
 
 export class UnencryptedFunctionL2Logs extends FunctionL2Logs<UnencryptedL2Log> {
-  static get schema() {
-    return z
-      .object({ logs: z.array(UnencryptedL2Log.schema) })
-      .transform(({ logs }) => new UnencryptedFunctionL2Logs(logs));
-  }
-
   /**
    * Creates an empty L2Logs object with no logs.
    * @returns A new FunctionL2Logs object with no logs.
diff --git a/yarn-project/circuit-types/src/logs/get_logs_response.ts b/yarn-project/circuit-types/src/logs/get_logs_response.ts
index 61df2d208bb..68b1dbb9068 100644
--- a/yarn-project/circuit-types/src/logs/get_logs_response.ts
+++ b/yarn-project/circuit-types/src/logs/get_logs_response.ts
@@ -1,26 +1,24 @@
 import { Fr } from '@aztec/circuits.js';
-import { type ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
+import { EncryptedL2NoteLog, TxHash } from '../index.js';
+import { type ExtendedUnencryptedL2Log } from './extended_unencrypted_l2_log.js';
 
-import { TxHash } from '../tx/tx_hash.js';
-import { EncryptedL2NoteLog } from './encrypted_l2_note_log.js';
-import { ExtendedUnencryptedL2Log } from './extended_unencrypted_l2_log.js';
-
-/** Response for the getUnencryptedLogs archiver call. */
+/**
+ * It provides documentation for the GetUnencryptedLogsResponse type.
+ */
 export type GetUnencryptedLogsResponse = {
-  /** An array of ExtendedUnencryptedL2Log elements. */
+  /**
+   * An array of ExtendedUnencryptedL2Log elements.
+   */
   logs: ExtendedUnencryptedL2Log[];
-  /** Indicates if a limit has been reached. */
+
+  /**
+   * Indicates if a limit has been reached.
+   */
   maxLogsHit: boolean;
 };
 
-export const GetUnencryptedLogsResponseSchema = z.object({
-  logs: z.array(ExtendedUnencryptedL2Log.schema),
-  maxLogsHit: z.boolean(),
-}) satisfies ZodFor<GetUnencryptedLogsResponse>;
-
 export class TxScopedEncryptedL2NoteLog {
   constructor(
     /*
@@ -38,18 +36,6 @@ export class TxScopedEncryptedL2NoteLog {
     public log: EncryptedL2NoteLog,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        txHash: TxHash.schema,
-        dataStartIndexForTx: z.number(),
-        log: EncryptedL2NoteLog.schema,
-      })
-      .transform(
-        ({ txHash, dataStartIndexForTx, log }) => new TxScopedEncryptedL2NoteLog(txHash, dataStartIndexForTx, log),
-      );
-  }
-
   toBuffer() {
     return Buffer.concat([this.txHash.toBuffer(), numToUInt32BE(this.dataStartIndexForTx), this.log.toBuffer()]);
   }
@@ -62,8 +48,4 @@ export class TxScopedEncryptedL2NoteLog {
       EncryptedL2NoteLog.fromBuffer(reader.readToEnd()),
     );
   }
-
-  static random() {
-    return new TxScopedEncryptedL2NoteLog(TxHash.random(), 1, EncryptedL2NoteLog.random());
-  }
 }
diff --git a/yarn-project/circuit-types/src/logs/l1_payload/payload.ts b/yarn-project/circuit-types/src/logs/l1_payload/payload.ts
index cc460a2a3cd..08e02e56f11 100644
--- a/yarn-project/circuit-types/src/logs/l1_payload/payload.ts
+++ b/yarn-project/circuit-types/src/logs/l1_payload/payload.ts
@@ -1,7 +1,6 @@
 import { Vector } from '@aztec/circuits.js';
 import { randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 
 /**
@@ -10,14 +9,6 @@ import { BufferReader } from '@aztec/foundation/serialize';
  * additional operations on the underlying field elements.
  */
 export class Payload extends Vector<Fr> {
-  toJSON() {
-    return this.toString();
-  }
-
-  static get schema() {
-    return hexSchemaFor(Payload);
-  }
-
   /**
    * Create a Note instance from a Buffer or BufferReader.
    * The input 'buffer' can be either a Buffer containing the serialized Fr elements or a BufferReader instance.
@@ -66,7 +57,7 @@ export class Payload extends Vector<Fr> {
     return this.items.length;
   }
 
-  equals(other: Payload) {
+  equals(other: Note) {
     return this.items.every((item, index) => item.equals(other.items[index]));
   }
 }
diff --git a/yarn-project/circuit-types/src/logs/l2_block_l2_logs.test.ts b/yarn-project/circuit-types/src/logs/l2_block_l2_logs.test.ts
index 540e118b99f..e8eac6ac0f0 100644
--- a/yarn-project/circuit-types/src/logs/l2_block_l2_logs.test.ts
+++ b/yarn-project/circuit-types/src/logs/l2_block_l2_logs.test.ts
@@ -1,11 +1,4 @@
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-
-import {
-  L2BlockL2Logs as BaseL2BlockL2Logs,
-  EncryptedL2BlockL2Logs,
-  EncryptedNoteL2BlockL2Logs,
-  UnencryptedL2BlockL2Logs,
-} from './l2_block_l2_logs.js';
+import { EncryptedL2BlockL2Logs, EncryptedNoteL2BlockL2Logs, UnencryptedL2BlockL2Logs } from './l2_block_l2_logs.js';
 
 function shouldBehaveLikeL2BlockL2Logs(
   L2BlockL2Logs: typeof EncryptedNoteL2BlockL2Logs | typeof UnencryptedL2BlockL2Logs | typeof EncryptedL2BlockL2Logs,
@@ -34,20 +27,11 @@ function shouldBehaveLikeL2BlockL2Logs(
       }
     });
 
-    it('serializes to and from JSON via fromJSON', () => {
-      const l2Logs = L2BlockL2Logs.random(3, 4, 2);
-      const json = jsonStringify(l2Logs);
-      const recovered = L2BlockL2Logs.fromJSON(JSON.parse(json));
-      expect(recovered).toEqual(l2Logs);
-      expect(recovered).toBeInstanceOf(L2BlockL2Logs);
-    });
-
-    it('serializes to and from JSON via schema', () => {
+    it('serializes to and from JSON', () => {
       const l2Logs = L2BlockL2Logs.random(3, 4, 2);
-      const json = jsonStringify(l2Logs);
-      const recovered = BaseL2BlockL2Logs.schema.parse(JSON.parse(json));
+      const json = l2Logs.toJSON();
+      const recovered = L2BlockL2Logs.fromJSON(json);
       expect(recovered).toEqual(l2Logs);
-      expect(recovered).toBeInstanceOf(L2BlockL2Logs);
     });
   });
 }
diff --git a/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts b/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts
index 9d858041460..e4d74dc3bb8 100644
--- a/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts
+++ b/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts
@@ -1,8 +1,6 @@
-import { type ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serialize';
 
 import isEqual from 'lodash.isequal';
-import { z } from 'zod';
 
 import { type EncryptedL2Log } from './encrypted_l2_log.js';
 import { type EncryptedL2NoteLog } from './encrypted_l2_note_log.js';
@@ -20,15 +18,6 @@ export abstract class L2BlockL2Logs<TLog extends UnencryptedL2Log | EncryptedL2N
     public readonly txLogs: TxL2Logs<TLog>[],
   ) {}
 
-  public abstract get type(): string;
-
-  static get schema(): ZodFor<
-    L2BlockL2Logs<EncryptedL2NoteLog> | L2BlockL2Logs<EncryptedL2Log> | L2BlockL2Logs<UnencryptedL2Log>
-  > {
-    // TODO(palla/schemas): This should be a discriminated union, but the compiler refuses
-    return z.union([EncryptedNoteL2BlockL2Logs.schema, EncryptedL2BlockL2Logs.schema, UnencryptedL2BlockL2Logs.schema]);
-  }
-
   /**
    * Serializes logs into a buffer.
    * @returns A buffer containing the serialized logs.
@@ -67,7 +56,9 @@ export abstract class L2BlockL2Logs<TLog extends UnencryptedL2Log | EncryptedL2N
    * @returns A plain object with L2BlockL2Logs properties.
    */
   public toJSON() {
-    return { txLogs: this.txLogs, type: this.type };
+    return {
+      txLogs: this.txLogs.map(log => log.toJSON()),
+    };
   }
 
   /**
@@ -92,16 +83,6 @@ export abstract class L2BlockL2Logs<TLog extends UnencryptedL2Log | EncryptedL2N
 }
 
 export class EncryptedNoteL2BlockL2Logs extends L2BlockL2Logs<EncryptedL2NoteLog> {
-  static override get schema() {
-    return z
-      .object({ type: z.literal('EncryptedNote'), txLogs: z.array(EncryptedNoteTxL2Logs.schema) })
-      .transform(({ txLogs }) => new EncryptedNoteL2BlockL2Logs(txLogs));
-  }
-
-  public get type() {
-    return 'EncryptedNote';
-  }
-
   /**
    * Convert a plain JSON object to a L2BlockL2Logs class object.
    * @param obj - A plain L2BlockL2Logs JSON object.
@@ -173,16 +154,6 @@ export class EncryptedNoteL2BlockL2Logs extends L2BlockL2Logs<EncryptedL2NoteLog
 }
 
 export class EncryptedL2BlockL2Logs extends L2BlockL2Logs<EncryptedL2Log> {
-  static override get schema() {
-    return z
-      .object({ type: z.literal('Encrypted'), txLogs: z.array(EncryptedTxL2Logs.schema) })
-      .transform(({ txLogs }) => new EncryptedL2BlockL2Logs(txLogs));
-  }
-
-  public get type() {
-    return 'Encrypted';
-  }
-
   /**
    * Convert a plain JSON object to a L2BlockL2Logs class object.
    * @param obj - A plain L2BlockL2Logs JSON object.
@@ -254,16 +225,6 @@ export class EncryptedL2BlockL2Logs extends L2BlockL2Logs<EncryptedL2Log> {
 }
 
 export class UnencryptedL2BlockL2Logs extends L2BlockL2Logs<UnencryptedL2Log> {
-  static override get schema() {
-    return z
-      .object({ type: z.literal('Unencrypted'), txLogs: z.array(UnencryptedTxL2Logs.schema) })
-      .transform(({ txLogs }) => new UnencryptedL2BlockL2Logs(txLogs));
-  }
-
-  public get type() {
-    return 'Unencrypted';
-  }
-
   /**
    * Convert a plain JSON object to a L2BlockL2Logs class object.
    * @param obj - A plain L2BlockL2Logs JSON object.
diff --git a/yarn-project/circuit-types/src/logs/log_filter.ts b/yarn-project/circuit-types/src/logs/log_filter.ts
index 0ac97ee5da5..93a33725b2f 100644
--- a/yarn-project/circuit-types/src/logs/log_filter.ts
+++ b/yarn-project/circuit-types/src/logs/log_filter.ts
@@ -1,10 +1,7 @@
 import { type AztecAddress } from '@aztec/circuits.js';
-import { schemas } from '@aztec/foundation/schemas';
 
-import { z } from 'zod';
-
-import { TxHash } from '../tx/tx_hash.js';
-import { LogId } from './log_id.js';
+import { type TxHash } from '../tx/tx_hash.js';
+import { type LogId } from './log_id.js';
 
 /**
  * Log filter used to fetch L2 logs.
@@ -22,11 +19,3 @@ export type LogFilter = {
   /** The contract address to filter logs by. */
   contractAddress?: AztecAddress;
 };
-
-export const LogFilterSchema = z.object({
-  txHash: TxHash.schema.optional(),
-  fromBlock: schemas.Integer.optional(),
-  toBlock: schemas.Integer.optional(),
-  afterLog: LogId.schema.optional(),
-  contractAddress: schemas.AztecAddress.optional(),
-});
diff --git a/yarn-project/circuit-types/src/logs/log_id.ts b/yarn-project/circuit-types/src/logs/log_id.ts
index 731763b1f07..9d0d06fd302 100644
--- a/yarn-project/circuit-types/src/logs/log_id.ts
+++ b/yarn-project/circuit-types/src/logs/log_id.ts
@@ -1,10 +1,7 @@
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 /** A globally unique log id. */
 export class LogId {
   /**
@@ -32,32 +29,6 @@ export class LogId {
     }
   }
 
-  static random() {
-    return new LogId(
-      Math.floor(Math.random() * 1000),
-      Math.floor(Math.random() * 1000),
-      Math.floor(Math.random() * 100),
-    );
-  }
-
-  static get schema() {
-    return z
-      .object({
-        blockNumber: schemas.Integer,
-        txIndex: schemas.Integer,
-        logIndex: schemas.Integer,
-      })
-      .transform(({ blockNumber, txIndex, logIndex }) => new LogId(blockNumber, txIndex, logIndex));
-  }
-
-  toJSON() {
-    return {
-      blockNumber: this.blockNumber,
-      txIndex: this.txIndex,
-      logIndex: this.logIndex,
-    };
-  }
-
   /**
    * Serializes log id to a buffer.
    * @returns A buffer containing the serialized log id.
diff --git a/yarn-project/circuit-types/src/logs/tx_l2_logs.test.ts b/yarn-project/circuit-types/src/logs/tx_l2_logs.test.ts
index 61ea3137a8e..755525d1388 100644
--- a/yarn-project/circuit-types/src/logs/tx_l2_logs.test.ts
+++ b/yarn-project/circuit-types/src/logs/tx_l2_logs.test.ts
@@ -1,5 +1,3 @@
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-
 import { EncryptedNoteTxL2Logs, EncryptedTxL2Logs, UnencryptedTxL2Logs } from './tx_l2_logs.js';
 
 function shouldBehaveLikeTxL2Logs(
@@ -18,8 +16,8 @@ function shouldBehaveLikeTxL2Logs(
     it('can encode TxL2Logs to JSON and back', () => {
       const l2Logs = TxL2Logs.random(4, 2);
 
-      const buffer = jsonStringify(l2Logs.toJSON());
-      const recovered = TxL2Logs.fromJSON(JSON.parse(buffer));
+      const buffer = l2Logs.toJSON();
+      const recovered = TxL2Logs.fromJSON(buffer);
 
       expect(recovered).toEqual(l2Logs);
     });
diff --git a/yarn-project/circuit-types/src/logs/tx_l2_logs.ts b/yarn-project/circuit-types/src/logs/tx_l2_logs.ts
index 6ffd7cbc5dc..6cb5f7b613f 100644
--- a/yarn-project/circuit-types/src/logs/tx_l2_logs.ts
+++ b/yarn-project/circuit-types/src/logs/tx_l2_logs.ts
@@ -6,12 +6,10 @@ import {
   MAX_UNENCRYPTED_LOGS_PER_TX,
   type ScopedLogHash,
 } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { sha256Trunc } from '@aztec/foundation/crypto';
 import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serialize';
 
 import isEqual from 'lodash.isequal';
-import { z } from 'zod';
 
 import { type EncryptedL2Log } from './encrypted_l2_log.js';
 import { type EncryptedL2NoteLog } from './encrypted_l2_note_log.js';
@@ -139,7 +137,7 @@ export abstract class TxL2Logs<TLog extends UnencryptedL2Log | EncryptedL2NoteLo
         if ('contractAddress' in log) {
           contractAddress = log.contractAddress;
         } else if ('maskedContractAddress' in log) {
-          contractAddress = new AztecAddress(log.maskedContractAddress);
+          contractAddress = log.maskedContractAddress;
         } else {
           throw new Error("Can't run filterScoped in logs without contractAddress or maskedContractAddress");
         }
@@ -160,12 +158,6 @@ export abstract class TxL2Logs<TLog extends UnencryptedL2Log | EncryptedL2NoteLo
 }
 
 export class UnencryptedTxL2Logs extends TxL2Logs<UnencryptedL2Log> {
-  static get schema() {
-    return z
-      .object({ functionLogs: z.array(UnencryptedFunctionL2Logs.schema) })
-      .transform(({ functionLogs }) => new UnencryptedTxL2Logs(functionLogs));
-  }
-
   /** Creates an empty instance. */
   public static empty() {
     return new UnencryptedTxL2Logs([]);
@@ -254,12 +246,6 @@ export class UnencryptedTxL2Logs extends TxL2Logs<UnencryptedL2Log> {
 }
 
 export class EncryptedNoteTxL2Logs extends TxL2Logs<EncryptedL2NoteLog> {
-  static get schema() {
-    return z
-      .object({ functionLogs: z.array(EncryptedNoteFunctionL2Logs.schema) })
-      .transform(({ functionLogs }) => new EncryptedNoteTxL2Logs(functionLogs));
-  }
-
   /** Creates an empty instance. */
   public static empty() {
     return new EncryptedNoteTxL2Logs([]);
@@ -347,12 +333,6 @@ export class EncryptedNoteTxL2Logs extends TxL2Logs<EncryptedL2NoteLog> {
 }
 
 export class EncryptedTxL2Logs extends TxL2Logs<EncryptedL2Log> {
-  static get schema() {
-    return z
-      .object({ functionLogs: z.array(EncryptedFunctionL2Logs.schema) })
-      .transform(({ functionLogs }) => new EncryptedTxL2Logs(functionLogs));
-  }
-
   /** Creates an empty instance. */
   public static empty() {
     return new EncryptedTxL2Logs([]);
diff --git a/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts b/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts
index b43778409a9..26616746340 100644
--- a/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts
+++ b/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts
@@ -1,10 +1,7 @@
 import { AztecAddress } from '@aztec/circuits.js';
 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';
-
 /**
  * Represents an individual unencrypted log entry.
  */
@@ -46,12 +43,6 @@ export class UnencryptedL2Log {
     return `UnencryptedL2Log(contractAddress: ${this.contractAddress.toString()}, data: ${payload})`;
   }
 
-  static get schema() {
-    return z
-      .object({ contractAddress: schemas.AztecAddress, data: schemas.BufferHex })
-      .transform(({ contractAddress, data }) => new UnencryptedL2Log(contractAddress, data));
-  }
-
   /** Returns a JSON-friendly representation of the log. */
   public toJSON(): object {
     return {
diff --git a/yarn-project/circuit-types/src/mocks.ts b/yarn-project/circuit-types/src/mocks.ts
index 92e56a2553d..e89e8401267 100644
--- a/yarn-project/circuit-types/src/mocks.ts
+++ b/yarn-project/circuit-types/src/mocks.ts
@@ -174,7 +174,7 @@ export const mockTx = (
                 // +4 for encoding the length of the buffer
                 new Fr(log.length + 4),
               ),
-              new AztecAddress(log.maskedContractAddress),
+              log.maskedContractAddress,
             );
             // make the first log non-revertible
             if (functionCount === 0) {
@@ -224,10 +224,7 @@ export const mockTx = (
         .unrollLogs()
         .map(
           log =>
-            new ScopedLogHash(
-              new LogHash(Fr.fromBuffer(log.hash()), 0, new Fr(log.length)),
-              new AztecAddress(log.maskedContractAddress),
-            ),
+            new ScopedLogHash(new LogHash(Fr.fromBuffer(log.hash()), 0, new Fr(log.length)), log.maskedContractAddress),
         ),
       ScopedLogHash.empty(),
       MAX_ENCRYPTED_LOGS_PER_TX,
diff --git a/yarn-project/circuit-types/src/notes/extended_note.ts b/yarn-project/circuit-types/src/notes/extended_note.ts
index a3c3506cdbb..4b3184563d0 100644
--- a/yarn-project/circuit-types/src/notes/extended_note.ts
+++ b/yarn-project/circuit-types/src/notes/extended_note.ts
@@ -1,6 +1,5 @@
 import { AztecAddress, Fr } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 
 import { Note } from '../logs/l1_payload/payload.js';
@@ -49,14 +48,6 @@ export class ExtendedNote {
     return new this(note, owner, contractAddress, storageSlot, noteTypeId, txHash);
   }
 
-  toJSON() {
-    return this.toString();
-  }
-
-  static get schema() {
-    return hexSchemaFor(ExtendedNote);
-  }
-
   toString() {
     return '0x' + this.toBuffer().toString('hex');
   }
@@ -65,17 +56,6 @@ export class ExtendedNote {
     const hex = str.replace(/^0x/, '');
     return ExtendedNote.fromBuffer(Buffer.from(hex, 'hex'));
   }
-
-  static random() {
-    return new ExtendedNote(
-      Note.random(),
-      AztecAddress.random(),
-      AztecAddress.random(),
-      Fr.random(),
-      NoteSelector.random(),
-      TxHash.random(),
-    );
-  }
 }
 
 export class UniqueNote extends ExtendedNote {
@@ -98,10 +78,6 @@ export class UniqueNote extends ExtendedNote {
     super(note, owner, contractAddress, storageSlot, noteTypeId, txHash);
   }
 
-  static override get schema() {
-    return hexSchemaFor(UniqueNote);
-  }
-
   override toBuffer(): Buffer {
     return Buffer.concat([
       this.note.toBuffer(),
@@ -114,18 +90,6 @@ export class UniqueNote extends ExtendedNote {
     ]);
   }
 
-  static override random() {
-    return new UniqueNote(
-      Note.random(),
-      AztecAddress.random(),
-      AztecAddress.random(),
-      Fr.random(),
-      NoteSelector.random(),
-      TxHash.random(),
-      Fr.random(),
-    );
-  }
-
   static override fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
 
diff --git a/yarn-project/circuit-types/src/notes/incoming_notes_filter.ts b/yarn-project/circuit-types/src/notes/incoming_notes_filter.ts
index 0f2911c3a58..2e7f33c848b 100644
--- a/yarn-project/circuit-types/src/notes/incoming_notes_filter.ts
+++ b/yarn-project/circuit-types/src/notes/incoming_notes_filter.ts
@@ -1,10 +1,7 @@
 import { type AztecAddress, type Fr } from '@aztec/circuits.js';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 
-import { z } from 'zod';
-
-import { TxHash } from '../tx/tx_hash.js';
-import { NoteStatus } from './note_status.js';
+import { type TxHash } from '../tx/tx_hash.js';
+import { type NoteStatus } from './note_status.js';
 
 /**
  * A filter used to fetch incoming notes.
@@ -26,13 +23,3 @@ export type IncomingNotesFilter = {
   /** The scopes in which to get incoming notes from. This defaults to all scopes. */
   scopes?: AztecAddress[];
 };
-
-export const IncomingNotesFilterSchema: ZodFor<IncomingNotesFilter> = z.object({
-  txHash: TxHash.schema.optional(),
-  contractAddress: schemas.AztecAddress.optional(),
-  storageSlot: schemas.Fr.optional(),
-  owner: schemas.AztecAddress.optional(),
-  status: z.nativeEnum(NoteStatus).optional(),
-  siloedNullifier: schemas.Fr.optional(),
-  scopes: z.array(schemas.AztecAddress).optional(),
-});
diff --git a/yarn-project/circuit-types/src/notes/note_status.ts b/yarn-project/circuit-types/src/notes/note_status.ts
index 561bb19146c..8a32cc4854b 100644
--- a/yarn-project/circuit-types/src/notes/note_status.ts
+++ b/yarn-project/circuit-types/src/notes/note_status.ts
@@ -4,5 +4,5 @@
 export enum NoteStatus {
   ACTIVE = 1,
   ACTIVE_OR_NULLIFIED = 2,
-  // TODO(#4217): add 'NULLIFIED'
+  // TODO 4217: add 'NULLIFIED'
 }
diff --git a/yarn-project/circuit-types/src/notes/outgoing_notes_filter.ts b/yarn-project/circuit-types/src/notes/outgoing_notes_filter.ts
index 79f1ae2d488..888c3fc6ef1 100644
--- a/yarn-project/circuit-types/src/notes/outgoing_notes_filter.ts
+++ b/yarn-project/circuit-types/src/notes/outgoing_notes_filter.ts
@@ -1,9 +1,6 @@
 import { type AztecAddress, type Fr } from '@aztec/circuits.js';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 
-import { z } from 'zod';
-
-import { TxHash } from '../tx/tx_hash.js';
+import { type TxHash } from '../tx/tx_hash.js';
 
 /**
  * A filter used to fetch outgoing notes.
@@ -19,10 +16,3 @@ export type OutgoingNotesFilter = {
   /** The owner of the note (whose public key was used to encrypt the note). */
   owner?: AztecAddress;
 };
-
-export const OutgoingNotesFilterSchema: ZodFor<OutgoingNotesFilter> = z.object({
-  txHash: TxHash.schema.optional(),
-  contractAddress: schemas.AztecAddress.optional(),
-  storageSlot: schemas.Fr.optional(),
-  owner: schemas.AztecAddress.optional(),
-});
diff --git a/yarn-project/circuit-types/src/packed_values.test.ts b/yarn-project/circuit-types/src/packed_values.test.ts
deleted file mode 100644
index cd957019295..00000000000
--- a/yarn-project/circuit-types/src/packed_values.test.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-
-import { PackedValues } from './packed_values.js';
-
-describe('PackedValues', () => {
-  it('serializes and deserializes', () => {
-    const values = PackedValues.random();
-    const json = jsonStringify(values);
-    expect(PackedValues.schema.parse(JSON.parse(json))).toEqual(values);
-  });
-});
diff --git a/yarn-project/circuit-types/src/packed_values.ts b/yarn-project/circuit-types/src/packed_values.ts
index 4dfbcea863c..7b3a4ce54ec 100644
--- a/yarn-project/circuit-types/src/packed_values.ts
+++ b/yarn-project/circuit-types/src/packed_values.ts
@@ -1,10 +1,7 @@
 import { Fr, Vector } from '@aztec/circuits.js';
 import { computeVarArgsHash } from '@aztec/circuits.js/hash';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 /**
  * Packs a set of values into a hash.
  */
@@ -20,18 +17,6 @@ export class PackedValues {
     public readonly hash: Fr,
   ) {}
 
-  static get schema() {
-    return z.array(schemas.Fr).transform(PackedValues.fromValues);
-  }
-
-  toJSON() {
-    return this.values;
-  }
-
-  static random() {
-    return PackedValues.fromValues([Fr.random(), Fr.random()]);
-  }
-
   static fromValues(values: Fr[]) {
     return new PackedValues(values, computeVarArgsHash(values));
   }
diff --git a/yarn-project/circuit-types/src/private_execution_result.test.ts b/yarn-project/circuit-types/src/private_execution_result.test.ts
index 31293c6263d..82b316137af 100644
--- a/yarn-project/circuit-types/src/private_execution_result.test.ts
+++ b/yarn-project/circuit-types/src/private_execution_result.test.ts
@@ -1,6 +1,5 @@
 import { PublicExecutionRequest } from '@aztec/circuit-types';
 import { Fr, PrivateCircuitPublicInputs } from '@aztec/circuits.js';
-import { jsonStringify } from '@aztec/foundation/json-rpc';
 
 import {
   PrivateExecutionResult,
@@ -35,11 +34,6 @@ describe('execution_result', () => {
     executionResult = emptyExecutionResult();
   });
 
-  describe('serialization', () => {
-    const instance = PrivateExecutionResult.random();
-    expect(PrivateExecutionResult.schema.parse(JSON.parse(jsonStringify(instance)))).toEqual(instance);
-  });
-
   describe('collectNoteHashLeafIndexMap', () => {
     it('returns a map for note hash leaf indexes', () => {
       executionResult.noteHashLeafIndexMap = new Map();
diff --git a/yarn-project/circuit-types/src/private_execution_result.ts b/yarn-project/circuit-types/src/private_execution_result.ts
index cd0a128ab7b..71854395dbe 100644
--- a/yarn-project/circuit-types/src/private_execution_result.ts
+++ b/yarn-project/circuit-types/src/private_execution_result.ts
@@ -10,13 +10,7 @@ import {
 } from '@aztec/circuit-types';
 import { type IsEmpty, PrivateCircuitPublicInputs, sortByCounter } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
-import { times } from '@aztec/foundation/collection';
-import { randomBytes, randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { type ZodFor, hexSchemaFor, mapSchema, schemas } from '@aztec/foundation/schemas';
-import { type FieldsOf } from '@aztec/foundation/types';
-
-import { z } from 'zod';
 
 /**
  * The contents of a new note.
@@ -31,20 +25,6 @@ export class NoteAndSlot {
     public noteTypeId: NoteSelector,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        note: Note.schema,
-        storageSlot: schemas.Fr,
-        noteTypeId: schemas.NoteSelector,
-      })
-      .transform(NoteAndSlot.from);
-  }
-
-  static from(fields: FieldsOf<NoteAndSlot>) {
-    return new NoteAndSlot(fields.note, fields.storageSlot, fields.noteTypeId);
-  }
-
   toJSON() {
     return {
       note: this.note.toBuffer().toString('hex'),
@@ -60,40 +40,11 @@ export class NoteAndSlot {
       NoteSelector.fromString(json.noteTypeId),
     );
   }
-
-  static random() {
-    return new NoteAndSlot(Note.random(), Fr.random(), NoteSelector.random());
-  }
 }
 
 export class CountedLog<TLog extends UnencryptedL2Log | EncryptedL2NoteLog | EncryptedL2Log> implements IsEmpty {
   constructor(public log: TLog, public counter: number) {}
 
-  static get schema(): ZodFor<CountedLog<UnencryptedL2Log | EncryptedL2NoteLog | EncryptedL2Log>> {
-    return z
-      .object({
-        log: z.union([EncryptedL2Log.schema, EncryptedL2NoteLog.schema, UnencryptedL2Log.schema]),
-        counter: schemas.Integer,
-      })
-      .transform(CountedLog.from);
-  }
-
-  static schemaFor<TLog extends UnencryptedL2Log | EncryptedL2NoteLog | EncryptedL2Log>(log: { schema: ZodFor<TLog> }) {
-    return z
-      .object({
-        log: log.schema,
-        counter: schemas.Integer,
-      })
-      .transform(({ log, counter }) => new CountedLog(log!, counter) as CountedLog<TLog>) as ZodFor<CountedLog<TLog>>;
-  }
-
-  static from<TLog extends UnencryptedL2Log | EncryptedL2NoteLog | EncryptedL2Log>(fields: {
-    log: TLog;
-    counter: number;
-  }): CountedLog<TLog> {
-    return new CountedLog(fields.log, fields.counter);
-  }
-
   isEmpty(): boolean {
     return !this.log.data.length && !this.counter;
   }
@@ -104,16 +55,6 @@ export class CountedNoteLog extends CountedLog<EncryptedL2NoteLog> {
     super(log, counter);
   }
 
-  static override get schema(): ZodFor<CountedNoteLog> {
-    return z
-      .object({
-        log: EncryptedL2NoteLog.schema,
-        counter: schemas.Integer,
-        noteHashCounter: schemas.Integer,
-      })
-      .transform(({ log, counter, noteHashCounter }) => new CountedNoteLog(log, counter, noteHashCounter));
-  }
-
   toJSON() {
     return {
       log: this.log.toJSON(),
@@ -125,28 +66,11 @@ export class CountedNoteLog extends CountedLog<EncryptedL2NoteLog> {
   static fromJSON(json: any) {
     return new CountedNoteLog(EncryptedL2NoteLog.fromJSON(json.log), json.counter, json.noteHashCounter);
   }
-
-  static random() {
-    return new CountedNoteLog(EncryptedL2NoteLog.random(), randomInt(10), randomInt(10));
-  }
 }
 
 export class CountedPublicExecutionRequest {
   constructor(public request: PublicExecutionRequest, public counter: number) {}
 
-  static get schema() {
-    return z
-      .object({
-        request: hexSchemaFor(PublicExecutionRequest), // TODO(palla/schema) Use PublicExecutionRequest.schema,
-        counter: schemas.Integer,
-      })
-      .transform(CountedPublicExecutionRequest.from);
-  }
-
-  static from(fields: FieldsOf<CountedPublicExecutionRequest>) {
-    return new CountedPublicExecutionRequest(fields.request, fields.counter);
-  }
-
   isEmpty(): boolean {
     return this.request.isEmpty() && !this.counter;
   }
@@ -164,10 +88,6 @@ export class CountedPublicExecutionRequest {
       json.counter,
     );
   }
-
-  static random() {
-    return new CountedPublicExecutionRequest(PublicExecutionRequest.random(), 0);
-  }
 }
 
 /**
@@ -216,46 +136,6 @@ export class PrivateExecutionResult {
     public unencryptedLogs: CountedLog<UnencryptedL2Log>[],
   ) {}
 
-  static get schema(): ZodFor<PrivateExecutionResult> {
-    return z
-      .object({
-        acir: schemas.BufferHex,
-        vk: schemas.BufferHex,
-        partialWitness: mapSchema(z.coerce.number(), z.string()),
-        publicInputs: PrivateCircuitPublicInputs.schema,
-        noteHashLeafIndexMap: mapSchema(schemas.BigInt, schemas.BigInt),
-        newNotes: z.array(NoteAndSlot.schema),
-        noteHashNullifierCounterMap: mapSchema(z.coerce.number(), z.number()),
-        returnValues: z.array(schemas.Fr),
-        nestedExecutions: z.array(z.lazy(() => PrivateExecutionResult.schema)),
-        enqueuedPublicFunctionCalls: z.array(CountedPublicExecutionRequest.schema),
-        publicTeardownFunctionCall: hexSchemaFor(PublicExecutionRequest), // TODO(palla/schema) Use PublicExecutionRequest.schema
-        noteEncryptedLogs: z.array(CountedNoteLog.schema),
-        encryptedLogs: z.array(CountedLog.schemaFor(EncryptedL2Log)),
-        unencryptedLogs: z.array(CountedLog.schemaFor(UnencryptedL2Log)),
-      })
-      .transform(PrivateExecutionResult.from);
-  }
-
-  static from(fields: FieldsOf<PrivateExecutionResult>) {
-    return new PrivateExecutionResult(
-      fields.acir,
-      fields.vk,
-      fields.partialWitness,
-      fields.publicInputs,
-      fields.noteHashLeafIndexMap,
-      fields.newNotes,
-      fields.noteHashNullifierCounterMap,
-      fields.returnValues,
-      fields.nestedExecutions,
-      fields.enqueuedPublicFunctionCalls,
-      fields.publicTeardownFunctionCall,
-      fields.noteEncryptedLogs,
-      fields.encryptedLogs,
-      fields.unencryptedLogs,
-    );
-  }
-
   toJSON(): any {
     return {
       acir: this.acir.toString('hex'),
@@ -284,25 +164,6 @@ export class PrivateExecutionResult {
     };
   }
 
-  static random(nested = 1): PrivateExecutionResult {
-    return new PrivateExecutionResult(
-      randomBytes(4),
-      randomBytes(4),
-      new Map([[1, 'one']]),
-      PrivateCircuitPublicInputs.empty(),
-      new Map([[1n, 1n]]),
-      [NoteAndSlot.random()],
-      new Map([[0, 0]]),
-      [Fr.random()],
-      times(nested, () => PrivateExecutionResult.random(0)),
-      [CountedPublicExecutionRequest.random()],
-      PublicExecutionRequest.random(),
-      [CountedNoteLog.random()],
-      [new CountedLog(EncryptedL2Log.random(), randomInt(10))],
-      [new CountedLog(UnencryptedL2Log.random(), randomInt(10))],
-    );
-  }
-
   static fromJSON(json: any): PrivateExecutionResult {
     return new PrivateExecutionResult(
       Buffer.from(json.acir, 'hex'),
diff --git a/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote.ts b/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote.ts
index d6f7222cf8b..2e691c4b708 100644
--- a/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote.ts
+++ b/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote.ts
@@ -18,14 +18,6 @@ export class EpochProofQuote extends Gossipable {
     super();
   }
 
-  static empty() {
-    return new EpochProofQuote(EpochProofQuotePayload.empty(), Signature.empty());
-  }
-
-  static random() {
-    return new EpochProofQuote(EpochProofQuotePayload.random(), Signature.random());
-  }
-
   static getFields(fields: FieldsOf<EpochProofQuote>) {
     return [fields.payload, fields.signature] as const;
   }
diff --git a/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote_payload.ts b/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote_payload.ts
index 7f1e87eee87..af38f31e797 100644
--- a/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote_payload.ts
+++ b/yarn-project/circuit-types/src/prover_coordination/epoch_proof_quote_payload.ts
@@ -30,16 +30,6 @@ export class EpochProofQuotePayload {
     return new EpochProofQuotePayload(0n, 0n, 0n, EthAddress.ZERO, 0);
   }
 
-  static random() {
-    return new EpochProofQuotePayload(
-      BigInt(Math.floor(Math.random() * 1e3)),
-      BigInt(Math.floor(Math.random() * 1e6)),
-      BigInt(Math.floor(Math.random() * 1e9)),
-      EthAddress.random(),
-      Math.floor(Math.random() * 10000),
-    );
-  }
-
   static getFields(fields: FieldsOf<EpochProofQuotePayload>) {
     return [
       fields.epochToProve,
diff --git a/yarn-project/circuit-types/src/public_data_witness.ts b/yarn-project/circuit-types/src/public_data_witness.ts
index cdc33705231..a8a80a76e0c 100644
--- a/yarn-project/circuit-types/src/public_data_witness.ts
+++ b/yarn-project/circuit-types/src/public_data_witness.ts
@@ -1,10 +1,7 @@
 import { Fr, PUBLIC_DATA_TREE_HEIGHT, PublicDataTreeLeafPreimage } from '@aztec/circuits.js';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 import { SiblingPath } from './sibling_path/sibling_path.js';
 
 /**
@@ -30,16 +27,6 @@ export class PublicDataWitness {
     public readonly siblingPath: SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        index: schemas.BigInt,
-        leafPreimage: PublicDataTreeLeafPreimage.schema,
-        siblingPath: SiblingPath.schemaFor(PUBLIC_DATA_TREE_HEIGHT),
-      })
-      .transform(({ index, leafPreimage, siblingPath }) => new PublicDataWitness(index, leafPreimage, siblingPath));
-  }
-
   /**
    * Returns a field array representation of a public data witness.
    * @returns A field array representation of a public data witness.
@@ -66,14 +53,6 @@ export class PublicDataWitness {
     return this.toBuffer().toString('hex');
   }
 
-  static random() {
-    return new PublicDataWitness(
-      BigInt(Math.floor(Math.random() * 1000)),
-      PublicDataTreeLeafPreimage.random(),
-      SiblingPath.random(PUBLIC_DATA_TREE_HEIGHT),
-    );
-  }
-
   /**
    * Deserializes an PublicDataWitness object from a buffer.
    * @param buf - Buffer or BufferReader to deserialize.
diff --git a/yarn-project/circuit-types/src/public_execution_request.ts b/yarn-project/circuit-types/src/public_execution_request.ts
index df60e8e8213..8e7c8b5fa58 100644
--- a/yarn-project/circuit-types/src/public_execution_request.ts
+++ b/yarn-project/circuit-types/src/public_execution_request.ts
@@ -1,12 +1,10 @@
 import { CallContext, type PublicCallRequest, Vector } from '@aztec/circuits.js';
 import { computeVarArgsHash } from '@aztec/circuits.js/hash';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 /**
  * The execution request of a public function.
@@ -31,22 +29,6 @@ export class PublicExecutionRequest {
     return serializeToBuffer(this.callContext, new Vector(this.args));
   }
 
-  static get schema() {
-    return z
-      .object({
-        callContext: CallContext.schema,
-        args: z.array(schemas.Fr),
-      })
-      .transform(PublicExecutionRequest.from);
-  }
-
-  toJSON() {
-    return {
-      callContext: this.callContext,
-      args: this.args,
-    };
-  }
-
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
     return new PublicExecutionRequest(CallContext.fromBuffer(reader), reader.readVector(Fr));
@@ -64,10 +46,6 @@ export class PublicExecutionRequest {
     return new PublicExecutionRequest(CallContext.empty(), []);
   }
 
-  static random() {
-    return new PublicExecutionRequest(CallContext.random(), [Fr.random(), Fr.random()]);
-  }
-
   isEmpty(): boolean {
     return this.callContext.isEmpty() && this.args.length === 0;
   }
diff --git a/yarn-project/circuit-types/src/sibling_path/sibling_path.ts b/yarn-project/circuit-types/src/sibling_path/sibling_path.ts
index a18d02ce951..df22de9a56c 100644
--- a/yarn-project/circuit-types/src/sibling_path/sibling_path.ts
+++ b/yarn-project/circuit-types/src/sibling_path/sibling_path.ts
@@ -1,6 +1,5 @@
 import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchema, hexSchemaFor } from '@aztec/foundation/schemas';
 import {
   type Tuple,
   assertLength,
@@ -22,34 +21,6 @@ import { type Hasher } from '@aztec/types/interfaces';
 export class SiblingPath<N extends number> {
   private data: Tuple<Buffer, N>;
 
-  /**
-   * Constructor.
-   * @param pathSize - The size of the sibling path.
-   * @param path - The sibling path data.
-   */
-  constructor(
-    /** Size of the sibling path (number of fields it contains). */
-    public pathSize: N,
-    /** The sibling path data. */
-    path: Buffer[],
-  ) {
-    this.data = assertLength(path, pathSize);
-  }
-
-  static get schema() {
-    return hexSchemaFor(SiblingPath);
-  }
-
-  static schemaFor<N extends number>(size: N) {
-    return hexSchema
-      .transform(str => SiblingPath.fromString(str) as SiblingPath<N>)
-      .refine(path => path.pathSize === size, 'Unexpected size');
-  }
-
-  toJSON() {
-    return this.toString();
-  }
-
   /**
    * Returns sibling path hashed up from the a element.
    * @param size - The number of elements in a given path.
@@ -67,9 +38,22 @@ export class SiblingPath<N extends number> {
     return new SiblingPath(size, bufs);
   }
 
-  static random<N extends number>(number: N) {
-    const data = Array.from({ length: number }, () => Fr.random().toBuffer());
-    return new SiblingPath(number, data);
+  /**
+   * Constructor.
+   * @param pathSize - The size of the sibling path.
+   * @param path - The sibling path data.
+   */
+  constructor(
+    /**
+     * Size of the sibling path (number of fields it contains).
+     */
+    public pathSize: N,
+    /**
+     * The sibling path data.
+     */
+    path: Buffer[],
+  ) {
+    this.data = assertLength(path, pathSize);
   }
 
   /**
diff --git a/yarn-project/circuit-types/src/simulation_error.ts b/yarn-project/circuit-types/src/simulation_error.ts
index 70cd960217a..6b0a695c519 100644
--- a/yarn-project/circuit-types/src/simulation_error.ts
+++ b/yarn-project/circuit-types/src/simulation_error.ts
@@ -1,8 +1,5 @@
-import { AztecAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
+import { type AztecAddress, Fr, type FunctionSelector } from '@aztec/circuits.js';
 import { type OpcodeLocation } from '@aztec/foundation/abi';
-import { schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 /**
  * Address and selector of a function that failed during simulation.
@@ -52,21 +49,11 @@ export interface SourceCodeLocation {
   locationText: string;
 }
 
-const SourceCodeLocationSchema = z.object({
-  filePath: z.string(),
-  line: z.number(),
-  column: z.number(),
-  fileSource: z.string(),
-  locationText: z.string(),
-});
-
 /**
  * A stack of noir source code locations.
  */
 export type NoirCallStack = SourceCodeLocation[] | OpcodeLocation[];
 
-const NoirCallStackSchema: z.ZodType<NoirCallStack> = z.union([z.array(SourceCodeLocationSchema), z.array(z.string())]);
-
 /**
  * Checks if a call stack is unresolved.
  */
@@ -228,31 +215,4 @@ export class SimulationError extends Error {
       obj.noirErrorStack,
     );
   }
-
-  static get schema() {
-    return z
-      .object({
-        originalMessage: z.string(),
-        functionErrorStack: z.array(
-          z.object({
-            contractAddress: schemas.AztecAddress,
-            contractName: z.string().optional(),
-            functionSelector: schemas.FunctionSelector,
-            functionName: z.string().optional(),
-          }),
-        ),
-        noirErrorStack: NoirCallStackSchema.optional(),
-        revertData: z.array(schemas.Fr),
-      })
-      .transform(
-        ({ originalMessage, functionErrorStack, noirErrorStack, revertData }) =>
-          new SimulationError(originalMessage, functionErrorStack, revertData, noirErrorStack),
-      );
-  }
-
-  static random() {
-    return new SimulationError('Random simulation error', [
-      { contractAddress: AztecAddress.random(), functionSelector: FunctionSelector.random() },
-    ]);
-  }
 }
diff --git a/yarn-project/circuit-types/src/stats/stats.ts b/yarn-project/circuit-types/src/stats/stats.ts
index 185a846750b..c75d84bf2e4 100644
--- a/yarn-project/circuit-types/src/stats/stats.ts
+++ b/yarn-project/circuit-types/src/stats/stats.ts
@@ -1,7 +1,3 @@
-import { type ZodFor } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
 /** Stats associated with an ACIR proof generation.*/
 export type ProofConstructed = {
   /** Name of the event for metrics purposes */
@@ -239,17 +235,6 @@ export type NoteProcessorStats = {
   txs: number;
 };
 
-export const NoteProcessorStatsSchema = z.object({
-  seen: z.number(),
-  deferredIncoming: z.number(),
-  deferredOutgoing: z.number(),
-  decryptedIncoming: z.number(),
-  decryptedOutgoing: z.number(),
-  failed: z.number(),
-  blocks: z.number(),
-  txs: z.number(),
-}) satisfies ZodFor<NoteProcessorStats>;
-
 /** Stats for a tx. */
 export type TxStats = {
   /** Hash of the tx. */
diff --git a/yarn-project/circuit-types/src/tx/public_simulation_output.ts b/yarn-project/circuit-types/src/tx/public_simulation_output.ts
index a6748c071aa..4e75381ce6c 100644
--- a/yarn-project/circuit-types/src/tx/public_simulation_output.ts
+++ b/yarn-project/circuit-types/src/tx/public_simulation_output.ts
@@ -1,11 +1,7 @@
 import { CombinedConstantData, Fr, Gas } from '@aztec/circuits.js';
 import { mapValues } from '@aztec/foundation/collection';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 
-import times from 'lodash.times';
-import { z } from 'zod';
-
-import { SimulationError } from '../simulation_error.js';
+import { type SimulationError } from '../simulation_error.js';
 import { TxEffect } from '../tx_effect.js';
 import { type GasUsed } from './gas_used.js';
 
@@ -22,15 +18,6 @@ export class NestedProcessReturnValues {
     this.nested = nested ?? [];
   }
 
-  static get schema(): ZodFor<NestedProcessReturnValues> {
-    return z
-      .object({
-        values: z.array(schemas.Fr).optional(),
-        nested: z.array(z.lazy(() => NestedProcessReturnValues.schema)),
-      })
-      .transform(({ values, nested }) => new NestedProcessReturnValues(values, nested));
-  }
-
   toJSON(): any {
     return {
       values: this.values?.map(fr => fr.toString()),
@@ -48,13 +35,6 @@ export class NestedProcessReturnValues {
   static empty() {
     return new NestedProcessReturnValues([]);
   }
-
-  static random(depth = 1): NestedProcessReturnValues {
-    return new NestedProcessReturnValues(
-      times(3, Fr.random),
-      depth > 0 ? [NestedProcessReturnValues.random(depth - 1)] : [],
-    );
-  }
 }
 
 /**
@@ -69,27 +49,6 @@ export class PublicSimulationOutput {
     public gasUsed: GasUsed,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        revertReason: SimulationError.schema.optional(),
-        constants: CombinedConstantData.schema,
-        txEffect: TxEffect.schema,
-        publicReturnValues: z.array(NestedProcessReturnValues.schema),
-        gasUsed: z.object({ totalGas: Gas.schema, teardownGas: Gas.schema }),
-      })
-      .transform(
-        fields =>
-          new PublicSimulationOutput(
-            fields.revertReason,
-            fields.constants,
-            fields.txEffect,
-            fields.publicReturnValues,
-            fields.gasUsed,
-          ),
-      );
-  }
-
   toJSON() {
     return {
       revertReason: this.revertReason,
@@ -111,14 +70,4 @@ export class PublicSimulationOutput {
       mapValues(json.gasUsed, gas => Gas.fromJSON(gas)),
     );
   }
-
-  static random() {
-    return new PublicSimulationOutput(
-      SimulationError.random(),
-      CombinedConstantData.empty(),
-      TxEffect.empty(),
-      times(2, NestedProcessReturnValues.random),
-      { teardownGas: Gas.random(), totalGas: Gas.random() },
-    );
-  }
 }
diff --git a/yarn-project/circuit-types/src/tx/simulated_tx.test.ts b/yarn-project/circuit-types/src/tx/simulated_tx.test.ts
index 035bab4f517..03e7ce78991 100644
--- a/yarn-project/circuit-types/src/tx/simulated_tx.test.ts
+++ b/yarn-project/circuit-types/src/tx/simulated_tx.test.ts
@@ -8,11 +8,11 @@ describe('simulated_tx', () => {
   });
   describe('json', () => {
     it('convert to and from json', () => {
-      expect(TxSimulationResult.fromJSON(JSON.parse(JSON.stringify(simulatedTx.toJSON())))).toEqual(simulatedTx);
+      expect(TxSimulationResult.fromJSON(simulatedTx.toJSON())).toEqual(simulatedTx);
     });
     it('convert undefined effects to and from json', () => {
       simulatedTx.publicOutput = undefined;
-      expect(TxSimulationResult.fromJSON(JSON.parse(JSON.stringify(simulatedTx.toJSON())))).toEqual(simulatedTx);
+      expect(TxSimulationResult.fromJSON(simulatedTx.toJSON())).toEqual(simulatedTx);
     });
   });
 });
diff --git a/yarn-project/circuit-types/src/tx/simulated_tx.ts b/yarn-project/circuit-types/src/tx/simulated_tx.ts
index e202b02a6ab..40fb969e7e8 100644
--- a/yarn-project/circuit-types/src/tx/simulated_tx.ts
+++ b/yarn-project/circuit-types/src/tx/simulated_tx.ts
@@ -1,13 +1,12 @@
 import { ClientIvcProof, Gas, PrivateKernelTailCircuitPublicInputs } from '@aztec/circuits.js';
-import { type FieldsOf } from '@aztec/foundation/types';
-
-import { z } from 'zod';
 
 import {
+  EncryptedNoteTxL2Logs,
+  EncryptedTxL2Logs,
+  type GasUsed,
   type PrivateKernelProverProfileResult,
-  PrivateKernelProverProfileResultSchema,
-} from '../interfaces/private_kernel_prover.js';
-import { EncryptedNoteTxL2Logs, EncryptedTxL2Logs, UnencryptedTxL2Logs } from '../logs/tx_l2_logs.js';
+  UnencryptedTxL2Logs,
+} from '../index.js';
 import {
   PrivateExecutionResult,
   collectEnqueuedPublicFunctionCalls,
@@ -16,7 +15,6 @@ import {
   collectSortedNoteEncryptedLogs,
   collectSortedUnencryptedLogs,
 } from '../private_execution_result.js';
-import { type GasUsed } from './gas_used.js';
 import { NestedProcessReturnValues, PublicSimulationOutput } from './public_simulation_output.js';
 import { Tx } from './tx.js';
 
@@ -82,26 +80,6 @@ export class TxSimulationResult extends PrivateSimulationResult {
     );
   }
 
-  static get schema() {
-    return z
-      .object({
-        privateExecutionResult: PrivateExecutionResult.schema,
-        publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
-        publicOutput: PublicSimulationOutput.schema.optional(),
-        profileResult: PrivateKernelProverProfileResultSchema.optional(),
-      })
-      .transform(TxSimulationResult.from);
-  }
-
-  static from(fields: Omit<FieldsOf<TxSimulationResult>, 'gasUsed'>) {
-    return new TxSimulationResult(
-      fields.privateExecutionResult,
-      fields.publicInputs,
-      fields.publicOutput,
-      fields.profileResult,
-    );
-  }
-
   getPublicReturnValues() {
     return this.publicOutput ? this.publicOutput.publicReturnValues : [];
   }
@@ -163,25 +141,11 @@ export class TxProvingResult {
     return tx;
   }
 
-  static get schema() {
-    return z
-      .object({
-        privateExecutionResult: PrivateExecutionResult.schema,
-        publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
-        clientIvcProof: ClientIvcProof.schema,
-      })
-      .transform(TxProvingResult.from);
-  }
-
-  static from(fields: FieldsOf<TxProvingResult>) {
-    return new TxProvingResult(fields.privateExecutionResult, fields.publicInputs, fields.clientIvcProof);
-  }
-
   public toJSON() {
     return {
-      privateExecutionResult: this.privateExecutionResult,
-      publicInputs: this.publicInputs,
-      clientIvcProof: this.clientIvcProof,
+      privateExecutionResult: this.privateExecutionResult.toJSON(),
+      publicInputs: this.publicInputs.toBuffer().toString('hex'),
+      clientIvcProof: this.clientIvcProof.toBuffer().toString('hex'),
     };
   }
 
diff --git a/yarn-project/circuit-types/src/tx/tx.ts b/yarn-project/circuit-types/src/tx/tx.ts
index 9123fb2e6f6..1bb78cf82f8 100644
--- a/yarn-project/circuit-types/src/tx/tx.ts
+++ b/yarn-project/circuit-types/src/tx/tx.ts
@@ -6,11 +6,8 @@ import {
 } from '@aztec/circuits.js';
 import { type Buffer32 } from '@aztec/foundation/buffer';
 import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
-import { hexSchema } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 import { type GetUnencryptedLogsResponse } from '../logs/get_logs_response.js';
 import { type L2LogsSource } from '../logs/l2_logs_source.js';
 import { EncryptedNoteTxL2Logs, EncryptedTxL2Logs, UnencryptedTxL2Logs } from '../logs/tx_l2_logs.js';
@@ -124,21 +121,6 @@ export class Tx extends Gossipable {
     ]);
   }
 
-  static get schema() {
-    // TODO(palla/schemas): Use the nested objects schemas as opposed to the toBuffers
-    return z
-      .object({
-        data: hexSchema, // PrivateKernelTailCircuitPublicInputs.schema,
-        clientIvcProof: hexSchema, // ClientIvcProof.schema,
-        noteEncryptedLogs: hexSchema, // EncryptedNoteTxL2Logs.schema,
-        encryptedLogs: hexSchema, // EncryptedTxL2Logs.schema,
-        unencryptedLogs: hexSchema, // UnencryptedTxL2Logs.schema,
-        enqueuedPublicFunctionCalls: z.array(hexSchema), // z.array(PublicExecutionRequest.schema),
-        publicTeardownFunctionCall: hexSchema, // PublicExecutionRequest.schema,
-      })
-      .transform(Tx.fromJSON);
-  }
-
   /**
    * Convert a Tx class object to a plain JSON object.
    * @returns A plain object with Tx properties.
@@ -150,11 +132,20 @@ export class Tx extends Gossipable {
       encryptedLogs: this.encryptedLogs.toBuffer().toString('hex'),
       unencryptedLogs: this.unencryptedLogs.toBuffer().toString('hex'),
       clientIvcProof: this.clientIvcProof.toBuffer().toString('hex'),
-      enqueuedPublicFunctionCalls: this.enqueuedPublicFunctionCalls.map(f => f.toBuffer().toString('hex')) ?? [],
+      enqueuedPublicFunctions: this.enqueuedPublicFunctionCalls.map(f => f.toBuffer().toString('hex')) ?? [],
       publicTeardownFunctionCall: this.publicTeardownFunctionCall.toBuffer().toString('hex'),
     };
   }
 
+  /**
+   * Gets unencrypted logs emitted by this tx.
+   * @param logsSource - An instance of `L2LogsSource` which can be used to obtain the logs.
+   * @returns The requested logs.
+   */
+  public getUnencryptedLogs(logsSource: L2LogsSource): Promise<GetUnencryptedLogsResponse> {
+    return logsSource.getUnencryptedLogs({ txHash: this.getTxHash() });
+  }
+
   /**
    * Convert a plain JSON object to a Tx class object.
    * @param obj - A plain Tx JSON object.
@@ -166,8 +157,8 @@ export class Tx extends Gossipable {
     const encryptedLogs = EncryptedTxL2Logs.fromBuffer(Buffer.from(obj.encryptedLogs, 'hex'));
     const unencryptedLogs = UnencryptedTxL2Logs.fromBuffer(Buffer.from(obj.unencryptedLogs, 'hex'));
     const clientIvcProof = ClientIvcProof.fromBuffer(Buffer.from(obj.clientIvcProof, 'hex'));
-    const enqueuedPublicFunctionCalls = obj.enqueuedPublicFunctionCalls
-      ? obj.enqueuedPublicFunctionCalls.map((x: string) => PublicExecutionRequest.fromBuffer(Buffer.from(x, 'hex')))
+    const enqueuedPublicFunctions = obj.enqueuedPublicFunctions
+      ? obj.enqueuedPublicFunctions.map((x: string) => PublicExecutionRequest.fromBuffer(Buffer.from(x, 'hex')))
       : [];
     const publicTeardownFunctionCall = PublicExecutionRequest.fromBuffer(
       Buffer.from(obj.publicTeardownFunctionCall, 'hex'),
@@ -178,20 +169,11 @@ export class Tx extends Gossipable {
       noteEncryptedLogs,
       encryptedLogs,
       unencryptedLogs,
-      enqueuedPublicFunctionCalls,
+      enqueuedPublicFunctions,
       publicTeardownFunctionCall,
     );
   }
 
-  /**
-   * Gets unencrypted logs emitted by this tx.
-   * @param logsSource - An instance of `L2LogsSource` which can be used to obtain the logs.
-   * @returns The requested logs.
-   */
-  public getUnencryptedLogs(logsSource: L2LogsSource): Promise<GetUnencryptedLogsResponse> {
-    return logsSource.getUnencryptedLogs({ txHash: this.getTxHash() });
-  }
-
   /**
    * Construct & return transaction hash.
    * @returns The transaction's hash.
@@ -296,18 +278,6 @@ export class Tx extends Gossipable {
     );
   }
 
-  static random() {
-    return new Tx(
-      PrivateKernelTailCircuitPublicInputs.emptyWithNullifier(),
-      ClientIvcProof.empty(),
-      EncryptedNoteTxL2Logs.random(1, 1),
-      EncryptedTxL2Logs.random(1, 1),
-      UnencryptedTxL2Logs.random(1, 1),
-      [PublicExecutionRequest.random()],
-      PublicExecutionRequest.random(),
-    );
-  }
-
   /**
    * Filters out logs from functions that are not present in the provided kernel output.
    *
diff --git a/yarn-project/circuit-types/src/tx/tx_hash.ts b/yarn-project/circuit-types/src/tx/tx_hash.ts
index f2477823ab2..7781fe4b30e 100644
--- a/yarn-project/circuit-types/src/tx/tx_hash.ts
+++ b/yarn-project/circuit-types/src/tx/tx_hash.ts
@@ -1,13 +1,14 @@
 import { Fr } from '@aztec/circuits.js';
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { schemas } from '@aztec/foundation/schemas';
 
 /**
  * A class representing hash of Aztec transaction.
  */
 export class TxHash extends Buffer32 {
   constructor(
-    /** The buffer containing the hash. */
+    /**
+     * The buffer containing the hash.
+     */
     hash: Buffer,
   ) {
     super(hash);
@@ -21,12 +22,4 @@ export class TxHash extends Buffer32 {
   static override random() {
     return new TxHash(Fr.random().toBuffer());
   }
-
-  static get schema() {
-    return schemas.BufferHex.transform(value => new TxHash(value));
-  }
-
-  static zero() {
-    return new TxHash(Buffer32.ZERO.toBuffer());
-  }
 }
diff --git a/yarn-project/circuit-types/src/tx/tx_receipt.ts b/yarn-project/circuit-types/src/tx/tx_receipt.ts
index 3d92c79adf6..30b44e06f96 100644
--- a/yarn-project/circuit-types/src/tx/tx_receipt.ts
+++ b/yarn-project/circuit-types/src/tx/tx_receipt.ts
@@ -1,11 +1,7 @@
-import { PublicDataWrite, RevertCode } from '@aztec/circuits.js';
+import { type PublicDataWrite, RevertCode } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
-import { type FieldsOf } from '@aztec/foundation/types';
 
-import { z } from 'zod';
-
-import { UniqueNote } from '../notes/extended_note.js';
+import { type UniqueNote } from '../notes/extended_note.js';
 import { TxHash } from './tx_hash.js';
 
 /**
@@ -28,26 +24,36 @@ export enum TxStatus {
  */
 export class TxReceipt {
   constructor(
-    /** A unique identifier for a transaction. */
+    /**
+     * A unique identifier for a transaction.
+     */
     public txHash: TxHash,
-    /** The transaction's status. */
+    /**
+     * The transaction's status.
+     */
     public status: TxStatus,
-    /** Description of transaction error, if any. */
+    /**
+     * Description of transaction error, if any.
+     */
     public error: string,
-    /** The transaction fee paid for the transaction. */
+    /**
+     * The transaction fee paid for the transaction.
+     */
     public transactionFee?: bigint,
-    /** The hash of the block containing the transaction. */
+    /**
+     * The hash of the block containing the transaction.
+     */
     public blockHash?: Buffer,
-    /** The block number in which the transaction was included. */
+    /**
+     * The block number in which the transaction was included.
+     */
     public blockNumber?: number,
-    /** Information useful for testing/debugging, set when test flag is set to true in `waitOpts`. */
+    /**
+     * Information useful for testing/debugging, set when test flag is set to true in `waitOpts`.
+     */
     public debugInfo?: DebugInfo,
   ) {}
 
-  static empty() {
-    return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, '');
-  }
-
   /**
    * Convert a Tx class object to a plain JSON object.
    * @returns A plain object with Tx properties.
@@ -60,36 +66,9 @@ export class TxReceipt {
       blockHash: this.blockHash?.toString('hex'),
       blockNumber: this.blockNumber,
       transactionFee: this.transactionFee?.toString(),
-      ...(this.debugInfo && { debugInfo: this.debugInfo }),
     };
   }
 
-  static get schema() {
-    return z
-      .object({
-        txHash: TxHash.schema,
-        status: z.nativeEnum(TxStatus),
-        error: z.string(),
-        blockHash: schemas.BufferHex.optional(),
-        blockNumber: z.number().optional(),
-        transactionFee: schemas.BigInt.optional(),
-        debugInfo: DebugInfoSchema.optional(),
-      })
-      .transform(TxReceipt.from);
-  }
-
-  static from(fields: FieldsOf<TxReceipt>) {
-    return new TxReceipt(
-      fields.txHash,
-      fields.status,
-      fields.error,
-      fields.transactionFee,
-      fields.blockHash,
-      fields.blockNumber,
-      fields.debugInfo,
-    );
-  }
-
   /**
    * Convert a plain JSON object to a Tx class object.
    * @param obj - A plain Tx JSON object.
@@ -154,12 +133,3 @@ interface DebugInfo {
    */
   visibleOutgoingNotes: UniqueNote[];
 }
-
-const DebugInfoSchema = z.object({
-  noteHashes: z.array(schemas.Fr),
-  nullifiers: z.array(schemas.Fr),
-  publicDataWrites: z.array(PublicDataWrite.schema),
-  l2ToL1Msgs: z.array(schemas.Fr),
-  visibleIncomingNotes: z.array(UniqueNote.schema),
-  visibleOutgoingNotes: z.array(UniqueNote.schema),
-});
diff --git a/yarn-project/circuit-types/src/tx_effect.ts b/yarn-project/circuit-types/src/tx_effect.ts
index fca7b865d37..17a53abc2f8 100644
--- a/yarn-project/circuit-types/src/tx_effect.ts
+++ b/yarn-project/circuit-types/src/tx_effect.ts
@@ -11,7 +11,6 @@ import {
 import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { sha256Trunc } from '@aztec/foundation/crypto';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';
@@ -247,19 +246,13 @@ export class TxEffect {
     return this.nullifiers.length === 0;
   }
 
-  /** Returns a hex representation of the TxEffect object. */
+  /**
+   * Returns a string representation of the TxEffect object.
+   */
   toString(): string {
     return this.toBuffer().toString('hex');
   }
 
-  toJSON() {
-    return this.toString();
-  }
-
-  static get schema() {
-    return hexSchemaFor(TxEffect);
-  }
-
   [inspect.custom]() {
     // print out the non-empty fields
 
diff --git a/yarn-project/circuit-types/src/tx_execution_request.test.ts b/yarn-project/circuit-types/src/tx_execution_request.test.ts
deleted file mode 100644
index 2cb04307dfa..00000000000
--- a/yarn-project/circuit-types/src/tx_execution_request.test.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-
-import { jsonParseWithSchema } from '../../foundation/src/json-rpc/convert.js';
-import { TxExecutionRequest } from './tx_execution_request.js';
-
-describe('TxExecutionRequest', () => {
-  it('serializes and deserializes', () => {
-    const request = TxExecutionRequest.random();
-    const json = jsonStringify(request);
-    expect(jsonParseWithSchema(json, TxExecutionRequest.schema)).toEqual(request);
-  });
-});
diff --git a/yarn-project/circuit-types/src/tx_execution_request.ts b/yarn-project/circuit-types/src/tx_execution_request.ts
index 9588de8c160..bbef6c9cede 100644
--- a/yarn-project/circuit-types/src/tx_execution_request.ts
+++ b/yarn-project/circuit-types/src/tx_execution_request.ts
@@ -1,10 +1,7 @@
 import { AztecAddress, Fr, FunctionData, FunctionSelector, TxContext, TxRequest, Vector } from '@aztec/circuits.js';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
-import { z } from 'zod';
-
 import { AuthWitness } from './auth_witness.js';
 import { PackedValues } from './packed_values.js';
 
@@ -43,19 +40,6 @@ export class TxExecutionRequest {
     public authWitnesses: AuthWitness[],
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        origin: schemas.AztecAddress,
-        functionSelector: schemas.FunctionSelector,
-        firstCallArgsHash: schemas.Fr,
-        txContext: TxContext.schema,
-        argsOfCalls: z.array(PackedValues.schema),
-        authWitnesses: z.array(AuthWitness.schema),
-      })
-      .transform(TxExecutionRequest.from);
-  }
-
   toTxRequest(): TxRequest {
     return new TxRequest(
       this.origin,
@@ -129,15 +113,4 @@ export class TxExecutionRequest {
   static fromString(str: string): TxExecutionRequest {
     return TxExecutionRequest.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  static random() {
-    return new TxExecutionRequest(
-      AztecAddress.random(),
-      FunctionSelector.random(),
-      Fr.random(),
-      TxContext.empty(),
-      [PackedValues.random()],
-      [AuthWitness.random()],
-    );
-  }
 }
diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json
index 0c4730d4357..5a83df9826b 100644
--- a/yarn-project/circuits.js/package.json
+++ b/yarn-project/circuits.js/package.json
@@ -40,13 +40,11 @@
   },
   "dependencies": {
     "@aztec/bb.js": "portal:../../barretenberg/ts",
-    "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/types": "workspace:^",
     "eslint": "^8.35.0",
     "lodash.chunk": "^4.2.0",
-    "tslib": "^2.4.0",
-    "zod": "^3.23.8"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
diff --git a/yarn-project/circuits.js/src/contract/artifact_hash.test.ts b/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
index c6261e83bd1..2d17740c9c2 100644
--- a/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
+++ b/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
@@ -16,7 +16,7 @@ describe('ArtifactHash', () => {
       notes: {},
     };
     expect(computeArtifactHash(emptyArtifact).toString()).toMatchInlineSnapshot(
-      `"0x0c6fd9b48570721c5d36f978d084d77cacbfd2814f1344985f40e62bea6e61be"`,
+      `"0x0dea64e7fa0688017f77bcb7075485485afb4a5f1f8508483398869439f82fdf"`,
     );
   });
 });
diff --git a/yarn-project/circuits.js/src/contract/artifact_hash.ts b/yarn-project/circuits.js/src/contract/artifact_hash.ts
index de8ada1782c..f5c8bee8ded 100644
--- a/yarn-project/circuits.js/src/contract/artifact_hash.ts
+++ b/yarn-project/circuits.js/src/contract/artifact_hash.ts
@@ -63,7 +63,23 @@ export function computeArtifactMetadataHash(artifact: ContractArtifact) {
   // apparently random in the order they appear after compiled w/ nargo. We can try to sort this upon loading an artifact.
   // TODO: #6021: Should we use the sorted event selectors instead? They'd need to be unique for that.
   // Response - The output selectors need to be sorted, because if not noir makes no guarantees on the order of outputs for some reason
-  return sha256Fr(Buffer.from(JSON.stringify({ name: artifact.name }), 'utf-8'));
+
+  const metadata = { name: artifact.name, outputs: artifact.outputs };
+
+  const exceptions: string[] = [
+    'AuthRegistry',
+    'FeeJuice',
+    'ContractInstanceDeployer',
+    'ContractClassRegisterer',
+    'Router',
+  ];
+
+  // This is a temporary workaround for the canonical contracts to have deterministic deployments.
+  if (exceptions.includes(artifact.name)) {
+    return sha256Fr(Buffer.from(JSON.stringify({ name: artifact.name }), 'utf-8'));
+  }
+
+  return sha256Fr(Buffer.from(JSON.stringify(metadata), 'utf-8'));
 }
 
 export function computeArtifactFunctionTreeRoot(artifact: ContractArtifact, fnType: FunctionType) {
diff --git a/yarn-project/circuits.js/src/contract/interfaces/contract_class.ts b/yarn-project/circuits.js/src/contract/interfaces/contract_class.ts
index 82d0a4960a2..bccf0db1528 100644
--- a/yarn-project/circuits.js/src/contract/interfaces/contract_class.ts
+++ b/yarn-project/circuits.js/src/contract/interfaces/contract_class.ts
@@ -1,8 +1,5 @@
 import { type FunctionSelector } from '@aztec/foundation/abi';
 import { type Fr } from '@aztec/foundation/fields';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 const VERSION = 1 as const;
 
@@ -33,21 +30,6 @@ export interface PrivateFunction {
   vkHash: Fr;
 }
 
-const PrivateFunctionSchema = z.object({
-  selector: schemas.FunctionSelector,
-  vkHash: schemas.Fr,
-}) satisfies ZodFor<PrivateFunction>;
-
-/** Private function definition with executable bytecode. */
-export interface ExecutablePrivateFunction extends PrivateFunction {
-  /** ACIR and Brillig bytecode */
-  bytecode: Buffer;
-}
-
-const ExecutablePrivateFunctionSchema = PrivateFunctionSchema.and(
-  z.object({ bytecode: schemas.BufferB64 }),
-) satisfies ZodFor<ExecutablePrivateFunction>;
-
 /** Public function definition within a contract class. */
 export interface PublicFunction {
   /** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
@@ -56,11 +38,6 @@ export interface PublicFunction {
   bytecode: Buffer;
 }
 
-export const PublicFunctionSchema = z.object({
-  selector: schemas.FunctionSelector,
-  bytecode: schemas.BufferB64,
-}) satisfies ZodFor<PublicFunction>;
-
 /** Unconstrained function definition. */
 export interface UnconstrainedFunction {
   /** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
@@ -69,11 +46,34 @@ export interface UnconstrainedFunction {
   bytecode: Buffer;
 }
 
-const UnconstrainedFunctionSchema = z.object({
-  /** lala */
-  selector: schemas.FunctionSelector,
-  bytecode: schemas.BufferB64,
-}) satisfies ZodFor<UnconstrainedFunction>;
+/** Commitments to fields of a contract class. */
+interface ContractClassCommitments {
+  /** Identifier of the contract class. */
+  id: Fr;
+  /** Commitment to the public bytecode. */
+  publicBytecodeCommitment: Fr;
+  /** Root of the private functions tree  */
+  privateFunctionsRoot: Fr;
+}
+
+/** A contract class with its precomputed id. */
+export type ContractClassWithId = ContractClass & Pick<ContractClassCommitments, 'id'>;
+
+/** A contract class with public bytecode information, and optional private and unconstrained. */
+export type ContractClassPublic = {
+  privateFunctions: ExecutablePrivateFunctionWithMembershipProof[];
+  unconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[];
+} & Pick<ContractClassCommitments, 'id' | 'privateFunctionsRoot'> &
+  Omit<ContractClass, 'privateFunctions'>;
+
+/** The contract class with the block it was initially deployed at */
+export type ContractClassPublicWithBlockNumber = { l2BlockNumber: number } & ContractClassPublic;
+
+/** Private function definition with executable bytecode. */
+export interface ExecutablePrivateFunction extends PrivateFunction {
+  /** ACIR and Brillig bytecode */
+  bytecode: Buffer;
+}
 
 /** Sibling paths and sibling commitments for proving membership of a private function within a contract class. */
 export type PrivateFunctionMembershipProof = {
@@ -86,16 +86,6 @@ export type PrivateFunctionMembershipProof = {
   artifactTreeLeafIndex: number;
 };
 
-const PrivateFunctionMembershipProofSchema = z.object({
-  artifactMetadataHash: schemas.Fr,
-  functionMetadataHash: schemas.Fr,
-  unconstrainedFunctionsArtifactTreeRoot: schemas.Fr,
-  privateFunctionTreeSiblingPath: z.array(schemas.Fr),
-  privateFunctionTreeLeafIndex: schemas.Integer,
-  artifactTreeSiblingPath: z.array(schemas.Fr),
-  artifactTreeLeafIndex: schemas.Integer,
-}) satisfies ZodFor<PrivateFunctionMembershipProof>;
-
 /** A private function with a memebership proof. */
 export type ExecutablePrivateFunctionWithMembershipProof = ExecutablePrivateFunction & PrivateFunctionMembershipProof;
 
@@ -108,57 +98,5 @@ export type UnconstrainedFunctionMembershipProof = {
   artifactTreeLeafIndex: number;
 };
 
-const UnconstrainedFunctionMembershipProofSchema = z.object({
-  artifactMetadataHash: schemas.Fr,
-  functionMetadataHash: schemas.Fr,
-  privateFunctionsArtifactTreeRoot: schemas.Fr,
-  artifactTreeSiblingPath: z.array(schemas.Fr),
-  artifactTreeLeafIndex: schemas.Integer,
-}) satisfies ZodFor<UnconstrainedFunctionMembershipProof>;
-
 /** An unconstrained function with a membership proof. */
 export type UnconstrainedFunctionWithMembershipProof = UnconstrainedFunction & UnconstrainedFunctionMembershipProof;
-
-export const ContractClassSchema = z.object({
-  version: z.literal(VERSION),
-  artifactHash: schemas.Fr,
-  privateFunctions: z.array(PrivateFunctionSchema),
-  publicFunctions: z.array(PublicFunctionSchema),
-  packedBytecode: schemas.BufferB64,
-}) satisfies ZodFor<ContractClass>;
-
-/** Commitments to fields of a contract class. */
-interface ContractClassCommitments {
-  /** Identifier of the contract class. */
-  id: Fr;
-  /** Commitment to the public bytecode. */
-  publicBytecodeCommitment: Fr;
-  /** Root of the private functions tree  */
-  privateFunctionsRoot: Fr;
-}
-
-/** A contract class with its precomputed id. */
-export type ContractClassWithId = ContractClass & Pick<ContractClassCommitments, 'id'>;
-
-export const ContractClassWithIdSchema = ContractClassSchema.extend({
-  id: schemas.Fr,
-}) satisfies ZodFor<ContractClassWithId>;
-
-/** A contract class with public bytecode information, and optional private and unconstrained. */
-export type ContractClassPublic = {
-  privateFunctions: ExecutablePrivateFunctionWithMembershipProof[];
-  unconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[];
-} & Pick<ContractClassCommitments, 'id' | 'privateFunctionsRoot'> &
-  Omit<ContractClass, 'privateFunctions'>;
-
-export const ContractClassPublicSchema = z
-  .object({
-    id: schemas.Fr,
-    privateFunctionsRoot: schemas.Fr,
-    privateFunctions: z.array(ExecutablePrivateFunctionSchema.and(PrivateFunctionMembershipProofSchema)),
-    unconstrainedFunctions: z.array(UnconstrainedFunctionSchema.and(UnconstrainedFunctionMembershipProofSchema)),
-  })
-  .and(ContractClassSchema.omit({ privateFunctions: true })) satisfies ZodFor<ContractClassPublic>;
-
-/** The contract class with the block it was initially deployed at */
-export type ContractClassPublicWithBlockNumber = { l2BlockNumber: number } & ContractClassPublic;
diff --git a/yarn-project/circuits.js/src/contract/interfaces/contract_data_source.ts b/yarn-project/circuits.js/src/contract/interfaces/contract_data_source.ts
index 6f545df85db..258f91dd034 100644
--- a/yarn-project/circuits.js/src/contract/interfaces/contract_data_source.ts
+++ b/yarn-project/circuits.js/src/contract/interfaces/contract_data_source.ts
@@ -37,9 +37,6 @@ export interface ContractDataSource {
    */
   getContractClassIds(): Promise<Fr[]>;
 
-  /** Returns a contract artifact. */
   getContractArtifact(address: AztecAddress): Promise<ContractArtifact | undefined>;
-
-  /** Registers a a contract artifact. */
   addContractArtifact(address: AztecAddress, contract: ContractArtifact): Promise<void>;
 }
diff --git a/yarn-project/circuits.js/src/contract/interfaces/contract_instance.ts b/yarn-project/circuits.js/src/contract/interfaces/contract_instance.ts
index a8ea957cfeb..24d6dc83f2b 100644
--- a/yarn-project/circuits.js/src/contract/interfaces/contract_instance.ts
+++ b/yarn-project/circuits.js/src/contract/interfaces/contract_instance.ts
@@ -1,18 +1,11 @@
 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 { PublicKeys } from '../../types/public_keys.js';
+import { type PublicKeys } from '../../types/public_keys.js';
 
 const VERSION = 1 as const;
 
-/**
- * A contract instance is a concrete deployment of a contract class. It always references a contract class,
- * which dictates what code it executes when called. It has state (both private and public), as well as an
- * address that acts as its identifier. It can be called into. It may have encryption and nullifying public keys.
- */
+/** A contract instance is a concrete deployment of a contract class. A contract instance always references a contract class, which dictates what code it executes when called. A contract instance has state (both private and public), as well as an address that acts as its identifier. A contract instance can be called into. */
 export interface ContractInstance {
   /** Version identifier. Initially one, bumped for any changes to the contract instance struct. */
   version: typeof VERSION;
@@ -24,21 +17,7 @@ export interface ContractInstance {
   contractClassId: Fr;
   /** Hash of the selector and arguments to the constructor. */
   initializationHash: Fr;
-  /** Public keys associated with this intsance. */
   publicKeys: PublicKeys;
 }
 
 export type ContractInstanceWithAddress = ContractInstance & { address: AztecAddress };
-
-export const ContractInstanceSchema = z.object({
-  version: z.literal(VERSION),
-  salt: schemas.Fr,
-  deployer: schemas.AztecAddress,
-  contractClassId: schemas.Fr,
-  initializationHash: schemas.Fr,
-  publicKeys: PublicKeys.schema,
-}) satisfies ZodFor<ContractInstance>;
-
-export const ContractInstanceWithAddressSchema = ContractInstanceSchema.and(
-  z.object({ address: schemas.AztecAddress }),
-) satisfies ZodFor<ContractInstanceWithAddress>;
diff --git a/yarn-project/circuits.js/src/contract/interfaces/node-info.ts b/yarn-project/circuits.js/src/contract/interfaces/node-info.ts
index c377ec71cc5..3813025aa61 100644
--- a/yarn-project/circuits.js/src/contract/interfaces/node-info.ts
+++ b/yarn-project/circuits.js/src/contract/interfaces/node-info.ts
@@ -1,33 +1,33 @@
-import { type L1ContractAddresses, L1ContractAddressesSchema } from '@aztec/ethereum';
-import { type ZodFor } from '@aztec/foundation/schemas';
+import { type L1ContractAddresses } from '@aztec/ethereum';
 
-import { z } from 'zod';
+import { type ProtocolContractAddresses } from './protocol_contract_addresses.js';
 
-import { type ProtocolContractAddresses, ProtocolContractAddressesSchema } from './protocol_contract_addresses.js';
-
-/** Provides basic information about the running node. */
+/**
+ * Provides basic information about the running node.
+ */
 export interface NodeInfo {
-  /** Version as tracked in the aztec-packages repository. */
+  /**
+   * Version as tracked in the aztec-packages repository.
+   */
   nodeVersion: string;
-  /** L1 chain id. */
+  /**
+   * L1 chain id.
+   */
   l1ChainId: number;
-  /** Protocol version. */
+  /**
+   * Protocol version.
+   */
   protocolVersion: number;
-  /** The node's ENR. */
+  /**
+   * The node's ENR.
+   */
   enr: string | undefined;
-  /** The deployed l1 contract addresses */
+  /**
+   * The deployed l1 contract addresses
+   */
   l1ContractAddresses: L1ContractAddresses;
-  /** Protocol contract addresses */
+  /**
+   * Protocol contract addresses
+   */
   protocolContractAddresses: ProtocolContractAddresses;
 }
-
-export const NodeInfoSchema = z
-  .object({
-    nodeVersion: z.string(),
-    l1ChainId: z.number(),
-    protocolVersion: z.number(),
-    enr: z.string().optional(),
-    l1ContractAddresses: L1ContractAddressesSchema,
-    protocolContractAddresses: ProtocolContractAddressesSchema,
-  })
-  .transform(obj => ({ enr: undefined, ...obj })) satisfies ZodFor<NodeInfo>;
diff --git a/yarn-project/circuits.js/src/contract/interfaces/protocol_contract_addresses.ts b/yarn-project/circuits.js/src/contract/interfaces/protocol_contract_addresses.ts
index c2309918e91..ddc1f67e03d 100644
--- a/yarn-project/circuits.js/src/contract/interfaces/protocol_contract_addresses.ts
+++ b/yarn-project/circuits.js/src/contract/interfaces/protocol_contract_addresses.ts
@@ -1,14 +1,4 @@
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
-import { schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
-
-export const ProtocolContractsNames = [
-  'classRegisterer',
-  'feeJuice',
-  'instanceDeployer',
-  'multiCallEntrypoint',
-] as const;
 
 export type ProtocolContractAddresses = {
   classRegisterer: AztecAddress;
@@ -16,10 +6,3 @@ export type ProtocolContractAddresses = {
   instanceDeployer: AztecAddress;
   multiCallEntrypoint: AztecAddress;
 };
-
-export const ProtocolContractAddressesSchema = z.object({
-  classRegisterer: schemas.AztecAddress,
-  feeJuice: schemas.AztecAddress,
-  instanceDeployer: schemas.AztecAddress,
-  multiCallEntrypoint: schemas.AztecAddress,
-});
diff --git a/yarn-project/circuits.js/src/keys/derivation.ts b/yarn-project/circuits.js/src/keys/derivation.ts
index 6f5d8b5a59f..337091c197a 100644
--- a/yarn-project/circuits.js/src/keys/derivation.ts
+++ b/yarn-project/circuits.js/src/keys/derivation.ts
@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { poseidon2HashWithSeparator, sha512ToGrumpkinScalar } from '@aztec/foundation/crypto';
 import { Fq, Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
 
@@ -46,7 +46,7 @@ export function computePreaddress(publicKeysHash: Fr, partialAddress: Fr) {
   return poseidon2HashWithSeparator([publicKeysHash, partialAddress], GeneratorIndex.CONTRACT_ADDRESS_V1);
 }
 
-export function computeAddress(publicKeys: PublicKeys, partialAddress: Fr): AztecAddress {
+export function computeAddress(publicKeys: PublicKeys, partialAddress: Fr) {
   // Given public keys and a partial address, we can compute our address in the following steps.
   // 1. preaddress = poseidon2([publicKeysHash, partialAddress], GeneratorIndex.CONTRACT_ADDRESS_V1);
   // 2. addressPoint = (preaddress * G) + ivpk_m
@@ -57,7 +57,7 @@ export function computeAddress(publicKeys: PublicKeys, partialAddress: Fr): Azte
     publicKeys.masterIncomingViewingPublicKey,
   );
 
-  return new AztecAddress(address.x);
+  return address.x;
 }
 
 export function computeAddressSecret(preaddress: Fr, ivsk: Fq) {
@@ -83,7 +83,7 @@ export function computeAddressSecret(preaddress: Fr, ivsk: Fq) {
 }
 
 export function computePoint(address: AztecAddress) {
-  return Point.fromXAndSign(address.toField(), true);
+  return Point.fromXAndSign(address, true);
 }
 
 export function derivePublicKeyFromSecretKey(secretKey: Fq) {
diff --git a/yarn-project/circuits.js/src/structs/avm/avm.ts b/yarn-project/circuits.js/src/structs/avm/avm.ts
index e2979b50745..aa11b038dff 100644
--- a/yarn-project/circuits.js/src/structs/avm/avm.ts
+++ b/yarn-project/circuits.js/src/structs/avm/avm.ts
@@ -1,6 +1,5 @@
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -12,10 +11,10 @@ import { Vector } from '../shared.js';
 import { AvmCircuitPublicInputs } from './avm_circuit_public_inputs.js';
 
 export class AvmEnqueuedCallHint {
-  public readonly contractAddress: AztecAddress;
+  public readonly contractAddress: Fr;
   public readonly calldata: Vector<Fr>;
 
-  constructor(contractAddress: AztecAddress, calldata: Fr[]) {
+  constructor(contractAddress: Fr, calldata: Fr[]) {
     this.contractAddress = contractAddress;
     this.calldata = new Vector(calldata);
   }
@@ -40,7 +39,7 @@ export class AvmEnqueuedCallHint {
    * @returns whether all members are empty.
    */
   isEmpty(): boolean {
-    return this.contractAddress.isZero() && this.calldata.items.length == 0;
+    return this.contractAddress.isEmpty() && this.calldata.items.length == 0;
   }
 
   /**
@@ -68,7 +67,7 @@ export class AvmEnqueuedCallHint {
    */
   static fromBuffer(buff: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buff);
-    return new AvmEnqueuedCallHint(AztecAddress.fromBuffer(reader), reader.readVector(Fr));
+    return new AvmEnqueuedCallHint(Fr.fromBuffer(reader), reader.readVector(Fr));
   }
 
   /**
@@ -249,10 +248,10 @@ export class AvmExternalCallHint {
 
 export class AvmContractInstanceHint {
   constructor(
-    public readonly address: AztecAddress,
+    public readonly address: Fr,
     public readonly exists: boolean,
     public readonly salt: Fr,
-    public readonly deployer: AztecAddress,
+    public readonly deployer: Fr,
     public readonly contractClassId: Fr,
     public readonly initializationHash: Fr,
     public readonly publicKeys: PublicKeys,
@@ -323,10 +322,10 @@ export class AvmContractInstanceHint {
   static fromBuffer(buff: Buffer | BufferReader): AvmContractInstanceHint {
     const reader = BufferReader.asReader(buff);
     return new AvmContractInstanceHint(
-      AztecAddress.fromBuffer(reader),
+      Fr.fromBuffer(reader),
       reader.readBoolean(),
       Fr.fromBuffer(reader),
-      AztecAddress.fromBuffer(reader),
+      Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       PublicKeys.fromBuffer(reader),
@@ -669,14 +668,4 @@ export class AvmCircuitInputs {
   static fromString(str: string): AvmCircuitInputs {
     return AvmCircuitInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(AvmCircuitInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/call_context.ts b/yarn-project/circuits.js/src/structs/call_context.ts
index f2761bc4d1f..b5df33acc0a 100644
--- a/yarn-project/circuits.js/src/structs/call_context.ts
+++ b/yarn-project/circuits.js/src/structs/call_context.ts
@@ -1,12 +1,9 @@
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
-import { z } from 'zod';
-
 import { CALL_CONTEXT_LENGTH } from '../constants.gen.js';
 
 /**
@@ -40,26 +37,6 @@ export class CallContext {
     return new CallContext(AztecAddress.ZERO, AztecAddress.ZERO, FunctionSelector.empty(), false);
   }
 
-  static random() {
-    return new CallContext(
-      AztecAddress.random(),
-      AztecAddress.random(),
-      FunctionSelector.random(),
-      Math.random() > 0.5,
-    );
-  }
-
-  static get schema() {
-    return z
-      .object({
-        msgSender: schemas.AztecAddress,
-        contractAddress: schemas.AztecAddress,
-        functionSelector: schemas.FunctionSelector,
-        isStaticCall: z.boolean(),
-      })
-      .transform(CallContext.from);
-  }
-
   isEmpty() {
     return (
       this.msgSender.isZero() && this.contractAddress.isZero() && this.functionSelector.isEmpty() && !this.isStaticCall
diff --git a/yarn-project/circuits.js/src/structs/client_ivc_proof.ts b/yarn-project/circuits.js/src/structs/client_ivc_proof.ts
index 737870e5080..52562c221b5 100644
--- a/yarn-project/circuits.js/src/structs/client_ivc_proof.ts
+++ b/yarn-project/circuits.js/src/structs/client_ivc_proof.ts
@@ -1,4 +1,3 @@
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import * as fs from 'fs/promises';
@@ -66,15 +65,6 @@ export class ClientIvcProof {
     await Promise.all(fileData.map(([fileName, buffer]) => fs.writeFile(path.join(directory, fileName), buffer)));
   }
 
-  static get schema() {
-    // TODO(palla/schemas): Consider using a b64 schema instead
-    return hexSchemaFor(ClientIvcProof);
-  }
-
-  toJSON() {
-    return '0x' + this.toBuffer().toString('hex');
-  }
-
   static fromBuffer(buffer: Buffer | BufferReader): ClientIvcProof {
     const reader = BufferReader.asReader(buffer);
     return new ClientIvcProof(reader.readBuffer(), reader.readBuffer(), reader.readBuffer(), reader.readBuffer());
diff --git a/yarn-project/circuits.js/src/structs/complete_address.test.ts b/yarn-project/circuits.js/src/structs/complete_address.test.ts
index ec45caaa8d9..a68d00e5c01 100644
--- a/yarn-project/circuits.js/src/structs/complete_address.test.ts
+++ b/yarn-project/circuits.js/src/structs/complete_address.test.ts
@@ -39,9 +39,7 @@ describe('CompleteAddress', () => {
       '0x24e4646f58b9fbe7d38e317db8d5636c423fbbdfbe119fc190fe9c64747e0c6222f7fcddfa3ce3e8f0cc8e82d7b94cdd740afa3e77f8e4a63ea78a239432dcab0471657de2b6216ade6c506d28fbc22ba8b8ed95c871ad9f3e3984e90d9723a7111223493147f6785514b1c195bb37a2589f22a6596d30bb2bb145fdc9ca8f1e273bbffd678edce8fe30e0deafc4f66d58357c06fd4a820285294b9746c3be9509115c96e962322ffed6522f57194627136b8d03ac7469109707f5e44190c4840c49773308a13d740a7f0d4f0e6163b02c5a408b6f965856b6a491002d073d5b00d3d81beb009873eb7116327cf47c612d5758ef083d4fda78e9b63980b2a7622f567d22d2b02fe1f4ad42db9d58a36afd1983e7e2909d1cab61cafedad6193a0a7c585381b10f4666044266a02405bf6e01fa564c8517d4ad5823493abd31de',
     );
 
-    const address = new AztecAddress(
-      Fr.fromString('0x24e4646f58b9fbe7d38e317db8d5636c423fbbdfbe119fc190fe9c64747e0c62'),
-    );
+    const address = Fr.fromString('0x24e4646f58b9fbe7d38e317db8d5636c423fbbdfbe119fc190fe9c64747e0c62');
     const npkM = Point.fromString(
       '0x22f7fcddfa3ce3e8f0cc8e82d7b94cdd740afa3e77f8e4a63ea78a239432dcab0471657de2b6216ade6c506d28fbc22ba8b8ed95c871ad9f3e3984e90d9723a7',
     );
diff --git a/yarn-project/circuits.js/src/structs/complete_address.ts b/yarn-project/circuits.js/src/structs/complete_address.ts
index 04d083ae50c..68140d7d02b 100644
--- a/yarn-project/circuits.js/src/structs/complete_address.ts
+++ b/yarn-project/circuits.js/src/structs/complete_address.ts
@@ -1,6 +1,5 @@
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { computePartialAddress } from '../contract/contract_address.js';
@@ -31,14 +30,6 @@ export class CompleteAddress {
   /** Size in bytes of an instance */
   static readonly SIZE_IN_BYTES = 32 * 4;
 
-  static get schema() {
-    return hexSchemaFor(CompleteAddress);
-  }
-
-  toJSON() {
-    return this.toString();
-  }
-
   static random(): CompleteAddress {
     return this.fromSecretKeyAndPartialAddress(Fr.random(), Fr.random());
   }
@@ -66,7 +57,7 @@ export class CompleteAddress {
   public validate() {
     const expectedAddress = computeAddress(this.publicKeys, this.partialAddress);
 
-    if (!expectedAddress.equals(this.address)) {
+    if (!AztecAddress.fromField(expectedAddress).equals(this.address)) {
       throw new Error(
         `Address cannot be derived from public keys and partial address (received ${this.address.toString()}, derived ${expectedAddress.toString()})`,
       );
@@ -131,7 +122,7 @@ export class CompleteAddress {
    * @returns A Point instance.
    */
   static fromString(address: string): CompleteAddress {
-    return CompleteAddress.fromBuffer(Buffer.from(address.replace(/^0x/i, ''), 'hex'));
+    return this.fromBuffer(Buffer.from(address.replace(/^0x/i, ''), 'hex'));
   }
 
   /**
diff --git a/yarn-project/circuits.js/src/structs/content_commitment.ts b/yarn-project/circuits.js/src/structs/content_commitment.ts
index 578a6831ff5..ae18898ac61 100644
--- a/yarn-project/circuits.js/src/structs/content_commitment.ts
+++ b/yarn-project/circuits.js/src/structs/content_commitment.ts
@@ -1,9 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 import { CONTENT_COMMITMENT_LENGTH } from '../constants.gen.js';
 
 export const NUM_BYTES_PER_SHA256 = 32;
@@ -30,28 +27,6 @@ export class ContentCommitment {
     }
   }
 
-  static get schema() {
-    return z
-      .object({
-        numTxs: schemas.Fr,
-        txsEffectsHash: schemas.BufferHex,
-        inHash: schemas.BufferHex,
-        outHash: schemas.BufferHex,
-      })
-      .transform(
-        ({ numTxs, txsEffectsHash, inHash, outHash }) => new ContentCommitment(numTxs, txsEffectsHash, inHash, outHash),
-      );
-  }
-
-  toJSON() {
-    return {
-      numTxs: this.numTxs,
-      txsEffectsHash: this.txsEffectsHash.toString('hex'),
-      inHash: this.inHash.toString('hex'),
-      outHash: this.outHash.toString('hex'),
-    };
-  }
-
   getSize() {
     return this.toBuffer().length;
   }
diff --git a/yarn-project/circuits.js/src/structs/gas.ts b/yarn-project/circuits.js/src/structs/gas.ts
index d2ad132394d..7e1f7469492 100644
--- a/yarn-project/circuits.js/src/structs/gas.ts
+++ b/yarn-project/circuits.js/src/structs/gas.ts
@@ -1,10 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 import { MAX_L2_GAS_PER_ENQUEUED_CALL } from '../constants.gen.js';
 import { type GasFees } from './gas_fees.js';
@@ -17,15 +15,6 @@ export type GasDimensions = (typeof GasDimensions)[number];
 export class Gas {
   constructor(public readonly daGas: UInt32, public readonly l2Gas: UInt32) {}
 
-  static get schema() {
-    return z
-      .object({
-        daGas: schemas.UInt32,
-        l2Gas: schemas.UInt32,
-      })
-      .transform(Gas.from);
-  }
-
   clone(): Gas {
     return new Gas(this.daGas, this.l2Gas);
   }
@@ -46,10 +35,6 @@ export class Gas {
     return new Gas(0, 0);
   }
 
-  static random() {
-    return new Gas(Math.floor(Math.random() * 1e9), Math.floor(Math.random() * 1e9));
-  }
-
   /** Returns large enough gas amounts for testing purposes. */
   static test() {
     return new Gas(1e9, MAX_L2_GAS_PER_ENQUEUED_CALL);
diff --git a/yarn-project/circuits.js/src/structs/gas_fees.ts b/yarn-project/circuits.js/src/structs/gas_fees.ts
index 6cab097c0ce..17d5e0835fe 100644
--- a/yarn-project/circuits.js/src/structs/gas_fees.ts
+++ b/yarn-project/circuits.js/src/structs/gas_fees.ts
@@ -1,10 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 import { type GasDimensions } from './gas.js';
 
@@ -18,15 +16,6 @@ export class GasFees {
     this.feePerL2Gas = new Fr(feePerL2Gas);
   }
 
-  static get schema() {
-    return z
-      .object({
-        feePerDaGas: schemas.Fr,
-        feePerL2Gas: schemas.Fr,
-      })
-      .transform(GasFees.from);
-  }
-
   clone(): GasFees {
     return new GasFees(this.feePerDaGas, this.feePerL2Gas);
   }
diff --git a/yarn-project/circuits.js/src/structs/gas_settings.ts b/yarn-project/circuits.js/src/structs/gas_settings.ts
index baa11000e20..8c2b6860efc 100644
--- a/yarn-project/circuits.js/src/structs/gas_settings.ts
+++ b/yarn-project/circuits.js/src/structs/gas_settings.ts
@@ -1,11 +1,8 @@
 import { compact } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
-import { z } from 'zod';
-
 import {
   DEFAULT_GAS_LIMIT,
   DEFAULT_INCLUSION_FEE,
@@ -25,17 +22,6 @@ export class GasSettings {
     public readonly inclusionFee: Fr,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        gasLimits: Gas.schema,
-        teardownGasLimits: Gas.schema,
-        maxFeesPerGas: GasFees.schema,
-        inclusionFee: schemas.Fr,
-      })
-      .transform(GasSettings.from);
-  }
-
   getSize(): number {
     return this.toBuffer().length;
   }
diff --git a/yarn-project/circuits.js/src/structs/global_variables.ts b/yarn-project/circuits.js/src/structs/global_variables.ts
index f49badfe8ff..e36f7503573 100644
--- a/yarn-project/circuits.js/src/structs/global_variables.ts
+++ b/yarn-project/circuits.js/src/structs/global_variables.ts
@@ -1,12 +1,10 @@
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 import { GLOBAL_VARIABLES_LENGTH } from '../constants.gen.js';
 import { GasFees } from './gas_fees.js';
@@ -34,21 +32,6 @@ export class GlobalVariables {
     public gasFees: GasFees,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        chainId: schemas.Fr,
-        version: schemas.Fr,
-        blockNumber: schemas.Fr,
-        slotNumber: schemas.Fr,
-        timestamp: schemas.Fr,
-        coinbase: schemas.EthAddress,
-        feeRecipient: schemas.AztecAddress,
-        gasFees: GasFees.schema,
-      })
-      .transform(GlobalVariables.from);
-  }
-
   getSize(): number {
     return this.toBuffer().length;
   }
diff --git a/yarn-project/circuits.js/src/structs/header.ts b/yarn-project/circuits.js/src/structs/header.ts
index f31f85a2ef9..4e62a930783 100644
--- a/yarn-project/circuits.js/src/structs/header.ts
+++ b/yarn-project/circuits.js/src/structs/header.ts
@@ -1,11 +1,9 @@
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 import { GeneratorIndex, HEADER_LENGTH } from '../constants.gen.js';
 import { ContentCommitment } from './content_commitment.js';
@@ -28,28 +26,6 @@ export class Header {
     public totalFees: Fr,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        lastArchive: AppendOnlyTreeSnapshot.schema,
-        contentCommitment: ContentCommitment.schema,
-        state: StateReference.schema,
-        globalVariables: GlobalVariables.schema,
-        totalFees: schemas.Fr,
-      })
-      .transform(Header.from);
-  }
-
-  toJSON() {
-    return {
-      lastArchive: this.lastArchive,
-      contentCommitment: this.contentCommitment,
-      state: this.state,
-      globalVariables: this.globalVariables,
-      totalFees: this.totalFees,
-    };
-  }
-
   static getFields(fields: FieldsOf<Header>) {
     // Note: The order here must match the order in the HeaderLib solidity library.
     return [
diff --git a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts
index 5135b74324f..b79ba6a5d73 100644
--- a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts
@@ -1,7 +1,6 @@
 import { type FieldsOf, makeTuple } from '@aztec/foundation/array';
 import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';
@@ -107,14 +106,6 @@ export class CombinedAccumulatedData {
     return new CombinedAccumulatedData(...CombinedAccumulatedData.getFields(fields));
   }
 
-  static get schema() {
-    return hexSchemaFor(CombinedAccumulatedData);
-  }
-
-  toJSON() {
-    return this.toString();
-  }
-
   toBuffer() {
     return serializeToBuffer(...CombinedAccumulatedData.getFields(this));
   }
diff --git a/yarn-project/circuits.js/src/structs/kernel/combined_constant_data.ts b/yarn-project/circuits.js/src/structs/kernel/combined_constant_data.ts
index 084873c7b9b..1de159aefbc 100644
--- a/yarn-project/circuits.js/src/structs/kernel/combined_constant_data.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/combined_constant_data.ts
@@ -1,10 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor, schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
-import { z } from 'zod';
-
 import { GlobalVariables } from '../global_variables.js';
 import { Header } from '../header.js';
 import { TxContext } from '../tx_context.js';
@@ -48,19 +45,6 @@ export class CombinedConstantData {
     );
   }
 
-  static get schema() {
-    return z
-      .object({
-        historicalHeader: Header.schema,
-        txContext: TxContext.schema,
-        vkTreeRoot: schemas.Fr,
-        protocolContractTreeRoot: schemas.Fr,
-        globalVariables: GlobalVariables.schema,
-      })
-      .transform(CombinedConstantData.from)
-      .or(hexSchemaFor(CombinedConstantData));
-  }
-
   toBuffer() {
     return serializeToBuffer(
       this.historicalHeader,
diff --git a/yarn-project/circuits.js/src/structs/kernel/kernel_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/kernel_circuit_public_inputs.ts
index f2861693c3b..ff3e0e7dbe7 100644
--- a/yarn-project/circuits.js/src/structs/kernel/kernel_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/kernel_circuit_public_inputs.ts
@@ -1,5 +1,4 @@
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { PartialStateReference } from '../partial_state_reference.js';
@@ -87,14 +86,4 @@ export class KernelCircuitPublicInputs {
   static fromString(str: string) {
     return KernelCircuitPublicInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(KernelCircuitPublicInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_circuit_public_inputs.ts
index 1db065b1464..9cb069f2ef7 100644
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_circuit_public_inputs.ts
@@ -1,6 +1,5 @@
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { PrivateValidationRequests } from '../private_validation_requests.js';
@@ -39,14 +38,6 @@ export class PrivateKernelCircuitPublicInputs {
     public feePayer: AztecAddress,
   ) {}
 
-  static get schema() {
-    return hexSchemaFor(PrivateKernelCircuitPublicInputs);
-  }
-
-  toJSON() {
-    return '0x' + this.toBuffer().toString('hex');
-  }
-
   toBuffer() {
     return serializeToBuffer(
       this.constants,
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_empty_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_empty_inputs.ts
index 85340aa1aff..8b20412e8ee 100644
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_empty_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_empty_inputs.ts
@@ -1,5 +1,4 @@
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -49,16 +48,6 @@ export class PrivateKernelEmptyInputData {
       fields.protocolContractTreeRoot,
     );
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(PrivateKernelEmptyInputData);
-  }
 }
 
 export class PrivateKernelEmptyInputs {
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts
index a60d44d5139..69609a6c801 100644
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts
@@ -1,6 +1,4 @@
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { countAccumulatedItems, mergeAccumulatedData } from '../../utils/index.js';
@@ -124,14 +122,6 @@ export class PrivateKernelTailCircuitPublicInputs {
     }
   }
 
-  static get schema() {
-    return hexSchemaFor(PrivateKernelTailCircuitPublicInputs);
-  }
-
-  toJSON() {
-    return '0x' + this.toBuffer().toString('hex');
-  }
-
   getSize() {
     return (
       (this.forPublic?.getSize() ?? 0) +
@@ -264,21 +254,4 @@ export class PrivateKernelTailCircuitPublicInputs {
       PartialPrivateTailPublicInputsForRollup.empty(),
     );
   }
-
-  /**
-   * Creates an empty instance except for a nullifier in the combined accumulated data.
-   * Useful for populating a tx, which relies on that nullifier for extracting its tx hash.
-   * TODO(#9269): Remove this method as we move away from 1st nullifier as hash.
-   */
-  static emptyWithNullifier() {
-    const data = CombinedAccumulatedData.empty();
-    data.nullifiers[0] = Fr.random();
-    return new PrivateKernelTailCircuitPublicInputs(
-      TxConstantData.empty(),
-      RollupValidationRequests.empty(),
-      AztecAddress.ZERO,
-      undefined,
-      new PartialPrivateTailPublicInputsForRollup(data),
-    );
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts
index 44a6804c840..292432538cc 100644
--- a/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts
@@ -1,5 +1,4 @@
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '../../constants.gen.js';
@@ -50,14 +49,4 @@ export class BaseParityInputs {
   static fromString(str: string) {
     return BaseParityInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(BaseParityInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts
index aa26e28386e..43c58a54fc6 100644
--- a/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts
+++ b/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts
@@ -1,5 +1,4 @@
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -57,14 +56,4 @@ export class RootParityInput<PROOF_LENGTH extends number> {
   ): RootParityInput<PROOF_LENGTH> {
     return RootParityInput.fromBuffer(Buffer.from(str, 'hex'), expectedSize);
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string with expected size. */
-  static schemaFor<N extends number>(expectedSize?: N) {
-    return schemas.HexString.transform(str => RootParityInput.fromString(str, expectedSize));
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts
index aa74c1092f2..8dc2928f9c4 100644
--- a/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts
@@ -1,4 +1,3 @@
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { NUM_BASE_PARITY_PER_ROOT_PARITY, RECURSIVE_PROOF_LENGTH } from '../../constants.gen.js';
@@ -52,14 +51,4 @@ export class RootParityInputs {
   static fromString(str: string) {
     return RootParityInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(RootParityInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/partial_state_reference.ts b/yarn-project/circuits.js/src/structs/partial_state_reference.ts
index fe484113835..15a5c09a093 100644
--- a/yarn-project/circuits.js/src/structs/partial_state_reference.ts
+++ b/yarn-project/circuits.js/src/structs/partial_state_reference.ts
@@ -1,8 +1,6 @@
 import { type Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { z } from 'zod';
-
 import { PARTIAL_STATE_REFERENCE_LENGTH } from '../constants.gen.js';
 import { AppendOnlyTreeSnapshot } from './rollup/append_only_tree_snapshot.js';
 
@@ -19,27 +17,6 @@ export class PartialStateReference {
     public readonly publicDataTree: AppendOnlyTreeSnapshot,
   ) {}
 
-  toJSON() {
-    return {
-      noteHashTree: this.noteHashTree,
-      nullifierTree: this.nullifierTree,
-      publicDataTree: this.publicDataTree,
-    };
-  }
-
-  static get schema() {
-    return z
-      .object({
-        noteHashTree: AppendOnlyTreeSnapshot.schema,
-        nullifierTree: AppendOnlyTreeSnapshot.schema,
-        publicDataTree: AppendOnlyTreeSnapshot.schema,
-      })
-      .transform(
-        ({ noteHashTree, nullifierTree, publicDataTree }) =>
-          new PartialStateReference(noteHashTree, nullifierTree, publicDataTree),
-      );
-  }
-
   getSize() {
     return this.noteHashTree.getSize() + this.nullifierTree.getSize() + this.publicDataTree.getSize();
   }
diff --git a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts
index fbd2ae24520..484dc9fc915 100644
--- a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts
@@ -1,6 +1,5 @@
 import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import {
   BufferReader,
   FieldReader,
@@ -329,12 +328,4 @@ export class PrivateCircuitPublicInputs {
   public static fromJSON(value: any) {
     return PrivateCircuitPublicInputs.fromBuffer(Buffer.from(value, 'hex'));
   }
-
-  public static fromString(str: string) {
-    return PrivateCircuitPublicInputs.fromBuffer(Buffer.from(str, 'hex'));
-  }
-
-  static get schema() {
-    return hexSchemaFor(PrivateCircuitPublicInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/public_data_write.ts b/yarn-project/circuits.js/src/structs/public_data_write.ts
index 7f4c2e49ca4..571410573f0 100644
--- a/yarn-project/circuits.js/src/structs/public_data_write.ts
+++ b/yarn-project/circuits.js/src/structs/public_data_write.ts
@@ -1,10 +1,8 @@
-import { STRING_ENCODING } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
-import { z } from 'zod';
+import { STRING_ENCODING } from './shared.js';
 
 /**
  * Write operations on the public state tree.
@@ -23,15 +21,6 @@ export class PublicDataWrite {
     public readonly value: Fr,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        leafSlot: schemas.Fr,
-        value: schemas.Fr,
-      })
-      .transform(PublicDataWrite.from);
-  }
-
   static from(fields: FieldsOf<PublicDataWrite>) {
     return new PublicDataWrite(...PublicDataWrite.getFields(fields));
   }
diff --git a/yarn-project/circuits.js/src/structs/recursive_proof.ts b/yarn-project/circuits.js/src/structs/recursive_proof.ts
index ce5a3b0dcae..d368c267abb 100644
--- a/yarn-project/circuits.js/src/structs/recursive_proof.ts
+++ b/yarn-project/circuits.js/src/structs/recursive_proof.ts
@@ -1,6 +1,5 @@
 import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { Proof, makeEmptyProof } from './proof.js';
@@ -84,16 +83,6 @@ export class RecursiveProof<N extends number> {
   static fromString<N extends number>(str: string, expectedSize?: N): RecursiveProof<N> {
     return RecursiveProof.fromBuffer(Buffer.from(str, 'hex'), expectedSize);
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string with expected size. */
-  static schemaFor<N extends number>(expectedSize?: N) {
-    return schemas.HexString.transform(str => RecursiveProof.fromString(str, expectedSize));
-  }
 }
 
 /**
diff --git a/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts b/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts
index b4c71e37be1..f6c1b8d7a05 100644
--- a/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts
@@ -1,9 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 import { STRING_ENCODING, type UInt32 } from '../shared.js';
 
@@ -30,19 +28,6 @@ export class AppendOnlyTreeSnapshot {
     public nextAvailableLeafIndex: UInt32,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        root: schemas.Fr,
-        nextAvailableLeafIndex: schemas.UInt32,
-      })
-      .transform(({ root, nextAvailableLeafIndex }) => new AppendOnlyTreeSnapshot(root, nextAvailableLeafIndex));
-  }
-
-  toJSON() {
-    return { root: this.root, nextAvailableLeafIndex: this.nextAvailableLeafIndex };
-  }
-
   getSize() {
     return this.root.size + 4;
   }
diff --git a/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts
index 981d1f0faa6..5081fa4879c 100644
--- a/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts
@@ -1,9 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { PartialStateReference } from '../partial_state_reference.js';
-import { RollupTypes } from '../shared.js';
+import { type RollupTypes } from '../shared.js';
 import { ConstantRollupData } from './constant_rollup_data.js';
 
 /**
@@ -48,20 +47,6 @@ export class BaseOrMergeRollupPublicInputs {
     public accumulatedFees: Fr,
   ) {}
 
-  /** Returns an empty instance. */
-  static empty() {
-    return new BaseOrMergeRollupPublicInputs(
-      RollupTypes.Base,
-      0,
-      ConstantRollupData.empty(),
-      PartialStateReference.empty(),
-      PartialStateReference.empty(),
-      Fr.zero(),
-      Fr.zero(),
-      Fr.zero(),
-    );
-  }
-
   /**
    * Deserializes from a buffer or reader.
    * Note: Corresponds to a write in cpp.
@@ -119,14 +104,4 @@ export class BaseOrMergeRollupPublicInputs {
   static fromString(str: string) {
     return BaseOrMergeRollupPublicInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(BaseOrMergeRollupPublicInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/block_merge_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/block_merge_rollup.ts
index 6732a4ffadf..5db57f8a55c 100644
--- a/yarn-project/circuits.js/src/structs/rollup/block_merge_rollup.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/block_merge_rollup.ts
@@ -1,4 +1,3 @@
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
@@ -51,14 +50,4 @@ export class BlockMergeRollupInputs {
   static fromString(str: string) {
     return BlockMergeRollupInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(BlockMergeRollupInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/block_root_or_block_merge_public_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/block_root_or_block_merge_public_inputs.ts
index 639f335b760..88b23ff5363 100644
--- a/yarn-project/circuits.js/src/structs/rollup/block_root_or_block_merge_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/block_root_or_block_merge_public_inputs.ts
@@ -1,6 +1,5 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -118,16 +117,6 @@ export class BlockRootOrBlockMergePublicInputs {
   static fromString(str: string) {
     return BlockRootOrBlockMergePublicInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(BlockRootOrBlockMergePublicInputs);
-  }
 }
 
 export class FeeRecipient {
diff --git a/yarn-project/circuits.js/src/structs/rollup/block_root_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/block_root_rollup.ts
index 3a63c40ddb3..0a4eece2374 100644
--- a/yarn-project/circuits.js/src/structs/rollup/block_root_rollup.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/block_root_rollup.ts
@@ -1,5 +1,4 @@
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -128,14 +127,4 @@ export class BlockRootRollupInputs {
   static fromString(str: string) {
     return BlockRootRollupInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(BlockRootRollupInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/empty_block_root_rollup_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/empty_block_root_rollup_inputs.ts
index ba42802e1ae..df629822258 100644
--- a/yarn-project/circuits.js/src/structs/rollup/empty_block_root_rollup_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/empty_block_root_rollup_inputs.ts
@@ -1,5 +1,4 @@
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -86,14 +85,4 @@ export class EmptyBlockRootRollupInputs {
   static fromString(str: string) {
     return EmptyBlockRootRollupInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(EmptyBlockRootRollupInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts
index 2950f2f1614..5600edec39f 100644
--- a/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts
@@ -1,4 +1,3 @@
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { PreviousRollupData } from './previous_rollup_data.js';
@@ -48,14 +47,4 @@ export class MergeRollupInputs {
   static fromString(str: string) {
     return MergeRollupInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(MergeRollupInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/private_base_rollup_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/private_base_rollup_inputs.ts
index 5cc93fdeb4e..a5483c51e41 100644
--- a/yarn-project/circuits.js/src/structs/rollup/private_base_rollup_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/private_base_rollup_inputs.ts
@@ -1,4 +1,3 @@
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -36,14 +35,4 @@ export class PrivateBaseRollupInputs {
   static empty() {
     return new PrivateBaseRollupInputs(PrivateTubeData.empty(), BaseRollupHints.empty());
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(PrivateBaseRollupInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/public_base_rollup_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/public_base_rollup_inputs.ts
index b8ab34a167f..8c0f034c2c3 100644
--- a/yarn-project/circuits.js/src/structs/rollup/public_base_rollup_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/public_base_rollup_inputs.ts
@@ -1,4 +1,3 @@
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -40,14 +39,4 @@ export class PublicBaseRollupInputs {
   static empty() {
     return new PublicBaseRollupInputs(PublicTubeData.empty(), AvmProofData.empty(), BaseRollupHints.empty());
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(PublicBaseRollupInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts
index a8eb8b433e5..0cc29515460 100644
--- a/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts
@@ -1,5 +1,4 @@
 import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -78,16 +77,6 @@ export class RootRollupInputs {
   static fromString(str: string) {
     return RootRollupInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(RootRollupInputs);
-  }
 }
 
 /**
@@ -169,14 +158,4 @@ export class RootRollupPublicInputs {
   static fromString(str: string) {
     return RootRollupPublicInputs.fromBuffer(Buffer.from(str, 'hex'));
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(RootRollupPublicInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/tube_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/tube_inputs.ts
index 0320d0ec228..840ced0fc0d 100644
--- a/yarn-project/circuits.js/src/structs/rollup/tube_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/tube_inputs.ts
@@ -1,4 +1,3 @@
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
@@ -56,14 +55,4 @@ export class TubeInputs {
   static empty() {
     return new TubeInputs(ClientIvcProof.empty());
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(TubeInputs);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/scoped_key_validation_request_and_generator.ts b/yarn-project/circuits.js/src/structs/scoped_key_validation_request_and_generator.ts
index 959c0808687..840282adb32 100644
--- a/yarn-project/circuits.js/src/structs/scoped_key_validation_request_and_generator.ts
+++ b/yarn-project/circuits.js/src/structs/scoped_key_validation_request_and_generator.ts
@@ -27,7 +27,7 @@ export class ScopedKeyValidationRequestAndGenerator {
   }
 
   toFields(): Fr[] {
-    const fields = [...this.request.toFields(), this.contractAddress.toField()];
+    const fields = [...this.request.toFields(), this.contractAddress];
     if (fields.length !== SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH) {
       throw new Error(
         `Invalid number of fields for ScopedKeyValidationRequestAndGenerator. Expected ${SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`,
diff --git a/yarn-project/circuits.js/src/structs/state_reference.ts b/yarn-project/circuits.js/src/structs/state_reference.ts
index 8f0c1fd0be0..e29ca1d6f9f 100644
--- a/yarn-project/circuits.js/src/structs/state_reference.ts
+++ b/yarn-project/circuits.js/src/structs/state_reference.ts
@@ -2,7 +2,6 @@ import { type Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';
-import { z } from 'zod';
 
 import { STATE_REFERENCE_LENGTH } from '../constants.gen.js';
 import { PartialStateReference } from './partial_state_reference.js';
@@ -19,19 +18,6 @@ export class StateReference {
     public partial: PartialStateReference,
   ) {}
 
-  toJSON() {
-    return { l1ToL2MessageTree: this.l1ToL2MessageTree, partial: this.partial };
-  }
-
-  static get schema() {
-    return z
-      .object({
-        l1ToL2MessageTree: AppendOnlyTreeSnapshot.schema,
-        partial: PartialStateReference.schema,
-      })
-      .transform(({ l1ToL2MessageTree, partial }) => new StateReference(l1ToL2MessageTree, partial));
-  }
-
   getSize() {
     return this.l1ToL2MessageTree.getSize() + this.partial.getSize();
   }
diff --git a/yarn-project/circuits.js/src/structs/tagging_secret.ts b/yarn-project/circuits.js/src/structs/tagging_secret.ts
index 3275346cf1a..9284fc36c16 100644
--- a/yarn-project/circuits.js/src/structs/tagging_secret.ts
+++ b/yarn-project/circuits.js/src/structs/tagging_secret.ts
@@ -6,7 +6,7 @@ export class TaggingSecret {
   constructor(public secret: Fr, public recipient: AztecAddress) {}
 
   toFields(): Fr[] {
-    return [this.secret, this.recipient.toField()];
+    return [this.secret, this.recipient];
   }
 }
 
@@ -16,7 +16,7 @@ export class IndexedTaggingSecret extends TaggingSecret {
   }
 
   override toFields(): Fr[] {
-    return [this.secret, this.recipient.toField(), new Fr(this.index)];
+    return [this.secret, this.recipient, new Fr(this.index)];
   }
 
   static fromFields(serialized: Fr[]) {
diff --git a/yarn-project/circuits.js/src/structs/trees/nullifier_leaf.ts b/yarn-project/circuits.js/src/structs/trees/nullifier_leaf.ts
index 8d561e1ebfb..42160877895 100644
--- a/yarn-project/circuits.js/src/structs/trees/nullifier_leaf.ts
+++ b/yarn-project/circuits.js/src/structs/trees/nullifier_leaf.ts
@@ -1,11 +1,8 @@
 import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 
-import { z } from 'zod';
-
 /**
  * Class containing the data of a preimage of a single leaf in the nullifier tree.
  * Note: It's called preimage because this data gets hashed before being inserted as a node into the `IndexedTree`.
@@ -26,26 +23,6 @@ export class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
     public nextIndex: bigint,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        nullifier: schemas.Fr,
-        nextNullifier: schemas.Fr,
-        nextIndex: schemas.BigInt,
-      })
-      .transform(
-        ({ nullifier, nextNullifier, nextIndex }) => new NullifierLeafPreimage(nullifier, nextNullifier, nextIndex),
-      );
-  }
-
-  toJSON() {
-    return {
-      nullifier: this.nullifier.toString(),
-      nextNullifier: this.nextNullifier.toString(),
-      nextIndex: '0x' + this.nextIndex.toString(16),
-    };
-  }
-
   getKey(): bigint {
     return this.nullifier.toBigInt();
   }
@@ -82,8 +59,12 @@ export class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
     return new NullifierLeafPreimage(this.nullifier, this.nextNullifier, this.nextIndex);
   }
 
-  static random() {
-    return new NullifierLeafPreimage(Fr.random(), Fr.random(), BigInt(Math.floor(Math.random() * 1000)));
+  toJSON() {
+    return {
+      nullifier: this.nullifier.toString(),
+      nextNullifier: this.nextNullifier.toString(),
+      nextIndex: '0x' + this.nextIndex.toString(16),
+    };
   }
 
   static empty(): NullifierLeafPreimage {
diff --git a/yarn-project/circuits.js/src/structs/trees/public_data_leaf.ts b/yarn-project/circuits.js/src/structs/trees/public_data_leaf.ts
index b9660f2832f..a7578688f03 100644
--- a/yarn-project/circuits.js/src/structs/trees/public_data_leaf.ts
+++ b/yarn-project/circuits.js/src/structs/trees/public_data_leaf.ts
@@ -1,11 +1,8 @@
 import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 
-import { z } from 'zod';
-
 /**
  * Class containing the data of a preimage of a single leaf in the public data tree.
  * Note: It's called preimage because this data gets hashed before being inserted as a node into the `IndexedTree`.
@@ -30,19 +27,6 @@ export class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
     public nextIndex: bigint,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        slot: schemas.Fr,
-        value: schemas.Fr,
-        nextSlot: schemas.Fr,
-        nextIndex: schemas.BigInt,
-      })
-      .transform(
-        ({ slot, value, nextSlot, nextIndex }) => new PublicDataTreeLeafPreimage(slot, value, nextSlot, nextIndex),
-      );
-  }
-
   getKey(): bigint {
     return this.slot.toBigInt();
   }
@@ -76,15 +60,6 @@ export class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
     return new PublicDataTreeLeafPreimage(this.slot, this.value, this.nextSlot, this.nextIndex);
   }
 
-  static random() {
-    return new PublicDataTreeLeafPreimage(
-      Fr.random(),
-      Fr.random(),
-      Fr.random(),
-      BigInt(Math.floor(Math.random() * 1000)),
-    );
-  }
-
   static empty(): PublicDataTreeLeafPreimage {
     return new PublicDataTreeLeafPreimage(Fr.ZERO, Fr.ZERO, Fr.ZERO, 0n);
   }
diff --git a/yarn-project/circuits.js/src/structs/tx_context.test.ts b/yarn-project/circuits.js/src/structs/tx_context.test.ts
index f2b1f4b7533..1b009fafd42 100644
--- a/yarn-project/circuits.js/src/structs/tx_context.test.ts
+++ b/yarn-project/circuits.js/src/structs/tx_context.test.ts
@@ -1,5 +1,4 @@
 import { randomInt } from '@aztec/foundation/crypto';
-import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
 
 import { TX_CONTEXT_LENGTH } from '../constants.gen.js';
@@ -21,11 +20,6 @@ describe('TxContext', () => {
     expect(res.isEmpty()).toBe(false);
   });
 
-  it(`serializes to json and deserializes it back`, () => {
-    const json = jsonStringify(context);
-    expect(TxContext.schema.parse(JSON.parse(json))).toEqual(context);
-  });
-
   it('number of fields matches constant', () => {
     const fields = context.toFields();
     expect(fields.length).toBe(TX_CONTEXT_LENGTH);
diff --git a/yarn-project/circuits.js/src/structs/tx_context.ts b/yarn-project/circuits.js/src/structs/tx_context.ts
index 526ff0860ef..a4b602b7f30 100644
--- a/yarn-project/circuits.js/src/structs/tx_context.ts
+++ b/yarn-project/circuits.js/src/structs/tx_context.ts
@@ -1,10 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
-import { z } from 'zod';
-
 import { TX_CONTEXT_LENGTH } from '../constants.gen.js';
 import { GasSettings } from './gas_settings.js';
 
@@ -27,24 +24,6 @@ export class TxContext {
     this.version = new Fr(version);
   }
 
-  static get schema() {
-    return z
-      .object({
-        chainId: schemas.Fr,
-        version: schemas.Fr,
-        gasSettings: GasSettings.schema,
-      })
-      .transform(TxContext.from);
-  }
-
-  toJSON() {
-    return {
-      chainId: this.chainId,
-      version: this.version,
-      gasSettings: this.gasSettings,
-    };
-  }
-
   getSize() {
     return this.chainId.size + this.version.size + this.gasSettings.getSize();
   }
diff --git a/yarn-project/circuits.js/src/structs/verification_key.ts b/yarn-project/circuits.js/src/structs/verification_key.ts
index 22aa2d68e04..b50398bf73c 100644
--- a/yarn-project/circuits.js/src/structs/verification_key.ts
+++ b/yarn-project/circuits.js/src/structs/verification_key.ts
@@ -1,7 +1,6 @@
 import { makeTuple } from '@aztec/foundation/array';
 import { times } from '@aztec/foundation/collection';
 import { Fq, Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS } from '../constants.gen.js';
@@ -98,15 +97,6 @@ export class VerificationKeyAsFields {
     return this.key[CIRCUIT_RECURSIVE_INDEX].equals(Fr.ONE);
   }
 
-  static get schema() {
-    // TODO(palla/schemas): Should we verify the hash matches the key when deserializing?
-    return hexSchemaFor(VerificationKeyAsFields);
-  }
-
-  toJSON() {
-    return '0x' + this.toBuffer().toString('hex');
-  }
-
   /**
    * Serialize as a buffer.
    * @returns The buffer.
@@ -114,7 +104,6 @@ export class VerificationKeyAsFields {
   toBuffer() {
     return serializeToBuffer(...this.toFields());
   }
-
   toFields() {
     return [this.key.length, ...this.key, this.hash];
   }
@@ -240,10 +229,6 @@ export class VerificationKeyData {
     return this.keyAsFields.isRecursive;
   }
 
-  static empty() {
-    return new VerificationKeyData(VerificationKeyAsFields.makeEmpty(0), Buffer.alloc(0));
-  }
-
   static makeFakeHonk(): VerificationKeyData {
     return new VerificationKeyData(VerificationKeyAsFields.makeFakeHonk(), VerificationKey.makeFake().toBuffer());
   }
@@ -279,14 +264,4 @@ export class VerificationKeyData {
   public clone() {
     return VerificationKeyData.fromBuffer(this.toBuffer());
   }
-
-  /** Returns a hex representation for JSON serialization. */
-  toJSON() {
-    return this.toString();
-  }
-
-  /** Creates an instance from a hex string. */
-  static get schema() {
-    return hexSchemaFor(VerificationKeyData);
-  }
 }
diff --git a/yarn-project/circuits.js/src/structs/vk_witness_data.ts b/yarn-project/circuits.js/src/structs/vk_witness_data.ts
index 723475b5fa2..0ce5beb46f7 100644
--- a/yarn-project/circuits.js/src/structs/vk_witness_data.ts
+++ b/yarn-project/circuits.js/src/structs/vk_witness_data.ts
@@ -20,7 +20,7 @@ export class VkWitnessData {
   ) {}
 
   static empty() {
-    return new VkWitnessData(VerificationKeyData.empty(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
+    return new VkWitnessData(VerificationKeyData.makeFakeHonk(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
@@ -35,8 +35,4 @@ export class VkWitnessData {
   toBuffer() {
     return serializeToBuffer(this.vk, this.vkIndex, this.vkPath);
   }
-
-  toString() {
-    return this.toBuffer().toString('hex');
-  }
 }
diff --git a/yarn-project/circuits.js/src/tests/factories.ts b/yarn-project/circuits.js/src/tests/factories.ts
index d44d2f2171b..e8658b246d8 100644
--- a/yarn-project/circuits.js/src/tests/factories.ts
+++ b/yarn-project/circuits.js/src/tests/factories.ts
@@ -1504,14 +1504,14 @@ export function makeAvmExternalCallHint(seed = 0): AvmExternalCallHint {
     makeArray((seed % 100) + 10, i => new Fr(i), seed + 0x1000),
     new Gas(seed + 0x200, seed),
     new Fr(seed + 0x300),
-    new AztecAddress(new Fr(seed + 0x400)),
+    new Fr(seed + 0x400),
   );
 }
 
 export function makeContractInstanceFromClassId(classId: Fr, seed = 0): ContractInstanceWithAddress {
   const salt = new Fr(seed);
   const initializationHash = new Fr(seed + 1);
-  const deployer = new AztecAddress(new Fr(seed + 2));
+  const deployer = new Fr(seed + 2);
   const publicKeys = PublicKeys.random();
 
   const saltedInitializationHash = poseidon2HashWithSeparator(
@@ -1563,10 +1563,10 @@ export function makeAvmBytecodeHints(seed = 0): AvmContractBytecodeHints {
  */
 export function makeAvmContractInstanceHint(seed = 0): AvmContractInstanceHint {
   return new AvmContractInstanceHint(
-    new AztecAddress(new Fr(seed)),
+    new Fr(seed),
     true /* exists */,
     new Fr(seed + 0x2),
-    new AztecAddress(new Fr(seed + 0x3)),
+    new Fr(seed + 0x3),
     new Fr(seed + 0x4),
     new Fr(seed + 0x5),
     new PublicKeys(
@@ -1580,7 +1580,7 @@ export function makeAvmContractInstanceHint(seed = 0): AvmContractInstanceHint {
 
 export function makeAvmEnqueuedCallHint(seed = 0): AvmEnqueuedCallHint {
   return AvmEnqueuedCallHint.from({
-    contractAddress: new AztecAddress(new Fr(seed)),
+    contractAddress: new Fr(seed),
     calldata: makeVector((seed % 20) + 4, i => new Fr(i), seed + 0x1000),
   });
 }
diff --git a/yarn-project/circuits.js/src/types/public_keys.ts b/yarn-project/circuits.js/src/types/public_keys.ts
index 321fc04c7a3..3dd38c807c0 100644
--- a/yarn-project/circuits.js/src/types/public_keys.ts
+++ b/yarn-project/circuits.js/src/types/public_keys.ts
@@ -1,10 +1,6 @@
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { Fr, Point } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { type FieldsOf } from '@aztec/foundation/types';
-
-import { z } from 'zod';
 
 import {
   DEFAULT_IVPK_M_X,
@@ -21,6 +17,7 @@ import { type PublicKey } from './public_key.js';
 
 export class PublicKeys {
   public constructor(
+    /** Contract address (typically of an account contract) */
     /** Master nullifier public key */
     public masterNullifierPublicKey: PublicKey,
     /** Master incoming viewing public key */
@@ -31,26 +28,6 @@ export class PublicKeys {
     public masterTaggingPublicKey: PublicKey,
   ) {}
 
-  static get schema() {
-    return z
-      .object({
-        masterNullifierPublicKey: schemas.Point,
-        masterIncomingViewingPublicKey: schemas.Point,
-        masterOutgoingViewingPublicKey: schemas.Point,
-        masterTaggingPublicKey: schemas.Point,
-      })
-      .transform(PublicKeys.from);
-  }
-
-  static from(fields: FieldsOf<PublicKeys>) {
-    return new PublicKeys(
-      fields.masterNullifierPublicKey,
-      fields.masterIncomingViewingPublicKey,
-      fields.masterOutgoingViewingPublicKey,
-      fields.masterTaggingPublicKey,
-    );
-  }
-
   hash() {
     return this.isEmpty()
       ? Fr.ZERO
diff --git a/yarn-project/circuits.js/tsconfig.json b/yarn-project/circuits.js/tsconfig.json
index fb67f66550e..831130c7c84 100644
--- a/yarn-project/circuits.js/tsconfig.json
+++ b/yarn-project/circuits.js/tsconfig.json
@@ -6,9 +6,6 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
-    {
-      "path": "../ethereum"
-    },
     {
       "path": "../foundation"
     },
diff --git a/yarn-project/cli/src/utils/inspect.ts b/yarn-project/cli/src/utils/inspect.ts
index 445e48c3bd1..d1f635ae514 100644
--- a/yarn-project/cli/src/utils/inspect.ts
+++ b/yarn-project/cli/src/utils/inspect.ts
@@ -165,8 +165,8 @@ async function getKnownNullifiers(pxe: PXE, artifactMap: ArtifactMap) {
   const deployNullifiers: Record<string, AztecAddress> = {};
   const classNullifiers: Record<string, string> = {};
   for (const contract of knownContracts) {
-    initNullifiers[siloNullifier(contract, contract.toField()).toString()] = contract;
-    deployNullifiers[siloNullifier(deployerAddress, contract.toField()).toString()] = contract;
+    initNullifiers[siloNullifier(contract, contract).toString()] = contract;
+    deployNullifiers[siloNullifier(deployerAddress, contract).toString()] = contract;
   }
   for (const artifact of Object.values(artifactMap)) {
     classNullifiers[
diff --git a/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts b/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts
index 9522bbf30ba..ff72ad0b4fc 100644
--- a/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts
+++ b/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts
@@ -41,8 +41,8 @@ describe('e2e_sandbox_example', () => {
     const bobWallet = accounts[1];
     const alice = aliceWallet.getAddress();
     const bob = bobWallet.getAddress();
-    logger.info(`Loaded alice's account at ${alice.toString()}`);
-    logger.info(`Loaded bob's account at ${bob.toString()}`);
+    logger.info(`Loaded alice's account at ${alice.toShortString()}`);
+    logger.info(`Loaded bob's account at ${bob.toShortString()}`);
     // docs:end:load_accounts
 
     // docs:start:Deployment
@@ -161,7 +161,7 @@ describe('e2e_sandbox_example', () => {
       [bob, 'Bob'],
     ] as const) {
       if (registeredAccounts.find(acc => acc.equals(account))) {
-        logger.info(`Created ${name}'s account at ${account.toString()}`);
+        logger.info(`Created ${name}'s account at ${account.toShortString()}`);
         continue;
       }
       logger.info(`Failed to create account for ${name}!`);
diff --git a/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts b/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts
index cc3347f02fe..0614c36ca16 100644
--- a/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts
+++ b/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts
@@ -13,13 +13,12 @@ import {
   retryUntil,
 } from '@aztec/aztec.js';
 import { DefaultMultiCallEntrypoint } from '@aztec/aztec.js/entrypoint';
-// eslint-disable-next-line no-restricted-imports
-import { PXESchema } from '@aztec/circuit-types';
 import { GasSettings, deriveSigningKey } from '@aztec/circuits.js';
-import { createNamespacedSafeJsonRpcServer, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
+import { createNamespacedJsonRpcServer, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
 import { type DebugLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { FeeJuiceContract, TestContract } from '@aztec/noir-contracts.js';
+import { createPXERpcServer } from '@aztec/pxe';
 
 import getPort from 'get-port';
 import { exec } from 'node:child_process';
@@ -110,7 +109,7 @@ describe('End-to-end tests for devnet', () => {
       const localhost = await getLocalhost();
       pxeUrl = `http://${localhost}:${port}`;
       // start a server for the CLI to talk to
-      const jsonRpcServer = createNamespacedSafeJsonRpcServer({ pxe: [pxe, PXESchema] });
+      const jsonRpcServer = createNamespacedJsonRpcServer([{ pxe: createPXERpcServer(pxe) }]);
       const server = await startHttpRpcServer(jsonRpcServer, { port });
 
       teardown = async () => {
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
index e712e0e9ebb..595a13e31ed 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
@@ -113,6 +113,6 @@ describe('e2e_deploy_contract legacy', () => {
     expect(badTxReceipt.status).toEqual(TxStatus.APP_LOGIC_REVERTED);
 
     // But the bad tx did not deploy
-    await expect(pxe.isContractClassPubliclyRegistered(badDeploy.getInstance().contractClassId)).resolves.toBeFalsy();
+    await expect(pxe.isContractClassPubliclyRegistered(badDeploy.getInstance().address)).resolves.toBeFalsy();
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_event_logs.test.ts b/yarn-project/end-to-end/src/e2e_event_logs.test.ts
index 1be9172b8b5..8a921af5097 100644
--- a/yarn-project/end-to-end/src/e2e_event_logs.test.ts
+++ b/yarn-project/end-to-end/src/e2e_event_logs.test.ts
@@ -1,4 +1,11 @@
-import { type AccountWalletWithSecretKey, type AztecNode, EventMetadata, Fr, L1EventPayload } from '@aztec/aztec.js';
+import {
+  type AccountWalletWithSecretKey,
+  type AztecNode,
+  EventMetadata,
+  EventType,
+  Fr,
+  L1EventPayload,
+} from '@aztec/aztec.js';
 import { EventSelector } from '@aztec/foundation/abi';
 import { makeTuple } from '@aztec/foundation/array';
 import { type Tuple } from '@aztec/foundation/serialize';
@@ -51,7 +58,10 @@ describe('Logs', () => {
       expect(decryptedEvent0.eventTypeId).toStrictEqual(EventSelector.fromSignature('ExampleEvent0(Field,Field)'));
 
       // We decode our event into the event type
-      const event0Metadata = new EventMetadata<ExampleEvent0>(TestLogContract.events.ExampleEvent0);
+      const event0Metadata = new EventMetadata<ExampleEvent0>(
+        EventType.Encrypted,
+        TestLogContract.events.ExampleEvent0,
+      );
       const event0 = event0Metadata.decode(decryptedEvent0);
 
       // We check that the event was decoded correctly
@@ -60,7 +70,10 @@ describe('Logs', () => {
 
       const decryptedEvent1 = L1EventPayload.decryptAsIncoming(encryptedLogs[2], wallets[0].getEncryptionSecret())!;
 
-      const event1Metadata = new EventMetadata<ExampleEvent1>(TestLogContract.events.ExampleEvent1);
+      const event1Metadata = new EventMetadata<ExampleEvent1>(
+        EventType.Encrypted,
+        TestLogContract.events.ExampleEvent1,
+      );
 
       // We check our second event, which is a different type
       const event1 = event1Metadata.decode(decryptedEvent1);
@@ -107,13 +120,15 @@ describe('Logs', () => {
 
       // We get all the events we can decrypt with either our incoming or outgoing viewing keys
 
-      const collectedEvent0s = await wallets[0].getEncryptedEvents<ExampleEvent0>(
+      const collectedEvent0s = await wallets[0].getEvents<ExampleEvent0>(
+        EventType.Encrypted,
         TestLogContract.events.ExampleEvent0,
         firstTx.blockNumber!,
         lastTx.blockNumber! - firstTx.blockNumber! + 1,
       );
 
-      const collectedEvent0sWithIncoming = await wallets[0].getEncryptedEvents<ExampleEvent0>(
+      const collectedEvent0sWithIncoming = await wallets[0].getEvents<ExampleEvent0>(
+        EventType.Encrypted,
         TestLogContract.events.ExampleEvent0,
         firstTx.blockNumber!,
         lastTx.blockNumber! - firstTx.blockNumber! + 1,
@@ -121,14 +136,16 @@ describe('Logs', () => {
         [wallets[0].getCompleteAddress().publicKeys.masterIncomingViewingPublicKey],
       );
 
-      const collectedEvent0sWithOutgoing = await wallets[0].getEncryptedEvents<ExampleEvent0>(
+      const collectedEvent0sWithOutgoing = await wallets[0].getEvents<ExampleEvent0>(
+        EventType.Encrypted,
         TestLogContract.events.ExampleEvent0,
         firstTx.blockNumber!,
         lastTx.blockNumber! - firstTx.blockNumber! + 1,
         [wallets[0].getCompleteAddress().publicKeys.masterOutgoingViewingPublicKey],
       );
 
-      const collectedEvent1s = await wallets[0].getEncryptedEvents<ExampleEvent1>(
+      const collectedEvent1s = await wallets[0].getEvents<ExampleEvent1>(
+        EventType.Encrypted,
         TestLogContract.events.ExampleEvent1,
         firstTx.blockNumber!,
         lastTx.blockNumber! - firstTx.blockNumber! + 1,
@@ -140,7 +157,8 @@ describe('Logs', () => {
       expect(collectedEvent0s.length).toBe(10);
       expect(collectedEvent1s.length).toBe(5);
 
-      const emptyEvent1s = await wallets[0].getEncryptedEvents<ExampleEvent1>(
+      const emptyEvent1s = await wallets[0].getEvents<ExampleEvent1>(
+        EventType.Encrypted,
         TestLogContract.events.ExampleEvent1,
         firstTx.blockNumber!,
         lastTx.blockNumber! - firstTx.blockNumber! + 1,
@@ -188,13 +206,15 @@ describe('Logs', () => {
       );
       const lastTx = await testLogContract.methods.emit_unencrypted_events(preimage[++i]).send().wait();
 
-      const collectedEvent0s = await wallets[0].getUnencryptedEvents<ExampleEvent0>(
+      const collectedEvent0s = await wallets[0].getEvents<ExampleEvent0>(
+        EventType.Unencrypted,
         TestLogContract.events.ExampleEvent0,
         firstTx.blockNumber!,
         lastTx.blockNumber! - firstTx.blockNumber! + 1,
       );
 
-      const collectedEvent1s = await wallets[0].getUnencryptedEvents<ExampleEvent1>(
+      const collectedEvent1s = await wallets[0].getEvents<ExampleEvent1>(
+        EventType.Unencrypted,
         TestLogContract.events.ExampleEvent1,
         firstTx.blockNumber!,
         lastTx.blockNumber! - firstTx.blockNumber! + 1,
diff --git a/yarn-project/end-to-end/src/e2e_fees/failures.test.ts b/yarn-project/end-to-end/src/e2e_fees/failures.test.ts
index a85e535b4e2..de795199b97 100644
--- a/yarn-project/end-to-end/src/e2e_fees/failures.test.ts
+++ b/yarn-project/end-to-end/src/e2e_fees/failures.test.ts
@@ -331,7 +331,7 @@ class BuggedSetupFeePaymentMethod extends PublicFeePaymentMethod {
             caller: this.paymentContract,
             action: {
               name: 'transfer_public',
-              args: [this.wallet.getAddress().toField(), this.paymentContract.toField(), maxFee, nonce],
+              args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
               selector: FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
               type: FunctionType.PUBLIC,
               isStatic: false,
@@ -348,7 +348,7 @@ class BuggedSetupFeePaymentMethod extends PublicFeePaymentMethod {
         selector: FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        args: [tooMuchFee, this.asset.toField(), nonce],
+        args: [tooMuchFee, this.asset, nonce],
         returnTypes: [],
       },
     ]);
diff --git a/yarn-project/end-to-end/src/e2e_synching.test.ts b/yarn-project/end-to-end/src/e2e_synching.test.ts
index 448b36e69c6..cc526217ef8 100644
--- a/yarn-project/end-to-end/src/e2e_synching.test.ts
+++ b/yarn-project/end-to-end/src/e2e_synching.test.ts
@@ -48,7 +48,7 @@ import {
   sleep,
 } from '@aztec/aztec.js';
 // eslint-disable-next-line no-restricted-imports
-import { ExtendedNote, L2Block, LogType, Note, type TxHash, tryStop } from '@aztec/circuit-types';
+import { ExtendedNote, L2Block, LogType, Note, type TxHash } from '@aztec/circuit-types';
 import { type AztecAddress } from '@aztec/circuits.js';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { Timer } from '@aztec/foundation/timer';
@@ -575,7 +575,7 @@ describe('e2e_synching', () => {
             .then(b => b?.hash());
           expect(worldStateLatestBlockHash).toEqual(archiverLatestBlockHash?.toString());
 
-          await tryStop(archiver);
+          await archiver.stop();
           await worldState.stop();
         },
         ASSUME_PROVEN_THROUGH,
diff --git a/yarn-project/end-to-end/src/e2e_token_contract/private_transfer_recursion.test.ts b/yarn-project/end-to-end/src/e2e_token_contract/private_transfer_recursion.test.ts
index 9d04d7e0542..dbc2ab59820 100644
--- a/yarn-project/end-to-end/src/e2e_token_contract/private_transfer_recursion.test.ts
+++ b/yarn-project/end-to-end/src/e2e_token_contract/private_transfer_recursion.test.ts
@@ -1,4 +1,4 @@
-import { BatchCall } from '@aztec/aztec.js';
+import { BatchCall, EventType } from '@aztec/aztec.js';
 import { TokenContract, type Transfer } from '@aztec/noir-contracts.js';
 
 import { TokenContractTest } from './token_contract_test.js';
@@ -44,7 +44,12 @@ describe('e2e_token_contract private transfer recursion', () => {
     // We should have created a single new note, for the recipient
     expect(tx.debugInfo?.noteHashes.length).toBe(1);
 
-    const events = await wallets[1].getEncryptedEvents<Transfer>(TokenContract.events.Transfer, tx.blockNumber!, 1);
+    const events = await wallets[1].getEvents<Transfer>(
+      EventType.Encrypted,
+      TokenContract.events.Transfer,
+      tx.blockNumber!,
+      1,
+    );
 
     expect(events[0]).toEqual({
       from: accounts[0].address,
@@ -70,7 +75,7 @@ describe('e2e_token_contract private transfer recursion', () => {
     const senderBalance = await asset.methods.balance_of_private(accounts[0].address).simulate();
     expect(senderBalance).toEqual(expectedChange);
 
-    const events = await wallets[1].getEncryptedEvents(TokenContract.events.Transfer, tx.blockNumber!, 1);
+    const events = await wallets[1].getEvents(EventType.Encrypted, TokenContract.events.Transfer, tx.blockNumber!, 1);
 
     expect(events[0]).toEqual({
       from: accounts[0].address,
diff --git a/yarn-project/end-to-end/src/e2e_token_contract/transfer_private.test.ts b/yarn-project/end-to-end/src/e2e_token_contract/transfer_private.test.ts
index b1a81efd77b..d1e9ffd31aa 100644
--- a/yarn-project/end-to-end/src/e2e_token_contract/transfer_private.test.ts
+++ b/yarn-project/end-to-end/src/e2e_token_contract/transfer_private.test.ts
@@ -1,6 +1,7 @@
 import {
   AztecAddress,
   CompleteAddress,
+  EventType,
   Fr,
   computeAuthWitMessageHash,
   computeInnerAuthWitHashFromAction,
@@ -40,7 +41,12 @@ describe('e2e_token_contract transfer private', () => {
     const tx = await asset.methods.transfer(accounts[1].address, amount).send().wait();
     tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount);
 
-    const events = await wallets[1].getEncryptedEvents<Transfer>(TokenContract.events.Transfer, tx.blockNumber!, 1);
+    const events = await wallets[1].getEvents<Transfer>(
+      EventType.Encrypted,
+      TokenContract.events.Transfer,
+      tx.blockNumber!,
+      1,
+    );
 
     expect(events[0]).toEqual({
       from: accounts[0].address,
diff --git a/yarn-project/end-to-end/src/sample-dapp/index.mjs b/yarn-project/end-to-end/src/sample-dapp/index.mjs
index 91f94f5ef90..62f43ba68d0 100644
--- a/yarn-project/end-to-end/src/sample-dapp/index.mjs
+++ b/yarn-project/end-to-end/src/sample-dapp/index.mjs
@@ -90,7 +90,7 @@ async function mintPublicFunds(pxe) {
 
   // docs:start:showLogs
   const blockNumber = await pxe.getBlockNumber();
-  const logs = (await pxe.getUnencryptedLogs({ fromBlock: blockNumber - 1 })).logs;
+  const logs = (await pxe.getUnencryptedLogs(blockNumber, 1)).logs;
   const textLogs = logs.map(extendedLog => extendedLog.toHumanReadable().slice(0, 200));
   for (const log of textLogs) console.log(`Log emitted: ${log}`);
   // docs:end:showLogs
diff --git a/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts b/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts
index 17e4123f2fb..a32510fdb8a 100644
--- a/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts
+++ b/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts
@@ -383,8 +383,13 @@ export class CrossChainTestHarness {
    */
   async makeMessageConsumable(msgHash: Fr | Hex) {
     const frMsgHash = typeof msgHash === 'string' ? Fr.fromString(msgHash) : msgHash;
+    const currentL2BlockNumber = await this.aztecNode.getBlockNumber();
     // We poll isL1ToL2MessageSynced endpoint until the message is available
-    await retryUntil(async () => await this.aztecNode.isL1ToL2MessageSynced(frMsgHash), 'message sync', 10);
+    await retryUntil(
+      async () => await this.aztecNode.isL1ToL2MessageSynced(frMsgHash, currentL2BlockNumber),
+      'message sync',
+      10,
+    );
 
     await this.mintTokensPublicOnL2(0n);
     await this.mintTokensPublicOnL2(0n);
diff --git a/yarn-project/ethereum/package.json b/yarn-project/ethereum/package.json
index afee02eac0a..87c18abfca7 100644
--- a/yarn-project/ethereum/package.json
+++ b/yarn-project/ethereum/package.json
@@ -28,8 +28,7 @@
     "@aztec/l1-artifacts": "workspace:^",
     "dotenv": "^16.0.3",
     "tslib": "^2.4.0",
-    "viem": "^2.7.15",
-    "zod": "^3.23.8"
+    "viem": "^2.7.15"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
diff --git a/yarn-project/ethereum/src/l1_contract_addresses.ts b/yarn-project/ethereum/src/l1_contract_addresses.ts
index 1733e15fc06..340b4872263 100644
--- a/yarn-project/ethereum/src/l1_contract_addresses.ts
+++ b/yarn-project/ethereum/src/l1_contract_addresses.ts
@@ -1,15 +1,12 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
-
-import { z } from 'zod';
 
 /**
  * The names of the current L1 contract addresses.
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
  */
-export const L1ContractsNames = [
+export const l1ContractsNames = [
   'rollupAddress',
   'registryAddress',
   'inboxAddress',
@@ -22,24 +19,13 @@ export const L1ContractsNames = [
   'governanceAddress',
 ] as const;
 
-/** Provides the directory of current L1 contract addresses */
+/**
+ * Provides the directory of current L1 contract addresses
+ */
 export type L1ContractAddresses = {
-  [K in (typeof L1ContractsNames)[number]]: EthAddress;
+  [K in (typeof l1ContractsNames)[number]]: EthAddress;
 };
 
-export const L1ContractAddressesSchema = z.object({
-  rollupAddress: schemas.EthAddress,
-  registryAddress: schemas.EthAddress,
-  inboxAddress: schemas.EthAddress,
-  outboxAddress: schemas.EthAddress,
-  feeJuiceAddress: schemas.EthAddress,
-  feeJuicePortalAddress: schemas.EthAddress,
-  coinIssuerAddress: schemas.EthAddress,
-  rewardDistributorAddress: schemas.EthAddress,
-  governanceProposerAddress: schemas.EthAddress,
-  governanceAddress: schemas.EthAddress,
-}) satisfies ZodFor<L1ContractAddresses>;
-
 const parseEnv = (val: string) => EthAddress.fromString(val);
 
 export const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses> = {
diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json
index 46cc1d6d96b..5354470a61b 100644
--- a/yarn-project/foundation/package.json
+++ b/yarn-project/foundation/package.json
@@ -25,7 +25,6 @@
     "./json-rpc": "./dest/json-rpc/index.js",
     "./json-rpc/server": "./dest/json-rpc/server/index.js",
     "./json-rpc/client": "./dest/json-rpc/client/index.js",
-    "./json-rpc/test": "./dest/json-rpc/test/index.js",
     "./iterable": "./dest/iterable/index.js",
     "./log": "./dest/log/index.js",
     "./mutex": "./dest/mutex/index.js",
@@ -48,8 +47,7 @@
     "./testing": "./dest/testing/index.js",
     "./array": "./dest/array/index.js",
     "./validation": "./dest/validation/index.js",
-    "./promise": "./dest/promise/index.js",
-    "./string": "./dest/string/index.js"
+    "./promise": "./dest/promise/index.js"
   },
   "scripts": {
     "build": "yarn clean && tsc -b",
diff --git a/yarn-project/foundation/src/abi/abi.ts b/yarn-project/foundation/src/abi/abi.ts
index b58d5cc5527..a762d4204f2 100644
--- a/yarn-project/foundation/src/abi/abi.ts
+++ b/yarn-project/foundation/src/abi/abi.ts
@@ -1,21 +1,35 @@
-/* eslint-disable camelcase */
 import { inflate } from 'pako';
-import { z } from 'zod';
 
 import { type Fr } from '../fields/fields.js';
-import { schemas } from '../schemas/schemas.js';
-import { type ZodFor } from '../schemas/types.js';
 import { type FunctionSelector } from './function_selector.js';
 import { type NoteSelector } from './note_selector.js';
 
-/** A basic value. */
+/**
+ * An error could be a custom error of any regular type or a string error.
+ */
+export type AbiErrorType =
+  | { error_kind: 'string'; string: string }
+  | {
+      error_kind: 'fmtstring';
+      length: number;
+      item_types: AbiType[];
+    }
+  | ({ error_kind: 'custom' } & AbiType);
+
+/**
+ * A basic value.
+ */
 export interface BasicValue<T extends string, V> {
-  /** The kind of the value. */
+  /**
+   * The kind of the value.
+   */
   kind: T;
   value: V;
 }
 
-/** An exported value. */
+/**
+ * An exported value.
+ */
 export type AbiValue =
   | BasicValue<'boolean', boolean>
   | BasicValue<'string', string>
@@ -24,18 +38,6 @@ export type AbiValue =
   | IntegerValue
   | StructValue;
 
-export const AbiValueSchema: z.ZodType<AbiValue> = z.discriminatedUnion('kind', [
-  z.object({ kind: z.literal('boolean'), value: z.boolean() }),
-  z.object({ kind: z.literal('string'), value: z.string() }),
-  z.object({ kind: z.literal('array'), value: z.array(z.lazy(() => AbiValueSchema)) }),
-  z.object({ kind: z.literal('tuple'), fields: z.array(z.lazy(() => AbiValueSchema)) }),
-  z.object({ kind: z.literal('integer'), value: z.string(), sign: z.boolean() }),
-  z.object({
-    kind: z.literal('struct'),
-    fields: z.array(z.object({ name: z.string(), value: z.lazy(() => AbiValueSchema) })),
-  }),
-]);
-
 export type TypedStructFieldValue<T> = { name: string; value: T };
 
 export interface StructValue {
@@ -52,23 +54,48 @@ export interface IntegerValue extends BasicValue<'integer', string> {
   sign: boolean;
 }
 
-/** Indicates whether a parameter is public or secret/private. */
-export const ABIParameterVisibility = ['public', 'private', 'databus'] as const;
+/**
+ * A named type.
+ */
+export interface ABIVariable {
+  /**
+   * The name of the variable.
+   */
+  name: string;
+  /**
+   * The type of the variable.
+   */
+  type: AbiType;
+}
+
+/**
+ * Indicates whether a parameter is public or secret/private.
+ */
+export type ABIParameterVisibility = 'public' | 'private' | 'databus';
 
-/** Indicates whether a parameter is public or secret/private. */
-export type ABIParameterVisibility = (typeof ABIParameterVisibility)[number];
+/**
+ * A function parameter.
+ */
+export interface ABIParameter extends ABIVariable {
+  /**
+   * Indicates whether a parameter is public or secret/private.
+   */
+  visibility: ABIParameterVisibility;
+}
 
-/** A basic type. */
+/**
+ * A basic type.
+ */
 export interface BasicType<T extends string> {
-  /** The kind of the type. */
+  /**
+   * The kind of the type.
+   */
   kind: T;
 }
 
-/** Sign for numeric types. */
-const Sign = ['unsigned', 'signed'] as const;
-type Sign = (typeof Sign)[number];
-
-/** A variable type. */
+/**
+ * A variable type.
+ */
 export type AbiType =
   | BasicType<'field'>
   | BasicType<'boolean'>
@@ -78,145 +105,120 @@ export type AbiType =
   | StructType
   | TupleType;
 
-export const AbiTypeSchema: z.ZodType<AbiType> = z.discriminatedUnion('kind', [
-  z.object({ kind: z.literal('field') }),
-  z.object({ kind: z.literal('boolean') }),
-  z.object({ kind: z.literal('integer'), sign: z.enum(Sign), width: z.number() }),
-  z.object({ kind: z.literal('array'), length: z.number(), type: z.lazy(() => AbiTypeSchema) }),
-  z.object({ kind: z.literal('string'), length: z.number() }),
-  z.object({ kind: z.literal('struct'), fields: z.array(z.lazy(() => ABIVariableSchema)), path: z.string() }),
-  z.object({ kind: z.literal('tuple'), fields: z.array(z.lazy(() => AbiTypeSchema)) }),
-]);
-
-/** A named type. */
-export const ABIVariableSchema = z.object({
-  /** The name of the variable. */
-  name: z.string(),
-  /** The type of the variable. */
-  type: AbiTypeSchema,
-});
-
-/** A named type. */
-export type ABIVariable = z.infer<typeof ABIVariableSchema>;
-
-/** A function parameter. */
-export const ABIParameterSchema = ABIVariableSchema.and(
-  z.object({
-    /** Visibility of the parameter in the function. */
-    visibility: z.enum(ABIParameterVisibility),
-  }),
-);
-
-/** A function parameter. */
-export type ABIParameter = z.infer<typeof ABIParameterSchema>;
-
-/** An integer type. */
+type Sign = 'unsigned' | 'signed';
+
+/**
+ * An integer type.
+ */
 export interface IntegerType extends BasicType<'integer'> {
-  /** The sign of the integer. */
+  /**
+   * The sign of the integer.
+   */
   sign: Sign;
-  /** The width of the integer in bits. */
+  /**
+   * The width of the integer in bits.
+   */
   width: number;
 }
 
-/** An array type. */
+/**
+ * An array type.
+ */
 export interface ArrayType extends BasicType<'array'> {
-  /** The length of the array. */
+  /**
+   * The length of the array.
+   */
   length: number;
-  /** The type of the array elements. */
+  /**
+   * The type of the array elements.
+   */
   type: AbiType;
 }
 
-/** A tuple type. */
+/**
+ * A tuple type.
+ */
 export interface TupleType extends BasicType<'tuple'> {
-  /** The types of the tuple elements. */
+  /**
+   * The types of the tuple elements.
+   */
   fields: AbiType[];
 }
 
-/** A string type. */
+/**
+ * A string type.
+ */
 export interface StringType extends BasicType<'string'> {
-  /** The length of the string. */
+  /**
+   * The length of the string.
+   */
   length: number;
 }
 
-/** A struct type. */
+/**
+ * A struct type.
+ */
 export interface StructType extends BasicType<'struct'> {
-  /** The fields of the struct. */
+  /**
+   * The fields of the struct.
+   */
   fields: ABIVariable[];
-  /** Fully qualified name of the struct. */
+  /**
+   * Fully qualified name of the struct.
+   */
   path: string;
 }
 
-/** An error could be a custom error of any regular type or a string error. */
-export type AbiErrorType =
-  | { error_kind: 'string'; string: string }
-  | { error_kind: 'fmtstring'; length: number; item_types: AbiType[] }
-  | ({ error_kind: 'custom' } & AbiType);
-
-const AbiErrorTypeSchema = z.union([
-  z.object({ error_kind: z.literal('string'), string: z.string() }),
-  z.object({ error_kind: z.literal('fmtstring'), length: z.number(), item_types: z.array(AbiTypeSchema) }),
-  z.object({ error_kind: z.literal('custom') }).and(AbiTypeSchema),
-]) satisfies ZodFor<AbiErrorType>;
-
-/** Aztec.nr function types. */
+/**
+ * Aztec.nr function types.
+ */
 export enum FunctionType {
   PRIVATE = 'private',
   PUBLIC = 'public',
   UNCONSTRAINED = 'unconstrained',
 }
 
-/** The abi entry of a function. */
+/**
+ * The abi entry of a function.
+ */
 export interface FunctionAbi {
-  /** The name of the function. */
+  /**
+   * The name of the function.
+   */
   name: string;
-  /** Whether the function is secret. */
+  /**
+   * Whether the function is secret.
+   */
   functionType: FunctionType;
-  /** Whether the function is internal. */
+  /**
+   * Whether the function is internal.
+   */
   isInternal: boolean;
-  /** Whether the function can alter state or not */
+  /**
+   * Whether the function can alter state or not
+   */
   isStatic: boolean;
-  /** Function parameters. */
+  /**
+   * Function parameters.
+   */
   parameters: ABIParameter[];
-  /** The types of the return values. */
+  /**
+   * The types of the return values.
+   */
   returnTypes: AbiType[];
-  /** The types of the errors that the function can throw. */
+  /**
+   * The types of the errors that the function can throw.
+   */
   errorTypes: Partial<Record<string, AbiErrorType>>;
-  /** Whether the function is flagged as an initializer. */
+  /**
+   * Whether the function is flagged as an initializer.
+   */
   isInitializer: boolean;
 }
 
-export const FunctionAbiSchema = z.object({
-  name: z.string(),
-  functionType: z.nativeEnum(FunctionType),
-  isInternal: z.boolean(),
-  isStatic: z.boolean(),
-  isInitializer: z.boolean(),
-  parameters: z.array(z.object({ name: z.string(), type: AbiTypeSchema, visibility: z.enum(ABIParameterVisibility) })),
-  returnTypes: z.array(AbiTypeSchema),
-  errorTypes: z.record(AbiErrorTypeSchema),
-}) satisfies z.ZodType<FunctionAbi>;
-
-/** Debug metadata for a function. */
-export interface FunctionDebugMetadata {
-  /** Maps opcodes to source code pointers */
-  debugSymbols: DebugInfo;
-  /** Maps the file IDs to the file contents to resolve pointers */
-  files: DebugFileMap;
-}
-
-export const FunctionDebugMetadataSchema = z.object({
-  debugSymbols: z.object({
-    locations: z.record(
-      z.array(z.object({ span: z.object({ start: z.number(), end: z.number() }), file: z.number() })),
-    ),
-    brillig_locations: z.record(
-      z.record(z.array(z.object({ span: z.object({ start: z.number(), end: z.number() }), file: z.number() }))),
-    ),
-  }),
-  files: z.record(z.object({ source: z.string(), path: z.string() })),
-}) satisfies z.ZodType<FunctionDebugMetadata>;
-
-/** The artifact entry of a function. */
+/**
+ * The artifact entry of a function.
+ */
 export interface FunctionArtifact extends FunctionAbi {
   /** The ACIR bytecode of the function. */
   bytecode: Buffer;
@@ -228,28 +230,31 @@ export interface FunctionArtifact extends FunctionAbi {
   debug?: FunctionDebugMetadata;
 }
 
-export const FunctionArtifactSchema = FunctionAbiSchema.and(
-  z.object({
-    bytecode: schemas.BufferB64,
-    verificationKey: z.string().optional(),
-    debugSymbols: z.string(),
-    debug: FunctionDebugMetadataSchema.optional(),
-  }),
-) satisfies ZodFor<FunctionArtifact>;
-
-/** A file ID. It's assigned during compilation. */
+/**
+ * A file ID. It's assigned during compilation.
+ */
 export type FileId = number;
 
-/** A pointer to a specific section of the source code. */
+/**
+ * A pointer to a specific section of the source code.
+ */
 export interface SourceCodeLocation {
-  /** The section of the source code. */
+  /**
+   * The section of the source code.
+   */
   span: {
-    /** The byte where the section starts. */
+    /**
+     * The byte where the section starts.
+     */
     start: number;
-    /** The byte where the section ends. */
+    /**
+     * The byte where the section ends.
+     */
     end: number;
   };
-  /** The source code file pointed to. */
+  /**
+   * The source code file pointed to.
+   */
   file: FileId;
 }
 
@@ -263,31 +268,65 @@ export type BrilligFunctionId = number;
 
 export type OpcodeToLocationsMap = Record<OpcodeLocation, SourceCodeLocation[]>;
 
-/** The debug information for a given function. */
+/**
+ * The debug information for a given function.
+ */
 export interface DebugInfo {
-  /** A map of the opcode location to the source code location. */
+  /**
+   * A map of the opcode location to the source code location.
+   */
   locations: OpcodeToLocationsMap;
-  /** For each Brillig function, we have a map of the opcode location to the source code location. */
+  /**
+   * For each Brillig function, we have a map of the opcode location to the source code location.
+   */
   brillig_locations: Record<BrilligFunctionId, OpcodeToLocationsMap>;
 }
 
-/** The debug information for a given program (a collection of functions) */
+/**
+ * The debug information for a given program (a collection of functions)
+ */
 export interface ProgramDebugInfo {
-  /** A list of debug information that matches with each function in a program */
+  /**
+   * A list of debug information that matches with each function in a program
+   */
   debug_infos: Array<DebugInfo>;
 }
 
-/** Maps a file ID to its metadata for debugging purposes. */
+/**
+ * Maps a file ID to its metadata for debugging purposes.
+ */
 export type DebugFileMap = Record<
   FileId,
   {
-    /** The source code of the file. */
+    /**
+     * The source code of the file.
+     */
     source: string;
-    /** The path of the file. */
+    /**
+     * The path of the file.
+     */
     path: string;
   }
 >;
 
+/**
+ * Type representing a note in use in the contract.
+ */
+export type ContractNote = {
+  /**
+   * Note identifier
+   */
+  id: NoteSelector;
+  /**
+   * Type of the note (e.g., 'TransparentNote')
+   */
+  typ: string;
+  /**
+   * Fields of the note.
+   */
+  fields: NoteField[];
+};
+
 /** Type representing a field of a note (e.g. `amount` in `TokenNote`). */
 export type NoteField = {
   /** Name of the field (e.g. `amount`). */
@@ -298,75 +337,73 @@ export type NoteField = {
   nullable: boolean;
 };
 
-export const NoteFieldSchema = z.object({
-  name: z.string(),
-  index: z.number(),
-  nullable: z.boolean(),
-}) satisfies z.ZodType<NoteField>;
-
-/** Type representing a note in use in the contract. */
-export type ContractNote = {
-  /** Note identifier */
-  id: NoteSelector;
-  /** Type of the note (e.g., 'TransparentNote') */
-  typ: string;
-  /** Fields of the note. */
-  fields: NoteField[];
-};
-
-export const ContractNoteSchema = z.object({
-  id: schemas.NoteSelector,
-  typ: z.string(),
-  fields: z.array(NoteFieldSchema),
-}) satisfies ZodFor<ContractNote>;
-
-/** Type representing a field layout in the storage of a contract. */
+/**
+ * Type representing a field layout in the storage of a contract.
+ */
 export type FieldLayout = {
-  /** Slot in which the field is stored. */
+  /**
+   * Slot in which the field is stored.
+   */
   slot: Fr;
 };
 
-/** Defines artifact of a contract. */
+/**
+ * Defines artifact of a contract.
+ */
 export interface ContractArtifact {
-  /** The name of the contract. */
+  /**
+   * The name of the contract.
+   */
   name: string;
 
-  /** The version of compiler used to create this artifact */
+  /**
+   * The version of compiler used to create this artifact
+   */
   aztecNrVersion?: string;
 
-  /** The functions of the contract. */
+  /**
+   * The functions of the contract.
+   */
   functions: FunctionArtifact[];
-
-  /** The outputs of the contract. */
+  /**
+   * The outputs of the contract.
+   */
   outputs: {
     structs: Record<string, AbiType[]>;
     globals: Record<string, AbiValue[]>;
   };
-
-  /** Storage layout */
+  /**
+   * Storage layout
+   */
   storageLayout: Record<string, FieldLayout>;
-
-  /** The notes used in the contract. */
+  /**
+   * The notes used in the contract.
+   */
   notes: Record<string, ContractNote>;
 
-  /** The map of file ID to the source code and path of the file. */
+  /**
+   * The map of file ID to the source code and path of the file.
+   */
   fileMap: DebugFileMap;
 }
 
-export const ContractArtifactSchema: ZodFor<ContractArtifact> = z.object({
-  name: z.string(),
-  aztecNrVersion: z.string().optional(),
-  functions: z.array(FunctionArtifactSchema),
-  outputs: z.object({
-    structs: z.record(z.array(AbiTypeSchema)),
-    globals: z.record(z.array(AbiValueSchema)),
-  }),
-  storageLayout: z.record(z.object({ slot: schemas.Fr })),
-  notes: z.record(ContractNoteSchema),
-  fileMap: z.record(z.coerce.number(), z.object({ source: z.string(), path: z.string() })),
-});
-
-/** Gets a function artifact including debug metadata given its name or selector. */
+/**
+ * Debug metadata for a function.
+ */
+export interface FunctionDebugMetadata {
+  /**
+   * Maps opcodes to source code pointers
+   */
+  debugSymbols: DebugInfo;
+  /**
+   * Maps the file IDs to the file contents to resolve pointers
+   */
+  files: DebugFileMap;
+}
+
+/**
+ * Gets a function artifact including debug metadata given its name or selector.
+ */
 export function getFunctionArtifact(
   artifact: ContractArtifact,
   functionNameOrSelector: string | FunctionSelector,
diff --git a/yarn-project/foundation/src/abi/encoder.test.ts b/yarn-project/foundation/src/abi/encoder.test.ts
index 0f1e6841cba..f0fd1a4e72e 100644
--- a/yarn-project/foundation/src/abi/encoder.test.ts
+++ b/yarn-project/foundation/src/abi/encoder.test.ts
@@ -1,8 +1,6 @@
 import { AztecAddress } from '../aztec-address/index.js';
 import { Fr } from '../fields/fields.js';
 import { Point } from '../fields/point.js';
-import { jsonParseWithSchema } from '../json-rpc/convert.js';
-import { schemas } from '../schemas/schemas.js';
 import { type FunctionAbi, FunctionType } from './abi.js';
 import { encodeArguments } from './encoder.js';
 
@@ -29,9 +27,6 @@ describe('abi/encoder', () => {
 
     const field = Fr.random();
     expect(encodeArguments(abi, [field])).toEqual([field]);
-
-    const serializedField = jsonParseWithSchema(JSON.stringify(field), schemas.Fr);
-    expect(encodeArguments(abi, [serializedField])).toEqual([field]);
   });
 
   it('serializes arrays of fields', () => {
@@ -115,15 +110,13 @@ describe('abi/encoder', () => {
     };
 
     const address = AztecAddress.random();
+
     expect(encodeArguments(abi, [address])).toEqual([address.toField()]);
     expect(encodeArguments(abi, [{ address }])).toEqual([address.toField()]);
     expect(encodeArguments(abi, [{ address: address.toField() }])).toEqual([address.toField()]);
 
     const completeAddressLike = { address, publicKey: Point.random(), partialAddress: Fr.random() };
     expect(encodeArguments(abi, [completeAddressLike])).toEqual([address.toField()]);
-
-    const serializedAddress = jsonParseWithSchema(JSON.stringify(address), schemas.AztecAddress);
-    expect(encodeArguments(abi, [serializedAddress])).toEqual([address.toField()]);
   });
 
   it('accepts a field for a wrapped field', () => {
@@ -233,6 +226,6 @@ describe('abi/encoder', () => {
       },
     ];
 
-    expect(() => encodeArguments(testFunctionAbi, args)).toThrow(/Invalid hex-encoded string/);
+    expect(() => encodeArguments(testFunctionAbi, args)).toThrow('Argument for owner cannot be serialized to a field');
   });
 });
diff --git a/yarn-project/foundation/src/abi/encoder.ts b/yarn-project/foundation/src/abi/encoder.ts
index 5f876a0e35d..1a8eaee20b2 100644
--- a/yarn-project/foundation/src/abi/encoder.ts
+++ b/yarn-project/foundation/src/abi/encoder.ts
@@ -57,8 +57,6 @@ class ArgumentEncoder {
             this.flattened.push(Fr.fromBuffer(arg));
           } else if (typeof arg.toField === 'function') {
             this.flattened.push(arg.toField());
-          } else if (typeof arg.value === 'string') {
-            this.flattened.push(Fr.fromString(arg.value));
           } else {
             throw new Error(`Argument for ${name} cannot be serialized to a field`);
           }
diff --git a/yarn-project/foundation/src/abi/event_selector.ts b/yarn-project/foundation/src/abi/event_selector.ts
index ea4d8bd234c..f7c8ae06d99 100644
--- a/yarn-project/foundation/src/abi/event_selector.ts
+++ b/yarn-project/foundation/src/abi/event_selector.ts
@@ -81,11 +81,4 @@ export class EventSelector extends Selector {
   static random() {
     return EventSelector.fromBuffer(randomBytes(Selector.SIZE));
   }
-
-  toJSON() {
-    return {
-      type: 'EventSelector',
-      value: this.toString(),
-    };
-  }
 }
diff --git a/yarn-project/foundation/src/aztec-address/index.ts b/yarn-project/foundation/src/aztec-address/index.ts
index fb64a0ecd25..53229d1fda7 100644
--- a/yarn-project/foundation/src/aztec-address/index.ts
+++ b/yarn-project/foundation/src/aztec-address/index.ts
@@ -1,16 +1,9 @@
-/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { inspect } from 'util';
 
 import { Fr, fromBuffer } from '../fields/index.js';
 import { type BufferReader, FieldReader } from '../serialize/index.js';
 import { TypeRegistry } from '../serialize/type_registry.js';
-import { hexToBuffer } from '../string/index.js';
 
-/** Branding to ensure fields are not interchangeable types. */
-export interface AztecAddress {
-  /** Brand. */
-  _branding: 'AztecAddress';
-}
 /**
  * AztecAddress represents a 32-byte address in the Aztec Protocol.
  * It provides methods to create, manipulate, and compare addresses.
@@ -18,90 +11,51 @@ export interface AztecAddress {
  * It should have a value less than or equal to this max value.
  * This class also provides helper functions to convert addresses from strings, buffers, and other formats.
  */
-export class AztecAddress {
-  private value: Fr;
-
-  constructor(buffer: Buffer | Fr) {
-    if ('length' in buffer && buffer.length !== 32) {
+export class AztecAddress extends Fr {
+  constructor(buffer: Buffer) {
+    if (buffer.length !== 32) {
       throw new Error(`Invalid AztecAddress length ${buffer.length}.`);
     }
-    this.value = new Fr(buffer);
+    super(buffer);
   }
 
   [inspect.custom]() {
     return `AztecAddress<${this.toString()}>`;
   }
 
-  static isAddress(str: string) {
-    return /^(0x)?[a-fA-F0-9]{64}$/.test(str);
-  }
-
-  static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES;
-
-  static ZERO = new AztecAddress(Buffer.alloc(32, 0));
+  static override ZERO = new AztecAddress(Buffer.alloc(32));
 
-  static zero(): AztecAddress {
+  static override zero(): AztecAddress {
     return AztecAddress.ZERO;
   }
 
-  static fromField(fr: Fr) {
-    return new AztecAddress(fr);
+  static override fromBuffer(buffer: Buffer | BufferReader) {
+    return fromBuffer(buffer, AztecAddress);
   }
 
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    return new AztecAddress(fromBuffer(buffer, Fr));
+  static fromField(fr: Fr) {
+    return new AztecAddress(fr.toBuffer());
   }
 
   static fromFields(fields: Fr[] | FieldReader) {
     const reader = FieldReader.asReader(fields);
-    return new AztecAddress(reader.readField());
+    return AztecAddress.fromField(reader.readField());
   }
 
   static fromBigInt(value: bigint) {
-    return new AztecAddress(new Fr(value));
-  }
-
-  static fromNumber(value: number) {
-    return new AztecAddress(new Fr(value));
-  }
-
-  static fromString(buf: string) {
-    return new AztecAddress(hexToBuffer(buf));
-  }
-
-  static random() {
-    return new AztecAddress(Fr.random());
-  }
-
-  get size() {
-    return this.value.size;
-  }
-
-  equals(other: AztecAddress) {
-    return this.value.equals(other.value);
-  }
-
-  isZero() {
-    return this.value.isZero();
-  }
-
-  toBuffer() {
-    return this.value.toBuffer();
-  }
-
-  toBigInt() {
-    return this.value.toBigInt();
+    return AztecAddress.fromField(new Fr(value));
   }
 
-  toField() {
-    return this.value;
+  static override fromString(buf: string) {
+    const buffer = Buffer.from(buf.replace(/^0x/i, ''), 'hex');
+    return new AztecAddress(buffer);
   }
 
-  toString() {
-    return this.value.toString();
+  static override random() {
+    return new AztecAddress(super.random().toBuffer());
   }
 
-  toJSON() {
+  override toJSON() {
     return {
       type: 'AztecAddress',
       value: this.toString(),
diff --git a/yarn-project/foundation/src/buffer/buffer32.ts b/yarn-project/foundation/src/buffer/buffer32.ts
index 4b1c2e1c25d..a3a1d6b6702 100644
--- a/yarn-project/foundation/src/buffer/buffer32.ts
+++ b/yarn-project/foundation/src/buffer/buffer32.ts
@@ -70,10 +70,6 @@ export class Buffer32 {
     return this.buffer.toString('hex');
   }
 
-  toJSON() {
-    return this.toString();
-  }
-
   public to0xString(): `0x${string}` {
     return `0x${this.buffer.toString('hex')}`;
   }
@@ -93,7 +89,6 @@ export class Buffer32 {
   public static fromBigInt(hash: bigint) {
     return new Buffer32(serializeBigInt(hash, Buffer32.SIZE));
   }
-
   public static fromField(hash: Fr) {
     return new Buffer32(serializeBigInt(hash.toBigInt()));
   }
diff --git a/yarn-project/foundation/src/fields/fields.ts b/yarn-project/foundation/src/fields/fields.ts
index 4653d0eeee8..08443b00468 100644
--- a/yarn-project/foundation/src/fields/fields.ts
+++ b/yarn-project/foundation/src/fields/fields.ts
@@ -182,7 +182,9 @@ function fromHexString<T extends BaseField>(buf: string, f: DerivedField<T>) {
   return new f(buffer);
 }
 
-/** Branding to ensure fields are not interchangeable types. */
+/**
+ * Branding to ensure fields are not interchangeable types.
+ */
 export interface Fr {
   /** Brand. */
   _branding: 'Fr';
@@ -300,7 +302,6 @@ export class Fr extends BaseField {
     return Fr.fromBuffer(rootBuf);
   }
 
-  // TODO(palla/schemas): Use toString instead of structured type
   toJSON() {
     return {
       type: 'Fr',
diff --git a/yarn-project/foundation/src/fields/point.test.ts b/yarn-project/foundation/src/fields/point.test.ts
index 1b4d333eb77..c95107f4dc1 100644
--- a/yarn-project/foundation/src/fields/point.test.ts
+++ b/yarn-project/foundation/src/fields/point.test.ts
@@ -1,4 +1,3 @@
-import { schemas } from '../schemas/schemas.js';
 import { updateInlineTestData } from '../testing/test_data.js';
 import { Fr } from './fields.js';
 import { Point } from './point.js';
@@ -76,11 +75,4 @@ describe('Point', () => {
       byteArrayString,
     );
   });
-
-  it('serializes from and to JSON', () => {
-    const p = Point.random();
-    const p2 = schemas.Point.parse(JSON.parse(JSON.stringify(p)));
-    expect(p).toEqual(p2);
-    expect(p2).toBeInstanceOf(Point);
-  });
 });
diff --git a/yarn-project/foundation/src/json-rpc/class_converter.ts b/yarn-project/foundation/src/json-rpc/class_converter.ts
new file mode 100644
index 00000000000..dcef59931b2
--- /dev/null
+++ b/yarn-project/foundation/src/json-rpc/class_converter.ts
@@ -0,0 +1,213 @@
+import { assert } from './js_utils.js';
+
+/**
+ * Represents a class compatible with our class conversion system.
+ * E.g. PublicKey here satisfies 'StringIOClass'.
+ * ```
+ *    class PublicKey {
+ *      toString() {
+ *        return '...';
+ *      }
+ *      static fromString(str) {
+ *        return new PublicKey(...);
+ *      }
+ *    }
+ * ```
+ */
+interface StringIOClass {
+  new (...args: any): any;
+
+  // TODO(#4254): Ensure that toString method is checked for as well.
+
+  /**
+   * Creates an IOClass from a given string.
+   */
+  fromString: (str: string) => any;
+}
+
+/**
+ * Represents a class compatible with our class conversion system.
+ * E.g. PublicKey here satisfies 'ObjIOClass'.
+ * ```
+ *    class PublicKey {
+ *      toJSON() {
+ *        return {...};
+ *      }
+ *      static fromJSON(obj) {
+ *        return new PublicKey({...});
+ *      }
+ *    }
+ * ```
+ */
+interface ObjIOClass {
+  new (...args: any): any;
+
+  // TODO(#4254): Ensure that toJSON method is checked for as well.
+
+  /**
+   * Creates an IOClass from a given JSON object.
+   */
+  fromJSON: (str: object) => any;
+}
+
+/**
+ * Either a StringIOClass or ObjIOClass
+ */
+type IOClass = ObjIOClass | StringIOClass;
+
+/**
+ * Registered classes available for conversion.
+ */
+export interface StringClassConverterInput {
+  [className: string]: StringIOClass;
+}
+
+/**
+ * Registered classes available for conversion.
+ */
+export interface JsonClassConverterInput {
+  [className: string]: ObjIOClass;
+}
+
+/**
+ * Represents a class in a JSON-friendly encoding.
+ */
+export interface StringEncodedClass {
+  /**
+   * The class type.
+   */
+  type: string;
+  /**
+   * The class data string.
+   */
+  data: string;
+}
+
+/**
+ * Represents a class in a JSON-friendly encoding.
+ */
+export interface JsonEncodedClass {
+  /**
+   * The class type.
+   */
+  type: string;
+  /**
+   * The class data string.
+   */
+  data: object;
+}
+/**
+ * Whether a class is a complex object or simply represented by a string.
+ */
+export type ClassEncoding = 'string' | 'object';
+
+/**
+ * Handles mapping of classes to names, and calling toString and fromString to convert to and from JSON-friendly formats.
+ * Takes a class map as input.
+ */
+export class ClassConverter {
+  private toClass = new Map<string, [IOClass, ClassEncoding]>();
+  private toName = new Map<IOClass, [string, ClassEncoding]>();
+
+  /**
+   * Create a class converter from a table of classes.
+   * @param stringClassMap - The class table of string encoded classes.
+   * @param objectClassMap - The class table of complex object classes
+   */
+  constructor(stringClassMap?: StringClassConverterInput, objectClassMap?: JsonClassConverterInput) {
+    if (stringClassMap) {
+      for (const key of Object.keys(stringClassMap)) {
+        this.register(key, stringClassMap[key], 'string');
+      }
+    }
+    if (objectClassMap) {
+      for (const key of Object.keys(objectClassMap)) {
+        this.register(key, objectClassMap[key], 'object');
+      }
+    }
+  }
+
+  /**
+   * Register a class with a certain name.
+   * This name is used for conversion from and to this class.
+   * @param type - The class name to use for serialization.
+   * @param class_ - The class object.
+   * @param encoding - Whether the class is a complex object or simply represented by a string.
+   */
+  register(type: string, class_: IOClass, encoding: ClassEncoding) {
+    assert(type !== 'Buffer', "'Buffer' handling is hardcoded. Cannot use as name.");
+    assert(
+      class_.prototype['toString'] || class_.prototype['toJSON'],
+      `Class ${type} must define a toString() OR toJSON() method.`,
+    );
+    assert(
+      (class_ as StringIOClass)['fromString'] || (class_ as ObjIOClass)['fromJSON'],
+      `Class ${type} must define a fromString() OR fromJSON() static method.`,
+    );
+    this.toName.set(class_, [type, encoding]);
+    this.toClass.set(type, [class_, encoding]);
+  }
+
+  /**
+   * Does this type name have a registered class?
+   * @param type - The type name.
+   * @returns If there's a registered class.
+   */
+  isRegisteredClassName(type: string) {
+    return this.toClass.has(type);
+  }
+  /**
+   * Is this class object registered?
+   * @param obj - The class object.
+   * @returns If it is a registered class.
+   */
+  isRegisteredClass(obj: any) {
+    const name = obj.prototype.constructor.name;
+    return this.toName.has(obj) || this.isRegisteredClassName(name);
+  }
+  /**
+   * Convert a JSON-like object to a class object.
+   * @param jsonObj - An object encoding a class.
+   * @returns The class object.
+   */
+  toClassObj(jsonObj: JsonEncodedClass | StringEncodedClass): any {
+    const result = this.toClass.get(jsonObj.type);
+    assert(result, `Could not find type in lookup.`);
+
+    const [class_, encoding] = result;
+    if (encoding === 'string' && typeof jsonObj.data === 'string') {
+      return (class_ as StringIOClass)!.fromString!(jsonObj.data);
+    } else {
+      return (class_ as ObjIOClass)!.fromJSON!(jsonObj.data as object);
+    }
+  }
+  /**
+   * Convert a class object to a JSON object.
+   * @param classObj - A JSON encoding a class.
+   * @returns The class object.
+   */
+  toJsonObj(classObj: any): JsonEncodedClass | StringEncodedClass {
+    const { type, encoding } = this.lookupObject(classObj);
+    const data = encoding === 'string' ? classObj.toString() : classObj.toJSON();
+    return { type: type!, data };
+  }
+
+  /**
+   * Loads the corresponding type for this class based on constructor first and constructor name if not found.
+   * Constructor match works in the event of a minifier changing function names, and constructor name match
+   * works in the event of duplicated instances of node modules being loaded (see #1826).
+   * @param classObj - Object to lookup in the registered types.
+   * @returns Registered type name and encoding.
+   */
+  private lookupObject(classObj: any) {
+    const nameResult = this.toName.get(classObj.constructor);
+    if (nameResult) {
+      return { type: nameResult[0], encoding: nameResult[1] };
+    }
+    const classResult = this.toClass.get(classObj.constructor.name);
+    if (classResult) {
+      return { type: classObj.constructor.name, encoding: classResult[1] };
+    }
+    throw new Error(`Could not find class ${classObj.constructor.name} in lookup.`);
+  }
+}
diff --git a/yarn-project/foundation/src/json-rpc/client/fetch.ts b/yarn-project/foundation/src/json-rpc/client/fetch.ts
deleted file mode 100644
index f93dce97f43..00000000000
--- a/yarn-project/foundation/src/json-rpc/client/fetch.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { format } from 'util';
-
-import { type DebugLogger, createDebugLogger } from '../../log/index.js';
-import { NoRetryError, makeBackoff, retry } from '../../retry/index.js';
-import { jsonStringify } from '../convert.js';
-
-const log = createDebugLogger('json-rpc:json_rpc_client');
-
-/**
- * A normal fetch function that does not retry.
- * Alternatives are a fetch function with retries, or a mocked fetch.
- * @param host - The host URL.
- * @param method - The RPC method name.
- * @param body - The RPC payload.
- * @param noRetry - Whether to throw a `NoRetryError` in case the response is a 5xx error and the body contains an error
- *                  message (see `retry` function for more details).
- * @returns The parsed JSON response, or throws an error.
- */
-export async function defaultFetch(
-  host: string,
-  rpcMethod: string,
-  body: any,
-  useApiEndpoints: boolean,
-  noRetry = false,
-) {
-  log.debug(format(`JsonRpcClient.fetch`, host, rpcMethod, '->', body));
-  let resp: Response;
-  if (useApiEndpoints) {
-    resp = await fetch(`${host}/${rpcMethod}`, {
-      method: 'POST',
-      body: jsonStringify(body),
-      headers: { 'content-type': 'application/json' },
-    });
-  } else {
-    resp = await fetch(host, {
-      method: 'POST',
-      body: jsonStringify({ ...body, method: rpcMethod }),
-      headers: { 'content-type': 'application/json' },
-    });
-  }
-
-  let responseJson;
-  try {
-    responseJson = await resp.json();
-  } catch (err) {
-    if (!resp.ok) {
-      throw new Error(resp.statusText);
-    }
-    throw new Error(`Failed to parse body as JSON: ${resp.text()}`);
-  }
-
-  if (!resp.ok) {
-    const errorMessage = `(JSON-RPC PROPAGATED) (host ${host}) (method ${rpcMethod}) (code ${resp.status}) ${responseJson.error.message}`;
-    if (noRetry || (resp.status >= 400 && resp.status < 500)) {
-      throw new NoRetryError(errorMessage);
-    } else {
-      throw new Error(errorMessage);
-    }
-  }
-
-  return responseJson;
-}
-
-/**
- * Makes a fetch function that retries based on the given attempts.
- * @param retries - Sequence of intervals (in seconds) to retry.
- * @param noRetry - Whether to stop retries on server errors.
- * @param log - Optional logger for logging attempts.
- * @returns A fetch function.
- */
-export function makeFetch(retries: number[], defaultNoRetry: boolean, log?: DebugLogger) {
-  return async (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, noRetry?: boolean) => {
-    return await retry(
-      () => defaultFetch(host, rpcMethod, body, useApiEndpoints, noRetry ?? defaultNoRetry),
-      `JsonRpcClient request ${rpcMethod} to ${host}`,
-      makeBackoff(retries),
-      log,
-      false,
-    );
-  };
-}
diff --git a/yarn-project/foundation/src/json-rpc/client/index.ts b/yarn-project/foundation/src/json-rpc/client/index.ts
index d36425f210a..3df1583012a 100644
--- a/yarn-project/foundation/src/json-rpc/client/index.ts
+++ b/yarn-project/foundation/src/json-rpc/client/index.ts
@@ -1,2 +1,2 @@
+export { createJsonRpcClient, defaultFetch, makeFetch } from './json_rpc_client.js';
 export * from './safe_json_rpc_client.js';
-export * from './fetch.js';
diff --git a/yarn-project/foundation/src/json-rpc/client/json_rpc_client.test.ts b/yarn-project/foundation/src/json-rpc/client/json_rpc_client.test.ts
new file mode 100644
index 00000000000..c95984230a2
--- /dev/null
+++ b/yarn-project/foundation/src/json-rpc/client/json_rpc_client.test.ts
@@ -0,0 +1,39 @@
+import request from 'supertest';
+
+import { TestNote, TestState } from '../fixtures/test_state.js';
+import { JsonRpcServer, createNamespacedJsonRpcServer } from '../server/index.js';
+import { createJsonRpcClient } from './json_rpc_client.js';
+
+it('test an RPC function over client', async () => {
+  const mockFetch = async (host: string, method: string, body: any) => {
+    const server = new JsonRpcServer(new TestState([new TestNote('a'), new TestNote('b')]), { TestNote }, {});
+    const result = await request(server.getApp().callback()).post(`/`).send(body);
+    return JSON.parse(result.text);
+  };
+  const client = createJsonRpcClient<TestState>('', { TestNote }, {}, true, false, mockFetch);
+  const result = await client.addNotes([new TestNote('c')]);
+  expect(result[0]).toBeInstanceOf(TestNote);
+  expect(result[1]).toBeInstanceOf(TestNote);
+  expect(result[2]).toBeInstanceOf(TestNote);
+  expect(result[0].toString()).toBe('a');
+  expect(result[1].toString()).toBe('b');
+  expect(result[2].toString()).toBe('c');
+});
+
+it('test a namespaced RPC function over client', async () => {
+  const namespace = 'testService';
+  const mockFetch = async (host: string, method: string, body: any) => {
+    const service = new JsonRpcServer(new TestState([new TestNote('a'), new TestNote('b')]), { TestNote }, {});
+    const server = createNamespacedJsonRpcServer([{ [namespace]: service }]);
+    const result = await request(server.getApp().callback()).post('/').send(body);
+    return JSON.parse(result.text);
+  };
+  const client = createJsonRpcClient<TestState>('', { TestNote }, {}, true, namespace, mockFetch);
+  const result = await client.addNotes([new TestNote('c')]);
+  expect(result[0]).toBeInstanceOf(TestNote);
+  expect(result[1]).toBeInstanceOf(TestNote);
+  expect(result[2]).toBeInstanceOf(TestNote);
+  expect(result[0].toString()).toBe('a');
+  expect(result[1].toString()).toBe('b');
+  expect(result[2].toString()).toBe('c');
+});
diff --git a/yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts b/yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts
new file mode 100644
index 00000000000..e7b1bd7d077
--- /dev/null
+++ b/yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts
@@ -0,0 +1,151 @@
+// comlink:
+//  Dev dependency just for the somewhat complex RemoteObject type
+//  This takes a {foo(): T} and makes {foo(): Promise<T>}
+//  while avoiding Promise of Promise.
+import { type RemoteObject } from 'comlink';
+import { format } from 'util';
+
+import { type DebugLogger, createDebugLogger } from '../../log/index.js';
+import { NoRetryError, makeBackoff, retry } from '../../retry/index.js';
+import { ClassConverter, type JsonClassConverterInput, type StringClassConverterInput } from '../class_converter.js';
+import { convertFromJsonObj, convertToJsonObj, jsonStringify } from '../convert.js';
+
+export { jsonStringify } from '../convert.js';
+
+const log = createDebugLogger('json-rpc:json_rpc_client');
+
+/**
+ * A normal fetch function that does not retry.
+ * Alternatives are a fetch function with retries, or a mocked fetch.
+ * @param host - The host URL.
+ * @param method - The RPC method name.
+ * @param body - The RPC payload.
+ * @param noRetry - Whether to throw a `NoRetryError` in case the response is a 5xx error and the body contains an error
+ *                  message (see `retry` function for more details).
+ * @returns The parsed JSON response, or throws an error.
+ */
+export async function defaultFetch(
+  host: string,
+  rpcMethod: string,
+  body: any,
+  useApiEndpoints: boolean,
+  noRetry = false,
+  stringify = jsonStringify,
+) {
+  log.debug(format(`JsonRpcClient.fetch`, host, rpcMethod, '->', body));
+  let resp: Response;
+  if (useApiEndpoints) {
+    resp = await fetch(`${host}/${rpcMethod}`, {
+      method: 'POST',
+      body: stringify(body),
+      headers: { 'content-type': 'application/json' },
+    });
+  } else {
+    resp = await fetch(host, {
+      method: 'POST',
+      body: stringify({ ...body, method: rpcMethod }),
+      headers: { 'content-type': 'application/json' },
+    });
+  }
+
+  let responseJson;
+  try {
+    responseJson = await resp.json();
+  } catch (err) {
+    if (!resp.ok) {
+      throw new Error(resp.statusText);
+    }
+    throw new Error(`Failed to parse body as JSON: ${resp.text()}`);
+  }
+
+  if (!resp.ok) {
+    const errorMessage = `(JSON-RPC PROPAGATED) (host ${host}) (method ${rpcMethod}) (code ${resp.status}) ${responseJson.error.message}`;
+    if (noRetry || (resp.status >= 400 && resp.status < 500)) {
+      throw new NoRetryError(errorMessage);
+    } else {
+      throw new Error(errorMessage);
+    }
+  }
+
+  return responseJson;
+}
+
+/**
+ * Makes a fetch function that retries based on the given attempts.
+ * @param retries - Sequence of intervals (in seconds) to retry.
+ * @param noRetry - Whether to stop retries on server errors.
+ * @param log - Optional logger for logging attempts.
+ * @returns A fetch function.
+ */
+export function makeFetch(retries: number[], noRetry: boolean, log?: DebugLogger) {
+  return async (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean) => {
+    return await retry(
+      () => defaultFetch(host, rpcMethod, body, useApiEndpoints, noRetry),
+      `JsonRpcClient request ${rpcMethod} to ${host}`,
+      makeBackoff(retries),
+      log,
+      false,
+    );
+  };
+}
+
+/**
+ * Creates a Proxy object that delegates over RPC and satisfies RemoteObject<T>.
+ * The server should have ran new JsonRpcServer().
+ * @param host - The host URL.
+ * @param stringClassMap - A map of class names to string representations.
+ * @param objectClassMap - A map of class names to class constructors.
+ * @param useApiEndpoints - Whether to use the API endpoints or the default RPC endpoint.
+ * @param namespaceMethods - String value (or false/empty) to namespace all methods sent to the server. e.g. 'getInfo' -\> 'pxe_getInfo'
+ * @param fetch - The fetch implementation to use.
+ */
+export function createJsonRpcClient<T extends object>(
+  host: string,
+  stringClassMap: StringClassConverterInput,
+  objectClassMap: JsonClassConverterInput,
+  useApiEndpoints: boolean,
+  namespaceMethods?: string | false,
+  fetch = defaultFetch,
+) {
+  const classConverter = new ClassConverter(stringClassMap, objectClassMap);
+  let id = 0;
+  const request = async (method: string, params: any[]): Promise<any> => {
+    const body = {
+      jsonrpc: '2.0',
+      id: id++,
+      method,
+      params: params.map(param => convertToJsonObj(classConverter, param)),
+    };
+    log.debug(format(`JsonRpcClient.request`, method, '<-', params));
+    const res = await fetch(host, method, body, useApiEndpoints);
+    log.debug(format(`JsonRpcClient.result`, method, '->', res));
+    if (res.error) {
+      throw res.error;
+    }
+    if ([null, undefined, 'null', 'undefined'].includes(res.result)) {
+      return;
+    }
+    return convertFromJsonObj(classConverter, res.result);
+  };
+
+  // Intercept any RPC methods with a proxy
+  // This wraps 'request' with a method-call syntax wrapper
+  return new Proxy(
+    {},
+    {
+      get: (target, method: string) => {
+        let rpcMethod = method;
+        if (namespaceMethods) {
+          rpcMethod = `${namespaceMethods}_${method}`;
+        }
+        if (['then', 'catch'].includes(method)) {
+          return Reflect.get(target, method);
+        }
+        return (...params: any[]) => {
+          log.debug(format(`JsonRpcClient.constructor`, 'proxy', rpcMethod, '<-', params));
+          return request(rpcMethod, params);
+        };
+      },
+    },
+  ) as RemoteObject<T>;
+}
diff --git a/yarn-project/foundation/src/json-rpc/client/safe_json_rpc_client.ts b/yarn-project/foundation/src/json-rpc/client/safe_json_rpc_client.ts
index 3c2bf3c32ba..990fdf26917 100644
--- a/yarn-project/foundation/src/json-rpc/client/safe_json_rpc_client.ts
+++ b/yarn-project/foundation/src/json-rpc/client/safe_json_rpc_client.ts
@@ -2,7 +2,10 @@ import { format } from 'util';
 
 import { createDebugLogger } from '../../log/logger.js';
 import { type ApiSchema, type ApiSchemaFor, schemaHasMethod } from '../../schemas/api.js';
-import { defaultFetch } from './fetch.js';
+import { jsonStringify2 } from '../convert.js';
+import { defaultFetch } from './json_rpc_client.js';
+
+export { jsonStringify } from '../convert.js';
 
 /**
  * Creates a Proxy object that delegates over RPC and validates outputs against a given schema.
@@ -30,13 +33,13 @@ export function createSafeJsonRpcClient<T extends object>(
     const body = { jsonrpc: '2.0', id: id++, method, params };
 
     log.debug(format(`request`, method, params));
-    const res = await fetch(host, method, body, useApiEndpoints);
+    const res = await fetch(host, method, body, useApiEndpoints, undefined, jsonStringify2);
     log.debug(format(`result`, method, res));
 
     if (res.error) {
       throw res.error;
     }
-    // TODO(palla/schemas): Find a better way to handle null responses (JSON.stringify(null) is string "null").
+    // TODO: Why check for string null and undefined?
     if ([null, undefined, 'null', 'undefined'].includes(res.result)) {
       return;
     }
diff --git a/yarn-project/foundation/src/json-rpc/convert.test.ts b/yarn-project/foundation/src/json-rpc/convert.test.ts
index b0817f765d4..25c8be3e1a8 100644
--- a/yarn-project/foundation/src/json-rpc/convert.test.ts
+++ b/yarn-project/foundation/src/json-rpc/convert.test.ts
@@ -1,44 +1,77 @@
-import { type ZodTypeAny, z } from 'zod';
-
-import { mapSchema, setSchema } from '../schemas/utils.js';
-import { jsonStringify } from './convert.js';
-
-describe('jsonStringify', () => {
-  const test = (value: any, schema: ZodTypeAny) => {
-    const json = jsonStringify(value);
-    expect(schema.parse(JSON.parse(json))).toEqual(value);
-  };
-
-  it('object with primitive types', () => {
-    const values = { a: 10, b: 'foo', c: true };
-    test(values, z.object({ a: z.number(), b: z.string(), c: z.boolean() }));
-  });
-
-  it('object with bigints', () => {
-    const values = { a: 10n };
-    test(values, z.object({ a: z.coerce.bigint() }));
-  });
-
-  it('tuples', () => {
-    const values = [10, 'foo', true];
-    test(values, z.tuple([z.number(), z.string(), z.boolean()]));
-  });
-
-  it('arrays', () => {
-    const values = [10, 20, 30];
-    test(values, z.array(z.number()));
-  });
-
-  it('maps', () => {
-    const values = new Map([
-      ['a', 10],
-      ['b', 20],
-    ]);
-    test(values, mapSchema(z.string(), z.number()));
-  });
-
-  it('sets', () => {
-    const values = new Set([10, 20]);
-    test(values, setSchema(z.number()));
-  });
+import { Buffer } from 'buffer';
+
+import { ClassConverter } from './class_converter.js';
+import { convertBigintsInObj, convertFromJsonObj, convertToJsonObj } from './convert.js';
+import { ToStringClass as ToStringClassA } from './fixtures/class_a.js';
+import { ToStringClass as ToStringClassB } from './fixtures/class_b.js';
+import { TestNote } from './fixtures/test_state.js';
+
+const TEST_BASE64 = 'YmFzZTY0IGRlY29kZXI=';
+it('test an RPC function over client', () => {
+  const cc = new ClassConverter({ TestNote });
+  const buffer = Buffer.from(TEST_BASE64, 'base64');
+  expect(convertFromJsonObj(cc, convertToJsonObj(cc, buffer)).toString('base64')).toBe(TEST_BASE64);
+  const note = new TestNote('1');
+  expect(convertFromJsonObj(cc, convertToJsonObj(cc, note))).toBeInstanceOf(TestNote);
+  expect(convertFromJsonObj(cc, convertToJsonObj(cc, note)).toString()).toBe('1');
+});
+
+it('converts a bigint', () => {
+  expect(convertBigintsInObj(10n)).toEqual({ type: 'bigint', data: '10' });
+  expect(convertBigintsInObj({ value: 10n })).toEqual({ value: { type: 'bigint', data: '10' } });
+  expect(convertBigintsInObj([10n])).toEqual([{ type: 'bigint', data: '10' }]);
+});
+
+it('does not convert a string', () => {
+  expect(convertBigintsInObj('hello')).toEqual('hello');
+  expect(convertBigintsInObj({ msg: 'hello' })).toEqual({ msg: 'hello' });
+});
+
+it('converts a registered class', () => {
+  const cc = new ClassConverter({ ToStringClass: ToStringClassA });
+  const obj = { content: new ToStringClassA('a', 'b') };
+  const serialized = convertToJsonObj(cc, obj);
+  const deserialized = convertFromJsonObj(cc, serialized) as { content: ToStringClassA };
+  expect(deserialized.content).toBeInstanceOf(ToStringClassA);
+  expect(deserialized.content.x).toEqual('a');
+  expect(deserialized.content.y).toEqual('b');
+});
+
+it('converts a class by name in the event of duplicate modules being loaded', () => {
+  expect(ToStringClassA.prototype.constructor.name).toEqual('ToStringClass');
+  expect(ToStringClassB.prototype.constructor.name).toEqual('ToStringClass');
+  const cc = new ClassConverter({ ToStringClass: ToStringClassA });
+  const obj = { content: new ToStringClassB('a', 'b') };
+  const serialized = convertToJsonObj(cc, obj);
+  const deserialized = convertFromJsonObj(cc, serialized) as { content: ToStringClassA };
+  expect(deserialized.content).toBeInstanceOf(ToStringClassA);
+  expect(deserialized.content.x).toEqual('a');
+  expect(deserialized.content.y).toEqual('b');
+});
+
+it('converts a class by constructor instead of name in the event of minified bundle', () => {
+  const cc = new ClassConverter({ NotMinifiedToStringClassName: ToStringClassA });
+  const obj = { content: new ToStringClassA('a', 'b') };
+  const serialized = convertToJsonObj(cc, obj);
+  const deserialized = convertFromJsonObj(cc, serialized) as { content: ToStringClassA };
+  expect(deserialized.content).toBeInstanceOf(ToStringClassA);
+  expect(deserialized.content.x).toEqual('a');
+  expect(deserialized.content.y).toEqual('b');
+});
+
+it('converts a plain object', () => {
+  const obj = { a: 10, b: [20, 30], c: 'foo' };
+  const cc = new ClassConverter();
+  expect(convertFromJsonObj(cc, convertToJsonObj(cc, obj))).toEqual(obj);
+});
+
+it('refuses to convert to json an unknown class', () => {
+  const cc = new ClassConverter();
+  expect(() => convertToJsonObj(cc, { content: new ToStringClassA('a', 'b') })).toThrow(/not registered/);
+});
+
+it('refuses to convert from json an unknown class', () => {
+  const cc = new ClassConverter({ ToStringClass: ToStringClassA });
+  const serialized = convertToJsonObj(cc, { content: new ToStringClassA('a', 'b') });
+  expect(() => convertFromJsonObj(new ClassConverter(), serialized)).toThrow(/not registered/);
 });
diff --git a/yarn-project/foundation/src/json-rpc/convert.ts b/yarn-project/foundation/src/json-rpc/convert.ts
index 8b040d74483..c0c7f200a44 100644
--- a/yarn-project/foundation/src/json-rpc/convert.ts
+++ b/yarn-project/foundation/src/json-rpc/convert.ts
@@ -1,23 +1,71 @@
 import { Buffer } from 'buffer';
+import cloneDeepWith from 'lodash.clonedeepwith';
 
-import { type ZodFor } from '../schemas/types.js';
+import { type ClassConverter } from './class_converter.js';
 
 /**
- * Parses a json string and then feeds it to a zod schema.
- * @param json - JSON string.
- * @param schema - Zod schema.
- * @returns Result of parsing json with schema.
+ * Check prototype chain to determine if an object is 'plain' (not a class instance).
+ * @param obj - The object to check.
+ * @returns True if the object is 'plain'.
  */
-export function jsonParseWithSchema<T>(json: string, schema: ZodFor<T>): T {
-  return schema.parse(JSON.parse(json));
+function isPlainObject(obj: any) {
+  if (obj === null) {
+    return false;
+  }
+
+  let proto = obj;
+  let counter = 0;
+  const MAX_PROTOTYPE_CHAIN_LENGTH = 1000; // Adjust as needed
+  while (Object.getPrototypeOf(proto) !== null) {
+    if (counter >= MAX_PROTOTYPE_CHAIN_LENGTH) {
+      // This is a failsafe in case circular prototype chain has been created. It should not be hit
+      return false;
+    }
+    proto = Object.getPrototypeOf(proto);
+    counter++;
+  }
+
+  return Object.getPrototypeOf(obj) === proto;
 }
 
 /**
- * JSON.stringify helper that stringifies bigints, buffers, maps, and sets.
+ * Recursively looks through an object for bigints and converts them to object format.
+ * @param obj - The object to convert.
+ * @returns The converted object with stringified bigints.
+ */
+export const convertBigintsInObj = (obj: any) => {
+  return cloneDeepWith(obj, (value: any) => {
+    if (typeof value === 'bigint') {
+      return { type: 'bigint', data: value.toString() };
+    }
+  });
+};
+
+/**
+ * JSON.stringify helper that handles bigints.
  * @param obj - The object to be stringified.
  * @returns The resulting string.
  */
 export function jsonStringify(obj: object, prettify?: boolean): string {
+  return JSON.stringify(
+    obj,
+    (key, value) =>
+      typeof value === 'bigint'
+        ? JSON.stringify({
+            type: 'bigint',
+            data: value.toString(),
+          })
+        : value,
+    prettify ? 2 : 0,
+  );
+}
+
+/**
+ * JSON.stringify helper that stringifies bigints and buffers.
+ * @param obj - The object to be stringified.
+ * @returns The resulting string.
+ */
+export function jsonStringify2(obj: object, prettify?: boolean): string {
   return JSON.stringify(
     obj,
     (_key, value) => {
@@ -25,10 +73,6 @@ export function jsonStringify(obj: object, prettify?: boolean): string {
         return value.toString();
       } else if (typeof value === 'object' && Buffer.isBuffer(value)) {
         return value.toString('base64');
-      } else if (typeof value === 'object' && value instanceof Map) {
-        return Array.from(value.entries());
-      } else if (typeof value === 'object' && value instanceof Set) {
-        return Array.from(value.values());
       } else {
         return value;
       }
@@ -38,13 +82,103 @@ export function jsonStringify(obj: object, prettify?: boolean): string {
 }
 
 /**
- * Calls jsonStringify but swallows errors.
- * Use for logging, when you don't want to potentially introduce another thing that throws.
+ * Convert a JSON-friendly object, which may encode a class object.
+ * @param cc - The class converter.
+ * @param obj - The encoded object.
+ * @returns The decoded object.
+ */
+export function convertFromJsonObj(cc: ClassConverter, obj: any): any {
+  if (obj === null) {
+    return undefined; // `null` doesn't work with default args.
+  }
+
+  if (!obj) {
+    return obj; // Primitive type
+  }
+  // Is this a serialized Node buffer?
+  if (obj.type === 'Buffer' && typeof obj.data === 'string') {
+    return Buffer.from(obj.data, 'base64');
+  }
+
+  if (obj.type === 'bigint' && typeof obj.data === 'string') {
+    return BigInt(obj.data);
+  }
+
+  // Is this a convertible type?
+  if (typeof obj.type === 'string') {
+    if (cc.isRegisteredClassName(obj.type)) {
+      return cc.toClassObj(obj);
+    } else {
+      throw new Error(`Object ${obj.type} not registered for serialization FROM JSON`);
+    }
+  }
+
+  // Is this an array?
+  if (Array.isArray(obj)) {
+    return obj.map((x: any) => convertFromJsonObj(cc, x));
+  }
+
+  // Is this a dictionary?
+  if (typeof obj === 'object') {
+    const newObj: any = {};
+    for (const key of Object.keys(obj)) {
+      newObj[key] = convertFromJsonObj(cc, obj[key]);
+    }
+    return newObj;
+  }
+
+  // Leave alone, assume JSON primitive
+  return obj;
+}
+
+/**
+ * Convert objects or classes to a JSON-friendly object.
+ * @param cc - The class converter.
+ * @param obj - The object.
+ * @returns The encoded object.
  */
-export function tryJsonStringify(obj: any, prettify?: boolean): string | undefined {
-  try {
-    return jsonStringify(obj, prettify);
-  } catch (e) {
-    return undefined;
+export function convertToJsonObj(cc: ClassConverter, obj: any): any {
+  // Bigint is a primitive type that needs special handling since it's not serializable
+  if (typeof obj === 'bigint') {
+    return {
+      type: 'bigint',
+      data: obj.toString(),
+    };
   }
+
+  if (!obj) {
+    return obj; // Primitive type
+  }
+
+  // Is this a Node buffer?
+  if (Buffer.isBuffer(obj)) {
+    return { type: 'Buffer', data: obj.toString('base64') };
+  }
+
+  // Is this a convertible type?
+  if (cc.isRegisteredClass(obj.constructor)) {
+    return cc.toJsonObj(obj);
+  }
+
+  // Is this an array?
+  if (Array.isArray(obj)) {
+    return obj.map((x: any) => convertToJsonObj(cc, x));
+  }
+
+  if (typeof obj === 'object') {
+    // Is this a dictionary?
+    if (isPlainObject(obj)) {
+      const newObj: any = {};
+      for (const key of Object.keys(obj)) {
+        newObj[key] = convertToJsonObj(cc, obj[key]);
+      }
+      return newObj;
+    } else {
+      // Throw if this is a non-primitive class that was not registered
+      throw new Error(`Object ${obj.constructor.name} not registered for serialization TO JSON`);
+    }
+  }
+
+  // Leave alone, assume JSON primitive
+  return obj;
 }
diff --git a/yarn-project/foundation/src/json-rpc/fixtures/test_state.ts b/yarn-project/foundation/src/json-rpc/fixtures/test_state.ts
index 04ff2fac259..6e67d64d785 100644
--- a/yarn-project/foundation/src/json-rpc/fixtures/test_state.ts
+++ b/yarn-project/foundation/src/json-rpc/fixtures/test_state.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { type ApiSchemaFor, optional, schemas } from '../../schemas/index.js';
+import { type ApiSchemaFor, schemas } from '../../schemas/index.js';
 import { sleep } from '../../sleep/index.js';
 
 /**
@@ -35,16 +35,13 @@ export class TestNote {
 }
 
 export interface TestStateApi {
-  getNote: (index: number) => Promise<TestNote | undefined>;
-  getNotes: (limit?: number) => Promise<TestNote[]>;
-  getNotes2: (limit: bigint | undefined) => Promise<TestNote[]>;
-  getNotes3: (limit?: number) => Promise<TestNote[]>;
+  getNote: (index: number) => Promise<TestNote>;
+  getNotes: () => Promise<TestNote[]>;
   clear: () => Promise<void>;
   addNotes: (notes: TestNote[]) => Promise<TestNote[]>;
   fail: () => Promise<void>;
   count: () => Promise<number>;
   getStatus: () => Promise<{ status: string; count: bigint }>;
-  getTuple(): Promise<[string, string | undefined, number]>;
 }
 
 /**
@@ -76,19 +73,9 @@ export class TestState implements TestStateApi {
     return this.notes.length;
   }
 
-  async getNotes(limit?: number): Promise<TestNote[]> {
+  async getNotes(): Promise<TestNote[]> {
     await sleep(0.1);
-    return limit ? this.notes.slice(0, limit) : this.notes;
-  }
-
-  async getNotes2(limit: bigint | undefined): Promise<TestNote[]> {
-    await sleep(0.1);
-    return limit ? this.notes.slice(0, Number(limit)) : this.notes;
-  }
-
-  async getNotes3(limit = 1): Promise<TestNote[]> {
-    await sleep(0.1);
-    return limit ? this.notes.slice(0, Number(limit)) : this.notes;
+    return this.notes;
   }
 
   async clear(): Promise<void> {
@@ -122,22 +109,14 @@ export class TestState implements TestStateApi {
     await sleep(0.1);
     return { status: 'ok', count: BigInt(this.notes.length) };
   }
-
-  async getTuple(): Promise<[string, string | undefined, number]> {
-    await sleep(0.1);
-    return ['a', undefined, 1];
-  }
 }
 
 export const TestStateSchema: ApiSchemaFor<TestStateApi> = {
-  getNote: z.function().args(z.number()).returns(TestNote.schema.optional()),
-  getNotes: z.function().args(optional(schemas.Integer)).returns(z.array(TestNote.schema)),
-  getNotes2: z.function().args(optional(schemas.BigInt)).returns(z.array(TestNote.schema)),
-  getNotes3: z.function().args(optional(schemas.Integer)).returns(z.array(TestNote.schema)),
+  getNote: z.function().args(z.number()).returns(TestNote.schema),
+  getNotes: z.function().returns(z.array(TestNote.schema)),
   clear: z.function().returns(z.void()),
   addNotes: z.function().args(z.array(TestNote.schema)).returns(z.array(TestNote.schema)),
   fail: z.function().returns(z.void()),
   count: z.function().returns(z.number()),
   getStatus: z.function().returns(z.object({ status: z.string(), count: schemas.BigInt })),
-  getTuple: z.function().returns(z.tuple([z.string(), optional(z.string()), z.number()])),
 };
diff --git a/yarn-project/foundation/src/json-rpc/index.ts b/yarn-project/foundation/src/json-rpc/index.ts
index 2e33ff54f4e..47cc5f01334 100644
--- a/yarn-project/foundation/src/json-rpc/index.ts
+++ b/yarn-project/foundation/src/json-rpc/index.ts
@@ -1 +1,8 @@
+export {
+  StringClassConverterInput,
+  JsonClassConverterInput as ObjClassConverterInput,
+  JsonEncodedClass,
+  ClassConverter,
+} from './class_converter.js';
+
 export { jsonStringify } from './convert.js';
diff --git a/yarn-project/foundation/src/json-rpc/server/index.ts b/yarn-project/foundation/src/json-rpc/server/index.ts
index 048e53af1fc..d16e1fca3ff 100644
--- a/yarn-project/foundation/src/json-rpc/server/index.ts
+++ b/yarn-project/foundation/src/json-rpc/server/index.ts
@@ -1 +1,3 @@
+export * from './json_rpc_server.js';
 export * from './safe_json_rpc_server.js';
+export { JsonProxy } from './json_proxy.js';
diff --git a/yarn-project/foundation/src/json-rpc/server/json_proxy.ts b/yarn-project/foundation/src/json-rpc/server/json_proxy.ts
new file mode 100644
index 00000000000..339d6013b71
--- /dev/null
+++ b/yarn-project/foundation/src/json-rpc/server/json_proxy.ts
@@ -0,0 +1,68 @@
+import { format } from 'util';
+
+import { createDebugLogger } from '../../log/index.js';
+import { ClassConverter, type JsonClassConverterInput, type StringClassConverterInput } from '../class_converter.js';
+import { convertFromJsonObj, convertToJsonObj } from '../convert.js';
+import { assert, hasOwnProperty } from '../js_utils.js';
+
+const log = createDebugLogger('json-rpc:json_proxy');
+
+/**
+ * A map of class names to class constructors.
+ */
+export type ClassMaps = {
+  /** The String class map */
+  stringClassMap: StringClassConverterInput;
+  /** The object class map */
+  objectClassMap: JsonClassConverterInput;
+};
+
+/**
+ * Handles conversion of objects over the write.
+ * Delegates to a ClassConverter object.
+ */
+export class JsonProxy {
+  classConverter: ClassConverter;
+  constructor(
+    private handler: object,
+    stringClassMap: StringClassConverterInput,
+    objectClassMap: JsonClassConverterInput,
+  ) {
+    this.classConverter = new ClassConverter(stringClassMap, objectClassMap);
+  }
+  /**
+   * Call an RPC method.
+   * @param methodName - The RPC method.
+   * @param jsonParams - The RPG parameters.
+   * @param skipConversion - Whether to skip conversion of the parameters.
+   * @returns The remote result.
+   */
+  public async call(methodName: string, jsonParams: any[] = [], skipConversion = false) {
+    log.debug(format(`JsonProxy:call`, methodName, jsonParams));
+    // Get access to our class members
+    const proto = Object.getPrototypeOf(this.handler);
+    assert(hasOwnProperty(proto, methodName), `JsonProxy: Method ${methodName} not found!`);
+    assert(Array.isArray(jsonParams), `JsonProxy: ${methodName} params not an array: ${jsonParams}`);
+    // convert the params from json representation to classes
+    let convertedParams = jsonParams;
+    if (!skipConversion) {
+      convertedParams = jsonParams.map(param => convertFromJsonObj(this.classConverter, param));
+    }
+    log.debug(format('JsonProxy:call', methodName, '<-', convertedParams));
+    const rawRet = await (this.handler as any)[methodName](...convertedParams);
+    let ret = rawRet;
+    if (!skipConversion) {
+      ret = convertToJsonObj(this.classConverter, rawRet);
+    }
+    log.debug(format('JsonProxy:call', methodName, '->', ret));
+    return ret;
+  }
+
+  public hasMethod(methodName: string): boolean {
+    return hasOwnProperty(Object.getPrototypeOf(this.handler), methodName);
+  }
+
+  public getMethods() {
+    return Object.getOwnPropertyNames(Object.getPrototypeOf(this.handler));
+  }
+}
diff --git a/yarn-project/foundation/src/json-rpc/server/json_rpc_server.test.ts b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.test.ts
new file mode 100644
index 00000000000..9815055346d
--- /dev/null
+++ b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.test.ts
@@ -0,0 +1,52 @@
+import request from 'supertest';
+
+import { TestNote, TestState } from '../fixtures/test_state.js';
+import { JsonRpcServer } from './json_rpc_server.js';
+
+it('test an RPC function with a primitive parameter', async () => {
+  const server = new JsonRpcServer(new TestState([new TestNote('a'), new TestNote('b')]), { TestNote }, {});
+  const response = await request(server.getApp().callback())
+    .post('/')
+    .send({ method: 'getNote', params: [0] });
+  expect(response.status).toBe(200);
+  expect(response.text).toBe(JSON.stringify({ result: { type: 'TestNote', data: 'a' } }));
+});
+
+it('test an RPC function with an array of classes', async () => {
+  const server = new JsonRpcServer(new TestState([]), { TestNote }, {});
+  const response = await request(server.getApp().callback())
+    .post('/')
+    .send({
+      method: 'addNotes',
+      params: [[{ data: 'a' }, { data: 'b' }, { data: 'c' }]],
+    });
+  expect(response.status).toBe(200);
+  expect(response.text).toBe(JSON.stringify({ result: [{ data: 'a' }, { data: 'b' }, { data: 'c' }] }));
+});
+
+it('test invalid JSON', async () => {
+  const server = new JsonRpcServer(new TestState([]), { TestNote }, {});
+  const response = await request(server.getApp().callback()).post('/').send('{');
+  expect(response.status).toBe(400);
+  expect(response.body).toEqual({
+    error: { code: -32700, message: 'Parse error' },
+    id: null,
+    jsonrpc: '2.0',
+  });
+});
+
+it('invalid method', async () => {
+  const server = new JsonRpcServer(new TestState([]), { TestNote }, {});
+  const response = await request(server.getApp().callback()).post('/').send({
+    jsonrpc: '2.0',
+    method: 'invalid',
+    params: [],
+    id: 42,
+  });
+  expect(response.status).toBe(400);
+  expect(response.body).toEqual({
+    error: { code: -32601, message: 'Method not found: invalid' },
+    id: 42,
+    jsonrpc: '2.0',
+  });
+});
diff --git a/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts
new file mode 100644
index 00000000000..5eba75b45f2
--- /dev/null
+++ b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts
@@ -0,0 +1,337 @@
+import cors from '@koa/cors';
+import http from 'http';
+import Koa from 'koa';
+import bodyParser from 'koa-bodyparser';
+import compress from 'koa-compress';
+import Router from 'koa-router';
+import { type AddressInfo } from 'net';
+
+import { createDebugLogger } from '../../log/index.js';
+import { promiseWithResolvers } from '../../promise/utils.js';
+import { type JsonClassConverterInput, type StringClassConverterInput } from '../class_converter.js';
+import { convertBigintsInObj } from '../convert.js';
+import { type ClassMaps, JsonProxy } from './json_proxy.js';
+
+/**
+ * JsonRpcServer.
+ * Minimal, dev-friendly mechanism to create a server from an object.
+ */
+export class JsonRpcServer {
+  /**
+   * The proxy object.
+   */
+  public proxy: JsonProxy;
+
+  /**
+   * The HTTP server accepting remote requests.
+   * This member field is initialized when the server is started.
+   */
+  private httpServer?: http.Server;
+
+  constructor(
+    private handler: object,
+    private stringClassMap: StringClassConverterInput,
+    private objectClassMap: JsonClassConverterInput,
+    /** List of methods to disallow from calling remotely */
+    public readonly disallowedMethods: string[] = [],
+    private healthCheck: StatusCheckFn = () => true,
+    private log = createDebugLogger('json-rpc:server'),
+  ) {
+    this.proxy = new JsonProxy(handler, stringClassMap, objectClassMap);
+  }
+
+  public isHealthy(): boolean | Promise<boolean> {
+    return this.healthCheck();
+  }
+
+  /**
+   * Get an express app object.
+   * @param prefix - Our server prefix.
+   * @returns The app object.
+   */
+  public getApp(prefix = '') {
+    const router = this.getRouter(prefix);
+    const exceptionHandler = async (ctx: Koa.Context, next: () => Promise<void>) => {
+      try {
+        await next();
+      } catch (err: any) {
+        this.log.error(err);
+        if (err instanceof SyntaxError) {
+          ctx.status = 400;
+          ctx.body = {
+            jsonrpc: '2.0',
+            id: null,
+            error: {
+              code: -32700,
+              message: 'Parse error',
+            },
+          };
+        } else {
+          ctx.status = 500;
+          ctx.body = {
+            jsonrpc: '2.0',
+            id: null,
+            error: {
+              code: -32603,
+              message: 'Internal error',
+            },
+          };
+        }
+      }
+    };
+    const app = new Koa();
+    app.on('error', error => {
+      this.log.error(`Error on API handler: ${error}`);
+    });
+    app.use(exceptionHandler);
+    app.use(compress({ br: false } as any));
+    app.use(
+      bodyParser({
+        jsonLimit: '50mb',
+        enableTypes: ['json'],
+        detectJSON: () => true,
+      }),
+    );
+    app.use(cors());
+    app.use(router.routes());
+    app.use(router.allowedMethods());
+
+    return app;
+  }
+
+  /**
+   * Get a router object wrapping our RPC class.
+   * @param prefix - The server prefix.
+   * @returns The router object.
+   */
+  private getRouter(prefix: string) {
+    const router = new Router({ prefix });
+    const proto = Object.getPrototypeOf(this.handler);
+    // "JSON RPC mode" where a single endpoint is used and the method is given in the request body
+    router.post('/', async (ctx: Koa.Context) => {
+      const { params = [], jsonrpc, id, method } = ctx.request.body as any;
+      // Ignore if not a function
+      if (
+        typeof method !== 'string' ||
+        method === 'constructor' ||
+        typeof proto[method] !== 'function' ||
+        this.disallowedMethods.includes(method)
+      ) {
+        ctx.status = 400;
+        ctx.body = {
+          jsonrpc,
+          id,
+          error: {
+            code: -32601,
+            message: `Method not found: ${method}`,
+          },
+        };
+      } else {
+        try {
+          const result = await this.proxy.call(method, params);
+          ctx.body = {
+            jsonrpc,
+            id,
+            result: convertBigintsInObj(result),
+          };
+          ctx.status = 200;
+        } catch (err: any) {
+          // Propagate the error message to the client. Plenty of the errors are expected to occur (e.g. adding
+          // a duplicate recipient) so this is necessary.
+          ctx.status = 400;
+          ctx.body = {
+            jsonrpc,
+            id,
+            error: {
+              // TODO assign error codes - https://github.com/AztecProtocol/aztec-packages/issues/2633
+              code: -32000,
+              message: err.message,
+            },
+          };
+        }
+      }
+    });
+
+    return router;
+  }
+
+  /**
+   * Start this server with koa.
+   * @param port - Port number.
+   * @param prefix - Prefix string.
+   */
+  public start(port: number, prefix = ''): void {
+    if (this.httpServer) {
+      throw new Error('Server is already listening');
+    }
+
+    this.httpServer = http.createServer(this.getApp(prefix).callback());
+    this.httpServer.listen(port);
+  }
+
+  /**
+   * Stops the HTTP server
+   */
+  public stop(): Promise<void> {
+    if (!this.httpServer) {
+      return Promise.resolve();
+    }
+
+    const { promise, resolve, reject } = promiseWithResolvers<void>();
+    this.httpServer.close(err => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve();
+      }
+    });
+    return promise;
+  }
+
+  /**
+   * Get a list of methods.
+   * @returns A list of methods.
+   */
+  public getMethods(): string[] {
+    return Object.getOwnPropertyNames(Object.getPrototypeOf(this.handler));
+  }
+
+  /**
+   * Gets the class maps that were used to create the proxy.
+   * @returns The string & object class maps.
+   */
+  public getClassMaps(): ClassMaps {
+    return { stringClassMap: this.stringClassMap, objectClassMap: this.objectClassMap };
+  }
+
+  /**
+   * Call an RPC method.
+   * @param methodName - The RPC method.
+   * @param jsonParams - The RPC parameters.
+   * @param skipConversion - Whether to skip conversion of the parameters.
+   * @returns The remote result.
+   */
+  public async call(methodName: string, jsonParams: any[] = [], skipConversion: boolean) {
+    return await this.proxy.call(methodName, jsonParams, skipConversion);
+  }
+}
+
+export type StatusCheckFn = () => boolean | Promise<boolean>;
+
+/**
+ * Creates a router for handling a plain status request that will return 200 status when running.
+ * @param getCurrentStatus - List of health check functions to run.
+ * @param apiPrefix - The prefix to use for all api requests
+ * @returns - The router for handling status requests.
+ */
+export function createStatusRouter(getCurrentStatus: StatusCheckFn, apiPrefix = '') {
+  const router = new Router({ prefix: `${apiPrefix}` });
+  router.get('/status', async (ctx: Koa.Context) => {
+    let ok: boolean;
+    try {
+      ok = (await getCurrentStatus()) === true;
+    } catch (err) {
+      ok = false;
+    }
+
+    ctx.status = ok ? 200 : 500;
+  });
+  return router;
+}
+
+/**
+ * Wraps a JsonRpcServer in a nodejs http server and starts it. Returns once starts listening.
+ * @returns A running http server.
+ */
+export async function startHttpRpcServer(
+  rpcServer: Pick<JsonRpcServer, 'getApp'>,
+  options: { host?: string; port?: number; apiPrefix?: string; statusCheckFn?: StatusCheckFn } = {},
+): Promise<http.Server & { port: number }> {
+  const app = rpcServer.getApp(options.apiPrefix);
+
+  if (options.statusCheckFn) {
+    const statusRouter = createStatusRouter(options.statusCheckFn, options.apiPrefix);
+    app.use(statusRouter.routes()).use(statusRouter.allowedMethods());
+  }
+
+  const httpServer = http.createServer(app.callback());
+  const { promise, resolve } = promiseWithResolvers<void>();
+  httpServer.listen(options.port ?? 0, options.host ?? '0.0.0.0', () => resolve());
+  await promise;
+
+  const port = (httpServer.address() as AddressInfo).port;
+  return Object.assign(httpServer, { port });
+}
+/**
+ * List of namespace to server instance.
+ */
+export type ServerList = {
+  /** name of the service to be used for namespacing */
+  [name: string]: JsonRpcServer;
+}[];
+
+/**
+ * Creates a single JsonRpcServer from multiple servers.
+ * @param servers - List of servers to be combined into a single server, passed as ServerList.
+ * @returns A single JsonRpcServer with namespaced methods.
+ */
+export function createNamespacedJsonRpcServer(
+  servers: ServerList,
+  log = createDebugLogger('json-rpc:multi-server'),
+): JsonRpcServer {
+  const handler = {} as any;
+  const disallowedMethods: string[] = [];
+  const classMapsArr: ClassMaps[] = [];
+
+  for (const serverEntry of servers) {
+    const [namespace, server] = Object.entries(serverEntry)[0];
+    const serverMethods = server.getMethods();
+
+    for (const method of serverMethods) {
+      const namespacedMethod = `${namespace}_${method}`;
+
+      handler[namespacedMethod] = (...args: any[]) => {
+        return server.call(method, args, true);
+      };
+    }
+
+    // get the combined disallowed methods from all servers.
+    disallowedMethods.push(...server.disallowedMethods.map(method => `${namespace}_${method}`));
+    // get the combined classmaps from all servers.
+    const classMap = server.getClassMaps();
+    classMapsArr.push({
+      stringClassMap: classMap.stringClassMap,
+      objectClassMap: classMap.objectClassMap,
+    });
+  }
+
+  // Get the combined stringClassMap & objectClassMap from all servers
+  const classMaps = classMapsArr.reduce(
+    (acc, curr) => {
+      return {
+        stringClassMap: { ...acc.stringClassMap, ...curr.stringClassMap },
+        objectClassMap: { ...acc.objectClassMap, ...curr.objectClassMap },
+      };
+    },
+    { stringClassMap: {}, objectClassMap: {} } as ClassMaps,
+  );
+
+  const aggregateHealthCheck = async () => {
+    const statuses = await Promise.allSettled(
+      servers.flatMap(services =>
+        Object.entries(services).map(async ([name, service]) => ({ name, healthy: await service.isHealthy() })),
+      ),
+    );
+    const allHealthy = statuses.every(result => result.status === 'fulfilled' && result.value.healthy);
+    return allHealthy;
+  };
+
+  return new JsonRpcServer(
+    Object.create(handler),
+    classMaps.stringClassMap,
+    classMaps.objectClassMap,
+    disallowedMethods,
+    aggregateHealthCheck,
+    log,
+  );
+}
diff --git a/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.test.ts b/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.test.ts
index 3f09077abb9..8f9fb2cdc96 100644
--- a/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.test.ts
+++ b/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.test.ts
@@ -21,8 +21,8 @@ describe('SafeJsonRpcServer', () => {
   const send = (body: any) => request(server.getApp().callback()).post('/').send(body);
 
   const expectError = (response: request.Response, httpCode: number, message: string) => {
-    expect(JSON.parse(response.text)).toMatchObject({ error: { message } });
     expect(response.status).toBe(httpCode);
+    expect(JSON.parse(response.text)).toMatchObject({ error: { message } });
   };
 
   describe('single', () => {
@@ -38,7 +38,7 @@ describe('SafeJsonRpcServer', () => {
 
     it('calls an RPC function with incorrect parameter type', async () => {
       const response = await send({ method: 'getNote', params: [{ index: 1 }] });
-      expectError(response, 400, expect.stringContaining('Expected number, received object'));
+      expectError(response, 400, 'Expected number, received object');
     });
 
     it('calls an RPC function with a primitive return type', async () => {
diff --git a/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts b/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts
index 41f48234786..7fa2ca14999 100644
--- a/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts
+++ b/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts
@@ -4,14 +4,13 @@ import Koa from 'koa';
 import bodyParser from 'koa-bodyparser';
 import compress from 'koa-compress';
 import Router from 'koa-router';
-import { type AddressInfo } from 'net';
-import { format, inspect } from 'util';
+import { format } from 'util';
 import { ZodError } from 'zod';
 
-import { type DebugLogger, createDebugLogger } from '../../log/index.js';
+import { createDebugLogger } from '../../log/index.js';
 import { promiseWithResolvers } from '../../promise/utils.js';
-import { type ApiSchema, type ApiSchemaFor, parseWithOptionals, schemaHasMethod } from '../../schemas/index.js';
-import { jsonStringify } from '../convert.js';
+import { type ApiSchema, type ApiSchemaFor, schemaHasMethod } from '../../schemas/index.js';
+import { jsonStringify2 } from '../convert.js';
 import { assert } from '../js_utils.js';
 
 export class SafeJsonRpcServer {
@@ -24,16 +23,10 @@ export class SafeJsonRpcServer {
   constructor(
     /** The proxy object to delegate requests to. */
     private readonly proxy: Proxy,
-    /** Health check function */
-    private readonly healthCheck: StatusCheckFn = () => true,
     /** Logger */
     private log = createDebugLogger('json-rpc:server'),
   ) {}
 
-  public isHealthy(): boolean | Promise<boolean> {
-    return this.healthCheck();
-  }
-
   /**
    * Get an express app object.
    * @param prefix - Our server prefix.
@@ -46,13 +39,12 @@ export class SafeJsonRpcServer {
       try {
         await next();
       } catch (err: any) {
-        const method = (ctx.request.body as any)?.method ?? 'unknown';
-        this.log.warn(`Error in JSON RPC server call ${method}: ${inspect(err)}`);
+        this.log.error(err);
         if (err instanceof SyntaxError) {
           ctx.status = 400;
           ctx.body = { jsonrpc: '2.0', id: null, error: { code: -32700, message: `Parse error: ${err.message}` } };
         } else if (err instanceof ZodError) {
-          const message = err.issues.map(e => `${e.message} (${e.path.join('.')})`).join('. ') || 'Validation error';
+          const message = err.issues.map(e => e.message).join(', ') || 'Validation error';
           ctx.status = 400;
           ctx.body = { jsonrpc: '2.0', id: null, error: { code: -32701, message } };
         } else {
@@ -66,7 +58,7 @@ export class SafeJsonRpcServer {
       try {
         await next();
         if (ctx.body && typeof ctx.body === 'object') {
-          ctx.body = jsonStringify(ctx.body);
+          ctx.body = jsonStringify2(ctx.body);
         }
       } catch (err: any) {
         ctx.status = 500;
@@ -158,8 +150,6 @@ export class SafeJsonRpcServer {
   }
 }
 
-export type StatusCheckFn = () => boolean | Promise<boolean>;
-
 interface Proxy {
   hasMethod(methodName: string): boolean;
   call(methodName: string, jsonParams?: any[]): Promise<any>;
@@ -190,7 +180,8 @@ export class SafeJsonProxy<T extends object = any> implements Proxy {
     assert(schemaHasMethod(this.schema, methodName), `Method ${methodName} not found in schema`);
     const method = this.handler[methodName as keyof T];
     assert(typeof method === 'function', `Method ${methodName} is not a function`);
-    const args = parseWithOptionals(jsonParams, this.schema[methodName].parameters());
+
+    const args = this.schema[methodName].parameters().parse(jsonParams);
     const ret = await method.apply(this.handler, args);
     this.log.debug(format('response', methodName, ret));
     return ret;
@@ -227,31 +218,12 @@ class NamespacedSafeJsonProxy implements Proxy {
 
 export type NamespacedApiHandlers = Record<string, ApiHandler>;
 
-export type ApiHandler<T extends object = any> = [T, ApiSchemaFor<T>, StatusCheckFn?];
+export type ApiHandler<T extends object = any> = [T, ApiSchemaFor<T>];
 
 export function makeHandler<T extends object>(handler: T, schema: ApiSchemaFor<T>): ApiHandler<T> {
   return [handler, schema];
 }
 
-function makeAggregateHealthcheck(namedHandlers: NamespacedApiHandlers, log?: DebugLogger): StatusCheckFn {
-  return async () => {
-    try {
-      const results = await Promise.all(
-        Object.entries(namedHandlers).map(([name, [, , healthCheck]]) => [name, healthCheck ? healthCheck() : true]),
-      );
-      const failed = results.filter(([_, result]) => !result);
-      if (failed.length > 0) {
-        log?.warn(`Health check failed for ${failed.map(([name]) => name).join(', ')}`);
-        return false;
-      }
-      return true;
-    } catch (err) {
-      log?.error(`Error during health check`, err);
-      return false;
-    }
-  };
-}
-
 /**
  * Creates a single SafeJsonRpcServer from multiple handlers.
  * @param servers - List of handlers to be combined.
@@ -262,75 +234,10 @@ export function createNamespacedSafeJsonRpcServer(
   log = createDebugLogger('json-rpc:server'),
 ): SafeJsonRpcServer {
   const proxy = new NamespacedSafeJsonProxy(handlers);
-  const healthCheck = makeAggregateHealthcheck(handlers, log);
-  return new SafeJsonRpcServer(proxy, healthCheck, log);
+  return new SafeJsonRpcServer(proxy, log);
 }
 
-export function createSafeJsonRpcServer<T extends object = any>(
-  handler: T,
-  schema: ApiSchemaFor<T>,
-  healthCheck?: StatusCheckFn,
-) {
+export function createSafeJsonRpcServer<T extends object = any>(handler: T, schema: ApiSchemaFor<T>) {
   const proxy = new SafeJsonProxy(handler, schema);
-  return new SafeJsonRpcServer(proxy, healthCheck);
-}
-
-/**
- * Creates a router for handling a plain status request that will return 200 status when running.
- * @param getCurrentStatus - List of health check functions to run.
- * @param apiPrefix - The prefix to use for all api requests
- * @returns - The router for handling status requests.
- */
-export function createStatusRouter(getCurrentStatus: StatusCheckFn, apiPrefix = '') {
-  const router = new Router({ prefix: `${apiPrefix}` });
-  router.get('/status', async (ctx: Koa.Context) => {
-    let ok: boolean;
-    try {
-      ok = (await getCurrentStatus()) === true;
-    } catch (err) {
-      ok = false;
-    }
-
-    ctx.status = ok ? 200 : 500;
-  });
-  return router;
-}
-
-/**
- * Wraps a JsonRpcServer in a nodejs http server and starts it.
- * Installs a status router that calls to the isHealthy method to the server.
- * Returns once starts listening unless noWait is set.
- * @returns A running http server.
- */
-export async function startHttpRpcServer(
-  rpcServer: Pick<SafeJsonRpcServer, 'getApp' | 'isHealthy'>,
-  options: {
-    host?: string;
-    port?: number | string;
-    apiPrefix?: string;
-    timeoutMs?: number;
-    noWait?: boolean;
-  } = {},
-): Promise<http.Server & { port: number }> {
-  const app = rpcServer.getApp(options.apiPrefix);
-
-  const statusRouter = createStatusRouter(rpcServer.isHealthy.bind(rpcServer), options.apiPrefix);
-  app.use(statusRouter.routes()).use(statusRouter.allowedMethods());
-
-  const httpServer = http.createServer(app.callback());
-  if (options.timeoutMs) {
-    httpServer.timeout = options.timeoutMs;
-  }
-
-  const { promise, resolve } = promiseWithResolvers<void>();
-  const listenPort = options.port ? (typeof options.port === 'string' ? parseInt(options.port) : options.port) : 0;
-  httpServer.listen(listenPort, options.host, () => resolve());
-
-  // Wait until listen callback is called
-  if (!options.noWait) {
-    await promise;
-  }
-
-  const port = (httpServer.address() as AddressInfo).port;
-  return Object.assign(httpServer, { port });
+  return new SafeJsonRpcServer(proxy);
 }
diff --git a/yarn-project/foundation/src/json-rpc/test/index.ts b/yarn-project/foundation/src/json-rpc/test/index.ts
deleted file mode 100644
index f9e0155547c..00000000000
--- a/yarn-project/foundation/src/json-rpc/test/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { createJsonRpcTestSetup, type JsonRpcTestContext } from './integration.js';
diff --git a/yarn-project/foundation/src/json-rpc/test/integration.test.ts b/yarn-project/foundation/src/json-rpc/test/integration.test.ts
index b48d0f8d7a5..d05ceb62a75 100644
--- a/yarn-project/foundation/src/json-rpc/test/integration.test.ts
+++ b/yarn-project/foundation/src/json-rpc/test/integration.test.ts
@@ -1,12 +1,12 @@
 import { createSafeJsonRpcClient } from '../client/safe_json_rpc_client.js';
 import { TestNote, TestState, type TestStateApi, TestStateSchema } from '../fixtures/test_state.js';
-import { startHttpRpcServer } from '../server/safe_json_rpc_server.js';
+import { startHttpRpcServer } from '../server/json_rpc_server.js';
 import {
   type SafeJsonRpcServer,
   createNamespacedSafeJsonRpcServer,
+  createSafeJsonRpcServer,
   makeHandler,
 } from '../server/safe_json_rpc_server.js';
-import { createJsonRpcTestSetup } from './integration.js';
 
 describe('JsonRpc integration', () => {
   let testState: TestState;
@@ -28,7 +28,9 @@ describe('JsonRpc integration', () => {
     let client: TestStateApi;
 
     beforeEach(async () => {
-      ({ server, httpServer, client } = await createJsonRpcTestSetup(testState, TestStateSchema));
+      server = createSafeJsonRpcServer<TestStateApi>(testState, TestStateSchema);
+      httpServer = await startHttpRpcServer(server, { host: '127.0.0.1' });
+      client = createSafeJsonRpcClient<TestStateApi>(`http://127.0.0.1:${httpServer.port}`, TestStateSchema);
     });
 
     it('calls an RPC function with a primitive parameter', async () => {
@@ -37,48 +39,6 @@ describe('JsonRpc integration', () => {
       expect(note).toBeInstanceOf(TestNote);
     });
 
-    it('calls an RPC function without an optional parameter', async () => {
-      const notes = await client.getNotes();
-      expect(notes).toEqual(testNotes);
-      expect(notes.every(note => note instanceof TestNote)).toBe(true);
-    });
-
-    it('calls an RPC function with an optional parameter', async () => {
-      const notes = await client.getNotes(1);
-      expect(notes).toEqual([testNotes[0]]);
-      expect(notes.every(note => note instanceof TestNote)).toBe(true);
-    });
-
-    it('calls an RPC function with a bigint parameter', async () => {
-      const notes = await client.getNotes2(1n);
-      expect(notes).toEqual([testNotes[0]]);
-      expect(notes.every(note => note instanceof TestNote)).toBe(true);
-    });
-
-    it('calls an RPC function with an undefined parameter', async () => {
-      const notes = await client.getNotes2(undefined);
-      expect(notes).toEqual(testNotes);
-      expect(notes.every(note => note instanceof TestNote)).toBe(true);
-    });
-
-    it('calls an RPC function with a default parameter', async () => {
-      const notes = await client.getNotes3();
-      expect(notes).toEqual([testNotes[0]]);
-      expect(notes.every(note => note instanceof TestNote)).toBe(true);
-    });
-
-    it('calls an RPC function with a default parameter with explicit undefined', async () => {
-      const notes = await client.getNotes3(undefined);
-      expect(notes).toEqual([testNotes[0]]);
-      expect(notes.every(note => note instanceof TestNote)).toBe(true);
-    });
-
-    it('calls an RPC function overriding the default parameter', async () => {
-      const notes = await client.getNotes3(5);
-      expect(notes).toEqual(testNotes);
-      expect(notes.every(note => note instanceof TestNote)).toBe(true);
-    });
-
     it('calls an RPC function with incorrect parameter type', async () => {
       await expect(() => client.getNote('foo' as any)).rejects.toThrow('Expected number, received string');
     });
@@ -99,21 +59,11 @@ describe('JsonRpc integration', () => {
       expect(testState.notes).toEqual([]);
     });
 
-    it('calls an RPC function that returns a primitive object with a bigint', async () => {
+    it('calls an RPC function that returns a primitive object and a bigint', async () => {
       const status = await client.getStatus();
       expect(status).toEqual({ status: 'ok', count: 2n });
     });
 
-    it('calls an RPC function that returns a tuple', async () => {
-      const status = await client.getTuple();
-      expect(status).toEqual(['a', undefined, 1]);
-    });
-
-    it('calls an RPC function that returns undefined', async () => {
-      const note = await client.getNote(10);
-      expect(note).toBeUndefined();
-    });
-
     it('calls an RPC function that throws an error', async () => {
       await expect(() => client.fail()).rejects.toThrow('Test state failed');
     });
diff --git a/yarn-project/foundation/src/json-rpc/test/integration.ts b/yarn-project/foundation/src/json-rpc/test/integration.ts
deleted file mode 100644
index ac7e6548a77..00000000000
--- a/yarn-project/foundation/src/json-rpc/test/integration.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type http from 'http';
-
-import { type ApiSchemaFor } from '../../schemas/api.js';
-import { makeFetch } from '../client/fetch.js';
-import { createSafeJsonRpcClient } from '../client/safe_json_rpc_client.js';
-import { startHttpRpcServer } from '../server/safe_json_rpc_server.js';
-import { type SafeJsonRpcServer, createSafeJsonRpcServer } from '../server/safe_json_rpc_server.js';
-
-export type JsonRpcTestContext<T extends object> = {
-  server: SafeJsonRpcServer;
-  client: T;
-  httpServer: http.Server & { port: number };
-};
-
-export async function createJsonRpcTestSetup<T extends object>(
-  handler: T,
-  schema: ApiSchemaFor<T>,
-): Promise<JsonRpcTestContext<T>> {
-  const server = createSafeJsonRpcServer<T>(handler, schema);
-  const httpServer = await startHttpRpcServer(server, { host: '127.0.0.1' });
-  const noRetryFetch = makeFetch([], true);
-  const client = createSafeJsonRpcClient<T>(`http://127.0.0.1:${httpServer.port}`, schema, false, false, noRetryFetch);
-  return { server, client, httpServer };
-}
diff --git a/yarn-project/foundation/src/schemas/api.ts b/yarn-project/foundation/src/schemas/api.ts
index b57fefb761e..a2e77bf970f 100644
--- a/yarn-project/foundation/src/schemas/api.ts
+++ b/yarn-project/foundation/src/schemas/api.ts
@@ -1,33 +1,16 @@
 import { type z } from 'zod';
 
-import { type ZodNullableOptional } from './utils.js';
-
-// Forces usage of ZodNullableOptional in parameters schemas so we properly accept nulls for optional parameters.
-type ZodParameterTypeFor<T> = undefined extends T
-  ? ZodNullableOptional<z.ZodType<T, z.ZodTypeDef, any>>
-  : z.ZodType<T, z.ZodTypeDef, any>;
-
-type ZodReturnTypeFor<T> = z.ZodType<T, z.ZodTypeDef, any>;
-
-// This monstruosity is used for mapping function arguments to their schema representation.
-// The complexity is required to satisfy ZodTuple which requires a fixed length tuple and
-// has a very annoying type of [] | [ZodTypeAny, ...ZodTypeAny], and most types fail to match
-// the second option. While a purely recursive approach works, it fails when trying to deal
-// with optional arguments (ie optional items in the tuple), and ts does not really like them
-// during a recursion and fails with infinite stack depth.
-// This type appears to satisfy everyone. Everyone but me.
-type ZodMapParameterTypes<T> = T extends []
+type ZodFor<T> = z.ZodType<T, z.ZodTypeDef, any>;
+type ZodMapTypes<T> = T extends []
   ? []
-  : T extends [item: infer Head, ...infer Rest]
-  ? [ZodParameterTypeFor<Head>, ...{ [K in keyof Rest]: ZodParameterTypeFor<Rest[K]> }]
-  : T extends [item?: infer Head, ...infer Rest]
-  ? [ZodNullableOptional<ZodParameterTypeFor<Head>>, ...{ [K in keyof Rest]: ZodParameterTypeFor<Rest[K]> }]
+  : T extends [infer Head, ...infer Rest]
+  ? [ZodFor<Head>, ...ZodMapTypes<Rest>]
   : never;
 
 /** Maps all functions in an interface to their schema representation. */
 export type ApiSchemaFor<T> = {
   [K in keyof T]: T[K] extends (...args: infer Args) => Promise<infer Ret>
-    ? z.ZodFunction<z.ZodTuple<ZodMapParameterTypes<Args>, z.ZodUnknown>, ZodReturnTypeFor<Ret>>
+    ? z.ZodFunction<z.ZodTuple<ZodMapTypes<Args>, z.ZodUnknown>, ZodFor<Ret>>
     : never;
 };
 
diff --git a/yarn-project/foundation/src/schemas/index.ts b/yarn-project/foundation/src/schemas/index.ts
index e3615c9eaa6..a3b3c1a8610 100644
--- a/yarn-project/foundation/src/schemas/index.ts
+++ b/yarn-project/foundation/src/schemas/index.ts
@@ -1,5 +1,3 @@
 export * from './api.js';
 export * from './parse.js';
 export * from './schemas.js';
-export * from './utils.js';
-export * from './types.js';
diff --git a/yarn-project/foundation/src/schemas/parse.test.ts b/yarn-project/foundation/src/schemas/parse.test.ts
deleted file mode 100644
index 3226c6c6e89..00000000000
--- a/yarn-project/foundation/src/schemas/parse.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { z } from 'zod';
-
-import { jsonStringify } from '../json-rpc/convert.js';
-import { parseWithOptionals } from './parse.js';
-import { optional } from './utils.js';
-
-describe('parse', () => {
-  it('parses arguments without optionals', () => {
-    expect(parseWithOptionals([1, 2], z.tuple([z.number(), z.number()]))).toEqual([1, 2]);
-  });
-
-  it('handles providing all optional arguments', () => {
-    const schema = z.tuple([z.number(), z.number().optional(), z.number().optional()]);
-    expect(parseWithOptionals([1, 2, 3], schema)).toEqual([1, 2, 3]);
-  });
-
-  it('handles some missing optional arguments', () => {
-    const schema = z.tuple([z.number(), z.number().optional(), z.number().optional()]);
-    expect(parseWithOptionals([1, 2], schema)).toEqual([1, 2, undefined]);
-  });
-
-  it('handles all missing optional arguments', () => {
-    const schema = z.tuple([z.number(), z.number().optional(), z.number().optional()]);
-    expect(parseWithOptionals([1], schema)).toEqual([1, undefined, undefined]);
-  });
-
-  it('handles no arguments if all optional', () => {
-    const schema = z.tuple([z.number().optional(), z.number().optional(), z.number().optional()]);
-    expect(parseWithOptionals([], schema)).toEqual([undefined, undefined, undefined]);
-  });
-
-  it('fails if a required argument is missing', () => {
-    const schema = z.tuple([z.number(), z.number(), z.number().optional()]);
-    expect(() => parseWithOptionals([1], schema)).toThrow();
-  });
-
-  it('handles coerced bigint', () => {
-    const schema = z.tuple([z.coerce.bigint()]);
-    expect(parseWithOptionals(['1'], schema)).toEqual([1n]);
-  });
-
-  it('handles coerced optional bigint', () => {
-    const schema = z.tuple([z.coerce.bigint().optional()]);
-    expect(parseWithOptionals(['1'], schema)).toEqual([1n]);
-  });
-
-  it('handles missing coerced optional bigint', () => {
-    const schema = z.tuple([z.coerce.bigint().optional()]);
-    expect(parseWithOptionals([], schema)).toEqual([undefined]);
-  });
-
-  it('fails on missing coerced required bigint', () => {
-    const schema = z.tuple([z.coerce.bigint()]);
-    expect(() => parseWithOptionals([], schema)).toThrow();
-  });
-
-  it('handles explicit undefined values', () => {
-    const schema = z.tuple([z.number(), optional(z.number())]);
-    const parsed = JSON.parse(jsonStringify([3, undefined]));
-    expect(parseWithOptionals(parsed, schema)).toEqual([3, undefined]);
-  });
-});
diff --git a/yarn-project/foundation/src/schemas/parse.ts b/yarn-project/foundation/src/schemas/parse.ts
index 6a3e7d11a8b..d49a690ec13 100644
--- a/yarn-project/foundation/src/schemas/parse.ts
+++ b/yarn-project/foundation/src/schemas/parse.ts
@@ -1,29 +1,6 @@
 import { z } from 'zod';
 
-import { times } from '../collection/array.js';
-
 /** Parses the given arguments using a tuple from the provided schemas. */
 export function parse<T extends [] | [z.ZodTypeAny, ...z.ZodTypeAny[]]>(args: IArguments, ...schemas: T) {
   return z.tuple(schemas).parse(args);
 }
-
-/**
- * Parses the given arguments against a tuple, allowing empty for optional items.
- * @dev Zod doesn't like tuplues with optional items. See https://github.com/colinhacks/zod/discussions/949.
- */
-export function parseWithOptionals<T extends z.AnyZodTuple>(args: any[], schema: T): T['_output'] {
-  const missingCount = schema.items.length - args.length;
-  const optionalCount = schema.items.filter(isOptional).length;
-  const toParse =
-    missingCount > 0 && missingCount <= optionalCount ? args.concat(times(missingCount, () => undefined)) : args;
-  return schema.parse(toParse);
-}
-
-function isOptional(schema: z.ZodTypeAny) {
-  try {
-    return schema.isOptional();
-  } catch (err) {
-    // See https://github.com/colinhacks/zod/issues/1911
-    return schema._def.typeName === 'ZodOptional';
-  }
-}
diff --git a/yarn-project/foundation/src/schemas/schemas.test.ts b/yarn-project/foundation/src/schemas/schemas.test.ts
deleted file mode 100644
index 2ffe4f26960..00000000000
--- a/yarn-project/foundation/src/schemas/schemas.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ZodError } from 'zod';
-
-import { schemas } from './schemas.js';
-
-describe('schemas', () => {
-  describe('bigint', () => {
-    it('parses from string', () => {
-      expect(schemas.BigInt.parse('123')).toEqual(123n);
-    });
-
-    it('parses from number', () => {
-      expect(schemas.BigInt.parse(123)).toEqual(123n);
-    });
-
-    it('parses from hex string', () => {
-      expect(schemas.BigInt.parse('0x123')).toEqual(0x123n);
-    });
-
-    it('fails when parsing null', () => {
-      expect(() => schemas.BigInt.parse(null)).toThrow(expect.any(ZodError));
-    });
-
-    it('fails when parsing undefined', () => {
-      expect(() => schemas.BigInt.parse(undefined)).toThrow(expect.any(ZodError));
-    });
-
-    it('fails when parsing an object', () => {
-      expect(() => schemas.BigInt.parse({ a: 10 })).toThrow(expect.any(ZodError));
-    });
-
-    it.skip('fails when parsing text', () => {
-      // TODO(palla/schemas): We'd need to regex check all valid bigint inputs
-      expect(() => schemas.BigInt.parse('foo')).toThrow(expect.any(ZodError));
-    });
-  });
-});
diff --git a/yarn-project/foundation/src/schemas/schemas.ts b/yarn-project/foundation/src/schemas/schemas.ts
index eca83d8bcd0..2a4a086d9c8 100644
--- a/yarn-project/foundation/src/schemas/schemas.ts
+++ b/yarn-project/foundation/src/schemas/schemas.ts
@@ -1,56 +1,23 @@
 import { z } from 'zod';
 
-import { type AbiDecoded } from '../abi/decoder.js';
-import { EventSelector } from '../abi/event_selector.js';
-import { FunctionSelector } from '../abi/function_selector.js';
-import { NoteSelector } from '../abi/note_selector.js';
-import { AztecAddress } from '../aztec-address/index.js';
-import { Buffer32 } from '../buffer/buffer32.js';
 import { EthAddress } from '../eth-address/index.js';
 import { Signature } from '../eth-signature/eth_signature.js';
-import { Fq, Fr } from '../fields/fields.js';
-import { Point } from '../fields/point.js';
-import { hasHexPrefix, isHex, withoutHexPrefix } from '../string/index.js';
-import { type ZodFor } from './types.js';
-import { hexSchema, maybeStructuredStringSchemaFor } from './utils.js';
+import { hasHexPrefix } from '../string/index.js';
 
-const FrSchema = maybeStructuredStringSchemaFor('Fr', Fr, isHex);
-const FqSchema = maybeStructuredStringSchemaFor('Fq', Fq, isHex);
-
-/** Validation schemas for common types. Every schema must match its toJSON. */
+/**
+ * Validation schemas for common types. Every schema should match its type toJSON.
+ */
 export const schemas = {
-  /** Accepts both a 0x string and a structured `{ type: EthAddress, value: '0x...' }` */
-  EthAddress: maybeStructuredStringSchemaFor('EthAddress', EthAddress, EthAddress.isAddress),
-
-  /** Accepts both a 0x string and a structured `{ type: AztecAddress, value: '0x...' }` */
-  AztecAddress: maybeStructuredStringSchemaFor('AztecAddress', AztecAddress, AztecAddress.isAddress),
-
-  /** Accepts both a 0x string and a structured type. */
-  FunctionSelector: maybeStructuredStringSchemaFor('FunctionSelector', FunctionSelector),
-
-  /** Accepts both a 0x string and a structured type. */
-  NoteSelector: maybeStructuredStringSchemaFor('NoteSelector', NoteSelector),
-
-  /** Accepts both a 0x string and a structured type. */
-  EventSelector: maybeStructuredStringSchemaFor('EventSelector', EventSelector),
-
-  /** Field element. Accepts a 0x prefixed hex string or a structured type. */
-  Fr: FrSchema,
-
-  /** Field element. Accepts a 0x prefixed hex string or a structured type. */
-  Fq: FqSchema,
-
-  /** Point. Serialized as 0x prefixed string or a type. */
-  Point: z
-    .object({
-      x: FrSchema,
-      y: FrSchema,
-      isInfinite: z.boolean().optional(),
-    })
-    .or(hexSchema)
-    .transform(value =>
-      typeof value === 'string' ? Point.fromString(value) : new Point(value.x, value.y, value.isInfinite ?? false),
-    ),
+  /** Accepts both a 0x string and a structured { type: EthAddress, value: '0x...' } */
+  EthAddress: z
+    .union([
+      z.string().refine(EthAddress.isAddress, 'Not a valid Ethereum address'),
+      z.object({
+        type: z.literal('EthAddress'),
+        value: z.string().refine(EthAddress.isAddress, 'Not a valid Ethereum address'),
+      }),
+    ])
+    .transform(input => EthAddress.fromString(typeof input === 'string' ? input : input.value)),
 
   /** Accepts a 0x string */
   Signature: z
@@ -60,25 +27,13 @@ export const schemas = {
     .transform(Signature.from0xString),
 
   /** Coerces any input to bigint */
-  BigInt: z.union([z.bigint(), z.number(), z.string()]).pipe(z.coerce.bigint()),
+  BigInt: z.coerce.bigint(),
 
   /** Coerces any input to integer number */
-  Integer: z.union([z.bigint(), z.number(), z.string()]).pipe(z.coerce.number().int()),
-
-  /** Coerces input to UInt32 */
-  UInt32: z.union([z.bigint(), z.number(), z.string()]).pipe(
-    z.coerce
-      .number()
-      .int()
-      .min(0)
-      .max(2 ** 32 - 1),
-  ),
+  Integer: z.coerce.number().int(),
 
-  /** Accepts a hex string as a Buffer32 type */
-  Buffer32: z.string().refine(isHex, 'Not a valid hex string').transform(Buffer32.fromString),
-
-  /** Accepts a base64 string or a structured `{ type: 'Buffer', data: [byte, byte...] }` as a buffer */
-  BufferB64: z.union([
+  /** Accepts a base64 string or a structured { type: 'Buffer', data: [byte, byte...] } */
+  Buffer: z.union([
     z
       .string()
       .base64()
@@ -90,22 +45,4 @@ export const schemas = {
       })
       .transform(({ data }) => Buffer.from(data)),
   ]),
-
-  /** Accepts a hex string with optional 0x prefix as a buffer */
-  BufferHex: z
-    .string()
-    .refine(isHex, 'Not a valid hex string')
-    .transform(withoutHexPrefix)
-    .transform(data => Buffer.from(data, 'hex')),
-
-  /** Hex string with an optional 0x prefix, which gets removed as part of the parsing */
-  HexString: hexSchema,
 };
-
-export const AbiDecodedSchema: ZodFor<AbiDecoded> = z.union([
-  schemas.BigInt,
-  z.boolean(),
-  schemas.AztecAddress,
-  z.array(z.lazy(() => AbiDecodedSchema)),
-  z.record(z.lazy(() => AbiDecodedSchema)),
-]);
diff --git a/yarn-project/foundation/src/schemas/types.ts b/yarn-project/foundation/src/schemas/types.ts
deleted file mode 100644
index 36621b6bc1d..00000000000
--- a/yarn-project/foundation/src/schemas/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { type ZodType } from 'zod';
-
-export type ZodFor<T> = ZodType<T, any, any>;
diff --git a/yarn-project/foundation/src/schemas/utils.ts b/yarn-project/foundation/src/schemas/utils.ts
deleted file mode 100644
index 412c49bc967..00000000000
--- a/yarn-project/foundation/src/schemas/utils.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import {
-  OK,
-  type ParseInput,
-  type ParseReturnType,
-  ZodFirstPartyTypeKind,
-  ZodOptional,
-  ZodParsedType,
-  type ZodType,
-  type ZodTypeAny,
-  z,
-} from 'zod';
-
-import { isHex, withoutHexPrefix } from '../string/index.js';
-import { type ZodFor } from './types.js';
-
-export const hexSchema = z.string().refine(isHex, 'Not a valid hex string').transform(withoutHexPrefix);
-
-export class ZodNullableOptional<T extends ZodTypeAny> extends ZodOptional<T> {
-  _isNullableOptional = true;
-
-  override _parse(input: ParseInput): ParseReturnType<this['_output']> {
-    const parsedType = this._getType(input);
-    if (parsedType === ZodParsedType.undefined || parsedType === ZodParsedType.null) {
-      return OK(undefined);
-    }
-    return this._def.innerType._parse(input);
-  }
-
-  static override create<T extends ZodTypeAny>(type: T): ZodNullableOptional<T> {
-    return new ZodNullableOptional({
-      innerType: type,
-      typeName: ZodFirstPartyTypeKind.ZodOptional,
-    }) as any;
-  }
-}
-
-/**
- * Declares a parameter as optional. Use this over z.optional in order to accept nulls as undefineds.
- * This is required as JSON does not have an undefined type, and null is used to represent it, so we
- * need to convert nulls to undefineds as we parse.
- */
-export function optional<T extends ZodTypeAny>(schema: T) {
-  return ZodNullableOptional.create(schema);
-}
-
-/**
- * Creates a schema that accepts a hex string and uses it to hydrate an instance.
- * @param klazz - Class that implements either fromString or fromBuffer.
- * @returns A schema for the class.
- */
-export function hexSchemaFor<TClass extends { fromString(str: string): any } | { fromBuffer(buf: Buffer): any }>(
-  klazz: TClass,
-): ZodType<
-  TClass extends { fromString(str: string): infer TInstance } | { fromBuffer(buf: Buffer): infer TInstance }
-    ? TInstance
-    : never,
-  any,
-  string
-> {
-  return 'fromString' in klazz
-    ? hexSchema.transform(klazz.fromString.bind(klazz))
-    : hexSchema.transform(str => Buffer.from(str, 'hex')).transform(klazz.fromBuffer.bind(klazz));
-}
-
-// TODO(palla/schemas): Delete this class once all serialization of the type { type: string, value: string } are removed.
-export function maybeStructuredStringSchemaFor<TClass extends { fromString(str: string): any }>(
-  name: string,
-  klazz: TClass,
-  refinement?: (input: string) => boolean,
-): ZodFor<TClass extends { fromString(str: string): infer TInstance } ? TInstance : never> {
-  const stringSchema = refinement ? z.string().refine(refinement, `Not a valid ${name}`) : z.string();
-  return z
-    .union([stringSchema, z.object({ type: z.literal(name), value: stringSchema })])
-    .transform(input => klazz.fromString(typeof input === 'string' ? input : input.value));
-}
-
-/** Creates a schema for a js Map type that matches the serialization used in jsonStringify. */
-export function mapSchema<TKey, TValue>(key: ZodFor<TKey>, value: ZodFor<TValue>): ZodFor<Map<TKey, TValue>> {
-  return z.array(z.tuple([key, value])).transform(entries => new Map(entries));
-}
-
-/** Creates a schema for a js Set type that matches the serialization used in jsonStringify. */
-export function setSchema<T>(value: ZodFor<T>): ZodFor<Set<T>> {
-  return z.array(value).transform(entries => new Set(entries));
-}
diff --git a/yarn-project/foundation/src/string/index.ts b/yarn-project/foundation/src/string/index.ts
index 0d1fd95cb07..5b8ce4f0fbd 100644
--- a/yarn-project/foundation/src/string/index.ts
+++ b/yarn-project/foundation/src/string/index.ts
@@ -1,15 +1,3 @@
 export function hasHexPrefix(str: string): str is `0x${string}` {
   return str.startsWith('0x');
 }
-
-export function withoutHexPrefix(str: string): string {
-  return hasHexPrefix(str) ? str.slice(2) : str;
-}
-
-export function isHex(str: string): boolean {
-  return /^(0x)?[0-9a-fA-F]*$/.test(str);
-}
-
-export function hexToBuffer(str: string): Buffer {
-  return Buffer.from(withoutHexPrefix(str), 'hex');
-}
diff --git a/yarn-project/foundation/src/types/index.ts b/yarn-project/foundation/src/types/index.ts
index 16be25668c9..05b4a76a785 100644
--- a/yarn-project/foundation/src/types/index.ts
+++ b/yarn-project/foundation/src/types/index.ts
@@ -20,6 +20,3 @@ export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 export function unfreeze<T>(obj: T): Writeable<T> {
   return obj as Writeable<T>;
 }
-
-/** Maybe exists, maybe not. */
-export type Maybe<T extends object> = T | unknown;
diff --git a/yarn-project/ivc-integration/src/avm_integration.test.ts b/yarn-project/ivc-integration/src/avm_integration.test.ts
index 7e65402008b..400f4b5965d 100644
--- a/yarn-project/ivc-integration/src/avm_integration.test.ts
+++ b/yarn-project/ivc-integration/src/avm_integration.test.ts
@@ -9,7 +9,6 @@ import {
 import {
   AvmCircuitInputs,
   AvmCircuitPublicInputs,
-  AztecAddress,
   Gas,
   GlobalVariables,
   type PublicFunction,
@@ -173,7 +172,7 @@ const proveAvmTestContract = async (
   const instanceGet = new SerializableContractInstance({
     version: 1,
     salt: new Fr(0x123),
-    deployer: AztecAddress.fromNumber(0x456),
+    deployer: new Fr(0x456),
     contractClassId: new Fr(0x789),
     initializationHash: new Fr(0x101112),
     publicKeys: new PublicKeys(
diff --git a/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts b/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts
index 43ae9c3aaf9..33fbd080831 100644
--- a/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts
+++ b/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts
@@ -15,7 +15,7 @@ export function buildProtocolContractTree(contracts: { address: AztecAddress; le
   const leaves = new Array(2 ** PROTOCOL_CONTRACT_TREE_HEIGHT).fill(Buffer.alloc(32));
 
   for (const contract of contracts) {
-    const index = contract.address.toField().toNumber();
+    const index = contract.address.toNumber();
     leaves[index] = contract.leaf;
   }
 
diff --git a/yarn-project/protocol-contracts/src/protocol_contract_data.ts b/yarn-project/protocol-contracts/src/protocol_contract_data.ts
index 66c91d65f91..f529cc87b32 100644
--- a/yarn-project/protocol-contracts/src/protocol_contract_data.ts
+++ b/yarn-project/protocol-contracts/src/protocol_contract_data.ts
@@ -53,11 +53,11 @@ export const ProtocolContractLeaf = {
   AuthRegistry: Fr.fromString('0x295f52c40413b660d817ceea60d07154322a035d28d18927b2ca84e8ec3b2115'),
   ContractInstanceDeployer: Fr.fromString('0x00113ad28d270a493266484d733f73a56b98c74b4e2cdf9fc040b5d3a6560f2d'),
   ContractClassRegisterer: Fr.fromString('0x1d591819cccc4031cc18a7865321c54f6344ae42a205782874d1f72648df2034'),
-  MultiCallEntrypoint: Fr.fromString('0x2b8848426e8142d658de233943cf5092d5a265bb69be51760e26827b806558a5'),
+  MultiCallEntrypoint: Fr.fromString('0x20a2e7e882045d27b3aa9e36188b8e45483b3c11652d4a46406699e5eb4efa9b'),
   FeeJuice: Fr.fromString('0x2ed38c200a958d2364c9a8c6f7475cb53e75f602bb7a873b81668c5e431baeb7'),
   Router: Fr.fromString('0x22ec69dd15cc4f9d7272fa362aa86212797ff2c73f33975f78f9d0289322d401'),
 };
 
 export const protocolContractTreeRoot = Fr.fromString(
-  '0x076133fdf0e7944b748650bbc5f5d154ddbe6b97fa93219f09e42c7d00b03532',
+  '0x2ba7b6e2fca56bb4abd15d3ef75ff0fb84c9c41588f9d0947068051297d59b67',
 );
diff --git a/yarn-project/protocol-contracts/src/protocol_contract_tree.ts b/yarn-project/protocol-contracts/src/protocol_contract_tree.ts
index 6a90c995063..cc69eed7c53 100644
--- a/yarn-project/protocol-contracts/src/protocol_contract_tree.ts
+++ b/yarn-project/protocol-contracts/src/protocol_contract_tree.ts
@@ -19,7 +19,7 @@ function getTree() {
 
 export function getProtocolContractSiblingPath(address: AztecAddress) {
   const tree = getTree();
-  const index = address.toField().toNumber();
+  const index = address.toNumber();
   return assertLength<Fr, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>(
     tree.getSiblingPath(index).map(buf => new Fr(buf)),
     PROTOCOL_CONTRACT_TREE_HEIGHT,
diff --git a/yarn-project/protocol-contracts/src/scripts/generate_data.ts b/yarn-project/protocol-contracts/src/scripts/generate_data.ts
index 6aefff993d4..0d226bcc99f 100644
--- a/yarn-project/protocol-contracts/src/scripts/generate_data.ts
+++ b/yarn-project/protocol-contracts/src/scripts/generate_data.ts
@@ -1,5 +1,4 @@
 import {
-  AztecAddress,
   CANONICAL_AUTH_REGISTRY_ADDRESS,
   DEPLOYER_CONTRACT_ADDRESS,
   FEE_JUICE_ADDRESS,
@@ -65,10 +64,7 @@ function computeContractLeaf(artifact: NoirCompiledContract) {
 }
 
 function computeRoot(names: string[], leaves: Fr[]) {
-  const data = names.map((name, i) => ({
-    address: new AztecAddress(new Fr(contractAddressMapping[name])),
-    leaf: leaves[i],
-  }));
+  const data = names.map((name, i) => ({ address: new Fr(contractAddressMapping[name]), leaf: leaves[i] }));
   const tree = buildProtocolContractTree(data);
   return Fr.fromBuffer(tree.root);
 }
@@ -181,7 +177,7 @@ async function main() {
     const destName = destNames[i];
     const artifact = await copyArtifact(srcName, destName);
     await generateDeclarationFile(destName);
-    leaves.push(computeContractLeaf(artifact).toField());
+    leaves.push(computeContractLeaf(artifact));
   }
 
   await generateOutputFile(destNames, leaves);
diff --git a/yarn-project/prover-client/src/prover-agent/agent-queue-rpc-integration.test.ts b/yarn-project/prover-client/src/prover-agent/agent-queue-rpc-integration.test.ts
index fe22d723495..326d91124d5 100644
--- a/yarn-project/prover-client/src/prover-agent/agent-queue-rpc-integration.test.ts
+++ b/yarn-project/prover-client/src/prover-agent/agent-queue-rpc-integration.test.ts
@@ -1,4 +1,4 @@
-import { ProvingJobSourceSchema, type ServerCircuitProver } from '@aztec/circuit-types';
+import { type ServerCircuitProver } from '@aztec/circuit-types';
 import { ClientIvcProof, Fr, PrivateKernelEmptyInputData, TubeInputs } from '@aztec/circuits.js';
 import {
   makeAvmCircuitInputs,
@@ -13,8 +13,7 @@ import {
   makeRootParityInputs,
   makeRootRollupInputs,
 } from '@aztec/circuits.js/testing';
-import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
-import { type SafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { type JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
 import getPort from 'get-port';
@@ -22,11 +21,11 @@ import getPort from 'get-port';
 import { MockProver } from '../test/mock_prover.js';
 import { MemoryProvingQueue } from './memory-proving-queue.js';
 import { ProverAgent } from './prover-agent.js';
-import { createProvingJobSourceServer } from './rpc.js';
+import { createProvingJobSourceClient, createProvingJobSourceServer } from './rpc.js';
 
 describe('Prover agent <-> queue integration', () => {
   let queue: MemoryProvingQueue;
-  let queueRpcServer: SafeJsonRpcServer;
+  let queueRpcServer: JsonRpcServer;
   let agent: ProverAgent;
   let prover: ServerCircuitProver;
 
@@ -60,7 +59,7 @@ describe('Prover agent <-> queue integration', () => {
     queueRpcServer.start(port);
 
     agent = new ProverAgent(prover, 1, 10);
-    const queueRpcClient = createSafeJsonRpcClient(`http://127.0.0.1:${port}`, ProvingJobSourceSchema);
+    const queueRpcClient = createProvingJobSourceClient(`http://127.0.0.1:${port}`);
     agent.start(queueRpcClient);
   });
 
diff --git a/yarn-project/prover-client/src/prover-agent/memory-proving-queue.test.ts b/yarn-project/prover-client/src/prover-agent/memory-proving-queue.test.ts
index 0e59ceda71e..ebd86cf4a0c 100644
--- a/yarn-project/prover-client/src/prover-agent/memory-proving-queue.test.ts
+++ b/yarn-project/prover-client/src/prover-agent/memory-proving-queue.test.ts
@@ -89,10 +89,7 @@ describe('MemoryProvingQueue', () => {
     const proof = makeRecursiveProof<typeof RECURSIVE_PROOF_LENGTH>(RECURSIVE_PROOF_LENGTH);
     const vk = VerificationKeyAsFields.makeFakeHonk();
     const vkPath = makeTuple(VK_TREE_HEIGHT, Fr.zero);
-    await queue.resolveProvingJob(job!.id, {
-      type: ProvingRequestType.BASE_PARITY,
-      result: new RootParityInput(proof, vk, vkPath, publicInputs),
-    });
+    await queue.resolveProvingJob(job!.id, new RootParityInput(proof, vk, vkPath, publicInputs));
     await expect(promise).resolves.toEqual(new RootParityInput(proof, vk, vkPath, publicInputs));
   });
 
@@ -105,7 +102,7 @@ describe('MemoryProvingQueue', () => {
 
     const error = new Error('test error');
 
-    await queue.rejectProvingJob(job!.id, error.message);
+    await queue.rejectProvingJob(job!.id, error);
     await expect(queue.getProvingJob()).resolves.toEqual(job);
   });
 
@@ -113,9 +110,9 @@ describe('MemoryProvingQueue', () => {
     const promise = queue.getBaseParityProof(makeBaseParityInputs());
 
     const error = new Error('test error');
-    await queue.rejectProvingJob((await queue.getProvingJob())!.id, error.message);
-    await queue.rejectProvingJob((await queue.getProvingJob())!.id, error.message);
-    await queue.rejectProvingJob((await queue.getProvingJob())!.id, error.message);
+    await queue.rejectProvingJob((await queue.getProvingJob())!.id, error);
+    await queue.rejectProvingJob((await queue.getProvingJob())!.id, error);
+    await queue.rejectProvingJob((await queue.getProvingJob())!.id, error);
 
     await expect(promise).rejects.toEqual(error);
   });
@@ -152,7 +149,7 @@ describe('MemoryProvingQueue', () => {
       makeTuple(VK_TREE_HEIGHT, Fr.zero),
       makeParityPublicInputs(),
     );
-    await queue.resolveProvingJob(job!.id, { type: ProvingRequestType.BASE_PARITY, result: output });
+    await queue.resolveProvingJob(job!.id, output);
     await expect(promise).resolves.toEqual(output);
   });
 });
diff --git a/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts b/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts
index bbf9d3a4c70..03eb267be56 100644
--- a/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts
+++ b/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts
@@ -3,7 +3,7 @@ import {
   type ProvingJob,
   type ProvingJobSource,
   type ProvingRequest,
-  type ProvingRequestResultFor,
+  type ProvingRequestResult,
   ProvingRequestType,
   type PublicInputsAndRecursiveProof,
   type ServerCircuitProver,
@@ -42,7 +42,7 @@ import { type TelemetryClient } from '@aztec/telemetry-client';
 import { ProvingQueueMetrics } from './queue_metrics.js';
 
 type ProvingJobWithResolvers<T extends ProvingRequest = ProvingRequest> = ProvingJob<T> &
-  PromiseWithResolvers<ProvingRequestResultFor<T['type']>> & {
+  PromiseWithResolvers<ProvingRequestResult<T['type']>> & {
     signal?: AbortSignal;
     epochNumber?: number;
     attempts: number;
@@ -131,7 +131,7 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
     }
   }
 
-  resolveProvingJob<T extends ProvingRequestType>(jobId: string, result: ProvingRequestResultFor<T>): Promise<void> {
+  resolveProvingJob<T extends ProvingRequestType>(jobId: string, result: ProvingRequestResult<T>): Promise<void> {
     if (!this.runningPromise.isRunning()) {
       throw new Error('Proving queue is not running.');
     }
@@ -150,7 +150,7 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
     return Promise.resolve();
   }
 
-  rejectProvingJob(jobId: string, reason: string): Promise<void> {
+  rejectProvingJob(jobId: string, err: any): Promise<void> {
     if (!this.runningPromise.isRunning()) {
       throw new Error('Proving queue is not running.');
     }
@@ -171,7 +171,7 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
     if (job.attempts < MAX_RETRIES && job.request.type !== ProvingRequestType.PUBLIC_VM) {
       job.attempts++;
       this.log.warn(
-        `Job id=${job.id} type=${ProvingRequestType[job.request.type]} failed with error: ${reason}. Retry ${
+        `Job id=${job.id} type=${ProvingRequestType[job.request.type]} failed with error: ${err}. Retry ${
           job.attempts
         }/${MAX_RETRIES}`,
       );
@@ -181,8 +181,8 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
         job.request.type === ProvingRequestType.PUBLIC_VM && !process.env.AVM_PROVING_STRICT
           ? this.log.warn
           : this.log.error;
-      logFn(`Job id=${job.id} type=${ProvingRequestType[job.request.type]} failed with error: ${reason}`);
-      job.reject(new Error(reason));
+      logFn(`Job id=${job.id} type=${ProvingRequestType[job.request.type]} failed with error: ${err}`);
+      job.reject(err);
     }
     return Promise.resolve();
   }
@@ -228,12 +228,12 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
     request: T,
     signal?: AbortSignal,
     epochNumber?: number,
-  ): Promise<ProvingRequestResultFor<T['type']>['result']> {
+  ): Promise<ProvingRequestResult<T['type']>> {
     if (!this.runningPromise.isRunning()) {
       return Promise.reject(new Error('Proving queue is not running.'));
     }
 
-    const { promise, resolve, reject } = promiseWithResolvers<ProvingRequestResultFor<T['type']>>();
+    const { promise, resolve, reject } = promiseWithResolvers<ProvingRequestResult<T['type']>>();
     const item: ProvingJobWithResolvers<T> = {
       id: this.generateId(),
       request,
@@ -261,7 +261,7 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
     const byteSize = serializeToBuffer(item.request.inputs).length;
     this.metrics.recordNewJob(item.request.type, byteSize);
 
-    return promise.then(({ result }) => result);
+    return promise;
   }
 
   getEmptyPrivateKernelProof(
diff --git a/yarn-project/prover-client/src/prover-agent/prover-agent.ts b/yarn-project/prover-client/src/prover-agent/prover-agent.ts
index 50c1733652c..9612830020c 100644
--- a/yarn-project/prover-client/src/prover-agent/prover-agent.ts
+++ b/yarn-project/prover-client/src/prover-agent/prover-agent.ts
@@ -1,23 +1,23 @@
 import {
-  type ProverAgentApi,
   type ProvingJob,
   type ProvingJobSource,
   type ProvingRequest,
-  type ProvingRequestResultFor,
+  type ProvingRequestResult,
   ProvingRequestType,
   type ServerCircuitProver,
-  makeProvingRequestResult,
 } from '@aztec/circuit-types';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { elapsed } from '@aztec/foundation/timer';
 
+import { ProvingError } from './proving-error.js';
+
 const PRINT_THRESHOLD_NS = 6e10; // 60 seconds
 
 /**
  * A helper class that encapsulates a circuit prover and connects it to a job source.
  */
-export class ProverAgent implements ProverAgentApi {
+export class ProverAgent {
   private inFlightPromises = new Map<
     string,
     {
@@ -38,12 +38,11 @@ export class ProverAgent implements ProverAgentApi {
     private log = createDebugLogger('aztec:prover-client:prover-agent'),
   ) {}
 
-  setMaxConcurrency(maxConcurrency: number): Promise<void> {
+  setMaxConcurrency(maxConcurrency: number): void {
     if (maxConcurrency < 1) {
       throw new Error('Concurrency must be at least 1');
     }
     this.maxConcurrency = maxConcurrency;
-    return Promise.resolve();
   }
 
   setCircuitProver(circuitProver: ServerCircuitProver): void {
@@ -51,17 +50,11 @@ export class ProverAgent implements ProverAgentApi {
   }
 
   isRunning() {
-    return Promise.resolve(this.#isRunning());
-  }
-
-  #isRunning() {
     return this.runningPromise?.isRunning() ?? false;
   }
 
-  getCurrentJobs(): Promise<{ id: string; type: string }[]> {
-    return Promise.resolve(
-      Array.from(this.inFlightPromises.values()).map(({ id, type }) => ({ id, type: ProvingRequestType[type] })),
-    );
+  getCurrentJobs(): { id: string; type: string }[] {
+    return Array.from(this.inFlightPromises.values()).map(({ id, type }) => ({ id, type: ProvingRequestType[type] }));
   }
 
   start(jobSource: ProvingJobSource): void {
@@ -130,17 +123,15 @@ export class ProverAgent implements ProverAgentApi {
     this.log.info('Agent stopped');
   }
 
-  private async work<TRequest extends ProvingRequest>(
-    jobSource: ProvingJobSource,
-    job: ProvingJob<TRequest>,
-  ): Promise<void> {
+  private async work(jobSource: ProvingJobSource, job: ProvingJob<ProvingRequest>): Promise<void> {
     try {
       this.log.debug(`Picked up proving job id=${job.id} type=${ProvingRequestType[job.request.type]}`);
-      const type: TRequest['type'] = job.request.type;
       const [time, result] = await elapsed(this.getProof(job.request));
-      if (this.#isRunning()) {
-        this.log.verbose(`Processed proving job id=${job.id} type=${ProvingRequestType[type]} duration=${time}ms`);
-        await jobSource.resolveProvingJob(job.id, makeProvingRequestResult(type, result));
+      if (this.isRunning()) {
+        this.log.verbose(
+          `Processed proving job id=${job.id} type=${ProvingRequestType[job.request.type]} duration=${time}ms`,
+        );
+        await jobSource.resolveProvingJob(job.id, result);
       } else {
         this.log.verbose(
           `Dropping proving job id=${job.id} type=${
@@ -150,24 +141,20 @@ export class ProverAgent implements ProverAgentApi {
       }
     } catch (err) {
       const type = ProvingRequestType[job.request.type];
-      if (this.#isRunning()) {
+      if (this.isRunning()) {
         if (job.request.type === ProvingRequestType.PUBLIC_VM && !process.env.AVM_PROVING_STRICT) {
           this.log.warn(`Expected error processing VM proving job id=${job.id} type=${type}: ${err}`);
         } else {
           this.log.error(`Error processing proving job id=${job.id} type=${type}: ${err}`, err);
         }
-        const reason = (err as any)?.message ?? String(err);
-        await jobSource.rejectProvingJob(job.id, reason);
+        await jobSource.rejectProvingJob(job.id, new ProvingError((err as any)?.message ?? String(err)));
       } else {
         this.log.verbose(`Dropping proving job id=${job.id} type=${type}: agent stopped: ${(err as any).stack || err}`);
       }
     }
   }
 
-  private getProof<TRequest extends ProvingRequest>(
-    request: TRequest,
-  ): Promise<ProvingRequestResultFor<TRequest['type']>['result']>;
-  private getProof(request: ProvingRequest): Promise<ProvingRequestResultFor<typeof type>['result']> {
+  private getProof(request: ProvingRequest): Promise<ProvingRequestResult<typeof type>> {
     const { type, inputs } = request;
     switch (type) {
       case ProvingRequestType.PUBLIC_VM: {
diff --git a/yarn-project/prover-client/src/prover-agent/rpc.ts b/yarn-project/prover-client/src/prover-agent/rpc.ts
index 0e1cdc91fd0..ff2a003db2a 100644
--- a/yarn-project/prover-client/src/prover-agent/rpc.ts
+++ b/yarn-project/prover-client/src/prover-agent/rpc.ts
@@ -1,22 +1,133 @@
-import { ProverAgentApiSchema, type ProvingJobSource, ProvingJobSourceSchema } from '@aztec/circuit-types';
-import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
-import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { type ProvingJobSource } from '@aztec/circuit-types';
+import {
+  AvmCircuitInputs,
+  AztecAddress,
+  BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
+  BlockMergeRollupInputs,
+  BlockRootOrBlockMergePublicInputs,
+  BlockRootRollupInputs,
+  EmptyBlockRootRollupInputs,
+  EthAddress,
+  Fr,
+  Header,
+  KernelCircuitPublicInputs,
+  MergeRollupInputs,
+  ParityPublicInputs,
+  PrivateBaseRollupInputs,
+  PrivateKernelEmptyInputData,
+  Proof,
+  PublicBaseRollupInputs,
+  PublicKernelCircuitPublicInputs,
+  RecursiveProof,
+  RootParityInput,
+  RootParityInputs,
+  RootRollupInputs,
+  RootRollupPublicInputs,
+  TubeInputs,
+  VMCircuitPublicInputs,
+  VerificationKeyData,
+} from '@aztec/circuits.js';
+import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 
 import { type ProverAgent } from './prover-agent.js';
+import { ProvingError } from './proving-error.js';
 
-export function createProvingJobSourceServer(queue: ProvingJobSource) {
-  return createSafeJsonRpcServer(queue, ProvingJobSourceSchema);
+export function createProvingJobSourceServer(queue: ProvingJobSource): JsonRpcServer {
+  return new JsonRpcServer(
+    queue,
+    {
+      AvmCircuitInputs,
+      BaseOrMergeRollupPublicInputs,
+      BaseParityInputs,
+      PrivateBaseRollupInputs,
+      PublicBaseRollupInputs,
+      Fr,
+      Header,
+      KernelCircuitPublicInputs,
+      MergeRollupInputs,
+      ParityPublicInputs,
+      Proof,
+      ProvingError,
+      PrivateKernelEmptyInputData,
+      VMCircuitPublicInputs,
+      PublicKernelCircuitPublicInputs,
+      RecursiveProof,
+      RootParityInput,
+      RootParityInputs,
+      RootRollupInputs,
+      RootRollupPublicInputs,
+      TubeInputs,
+      VerificationKeyData,
+      BlockRootOrBlockMergePublicInputs,
+      BlockMergeRollupInputs,
+      BlockRootRollupInputs,
+      EmptyBlockRootRollupInputs,
+    },
+    {},
+  );
 }
 
-export function createProvingJobSourceClient(url: string, fetch = makeFetch([1, 2, 3], false)): ProvingJobSource {
-  return createSafeJsonRpcClient(url, ProvingJobSourceSchema, false, 'provingJobSource', fetch);
+export function createProvingJobSourceClient(
+  url: string,
+  namespace?: string,
+  fetch = makeFetch([1, 2, 3], false),
+): ProvingJobSource {
+  return createJsonRpcClient(
+    url,
+    {
+      AvmCircuitInputs,
+      BaseOrMergeRollupPublicInputs,
+      BaseParityInputs,
+      PrivateBaseRollupInputs,
+      PublicBaseRollupInputs,
+      Fr,
+      Header,
+      KernelCircuitPublicInputs,
+      MergeRollupInputs,
+      ParityPublicInputs,
+      Proof,
+      ProvingError,
+      PrivateKernelEmptyInputData,
+      VMCircuitPublicInputs,
+      PublicKernelCircuitPublicInputs,
+      RecursiveProof,
+      RootParityInput,
+      RootParityInputs,
+      RootRollupPublicInputs,
+      RootRollupInputs,
+      TubeInputs,
+      VerificationKeyData,
+      BlockRootOrBlockMergePublicInputs,
+      BlockMergeRollupInputs,
+      BlockRootRollupInputs,
+      EmptyBlockRootRollupInputs,
+    },
+    {},
+    false,
+    namespace,
+    fetch,
+  ) as ProvingJobSource;
 }
 
 /**
  * Wrap a ProverAgent instance with a JSON RPC HTTP server.
- * @param agent - The Prover Agent
+ * @param node - The ProverNode
  * @returns An JSON-RPC HTTP server
  */
 export function createProverAgentRpcServer(agent: ProverAgent) {
-  return createSafeJsonRpcServer(agent, ProverAgentApiSchema);
+  const rpc = new JsonRpcServer(
+    agent,
+    {
+      AztecAddress,
+      EthAddress,
+      Fr,
+      Header,
+    },
+    {},
+    // disable methods
+    ['start', 'stop', 'setCircuitProver', 'work', 'getProof'],
+  );
+  return rpc;
 }
diff --git a/yarn-project/prover-client/src/tx-prover/tx-prover.ts b/yarn-project/prover-client/src/tx-prover/tx-prover.ts
index 7fc059d902a..89dc5ce0c7c 100644
--- a/yarn-project/prover-client/src/tx-prover/tx-prover.ts
+++ b/yarn-project/prover-client/src/tx-prover/tx-prover.ts
@@ -50,7 +50,7 @@ export class TxProver implements EpochProverManager {
     }
 
     if (this.config.proverAgentConcurrency !== newConfig.proverAgentConcurrency) {
-      await this.agent?.setMaxConcurrency(newConfig.proverAgentConcurrency);
+      this.agent?.setMaxConcurrency(newConfig.proverAgentConcurrency);
     }
 
     if (!this.config.realProofs && newConfig.realProofs) {
diff --git a/yarn-project/prover-node/src/http.ts b/yarn-project/prover-node/src/http.ts
index 0178e4be79d..940053a0eab 100644
--- a/yarn-project/prover-node/src/http.ts
+++ b/yarn-project/prover-node/src/http.ts
@@ -1,5 +1,5 @@
-import { ProverNodeApiSchema } from '@aztec/circuit-types';
-import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { AztecAddress, EthAddress, Fr, Header } from '@aztec/circuits.js';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 
 import { type ProverNode } from './prover-node.js';
 
@@ -9,5 +9,17 @@ import { type ProverNode } from './prover-node.js';
  * @returns An JSON-RPC HTTP server
  */
 export function createProverNodeRpcServer(node: ProverNode) {
-  return createSafeJsonRpcServer(node, ProverNodeApiSchema);
+  const rpc = new JsonRpcServer(
+    node,
+    {
+      AztecAddress,
+      EthAddress,
+      Fr,
+      Header,
+    },
+    {},
+    // disable methods not part of the AztecNode interface
+    ['start', 'stop', 'createProvingJob', 'work', 'getProver'],
+  );
+  return rpc;
 }
diff --git a/yarn-project/prover-node/src/prover-node.ts b/yarn-project/prover-node/src/prover-node.ts
index 1b090315c8f..e27489914ab 100644
--- a/yarn-project/prover-node/src/prover-node.ts
+++ b/yarn-project/prover-node/src/prover-node.ts
@@ -9,14 +9,11 @@ import {
   type MerkleTreeWriteOperations,
   type ProverCoordination,
   type ProverNodeApi,
-  type Service,
   type WorldStateSynchronizer,
-  tryStop,
 } from '@aztec/circuit-types';
 import { type ContractDataSource } from '@aztec/circuits.js';
 import { compact } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { type Maybe } from '@aztec/foundation/types';
 import { type L1Publisher } from '@aztec/sequencer-client';
 import { PublicProcessorFactory, type SimulationProvider } from '@aztec/simulator';
 import { type TelemetryClient } from '@aztec/telemetry-client';
@@ -51,11 +48,11 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
   constructor(
     private readonly prover: EpochProverManager,
     private readonly publisher: L1Publisher,
-    private readonly l2BlockSource: L2BlockSource & Maybe<Service>,
+    private readonly l2BlockSource: L2BlockSource,
     private readonly l1ToL2MessageSource: L1ToL2MessageSource,
     private readonly contractDataSource: ContractDataSource,
     private readonly worldState: WorldStateSynchronizer,
-    private readonly coordination: ProverCoordination & Maybe<Service>,
+    private readonly coordination: ProverCoordination,
     private readonly simulator: SimulationProvider,
     private readonly quoteProvider: QuoteProvider,
     private readonly quoteSigner: QuoteSigner,
@@ -169,11 +166,11 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
     await this.epochsMonitor.stop();
     await this.claimsMonitor.stop();
     await this.prover.stop();
-    await tryStop(this.l2BlockSource);
+    await this.l2BlockSource.stop();
     this.publisher.interrupt();
     await Promise.all(Array.from(this.jobs.values()).map(job => job.stop()));
     await this.worldState.stop();
-    await tryStop(this.coordination);
+    await this.coordination.stop();
     await this.telemetryClient.stop();
     this.log.info('Stopped ProverNode');
   }
diff --git a/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts b/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts
index 241ea97c919..0b7bc63a0a0 100644
--- a/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts
+++ b/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts
@@ -424,7 +424,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
       throw new Error('`needsResetTransientData` must be run before `needsSiloNoteHashes`.');
     }
 
-    const numNoteHashes = this.previousKernel.end.noteHashes.filter(n => !n.contractAddress.isZero()).length;
+    const numNoteHashes = this.previousKernel.end.noteHashes.filter(n => !n.contractAddress.isEmpty()).length;
     const numToSilo = Math.max(0, numNoteHashes - this.numTransientData);
     this.requestedDimensions.NOTE_HASH_SILOING_AMOUNT = numToSilo;
 
@@ -436,7 +436,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
       throw new Error('`needsResetTransientData` must be run before `needsSiloNullifiers`.');
     }
 
-    const numNullifiers = this.previousKernel.end.nullifiers.filter(n => !n.contractAddress.isZero()).length;
+    const numNullifiers = this.previousKernel.end.nullifiers.filter(n => !n.contractAddress.isEmpty()).length;
     const numToSilo = Math.max(0, numNullifiers - this.numTransientData);
     // Include the first nullifier if there's something to silo.
     // The reset circuit checks that capped_size must be greater than or equal to all non-empty nullifiers.
diff --git a/yarn-project/pxe/src/kernel_prover/test/test_circuit_prover.ts b/yarn-project/pxe/src/kernel_prover/test/test_circuit_prover.ts
index 48c69ddcb4b..019251d2093 100644
--- a/yarn-project/pxe/src/kernel_prover/test/test_circuit_prover.ts
+++ b/yarn-project/pxe/src/kernel_prover/test/test_circuit_prover.ts
@@ -122,9 +122,10 @@ export class TestPrivateKernelProver implements PrivateKernelProver {
     return Promise.resolve(appCircuitProofOutput);
   }
 
-  private makeEmptyKernelSimulateOutput<
-    PublicInputsType extends PrivateKernelTailCircuitPublicInputs | PrivateKernelCircuitPublicInputs,
-  >(publicInputs: PublicInputsType, circuitType: ProtocolArtifact) {
+  private makeEmptyKernelSimulateOutput<PublicInputsType>(
+    publicInputs: PublicInputsType,
+    circuitType: ProtocolArtifact,
+  ) {
     const kernelProofOutput: PrivateKernelSimulateOutput<PublicInputsType> = {
       publicInputs,
       verificationKey: ProtocolCircuitVks[circuitType].keyAsFields,
diff --git a/yarn-project/pxe/src/pxe_http/pxe_http_server.ts b/yarn-project/pxe/src/pxe_http/pxe_http_server.ts
index 03d9309fdf4..373b908a270 100644
--- a/yarn-project/pxe/src/pxe_http/pxe_http_server.ts
+++ b/yarn-project/pxe/src/pxe_http/pxe_http_server.ts
@@ -1,5 +1,39 @@
-import { type PXE, PXESchema } from '@aztec/circuit-types';
-import { createNamespacedSafeJsonRpcServer, createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import {
+  AuthWitness,
+  CompleteAddress,
+  CountedNoteLog,
+  CountedPublicExecutionRequest,
+  EncryptedL2Log,
+  EncryptedL2NoteLog,
+  EncryptedNoteL2BlockL2Logs,
+  EventMetadata,
+  ExtendedNote,
+  ExtendedUnencryptedL2Log,
+  L2Block,
+  LogId,
+  Note,
+  NullifierMembershipWitness,
+  type PXE,
+  PrivateExecutionResult,
+  SiblingPath,
+  Tx,
+  TxEffect,
+  TxExecutionRequest,
+  TxHash,
+  TxProvingResult,
+  TxReceipt,
+  TxSimulationResult,
+  UnencryptedL2BlockL2Logs,
+  UnencryptedL2Log,
+  UniqueNote,
+} from '@aztec/circuit-types';
+import { FunctionSelector, PrivateCircuitPublicInputs, PublicKeys } from '@aztec/circuits.js';
+import { EventSelector, NoteSelector } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { JsonRpcServer, createNamespacedJsonRpcServer } from '@aztec/foundation/json-rpc/server';
 
 import http from 'http';
 
@@ -7,8 +41,52 @@ import http from 'http';
  * Wraps an instance of Private eXecution Environment (PXE) implementation to a JSON RPC HTTP interface.
  * @returns A new instance of the HTTP server.
  */
-export function createPXERpcServer(pxeService: PXE) {
-  return createSafeJsonRpcServer(pxeService, PXESchema);
+export function createPXERpcServer(pxeService: PXE): JsonRpcServer {
+  return new JsonRpcServer(
+    pxeService,
+    {
+      AuthWitness,
+      AztecAddress,
+      Buffer32,
+      CompleteAddress,
+      EthAddress,
+      EventSelector,
+      ExtendedNote,
+      ExtendedUnencryptedL2Log,
+      Fr,
+      FunctionSelector,
+      GrumpkinScalar,
+      L2Block,
+      LogId,
+      Note,
+      Point,
+      PublicKeys,
+      SiblingPath,
+      TxEffect,
+      TxExecutionRequest,
+      TxHash,
+      UniqueNote,
+    },
+    {
+      CountedPublicExecutionRequest,
+      CountedNoteLog,
+      EncryptedL2Log,
+      EncryptedL2NoteLog,
+      EncryptedNoteL2BlockL2Logs,
+      EventMetadata,
+      NoteSelector,
+      NullifierMembershipWitness,
+      PrivateCircuitPublicInputs,
+      PrivateExecutionResult,
+      TxSimulationResult,
+      TxProvingResult,
+      Tx,
+      TxReceipt,
+      UnencryptedL2BlockL2Logs,
+      UnencryptedL2Log,
+    },
+    ['start', 'stop'],
+  );
 }
 
 /**
@@ -18,7 +96,8 @@ export function createPXERpcServer(pxeService: PXE) {
  * @returns A running http server.
  */
 export function startPXEHttpServer(pxeService: PXE, port: string | number): http.Server {
-  const rpcServer = createNamespacedSafeJsonRpcServer({ pxe: [pxeService, PXESchema] });
+  const pxeServer = createPXERpcServer(pxeService);
+  const rpcServer = createNamespacedJsonRpcServer([{ pxe: pxeServer }]);
 
   const app = rpcServer.getApp();
   const httpServer = http.createServer(app.callback());
diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts
index 08654326d1d..c46ee53537e 100644
--- a/yarn-project/pxe/src/pxe_service/pxe_service.ts
+++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts
@@ -2,7 +2,7 @@ import {
   type AuthWitness,
   type AztecNode,
   EventMetadata,
-  type EventMetadataDefinition,
+  EventType,
   type ExtendedNote,
   type FunctionCall,
   type GetUnencryptedLogsResponse,
@@ -50,6 +50,7 @@ import {
 import { computeNoteHashNonce, siloNullifier } from '@aztec/circuits.js/hash';
 import {
   type AbiDecoded,
+  type AbiType,
   type ContractArtifact,
   EventSelector,
   FunctionSelector,
@@ -861,18 +862,45 @@ export class PXEService implements PXE {
   }
 
   public async isContractInitialized(address: AztecAddress): Promise<boolean> {
-    const initNullifier = siloNullifier(address, address.toField());
+    const initNullifier = siloNullifier(address, address);
     return !!(await this.node.getNullifierMembershipWitness('latest', initNullifier));
   }
 
-  public async getEncryptedEvents<T>(
-    eventMetadataDef: EventMetadataDefinition,
+  public getEvents<T>(
+    type: EventType.Encrypted,
+    event: { eventSelector: EventSelector; abiType: AbiType; fieldNames: string[] },
     from: number,
     limit: number,
+    vpks: Point[],
+  ): Promise<T[]>;
+  public getEvents<T>(
+    type: EventType.Unencrypted,
+    event: { eventSelector: EventSelector; abiType: AbiType; fieldNames: string[] },
+    from: number,
+    limit: number,
+  ): Promise<T[]>;
+  public getEvents<T>(
+    type: EventType,
+    event: { eventSelector: EventSelector; abiType: AbiType; fieldNames: string[] },
+    from: number,
+    limit: number,
+    vpks: Point[] = [],
+  ): Promise<T[]> {
+    const eventMetadata = new EventMetadata<T>(type, event);
+    if (type.includes(EventType.Encrypted)) {
+      return this.getEncryptedEvents(from, limit, eventMetadata, vpks);
+    }
+
+    return this.getUnencryptedEvents(from, limit, eventMetadata);
+  }
+
+  async getEncryptedEvents<T>(
+    from: number,
+    limit: number,
+    eventMetadata: EventMetadata<T>,
     // TODO (#9272): Make this better, we should be able to only pass an address now
     vpks: Point[],
   ): Promise<T[]> {
-    const eventMetadata = new EventMetadata<T>(eventMetadataDef);
     if (vpks.length === 0) {
       throw new Error('Tried to get encrypted events without supplying any viewing public keys');
     }
@@ -936,8 +964,7 @@ export class PXEService implements PXE {
     return decodedEvents;
   }
 
-  async getUnencryptedEvents<T>(eventMetadataDef: EventMetadataDefinition, from: number, limit: number): Promise<T[]> {
-    const eventMetadata = new EventMetadata<T>(eventMetadataDef);
+  async getUnencryptedEvents<T>(from: number, limit: number, eventMetadata: EventMetadata<T>): Promise<T[]> {
     const { logs: unencryptedLogs } = await this.node.getUnencryptedLogs({
       fromBlock: from,
       toBlock: from + limit,
diff --git a/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts b/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts
index 619cb675adc..7a3161ab229 100644
--- a/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts
+++ b/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts
@@ -69,7 +69,7 @@ export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) =>
         pxe.registerContract({
           instance: {
             ...instance,
-            address: AztecAddress.random(),
+            address: Fr.random(),
           },
           artifact,
         }),
diff --git a/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts b/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts
index 57c74cef516..9ba6ea80930 100644
--- a/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts
+++ b/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts
@@ -71,7 +71,7 @@ describe('GasTxValidator', () => {
     patchNonRevertibleFn(tx, 0, {
       address: ProtocolContractAddress.FeeJuice,
       selector: FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
-      args: [selector.toField(), payer.toField(), new Fr(1n)],
+      args: [selector.toField(), payer, new Fr(1n)],
       msgSender: ProtocolContractAddress.FeeJuice,
     });
     await expectValidateSuccess(tx);
@@ -90,7 +90,7 @@ describe('GasTxValidator', () => {
     mockBalance(TX_FEE - 1n);
     patchRevertibleFn(tx, 0, {
       selector: FunctionSelector.fromSignature('_increase_public_balance((Field),Field)'),
-      args: [payer.toField(), new Fr(1n)],
+      args: [payer, new Fr(1n)],
     });
     await expectValidateFail(tx);
   });
diff --git a/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts b/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts
index 486e6285c3a..7d4683f0226 100644
--- a/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts
+++ b/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts
@@ -66,7 +66,7 @@ export class GasTxValidator implements TxValidator<Tx> {
         fn.args.length > 2 &&
         // Public functions get routed through the dispatch function, whose first argument is the target function selector.
         fn.args[0].equals(FunctionSelector.fromSignature('_increase_public_balance((Field),Field)').toField()) &&
-        fn.args[1].equals(feePayer.toField()) &&
+        fn.args[1].equals(feePayer) &&
         !fn.callContext.isStaticCall,
     );
 
diff --git a/yarn-project/simulator/src/acvm/oracle/oracle.ts b/yarn-project/simulator/src/acvm/oracle/oracle.ts
index 77cd613cd3f..cb4f063cf1b 100644
--- a/yarn-project/simulator/src/acvm/oracle/oracle.ts
+++ b/yarn-project/simulator/src/acvm/oracle/oracle.ts
@@ -293,7 +293,7 @@ export class Oracle {
     [numberOfElements]: ACVMField[],
   ): Promise<ACVMField[]> {
     const values = await this.typedOracle.storageRead(
-      new AztecAddress(fromACVMField(contractAddress)),
+      fromACVMField(contractAddress),
       fromACVMField(startStorageSlot),
       +blockNumber,
       +numberOfElements,
diff --git a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts
index 4aa721d423a..76fa4b31f2f 100644
--- a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts
+++ b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts
@@ -183,7 +183,7 @@ export abstract class TypedOracle {
   }
 
   storageRead(
-    _contractAddress: AztecAddress,
+    _contractAddress: Fr,
     _startStorageSlot: Fr,
     _blockNumber: number,
     _numberOfElements: number,
diff --git a/yarn-project/simulator/src/avm/avm_execution_environment.test.ts b/yarn-project/simulator/src/avm/avm_execution_environment.test.ts
index cadbfc5a33a..f6c6f07c688 100644
--- a/yarn-project/simulator/src/avm/avm_execution_environment.test.ts
+++ b/yarn-project/simulator/src/avm/avm_execution_environment.test.ts
@@ -1,10 +1,10 @@
-import { AztecAddress, FunctionSelector } from '@aztec/circuits.js';
+import { FunctionSelector } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
 import { allSameExcept, initExecutionEnvironment } from './fixtures/index.js';
 
 describe('Execution Environment', () => {
-  const newAddress = AztecAddress.fromNumber(123456);
+  const newAddress = new Fr(123456n);
   const calldata = [new Fr(1n), new Fr(2n), new Fr(3n)];
   const selector = FunctionSelector.empty();
 
diff --git a/yarn-project/simulator/src/avm/avm_memory_types.ts b/yarn-project/simulator/src/avm/avm_memory_types.ts
index d22e86bc9b0..3831d92ad9a 100644
--- a/yarn-project/simulator/src/avm/avm_memory_types.ts
+++ b/yarn-project/simulator/src/avm/avm_memory_types.ts
@@ -7,7 +7,6 @@ import {
   MEM_TAG_U64,
   MEM_TAG_U128,
 } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
 import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
@@ -42,10 +41,6 @@ export abstract class MemoryValue {
     return new Fr(this.toBigInt());
   }
 
-  public toAztecAddress(): AztecAddress {
-    return new AztecAddress(this.toFr());
-  }
-
   // To number. Throws if exceeds max safe int.
   public toNumber(): number {
     return this.toFr().toNumber();
diff --git a/yarn-project/simulator/src/avm/avm_simulator.test.ts b/yarn-project/simulator/src/avm/avm_simulator.test.ts
index eb744ab15cb..baa1060a1bf 100644
--- a/yarn-project/simulator/src/avm/avm_simulator.test.ts
+++ b/yarn-project/simulator/src/avm/avm_simulator.test.ts
@@ -134,7 +134,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
     const instanceGet = new SerializableContractInstance({
       version: 1,
       salt: new Fr(0x123),
-      deployer: AztecAddress.fromNumber(0x456),
+      deployer: new Fr(0x456),
       contractClassId: new Fr(0x789),
       initializationHash: new Fr(0x101112),
       publicKeys: new PublicKeys(
@@ -163,7 +163,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
       calldata,
       globals,
       address: contractInstance.address,
-      sender: AztecAddress.fromNumber(42),
+      sender: new Fr(42),
     });
     const context = initContext({ env: environment, persistableState });
 
@@ -500,8 +500,8 @@ describe('AVM simulator: transpiled Noir contracts', () => {
   });
 
   describe('Side effects, world state, nested calls', () => {
-    const address = AztecAddress.fromNumber(1);
-    const sender = AztecAddress.fromNumber(42);
+    const address = new Fr(1);
+    const sender = new Fr(42);
     const leafIndex = new Fr(7);
     const slotNumber = 1; // must update Noir contract if changing this
     const slot = new Fr(slotNumber);
@@ -824,7 +824,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
       });
 
       it('Should set a value in storage (map)', async () => {
-        const calldata = [address.toField(), value0];
+        const calldata = [address, value0];
 
         const context = createContext(calldata);
         const bytecode = getAvmTestContractBytecode('set_storage_map');
@@ -843,7 +843,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
       });
 
       it('Should read-add-set a value in storage (map)', async () => {
-        const calldata = [address.toField(), value0];
+        const calldata = [address, value0];
 
         const context = createContext(calldata);
         const bytecode = getAvmTestContractBytecode('add_storage_map');
@@ -870,7 +870,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
       });
 
       it('Should read value in storage (map)', async () => {
-        const calldata = [address.toField()];
+        const calldata = [address];
 
         const context = createContext(calldata);
         mockStorageRead(worldStateDB, value0);
@@ -894,7 +894,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
 
     describe('Contract Instance Retrieval', () => {
       it(`Can getContractInstance`, async () => {
-        const calldata = [address.toField()];
+        const calldata = [address];
         const context = createContext(calldata);
         // Contract instance must match noir
         const contractInstance = new SerializableContractInstance({
diff --git a/yarn-project/simulator/src/avm/journal/journal.test.ts b/yarn-project/simulator/src/avm/journal/journal.test.ts
index d4dd745ab92..47288f52805 100644
--- a/yarn-project/simulator/src/avm/journal/journal.test.ts
+++ b/yarn-project/simulator/src/avm/journal/journal.test.ts
@@ -1,4 +1,4 @@
-import { AztecAddress, SerializableContractInstance } from '@aztec/circuits.js';
+import { SerializableContractInstance } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
 import { mock } from 'jest-mock-extended';
@@ -16,7 +16,7 @@ import {
 import { type AvmPersistableStateManager } from './journal.js';
 
 describe('journal', () => {
-  const address = AztecAddress.random();
+  const address = Fr.random();
   const utxo = Fr.random();
   const leafIndex = Fr.random();
 
@@ -168,7 +168,7 @@ describe('journal', () => {
   //  // merge journals
   //  // t2 -> journal0 -> read  | 2
 
-  //  const contractAddress = AztecAddress.fromNumber(1);
+  //  const contractAddress = new Fr(1);
   //  const aztecContractAddress = AztecAddress.fromField(contractAddress);
   //  const key = new Fr(2);
   //  const value = new Fr(1);
@@ -301,7 +301,7 @@ describe('journal', () => {
   //  // merge journals
   //  // t2 -> journal0 -> read  | 1
 
-  //  const contractAddress = AztecAddress.fromNumber(1);
+  //  const contractAddress = new Fr(1);
   //  const aztecContractAddress = AztecAddress.fromField(contractAddress);
   //  const key = new Fr(2);
   //  const value = new Fr(1);
diff --git a/yarn-project/simulator/src/avm/journal/journal.ts b/yarn-project/simulator/src/avm/journal/journal.ts
index 38cbbf58f69..6595659a323 100644
--- a/yarn-project/simulator/src/avm/journal/journal.ts
+++ b/yarn-project/simulator/src/avm/journal/journal.ts
@@ -1,5 +1,5 @@
 import {
-  type AztecAddress,
+  AztecAddress,
   type Gas,
   type PublicCallRequest,
   SerializableContractInstance,
@@ -78,7 +78,7 @@ export class AvmPersistableStateManager {
    * @param slot - the slot in the contract's storage being written to
    * @param value - the value being written to the slot
    */
-  public writeStorage(contractAddress: AztecAddress, slot: Fr, value: Fr) {
+  public writeStorage(contractAddress: Fr, slot: Fr, value: Fr) {
     this.log.debug(`Storage write (address=${contractAddress}, slot=${slot}): value=${value}`);
     // Cache storage writes for later reference/reads
     this.publicStorage.write(contractAddress, slot, value);
@@ -92,7 +92,7 @@ export class AvmPersistableStateManager {
    * @param slot - the slot in the contract's storage being read from
    * @returns the latest value written to slot, or 0 if never written to before
    */
-  public async readStorage(contractAddress: AztecAddress, slot: Fr): Promise<Fr> {
+  public async readStorage(contractAddress: Fr, slot: Fr): Promise<Fr> {
     const { value, exists, cached } = await this.publicStorage.read(contractAddress, slot);
     this.log.debug(
       `Storage read  (address=${contractAddress}, slot=${slot}): value=${value}, exists=${exists}, cached=${cached}`,
@@ -108,7 +108,7 @@ export class AvmPersistableStateManager {
    * @param slot - the slot in the contract's storage being read from
    * @returns the latest value written to slot, or 0 if never written to before
    */
-  public async peekStorage(contractAddress: AztecAddress, slot: Fr): Promise<Fr> {
+  public async peekStorage(contractAddress: Fr, slot: Fr): Promise<Fr> {
     const { value, exists, cached } = await this.publicStorage.read(contractAddress, slot);
     this.log.debug(
       `Storage peek  (address=${contractAddress}, slot=${slot}): value=${value}, exists=${exists}, cached=${cached}`,
@@ -125,7 +125,7 @@ export class AvmPersistableStateManager {
    * @param leafIndex - the leaf index being checked
    * @returns true if the note hash exists at the given leaf index, false otherwise
    */
-  public async checkNoteHashExists(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr): Promise<boolean> {
+  public async checkNoteHashExists(contractAddress: Fr, noteHash: Fr, leafIndex: Fr): Promise<boolean> {
     const gotLeafValue = (await this.worldStateDB.getCommitmentValue(leafIndex.toBigInt())) ?? Fr.ZERO;
     const exists = gotLeafValue.equals(noteHash);
     this.log.debug(
@@ -141,7 +141,7 @@ export class AvmPersistableStateManager {
    * Write a note hash, trace the write.
    * @param noteHash - the unsiloed note hash to write
    */
-  public writeNoteHash(contractAddress: AztecAddress, noteHash: Fr) {
+  public writeNoteHash(contractAddress: Fr, noteHash: Fr) {
     this.log.debug(`noteHashes(${contractAddress}) += @${noteHash}.`);
     this.trace.traceNewNoteHash(contractAddress, noteHash);
   }
@@ -152,7 +152,7 @@ export class AvmPersistableStateManager {
    * @param nullifier - the unsiloed nullifier to check
    * @returns exists - whether the nullifier exists in the nullifier set
    */
-  public async checkNullifierExists(contractAddress: AztecAddress, nullifier: Fr): Promise<boolean> {
+  public async checkNullifierExists(contractAddress: Fr, nullifier: Fr): Promise<boolean> {
     const [exists, isPending, leafIndex] = await this.nullifiers.checkExists(contractAddress, nullifier);
     this.log.debug(
       `nullifiers(${contractAddress})@${nullifier} ?? leafIndex: ${leafIndex}, exists: ${exists}, pending: ${isPending}.`,
@@ -166,7 +166,7 @@ export class AvmPersistableStateManager {
    * @param contractAddress - address of the contract that the nullifier is associated with
    * @param nullifier - the unsiloed nullifier to write
    */
-  public async writeNullifier(contractAddress: AztecAddress, nullifier: Fr) {
+  public async writeNullifier(contractAddress: Fr, nullifier: Fr) {
     this.log.debug(`nullifiers(${contractAddress}) += ${nullifier}.`);
     // Cache pending nullifiers for later access
     await this.nullifiers.append(contractAddress, nullifier);
@@ -180,11 +180,7 @@ export class AvmPersistableStateManager {
    * @param msgLeafIndex - the message leaf index to use in the check
    * @returns exists - whether the message exists in the L1 to L2 Messages tree
    */
-  public async checkL1ToL2MessageExists(
-    contractAddress: AztecAddress,
-    msgHash: Fr,
-    msgLeafIndex: Fr,
-  ): Promise<boolean> {
+  public async checkL1ToL2MessageExists(contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr): Promise<boolean> {
     const valueAtIndex = (await this.worldStateDB.getL1ToL2LeafValue(msgLeafIndex.toBigInt())) ?? Fr.ZERO;
     const exists = valueAtIndex.equals(msgHash);
     this.log.debug(
@@ -202,7 +198,7 @@ export class AvmPersistableStateManager {
    * @param recipient - L1 contract address to send the message to.
    * @param content - Message content.
    */
-  public writeL2ToL1Message(contractAddress: AztecAddress, recipient: Fr, content: Fr) {
+  public writeL2ToL1Message(contractAddress: Fr, recipient: Fr, content: Fr) {
     this.log.debug(`L2ToL1Messages(${contractAddress}) += (recipient: ${recipient}, content: ${content}).`);
     this.trace.traceNewL2ToL1Message(contractAddress, recipient, content);
   }
@@ -213,7 +209,7 @@ export class AvmPersistableStateManager {
    * @param event - log event selector
    * @param log - log contents
    */
-  public writeUnencryptedLog(contractAddress: AztecAddress, log: Fr[]) {
+  public writeUnencryptedLog(contractAddress: Fr, log: Fr[]) {
     this.log.debug(`UnencryptedL2Log(${contractAddress}) += event with ${log.length} fields.`);
     this.trace.traceUnencryptedLog(contractAddress, log);
   }
@@ -223,9 +219,9 @@ export class AvmPersistableStateManager {
    * @param contractAddress - address of the contract instance to retrieve.
    * @returns the contract instance or undefined if it does not exist.
    */
-  public async getContractInstance(contractAddress: AztecAddress): Promise<SerializableContractInstance | undefined> {
+  public async getContractInstance(contractAddress: Fr): Promise<SerializableContractInstance | undefined> {
     this.log.debug(`Getting contract instance for address ${contractAddress}`);
-    const instanceWithAddress = await this.worldStateDB.getContractInstance(contractAddress);
+    const instanceWithAddress = await this.worldStateDB.getContractInstance(AztecAddress.fromField(contractAddress));
     const exists = instanceWithAddress !== undefined;
 
     if (exists) {
diff --git a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts
index 39b4c875f0e..8a215a54228 100644
--- a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts
+++ b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts
@@ -1,4 +1,3 @@
-import { AztecAddress } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
 import { type MockProxy, mock } from 'jest-mock-extended';
@@ -17,7 +16,7 @@ describe('avm nullifier caching', () => {
 
   describe('Nullifier caching and existence checks', () => {
     it('Reading a non-existent nullifier works (gets zero & DNE)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2);
       // never written!
       const [exists, isPending, gotIndex] = await nullifiers.checkExists(contractAddress, nullifier);
@@ -27,7 +26,7 @@ describe('avm nullifier caching', () => {
       expect(gotIndex).toEqual(Fr.ZERO);
     });
     it('Should cache nullifier, existence check works after creation', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2);
 
       // Write to cache
@@ -39,7 +38,7 @@ describe('avm nullifier caching', () => {
       expect(gotIndex).toEqual(Fr.ZERO);
     });
     it('Existence check works on fallback to host (gets index, exists, not-pending)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2);
       const storedLeafIndex = BigInt(420);
 
@@ -52,7 +51,7 @@ describe('avm nullifier caching', () => {
       expect(gotIndex).toEqual(gotIndex);
     });
     it('Existence check works on fallback to parent (gets value, exists, is pending)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2);
       const childNullifiers = nullifiers.fork();
 
@@ -66,7 +65,7 @@ describe('avm nullifier caching', () => {
       expect(gotIndex).toEqual(Fr.ZERO);
     });
     it('Existence check works on fallback to grandparent (gets value, exists, is pending)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2);
       const childNullifiers = nullifiers.fork();
       const grandChildNullifiers = childNullifiers.fork();
@@ -84,7 +83,7 @@ describe('avm nullifier caching', () => {
 
   describe('Nullifier collision failures', () => {
     it('Cant append nullifier that already exists in cache', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2); // same nullifier for both!
 
       // Append a nullifier to cache
@@ -95,7 +94,7 @@ describe('avm nullifier caching', () => {
       );
     });
     it('Cant append nullifier that already exists in parent cache', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2); // same nullifier for both!
 
       // Append a nullifier to parent
@@ -107,7 +106,7 @@ describe('avm nullifier caching', () => {
       );
     });
     it('Cant append nullifier that already exist in host', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2); // same nullifier for both!
       const storedLeafIndex = BigInt(420);
 
@@ -122,7 +121,7 @@ describe('avm nullifier caching', () => {
 
   describe('Nullifier cache merging', () => {
     it('Should be able to merge two nullifier caches together', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier0 = new Fr(2);
       const nullifier1 = new Fr(3);
 
@@ -143,7 +142,7 @@ describe('avm nullifier caching', () => {
       expect(results1).toEqual([/*exists=*/ true, /*isPending=*/ true, /*leafIndex=*/ Fr.ZERO]);
     });
     it('Cant merge two nullifier caches with colliding entries', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const nullifier = new Fr(2);
 
       // Append a nullifier to parent
diff --git a/yarn-project/simulator/src/avm/journal/nullifiers.ts b/yarn-project/simulator/src/avm/journal/nullifiers.ts
index 33e615349b3..d1b3577fffc 100644
--- a/yarn-project/simulator/src/avm/journal/nullifiers.ts
+++ b/yarn-project/simulator/src/avm/journal/nullifiers.ts
@@ -1,4 +1,4 @@
-import { type AztecAddress } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/circuits.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -41,7 +41,7 @@ export class NullifierManager {
    * @param nullifier - the nullifier to check for
    * @returns exists: whether the nullifier exists in cache here or in parent's
    */
-  private checkExistsHereOrParent(contractAddress: AztecAddress, nullifier: Fr): boolean {
+  private checkExistsHereOrParent(contractAddress: Fr, nullifier: Fr): boolean {
     // First check this cache
     let existsAsPending = this.cache.exists(contractAddress, nullifier);
     // Then try parent's nullifier cache
@@ -66,7 +66,7 @@ export class NullifierManager {
    *          leafIndex: the nullifier's leaf index if it exists and is not pending (comes from host state).
    */
   public async checkExists(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     nullifier: Fr,
   ): Promise<[/*exists=*/ boolean, /*isPending=*/ boolean, /*leafIndex=*/ Fr]> {
     // Check this cache and parent's (recursively)
@@ -89,7 +89,7 @@ export class NullifierManager {
    * @param contractAddress - the address of the contract that the nullifier is associated with
    * @param nullifier - the nullifier to stage
    */
-  public async append(contractAddress: AztecAddress, nullifier: Fr) {
+  public async append(contractAddress: Fr, nullifier: Fr) {
     const [exists, ,] = await this.checkExists(contractAddress, nullifier);
     if (exists) {
       throw new NullifierCollisionError(
@@ -139,10 +139,10 @@ export class NullifierCache {
    * @param nullifier - the nullifier to check existence of
    * @returns whether the nullifier is found in the cache
    */
-  public exists(contractAddress: AztecAddress, nullifier: Fr): boolean {
+  public exists(contractAddress: Fr, nullifier: Fr): boolean {
     const exists =
       this.cachePerContract.get(contractAddress.toBigInt())?.has(nullifier.toBigInt()) ||
-      this.siloedNullifiers.has(siloNullifier(contractAddress, nullifier).toBigInt());
+      this.siloedNullifiers.has(siloNullifier(AztecAddress.fromField(contractAddress), nullifier).toBigInt());
     return !!exists;
   }
 
@@ -152,7 +152,7 @@ export class NullifierCache {
    * @param contractAddress - the address of the contract that the nullifier is associated with
    * @param nullifier - the nullifier to stage
    */
-  public append(contractAddress: AztecAddress, nullifier: Fr) {
+  public append(contractAddress: Fr, nullifier: Fr) {
     if (this.exists(contractAddress, nullifier)) {
       throw new NullifierCollisionError(
         `Nullifier ${nullifier} at contract ${contractAddress} already exists in cache.`,
diff --git a/yarn-project/simulator/src/avm/journal/public_storage.test.ts b/yarn-project/simulator/src/avm/journal/public_storage.test.ts
index 442761b6786..3b20b5cae3b 100644
--- a/yarn-project/simulator/src/avm/journal/public_storage.test.ts
+++ b/yarn-project/simulator/src/avm/journal/public_storage.test.ts
@@ -1,4 +1,3 @@
-import { AztecAddress } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
 import { type MockProxy, mock } from 'jest-mock-extended';
@@ -17,7 +16,7 @@ describe('avm public storage', () => {
 
   describe('AVM Public Storage', () => {
     it('Reading an unwritten slot works (gets zero & DNE)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const slot = new Fr(2);
       // never written!
       const { exists, value: gotValue, cached } = await publicStorage.read(contractAddress, slot);
@@ -28,7 +27,7 @@ describe('avm public storage', () => {
     });
 
     it('Should cache storage write, reading works after write', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const slot = new Fr(2);
       const value = new Fr(3);
       // Write to cache
@@ -41,7 +40,7 @@ describe('avm public storage', () => {
     });
 
     it('Reading works on fallback to host (gets value & exists)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const slot = new Fr(2);
       const storedValue = new Fr(420);
       // ensure that fallback to host gets a value
@@ -55,7 +54,7 @@ describe('avm public storage', () => {
     });
 
     it('Reading works on fallback to parent (gets value & exists)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const slot = new Fr(2);
       const value = new Fr(3);
       const childStorage = new PublicStorage(publicDb, publicStorage);
@@ -69,7 +68,7 @@ describe('avm public storage', () => {
     });
 
     it('Reading works on fallback to grandparent (gets value & exists)', async () => {
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const slot = new Fr(2);
       const value = new Fr(3);
       const childStorage = new PublicStorage(publicDb, publicStorage);
@@ -85,7 +84,7 @@ describe('avm public storage', () => {
 
     it('When reading from storage, should check cache, then parent, then host', async () => {
       // Store a different value in storage vs the cache, and make sure the cache is returned
-      const contractAddress = AztecAddress.fromNumber(1);
+      const contractAddress = new Fr(1);
       const slot = new Fr(2);
       const storedValue = new Fr(420);
       const parentValue = new Fr(69);
@@ -118,7 +117,7 @@ describe('avm public storage', () => {
 
   it('Should be able to merge two public storages together', async () => {
     // Checking that child's writes take precedence on marge
-    const contractAddress = AztecAddress.fromNumber(1);
+    const contractAddress = new Fr(1);
     const slot = new Fr(2);
     // value written initially in parent
     const value = new Fr(1);
diff --git a/yarn-project/simulator/src/avm/journal/public_storage.ts b/yarn-project/simulator/src/avm/journal/public_storage.ts
index 794cb745048..62e32cba671 100644
--- a/yarn-project/simulator/src/avm/journal/public_storage.ts
+++ b/yarn-project/simulator/src/avm/journal/public_storage.ts
@@ -49,7 +49,7 @@ export class PublicStorage {
    * @param slot - the slot in the contract's storage being read from
    * @returns value: the latest value written according to this cache or the parent's. undefined on cache miss.
    */
-  public readHereOrParent(contractAddress: AztecAddress, slot: Fr): Fr | undefined {
+  public readHereOrParent(contractAddress: Fr, slot: Fr): Fr | undefined {
     // First try check this storage cache
     let value = this.cache.read(contractAddress, slot);
     // Then try parent's storage cache
@@ -71,7 +71,7 @@ export class PublicStorage {
    * @param slot - the slot in the contract's storage being read from
    * @returns exists: whether the slot has EVER been written to before, value: the latest value written to slot, or 0 if never written to before
    */
-  public async read(contractAddress: AztecAddress, slot: Fr): Promise<PublicStorageReadResult> {
+  public async read(contractAddress: Fr, slot: Fr): Promise<PublicStorageReadResult> {
     let cached = false;
     // Check this cache and parent's (recursively)
     let value = this.readHereOrParent(contractAddress, slot);
@@ -97,7 +97,7 @@ export class PublicStorage {
    * @param slot - the slot in the contract's storage being written to
    * @param value - the value being written to the slot
    */
-  public write(contractAddress: AztecAddress, slot: Fr, value: Fr) {
+  public write(contractAddress: Fr, slot: Fr, value: Fr) {
     this.cache.write(contractAddress, slot, value);
   }
 
@@ -143,7 +143,7 @@ class PublicStorageCache {
    * @param slot - the slot in the contract's storage being read from
    * @returns the latest value written to slot, or undefined if no value has been written
    */
-  public read(contractAddress: AztecAddress, slot: Fr): Fr | undefined {
+  public read(contractAddress: Fr, slot: Fr): Fr | undefined {
     return this.cachePerContract.get(contractAddress.toBigInt())?.get(slot.toBigInt());
   }
 
@@ -154,7 +154,7 @@ class PublicStorageCache {
    * @param slot - the slot in the contract's storage being written to
    * @param value - the value being written to the slot
    */
-  public write(contractAddress: AztecAddress, slot: Fr, value: Fr) {
+  public write(contractAddress: Fr, slot: Fr, value: Fr) {
     let cacheAtContract = this.cachePerContract.get(contractAddress.toBigInt());
     if (!cacheAtContract) {
       // If this contract's storage has no staged modifications, create a new inner map to store them
diff --git a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts
index 4c016542f99..96a7cbb5340 100644
--- a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts
@@ -1,4 +1,4 @@
-import { AztecAddress, Fr } from '@aztec/circuits.js';
+import { Fr } from '@aztec/circuits.js';
 
 import { mock } from 'jest-mock-extended';
 
@@ -26,8 +26,8 @@ describe('Accrued Substate', () => {
   let persistableState: AvmPersistableStateManager;
   let context: AvmContext;
 
-  const address = AztecAddress.fromNumber(1);
-  const sender = AztecAddress.fromNumber(42);
+  const address = new Fr(1);
+  const sender = new Fr(42);
   const value0 = new Fr(69); // noteHash or nullifier...
   const value0Offset = 100;
   const value1 = new Fr(420);
@@ -155,7 +155,7 @@ describe('Accrued Substate', () => {
         }
 
         context.machineState.memory.set(value0Offset, new Field(value0)); // nullifier
-        context.machineState.memory.set(addressOffset, new Field(address.toField()));
+        context.machineState.memory.set(addressOffset, new Field(address));
         await new NullifierExists(
           /*indirect=*/ 0,
           /*nullifierOffset=*/ value0Offset,
diff --git a/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts
index 6370740b3eb..5ba30a80aeb 100644
--- a/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts
+++ b/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts
@@ -107,7 +107,7 @@ export class NullifierExists extends Instruction {
     memory.checkTags(TypeTag.FIELD, nullifierOffset, addressOffset);
 
     const nullifier = memory.get(nullifierOffset).toFr();
-    const address = memory.get(addressOffset).toAztecAddress();
+    const address = memory.get(addressOffset).toFr();
     const exists = await context.persistableState.checkNullifierExists(address, nullifier);
 
     memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
diff --git a/yarn-project/simulator/src/avm/opcodes/contract.test.ts b/yarn-project/simulator/src/avm/opcodes/contract.test.ts
index df92874145a..818ff2844b0 100644
--- a/yarn-project/simulator/src/avm/opcodes/contract.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/contract.test.ts
@@ -1,4 +1,4 @@
-import { AztecAddress, type Fr, SerializableContractInstance } from '@aztec/circuits.js';
+import { Fr, SerializableContractInstance } from '@aztec/circuits.js';
 
 import { mock } from 'jest-mock-extended';
 
@@ -12,7 +12,7 @@ import { mockGetContractInstance } from '../test_utils.js';
 import { ContractInstanceMember, GetContractInstance } from './contract.js';
 
 describe('Contract opcodes', () => {
-  const address = AztecAddress.random();
+  const address = Fr.random();
   const contractInstance = SerializableContractInstance.random();
   const deployer = contractInstance.deployer;
   const contractClassId = contractInstance.contractClassId;
@@ -60,7 +60,7 @@ describe('Contract opcodes', () => {
       it(`Should read '${ContractInstanceMember[memberEnum]}' correctly`, async () => {
         mockGetContractInstance(worldStateDB, contractInstance.withAddress(address));
 
-        context.machineState.memory.set(0, new Field(address.toField()));
+        context.machineState.memory.set(0, new Field(address));
         await new GetContractInstance(
           /*indirect=*/ 0,
           memberEnum,
@@ -92,7 +92,7 @@ describe('Contract opcodes', () => {
       'GETCONTRACTINSTANCE member instruction works when contract does not exist',
       (memberEnum: ContractInstanceMember) => {
         it(`'${ContractInstanceMember[memberEnum]}' should be 0 when contract does not exist `, async () => {
-          context.machineState.memory.set(0, new Field(address.toField()));
+          context.machineState.memory.set(0, new Field(address));
           await new GetContractInstance(
             /*indirect=*/ 0,
             memberEnum,
diff --git a/yarn-project/simulator/src/avm/opcodes/contract.ts b/yarn-project/simulator/src/avm/opcodes/contract.ts
index f98c8d48422..a9912fd38fc 100644
--- a/yarn-project/simulator/src/avm/opcodes/contract.ts
+++ b/yarn-project/simulator/src/avm/opcodes/contract.ts
@@ -47,7 +47,7 @@ export class GetContractInstance extends Instruction {
     const [addressOffset, dstOffset, existsOffset] = addressing.resolve(operands, memory);
     memory.checkTag(TypeTag.FIELD, addressOffset);
 
-    const address = memory.get(addressOffset).toAztecAddress();
+    const address = memory.get(addressOffset).toFr();
     const instance = await context.persistableState.getContractInstance(address);
     const exists = instance !== undefined;
 
diff --git a/yarn-project/simulator/src/avm/opcodes/external_calls.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.ts
index 64c5fc64252..7bf31a24a45 100644
--- a/yarn-project/simulator/src/avm/opcodes/external_calls.ts
+++ b/yarn-project/simulator/src/avm/opcodes/external_calls.ts
@@ -64,7 +64,7 @@ abstract class ExternalCall extends Instruction {
     context.machineState.consumeGas(allocatedGas);
 
     const nestedContext = context.createNestedContractCallContext(
-      callAddress.toAztecAddress(),
+      callAddress.toFr(),
       calldata,
       allocatedGas,
       callType,
diff --git a/yarn-project/simulator/src/client/private_execution.test.ts b/yarn-project/simulator/src/client/private_execution.test.ts
index dbdba82276e..0bcb2b01ba1 100644
--- a/yarn-project/simulator/src/client/private_execution.test.ts
+++ b/yarn-project/simulator/src/client/private_execution.test.ts
@@ -267,11 +267,10 @@ describe('Private Execution test suite', () => {
     );
 
     node = mock<AztecNode>();
-    node.getPublicStorageAt.mockImplementation(
-      (_address: AztecAddress, _storageSlot: Fr, _blockNumber: L2BlockNumber) => {
-        return Promise.resolve(Fr.ZERO);
-      },
-    );
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    node.getPublicStorageAt.mockImplementation((address: Fr, storageSlot: Fr, blockNumber: L2BlockNumber) => {
+      return Promise.resolve(Fr.ZERO);
+    });
 
     acirSimulator = new AcirSimulator(oracle, node);
   });
@@ -311,7 +310,7 @@ describe('Private Execution test suite', () => {
     const mockFirstNullifier = new Fr(1111);
     let currentNoteIndex = 0n;
 
-    const buildNote = (amount: bigint, ownerAddress: AztecAddress, storageSlot: Fr, noteTypeId: NoteSelector) => {
+    const buildNote = (amount: bigint, ownerNpkMHash: Fr, storageSlot: Fr, noteTypeId: NoteSelector) => {
       // WARNING: this is not actually how nonces are computed!
       // For the purpose of this test we use a mocked firstNullifier and and a random number
       // to compute the nonce. Proper nonces are only enforced later by the kernel/later circuits
@@ -322,7 +321,7 @@ describe('Private Execution test suite', () => {
       // `hash(firstNullifier, noteHashIndex)`
       const noteHashIndex = randomInt(1); // mock index in TX's final noteHashes array
       const nonce = computeNoteHashNonce(mockFirstNullifier, noteHashIndex);
-      const note = new Note([new Fr(amount), ownerAddress.toField(), Fr.random()]);
+      const note = new Note([new Fr(amount), ownerNpkMHash, Fr.random()]);
       // Note: The following does not correspond to how note hashing is generally done in real notes.
       const noteHash = poseidon2Hash([storageSlot, ...note.items]);
       return {
@@ -537,8 +536,8 @@ describe('Private Execution test suite', () => {
 
       oracle.getFunctionArtifact.mockImplementation(() => Promise.resolve(childArtifact));
 
-      logger.info(`Parent deployed at ${parentAddress.toString()}`);
-      logger.info(`Calling child function ${childSelector.toString()} at ${childAddress.toString()}`);
+      logger.info(`Parent deployed at ${parentAddress.toShortString()}`);
+      logger.info(`Calling child function ${childSelector.toString()} at ${childAddress.toShortString()}`);
 
       const args = [childAddress, childSelector];
       const result = await runSimulator({ args, artifact: parentArtifact });
diff --git a/yarn-project/simulator/src/client/view_data_oracle.ts b/yarn-project/simulator/src/client/view_data_oracle.ts
index a6651c12f87..57fb6695e23 100644
--- a/yarn-project/simulator/src/client/view_data_oracle.ts
+++ b/yarn-project/simulator/src/client/view_data_oracle.ts
@@ -271,7 +271,7 @@ export class ViewDataOracle extends TypedOracle {
    * @param numberOfElements - Number of elements to read from the starting storage slot.
    */
   public override async storageRead(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     startStorageSlot: Fr,
     blockNumber: number,
     numberOfElements: number,
diff --git a/yarn-project/simulator/src/public/dual_side_effect_trace.ts b/yarn-project/simulator/src/public/dual_side_effect_trace.ts
index c1c6bbcda59..4572b26f9f6 100644
--- a/yarn-project/simulator/src/public/dual_side_effect_trace.ts
+++ b/yarn-project/simulator/src/public/dual_side_effect_trace.ts
@@ -7,7 +7,6 @@ import {
   type SerializableContractInstance,
   type VMCircuitPublicInputs,
 } from '@aztec/circuits.js';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
 
 import { assert } from 'console';
@@ -37,60 +36,54 @@ export class DualSideEffectTrace implements PublicSideEffectTraceInterface {
     return this.innerCallTrace.getCounter();
   }
 
-  public tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, exists: boolean, cached: boolean) {
+  public tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, exists: boolean, cached: boolean) {
     this.innerCallTrace.tracePublicStorageRead(contractAddress, slot, value, exists, cached);
     this.enqueuedCallTrace.tracePublicStorageRead(contractAddress, slot, value, exists, cached);
   }
 
-  public tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr) {
+  public tracePublicStorageWrite(contractAddress: Fr, slot: Fr, value: Fr) {
     this.innerCallTrace.tracePublicStorageWrite(contractAddress, slot, value);
     this.enqueuedCallTrace.tracePublicStorageWrite(contractAddress, slot, value);
   }
 
   // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
-  public traceNoteHashCheck(_contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean) {
+  public traceNoteHashCheck(_contractAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean) {
     this.innerCallTrace.traceNoteHashCheck(_contractAddress, noteHash, leafIndex, exists);
     this.enqueuedCallTrace.traceNoteHashCheck(_contractAddress, noteHash, leafIndex, exists);
   }
 
-  public traceNewNoteHash(_contractAddress: AztecAddress, noteHash: Fr) {
+  public traceNewNoteHash(_contractAddress: Fr, noteHash: Fr) {
     this.innerCallTrace.traceNewNoteHash(_contractAddress, noteHash);
     this.enqueuedCallTrace.traceNewNoteHash(_contractAddress, noteHash);
   }
 
-  public traceNullifierCheck(
-    contractAddress: AztecAddress,
-    nullifier: Fr,
-    leafIndex: Fr,
-    exists: boolean,
-    isPending: boolean,
-  ) {
+  public traceNullifierCheck(contractAddress: Fr, nullifier: Fr, leafIndex: Fr, exists: boolean, isPending: boolean) {
     this.innerCallTrace.traceNullifierCheck(contractAddress, nullifier, leafIndex, exists, isPending);
     this.enqueuedCallTrace.traceNullifierCheck(contractAddress, nullifier, leafIndex, exists, isPending);
   }
 
-  public traceNewNullifier(contractAddress: AztecAddress, nullifier: Fr) {
+  public traceNewNullifier(contractAddress: Fr, nullifier: Fr) {
     this.innerCallTrace.traceNewNullifier(contractAddress, nullifier);
     this.enqueuedCallTrace.traceNewNullifier(contractAddress, nullifier);
   }
 
-  public traceL1ToL2MessageCheck(contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
+  public traceL1ToL2MessageCheck(contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
     this.innerCallTrace.traceL1ToL2MessageCheck(contractAddress, msgHash, msgLeafIndex, exists);
     this.enqueuedCallTrace.traceL1ToL2MessageCheck(contractAddress, msgHash, msgLeafIndex, exists);
   }
 
-  public traceNewL2ToL1Message(contractAddress: AztecAddress, recipient: Fr, content: Fr) {
+  public traceNewL2ToL1Message(contractAddress: Fr, recipient: Fr, content: Fr) {
     this.innerCallTrace.traceNewL2ToL1Message(contractAddress, recipient, content);
     this.enqueuedCallTrace.traceNewL2ToL1Message(contractAddress, recipient, content);
   }
 
-  public traceUnencryptedLog(contractAddress: AztecAddress, log: Fr[]) {
+  public traceUnencryptedLog(contractAddress: Fr, log: Fr[]) {
     this.innerCallTrace.traceUnencryptedLog(contractAddress, log);
     this.enqueuedCallTrace.traceUnencryptedLog(contractAddress, log);
   }
 
   public traceGetContractInstance(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     exists: boolean,
     instance: SerializableContractInstance | undefined,
   ) {
@@ -99,7 +92,7 @@ export class DualSideEffectTrace implements PublicSideEffectTraceInterface {
   }
 
   public traceGetBytecode(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     exists: boolean,
     bytecode: Buffer,
     contractInstance: SerializableContractInstance | undefined,
diff --git a/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.test.ts b/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.test.ts
index 4b32d350a18..a3a1c9e7e13 100644
--- a/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.test.ts
+++ b/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.test.ts
@@ -54,7 +54,7 @@ function createPublicCallRequest(avmEnvironment: AvmExecutionEnvironment): Publi
 }
 
 describe('Enqueued-call Side Effect Trace', () => {
-  const address = AztecAddress.random();
+  const address = Fr.random();
   const utxo = Fr.random();
   const leafIndex = Fr.random();
   const slot = Fr.random();
@@ -236,13 +236,16 @@ describe('Enqueued-call Side Effect Trace', () => {
     trace.traceUnencryptedLog(address, log);
     expect(trace.getCounter()).toBe(startCounterPlus1);
 
-    const expectedLog = new UnencryptedL2Log(address, Buffer.concat(log.map(f => f.toBuffer())));
+    const expectedLog = new UnencryptedL2Log(
+      AztecAddress.fromField(address),
+      Buffer.concat(log.map(f => f.toBuffer())),
+    );
     const expectedArray = PublicAccumulatedData.empty().unencryptedLogsHashes;
     expectedArray[0] = new LogHash(
       Fr.fromBuffer(expectedLog.hash()),
       startCounter,
       new Fr(expectedLog.length + 4),
-    ).scope(address);
+    ).scope(AztecAddress.fromField(address));
 
     const circuitPublicInputs = toVMCircuitPublicInputs(trace);
     expect(trace.getUnencryptedLogs()).toEqual([expectedLog]);
@@ -268,105 +271,101 @@ describe('Enqueued-call Side Effect Trace', () => {
   describe('Maximum accesses', () => {
     it('Should enforce maximum number of public storage reads', () => {
       for (let i = 0; i < MAX_PUBLIC_DATA_READS_PER_TX; i++) {
-        trace.tracePublicStorageRead(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true, true);
+        trace.tracePublicStorageRead(new Fr(i), new Fr(i), new Fr(i), true, true);
       }
-      expect(() =>
-        trace.tracePublicStorageRead(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true),
-      ).toThrow(SideEffectLimitReachedError);
+      expect(() => trace.tracePublicStorageRead(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
+        SideEffectLimitReachedError,
+      );
     });
 
     it('Should enforce maximum number of public storage writes', () => {
       for (let i = 0; i < MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX; i++) {
-        trace.tracePublicStorageWrite(AztecAddress.fromNumber(i), new Fr(i), new Fr(i));
+        trace.tracePublicStorageWrite(new Fr(i), new Fr(i), new Fr(i));
       }
-      expect(() => trace.tracePublicStorageWrite(AztecAddress.fromNumber(42), new Fr(42), new Fr(42))).toThrow(
+      expect(() => trace.tracePublicStorageWrite(new Fr(42), new Fr(42), new Fr(42))).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of note hash checks', () => {
       for (let i = 0; i < MAX_NOTE_HASH_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNoteHashCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true);
+        trace.traceNoteHashCheck(new Fr(i), new Fr(i), new Fr(i), true);
       }
-      expect(() => trace.traceNoteHashCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true)).toThrow(
+      expect(() => trace.traceNoteHashCheck(new Fr(42), new Fr(42), new Fr(42), true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new note hashes', () => {
       for (let i = 0; i < MAX_NOTE_HASHES_PER_TX; i++) {
-        trace.traceNewNoteHash(AztecAddress.fromNumber(i), new Fr(i));
+        trace.traceNewNoteHash(new Fr(i), new Fr(i));
       }
-      expect(() => trace.traceNewNoteHash(AztecAddress.fromNumber(42), new Fr(42))).toThrow(
-        SideEffectLimitReachedError,
-      );
+      expect(() => trace.traceNewNoteHash(new Fr(42), new Fr(42))).toThrow(SideEffectLimitReachedError);
     });
 
     it('Should enforce maximum number of nullifier checks', () => {
       for (let i = 0; i < MAX_NULLIFIER_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), true, true);
       }
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
         SideEffectLimitReachedError,
       );
       // NOTE: also cannot do a non-existent check once existent checks have filled up
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), false, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), false, true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of nullifier non-existent checks', () => {
       for (let i = 0; i < MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), false, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), false, true);
       }
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), false, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), false, true)).toThrow(
         SideEffectLimitReachedError,
       );
       // NOTE: also cannot do a existent check once non-existent checks have filled up
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new nullifiers', () => {
       for (let i = 0; i < MAX_NULLIFIERS_PER_TX; i++) {
-        trace.traceNewNullifier(AztecAddress.fromNumber(i), new Fr(i));
+        trace.traceNewNullifier(new Fr(i), new Fr(i));
       }
-      expect(() => trace.traceNewNullifier(AztecAddress.fromNumber(42), new Fr(42))).toThrow(
-        SideEffectLimitReachedError,
-      );
+      expect(() => trace.traceNewNullifier(new Fr(42), new Fr(42))).toThrow(SideEffectLimitReachedError);
     });
 
     it('Should enforce maximum number of L1 to L2 message checks', () => {
       for (let i = 0; i < MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX; i++) {
-        trace.traceL1ToL2MessageCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true);
+        trace.traceL1ToL2MessageCheck(new Fr(i), new Fr(i), new Fr(i), true);
       }
-      expect(() => trace.traceL1ToL2MessageCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true)).toThrow(
+      expect(() => trace.traceL1ToL2MessageCheck(new Fr(42), new Fr(42), new Fr(42), true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new l2 to l1 messages', () => {
       for (let i = 0; i < MAX_L2_TO_L1_MSGS_PER_TX; i++) {
-        trace.traceNewL2ToL1Message(AztecAddress.fromNumber(i), new Fr(i), new Fr(i));
+        trace.traceNewL2ToL1Message(new Fr(i), new Fr(i), new Fr(i));
       }
-      expect(() => trace.traceNewL2ToL1Message(AztecAddress.fromNumber(42), new Fr(42), new Fr(42))).toThrow(
+      expect(() => trace.traceNewL2ToL1Message(new Fr(42), new Fr(42), new Fr(42))).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new logs hashes', () => {
       for (let i = 0; i < MAX_UNENCRYPTED_LOGS_PER_TX; i++) {
-        trace.traceUnencryptedLog(AztecAddress.fromNumber(i), [new Fr(i), new Fr(i)]);
+        trace.traceUnencryptedLog(new Fr(i), [new Fr(i), new Fr(i)]);
       }
-      expect(() => trace.traceUnencryptedLog(AztecAddress.fromNumber(42), [new Fr(42), new Fr(42)])).toThrow(
+      expect(() => trace.traceUnencryptedLog(new Fr(42), [new Fr(42), new Fr(42)])).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of nullifier checks for GETCONTRACTINSTANCE', () => {
       for (let i = 0; i < MAX_NULLIFIER_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), true, true);
       }
       expect(() => trace.traceGetContractInstance(address, /*exists=*/ true, contractInstance)).toThrow(
         SideEffectLimitReachedError,
@@ -379,7 +378,7 @@ describe('Enqueued-call Side Effect Trace', () => {
 
     it('Should enforce maximum number of nullifier non-existent checks for GETCONTRACTINSTANCE', () => {
       for (let i = 0; i < MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), false, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), false, true);
       }
       expect(() => trace.traceGetContractInstance(address, /*exists=*/ false, contractInstance)).toThrow(
         SideEffectLimitReachedError,
@@ -411,34 +410,30 @@ describe('Enqueued-call Side Effect Trace', () => {
           0,
         ),
       );
-      expect(() =>
-        trace.tracePublicStorageRead(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true),
-      ).toThrow(SideEffectLimitReachedError);
-      expect(() => trace.tracePublicStorageWrite(AztecAddress.fromNumber(42), new Fr(42), new Fr(42))).toThrow(
-        SideEffectLimitReachedError,
-      );
-      expect(() => trace.traceNoteHashCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true)).toThrow(
+      expect(() => trace.tracePublicStorageRead(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
         SideEffectLimitReachedError,
       );
-      expect(() => trace.traceNewNoteHash(AztecAddress.fromNumber(42), new Fr(42))).toThrow(
+      expect(() => trace.tracePublicStorageWrite(new Fr(42), new Fr(42), new Fr(42))).toThrow(
         SideEffectLimitReachedError,
       );
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), false, true)).toThrow(
+      expect(() => trace.traceNoteHashCheck(new Fr(42), new Fr(42), new Fr(42), true)).toThrow(
         SideEffectLimitReachedError,
       );
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true)).toThrow(
+      expect(() => trace.traceNewNoteHash(new Fr(42), new Fr(42))).toThrow(SideEffectLimitReachedError);
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), false, true)).toThrow(
         SideEffectLimitReachedError,
       );
-      expect(() => trace.traceNewNullifier(AztecAddress.fromNumber(42), new Fr(42))).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
         SideEffectLimitReachedError,
       );
-      expect(() => trace.traceL1ToL2MessageCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true)).toThrow(
+      expect(() => trace.traceNewNullifier(new Fr(42), new Fr(42))).toThrow(SideEffectLimitReachedError);
+      expect(() => trace.traceL1ToL2MessageCheck(new Fr(42), new Fr(42), new Fr(42), true)).toThrow(
         SideEffectLimitReachedError,
       );
-      expect(() => trace.traceNewL2ToL1Message(AztecAddress.fromNumber(42), new Fr(42), new Fr(42))).toThrow(
+      expect(() => trace.traceNewL2ToL1Message(new Fr(42), new Fr(42), new Fr(42))).toThrow(
         SideEffectLimitReachedError,
       );
-      expect(() => trace.traceUnencryptedLog(AztecAddress.fromNumber(42), [new Fr(42), new Fr(42)])).toThrow(
+      expect(() => trace.traceUnencryptedLog(new Fr(42), [new Fr(42), new Fr(42)])).toThrow(
         SideEffectLimitReachedError,
       );
       expect(() => trace.traceGetContractInstance(address, /*exists=*/ false, contractInstance)).toThrow(
diff --git a/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.ts b/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.ts
index cef43fb3d13..1f50f4ba13c 100644
--- a/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.ts
+++ b/yarn-project/simulator/src/public/enqueued_call_side_effect_trace.ts
@@ -6,7 +6,7 @@ import {
   AvmExecutionHints,
   AvmExternalCallHint,
   AvmKeyValueHint,
-  type AztecAddress,
+  AztecAddress,
   type CombinedConstantData,
   type ContractClassIdPreimage,
   EthAddress,
@@ -159,13 +159,7 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
     this.sideEffectCounter++;
   }
 
-  public tracePublicStorageRead(
-    contractAddress: AztecAddress,
-    slot: Fr,
-    value: Fr,
-    _exists: boolean,
-    _cached: boolean,
-  ) {
+  public tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, _exists: boolean, _cached: boolean) {
     // NOTE: exists and cached are unused for now but may be used for optimizations or kernel hints later
     if (
       this.publicDataReads.length + this.previousValidationRequestArrayLengths.publicDataReads >=
@@ -183,7 +177,7 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
     this.incrementSideEffectCounter();
   }
 
-  public tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr) {
+  public tracePublicStorageWrite(contractAddress: Fr, slot: Fr, value: Fr) {
     if (
       this.publicDataWrites.length + this.previousAccumulatedDataArrayLengths.publicDataUpdateRequests >=
       MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
@@ -201,7 +195,7 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
   }
 
   // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
-  public traceNoteHashCheck(_contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean) {
+  public traceNoteHashCheck(_contractAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean) {
     // NOTE: contractAddress is unused because noteHash is an already-siloed leaf
     if (
       this.noteHashReadRequests.length + this.previousValidationRequestArrayLengths.noteHashReadRequests >=
@@ -218,32 +212,28 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
     // NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
   }
 
-  public traceNewNoteHash(contractAddress: AztecAddress, noteHash: Fr) {
+  public traceNewNoteHash(contractAddress: Fr, noteHash: Fr) {
     if (this.noteHashes.length + this.previousAccumulatedDataArrayLengths.noteHashes >= MAX_NOTE_HASHES_PER_TX) {
       throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
     }
 
     // TODO(dbanks12): make unique and silo instead of scoping
     //const siloedNoteHash = siloNoteHash(contractAddress, noteHash);
-    this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter).scope(contractAddress));
+    this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter).scope(AztecAddress.fromField(contractAddress)));
     this.log.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
-  public traceNullifierCheck(
-    contractAddress: AztecAddress,
-    nullifier: Fr,
-    _leafIndex: Fr,
-    exists: boolean,
-    _isPending: boolean,
-  ) {
+  public traceNullifierCheck(contractAddress: Fr, nullifier: Fr, _leafIndex: Fr, exists: boolean, _isPending: boolean) {
     // NOTE: isPending and leafIndex are unused for now but may be used for optimizations or kernel hints later
     this.enforceLimitOnNullifierChecks();
 
     // TODO(dbanks12): use siloed nullifier instead of scoped once public kernel stops siloing
     // and once VM public inputs are meant to contain siloed nullifiers.
     //const siloedNullifier = siloNullifier(contractAddress, nullifier);
-    const readRequest = new ReadRequest(nullifier, this.sideEffectCounter).scope(contractAddress);
+    const readRequest = new ReadRequest(nullifier, this.sideEffectCounter).scope(
+      AztecAddress.fromField(contractAddress),
+    );
     if (exists) {
       this.nullifierReadRequests.push(readRequest);
     } else {
@@ -256,7 +246,7 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
     this.incrementSideEffectCounter();
   }
 
-  public traceNewNullifier(contractAddress: AztecAddress, nullifier: Fr) {
+  public traceNewNullifier(contractAddress: Fr, nullifier: Fr) {
     if (this.nullifiers.length + this.previousAccumulatedDataArrayLengths.nullifiers >= MAX_NULLIFIERS_PER_TX) {
       throw new SideEffectLimitReachedError('nullifier', MAX_NULLIFIERS_PER_TX);
     }
@@ -268,7 +258,7 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
   }
 
   // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
-  public traceL1ToL2MessageCheck(_contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
+  public traceL1ToL2MessageCheck(_contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
     // NOTE: contractAddress is unused because msgHash is an already-siloed leaf
     if (
       this.l1ToL2MsgReadRequests.length + this.previousValidationRequestArrayLengths.l1ToL2MsgReadRequests >=
@@ -283,20 +273,22 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
     );
   }
 
-  public traceNewL2ToL1Message(contractAddress: AztecAddress, recipient: Fr, content: Fr) {
+  public traceNewL2ToL1Message(contractAddress: Fr, recipient: Fr, content: Fr) {
     if (this.l2ToL1Messages.length + this.previousAccumulatedDataArrayLengths.l2ToL1Msgs >= MAX_L2_TO_L1_MSGS_PER_TX) {
       throw new SideEffectLimitReachedError('l2 to l1 message', MAX_L2_TO_L1_MSGS_PER_TX);
     }
 
     const recipientAddress = EthAddress.fromField(recipient);
     this.l2ToL1Messages.push(
-      new L2ToL1Message(recipientAddress, content, this.sideEffectCounter).scope(contractAddress),
+      new L2ToL1Message(recipientAddress, content, this.sideEffectCounter).scope(
+        AztecAddress.fromField(contractAddress),
+      ),
     );
     this.log.debug(`NEW_L2_TO_L1_MSG cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
-  public traceUnencryptedLog(contractAddress: AztecAddress, log: Fr[]) {
+  public traceUnencryptedLog(contractAddress: Fr, log: Fr[]) {
     if (
       this.unencryptedLogs.length + this.previousAccumulatedDataArrayLengths.unencryptedLogsHashes >=
       MAX_UNENCRYPTED_LOGS_PER_TX
@@ -304,20 +296,25 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
       throw new SideEffectLimitReachedError('unencrypted log', MAX_UNENCRYPTED_LOGS_PER_TX);
     }
 
-    const ulog = new UnencryptedL2Log(contractAddress, Buffer.concat(log.map(f => f.toBuffer())));
+    const ulog = new UnencryptedL2Log(
+      AztecAddress.fromField(contractAddress),
+      Buffer.concat(log.map(f => f.toBuffer())),
+    );
     const basicLogHash = Fr.fromBuffer(ulog.hash());
     this.unencryptedLogs.push(ulog);
     // This length is for charging DA and is checked on-chain - has to be length of log preimage + 4 bytes.
     // The .length call also has a +4 but that is unrelated
     this.unencryptedLogsHashes.push(
-      new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length + 4)).scope(contractAddress),
+      new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length + 4)).scope(
+        AztecAddress.fromField(contractAddress),
+      ),
     );
     this.log.debug(`NEW_UNENCRYPTED_LOG cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
   public traceGetContractInstance(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     exists: boolean,
     instance: SerializableContractInstance = SerializableContractInstance.default(),
   ) {
@@ -342,7 +339,7 @@ export class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceI
   // This happens both when starting a new top-level trace and the start of every nested trace
   // We use this to collect the AvmContractBytecodeHints
   public traceGetBytecode(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     exists: boolean,
     bytecode: Buffer = Buffer.alloc(0),
     contractInstance: SerializableContractInstance = SerializableContractInstance.default(),
diff --git a/yarn-project/simulator/src/public/public_processor.ts b/yarn-project/simulator/src/public/public_processor.ts
index fdc3eca0a1e..ef43a25b28a 100644
--- a/yarn-project/simulator/src/public/public_processor.ts
+++ b/yarn-project/simulator/src/public/public_processor.ts
@@ -12,7 +12,6 @@ import {
   makeProcessedTxFromTxWithPublicCalls,
 } from '@aztec/circuit-types';
 import {
-  type AztecAddress,
   ContractClassRegisteredEvent,
   type ContractDataSource,
   Fr,
@@ -249,7 +248,7 @@ export class PublicProcessor {
   private async getFeePaymentPublicDataWrite(
     publicDataWrites: PublicDataWrite[],
     txFee: Fr,
-    feePayer: AztecAddress,
+    feePayer: Fr,
   ): Promise<PublicDataWrite | undefined> {
     if (feePayer.isZero()) {
       return;
diff --git a/yarn-project/simulator/src/public/side_effect_trace.test.ts b/yarn-project/simulator/src/public/side_effect_trace.test.ts
index 55f15207901..7a65890a6f6 100644
--- a/yarn-project/simulator/src/public/side_effect_trace.test.ts
+++ b/yarn-project/simulator/src/public/side_effect_trace.test.ts
@@ -26,7 +26,7 @@ import { SideEffectLimitReachedError } from './side_effect_errors.js';
 import { PublicSideEffectTrace } from './side_effect_trace.js';
 
 describe('Side Effect Trace', () => {
-  const address = AztecAddress.random();
+  const address = Fr.random();
   const utxo = Fr.random();
   const leafIndex = Fr.random();
   const slot = Fr.random();
@@ -79,7 +79,7 @@ describe('Side Effect Trace', () => {
         storageSlot: slot,
         currentValue: value,
         counter: startCounter,
-        contractAddress: address,
+        contractAddress: AztecAddress.fromField(address),
         //exists: exists,
         //cached: cached,
       },
@@ -97,7 +97,7 @@ describe('Side Effect Trace', () => {
         storageSlot: slot,
         newValue: value,
         counter: startCounter,
-        contractAddress: address,
+        contractAddress: AztecAddress.fromField(address),
       },
     ]);
   });
@@ -215,7 +215,7 @@ describe('Side Effect Trace', () => {
     expect(trace.getCounter()).toBe(startCounterPlus1);
 
     const pxResult = toPxResult(trace);
-    const expectLog = new UnencryptedL2Log(address, Buffer.concat(log.map(f => f.toBuffer())));
+    const expectLog = new UnencryptedL2Log(AztecAddress.fromField(address), Buffer.concat(log.map(f => f.toBuffer())));
     expect(pxResult.unencryptedLogs.logs).toEqual([expectLog]);
     expect(pxResult.allUnencryptedLogs.logs).toEqual([expectLog]);
     expect(pxResult.unencryptedLogsHashes).toEqual([
@@ -245,105 +245,101 @@ describe('Side Effect Trace', () => {
   describe('Maximum accesses', () => {
     it('Should enforce maximum number of public storage reads', () => {
       for (let i = 0; i < MAX_PUBLIC_DATA_READS_PER_TX; i++) {
-        trace.tracePublicStorageRead(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true, true);
+        trace.tracePublicStorageRead(new Fr(i), new Fr(i), new Fr(i), true, true);
       }
-      expect(() =>
-        trace.tracePublicStorageRead(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true),
-      ).toThrow(SideEffectLimitReachedError);
+      expect(() => trace.tracePublicStorageRead(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
+        SideEffectLimitReachedError,
+      );
     });
 
     it('Should enforce maximum number of public storage writes', () => {
       for (let i = 0; i < MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX; i++) {
-        trace.tracePublicStorageWrite(AztecAddress.fromNumber(i), new Fr(i), new Fr(i));
+        trace.tracePublicStorageWrite(new Fr(i), new Fr(i), new Fr(i));
       }
-      expect(() => trace.tracePublicStorageWrite(AztecAddress.fromNumber(42), new Fr(42), new Fr(42))).toThrow(
+      expect(() => trace.tracePublicStorageWrite(new Fr(42), new Fr(42), new Fr(42))).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of note hash checks', () => {
       for (let i = 0; i < MAX_NOTE_HASH_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNoteHashCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true);
+        trace.traceNoteHashCheck(new Fr(i), new Fr(i), new Fr(i), true);
       }
-      expect(() => trace.traceNoteHashCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true)).toThrow(
+      expect(() => trace.traceNoteHashCheck(new Fr(42), new Fr(42), new Fr(42), true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new note hashes', () => {
       for (let i = 0; i < MAX_NOTE_HASHES_PER_TX; i++) {
-        trace.traceNewNoteHash(AztecAddress.fromNumber(i), new Fr(i));
+        trace.traceNewNoteHash(new Fr(i), new Fr(i));
       }
-      expect(() => trace.traceNewNoteHash(AztecAddress.fromNumber(42), new Fr(42))).toThrow(
-        SideEffectLimitReachedError,
-      );
+      expect(() => trace.traceNewNoteHash(new Fr(42), new Fr(42))).toThrow(SideEffectLimitReachedError);
     });
 
     it('Should enforce maximum number of nullifier checks', () => {
       for (let i = 0; i < MAX_NULLIFIER_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), true, true);
       }
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
         SideEffectLimitReachedError,
       );
       // NOTE: also cannot do a non-existent check once existent checks have filled up
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), false, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), false, true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of nullifier non-existent checks', () => {
       for (let i = 0; i < MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), false, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), false, true);
       }
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), false, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), false, true)).toThrow(
         SideEffectLimitReachedError,
       );
       // NOTE: also cannot do a existent check once non-existent checks have filled up
-      expect(() => trace.traceNullifierCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true, true)).toThrow(
+      expect(() => trace.traceNullifierCheck(new Fr(42), new Fr(42), new Fr(42), true, true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new nullifiers', () => {
       for (let i = 0; i < MAX_NULLIFIERS_PER_TX; i++) {
-        trace.traceNewNullifier(AztecAddress.fromNumber(i), new Fr(i));
+        trace.traceNewNullifier(new Fr(i), new Fr(i));
       }
-      expect(() => trace.traceNewNullifier(AztecAddress.fromNumber(42), new Fr(42))).toThrow(
-        SideEffectLimitReachedError,
-      );
+      expect(() => trace.traceNewNullifier(new Fr(42), new Fr(42))).toThrow(SideEffectLimitReachedError);
     });
 
     it('Should enforce maximum number of L1 to L2 message checks', () => {
       for (let i = 0; i < MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX; i++) {
-        trace.traceL1ToL2MessageCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true);
+        trace.traceL1ToL2MessageCheck(new Fr(i), new Fr(i), new Fr(i), true);
       }
-      expect(() => trace.traceL1ToL2MessageCheck(AztecAddress.fromNumber(42), new Fr(42), new Fr(42), true)).toThrow(
+      expect(() => trace.traceL1ToL2MessageCheck(new Fr(42), new Fr(42), new Fr(42), true)).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new l2 to l1 messages', () => {
       for (let i = 0; i < MAX_L2_TO_L1_MSGS_PER_TX; i++) {
-        trace.traceNewL2ToL1Message(AztecAddress.fromNumber(i), new Fr(i), new Fr(i));
+        trace.traceNewL2ToL1Message(new Fr(i), new Fr(i), new Fr(i));
       }
-      expect(() => trace.traceNewL2ToL1Message(AztecAddress.fromNumber(42), new Fr(42), new Fr(42))).toThrow(
+      expect(() => trace.traceNewL2ToL1Message(new Fr(42), new Fr(42), new Fr(42))).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of new logs hashes', () => {
       for (let i = 0; i < MAX_UNENCRYPTED_LOGS_PER_TX; i++) {
-        trace.traceUnencryptedLog(AztecAddress.fromNumber(i), [new Fr(i), new Fr(i)]);
+        trace.traceUnencryptedLog(new Fr(i), [new Fr(i), new Fr(i)]);
       }
-      expect(() => trace.traceUnencryptedLog(AztecAddress.fromNumber(42), [new Fr(42), new Fr(42)])).toThrow(
+      expect(() => trace.traceUnencryptedLog(new Fr(42), [new Fr(42), new Fr(42)])).toThrow(
         SideEffectLimitReachedError,
       );
     });
 
     it('Should enforce maximum number of nullifier checks for GETCONTRACTINSTANCE', () => {
       for (let i = 0; i < MAX_NULLIFIER_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), true, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), true, true);
       }
       expect(() => trace.traceGetContractInstance(address, /*exists=*/ true, contractInstance)).toThrow(
         SideEffectLimitReachedError,
@@ -356,7 +352,7 @@ describe('Side Effect Trace', () => {
 
     it('Should enforce maximum number of nullifier non-existent checks for GETCONTRACTINSTANCE', () => {
       for (let i = 0; i < MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX; i++) {
-        trace.traceNullifierCheck(AztecAddress.fromNumber(i), new Fr(i), new Fr(i), false, true);
+        trace.traceNullifierCheck(new Fr(i), new Fr(i), new Fr(i), false, true);
       }
       expect(() => trace.traceGetContractInstance(address, /*exists=*/ false, contractInstance)).toThrow(
         SideEffectLimitReachedError,
diff --git a/yarn-project/simulator/src/public/side_effect_trace.ts b/yarn-project/simulator/src/public/side_effect_trace.ts
index 4a1c2e15da3..e1b370ab81b 100644
--- a/yarn-project/simulator/src/public/side_effect_trace.ts
+++ b/yarn-project/simulator/src/public/side_effect_trace.ts
@@ -5,7 +5,7 @@ import {
   AvmExecutionHints,
   AvmExternalCallHint,
   AvmKeyValueHint,
-  type AztecAddress,
+  AztecAddress,
   CallContext,
   type CombinedConstantData,
   type ContractClassIdPreimage,
@@ -100,18 +100,14 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.sideEffectCounter++;
   }
 
-  public tracePublicStorageRead(
-    contractAddress: AztecAddress,
-    slot: Fr,
-    value: Fr,
-    _exists: boolean,
-    _cached: boolean,
-  ) {
+  public tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, _exists: boolean, _cached: boolean) {
     // NOTE: exists and cached are unused for now but may be used for optimizations or kernel hints later
     if (this.contractStorageReads.length >= MAX_PUBLIC_DATA_READS_PER_TX) {
       throw new SideEffectLimitReachedError('contract storage read', MAX_PUBLIC_DATA_READS_PER_TX);
     }
-    this.contractStorageReads.push(new ContractStorageRead(slot, value, this.sideEffectCounter, contractAddress));
+    this.contractStorageReads.push(
+      new ContractStorageRead(slot, value, this.sideEffectCounter, AztecAddress.fromField(contractAddress)),
+    );
     this.avmCircuitHints.storageValues.items.push(
       new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ value),
     );
@@ -119,7 +115,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.incrementSideEffectCounter();
   }
 
-  public tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr) {
+  public tracePublicStorageWrite(contractAddress: Fr, slot: Fr, value: Fr) {
     if (this.contractStorageUpdateRequests.length >= MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
       throw new SideEffectLimitReachedError('contract storage write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
     }
@@ -131,7 +127,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
   }
 
   // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
-  public traceNoteHashCheck(_contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean) {
+  public traceNoteHashCheck(_contractAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean) {
     // NOTE: contractAddress is unused but will be important when an AVM circuit processes an entire enqueued call
     if (this.noteHashReadRequests.length >= MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
       throw new SideEffectLimitReachedError('note hash read request', MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
@@ -143,7 +139,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     // NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
   }
 
-  public traceNewNoteHash(_contractAddress: AztecAddress, noteHash: Fr) {
+  public traceNewNoteHash(_contractAddress: Fr, noteHash: Fr) {
     if (this.noteHashes.length >= MAX_NOTE_HASHES_PER_TX) {
       throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
     }
@@ -153,7 +149,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
   }
 
   public traceNullifierCheck(
-    _contractAddress: AztecAddress,
+    _contractAddress: Fr,
     nullifier: Fr,
     _leafIndex: Fr,
     exists: boolean,
@@ -177,7 +173,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.incrementSideEffectCounter();
   }
 
-  public traceNewNullifier(_contractAddress: AztecAddress, nullifier: Fr) {
+  public traceNewNullifier(_contractAddress: Fr, nullifier: Fr) {
     // NOTE: contractAddress is unused but will be important when an AVM circuit processes an entire enqueued call
     if (this.nullifiers.length >= MAX_NULLIFIERS_PER_TX) {
       throw new SideEffectLimitReachedError('nullifier', MAX_NULLIFIERS_PER_TX);
@@ -188,7 +184,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
   }
 
   // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
-  public traceL1ToL2MessageCheck(_contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
+  public traceL1ToL2MessageCheck(_contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
     // NOTE: contractAddress is unused but will be important when an AVM circuit processes an entire enqueued call
     if (this.l1ToL2MsgReadRequests.length >= MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX) {
       throw new SideEffectLimitReachedError('l1 to l2 message read request', MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX);
@@ -200,7 +196,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     // NOTE: counter does not increment for l1tol2 message checks (because it doesn't rely on pending messages)
   }
 
-  public traceNewL2ToL1Message(_contractAddress: AztecAddress, recipient: Fr, content: Fr) {
+  public traceNewL2ToL1Message(_contractAddress: Fr, recipient: Fr, content: Fr) {
     if (this.newL2ToL1Messages.length >= MAX_L2_TO_L1_MSGS_PER_TX) {
       throw new SideEffectLimitReachedError('l2 to l1 message', MAX_L2_TO_L1_MSGS_PER_TX);
     }
@@ -210,11 +206,14 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.incrementSideEffectCounter();
   }
 
-  public traceUnencryptedLog(contractAddress: AztecAddress, log: Fr[]) {
+  public traceUnencryptedLog(contractAddress: Fr, log: Fr[]) {
     if (this.unencryptedLogs.length >= MAX_UNENCRYPTED_LOGS_PER_TX) {
       throw new SideEffectLimitReachedError('unencrypted log', MAX_UNENCRYPTED_LOGS_PER_TX);
     }
-    const ulog = new UnencryptedL2Log(contractAddress, Buffer.concat(log.map(f => f.toBuffer())));
+    const ulog = new UnencryptedL2Log(
+      AztecAddress.fromField(contractAddress),
+      Buffer.concat(log.map(f => f.toBuffer())),
+    );
     const basicLogHash = Fr.fromBuffer(ulog.hash());
     this.unencryptedLogs.push(ulog);
     this.allUnencryptedLogs.push(ulog);
@@ -226,7 +225,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
   }
 
   public traceGetContractInstance(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     exists: boolean,
     instance: SerializableContractInstance = SerializableContractInstance.default(),
   ) {
@@ -251,7 +250,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
   // This happens both when starting a new top-level trace and the start of every nested trace
   // We use this to collect the AvmContractBytecodeHints
   public traceGetBytecode(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     exists: boolean,
     bytecode: Buffer = Buffer.alloc(0),
     contractInstance: SerializableContractInstance = SerializableContractInstance.default(),
diff --git a/yarn-project/simulator/src/public/side_effect_trace_interface.ts b/yarn-project/simulator/src/public/side_effect_trace_interface.ts
index 9092c183427..66602405845 100644
--- a/yarn-project/simulator/src/public/side_effect_trace_interface.ts
+++ b/yarn-project/simulator/src/public/side_effect_trace_interface.ts
@@ -7,7 +7,6 @@ import {
   type SerializableContractInstance,
   type VMCircuitPublicInputs,
 } from '@aztec/circuits.js';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
 
 import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
@@ -18,28 +17,18 @@ export interface PublicSideEffectTraceInterface {
   fork(incrementSideEffectCounter?: boolean): PublicSideEffectTraceInterface;
   getCounter(): number;
   // all "trace*" functions can throw SideEffectLimitReachedError
-  tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, exists: boolean, cached: boolean): void;
-  tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr): void;
-  traceNoteHashCheck(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean): void;
-  traceNewNoteHash(contractAddress: AztecAddress, noteHash: Fr): void;
-  traceNullifierCheck(
-    contractAddress: AztecAddress,
-    nullifier: Fr,
-    leafIndex: Fr,
-    exists: boolean,
-    isPending: boolean,
-  ): void;
-  traceNewNullifier(contractAddress: AztecAddress, nullifier: Fr): void;
-  traceL1ToL2MessageCheck(contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean): void;
-  traceNewL2ToL1Message(contractAddress: AztecAddress, recipient: Fr, content: Fr): void;
-  traceUnencryptedLog(contractAddress: AztecAddress, log: Fr[]): void;
-  traceGetContractInstance(
-    contractAddress: AztecAddress,
-    exists: boolean,
-    instance?: SerializableContractInstance,
-  ): void;
+  tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, exists: boolean, cached: boolean): void;
+  tracePublicStorageWrite(contractAddress: Fr, slot: Fr, value: Fr): void;
+  traceNoteHashCheck(contractAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean): void;
+  traceNewNoteHash(contractAddress: Fr, noteHash: Fr): void;
+  traceNullifierCheck(contractAddress: Fr, nullifier: Fr, leafIndex: Fr, exists: boolean, isPending: boolean): void;
+  traceNewNullifier(contractAddress: Fr, nullifier: Fr): void;
+  traceL1ToL2MessageCheck(contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean): void;
+  traceNewL2ToL1Message(contractAddress: Fr, recipient: Fr, content: Fr): void;
+  traceUnencryptedLog(contractAddress: Fr, log: Fr[]): void;
+  traceGetContractInstance(contractAddress: Fr, exists: boolean, instance?: SerializableContractInstance): void;
   traceGetBytecode(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     exists: boolean,
     bytecode?: Buffer,
     contractInstance?: SerializableContractInstance,
diff --git a/yarn-project/txe/package.json b/yarn-project/txe/package.json
index e109bd49925..b25781fc605 100644
--- a/yarn-project/txe/package.json
+++ b/yarn-project/txe/package.json
@@ -73,8 +73,7 @@
     "@aztec/simulator": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/types": "workspace:^",
-    "@aztec/world-state": "workspace:^",
-    "zod": "^3.23.8"
+    "@aztec/world-state": "workspace:^"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
diff --git a/yarn-project/txe/src/bin/index.ts b/yarn-project/txe/src/bin/index.ts
index e15701b1165..a2fba6f3777 100644
--- a/yarn-project/txe/src/bin/index.ts
+++ b/yarn-project/txe/src/bin/index.ts
@@ -1,29 +1,31 @@
 #!/usr/bin/env -S node --no-warnings
 import { createDebugLogger } from '@aztec/aztec.js';
-import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
+import { createStatusRouter } from '@aztec/foundation/json-rpc/server';
+
+import http from 'http';
 
 import { createTXERpcServer } from '../index.js';
 
 /**
  * Create and start a new TXE HTTP Server
  */
-async function main() {
+function main() {
   const { TXE_PORT = 8080 } = process.env;
 
   const logger = createDebugLogger('aztec:txe_service');
   logger.info(`Setting up TXE...`);
 
   const txeServer = createTXERpcServer(logger);
-  const { port } = await startHttpRpcServer(txeServer, {
-    port: TXE_PORT,
-    timeoutMs: 1e3 * 60 * 5,
-  });
+  const app = txeServer.getApp();
+  // add status route
+  const statusRouter = createStatusRouter(() => txeServer.isHealthy());
+  app.use(statusRouter.routes()).use(statusRouter.allowedMethods());
+
+  const httpServer = http.createServer(app.callback());
+  httpServer.timeout = 1e3 * 60 * 5; // 5 minutes
+  httpServer.listen(TXE_PORT);
 
-  logger.info(`TXE listening on port ${port}`);
+  logger.info(`TXE listening on port ${TXE_PORT}`);
 }
 
-main().catch(err => {
-  // eslint-disable-next-line no-console
-  console.error(err);
-  process.exit(1);
-});
+main();
diff --git a/yarn-project/txe/src/index.ts b/yarn-project/txe/src/index.ts
index 47079c7f6a5..3b03e89c2e6 100644
--- a/yarn-project/txe/src/index.ts
+++ b/yarn-project/txe/src/index.ts
@@ -1,22 +1,13 @@
 import { loadContractArtifact } from '@aztec/aztec.js';
-import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { Fr } from '@aztec/foundation/fields';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 import { type Logger } from '@aztec/foundation/log';
-import { type ApiSchemaFor, type ZodFor } from '@aztec/foundation/schemas';
 
 import { readFile, readdir } from 'fs/promises';
 import { join } from 'path';
-import { z } from 'zod';
 
 import { TXEService } from './txe_service/txe_service.js';
-import {
-  type ForeignCallArgs,
-  ForeignCallArgsSchema,
-  type ForeignCallArray,
-  type ForeignCallResult,
-  ForeignCallResultSchema,
-  fromArray,
-  toForeignCallResult,
-} from './util/encoding.js';
+import { type ForeignCallArray, type ForeignCallResult, fromArray, toForeignCallResult } from './util/encoding.js';
 
 const TXESessions = new Map<number, TXEService>();
 
@@ -29,20 +20,9 @@ type TXEForeignCallInput = {
   function: MethodNames<TXEService> | 'reset';
   root_path: string;
   package_name: string;
-  inputs: ForeignCallArgs;
+  inputs: any[];
 };
 
-const TXEForeignCallInputSchema = z.object({
-  // eslint-disable-next-line camelcase
-  session_id: z.number(),
-  function: z.string() as ZodFor<MethodNames<TXEService> | 'reset'>,
-  // eslint-disable-next-line camelcase
-  root_path: z.string(),
-  // eslint-disable-next-line camelcase
-  package_name: z.string(),
-  inputs: ForeignCallArgsSchema,
-}) satisfies ZodFor<TXEForeignCallInput>;
-
 class TXEDispatcher {
   constructor(private logger: Logger) {}
 
@@ -109,16 +89,11 @@ class TXEDispatcher {
   }
 }
 
-const TXEDispatcherApiChema: ApiSchemaFor<TXEDispatcher> = {
-  // eslint-disable-next-line camelcase
-  resolve_foreign_call: z.function().args(TXEForeignCallInputSchema).returns(ForeignCallResultSchema),
-};
-
 /**
  * Creates an RPC server that forwards calls to the TXE.
  * @param logger - Logger to output to
  * @returns A TXE RPC server.
  */
 export function createTXERpcServer(logger: Logger) {
-  return createSafeJsonRpcServer(new TXEDispatcher(logger), TXEDispatcherApiChema);
+  return new JsonRpcServer(new TXEDispatcher(logger), { Fr }, {}, ['init']);
 }
diff --git a/yarn-project/txe/src/oracle/txe_oracle.ts b/yarn-project/txe/src/oracle/txe_oracle.ts
index 947e40671f9..242c8be2ae7 100644
--- a/yarn-project/txe/src/oracle/txe_oracle.ts
+++ b/yarn-project/txe/src/oracle/txe_oracle.ts
@@ -136,7 +136,7 @@ export class TXE implements TypedOracle {
     return this.functionSelector;
   }
 
-  setMsgSender(msgSender: AztecAddress) {
+  setMsgSender(msgSender: Fr) {
     this.msgSender = msgSender;
   }
 
@@ -471,7 +471,7 @@ export class TXE implements TypedOracle {
   }
 
   async storageRead(
-    contractAddress: AztecAddress,
+    contractAddress: Fr,
     startStorageSlot: Fr,
     blockNumber: number,
     numberOfElements: number,
@@ -548,8 +548,8 @@ export class TXE implements TypedOracle {
     );
 
     // Store and modify env
-    const currentContractAddress = this.contractAddress;
-    const currentMessageSender = this.msgSender;
+    const currentContractAddress = AztecAddress.fromField(this.contractAddress);
+    const currentMessageSender = AztecAddress.fromField(this.msgSender);
     const currentFunctionSelector = FunctionSelector.fromField(this.functionSelector.toField());
     this.setMsgSender(this.contractAddress);
     this.setContractAddress(targetContractAddress);
@@ -695,8 +695,8 @@ export class TXE implements TypedOracle {
     isStaticCall: boolean,
   ): Promise<Fr> {
     // Store and modify env
-    const currentContractAddress = this.contractAddress;
-    const currentMessageSender = this.msgSender;
+    const currentContractAddress = AztecAddress.fromField(this.contractAddress);
+    const currentMessageSender = AztecAddress.fromField(this.msgSender);
     const currentFunctionSelector = FunctionSelector.fromField(this.functionSelector.toField());
     this.setMsgSender(this.contractAddress);
     this.setContractAddress(targetContractAddress);
@@ -834,8 +834,8 @@ export class TXE implements TypedOracle {
     isStaticCall: boolean,
   ): Promise<EnqueuedPublicCallExecutionResultWithSideEffects> {
     // Store and modify env
-    const currentContractAddress = this.contractAddress;
-    const currentMessageSender = this.msgSender;
+    const currentContractAddress = AztecAddress.fromField(this.contractAddress);
+    const currentMessageSender = AztecAddress.fromField(this.msgSender);
     this.setMsgSender(this.contractAddress);
     this.setContractAddress(targetContractAddress);
 
diff --git a/yarn-project/txe/src/txe_service/txe_service.ts b/yarn-project/txe/src/txe_service/txe_service.ts
index f5bb2fc80fb..7abccd7cb45 100644
--- a/yarn-project/txe/src/txe_service/txe_service.ts
+++ b/yarn-project/txe/src/txe_service/txe_service.ts
@@ -26,7 +26,6 @@ import { TXE } from '../oracle/txe_oracle.js';
 import {
   type ForeignCallArray,
   type ForeignCallSingle,
-  addressFromSingle,
   fromArray,
   fromSingle,
   toArray,
@@ -88,7 +87,7 @@ export class TXEService {
   }
 
   setContractAddress(address: ForeignCallSingle) {
-    const typedAddress = addressFromSingle(address);
+    const typedAddress = AztecAddress.fromField(fromSingle(address));
     (this.typedOracle as TXE).setContractAddress(typedAddress);
     return toForeignCallResult([]);
   }
@@ -130,7 +129,7 @@ export class TXEService {
     return toForeignCallResult([
       toArray([
         instance.salt,
-        instance.deployer.toField(),
+        instance.deployer,
         instance.contractClassId,
         instance.initializationHash,
         ...instance.publicKeys.toFields(),
@@ -146,7 +145,7 @@ export class TXEService {
     const trees = (this.typedOracle as TXE).getTrees();
     const startStorageSlotFr = fromSingle(startStorageSlot);
     const valuesFr = fromArray(values);
-    const contractAddressFr = addressFromSingle(contractAddress);
+    const contractAddressFr = fromSingle(contractAddress);
     const db = await trees.getLatest();
 
     const publicDataWrites = valuesFr.map((value, i) => {
@@ -208,7 +207,7 @@ export class TXEService {
   }
 
   async addAuthWitness(address: ForeignCallSingle, messageHash: ForeignCallSingle) {
-    await (this.typedOracle as TXE).addAuthWitness(addressFromSingle(address), fromSingle(messageHash));
+    await (this.typedOracle as TXE).addAuthWitness(fromSingle(address), fromSingle(messageHash));
     return toForeignCallResult([]);
   }
 
@@ -218,7 +217,7 @@ export class TXEService {
     _length: ForeignCallSingle,
     args: ForeignCallArray,
   ) {
-    const parsedAddress = addressFromSingle(address);
+    const parsedAddress = fromSingle(address);
     const parsedSelector = fromSingle(functionSelector);
     const extendedArgs = [parsedSelector, ...fromArray(args)];
     const result = await (this.typedOracle as TXE).avmOpcodeCall(parsedAddress, extendedArgs, false);
@@ -238,7 +237,7 @@ export class TXEService {
   ) {
     try {
       await this.typedOracle.callPrivateFunction(
-        addressFromSingle(targetContractAddress),
+        fromSingle(targetContractAddress),
         FunctionSelector.fromField(fromSingle(functionSelector)),
         fromSingle(argsHash),
         fromSingle(sideEffectCounter).toNumber(),
@@ -307,7 +306,7 @@ export class TXEService {
     numberOfElements: ForeignCallSingle,
   ) {
     const values = await this.typedOracle.storageRead(
-      addressFromSingle(contractAddress),
+      fromSingle(contractAddress),
       fromSingle(startStorageSlot),
       fromSingle(blockNumber).toNumber(),
       fromSingle(numberOfElements).toNumber(),
@@ -392,7 +391,7 @@ export class TXEService {
     ]);
 
     const returnFieldSize = fromSingle(returnSize).toNumber();
-    const returnData = [noteDatas.length, contractAddress.toField(), ...flattenData].map(v => new Fr(v));
+    const returnData = [noteDatas.length, contractAddress, ...flattenData].map(v => new Fr(v));
     if (returnData.length > returnFieldSize) {
       throw new Error(`Return data size too big. Maximum ${returnFieldSize} fields. Got ${flattenData.length}.`);
     }
@@ -437,11 +436,11 @@ export class TXEService {
   }
 
   async getContractInstance(address: ForeignCallSingle) {
-    const instance = await this.typedOracle.getContractInstance(addressFromSingle(address));
+    const instance = await this.typedOracle.getContractInstance(fromSingle(address));
     return toForeignCallResult([
       toArray([
         instance.salt,
-        instance.deployer.toField(),
+        instance.deployer,
         instance.contractClassId,
         instance.initializationHash,
         ...instance.publicKeys.toFields(),
@@ -450,7 +449,7 @@ export class TXEService {
   }
 
   async getPublicKeysAndPartialAddress(address: ForeignCallSingle) {
-    const parsedAddress = addressFromSingle(address);
+    const parsedAddress = AztecAddress.fromField(fromSingle(address));
     const { publicKeys, partialAddress } = await this.typedOracle.getCompleteAddress(parsedAddress);
     return toForeignCallResult([toArray([...publicKeys.toFields(), partialAddress])]);
   }
@@ -492,7 +491,7 @@ export class TXEService {
     isStaticCall: ForeignCallSingle,
   ) {
     const result = await this.typedOracle.callPrivateFunction(
-      addressFromSingle(targetContractAddress),
+      fromSingle(targetContractAddress),
       FunctionSelector.fromField(fromSingle(functionSelector)),
       fromSingle(argsHash),
       fromSingle(sideEffectCounter).toNumber(),
@@ -527,7 +526,7 @@ export class TXEService {
     isStaticCall: ForeignCallSingle,
   ) {
     const newArgsHash = await this.typedOracle.enqueuePublicFunctionCall(
-      addressFromSingle(targetContractAddress),
+      fromSingle(targetContractAddress),
       FunctionSelector.fromField(fromSingle(functionSelector)),
       fromSingle(argsHash),
       fromSingle(sideEffectCounter).toNumber(),
@@ -544,7 +543,7 @@ export class TXEService {
     isStaticCall: ForeignCallSingle,
   ) {
     const newArgsHash = await this.typedOracle.setPublicTeardownFunctionCall(
-      addressFromSingle(targetContractAddress),
+      fromSingle(targetContractAddress),
       FunctionSelector.fromField(fromSingle(functionSelector)),
       fromSingle(argsHash),
       fromSingle(sideEffectCounter).toNumber(),
@@ -566,12 +565,12 @@ export class TXEService {
   }
 
   async addNullifiers(contractAddress: ForeignCallSingle, _length: ForeignCallSingle, nullifiers: ForeignCallArray) {
-    await (this.typedOracle as TXE).addNullifiers(addressFromSingle(contractAddress), fromArray(nullifiers));
+    await (this.typedOracle as TXE).addNullifiers(fromSingle(contractAddress), fromArray(nullifiers));
     return toForeignCallResult([]);
   }
 
   async addNoteHashes(contractAddress: ForeignCallSingle, _length: ForeignCallSingle, noteHashes: ForeignCallArray) {
-    await (this.typedOracle as TXE).addNoteHashes(addressFromSingle(contractAddress), fromArray(noteHashes));
+    await (this.typedOracle as TXE).addNoteHashes(fromSingle(contractAddress), fromArray(noteHashes));
     return toForeignCallResult([]);
   }
 
@@ -632,7 +631,7 @@ export class TXEService {
   }
 
   async avmOpcodeGetContractInstanceDeployer(address: ForeignCallSingle) {
-    const instance = await this.typedOracle.getContractInstance(addressFromSingle(address));
+    const instance = await this.typedOracle.getContractInstance(fromSingle(address));
     return toForeignCallResult([
       toSingle(instance.deployer),
       // AVM requires an extra boolean indicating the instance was found
@@ -641,7 +640,7 @@ export class TXEService {
   }
 
   async avmOpcodeGetContractInstanceClassId(address: ForeignCallSingle) {
-    const instance = await this.typedOracle.getContractInstance(addressFromSingle(address));
+    const instance = await this.typedOracle.getContractInstance(fromSingle(address));
     return toForeignCallResult([
       toSingle(instance.contractClassId),
       // AVM requires an extra boolean indicating the instance was found
@@ -650,7 +649,7 @@ export class TXEService {
   }
 
   async avmOpcodeGetContractInstanceInitializationHash(address: ForeignCallSingle) {
-    const instance = await this.typedOracle.getContractInstance(addressFromSingle(address));
+    const instance = await this.typedOracle.getContractInstance(fromSingle(address));
     return toForeignCallResult([
       toSingle(instance.initializationHash),
       // AVM requires an extra boolean indicating the instance was found
@@ -732,7 +731,7 @@ export class TXEService {
     args: ForeignCallArray,
   ) {
     const result = await (this.typedOracle as TXE).avmOpcodeCall(
-      addressFromSingle(address),
+      fromSingle(address),
       fromArray(args),
       /* isStaticCall */ false,
     );
@@ -762,7 +761,7 @@ export class TXEService {
     args: ForeignCallArray,
   ) {
     const result = await (this.typedOracle as TXE).avmOpcodeCall(
-      addressFromSingle(address),
+      fromSingle(address),
       fromArray(args),
       /* isStaticCall */ true,
     );
diff --git a/yarn-project/txe/src/util/encoding.ts b/yarn-project/txe/src/util/encoding.ts
index 0b65122a61f..0d4a78ba61a 100644
--- a/yarn-project/txe/src/util/encoding.ts
+++ b/yarn-project/txe/src/util/encoding.ts
@@ -1,15 +1,9 @@
-import { AztecAddress } from '@aztec/circuits.js';
-import { type ContractArtifact, ContractArtifactSchema } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 
-import { z } from 'zod';
-
 export type ForeignCallSingle = string;
 
 export type ForeignCallArray = string[];
 
-export type ForeignCallArgs = (ForeignCallSingle | ForeignCallArray | ContractArtifact)[];
-
 export type ForeignCallResult = {
   values: (ForeignCallSingle | ForeignCallArray)[];
 };
@@ -18,15 +12,11 @@ export function fromSingle(obj: ForeignCallSingle) {
   return Fr.fromBuffer(Buffer.from(obj, 'hex'));
 }
 
-export function addressFromSingle(obj: ForeignCallSingle) {
-  return new AztecAddress(fromSingle(obj));
-}
-
 export function fromArray(obj: ForeignCallArray) {
   return obj.map(str => Fr.fromBuffer(Buffer.from(str, 'hex')));
 }
 
-export function toSingle(obj: Fr | AztecAddress) {
+export function toSingle(obj: Fr) {
   return obj.toString().slice(2);
 }
 
@@ -37,15 +27,3 @@ export function toArray(objs: Fr[]) {
 export function toForeignCallResult(obj: (ForeignCallSingle | ForeignCallArray)[]) {
   return { values: obj };
 }
-
-export const ForeignCallSingleSchema = z.string();
-
-export const ForeignCallArraySchema = z.array(z.string());
-
-export const ForeignCallArgsSchema = z.array(
-  z.union([ForeignCallSingleSchema, ForeignCallArraySchema, ContractArtifactSchema]),
-);
-
-export const ForeignCallResultSchema = z.object({
-  values: z.array(z.union([ForeignCallSingleSchema, ForeignCallArraySchema])),
-});
diff --git a/yarn-project/types/src/abi/contract_artifact.ts b/yarn-project/types/src/abi/contract_artifact.ts
index 4fc0616e78c..e6c12bd4427 100644
--- a/yarn-project/types/src/abi/contract_artifact.ts
+++ b/yarn-project/types/src/abi/contract_artifact.ts
@@ -179,10 +179,9 @@ function generateFunctionArtifact(fn: NoirCompiledContractFunction, contract: No
     parameters,
     returnTypes,
     bytecode: Buffer.from(fn.bytecode, 'base64'),
+    verificationKey: fn.verification_key,
     debugSymbols: fn.debug_symbols,
     errorTypes: fn.abi.error_types,
-    ...(fn.assert_messages ? { assertMessages: fn.assert_messages } : undefined),
-    ...(fn.verification_key ? { verificationKey: fn.verification_key } : undefined),
   };
 }
 
@@ -308,7 +307,7 @@ function generateContractArtifact(contract: NoirCompiledContract, aztecNrVersion
       storageLayout: getStorageLayout(contract),
       notes: getNoteTypes(contract),
       fileMap: contract.file_map,
-      ...(aztecNrVersion ? { aztecNrVersion } : {}),
+      aztecNrVersion,
     };
   } catch (err) {
     throw new Error(`Could not generate contract artifact for ${contract.name}: ${err}`);
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index b1e7319c4ef..335dbacd01c 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -351,7 +351,6 @@ __metadata:
     ts-node: ^10.9.1
     tslib: ^2.4.0
     typescript: ^5.0.4
-    zod: ^3.23.8
   languageName: unknown
   linkType: soft
 
@@ -385,7 +384,6 @@ __metadata:
     "@types/jest": ^29.5.0
     "@types/lodash.clonedeep": ^4.5.7
     "@types/lodash.isequal": ^4.5.6
-    "@types/lodash.omit": ^4.5.9
     "@types/lodash.times": ^4.3.7
     "@types/node": ^18.7.23
     browserify-cipher: ^1.0.1
@@ -393,7 +391,6 @@ __metadata:
     jest-mock-extended: ^3.0.3
     lodash.clonedeep: ^4.5.0
     lodash.isequal: ^4.5.0
-    lodash.omit: ^4.5.0
     lodash.times: ^4.3.2
     ts-node: ^10.9.1
     tslib: ^2.5.0
@@ -408,7 +405,6 @@ __metadata:
   resolution: "@aztec/circuits.js@workspace:circuits.js"
   dependencies:
     "@aztec/bb.js": "portal:../../barretenberg/ts"
-    "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/types": "workspace:^"
     "@jest/globals": ^29.5.0
@@ -422,7 +418,6 @@ __metadata:
     ts-node: ^10.9.1
     tslib: ^2.4.0
     typescript: ^5.0.4
-    zod: ^3.23.8
   languageName: unknown
   linkType: soft
 
@@ -627,7 +622,6 @@ __metadata:
     tslib: ^2.4.0
     typescript: ^5.0.4
     viem: ^2.7.15
-    zod: ^3.23.8
   languageName: unknown
   linkType: soft
 
@@ -1228,7 +1222,6 @@ __metadata:
     jest-mock-extended: ^3.0.3
     ts-node: ^10.9.1
     typescript: ^5.0.4
-    zod: ^3.23.8
   bin:
     txe: ./dest/bin/index.js
   languageName: unknown