@aztec/aztec.js 0.76.4 → 0.77.0-testnet-ignition.21

package/src/api/ethereum/l1_contracts.ts

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

package/src/api/ethereum/portal_manager.ts

@@ -1,23 +1,19 @@
-import { type PXE, type SiblingPath } from '@aztec/circuit-types';
-import { type AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
-import { computeSecretHash } from '@aztec/circuits.js/hash';
+import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
 import { extractEvent } from '@aztec/ethereum/utils';
 import { sha256ToField } from '@aztec/foundation/crypto';
-import { type Logger } from '@aztec/foundation/log';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import type { Logger } from '@aztec/foundation/log';
+import type { SiblingPath } from '@aztec/foundation/trees';
 import { FeeJuicePortalAbi, OutboxAbi, TestERC20Abi, TokenPortalAbi } from '@aztec/l1-artifacts';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { computeSecretHash } from '@aztec/stdlib/hash';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
 
-import {
-  type Account,
-  type Chain,
-  type GetContractReturnType,
-  type Hex,
-  type HttpTransport,
-  type PublicClient,
-  type WalletClient,
-  getContract,
-  toFunctionSelector,
-} from 'viem';
+import { type GetContractReturnType, type Hex, getContract, toFunctionSelector } from 'viem';
 
+// docs:start:claim_type
+// docs:start:claim_type_amount
 /** L1 to L2 message info to claim it on L2. */
 export type L2Claim = {
   /** Secret for claiming. */
@@ -29,9 +25,11 @@ export type L2Claim = {
   /** Leaf index in the L1 to L2 message tree. */
   messageLeafIndex: bigint;
 };
+// docs:end:claim_type
 
 /** L1 to L2 message info that corresponds to an amount to claim. */
 export type L2AmountClaim = L2Claim & { /** Amount to claim */ claimAmount: bigint };
+// docs:end:claim_type_amount
 
 /** L1 to L2 message info that corresponds to an amount to claim with associated recipient. */
 export type L2AmountClaimWithRecipient = L2AmountClaim & {
@@ -53,13 +51,13 @@ export async function generateClaimSecret(logger?: Logger): Promise<[Fr, Fr]> {
 
 /** Helper for managing an ERC20 on L1. */
 export class L1TokenManager {
-  private contract: GetContractReturnType<typeof TestERC20Abi, WalletClient<HttpTransport, Chain, Account>>;
+  private contract: GetContractReturnType<typeof TestERC20Abi, ViemWalletClient>;
 
   public constructor(
     /** Address of the ERC20 contract. */
     public readonly address: EthAddress,
-    private publicClient: PublicClient<HttpTransport, Chain>,
-    private walletClient: WalletClient<HttpTransport, Chain, Account>,
+    private publicClient: ViemPublicClient,
+    private walletClient: ViemWalletClient,
     private logger: Logger,
   ) {
     this.contract = getContract({
@@ -107,16 +105,13 @@ export class L1TokenManager {
 /** Helper for interacting with the FeeJuicePortal on L1. */
 export class L1FeeJuicePortalManager {
   private readonly tokenManager: L1TokenManager;
-  private readonly contract: GetContractReturnType<
-    typeof FeeJuicePortalAbi,
-    WalletClient<HttpTransport, Chain, Account>
-  >;
+  private readonly contract: GetContractReturnType<typeof FeeJuicePortalAbi, ViemWalletClient>;
 
   constructor(
     portalAddress: EthAddress,
     tokenAddress: EthAddress,
-    private readonly publicClient: PublicClient<HttpTransport, Chain>,
-    private readonly walletClient: WalletClient<HttpTransport, Chain, Account>,
+    private readonly publicClient: ViemPublicClient,
+    private readonly walletClient: ViemWalletClient,
     private readonly logger: Logger,
   ) {
     this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
@@ -187,8 +182,8 @@ export class L1FeeJuicePortalManager {
    */
   public static async new(
     pxe: PXE,
-    publicClient: PublicClient<HttpTransport, Chain>,
-    walletClient: WalletClient<HttpTransport, Chain, Account>,
+    publicClient: ViemPublicClient,
+    walletClient: ViemWalletClient,
     logger: Logger,
   ): Promise<L1FeeJuicePortalManager> {
     const {
@@ -205,14 +200,14 @@ export class L1FeeJuicePortalManager {
 
 /** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */
 export class L1ToL2TokenPortalManager {
-  protected readonly portal: GetContractReturnType<typeof TokenPortalAbi, WalletClient<HttpTransport, Chain, Account>>;
+  protected readonly portal: GetContractReturnType<typeof TokenPortalAbi, ViemWalletClient>;
   protected readonly tokenManager: L1TokenManager;
 
   constructor(
     portalAddress: EthAddress,
     tokenAddress: EthAddress,
-    protected publicClient: PublicClient<HttpTransport, Chain>,
-    protected walletClient: WalletClient<HttpTransport, Chain, Account>,
+    protected publicClient: ViemPublicClient,
+    protected walletClient: ViemWalletClient,
     protected logger: Logger,
   ) {
     this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
@@ -323,14 +318,14 @@ export class L1ToL2TokenPortalManager {
 
 /** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */
 export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
-  private readonly outbox: GetContractReturnType<typeof OutboxAbi, WalletClient<HttpTransport, Chain, Account>>;
+  private readonly outbox: GetContractReturnType<typeof OutboxAbi, ViemWalletClient>;
 
   constructor(
     portalAddress: EthAddress,
     tokenAddress: EthAddress,
     outboxAddress: EthAddress,
-    publicClient: PublicClient<HttpTransport, Chain>,
-    walletClient: WalletClient<HttpTransport, Chain, Account>,
+    publicClient: ViemPublicClient,
+    walletClient: ViemWalletClient,
     logger: Logger,
   ) {
     super(portalAddress, tokenAddress, publicClient, walletClient, logger);

package/src/api/fee.ts

@@ -3,4 +3,3 @@ export { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
 export { PrivateFeePaymentMethod } from '../fee/private_fee_payment_method.js';
 export { PublicFeePaymentMethod } from '../fee/public_fee_payment_method.js';
 export { FeeJuicePaymentMethodWithClaim } from '../fee/fee_juice_payment_method_with_claim.js';
-export { NoFeePaymentMethod } from '../fee/no_fee_payment_method.js';

package/src/api/interfaces/pxe.ts

@@ -1 +1 @@
-export { PXE } from '@aztec/circuit-types/interfaces';
+export type { PXE } from '@aztec/stdlib/interfaces/client';

package/src/api/log_id.ts

@@ -1 +1 @@
-export { LogId } from '@aztec/circuit-types/log_id';
+export { LogId } from '@aztec/stdlib/logs';

package/src/api/tx_hash.ts

@@ -1 +1 @@
-export { TxHash } from '@aztec/circuit-types/tx_hash';
+export { TxHash } from '@aztec/stdlib/tx';

package/src/api/wallet.ts

@@ -2,6 +2,6 @@ export {
   AccountWallet,
   AccountWalletWithSecretKey as AccountWalletWithSecretKey,
   SignerlessWallet,
-  Wallet,
+  type Wallet,
   getWallet,
 } from '../wallet/index.js';

package/src/contract/base_contract_interaction.ts

@@ -1,11 +1,12 @@
-import { type TxExecutionRequest, type TxProvingResult } from '@aztec/circuit-types';
-import { type Fr, GasSettings } from '@aztec/circuits.js';
+import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
+import { GasSettings } from '@aztec/stdlib/gas';
+import type { Capsule, TxExecutionRequest, TxProvingResult } from '@aztec/stdlib/tx';
 
-import { type Wallet } from '../account/wallet.js';
-import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
-import { type FeeOptions, type UserFeeOptions } from '../entrypoint/payload.js';
-import { NoFeePaymentMethod } from '../fee/no_fee_payment_method.js';
+import type { Wallet } from '../account/wallet.js';
+import type { ExecutionRequestInit } from '../entrypoint/entrypoint.js';
+import type { FeeOptions, UserFeeOptions } from '../entrypoint/payload.js';
+import { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
 import { getGasLimits } from './get_gas_limits.js';
 import { ProvenTx } from './proven_tx.js';
 import { SentTx } from './sent_tx.js';
@@ -32,6 +33,8 @@ export type SendMethodOptions = {
 export abstract class BaseContractInteraction {
   protected log = createLogger('aztecjs:contract_interaction');
 
+  private capsules: Capsule[] = [];
+
   constructor(protected wallet: Wallet) {}
 
   /**
@@ -102,7 +105,7 @@ export abstract class BaseContractInteraction {
       true /*simulatePublic*/,
       undefined /* msgSender */,
       undefined /* skipTxValidation */,
-      false /* enforceFeePayment */,
+      true /* skipFeeEnforcement */,
     );
     const { totalGas: gasLimits, teardownGas: teardownGasLimits } = getGasLimits(
       simulationResult,
@@ -118,7 +121,7 @@ export abstract class BaseContractInteraction {
   protected async getDefaultFeeOptions(fee: UserFeeOptions | undefined): Promise<FeeOptions> {
     const maxFeesPerGas =
       fee?.gasSettings?.maxFeesPerGas ?? (await this.wallet.getCurrentBaseFees()).mul(1 + (fee?.baseFeePadding ?? 0.5));
-    const paymentMethod = fee?.paymentMethod ?? new NoFeePaymentMethod();
+    const paymentMethod = fee?.paymentMethod ?? new FeeJuicePaymentMethod(this.wallet.getAddress());
     const gasSettings: GasSettings = GasSettings.default({ ...fee?.gasSettings, maxFeesPerGas });
     this.log.debug(`Using L2 gas settings`, gasSettings);
     return { gasSettings, paymentMethod };
@@ -149,7 +152,7 @@ export abstract class BaseContractInteraction {
         true /*simulatePublic*/,
         undefined /* msgSender */,
         undefined /* skipTxValidation */,
-        false /* enforceFeePayment */,
+        true /* skipFeeEnforcement */,
       );
       const { totalGas: gasLimits, teardownGas: teardownGasLimits } = getGasLimits(
         simulationResult,
@@ -163,4 +166,27 @@ export abstract class BaseContractInteraction {
 
     return { gasSettings, paymentMethod };
   }
+
+  /**
+   * Add data passed to the oracle calls during this contract interaction.
+   * @param capsule - Data passed to oracle calls.
+   */
+  public addCapsule(capsule: Capsule) {
+    this.capsules.push(capsule);
+  }
+
+  /**
+   * Add data passed to the oracle calls during this contract interaction.
+   * @param capsules - Data passed to oracle calls.
+   */
+  public addCapsules(capsules: Capsule[]) {
+    this.capsules.push(...capsules);
+  }
+
+  /**
+   * Return all capsules added for this function interaction.
+   */
+  public getCapsules() {
+    return this.capsules;
+  }
 }

package/src/contract/batch_call.ts

@@ -1,7 +1,7 @@
-import { type FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types';
-import { FunctionType, decodeFromAbi } from '@aztec/foundation/abi';
+import { type FunctionCall, FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
+import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import { type Wallet } from '../account/index.js';
+import type { Wallet } from '../account/index.js';
 import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
 import type { SimulateMethodOptions } from './contract_function_interaction.js';
 
@@ -19,8 +19,9 @@ export class BatchCall extends BaseContractInteraction {
    */
   public async create(opts?: SendMethodOptions): Promise<TxExecutionRequest> {
     const calls = this.calls;
-    const fee = await this.getFeeOptions({ calls, ...opts });
-    return await this.wallet.createTxExecutionRequest({ calls, ...opts, fee });
+    const capsules = this.getCapsules();
+    const fee = await this.getFeeOptions({ calls, capsules, ...opts });
+    return await this.wallet.createTxExecutionRequest({ calls, capsules, ...opts, fee });
   }
 
   /**
@@ -59,8 +60,9 @@ export class BatchCall extends BaseContractInteraction {
     );
 
     const calls = indexedCalls.map(([call]) => call);
-    const fee = await this.getFeeOptions({ calls, ...options });
-    const txRequest = await this.wallet.createTxExecutionRequest({ calls, ...options, fee });
+    const capsules = this.getCapsules();
+    const fee = await this.getFeeOptions({ calls, capsules, ...options });
+    const txRequest = await this.wallet.createTxExecutionRequest({ calls, capsules, ...options, fee });
 
     const unconstrainedCalls = unconstrained.map(
       async ([call, index]) =>

package/src/contract/checker.ts

@@ -1,4 +1,4 @@
-import { type AbiType, type BasicType, type ContractArtifact, type StructType } from '@aztec/foundation/abi';
+import type { AbiType, BasicType, ContractArtifact, StructType } from '@aztec/stdlib/abi';
 
 /**
  * Represents a type derived from input type T with the 'kind' property removed.

package/src/contract/contract.ts

@@ -1,8 +1,9 @@
-import { PublicKeys } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { PublicKeys } from '@aztec/stdlib/keys';
 
-import { type Wallet } from '../account/index.js';
+import type { Wallet } from '../account/index.js';
 import { ContractBase } from './contract_base.js';
 import { DeployMethod } from './deploy_method.js';
 
@@ -26,6 +27,12 @@ export class Contract extends ContractBase {
     if (instance === undefined) {
       throw new Error(`Contract instance at ${address.toString()} has not been registered in the wallet's PXE`);
     }
+    const thisContractClass = await getContractClassFromArtifact(artifact);
+    if (!thisContractClass.id.equals(instance.currentContractClassId)) {
+      // wallet holds an outdated version of this contract
+      await wallet.updateContract(address, artifact);
+      instance.currentContractClassId = thisContractClass.id;
+    }
     return new Contract(instance, artifact, wallet);
   }
 

package/src/contract/contract_base.ts

@@ -1,13 +1,13 @@
-import { type ContractInstanceWithAddress, computePartialAddress } from '@aztec/circuits.js';
 import {
   type ContractArtifact,
   type ContractNote,
   type FieldLayout,
   type FunctionArtifact,
   FunctionSelector,
-} from '@aztec/foundation/abi';
+} from '@aztec/stdlib/abi';
+import { type ContractInstanceWithAddress, computePartialAddress } from '@aztec/stdlib/contract';
 
-import { type Wallet } from '../account/index.js';
+import type { Wallet } from '../account/index.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 
 /**

package/src/contract/contract_function_interaction.ts

@@ -1,30 +1,33 @@
-import type { FunctionCall, PrivateKernelProverProfileResult, TxExecutionRequest } from '@aztec/circuit-types';
-import { type AztecAddress, type GasSettings } from '@aztec/circuits.js';
 import {
   type FunctionAbi,
+  FunctionCall,
   FunctionSelector,
   FunctionType,
   decodeFromAbi,
   encodeArguments,
-} from '@aztec/foundation/abi';
+} from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PrivateKernelProverProfileResult } from '@aztec/stdlib/kernel';
+import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import { type Wallet } from '../account/wallet.js';
+import type { Wallet } from '../account/wallet.js';
+import { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
 import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
 
-export { SendMethodOptions };
+export type { SendMethodOptions };
 
 /**
  * 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 SimulateMethodOptions = {
+export type SimulateMethodOptions = Pick<SendMethodOptions, 'fee'> & {
   /** The sender's Aztec address. */
   from?: AztecAddress;
-  /** Gas settings for the simulation. */
-  gasSettings?: GasSettings;
   /** Simulate without checking for the validity of the resulting transaction, e.g. whether it emits any existing nullifiers. */
   skipTxValidation?: boolean;
+  /** Whether to ensure the fee payer is not empty and has enough balance to pay for the fee. */
+  skipFeeEnforcement?: boolean;
 };
 
 /**
@@ -65,9 +68,10 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
       throw new Error("Can't call `create` on an unconstrained function.");
     }
     const calls = [await this.request()];
-    const fee = await this.getFeeOptions({ calls, ...opts });
+    const capsules = this.getCapsules();
+    const fee = await this.getFeeOptions({ calls, capsules, ...opts });
     const { nonce, cancellable } = opts;
-    return await this.wallet.createTxExecutionRequest({ calls, fee, nonce, cancellable });
+    return await this.wallet.createTxExecutionRequest({ calls, fee, nonce, cancellable, capsules });
   }
 
   // docs:start:request
@@ -106,8 +110,15 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
       return this.wallet.simulateUnconstrained(this.functionDao.name, this.args, this.contractAddress, options?.from);
     }
 
-    const txRequest = await this.create();
-    const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation);
+    const fee = options.fee ?? { paymentMethod: new FeeJuicePaymentMethod(AztecAddress.ZERO) };
+    const txRequest = await this.create({ fee });
+    const simulatedTx = await this.wallet.simulateTx(
+      txRequest,
+      true /* simulatePublic */,
+      options.from,
+      options.skipTxValidation,
+      options.skipFeeEnforcement ?? true,
+    );
 
     let rawReturnValues;
     if (this.functionDao.functionType == FunctionType.PRIVATE) {
@@ -138,7 +149,7 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
       throw new Error("Can't profile an unconstrained function.");
     }
 
-    const txRequest = await this.create();
+    const txRequest = await this.create({ fee: options.fee });
     const simulatedTx = await this.wallet.simulateTx(
       txRequest,
       true,

package/src/contract/deploy_method.ts

@@ -1,22 +1,23 @@
-import { type FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types';
+import type { Fr } from '@aztec/foundation/fields';
+import { type ContractArtifact, type FunctionArtifact, type FunctionCall, getInitializer } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
-  AztecAddress,
   type ContractInstanceWithAddress,
-  type PublicKeys,
   computePartialAddress,
   getContractClassFromArtifact,
   getContractInstanceFromDeployParams,
-} from '@aztec/circuits.js';
-import { type ContractArtifact, type FunctionArtifact, getInitializer } from '@aztec/foundation/abi';
-import { type Fr } from '@aztec/foundation/fields';
+} from '@aztec/stdlib/contract';
+import type { GasSettings } from '@aztec/stdlib/gas';
+import type { PublicKeys } from '@aztec/stdlib/keys';
+import type { Capsule, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import { type 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 { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
+import type { ExecutionRequestInit } from '../entrypoint/entrypoint.js';
 import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
-import { type Contract } from './contract.js';
-import { type ContractBase } from './contract_base.js';
+import type { Contract } from './contract.js';
+import type { ContractBase } from './contract_base.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 import { DeployProvenTx } from './deploy_proven_tx.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
@@ -111,9 +112,10 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
     const calls = [...deployment.calls, ...bootstrap.calls];
     const authWitnesses = [...(deployment.authWitnesses ?? []), ...(bootstrap.authWitnesses ?? [])];
     const hashedArguments = [...(deployment.hashedArguments ?? []), ...(bootstrap.hashedArguments ?? [])];
+    const capsules = [...(deployment.capsules ?? []), ...(bootstrap.capsules ?? [])];
     const { cancellable, nonce, fee: userFee } = options;
 
-    const request = { calls, authWitnesses, hashedArguments, cancellable, fee: userFee, nonce };
+    const request = { calls, authWitnesses, hashedArguments, capsules, cancellable, fee: userFee, nonce };
 
     const fee = await this.getFeeOptions(request);
     return { ...request, fee };
@@ -136,8 +138,9 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   protected async getDeploymentFunctionCalls(
     options: DeployOptions = {},
-  ): Promise<Pick<ExecutionRequestInit, 'calls' | 'authWitnesses' | 'hashedArguments'>> {
+  ): Promise<Pick<ExecutionRequestInit, 'calls' | 'authWitnesses' | 'hashedArguments' | 'capsules'>> {
     const calls: FunctionCall[] = [];
+    const capsules: Capsule[] = [];
 
     // Set contract instance object so it's available for populating the DeploySendTx object
     const instance = await this.getInstance(options);
@@ -145,9 +148,9 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
     // Obtain contract class from artifact and check it matches the reported one by the instance.
     // TODO(@spalladino): We're unnecessarily calculating the contract class multiple times here.
     const contractClass = await getContractClassFromArtifact(this.artifact);
-    if (!instance.contractClassId.equals(contractClass.id)) {
+    if (!instance.currentContractClassId.equals(contractClass.id)) {
       throw new Error(
-        `Contract class mismatch when deploying contract: got ${instance.contractClassId.toString()} from instance and ${contractClass.id.toString()} from artifact`,
+        `Contract class mismatch when deploying contract: got ${instance.currentContractClassId.toString()} from instance and ${contractClass.id.toString()} from artifact`,
       );
     }
 
@@ -163,6 +166,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
         );
         const registerContractClassInteraction = await registerContractClass(this.wallet, this.artifact);
         calls.push(await registerContractClassInteraction.request());
+        capsules.push(...registerContractClassInteraction.getCapsules());
       }
     }
 
@@ -170,9 +174,10 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
     if (!options.skipPublicDeployment) {
       const deploymentInteraction = await deployInstance(this.wallet, instance);
       calls.push(await deploymentInteraction.request());
+      capsules.push(...deploymentInteraction.getCapsules());
     }
 
-    return { calls };
+    return { calls, capsules };
   }
 
   /**
@@ -182,9 +187,10 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   protected async getInitializeFunctionCalls(
     options: DeployOptions,
-  ): Promise<Pick<ExecutionRequestInit, 'calls' | 'authWitnesses' | 'hashedArguments'>> {
+  ): Promise<Pick<ExecutionRequestInit, 'calls' | 'authWitnesses' | 'hashedArguments' | 'capsules'>> {
     const { address } = await this.getInstance(options);
     const calls: FunctionCall[] = [];
+    const capsules: Capsule[] = [];
     if (this.constructorArtifact && !options.skipInitialization) {
       const constructorCall = new ContractFunctionInteraction(
         this.wallet,
@@ -193,8 +199,9 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
         this.args,
       );
       calls.push(await constructorCall.request());
+      capsules.push(...constructorCall.getCapsules());
     }
-    return { calls };
+    return { calls, capsules };
   }
 
   /**
@@ -246,7 +253,9 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    * Estimates gas cost for this deployment operation.
    * @param options - Options.
    */
-  public override estimateGas(options?: Omit<DeployOptions, 'estimateGas' | 'skipPublicSimulation'>) {
+  public override estimateGas(
+    options?: Omit<DeployOptions, 'estimateGas' | 'skipPublicSimulation'>,
+  ): Promise<Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>> {
     return super.estimateGas(options);
   }
 

package/src/contract/deploy_proven_tx.ts

@@ -1,8 +1,10 @@
-import { type PXE, type Tx } from '@aztec/circuit-types';
-import { type AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { Tx } from '@aztec/stdlib/tx';
 
-import { type Wallet } from '../account/index.js';
-import { type Contract } from './contract.js';
+import type { Wallet } from '../account/index.js';
+import type { Contract } from './contract.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
 import { ProvenTx } from './proven_tx.js';
 

package/src/contract/deploy_sent_tx.ts

@@ -1,11 +1,13 @@
-import { type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types';
-import { type AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
 import { createLogger } from '@aztec/foundation/log';
-import { type FieldsOf } from '@aztec/foundation/types';
+import type { FieldsOf } from '@aztec/foundation/types';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
-import { type Wallet } from '../account/index.js';
-import { type Contract } from './contract.js';
-import { type ContractBase } from './contract_base.js';
+import type { Wallet } from '../account/index.js';
+import type { Contract } from './contract.js';
+import type { ContractBase } from './contract_base.js';
 import { SentTx, type WaitOpts } from './sent_tx.js';
 
 /** Options related to waiting for a deployment tx. */

package/src/contract/get_gas_limits.ts

@@ -1,5 +1,5 @@
-import { type TxSimulationResult } from '@aztec/circuit-types';
-import { type Gas } from '@aztec/circuits.js';
+import type { Gas } from '@aztec/stdlib/gas';
+import type { TxSimulationResult } from '@aztec/stdlib/tx';
 
 /**
  * Returns suggested total and teardown gas limits for a simulated tx.

package/src/contract/protocol_contracts.ts

@@ -0,0 +1,35 @@
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+
+import type { Wallet } from '../wallet/index.js';
+import { UnsafeContract } from './unsafe_contract.js';
+
+/** Returns a Contract wrapper for the class registerer. */
+export async function getRegistererContract(wallet: Wallet) {
+  const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.ContractClassRegisterer);
+  if (!contractInstance) {
+    throw new Error("ContractClassRegisterer is not registered in this wallet's instance");
+  }
+  const { artifact } = await wallet.getContractClassMetadata(contractInstance.currentContractClassId, true);
+
+  return new UnsafeContract(contractInstance!, artifact!, wallet);
+}
+
+/** Returns a Contract wrapper for the instance deployer. */
+export async function getDeployerContract(wallet: Wallet) {
+  const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.ContractInstanceDeployer);
+  if (!contractInstance) {
+    throw new Error("ContractInstanceDeployer is not registered in this wallet's instance");
+  }
+  const { artifact } = await wallet.getContractClassMetadata(contractInstance.currentContractClassId, true);
+  return new UnsafeContract(contractInstance!, artifact!, wallet);
+}
+
+/** Returns a Contract wrapper for the fee juice */
+export async function getFeeJuice(wallet: Wallet) {
+  const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.FeeJuice);
+  if (!contractInstance) {
+    throw new Error("FeeJuice is not registered in this wallet's instance");
+  }
+  const { artifact } = await wallet.getContractClassMetadata(contractInstance.currentContractClassId, true);
+  return new UnsafeContract(contractInstance!, artifact!, wallet);
+}

package/src/contract/proven_tx.ts

@@ -1,6 +1,7 @@
-import { type PXE, Tx } from '@aztec/circuit-types';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import { Tx } from '@aztec/stdlib/tx';
 
-import { type Wallet } from '../account/index.js';
+import type { Wallet } from '../account/index.js';
 import { SentTx } from './sent_tx.js';
 
 /**

package/src/contract/sent_tx.ts

@@ -1,6 +1,7 @@
-import { type GetPublicLogsResponse, type PXE, type TxHash, type TxReceipt, TxStatus } from '@aztec/circuit-types';
 import { retryUntil } from '@aztec/foundation/retry';
-import { type FieldsOf } from '@aztec/foundation/types';
+import type { FieldsOf } from '@aztec/foundation/types';
+import type { GetPublicLogsResponse, PXE } from '@aztec/stdlib/interfaces/client';
+import { type TxHash, type TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 
 /** Options related to waiting for a tx. */
 export type WaitOpts = {