@aztec/bot 0.0.1-commit.b6e433891 → 0.0.1-commit.b9865e97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "0.0.1-commit.b6e433891",
+  "version": "0.0.1-commit.b9865e97",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,24 +54,24 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.b6e433891",
-    "@aztec/aztec.js": "0.0.1-commit.b6e433891",
-    "@aztec/entrypoints": "0.0.1-commit.b6e433891",
-    "@aztec/ethereum": "0.0.1-commit.b6e433891",
-    "@aztec/foundation": "0.0.1-commit.b6e433891",
-    "@aztec/kv-store": "0.0.1-commit.b6e433891",
-    "@aztec/l1-artifacts": "0.0.1-commit.b6e433891",
-    "@aztec/noir-contracts.js": "0.0.1-commit.b6e433891",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b6e433891",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.b6e433891",
-    "@aztec/protocol-contracts": "0.0.1-commit.b6e433891",
-    "@aztec/stdlib": "0.0.1-commit.b6e433891",
-    "@aztec/telemetry-client": "0.0.1-commit.b6e433891",
-    "@aztec/wallets": "0.0.1-commit.b6e433891",
+    "@aztec/accounts": "0.0.1-commit.b9865e97",
+    "@aztec/aztec.js": "0.0.1-commit.b9865e97",
+    "@aztec/entrypoints": "0.0.1-commit.b9865e97",
+    "@aztec/ethereum": "0.0.1-commit.b9865e97",
+    "@aztec/foundation": "0.0.1-commit.b9865e97",
+    "@aztec/kv-store": "0.0.1-commit.b9865e97",
+    "@aztec/l1-artifacts": "0.0.1-commit.b9865e97",
+    "@aztec/noir-contracts.js": "0.0.1-commit.b9865e97",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b9865e97",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.b9865e97",
+    "@aztec/protocol-contracts": "0.0.1-commit.b9865e97",
+    "@aztec/stdlib": "0.0.1-commit.b9865e97",
+    "@aztec/telemetry-client": "0.0.1-commit.b9865e97",
+    "@aztec/wallets": "0.0.1-commit.b9865e97",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2",
-    "zod": "^3.23.8"
+    "zod": "^4"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

package/src/amm_bot.ts

@@ -1,7 +1,7 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
-import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
+import type { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -87,7 +87,7 @@ export class AmmBot extends BaseBot {
         authWitnesses: [swapAuthwit],
       });
 
-    const opts = await this.getSendMethodOpts(swapExactTokensInteraction);
+    const opts = this.getSendMethodOpts();
 
     this.log.verbose(`Sending transaction`, logCtx);
     this.log.info(`Tx. Balances: ${jsonStringify(balances)}`, { ...logCtx, balances });

package/src/base_bot.ts

@@ -1,8 +1,9 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { BatchCall, ContractFunctionInteraction, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
+import type { SendInteractionOptions } from '@aztec/aztec.js/contracts';
 import { createLogger } from '@aztec/aztec.js/log';
 import { waitForTx } from '@aztec/aztec.js/node';
-import { TxHash, TxReceipt, TxStatus } from '@aztec/aztec.js/tx';
+import { TxStatus } from '@aztec/aztec.js/tx';
+import type { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
 import { Gas } from '@aztec/stdlib/gas';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { EmbeddedWallet } from '@aztec/wallets/embedded';
@@ -56,27 +57,19 @@ export abstract class BaseBot {
     return Promise.resolve();
   }
 
-  protected async getSendMethodOpts(
-    interaction: ContractFunctionInteraction | BatchCall,
-  ): Promise<SendInteractionOptions> {
+  protected getSendMethodOpts(): SendInteractionOptions {
     const { l2GasLimit, daGasLimit, minFeePadding } = this.config;
 
     this.wallet.setMinFeePadding(minFeePadding);
 
-    let gasSettings;
-    if (l2GasLimit !== undefined && l2GasLimit > 0 && daGasLimit !== undefined && daGasLimit > 0) {
-      gasSettings = { gasLimits: Gas.from({ l2Gas: l2GasLimit, daGas: daGasLimit }) };
-      this.log.verbose(`Using gas limits ${l2GasLimit} L2 gas ${daGasLimit} DA gas`);
-    } else {
-      this.log.verbose(`Estimating gas for transaction`);
-      ({ estimatedGas: gasSettings } = await interaction.simulate({
-        fee: { estimateGas: true },
-        from: this.defaultAccountAddress,
-      }));
-    }
+    const gasSettings =
+      l2GasLimit !== undefined && l2GasLimit > 0 && daGasLimit !== undefined && daGasLimit > 0
+        ? { gasLimits: Gas.from({ l2Gas: l2GasLimit, daGas: daGasLimit }) }
+        : undefined;
+
     return {
       from: this.defaultAccountAddress,
-      fee: { gasSettings },
+      ...(gasSettings ? { fee: { gasSettings } } : {}),
     };
   }
 }

package/src/bot.ts

@@ -70,10 +70,7 @@ export class Bot extends BaseBot {
         );
 
     const batch = new BatchCall(wallet, calls);
-    const opts = await this.getSendMethodOpts(batch);
-
-    this.log.verbose(`Simulating transaction with ${calls.length}`, logCtx);
-    await batch.simulate({ from: this.defaultAccountAddress });
+    const opts = this.getSendMethodOpts();
 
     this.log.verbose(`Sending transaction`, logCtx);
     const { txHash } = await batch.send({ ...opts, wait: NO_WAIT });

package/src/config.ts

@@ -69,9 +69,9 @@ export type BotConfig = {
   maxPendingTxs: number;
   /** Whether to flush after sending each 'setup' transaction */
   flushSetupTransactions: boolean;
-  /** L2 gas limit for the tx (empty to have the bot trigger an estimate gas). */
+  /** L2 gas limit for the tx (empty to let the bot's wallet estimate). */
   l2GasLimit: number | undefined;
-  /** DA gas limit for the tx (empty to have the bot trigger an estimate gas). */
+  /** DA gas limit for the tx (empty to let the bot's wallet estimate). */
   daGasLimit: number | undefined;
   /** Token contract to use */
   contract: SupportedTokenContracts;
@@ -243,12 +243,12 @@ export const botConfigMappings: ConfigMappingsType<BotConfig> = {
   },
   l2GasLimit: {
     env: 'BOT_L2_GAS_LIMIT',
-    description: 'L2 gas limit for the tx (empty to have the bot trigger an estimate gas).',
+    description: "L2 gas limit for the tx (empty to let the bot's wallet estimate).",
     ...optionalNumberConfigHelper(),
   },
   daGasLimit: {
     env: 'BOT_DA_GAS_LIMIT',
-    description: 'DA gas limit for the tx (empty to have the bot trigger an estimate gas).',
+    description: "DA gas limit for the tx (empty to let the bot's wallet estimate).",
     ...optionalNumberConfigHelper(),
   },
   contract: {

package/src/cross_chain_bot.ts

@@ -26,7 +26,7 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
 import { isL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
-import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
+import type { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -137,7 +137,7 @@ export class CrossChainBot extends BaseBot {
     }
 
     const batch = new BatchCall(this.wallet, calls);
-    const opts = await this.getSendMethodOpts(batch);
+    const opts = this.getSendMethodOpts();
 
     this.log.verbose(`Sending cross-chain batch with ${calls.length} calls`, logCtx);
     const { txHash } = await batch.send({ ...opts, wait: NO_WAIT });
@@ -146,9 +146,10 @@ export class CrossChainBot extends BaseBot {
 
   protected override async onTxMined(receipt: TxReceipt, logCtx: object): Promise<void> {
     // Verify L2→L1 messages appeared in this tx's effects
-    const indexed = await this.node.getTxEffect(receipt.txHash);
-    if (indexed) {
-      const l2ToL1Msgs = indexed.data.l2ToL1Msgs.filter(m => !m.isZero());
+    const minedReceipt = await this.node.getTxReceipt(receipt.txHash, { includeTxEffect: true });
+    const l2ToL1MsgsRaw = minedReceipt.txEffect?.l2ToL1Msgs;
+    if (l2ToL1MsgsRaw) {
+      const l2ToL1Msgs = l2ToL1MsgsRaw.filter(m => !m.isZero());
       if (l2ToL1Msgs.length >= this.config.l2ToL1MessagesPerTx) {
         this.l2ToL1Sent += l2ToL1Msgs.length;
       } else {