@aztec/wallet-sdk 0.0.1-commit.a89ec08 → 0.0.1-commit.aa0c64f

package/dest/base-wallet/base_wallet.js

@@ -9,12 +9,14 @@ import { createLogger } from '@aztec/foundation/log';
 import { displayDebugLogs } from '@aztec/pxe/client/lazy';
 import { decodeFromAbi } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { computePartialAddress, getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { computePartialAddress } from '@aztec/stdlib/contract';
 import { SimulationError } from '@aztec/stdlib/errors';
-import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
+import { Gas, GasFees, GasSettings, ManaUsageEstimate } from '@aztec/stdlib/gas';
 import { computeSiloedPrivateInitializationNullifier, computeSiloedPublicInitializationNullifier } from '@aztec/stdlib/hash';
+import { deriveKeys, deriveKeysFromMasterSecretKeys } from '@aztec/stdlib/keys';
 import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
 import { inspect } from 'util';
+import { assertGasLimitsWithinNetworkLimits } from './get_gas_limits.js';
 import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simulateViaNode } from './utils.js';
 /**
  * A base class for Wallet implementations
@@ -24,6 +26,9 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
     log;
     minFeePadding;
     cancellableTransactions;
+    // Poll interval (in seconds) injected into sendTx waits when the caller does not specify one. Left undefined on
+    // production wallets so the DefaultWaitOpts 1s cadence stands; test wallets talking to in-process nodes lower it.
+    defaultWaitInterval;
     // A wallet is instantiated for a particular chain, so chain info never changes during its lifetime.
     // We cache it here because getChainInfo is called frequently (every tx simulation, send, auth wit, etc.).
     nodeInfoPromise;
@@ -35,15 +40,32 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
         this.minFeePadding = 0.5;
         this.cancellableTransactions = false;
     }
-    scopesFrom(from, additionalScopes = []) {
-        const allScopes = from === NO_FROM ? additionalScopes : [
-            from,
-            ...additionalScopes
+    scopesFrom(from, additionalScopes, sendMessagesAs) {
+        // The sendMessagesAs account must be in scope so that its tagging secrets can be accessed.
+        const tagSenderScopes = sendMessagesAs ? [
+            sendMessagesAs
+        ] : [];
+        const baseScopes = from === NO_FROM ? [] : [
+            from
+        ];
+        const allScopes = [
+            ...baseScopes,
+            ...additionalScopes,
+            ...tagSenderScopes
         ];
         const scopeSet = new Set(allScopes.map((address)=>address.toString()));
         return [
             ...scopeSet
-        ].map(AztecAddress.fromString);
+        ].map(AztecAddress.fromStringUnsafe);
+    }
+    /**
+   * Picks the sender address PXE should tag private messages with. Returns `undefined` when there is no signing
+   * account (`from === NO_FROM`) and no explicit override; in that case any private log emitted by the tx using
+   * the wallet-supplied default sender will fail the "Sender for tags is not set" assertion.
+   * @param from - Tx sender, or `NO_FROM`.
+   * @param sendMessagesAs - Explicit override.
+   */ senderForTagsFrom(from, sendMessagesAs) {
+        return sendMessagesAs ?? (from === NO_FROM ? undefined : from);
     }
     /**
    * Returns the list of aliased contacts associated with the wallet.
@@ -52,22 +74,44 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
    *  - Contacts: more general concept akin to a phone's contact list.
    * @returns The aliased collection of AztecAddresses that form this wallet's address book
    */ async getAddressBook() {
-        const senders = await this.pxe.getSenders();
-        return senders.map((sender)=>({
-                item: sender,
+        const sources = await this.pxe.getTaggingSecretSources({
+            kind: 'address-derived'
+        });
+        return sources.map((source)=>({
+                item: source.sender,
                 alias: ''
             }));
     }
-    async getChainInfo() {
+    /**
+   * Fetches and caches the node info for the wallet's lifetime, since a wallet talks to a single network and
+   * node info never changes. A rejected fetch clears the cache so the next call retries instead of replaying
+   * the cached rejection forever — important because the gas-limit fill-in and validation (run on every send)
+   * depend on it.
+   */ getNodeInfo() {
         if (!this.nodeInfoPromise) {
-            this.nodeInfoPromise = this.aztecNode.getNodeInfo();
+            this.nodeInfoPromise = this.aztecNode.getNodeInfo().catch((err)=>{
+                this.nodeInfoPromise = undefined;
+                throw err;
+            });
         }
-        const { l1ChainId, rollupVersion } = await this.nodeInfoPromise;
+        return this.nodeInfoPromise;
+    }
+    async getChainInfo() {
+        const { l1ChainId, rollupVersion } = await this.getNodeInfo();
         return {
             chainId: new Fr(l1ChainId),
             version: new Fr(rollupVersion)
         };
     }
+    /**
+   * Returns the maximum gas limits a single transaction may declare on this wallet's network (the
+   * node-advertised `txsLimits.gas`). Internal helper used to fill in default gas limits when sending a
+   * transaction without explicit limits, and to validate caller-provided limits before sending. Backed by
+   * the cached node info, since a wallet talks to a single network.
+   */ async getMaxTxGasLimits() {
+        const { txsLimits } = await this.getNodeInfo();
+        return new Gas(txsLimits.gas.daGas, txsLimits.gas.l2Gas);
+    }
     async createTxExecutionRequestFromPayloadAndFee(executionPayload, from, feeOptions) {
         const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
         const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
@@ -132,8 +176,8 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
    * Completes partial user-provided fee options with wallet defaults.
    * @param config - Fee completion config.
    */ async completeFeeOptions(config) {
-        const { from, feePayer, gasSettings, forEstimation } = config;
-        const maxFeesPerGas = gasSettings?.maxFeesPerGas ?? (await this.aztecNode.getCurrentMinFees()).mul(1 + this.minFeePadding);
+        const { from, feePayer, gasSettings, forEstimation, congestionEstimate } = config;
+        const maxFeesPerGas = gasSettings?.maxFeesPerGas ?? (await this.getMinFees(congestionEstimate)).mul(1 + this.minFeePadding);
         let accountFeePaymentMethodOptions;
         // If from is an address, we need to determine the appropriate fee payment method options for the
         // account contract entrypoint to use
@@ -155,8 +199,25 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
             maxPriorityFeesPerGas: gasSettings?.maxPriorityFeesPerGas ?? GasFees.empty()
         };
         // When estimating gas (simulation), use high limits so the simulation doesn't run out of gas.
-        // When sending for real, use protocol max limits that the network will actually accept.
-        const fullGasSettings = forEstimation ? GasSettings.forEstimation(gasSettingsOverrides) : GasSettings.fallback(gasSettingsOverrides);
+        // When sending for real without explicit limits, declare the most a single tx may use on this network
+        // (the node's per-tx admission limit), so the proposer does not skip the tx for over-declaring gas.
+        let fullGasSettings;
+        if (forEstimation) {
+            // Estimation deliberately uses very high internal limits and skips tx validation, so we do not
+            // validate against the network admission limit here.
+            fullGasSettings = GasSettings.forEstimation(gasSettingsOverrides);
+        } else {
+            const maxTxGasLimits = await this.getMaxTxGasLimits();
+            // If the caller declared explicit gas limits, reject them up front when they exceed the network's
+            // per-tx admission limit (mirroring the node's GasLimitsValidator). Otherwise fill in the limit.
+            if (gasSettingsOverrides.gasLimits) {
+                assertGasLimitsWithinNetworkLimits(gasSettingsOverrides.gasLimits, maxTxGasLimits);
+            }
+            fullGasSettings = GasSettings.fallback({
+                ...gasSettingsOverrides,
+                gasLimits: gasSettingsOverrides.gasLimits ?? maxTxGasLimits
+            });
+        }
         this.log.debug(`Using L2 gas settings`, fullGasSettings);
         return {
             gasSettings: fullGasSettings,
@@ -164,40 +225,57 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
             accountFeePaymentMethodOptions
         };
     }
-    registerSender(address, _alias = '') {
-        return this.pxe.registerSender(address);
-    }
-    async registerContract(instance, artifact, secretKey) {
-        const existingInstance = await this.pxe.getContractInstance(instance.address);
-        if (existingInstance) {
-            // Instance already registered in the wallet
-            if (artifact) {
-                const thisContractClass = await getContractClassFromArtifact(artifact);
-                if (!thisContractClass.id.equals(existingInstance.currentContractClassId)) {
-                    // wallet holds an outdated version of this contract
-                    await this.pxe.updateContract(instance.address, artifact);
-                    instance.currentContractClassId = thisContractClass.id;
-                }
+    /**
+   * Returns the worst-case min fee across predicted future slots.
+   * Falls back to getCurrentMinFees if the node doesn't support getPredictedMinFees.
+   * @param estimate - The mana usage estimate to use for fee prediction. Defaults to Limit for conservative estimation.
+   */ async getMinFees(estimate = ManaUsageEstimate.Limit) {
+        try {
+            const predicted = await this.aztecNode.getPredictedMinFees(estimate);
+            if (predicted.length === 0) {
+                return this.aztecNode.getCurrentMinFees();
             }
-        // If no artifact provided, we just use the existing registration
-        } else {
-            // Instance not registered yet
-            if (!artifact) {
-                // Try to get the artifact from the wallet's contract class storage
-                artifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
-                if (!artifact) {
-                    throw new Error(`Cannot register contract at ${instance.address.toString()}: artifact is required but not provided, and wallet does not have the artifact for contract class ${instance.currentContractClassId.toString()}`);
-                }
+            return predicted.reduce((worst, fees)=>fees.feePerL2Gas > worst.feePerL2Gas ? fees : worst);
+        } catch (err) {
+            // Fallback for old nodes that don't support getPredictedMinFees.
+            // Only fall back on method-not-found errors (JSON-RPC code -32601); rethrow others.
+            if (err?.cause?.code === -32601 || err?.message?.includes('Method not found')) {
+                return this.aztecNode.getCurrentMinFees();
             }
-            await this.pxe.registerContract({
-                artifact,
-                instance
-            });
+            throw err;
         }
-        if (secretKey) {
-            await this.pxe.registerAccount(secretKey, await computePartialAddress(instance));
+    }
+    async registerSender(address, _alias = '') {
+        await this.pxe.registerTaggingSecretSource({
+            kind: 'address-derived',
+            sender: address
+        });
+        return address;
+    }
+    async registerContract(instance, artifact, secretKeyOrKeys) {
+        // Classes and instances are registered independently: register the artifact (if provided) then the instance.
+        // Neither call validates that the artifact matches the class the instance runs, a missing artifact only surfaces
+        // when the contract is later simulated.
+        if (artifact) {
+            await this.pxe.registerContractClass(artifact);
+        }
+        const contractAddress = await this.pxe.registerContract(instance);
+        if (secretKeyOrKeys) {
+            // PXE never receives the account seed (from which the message-signing/fallback secret keys could be re-derived):
+            // the wallet derives the keys here. Of these, PXE only reads and stores the four privacy secret keys and the
+            // message-signing and fallback *public* keys — it never touches the message-signing or fallback secret keys.
+            //
+            // Since PXE recomputes the address from those keys, we assert it matches the instance's address: a mismatch means
+            // the provided keys don't correspond to this account.
+            const derivedKeys = secretKeyOrKeys instanceof Fr ? await deriveKeys(secretKeyOrKeys) : await deriveKeysFromMasterSecretKeys(secretKeyOrKeys);
+            const { address } = await this.pxe.registerAccount(derivedKeys, await computePartialAddress(instance));
+            if (!address.equals(contractAddress)) {
+                throw new Error(`Registered account address ${address.toString()} does not match contract instance address ${contractAddress.toString()}: the provided keys do not correspond to this account.`);
+            }
         }
-        return instance;
+    }
+    registerContractClass(artifact) {
+        return this.pxe.registerContractClass(artifact);
     }
     /**
    * Simulates calls through the standard PXE path (account entrypoint).
@@ -209,7 +287,9 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
             simulatePublic: true,
             skipTxValidation: opts.skipTxValidation,
             skipFeeEnforcement: opts.skipFeeEnforcement,
-            scopes: this.scopesFrom(opts.from, opts.additionalScopes)
+            scopes: this.scopesFrom(opts.from, opts.additionalScopes ?? [], opts.sendMessagesAs),
+            senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs),
+            overrides: opts.overrides
         });
         const appCallOffset = await this.computeAppCallOffset(opts.from, opts.feeOptions);
         return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
@@ -238,7 +318,8 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
             from: opts.from,
             feePayer: executionPayload.feePayer,
             gasSettings: opts.fee?.gasSettings,
-            forEstimation: true
+            forEstimation: true,
+            congestionEstimate: opts.fee?.congestionEstimate
         });
         const { optimizableCalls, remainingCalls } = extractOptimizablePublicStaticCalls(executionPayload);
         const remainingPayload = {
@@ -252,17 +333,19 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
         try {
             blockHeader = await this.pxe.getSyncedBlockHeader();
         } catch  {
-            blockHeader = await this.aztecNode.getBlockHeader();
+            blockHeader = (await this.aztecNode.getBlockData('latest')).header;
         }
         const simulationOrigin = opts.from === NO_FROM ? AztecAddress.ZERO : opts.from;
         const [optimizedResults, normalResult] = await Promise.all([
-            optimizableCalls.length > 0 ? simulateViaNode(this.aztecNode, optimizableCalls, simulationOrigin, chainInfo, feeOptions.gasSettings, blockHeader, opts.skipFeeEnforcement ?? true, this.getContractName.bind(this)) : Promise.resolve([]),
+            optimizableCalls.length > 0 ? simulateViaNode(this.aztecNode, optimizableCalls, simulationOrigin, chainInfo, feeOptions.gasSettings, blockHeader, opts.skipFeeEnforcement ?? true, this.getContractName.bind(this), opts.overrides) : Promise.resolve([]),
             remainingCalls.length > 0 ? this.simulateViaEntrypoint(remainingPayload, {
                 from: opts.from,
                 feeOptions,
                 additionalScopes: opts.additionalScopes,
                 skipTxValidation: opts.skipTxValidation,
-                skipFeeEnforcement: opts.skipFeeEnforcement ?? true
+                skipFeeEnforcement: opts.skipFeeEnforcement ?? true,
+                sendMessagesAs: opts.sendMessagesAs,
+                overrides: opts.overrides
             }) : Promise.resolve(null)
         ]);
         return buildMergedSimulationResult(optimizedResults, normalResult);
@@ -271,27 +354,33 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
         const feeOptions = await this.completeFeeOptions({
             from: opts.from,
             feePayer: executionPayload.feePayer,
-            gasSettings: opts.fee?.gasSettings
+            gasSettings: opts.fee?.gasSettings,
+            congestionEstimate: opts.fee?.congestionEstimate
         });
         const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, feeOptions);
         return this.pxe.profileTx(txRequest, {
             profileMode: opts.profileMode,
             skipProofGeneration: opts.skipProofGeneration ?? true,
-            scopes: this.scopesFrom(opts.from, opts.additionalScopes)
+            scopes: this.scopesFrom(opts.from, opts.additionalScopes ?? [], opts.sendMessagesAs),
+            senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs)
         });
     }
     async sendTx(executionPayload, opts) {
         const feeOptions = await this.completeFeeOptions({
             from: opts.from,
             feePayer: executionPayload.feePayer,
-            gasSettings: opts.fee?.gasSettings
+            gasSettings: opts.fee?.gasSettings,
+            congestionEstimate: opts.fee?.congestionEstimate
         });
         const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(executionPayload, opts.from, feeOptions);
-        const provenTx = await this.pxe.proveTx(txRequest, this.scopesFrom(opts.from, opts.additionalScopes));
+        const provenTx = await this.pxe.proveTx(txRequest, {
+            scopes: this.scopesFrom(opts.from, opts.additionalScopes ?? [], opts.sendMessagesAs),
+            senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs)
+        });
         const offchainOutput = extractOffchainOutput(provenTx.getOffchainEffects(), provenTx.publicInputs.constants.anchorBlockHeader.globalVariables.timestamp);
         const tx = await provenTx.toTx();
         const txHash = tx.getTxHash();
-        if (await this.aztecNode.getTxEffect(txHash)) {
+        if ((await this.aztecNode.getTxReceipt(txHash)).isMined()) {
             throw new Error(`A settled tx with equal hash ${txHash.toString()} exists.`);
         }
         this.log.debug(`Sending transaction ${txHash}`);
@@ -307,10 +396,14 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
             };
         }
         // Otherwise, wait for the full receipt (default behavior on wait: undefined)
-        const waitOpts = typeof opts.wait === 'object' ? opts.wait : undefined;
+        const callerWaitOpts = typeof opts.wait === 'object' ? opts.wait : undefined;
+        const waitOpts = this.defaultWaitInterval !== undefined && callerWaitOpts?.interval === undefined ? {
+            ...callerWaitOpts,
+            interval: this.defaultWaitInterval
+        } : callerWaitOpts;
         const receipt = await waitForTx(this.aztecNode, txHash, waitOpts);
         // Display debug logs from public execution if present (served in test mode only)
-        if (receipt.debugLogs?.length) {
+        if (receipt.isMined() && receipt.debugLogs?.length) {
             await displayDebugLogs(receipt.debugLogs, this.getContractName.bind(this));
         }
         return {
@@ -326,7 +419,11 @@ import { buildMergedSimulationResult, extractOptimizablePublicStaticCalls, simul
         if (!instance) {
             return undefined;
         }
-        const artifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
+        // Contract names are class-stable (an upgrade preserves the contract name), so the original class artifact is a
+        // sufficient source for the display name without resolving the current class against the node.
+        // TODO: if a contract were to be upgraded and its original artifact never registered, then this would fail and we'd
+        // want to fallback to the current class.
+        const artifact = await this.pxe.getContractArtifact(instance.originalContractClassId);
         return artifact?.name;
     }
     contextualizeError(err, ...context) {

package/dest/base-wallet/get_gas_limits.d.ts

@@ -0,0 +1,36 @@
+import { Gas, type GasUsed } from '@aztec/stdlib/gas';
+/**
+ * Returns suggested total and teardown gas limits for a simulated tx, clamped to the network's per-tx
+ * admission limits.
+ *
+ * The network only admits transactions that declare up to `maxTxGasLimits` per dimension (the
+ * node-advertised `txsLimits.gas`). Wallets pass the value read from their own node info, but since node info
+ * is remote input it is defensively clamped here to the per-tx protocol maxima so a value above them is never
+ * honored. If the simulated usage already exceeds the resulting admission limits the tx can never be included,
+ * so this throws a descriptive error instead of returning a limit the node would reject. Otherwise it pads the
+ * usage and clamps each dimension to the admission limit.
+ * @param gasUsed - The gas actually consumed during simulation.
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
+ * @param pad - Fraction to pad the suggested gas limits by (as a decimal, e.g. 0.1 for 10%). The effective
+ * padding shrinks to zero as usage approaches the network limit, since the network will not admit a higher
+ * declared limit regardless of the buffer.
+ */
+export declare function getGasLimits(gasUsed: GasUsed, maxTxGasLimits: Gas, pad?: number): {
+    /**
+     * Gas limit for the tx, excluding teardown gas
+     */
+    gasLimits: Gas;
+    /**
+     * Gas limit for the teardown phase
+     */
+    teardownGasLimits: Gas;
+};
+/**
+ * Validates that caller-declared gas limits do not exceed the network's per-tx admission limits, throwing a
+ * descriptive error per dimension when they do. The node's inbound validation checks declared
+ * `gasSettings.gasLimits`, so we mirror that here to surface the rejection locally before the tx is sent.
+ * @param gasLimits - The gas limits the transaction will declare.
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
+ */
+export declare function assertGasLimitsWithinNetworkLimits(gasLimits: Gas, maxTxGasLimits: Gas): void;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2dhc19saW1pdHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9nZXRfZ2FzX2xpbWl0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsR0FBRyxFQUFFLEtBQUssT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdEQ7Ozs7Ozs7Ozs7Ozs7OztHQWVHO0FBQ0gsd0JBQWdCLFlBQVksQ0FDMUIsT0FBTyxFQUFFLE9BQU8sRUFDaEIsY0FBYyxFQUFFLEdBQUcsRUFDbkIsR0FBRyxTQUFNLEdBQ1I7SUFDRDs7T0FFRztJQUNILFNBQVMsRUFBRSxHQUFHLENBQUM7SUFDZjs7T0FFRztJQUNILGlCQUFpQixFQUFFLEdBQUcsQ0FBQztDQUN4QixDQTZCQTtBQVFEOzs7Ozs7R0FNRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FBQyxTQUFTLEVBQUUsR0FBRyxFQUFFLGNBQWMsRUFBRSxHQUFHLEdBQUcsSUFBSSxDQVc1RiJ9

package/dest/base-wallet/get_gas_limits.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get_gas_limits.d.ts","sourceRoot":"","sources":["../../src/base-wallet/get_gas_limits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,GAAG,EACnB,GAAG,SAAM,GACR;IACD;;OAEG;IACH,SAAS,EAAE,GAAG,CAAC;IACf;;OAEG;IACH,iBAAiB,EAAE,GAAG,CAAC;CACxB,CA6BA;AAQD;;;;;;GAMG;AACH,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,IAAI,CAW5F"}

package/dest/base-wallet/get_gas_limits.js

@@ -0,0 +1,55 @@
+import { MAX_PROCESSABLE_L2_GAS, MAX_TX_DA_GAS } from '@aztec/constants';
+import { Gas } from '@aztec/stdlib/gas';
+/**
+ * Returns suggested total and teardown gas limits for a simulated tx, clamped to the network's per-tx
+ * admission limits.
+ *
+ * The network only admits transactions that declare up to `maxTxGasLimits` per dimension (the
+ * node-advertised `txsLimits.gas`). Wallets pass the value read from their own node info, but since node info
+ * is remote input it is defensively clamped here to the per-tx protocol maxima so a value above them is never
+ * honored. If the simulated usage already exceeds the resulting admission limits the tx can never be included,
+ * so this throws a descriptive error instead of returning a limit the node would reject. Otherwise it pads the
+ * usage and clamps each dimension to the admission limit.
+ * @param gasUsed - The gas actually consumed during simulation.
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
+ * @param pad - Fraction to pad the suggested gas limits by (as a decimal, e.g. 0.1 for 10%). The effective
+ * padding shrinks to zero as usage approaches the network limit, since the network will not admit a higher
+ * declared limit regardless of the buffer.
+ */ export function getGasLimits(gasUsed, maxTxGasLimits, pad = 0.1) {
+    const { totalGas, teardownGas } = gasUsed;
+    // `maxTxGasLimits` is the node-advertised admission limit. Node info is remote input, so we defensively
+    // clamp to the per-tx protocol maxima so a value above them can never be honored.
+    const maxLimits = new Gas(Math.min(maxTxGasLimits.daGas, MAX_TX_DA_GAS), Math.min(maxTxGasLimits.l2Gas, MAX_PROCESSABLE_L2_GAS));
+    // The simulated usage must fit within the admission limits, otherwise the tx can never be included.
+    if (totalGas.daGas > maxLimits.daGas) {
+        throw new Error(`Transaction consumes ${totalGas.daGas} DA gas but the network only admits transactions declaring up to ${maxLimits.daGas} DA gas`);
+    }
+    if (totalGas.l2Gas > maxLimits.l2Gas) {
+        throw new Error(`Transaction consumes ${totalGas.l2Gas} L2 gas but the network only admits transactions declaring up to ${maxLimits.l2Gas} L2 gas`);
+    }
+    // Pad the limits by the buffer, then cap each dimension at the admission limit so the buffer cannot push a
+    // declared limit past what inbound validation accepts. Teardown is part of the total, so clamping it to the
+    // admission limit is safe.
+    return {
+        gasLimits: padGas(totalGas, pad, maxLimits),
+        teardownGasLimits: padGas(teardownGas, pad, maxLimits)
+    };
+}
+/** Pads each gas dimension, capping it at the network admission limit. */ function padGas(gas, pad, cap) {
+    const padded = gas.mul(1 + pad);
+    return new Gas(Math.min(padded.daGas, cap.daGas), Math.min(padded.l2Gas, cap.l2Gas));
+}
+/**
+ * Validates that caller-declared gas limits do not exceed the network's per-tx admission limits, throwing a
+ * descriptive error per dimension when they do. The node's inbound validation checks declared
+ * `gasSettings.gasLimits`, so we mirror that here to surface the rejection locally before the tx is sent.
+ * @param gasLimits - The gas limits the transaction will declare.
+ * @param maxTxGasLimits - The maximum gas a single tx may declare on this network (the node-advertised `txsLimits.gas`).
+ */ export function assertGasLimitsWithinNetworkLimits(gasLimits, maxTxGasLimits) {
+    if (gasLimits.daGas > maxTxGasLimits.daGas) {
+        throw new Error(`Declared DA gas limit (${gasLimits.daGas}) exceeds the maximum this network allows per tx (${maxTxGasLimits.daGas})`);
+    }
+    if (gasLimits.l2Gas > maxTxGasLimits.l2Gas) {
+        throw new Error(`Declared L2 gas limit (${gasLimits.l2Gas}) exceeds the maximum this network allows per tx (${maxTxGasLimits.l2Gas})`);
+    }
+}

package/dest/base-wallet/index.d.ts

@@ -1,3 +1,4 @@
 export { BaseWallet, type CompleteFeeOptionsConfig, type FeeOptions, type SimulateViaEntrypointOptions, } from './base_wallet.js';
 export { simulateViaNode, buildMergedSimulationResult, extractOptimizablePublicStaticCalls } from './utils.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssVUFBVSxFQUNmLEtBQUssNEJBQTRCLEdBQ2xDLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLGVBQWUsRUFBRSwyQkFBMkIsRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLFlBQVksQ0FBQyJ9
+export { getGasLimits, assertGasLimitsWithinNetworkLimits } from './get_gas_limits.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssVUFBVSxFQUNmLEtBQUssNEJBQTRCLEdBQ2xDLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLGVBQWUsRUFBRSwyQkFBMkIsRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUMvRyxPQUFPLEVBQUUsWUFBWSxFQUFFLGtDQUFrQyxFQUFFLE1BQU0scUJBQXFCLENBQUMifQ==

package/dest/base-wallet/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base-wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,wBAAwB,EAC7B,KAAK,UAAU,EACf,KAAK,4BAA4B,GAClC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base-wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,wBAAwB,EAC7B,KAAK,UAAU,EACf,KAAK,4BAA4B,GAClC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC;AAC/G,OAAO,EAAE,YAAY,EAAE,kCAAkC,EAAE,MAAM,qBAAqB,CAAC"}

package/dest/base-wallet/index.js

@@ -1,2 +1,3 @@
 export { BaseWallet } from './base_wallet.js';
 export { simulateViaNode, buildMergedSimulationResult, extractOptimizablePublicStaticCalls } from './utils.js';
+export { getGasLimits, assertGasLimitsWithinNetworkLimits } from './get_gas_limits.js';

package/dest/base-wallet/utils.d.ts

@@ -5,7 +5,7 @@ import type { ContractNameResolver } from '@aztec/pxe/client/lazy';
 import { type FunctionCall } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
-import { type BlockHeader, type ExecutionPayload, TxSimulationResult } from '@aztec/stdlib/tx';
+import { type BlockHeader, type ExecutionPayload, type SimulationOverrides, TxSimulationResult } from '@aztec/stdlib/tx';
 /**
  * Splits an execution payload into a leading prefix of public static calls
  * (eligible for direct node simulation) and the remaining calls.
@@ -33,9 +33,11 @@ export declare function extractOptimizablePublicStaticCalls(payload: ExecutionPa
  * @param gasSettings - Gas settings for the transaction.
  * @param blockHeader - Block header to use as anchor.
  * @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
+ * @param getContractName - Resolver for contract names (used for debug log display).
+ * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
  * @returns Array of TxSimulationResult, one per batch.
  */
-export declare function simulateViaNode(node: AztecNode, publicStaticCalls: FunctionCall[], from: AztecAddress, chainInfo: ChainInfo, gasSettings: GasSettings, blockHeader: BlockHeader, skipFeeEnforcement: boolean | undefined, getContractName: ContractNameResolver): Promise<TxSimulationResult[]>;
+export declare function simulateViaNode(node: AztecNode, publicStaticCalls: FunctionCall[], from: AztecAddress, chainInfo: ChainInfo, gasSettings: GasSettings, blockHeader: BlockHeader, skipFeeEnforcement: boolean | undefined, getContractName: ContractNameResolver, overrides?: SimulationOverrides): Promise<TxSimulationResult[]>;
 /**
  * Merges simulation results from the optimized (public static) and normal paths.
  * Since optimized calls are always a leading prefix, return values are simply
@@ -47,4 +49,4 @@ export declare function simulateViaNode(node: AztecNode, publicStaticCalls: Func
  * @returns A single TxSimulationResult with return values in original call order.
  */
 export declare function buildMergedSimulationResult(optimizedResults: TxSimulationResult[], normalResult: TxSimulationResultWithAppOffset | null): TxSimulationResultWithAppOffset;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUV6RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUkvRCxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR25FLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBb0IsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVFyRCxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssZ0JBQWdCLEVBT3JCLGtCQUFrQixFQUNuQixNQUFNLGtCQUFrQixDQUFDO0FBRTFCOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQixtQ0FBbUMsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUc7SUFDOUUsdUVBQXVFO0lBQ3ZFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ2pDLDJCQUEyQjtJQUMzQixjQUFjLEVBQUUsWUFBWSxFQUFFLENBQUM7Q0FDaEMsQ0FPQTtBQXVHRDs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxJQUFJLEVBQUUsU0FBUyxFQUNmLGlCQUFpQixFQUFFLFlBQVksRUFBRSxFQUNqQyxJQUFJLEVBQUUsWUFBWSxFQUNsQixTQUFTLEVBQUUsU0FBUyxFQUNwQixXQUFXLEVBQUUsV0FBVyxFQUN4QixXQUFXLEVBQUUsV0FBVyxFQUN4QixrQkFBa0IscUJBQWdCLEVBQ2xDLGVBQWUsRUFBRSxvQkFBb0IsR0FDcEMsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0F3Qi9CO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQWdCLDJCQUEyQixDQUN6QyxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxFQUN0QyxZQUFZLEVBQUUsK0JBQStCLEdBQUcsSUFBSSxHQUNuRCwrQkFBK0IsQ0FxQmpDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUV6RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUkvRCxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR25FLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBb0IsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVFyRCxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssZ0JBQWdCLEVBS3JCLEtBQUssbUJBQW1CLEVBR3hCLGtCQUFrQixFQUNuQixNQUFNLGtCQUFrQixDQUFDO0FBRTFCOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQixtQ0FBbUMsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUc7SUFDOUUsdUVBQXVFO0lBQ3ZFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ2pDLDJCQUEyQjtJQUMzQixjQUFjLEVBQUUsWUFBWSxFQUFFLENBQUM7Q0FDaEMsQ0FPQTtBQTBHRDs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHdCQUFzQixlQUFlLENBQ25DLElBQUksRUFBRSxTQUFTLEVBQ2YsaUJBQWlCLEVBQUUsWUFBWSxFQUFFLEVBQ2pDLElBQUksRUFBRSxZQUFZLEVBQ2xCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLGtCQUFrQixxQkFBZ0IsRUFDbEMsZUFBZSxFQUFFLG9CQUFvQixFQUNyQyxTQUFTLENBQUMsRUFBRSxtQkFBbUIsR0FDOUIsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0F5Qi9CO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQWdCLDJCQUEyQixDQUN6QyxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxFQUN0QyxZQUFZLEVBQUUsK0JBQStCLEdBQUcsSUFBSSxHQUNuRCwrQkFBK0IsQ0FxQmpDIn0=

package/dest/base-wallet/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base-wallet/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAI/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQrD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAOrB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAC9E,uEAAuE;IACvE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IACjC,2BAA2B;IAC3B,cAAc,EAAE,YAAY,EAAE,CAAC;CAChC,CAOA;AAuGD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,EACf,iBAAiB,EAAE,YAAY,EAAE,EACjC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,kBAAkB,qBAAgB,EAClC,eAAe,EAAE,oBAAoB,GACpC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAwB/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,gBAAgB,EAAE,kBAAkB,EAAE,EACtC,YAAY,EAAE,+BAA+B,GAAG,IAAI,GACnD,+BAA+B,CAqBjC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base-wallet/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAI/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQrD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAKrB,KAAK,mBAAmB,EAGxB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAC9E,uEAAuE;IACvE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IACjC,2BAA2B;IAC3B,cAAc,EAAE,YAAY,EAAE,CAAC;CAChC,CAOA;AA0GD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,EACf,iBAAiB,EAAE,YAAY,EAAE,EACjC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,kBAAkB,qBAAgB,EAClC,eAAe,EAAE,oBAAoB,EACrC,SAAS,CAAC,EAAE,mBAAmB,GAC9B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAyB/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,gBAAgB,EAAE,kBAAkB,EAAE,EACtC,YAAY,EAAE,+BAA+B,GAAG,IAAI,GACnD,+BAA+B,CAqBjC"}

package/dest/base-wallet/utils.js

@@ -35,8 +35,10 @@ import { HashedValues, PrivateCallExecutionResult, PrivateExecutionResult, Tx, T
  * @param gasSettings - Gas settings for the transaction.
  * @param blockHeader - Block header to use as anchor.
  * @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
+ * @param getContractName - Resolver for contract names (used for debug log display).
+ * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
  * @returns TxSimulationResult with public return values.
- */ async function simulateBatchViaNode(node, publicStaticCalls, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement, getContractName) {
+ */ async function simulateBatchViaNode(node, publicStaticCalls, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement, getContractName, overrides) {
     const txContext = new TxContext(chainInfo.chainId, chainInfo.version, gasSettings);
     const publicFunctionCalldata = [];
     for (const call of publicStaticCalls){
@@ -75,7 +77,7 @@ import { HashedValues, PrivateCallExecutionResult, PrivateExecutionResult, Tx, T
         contractClassLogFields: [],
         publicFunctionCalldata: publicFunctionCalldata
     });
-    const publicOutput = await node.simulatePublicCalls(tx, skipFeeEnforcement);
+    const publicOutput = await node.simulatePublicCalls(tx, skipFeeEnforcement, overrides);
     if (publicOutput.revertReason) {
         throw publicOutput.revertReason;
     }
@@ -94,15 +96,17 @@ import { HashedValues, PrivateCallExecutionResult, PrivateExecutionResult, Tx, T
  * @param gasSettings - Gas settings for the transaction.
  * @param blockHeader - Block header to use as anchor.
  * @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
+ * @param getContractName - Resolver for contract names (used for debug log display).
+ * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
  * @returns Array of TxSimulationResult, one per batch.
- */ export async function simulateViaNode(node, publicStaticCalls, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement = true, getContractName) {
+ */ export async function simulateViaNode(node, publicStaticCalls, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement = true, getContractName, overrides) {
     const batches = [];
     for(let i = 0; i < publicStaticCalls.length; i += MAX_ENQUEUED_CALLS_PER_CALL){
         batches.push(publicStaticCalls.slice(i, i + MAX_ENQUEUED_CALLS_PER_CALL));
     }
     const results = [];
     for (const batch of batches){
-        const result = await simulateBatchViaNode(node, batch, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement, getContractName);
+        const result = await simulateBatchViaNode(node, batch, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement, getContractName, overrides);
         results.push(result);
     }
     return results;

package/dest/extension/handlers/background_connection_handler.d.ts

@@ -1,6 +1,6 @@
 import type { ChainInfo } from '@aztec/aztec.js/account';
 import { type EncryptedPayload } from '../../crypto.js';
-import { type DiscoveryRequest, type KeyExchangeRequest, type WalletInfo, type WalletMessage, type WalletResponse } from '../../types.js';
+import { type DiscoveryRequest, type KeyExchangeRequest, type WalletInfo, type WalletMessage, type WalletResponse, type WalletSdkLogger } from '../../types.js';
 import { type BackgroundMessage, type MessageSender } from './internal_message_types.js';
 /**
  * Status of a pending discovery request.
@@ -98,6 +98,8 @@ export interface BackgroundConnectionConfig {
     walletVersion: string;
     /** Optional wallet icon URL. */
     walletIcon?: string;
+    /** Logger used for diagnostics. */
+    logger: WalletSdkLogger;
 }
 /**
  * Handles wallet session flow in the extension background script.
@@ -115,6 +117,7 @@ export interface BackgroundConnectionConfig {
  *     walletId: 'my-wallet',
  *     walletName: 'My Wallet',
  *     walletVersion: '1.0.0',
+ *     logger: console,
  *   },
  *   {
  *     sendToTab: (tabId, message) => browser.tabs.sendMessage(tabId, message),
@@ -136,9 +139,16 @@ export declare class BackgroundConnectionHandler {
     private callbacks;
     private pendingDiscoveries;
     private activeSessions;
+    private log;
     constructor(config: BackgroundConnectionConfig, transport: BackgroundTransport, callbacks?: BackgroundConnectionCallbacks);
     initialize(): void;
     private handleMessage;
+    /**
+     * Reply to a dApp PING with a PONG. Used as a liveness probe so the dApp can
+     * tell the difference between a slow request and a dead extension.
+     * @param sessionId - The session that sent the PING.
+     */
+    private handlePing;
     getWalletInfo(): WalletInfo;
     handleDiscoveryRequest(request: DiscoveryRequest, tabId: number, origin: string): void;
     approveDiscovery(requestId: string): boolean;
@@ -155,4 +165,4 @@ export declare class BackgroundConnectionHandler {
     getSession(sessionId: string): ActiveSession | undefined;
     getPendingDiscovery(requestId: string): PendingDiscovery | undefined;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9leHRlbnNpb24vaGFuZGxlcnMvYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBT3RCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssVUFBVSxFQUNmLEtBQUssYUFBYSxFQUVsQixLQUFLLGNBQWMsRUFDcEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEVBQ0wsS0FBSyxpQkFBaUIsRUFJdEIsS0FBSyxhQUFhLEVBQ25CLE1BQU0sNkJBQTZCLENBQUM7QUFFckM7O0dBRUc7QUFDSCxNQUFNLE1BQU0sZUFBZSxHQUFHLFNBQVMsR0FBRyxVQUFVLEdBQUcsVUFBVSxDQUFDO0FBRWxFOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixpQ0FBaUM7SUFDakMsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQiw4QkFBOEI7SUFDOUIsS0FBSyxFQUFFLE1BQU0sQ0FBQztJQUNkLGlDQUFpQztJQUNqQyxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDakIseUNBQXlDO0lBQ3pDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZiwyQkFBMkI7SUFDM0IsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixzQkFBc0I7SUFDdEIsS0FBSyxFQUFFLE1BQU0sQ0FBQztJQUNkLHlCQUF5QjtJQUN6QixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLHNCQUFzQjtJQUN0QixNQUFNLEVBQUUsZUFBZSxDQUFDO0NBQ3pCO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxX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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9leHRlbnNpb24vaGFuZGxlcnMvYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBT3RCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssVUFBVSxFQUNmLEtBQUssYUFBYSxFQUVsQixLQUFLLGNBQWMsRUFDbkIsS0FBSyxlQUFlLEVBQ3JCLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBSXRCLEtBQUssYUFBYSxFQUNuQixNQUFNLDZCQUE2QixDQUFDO0FBRXJDOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FBRyxTQUFTLEdBQUcsVUFBVSxHQUFHLFVBQVUsQ0FBQztBQUVsRTs7R0FFRztBQUNILE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsaUNBQWlDO0lBQ2pDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsOEJBQThCO0lBQzlCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxpQ0FBaUM7SUFDakMsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLHlDQUF5QztJQUN6QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsMkJBQTJCO0lBQzNCLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsc0JBQXNCO0lBQ3RCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCx5QkFBeUI7SUFDekIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixzQkFBc0I7SUFDdEIsTUFBTSxFQUFFLGVBQWUsQ0FBQztDQUN6QjtBQUVEOzs7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