@aztec/aztec.js 0.65.0 → 0.65.2

package/src/entrypoint/payload.ts

@@ -4,6 +4,7 @@ import { FunctionType } from '@aztec/foundation/abi';
 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 { type FeePaymentMethod } from '../fee/fee_payment_method.js';
 
@@ -17,6 +18,18 @@ export type FeeOptions = {
   gasSettings: GasSettings;
 };
 
+/** Fee options as set by a user. */
+export type UserFeeOptions = {
+  /** The fee payment method to use */
+  paymentMethod?: FeePaymentMethod;
+  /** The gas settings */
+  gasSettings?: Partial<FieldsOf<GasSettings>>;
+  /** 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. */
+  estimatedGasPadding?: number;
+};
+
 // These must match the values defined in:
 // - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
 const APP_MAX_CALLS = 4;

package/src/rpc_clients/node/index.ts

@@ -1,8 +1,10 @@
 import { type PXE } from '@aztec/circuit-types';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { type DebugLogger } from '@aztec/foundation/log';
 import { NoRetryError, makeBackoff, retry } from '@aztec/foundation/retry';
 
-import axios, { type AxiosError, type AxiosResponse } from 'axios';
+import { Axios, type AxiosError } from 'axios';
+import { inspect } from 'util';
 
 import { createPXEClient } from '../pxe_client.js';
 
@@ -15,34 +17,19 @@ import { createPXEClient } from '../pxe_client.js';
  * @returns The response data.
  */
 async function axiosFetch(host: string, rpcMethod: string, body: any, useApiEndpoints: boolean) {
-  let resp: AxiosResponse;
-  if (useApiEndpoints) {
-    resp = await axios
-      .post(`${host}/${rpcMethod}`, body, {
-        headers: { 'content-type': 'application/json' },
-      })
-      .catch((error: AxiosError) => {
-        if (error.response) {
-          return error.response;
-        }
-        throw error;
-      });
-  } else {
-    resp = await axios
-      .post(
-        host,
-        { ...body, method: rpcMethod },
-        {
-          headers: { 'content-type': 'application/json' },
-        },
-      )
-      .catch((error: AxiosError) => {
-        if (error.response) {
-          return error.response;
-        }
-        throw error;
-      });
-  }
+  const request = new Axios({
+    headers: { 'content-type': 'application/json' },
+    transformRequest: [(data: any) => jsonStringify(data)],
+    transformResponse: [(data: any) => JSON.parse(data)],
+  });
+  const [url, content] = useApiEndpoints ? [`${host}/${rpcMethod}`, body] : [host, { ...body, method: rpcMethod }];
+  const resp = await request.post(url, content).catch((error: AxiosError) => {
+    if (error.response) {
+      return error.response;
+    }
+    const errorMessage = `Error fetching from host ${host} with method ${rpcMethod}: ${inspect(error)}`;
+    throw new Error(errorMessage);
+  });
 
   const isOK = resp.status >= 200 && resp.status < 300;
   if (isOK) {

package/src/utils/anvil_test_watcher.ts

@@ -62,9 +62,9 @@ export class AnvilTestWatcher {
     try {
       const currentSlot = await this.rollup.read.getCurrentSlot();
       const pendingBlockNumber = BigInt(await this.rollup.read.getPendingBlockNumber());
-      const [, , lastSlotNumber] = await this.rollup.read.blocks([pendingBlockNumber]);
+      const blockLog = await this.rollup.read.getBlock([pendingBlockNumber]);
 
-      if (currentSlot === lastSlotNumber) {
+      if (currentSlot === blockLog.slotNumber) {
         // We should jump to the next slot
         const timestamp = await this.rollup.read.getTimestampForSlot([currentSlot + 1n]);
         try {

package/src/wallet/base_wallet.ts

@@ -26,6 +26,7 @@ import {
   type ContractClassWithId,
   type ContractInstanceWithAddress,
   type Fr,
+  type GasFees,
   type L1_TO_L2_MSG_TREE_HEIGHT,
   type NodeInfo,
   type PartialAddress,
@@ -145,6 +146,9 @@ export abstract class BaseWallet implements Wallet {
   getBlock(number: number): Promise<L2Block | undefined> {
     return this.pxe.getBlock(number);
   }
+  getCurrentBaseFees(): Promise<GasFees> {
+    return this.pxe.getCurrentBaseFees();
+  }
   simulateUnconstrained(
     functionName: string,
     args: any[],