@aztec/aztec.js 0.71.0 → 0.72.1

package/src/deployment/broadcast_function.ts

@@ -52,7 +52,7 @@ export async function broadcastPrivateFunction(
 
   await wallet.addCapsule(bytecode);
 
-  const registerer = getRegistererContract(wallet);
+  const registerer = await getRegistererContract(wallet);
   return Promise.resolve(
     registerer.methods.broadcast_private_function(
       contractClass.id,
@@ -103,7 +103,7 @@ export async function broadcastUnconstrainedFunction(
 
   await wallet.addCapsule(bytecode);
 
-  const registerer = getRegistererContract(wallet);
+  const registerer = await getRegistererContract(wallet);
   return registerer.methods.broadcast_unconstrained_function(
     contractClass.id,
     artifactMetadataHash,

package/src/deployment/deploy_instance.ts

@@ -9,8 +9,11 @@ import { getDeployerContract } from './protocol_contracts.js';
  * @param wallet - The wallet to use for the deployment.
  * @param instance - The instance to deploy.
  */
-export function deployInstance(wallet: Wallet, instance: ContractInstanceWithAddress): ContractFunctionInteraction {
-  const deployerContract = getDeployerContract(wallet);
+export async function deployInstance(
+  wallet: Wallet,
+  instance: ContractInstanceWithAddress,
+): Promise<ContractFunctionInteraction> {
+  const deployerContract = await getDeployerContract(wallet);
   const { salt, contractClassId, publicKeys, deployer } = instance;
   const isUniversalDeploy = deployer.isZero();
   if (!isUniversalDeploy && !wallet.getAddress().equals(deployer)) {

package/src/deployment/protocol_contracts.ts

@@ -5,13 +5,13 @@ import { UnsafeContract } from '../contract/unsafe_contract.js';
 import { type Wallet } from '../wallet/index.js';
 
 /** Returns a Contract wrapper for the class registerer. */
-export function getRegistererContract(wallet: Wallet) {
-  const { artifact, instance } = getCanonicalClassRegisterer();
+export async function getRegistererContract(wallet: Wallet) {
+  const { artifact, instance } = await getCanonicalClassRegisterer();
   return new UnsafeContract(instance, artifact, wallet);
 }
 
 /** Returns a Contract wrapper for the instance deployer. */
-export function getDeployerContract(wallet: Wallet) {
-  const { artifact, instance } = getCanonicalInstanceDeployer();
+export async function getDeployerContract(wallet: Wallet) {
+  const { artifact, instance } = await getCanonicalInstanceDeployer();
   return new UnsafeContract(instance, artifact, wallet);
 }

package/src/deployment/register_class.ts

@@ -20,7 +20,7 @@ export async function registerContractClass(
   const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment, packedBytecode } =
     getContractClassFromArtifact(artifact);
   const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
-  const registerer = getRegistererContract(wallet);
+  const registerer = await getRegistererContract(wallet);
   await wallet.addCapsule(encodedBytecode);
   return registerer.methods.register(artifactHash, privateFunctionsRoot, publicBytecodeCommitment, emitPublicBytecode);
 }

package/src/entrypoint/payload.ts

@@ -24,6 +24,8 @@ export type UserFeeOptions = {
   paymentMethod?: FeePaymentMethod;
   /** The gas settings */
   gasSettings?: Partial<FieldsOf<GasSettings>>;
+  /** Percentage to pad the base fee by, if empty, defaults to 0.5 */
+  baseFeePadding?: number;
   /** Whether to run an initial simulation of the tx with high gas limit to figure out actual gas settings. */
   estimateGas?: boolean;
   /** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */

package/src/fee/fee_juice_payment_method_with_claim.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { type AztecAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
-import { FunctionType } from '@aztec/foundation/abi';
+import { FunctionType, U128 } from '@aztec/foundation/abi';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 
@@ -22,9 +22,10 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
    * Creates a function call to pay the fee in Fee Juice.
    * @returns A function call
    */
-  override getFunctionCalls(): Promise<FunctionCall[]> {
+  override async getFunctionCalls(): Promise<FunctionCall[]> {
+    const canonicalFeeJuice = await getCanonicalFeeJuice();
     const selector = FunctionSelector.fromNameAndParameters(
-      getCanonicalFeeJuice().artifact.functions.find(f => f.name === 'claim')!,
+      canonicalFeeJuice.artifact.functions.find(f => f.name === 'claim')!,
     );
 
     return Promise.resolve([
@@ -35,7 +36,7 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
         isStatic: false,
         args: [
           this.sender.toField(),
-          this.claim.claimAmount,
+          ...new U128(this.claim.claimAmount).toFields(),
           this.claim.claimSecret,
           new Fr(this.claim.messageLeafIndex),
         ],

package/src/fee/private_fee_payment_method.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { type GasSettings } from '@aztec/circuits.js';
-import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { FunctionSelector, FunctionType, U128 } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -88,15 +88,15 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
   async getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     // We assume 1:1 exchange rate between fee juice and token. But in reality you would need to convert feeLimit
     // (maxFee) to be in token denomination.
-    const maxFee = this.setMaxFeeToOne ? Fr.ONE : gasSettings.getFeeLimit();
+    const maxFee = new U128(this.setMaxFeeToOne ? 1n : gasSettings.getFeeLimit().toBigInt());
     const nonce = Fr.random();
 
     await this.wallet.createAuthWit({
       caller: this.paymentContract,
       action: {
         name: 'setup_refund',
-        args: [this.wallet.getAddress().toField(), maxFee, nonce],
-        selector: FunctionSelector.fromSignature('setup_refund((Field),Field,Field)'),
+        args: [this.wallet.getAddress().toField(), ...maxFee.toFields(), nonce],
+        selector: FunctionSelector.fromSignature('setup_refund((Field),(Field,Field),Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
         to: await this.getAsset(),
@@ -108,10 +108,10 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
       {
         name: 'fee_entrypoint_private',
         to: this.paymentContract,
-        selector: FunctionSelector.fromSignature('fee_entrypoint_private(Field,Field)'),
+        selector: FunctionSelector.fromSignature('fee_entrypoint_private((Field,Field),Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        args: [maxFee, nonce],
+        args: [...maxFee.toFields(), nonce],
         returnTypes: [],
       },
     ];

package/src/fee/public_fee_payment_method.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { type GasSettings } from '@aztec/circuits.js';
-import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { FunctionSelector, FunctionType, U128 } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -80,7 +80,7 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
    */
   async getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     const nonce = Fr.random();
-    const maxFee = gasSettings.getFeeLimit();
+    const maxFee = new U128(gasSettings.getFeeLimit().toBigInt());
 
     return Promise.resolve([
       this.wallet
@@ -89,8 +89,8 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
             caller: this.paymentContract,
             action: {
               name: 'transfer_in_public',
-              args: [this.wallet.getAddress().toField(), this.paymentContract.toField(), maxFee, nonce],
-              selector: FunctionSelector.fromSignature('transfer_in_public((Field),(Field),Field,Field)'),
+              args: [this.wallet.getAddress().toField(), this.paymentContract.toField(), ...maxFee.toFields(), nonce],
+              selector: FunctionSelector.fromSignature('transfer_in_public((Field),(Field),(Field,Field),Field)'),
               type: FunctionType.PUBLIC,
               isStatic: false,
               to: await this.getAsset(),
@@ -103,10 +103,10 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
       {
         name: 'fee_entrypoint_public',
         to: this.paymentContract,
-        selector: FunctionSelector.fromSignature('fee_entrypoint_public(Field,Field)'),
+        selector: FunctionSelector.fromSignature('fee_entrypoint_public((Field,Field),Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        args: [maxFee, nonce],
+        args: [...maxFee.toFields(), nonce],
         returnTypes: [],
       },
     ]);

package/src/index.ts

@@ -45,6 +45,7 @@ export {
   type L2AmountClaim,
   type L2AmountClaimWithRecipient,
   type L2Claim,
+  type U128Like,
   type WrappedFieldLike,
   type IntentAction,
 } from './utils/index.js';
@@ -117,7 +118,6 @@ export {
   TxHash,
   TxReceipt,
   TxStatus,
-  UnencryptedL2BlockL2Logs,
   UnencryptedL2Log,
   UniqueNote,
   createAztecNodeClient,

package/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;
@@ -21,5 +21,8 @@ export type FunctionSelectorLike = FieldLike | FunctionSelector;
 /** Any type that can be converted into an EventSelector Aztec.nr struct. */
 export type EventSelectorLike = FieldLike | EventSelector;
 
+/** Any type that can be converted into a U128. */
+export type U128Like = bigint | number;
+
 /** Any type that can be converted into a struct with a single `inner` field. */
 export type WrappedFieldLike = { /** Wrapped value */ inner: FieldLike } | FieldLike;

package/src/utils/cheat_codes.ts

@@ -188,6 +188,14 @@ export class RollupCheatCodes {
     await action(owner, this.rollup);
     await this.ethCheatCodes.stopImpersonating(owner);
   }
+
+  /** Directly calls the L1 gas fee oracle. */
+  public async updateL1GasFeeOracle() {
+    await this.asOwner(async (account, rollup) => {
+      await rollup.write.updateL1GasFeeOracle({ account, chain: this.client.chain });
+      this.logger.warn(`Updated L1 gas fee oracle`);
+    });
+  }
 }
 
 /**

package/src/utils/portal_manager.ts

@@ -36,7 +36,7 @@ export type L2Claim = {
 };
 
 /** L1 to L2 message info that corresponds to an amount to claim. */
-export type L2AmountClaim = L2Claim & { /** Amount to claim */ claimAmount: Fr };
+export type L2AmountClaim = L2Claim & { /** Amount to claim */ claimAmount: bigint };
 
 /** L1 to L2 message info that corresponds to an amount to claim with associated recipient. */
 export type L2AmountClaimWithRecipient = L2AmountClaim & {
@@ -173,7 +173,7 @@ export class L1FeeJuicePortalManager {
     );
 
     return {
-      claimAmount: new Fr(amount),
+      claimAmount: amount,
       claimSecret,
       claimSecretHash,
       messageHash: log.args.key,
@@ -264,7 +264,7 @@ export class L1ToL2TokenPortalManager {
     );
 
     return {
-      claimAmount: new Fr(amount),
+      claimAmount: amount,
       claimSecret,
       claimSecretHash,
       messageHash: log.args.key,
@@ -306,7 +306,7 @@ export class L1ToL2TokenPortalManager {
     );
 
     return {
-      claimAmount: new Fr(amount),
+      claimAmount: amount,
       claimSecret,
       claimSecretHash,
       recipient: to,

package/src/utils/pub_key.ts

@@ -6,7 +6,7 @@ import { Grumpkin } from '@aztec/circuits.js/barretenberg';
  * @param privateKey - The private key.
  * @returns The generated public key.
  */
-export function generatePublicKey(privateKey: GrumpkinScalar): PublicKey {
+export function generatePublicKey(privateKey: GrumpkinScalar): Promise<PublicKey> {
   const grumpkin = new Grumpkin();
   return grumpkin.mul(grumpkin.generator(), privateKey);
 }

package/src/wallet/base_wallet.ts

@@ -2,7 +2,8 @@ import {
   type AuthWitness,
   type EventMetadataDefinition,
   type ExtendedNote,
-  type GetUnencryptedLogsResponse,
+  type GetContractClassLogsResponse,
+  type GetPublicLogsResponse,
   type L2Block,
   type LogFilter,
   type NotesFilter,
@@ -160,10 +161,10 @@ export abstract class BaseWallet implements Wallet {
   ): Promise<AbiDecoded> {
     return this.pxe.simulateUnconstrained(functionName, args, to, from);
   }
-  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
-    return this.pxe.getUnencryptedLogs(filter);
+  getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse> {
+    return this.pxe.getPublicLogs(filter);
   }
-  getContractClassLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
+  getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse> {
     return this.pxe.getContractClassLogs(filter);
   }
   getBlockNumber(): Promise<number> {
@@ -193,16 +194,16 @@ export abstract class BaseWallet implements Wallet {
   getPXEInfo(): Promise<PXEInfo> {
     return this.pxe.getPXEInfo();
   }
-  getEncryptedEvents<T>(
+  getPrivateEvents<T>(
     event: EventMetadataDefinition,
     from: number,
     limit: number,
     vpks: Point[] = [this.getCompleteAddress().publicKeys.masterIncomingViewingPublicKey],
   ): Promise<T[]> {
-    return this.pxe.getEncryptedEvents(event, from, limit, vpks);
+    return this.pxe.getPrivateEvents(event, from, limit, vpks);
   }
-  getUnencryptedEvents<T>(event: EventMetadataDefinition, from: number, limit: number): Promise<T[]> {
-    return this.pxe.getUnencryptedEvents(event, from, limit);
+  getPublicEvents<T>(event: EventMetadataDefinition, from: number, limit: number): Promise<T[]> {
+    return this.pxe.getPublicEvents(event, from, limit);
   }
   public getL1ToL2MembershipWitness(
     contractAddress: AztecAddress,