@aztec/aztec.js 0.76.4-devnet-test-rc3 → 0.77.0-testnet-ignition.17

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 = {

package/src/contract/unsafe_contract.ts

@@ -1,7 +1,7 @@
-import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
-import { type 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

@@ -1,21 +1,23 @@
 import {
   ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
-  AztecAddress,
   MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
-  REGISTERER_CONTRACT_ADDRESS,
   REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT,
+} from '@aztec/constants';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { type ContractArtifact, FunctionSelector, FunctionType, bufferAsFields } from '@aztec/stdlib/abi';
+import {
   computeVerificationKeyHash,
   createPrivateFunctionMembershipProof,
   createUnconstrainedFunctionMembershipProof,
   getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { type ContractArtifact, FunctionSelector, FunctionType, bufferAsFields } from '@aztec/foundation/abi';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+} from '@aztec/stdlib/contract';
+import { Capsule } from '@aztec/stdlib/tx';
 
-import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { type Wallet } from '../wallet/index.js';
-import { getRegistererContract } from './protocol_contracts.js';
+import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { getRegistererContract } from '../contract/protocol_contracts.js';
+import type { Wallet } from '../wallet/index.js';
 
 /**
  * Sets up a call to broadcast a private function's bytecode via the ClassRegisterer contract.
@@ -55,31 +57,33 @@ export async function broadcastPrivateFunction(
   } = await createPrivateFunctionMembershipProof(selector, artifact);
 
   const vkHash = await computeVerificationKeyHash(privateFunctionArtifact);
+
+  const registerer = await getRegistererContract(wallet);
+  const fn = registerer.methods.broadcast_private_function(
+    contractClass.id,
+    artifactMetadataHash,
+    unconstrainedFunctionsArtifactTreeRoot,
+    privateFunctionTreeSiblingPath,
+    privateFunctionTreeLeafIndex,
+    padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT),
+    artifactTreeLeafIndex,
+    // eslint-disable-next-line camelcase
+    { selector, metadata_hash: functionMetadataHash, vk_hash: vkHash },
+  );
+
   const bytecode = bufferAsFields(
     privateFunctionArtifact.bytecode,
     MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
   );
-
-  await wallet.storeCapsule(
-    AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS),
-    new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT),
-    bytecode,
-  );
-
-  const registerer = await getRegistererContract(wallet);
-  return Promise.resolve(
-    registerer.methods.broadcast_private_function(
-      contractClass.id,
-      artifactMetadataHash,
-      unconstrainedFunctionsArtifactTreeRoot,
-      privateFunctionTreeSiblingPath,
-      privateFunctionTreeLeafIndex,
-      padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT),
-      artifactTreeLeafIndex,
-      // eslint-disable-next-line camelcase
-      { selector, metadata_hash: functionMetadataHash, vk_hash: vkHash },
+  fn.addCapsule(
+    new Capsule(
+      ProtocolContractAddress.ContractClassRegisterer,
+      new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT),
+      bytecode,
     ),
   );
+
+  return fn;
 }
 
 /**
@@ -117,19 +121,8 @@ export async function broadcastUnconstrainedFunction(
     privateFunctionsArtifactTreeRoot,
   } = await createUnconstrainedFunctionMembershipProof(selector, artifact);
 
-  const bytecode = bufferAsFields(
-    unconstrainedFunctionArtifact.bytecode,
-    MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
-  );
-
-  await wallet.storeCapsule(
-    AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS),
-    new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT),
-    bytecode,
-  );
-
   const registerer = await getRegistererContract(wallet);
-  return registerer.methods.broadcast_unconstrained_function(
+  const fn = registerer.methods.broadcast_unconstrained_function(
     contractClass.id,
     artifactMetadataHash,
     privateFunctionsArtifactTreeRoot,
@@ -138,4 +131,18 @@ export async function broadcastUnconstrainedFunction(
     // eslint-disable-next-line camelcase
     { selector, metadata_hash: functionMetadataHash },
   );
+
+  const bytecode = bufferAsFields(
+    unconstrainedFunctionArtifact.bytecode,
+    MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
+  );
+  fn.addCapsule(
+    new Capsule(
+      ProtocolContractAddress.ContractClassRegisterer,
+      new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT),
+      bytecode,
+    ),
+  );
+
+  return fn;
 }

package/src/deployment/contract_deployer.ts

@@ -1,7 +1,8 @@
-import { type AztecAddress, PublicKeys } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { PublicKeys } from '@aztec/stdlib/keys';
 
-import { type Wallet } from '../account/wallet.js';
+import type { Wallet } from '../account/wallet.js';
 import { Contract } from '../contract/contract.js';
 import { DeployMethod } from '../contract/deploy_method.js';
 

package/src/deployment/deploy_instance.ts

@@ -1,8 +1,8 @@
-import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
-import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { type Wallet } from '../wallet/index.js';
-import { getDeployerContract } from './protocol_contracts.js';
+import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { getDeployerContract } from '../contract/protocol_contracts.js';
+import type { Wallet } from '../wallet/index.js';
 
 /**
  * Sets up a call to the canonical deployer contract to publicly deploy a contract instance.
@@ -14,7 +14,7 @@ export async function deployInstance(
   instance: ContractInstanceWithAddress,
 ): Promise<ContractFunctionInteraction> {
   const deployerContract = await getDeployerContract(wallet);
-  const { salt, contractClassId, publicKeys, deployer } = instance;
+  const { salt, currentContractClassId: contractClassId, publicKeys, deployer } = instance;
   const isUniversalDeploy = deployer.isZero();
   if (!isUniversalDeploy && !wallet.getAddress().equals(deployer)) {
     throw new Error(

package/src/deployment/register_class.ts

@@ -1,16 +1,13 @@
-import {
-  AztecAddress,
-  Fr,
-  MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS,
-  REGISTERER_CONTRACT_ADDRESS,
-  REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT,
-  getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { type ContractArtifact, bufferAsFields } from '@aztec/foundation/abi';
+import { MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { type ContractArtifact, bufferAsFields } from '@aztec/stdlib/abi';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { Capsule } from '@aztec/stdlib/tx';
 
-import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { type Wallet } from '../wallet/index.js';
-import { getRegistererContract } from './protocol_contracts.js';
+import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { getRegistererContract } from '../contract/protocol_contracts.js';
+import type { Wallet } from '../wallet/index.js';
 
 const defaultEmitPublicBytecode =
   // guard against `process` not being defined (e.g. in the browser)
@@ -26,12 +23,22 @@ export async function registerContractClass(
 ): Promise<ContractFunctionInteraction> {
   const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment, packedBytecode } =
     await getContractClassFromArtifact(artifact);
-  const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
   const registerer = await getRegistererContract(wallet);
-  await wallet.storeCapsule(
-    AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS),
-    new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT),
-    encodedBytecode,
+  const fn = registerer.methods.register(
+    artifactHash,
+    privateFunctionsRoot,
+    publicBytecodeCommitment,
+    emitPublicBytecode,
   );
-  return registerer.methods.register(artifactHash, privateFunctionsRoot, publicBytecodeCommitment, emitPublicBytecode);
+
+  const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
+  fn.addCapsule(
+    new Capsule(
+      ProtocolContractAddress.ContractClassRegisterer,
+      new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT),
+      encodedBytecode,
+    ),
+  );
+
+  return fn;
 }

package/src/entrypoint/default_entrypoint.ts

@@ -1,8 +1,7 @@
-import { HashedValues, TxExecutionRequest } from '@aztec/circuit-types';
-import { TxContext } from '@aztec/circuits.js';
-import { FunctionType } from '@aztec/foundation/abi';
+import { FunctionType } from '@aztec/stdlib/abi';
+import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import { type EntrypointInterface, type ExecutionRequestInit } from './entrypoint.js';
+import type { EntrypointInterface, ExecutionRequestInit } from './entrypoint.js';
 
 /**
  * Default implementation of the entrypoint interface. It calls a function on a contract directly
@@ -11,7 +10,7 @@ export class DefaultEntrypoint implements EntrypointInterface {
   constructor(private chainId: number, private protocolVersion: number) {}
 
   async createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
-    const { fee, calls, authWitnesses = [], hashedArguments = [] } = exec;
+    const { fee, calls, authWitnesses = [], hashedArguments = [], capsules = [] } = exec;
 
     if (calls.length > 1) {
       throw new Error(`Expected a single call, got ${calls.length}`);
@@ -33,6 +32,7 @@ export class DefaultEntrypoint implements EntrypointInterface {
         txContext,
         [...hashedArguments, entrypointHashedValues],
         authWitnesses,
+        capsules,
       ),
     );
   }

package/src/entrypoint/default_multi_call_entrypoint.ts

@@ -1,7 +1,7 @@
-import { HashedValues, TxExecutionRequest } from '@aztec/circuit-types';
-import { type AztecAddress, TxContext } from '@aztec/circuits.js';
-import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
 import { type EntrypointInterface, EntrypointPayload, type ExecutionRequestInit } from './entrypoint.js';
 
@@ -16,7 +16,7 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
   ) {}
 
   async createTxExecutionRequest(executions: ExecutionRequestInit): Promise<TxExecutionRequest> {
-    const { fee, calls, authWitnesses = [], hashedArguments = [] } = executions;
+    const { fee, calls, authWitnesses = [], hashedArguments = [], capsules = [] } = executions;
     const payload = await EntrypointPayload.fromAppExecution(calls);
     const abi = this.getEntrypointAbi();
     const entrypointHashedArgs = await HashedValues.fromValues(encodeArguments(abi, [payload]));
@@ -28,6 +28,7 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
       txContext: new TxContext(this.chainId, this.version, fee.gasSettings),
       argsOfCalls: [...payload.hashedArguments, ...hashedArguments, entrypointHashedArgs],
       authWitnesses,
+      capsules,
     });
 
     return Promise.resolve(txRequest);

package/src/entrypoint/entrypoint.ts

@@ -1,9 +1,11 @@
-import { type AuthWitness, type FunctionCall, type HashedValues, type TxExecutionRequest } from '@aztec/circuit-types';
-import { type Fr } from '@aztec/circuits.js';
+import type { Fr } from '@aztec/foundation/fields';
+import type { FunctionCall } from '@aztec/stdlib/abi';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import type { Capsule, HashedValues, TxExecutionRequest } from '@aztec/stdlib/tx';
 
 import { EntrypointPayload, type FeeOptions, computeCombinedPayloadHash } from './payload.js';
 
-export { EntrypointPayload, FeeOptions, computeCombinedPayloadHash };
+export { EntrypointPayload, type FeeOptions, computeCombinedPayloadHash };
 
 export { DefaultEntrypoint } from './default_entrypoint.js';
 export { DefaultMultiCallEntrypoint } from './default_multi_call_entrypoint.js';
@@ -16,6 +18,8 @@ export type ExecutionRequestInit = {
   authWitnesses?: AuthWitness[];
   /** Any transient hashed arguments for this execution */
   hashedArguments?: HashedValues[];
+  /** Data passed through an oracle for this execution. */
+  capsules?: Capsule[];
   /** How the fee is going to be payed */
   fee: FeeOptions;
   /** An optional nonce. Used to repeat a previous tx with a higher fee so that the first one is cancelled */

package/src/entrypoint/payload.ts

@@ -1,12 +1,15 @@
-import { FunctionCall, HashedValues } from '@aztec/circuit-types';
-import { type AztecAddress, Fr, type GasSettings, GeneratorIndex } from '@aztec/circuits.js';
-import { FunctionType } from '@aztec/foundation/abi';
+import { GeneratorIndex } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { type Tuple } from '@aztec/foundation/serialize';
-import { type FieldsOf } from '@aztec/foundation/types';
+import { Fr } from '@aztec/foundation/fields';
+import type { Tuple } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+import { FunctionCall, FunctionType } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
+import { HashedValues } from '@aztec/stdlib/tx';
 
-import { type FeePaymentMethod } from '../fee/fee_payment_method.js';
+import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
 
 /**
  * Fee payment options for a transaction.
@@ -18,6 +21,7 @@ export type FeeOptions = {
   gasSettings: GasSettings;
 };
 
+// docs:start:user_fee_options
 /** Fee options as set by a user. */
 export type UserFeeOptions = {
   /** The fee payment method to use */
@@ -31,6 +35,7 @@ export type UserFeeOptions = {
   /** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */
   estimatedGasPadding?: number;
 };
+// docs:end:user_fee_options
 
 // These must match the values defined in:
 // - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr

package/src/fee/fee_juice_payment_method.ts

@@ -1,13 +1,15 @@
-import { type FunctionCall } from '@aztec/circuit-types';
-import { type AztecAddress } from '@aztec/circuits.js';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import type { FunctionCall } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-import { type FeePaymentMethod } from './fee_payment_method.js';
+import type { FeePaymentMethod } from './fee_payment_method.js';
 
+// docs:start:fee_juice_method
 /**
  * Pay fee directly in the Fee Juice.
  */
 export class FeeJuicePaymentMethod implements FeePaymentMethod {
+  // docs:end:fee_juice_method
   constructor(protected sender: AztecAddress) {}
 
   getAsset() {

package/src/fee/fee_juice_payment_method_with_claim.ts

@@ -1,10 +1,11 @@
-import { type FunctionCall } from '@aztec/circuit-types';
-import { type AztecAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
-import { FunctionType, U128 } from '@aztec/foundation/abi';
+import { Fr } from '@aztec/foundation/fields';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
+import type { FunctionCall } from '@aztec/stdlib/abi';
+import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
 
-import { type L2AmountClaim } from '../api/ethereum/portal_manager.js';
+import type { L2AmountClaim } from '../api/ethereum/portal_manager.js';
+import { getFeeJuice } from '../contract/protocol_contracts.js';
+import type { Wallet } from '../wallet/index.js';
 import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
 
 /**
@@ -12,10 +13,10 @@ import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
  */
 export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
   constructor(
-    sender: AztecAddress,
+    private senderWallet: Wallet,
     private claim: Pick<L2AmountClaim, 'claimAmount' | 'claimSecret' | 'messageLeafIndex'>,
   ) {
-    super(sender);
+    super(senderWallet.getAddress());
   }
 
   /**
@@ -23,7 +24,7 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
    * @returns A function call
    */
   override async getFunctionCalls(): Promise<FunctionCall[]> {
-    const canonicalFeeJuice = await getCanonicalFeeJuice();
+    const canonicalFeeJuice = await getFeeJuice(this.senderWallet);
     const selector = await FunctionSelector.fromNameAndParameters(
       canonicalFeeJuice.artifact.functions.find(f => f.name === 'claim')!,
     );
@@ -35,8 +36,8 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
         selector,
         isStatic: false,
         args: [
-          this.sender.toField(),
-          ...new U128(this.claim.claimAmount).toFields(),
+          this.senderWallet.getAddress().toField(),
+          new Fr(this.claim.claimAmount),
           this.claim.claimSecret,
           new Fr(this.claim.messageLeafIndex),
         ],