@aztec/aztec.js 0.32.0 → 0.33.0

package/src/contract/base_contract_interaction.ts

@@ -1,6 +1,6 @@
-import { PXE, Tx, TxExecutionRequest } from '@aztec/circuit-types';
+import { type PXE, type Tx, type TxExecutionRequest } from '@aztec/circuit-types';
 
-import { FeeOptions } from '../entrypoint/entrypoint.js';
+import { type FeeOptions } from '../entrypoint/entrypoint.js';
 import { SentTx } from './sent_tx.js';
 
 /**
@@ -37,13 +37,13 @@ export abstract class BaseContractInteraction {
   public abstract create(options?: SendMethodOptions): Promise<TxExecutionRequest>;
 
   /**
-   * Simulates a transaction execution request and returns a tx object ready to be sent.
+   * Proves a transaction execution request and returns a tx object ready to be sent.
    * @param options - optional arguments to be used in the creation of the transaction
    * @returns The resulting transaction
    */
-  public async simulate(options: SendMethodOptions = {}): Promise<Tx> {
+  public async prove(options: SendMethodOptions = {}): Promise<Tx> {
     const txRequest = this.txRequest ?? (await this.create(options));
-    this.tx = await this.pxe.simulateTx(txRequest, !options.skipPublicSimulation);
+    this.tx = await this.pxe.proveTx(txRequest, !options.skipPublicSimulation);
     return this.tx;
   }
 
@@ -58,7 +58,7 @@ export abstract class BaseContractInteraction {
    */
   public send(options: SendMethodOptions = {}) {
     const promise = (async () => {
-      const tx = this.tx ?? (await this.simulate(options));
+      const tx = this.tx ?? (await this.prove(options));
       return this.pxe.sendTx(tx);
     })();
 

package/src/contract/batch_call.ts

@@ -1,7 +1,7 @@
-import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
+import { type FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types';
 
-import { Wallet } from '../account/index.js';
-import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js';
+import { type Wallet } from '../account/index.js';
+import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
 
 /** A batch of function calls to be sent as a single transaction through a wallet. */
 export class BatchCall extends BaseContractInteraction {

package/src/contract/checker.ts

@@ -1,4 +1,4 @@
-import { ABIType, BasicType, ContractArtifact, StructType } from '@aztec/foundation/abi';
+import { type AbiType, type BasicType, type ContractArtifact, type StructType } from '@aztec/foundation/abi';
 
 /**
  * Represents a type derived from input type T with the 'kind' property removed.
@@ -51,10 +51,10 @@ export function abiChecker(artifact: ContractArtifact) {
  * Throws an error if the type has an unrecognized kind or incorrectly formed attributes.
  * Additionally, checks nested types for array and struct kinds.
  *
- * @param type - The ABIType object representing the type of the ABI function parameter.
+ * @param type - The AbiType object representing the type of the ABI function parameter.
  * @returns A boolean value indicating whether the type is valid or not.
  */
-function abiParameterTypeChecker(type: ABIType): boolean {
+function abiParameterTypeChecker(type: AbiType): boolean {
   switch (type.kind) {
     case 'field':
     case 'boolean':
@@ -73,7 +73,7 @@ function abiParameterTypeChecker(type: ABIType): boolean {
 }
 
 /**
- * Check if the structure of the ABIType 'struct' is valid by ensuring field names are strings
+ * Check if the structure of the AbiType 'struct' is valid by ensuring field names are strings
  * and their type attribute passes the abiParameterTypeChecker. Returns true on successful validation,
  * otherwise throws an error providing insight into the incorrect formation in the struct.
  *

package/src/contract/contract.ts

@@ -1,9 +1,9 @@
-import { PublicKey } from '@aztec/circuit-types';
-import { ContractArtifact } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type PublicKey } from '@aztec/circuit-types';
+import { type ContractArtifact } from '@aztec/foundation/abi';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Point } from '@aztec/foundation/fields';
 
-import { Wallet } from '../account/index.js';
+import { type Wallet } from '../account/index.js';
 import { ContractBase } from './contract_base.js';
 import { DeployMethod } from './deploy_method.js';
 

package/src/contract/contract_base.ts

@@ -1,8 +1,8 @@
-import { computePartialAddress } from '@aztec/circuits.js';
-import { ContractArtifact, FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type Fr, computePartialAddress } from '@aztec/circuits.js';
+import { type ContractArtifact, type FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';
+import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { Wallet } from '../account/index.js';
+import { type Wallet } from '../account/index.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 
 /**
@@ -16,6 +16,48 @@ export type ContractMethod = ((...args: any[]) => ContractFunctionInteraction) &
   readonly selector: FunctionSelector;
 };
 
+/**
+ * Type representing a field layout in the storage of a contract.
+ */
+type FieldLayout = {
+  /**
+   * Slot in which the field is stored.
+   */
+  slot: Fr;
+  /**
+   * Type being stored at the slot
+   */
+  typ: string;
+};
+
+/**
+ * Type representing a note in use in the contract.
+ */
+type ContractNote = {
+  /**
+   * Note identifier
+   */
+  id: Fr;
+  /**
+   * Type of the note
+   */
+  typ: string;
+};
+
+/**
+ * Type representing the storage layout of a contract.
+ */
+export type ContractStorageLayout<T extends string> = {
+  [K in T]: FieldLayout;
+};
+
+/**
+ * Type representing the notes used in a contract.
+ */
+export type ContractNotes<T extends string> = {
+  [K in T]: ContractNote;
+};
+
 /**
  * Abstract implementation of a contract extended by the Contract class and generated contract types.
  */

package/src/contract/contract_function_interaction.ts

@@ -1,17 +1,18 @@
-import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
-import { AztecAddress, FunctionData } from '@aztec/circuits.js';
-import { FunctionAbi, FunctionType, encodeArguments } from '@aztec/foundation/abi';
+import { type FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
+import { type AztecAddress, FunctionData, TxContext } from '@aztec/circuits.js';
+import { type FunctionAbi, FunctionType, encodeArguments } from '@aztec/foundation/abi';
 
-import { Wallet } from '../account/wallet.js';
-import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js';
+import { type Wallet } from '../account/wallet.js';
+import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
 
 export { SendMethodOptions };
 
 /**
- * Represents the options for a view method in a contract function interaction.
+ * Represents the options for simulating a contract function interaction.
  * Allows specifying the address from which the view method should be called.
+ * Disregarded for simulation of public functions
  */
-export type ViewMethodOptions = {
+export type SimulateMethodOptions = {
   /**
    * The sender's Aztec address.
    */
@@ -63,18 +64,48 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
   }
 
   /**
-   * Execute a view (read-only) transaction on an unconstrained function.
-   * This method is used to call functions that do not modify the contract state and only return data.
-   * Throws an error if called on a non-unconstrained function.
+   * Simulate a transaction and get its return values
+   * Differs from prove in a few important ways:
+   * 1. It returns the values of the function execution
+   * 2. It supports `unconstrained`, `private` and `public` functions
+   * 3. For `private` execution it:
+   * 3.a SKIPS the entrypoint and starts directly at the function
+   * 3.b SKIPS public execution entirely
+   * 4. For `public` execution it:
+   * 4.a Removes the `txRequest` value after ended simulation
+   * 4.b Ignores the `from` in the options
+   *
    * @param options - An optional object containing additional configuration for the transaction.
-   * @returns The result of the view transaction as returned by the contract function.
+   * @returns The result of the transaction as returned by the contract function.
    */
-  public view(options: ViewMethodOptions = {}) {
-    if (this.functionDao.functionType !== FunctionType.UNCONSTRAINED) {
-      throw new Error('Can only call `view` on an unconstrained function.');
+  public async simulate(options: SimulateMethodOptions = {}): Promise<any> {
+    if (this.functionDao.functionType == FunctionType.UNCONSTRAINED) {
+      return this.wallet.viewTx(this.functionDao.name, this.args, this.contractAddress, options.from);
     }
 
-    const { from } = options;
-    return this.wallet.viewTx(this.functionDao.name, this.args, this.contractAddress, from);
+    // TODO: If not unconstrained, we return a size 4 array of fields.
+    // TODO: It should instead return the correctly decoded value
+    // TODO: The return type here needs to be fixed! @LHerskind
+
+    if (this.functionDao.functionType == FunctionType.SECRET) {
+      const nodeInfo = await this.wallet.getNodeInfo();
+      const packedArgs = PackedArguments.fromArgs(encodeArguments(this.functionDao, this.args));
+
+      const txRequest = TxExecutionRequest.from({
+        argsHash: packedArgs.hash,
+        origin: this.contractAddress,
+        functionData: FunctionData.fromAbi(this.functionDao),
+        txContext: TxContext.empty(nodeInfo.chainId, nodeInfo.protocolVersion),
+        packedArguments: [packedArgs],
+        authWitnesses: [],
+      });
+      const simulatedTx = await this.pxe.simulateTx(txRequest, false, options.from ?? this.wallet.getAddress());
+      return simulatedTx.privateReturnValues?.[0];
+    } else {
+      const txRequest = await this.create();
+      const simulatedTx = await this.pxe.simulateTx(txRequest, true);
+      this.txRequest = undefined;
+      return simulatedTx.publicReturnValues?.[0];
+    }
   }
 }

package/src/contract/deploy_method.ts

@@ -1,22 +1,22 @@
-import { FunctionCall, PublicKey, Tx, TxExecutionRequest } from '@aztec/circuit-types';
+import { type FunctionCall, type PublicKey, type Tx, type TxExecutionRequest } from '@aztec/circuit-types';
 import {
   AztecAddress,
   computePartialAddress,
   getContractClassFromArtifact,
   getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
-import { ContractArtifact, FunctionArtifact, getInitializer } from '@aztec/foundation/abi';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
+import { type ContractArtifact, type FunctionArtifact, getInitializer } from '@aztec/foundation/abi';
+import { type EthAddress } from '@aztec/foundation/eth-address';
+import { type Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { Wallet } from '../account/index.js';
+import { type Wallet } from '../account/index.js';
 import { deployInstance } from '../deployment/deploy_instance.js';
 import { registerContractClass } from '../deployment/register_class.js';
-import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js';
+import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
 import { type Contract } from './contract.js';
-import { ContractBase } from './contract_base.js';
+import { type ContractBase } from './contract_base.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
 
@@ -169,7 +169,11 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   public send(options: DeployOptions = {}): DeploySentTx<TContract> {
     const txHashPromise = super.send(options).getTxHash();
-    return new DeploySentTx(this.pxe, txHashPromise, this.postDeployCtor, this.getInstance(options));
+    const instance = this.getInstance(options);
+    this.log(
+      `Sent deployment tx of ${this.artifact.name} contract with deployment address ${instance.address.toString()}`,
+    );
+    return new DeploySentTx(this.pxe, txHashPromise, this.postDeployCtor, instance);
   }
 
   /**
@@ -193,12 +197,12 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
   }
 
   /**
-   * Simulate the request.
+   * Prove the request.
    * @param options - Deployment options.
-   * @returns The simulated tx.
+   * @returns The proven tx.
    */
-  public simulate(options: DeployOptions): Promise<Tx> {
-    return super.simulate(options);
+  public prove(options: DeployOptions): Promise<Tx> {
+    return super.prove(options);
   }
 
   /** Return this deployment address. */

package/src/contract/deploy_sent_tx.ts

@@ -1,12 +1,13 @@
-import { PXE, TxHash, TxReceipt } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/circuits.js';
-import { FieldsOf } from '@aztec/foundation/types';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types';
+import { type AztecAddress } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { type FieldsOf } from '@aztec/foundation/types';
+import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { Wallet } from '../account/index.js';
+import { type Wallet } from '../account/index.js';
 import { type Contract } from './contract.js';
-import { ContractBase } from './contract_base.js';
-import { SentTx, WaitOpts } from './sent_tx.js';
+import { type ContractBase } from './contract_base.js';
+import { SentTx, type WaitOpts } from './sent_tx.js';
 
 /** Options related to waiting for a deployment tx. */
 export type DeployedWaitOpts = WaitOpts & {
@@ -24,6 +25,8 @@ export type DeployTxReceipt<TContract extends ContractBase = Contract> = FieldsO
  * A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
  */
 export class DeploySentTx<TContract extends Contract = Contract> extends SentTx {
+  private log = createDebugLogger('aztec:js:deploy_sent_tx');
+
   constructor(
     wallet: PXE | Wallet,
     txHashPromise: Promise<TxHash>,
@@ -41,6 +44,7 @@ export class DeploySentTx<TContract extends Contract = Contract> extends SentTx
    */
   public async deployed(opts?: DeployedWaitOpts): Promise<TContract> {
     const receipt = await this.wait(opts);
+    this.log(`Contract ${this.instance.address.toString()} successfully deployed.`);
     return receipt.contract;
   }
 

package/src/contract/index.ts

@@ -6,8 +6,8 @@
  *
  * The {@link Contract} class is the main class in this module, and provides static methods for deploying
  * a contract or interacting with an already deployed one. The `methods` property of the contract instance
- * provides access to private, public, and view methods, that can be invoked in a transaction via `send()`,
- * or can be queried via `view()`.
+ * provides access to private, public, and simulate methods, that can be invoked in a transaction via `send()`,
+ * or can be queried via `simulate()`.
  *
  * ```ts
  * const contract = await Contract.deploy(wallet, MyContractArtifact, [...constructorArgs]).send().deployed();
@@ -17,7 +17,7 @@
  * ```ts
  * const contract = await Contract.at(address, MyContractArtifact, wallet);
  * await contract.methods.mint(1000, owner).send().wait();
- * console.log(`Total supply is now ${await contract.methods.totalSupply().view()}`);
+ * console.log(`Total supply is now ${await contract.methods.totalSupply().simulate()}`);
  * ```
  *
  * The result of calling a method in a contract instance, such as `contract.methods.mint(1000, owner)`

package/src/contract/sent_tx.ts

@@ -1,6 +1,13 @@
-import { ExtendedNote, GetUnencryptedLogsResponse, PXE, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types';
+import {
+  type ExtendedNote,
+  type GetUnencryptedLogsResponse,
+  type PXE,
+  type TxHash,
+  type TxReceipt,
+  TxStatus,
+} from '@aztec/circuit-types';
 import { retryUntil } from '@aztec/foundation/retry';
-import { FieldsOf } from '@aztec/foundation/types';
+import { type FieldsOf } from '@aztec/foundation/types';
 
 /** Options related to waiting for a tx. */
 export type WaitOpts = {
@@ -75,10 +82,10 @@ export class SentTx {
       const tx = (await this.pxe.getTxEffect(txHash))!;
       const visibleNotes = await this.pxe.getNotes({ txHash });
       receipt.debugInfo = {
-        noteHashes: tx.noteHashes.filter(n => !n.isZero()),
-        nullifiers: tx.nullifiers.filter(n => !n.isZero()),
-        publicDataWrites: tx.publicDataWrites.filter(p => !p.isEmpty()),
-        l2ToL1Msgs: tx.l2ToL1Msgs.filter(l => !l.isZero()),
+        noteHashes: tx.noteHashes,
+        nullifiers: tx.nullifiers,
+        publicDataWrites: tx.publicDataWrites,
+        l2ToL1Msgs: tx.l2ToL1Msgs,
         visibleNotes,
       };
     }

package/src/contract/unsafe_contract.ts

@@ -1,7 +1,7 @@
-import { ContractArtifact } from '@aztec/foundation/abi';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type ContractArtifact } from '@aztec/foundation/abi';
+import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { Wallet } from '../wallet/index.js';
+import { type Wallet } from '../wallet/index.js';
 import { ContractBase } from './contract_base.js';
 
 /** Unsafe constructor for ContractBase that bypasses the check that the instance is registered in the wallet. */

package/src/deployment/broadcast_function.ts

@@ -6,12 +6,12 @@ import {
   createUnconstrainedFunctionMembershipProof,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
-import { ContractArtifact, FunctionSelector, FunctionType, bufferAsFields } from '@aztec/foundation/abi';
+import { type ContractArtifact, type FunctionSelector, FunctionType, bufferAsFields } from '@aztec/foundation/abi';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 
-import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { Wallet } from '../wallet/index.js';
+import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { type Wallet } from '../wallet/index.js';
 import { getRegistererContract } from './protocol_contracts.js';
 
 /**

package/src/deployment/contract_deployer.ts

@@ -1,9 +1,9 @@
-import { PublicKey } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/circuits.js';
-import { ContractArtifact } from '@aztec/foundation/abi';
+import { type PublicKey } from '@aztec/circuit-types';
+import { type AztecAddress } from '@aztec/circuits.js';
+import { type ContractArtifact } from '@aztec/foundation/abi';
 import { Point } from '@aztec/foundation/fields';
 
-import { Wallet } from '../account/wallet.js';
+import { type Wallet } from '../account/wallet.js';
 import { DeployMethod } from '../contract/deploy_method.js';
 import { Contract } from '../contract/index.js';
 

package/src/deployment/deploy_instance.ts

@@ -1,7 +1,7 @@
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { Wallet } from '../wallet/index.js';
+import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { type Wallet } from '../wallet/index.js';
 import { getDeployerContract } from './protocol_contracts.js';
 
 /**

package/src/deployment/protocol_contracts.ts

@@ -2,7 +2,7 @@ import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-reg
 import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
 
 import { UnsafeContract } from '../contract/unsafe_contract.js';
-import { Wallet } from '../wallet/index.js';
+import { type Wallet } from '../wallet/index.js';
 
 /** Returns a Contract wrapper for the class registerer. */
 export function getRegistererContract(wallet: Wallet) {

package/src/deployment/register_class.ts

@@ -1,8 +1,8 @@
 import { MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, getContractClassFromArtifact } from '@aztec/circuits.js';
-import { ContractArtifact, bufferAsFields } from '@aztec/foundation/abi';
+import { type ContractArtifact, bufferAsFields } from '@aztec/foundation/abi';
 
-import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { Wallet } from '../wallet/index.js';
+import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { type Wallet } from '../wallet/index.js';
 import { getRegistererContract } from './protocol_contracts.js';
 
 /** Sets up a call to register a contract class given its artifact. */

package/src/entrypoint/default_entrypoint.ts

@@ -1,7 +1,7 @@
-import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
+import { type FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
 import { TxContext } from '@aztec/circuits.js';
 
-import { EntrypointInterface } from './entrypoint.js';
+import { type EntrypointInterface } from './entrypoint.js';
 
 /**
  * Default implementation of the entrypoint interface. It calls a function on a contract directly

package/src/entrypoint/entrypoint.ts

@@ -1,7 +1,7 @@
-import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
-import { Fr } from '@aztec/foundation/fields';
+import { type FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types';
+import { type Fr } from '@aztec/foundation/fields';
 
-import { FeePaymentMethod } from '../fee/fee_payment_method.js';
+import { type FeePaymentMethod } from '../fee/fee_payment_method.js';
 
 /**
  * Fee payment options for a transaction.

package/src/fee/fee_payment_method.ts

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

package/src/fee/native_fee_payment_method.ts

@@ -1,11 +1,11 @@
-import { FunctionCall } from '@aztec/circuit-types';
-import { AztecAddress, FunctionData } from '@aztec/circuits.js';
+import { type FunctionCall } from '@aztec/circuit-types';
+import { type AztecAddress, FunctionData } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
-import { Fr } from '@aztec/foundation/fields';
+import { type Fr } from '@aztec/foundation/fields';
 import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 
-import { Wallet } from '../account/wallet.js';
-import { FeePaymentMethod } from './fee_payment_method.js';
+import { type Wallet } from '../account/wallet.js';
+import { type FeePaymentMethod } from './fee_payment_method.js';
 
 /**
  * Pay fee directly in the native gas token.

package/src/fee/private_fee_payment_method.ts

@@ -1,13 +1,13 @@
-import { FunctionCall } from '@aztec/circuit-types';
+import { type FunctionCall } from '@aztec/circuit-types';
 import { FunctionData } from '@aztec/circuits.js';
 import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
 import { FunctionSelector } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
-import { Wallet } from '../account/wallet.js';
+import { type Wallet } from '../account/wallet.js';
 import { computeAuthWitMessageHash } from '../utils/authwit.js';
-import { FeePaymentMethod } from './fee_payment_method.js';
+import { type FeePaymentMethod } from './fee_payment_method.js';
 
 /**
  * Holds information about how the fee for a transaction is to be paid.

package/src/fee/public_fee_payment_method.ts

@@ -1,12 +1,12 @@
-import { FunctionCall } from '@aztec/circuit-types';
+import { type FunctionCall } from '@aztec/circuit-types';
 import { FunctionData } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
 import { computeAuthWitMessageHash } from '../utils/authwit.js';
-import { AccountWallet } from '../wallet/account_wallet.js';
-import { FeePaymentMethod } from './fee_payment_method.js';
+import { type AccountWallet } from '../wallet/account_wallet.js';
+import { type FeePaymentMethod } from './fee_payment_method.js';
 
 /**
  * Holds information about how the fee for a transaction is to be paid.

package/src/index.ts

@@ -25,6 +25,8 @@ export {
   Contract,
   ContractBase,
   ContractMethod,
+  ContractStorageLayout,
+  ContractNotes,
   SentTx,
   BatchCall,
   DeployMethod,

package/src/rpc_clients/pxe_client.ts

@@ -7,7 +7,8 @@ import {
   LogId,
   Note,
   NullifierMembershipWitness,
-  PXE,
+  type PXE,
+  SimulatedTx,
   Tx,
   TxEffect,
   TxExecutionRequest,
@@ -53,7 +54,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       TxExecutionRequest,
       TxHash,
     },
-    { Tx, TxReceipt, EncryptedL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
+    { Tx, SimulatedTx, TxReceipt, EncryptedL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
     false,
     'pxe',
     fetch,

package/src/utils/abi_types.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, EthAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
+import { type AztecAddress, type EthAddress, type Fr, type FunctionSelector } from '@aztec/circuits.js';
 
 /** Any type that can be converted into a field for a contract call. */
 export type FieldLike = Fr | Buffer | bigint | number | { /** Converts to field */ toField: () => Fr };

package/src/utils/account.ts

@@ -1,7 +1,7 @@
-import { CompleteAddress, PXE } from '@aztec/circuit-types';
+import { type CompleteAddress, type PXE } from '@aztec/circuit-types';
 import { retryUntil } from '@aztec/foundation/retry';
 
-import { DefaultWaitOpts, WaitOpts } from '../contract/index.js';
+import { DefaultWaitOpts, type WaitOpts } from '../contract/index.js';
 
 /**
  * Waits for the account to finish synchronizing with the PXE Service.

package/src/utils/authwit.ts

@@ -1,5 +1,5 @@
-import { FunctionCall, PackedArguments } from '@aztec/circuit-types';
-import { AztecAddress, Fr, GeneratorIndex } from '@aztec/circuits.js';
+import { type FunctionCall, PackedArguments } from '@aztec/circuit-types';
+import { type AztecAddress, type Fr, GeneratorIndex } from '@aztec/circuits.js';
 import { pedersenHash } from '@aztec/foundation/crypto';
 
 // docs:start:authwit_computeAuthWitMessageHash

package/src/utils/cheat_codes.ts

@@ -1,5 +1,5 @@
-import { Note, PXE } from '@aztec/circuit-types';
-import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
+import { type Note, type PXE } from '@aztec/circuit-types';
+import { type AztecAddress, type EthAddress, Fr } from '@aztec/circuits.js';
 import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
 import { keccak, pedersenHash } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';

package/src/utils/l1_contracts.ts

@@ -1,4 +1,4 @@
-import { L1ContractAddresses } from '@aztec/ethereum';
+import { type L1ContractAddresses } from '@aztec/ethereum';
 import { retryUntil } from '@aztec/foundation/retry';
 
 import { createPXEClient } from '../rpc_clients/index.js';