@aztec/bot 0.0.1-commit.72dcdcda8 → 0.0.1-commit.7689c7f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "0.0.1-commit.72dcdcda8",
+  "version": "0.0.1-commit.7689c7f",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,24 +54,24 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.72dcdcda8",
-    "@aztec/aztec.js": "0.0.1-commit.72dcdcda8",
-    "@aztec/entrypoints": "0.0.1-commit.72dcdcda8",
-    "@aztec/ethereum": "0.0.1-commit.72dcdcda8",
-    "@aztec/foundation": "0.0.1-commit.72dcdcda8",
-    "@aztec/kv-store": "0.0.1-commit.72dcdcda8",
-    "@aztec/l1-artifacts": "0.0.1-commit.72dcdcda8",
-    "@aztec/noir-contracts.js": "0.0.1-commit.72dcdcda8",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.72dcdcda8",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.72dcdcda8",
-    "@aztec/protocol-contracts": "0.0.1-commit.72dcdcda8",
-    "@aztec/stdlib": "0.0.1-commit.72dcdcda8",
-    "@aztec/telemetry-client": "0.0.1-commit.72dcdcda8",
-    "@aztec/wallets": "0.0.1-commit.72dcdcda8",
+    "@aztec/accounts": "0.0.1-commit.7689c7f",
+    "@aztec/aztec.js": "0.0.1-commit.7689c7f",
+    "@aztec/entrypoints": "0.0.1-commit.7689c7f",
+    "@aztec/ethereum": "0.0.1-commit.7689c7f",
+    "@aztec/foundation": "0.0.1-commit.7689c7f",
+    "@aztec/kv-store": "0.0.1-commit.7689c7f",
+    "@aztec/l1-artifacts": "0.0.1-commit.7689c7f",
+    "@aztec/noir-contracts.js": "0.0.1-commit.7689c7f",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.7689c7f",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.7689c7f",
+    "@aztec/protocol-contracts": "0.0.1-commit.7689c7f",
+    "@aztec/stdlib": "0.0.1-commit.7689c7f",
+    "@aztec/telemetry-client": "0.0.1-commit.7689c7f",
+    "@aztec/wallets": "0.0.1-commit.7689c7f",
     "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

@@ -71,12 +71,14 @@ export class AmmBot extends BaseBot {
         .getFunctionCall(),
     });
 
-    const amountOutMin = await amm.methods
-      .get_amount_out_for_exact_in(
-        await tokenIn.methods.balance_of_public(amm.address).simulate({ from: this.defaultAccountAddress }),
-        await tokenOut.methods.balance_of_public(amm.address).simulate({ from: this.defaultAccountAddress }),
-        amountIn,
-      )
+    const { result: tokenInBalance } = await tokenIn.methods
+      .balance_of_public(amm.address)
+      .simulate({ from: this.defaultAccountAddress });
+    const { result: tokenOutBalance } = await tokenOut.methods
+      .balance_of_public(amm.address)
+      .simulate({ from: this.defaultAccountAddress });
+    const { result: amountOutMin } = await amm.methods
+      .get_amount_out_for_exact_in(tokenInBalance, tokenOutBalance, amountIn)
       .simulate({ from: this.defaultAccountAddress });
 
     const swapExactTokensInteraction = amm.methods
@@ -85,11 +87,12 @@ 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 });
-    return swapExactTokensInteraction.send({ ...opts, wait: NO_WAIT });
+    const { txHash } = await swapExactTokensInteraction.send({ ...opts, wait: NO_WAIT });
+    return txHash;
   }
 
   protected override async onTxMined(receipt: TxReceipt, logCtx: object): Promise<void> {
@@ -110,15 +113,17 @@ export class AmmBot extends BaseBot {
   }
 
   private async getPublicBalanceFor(address: AztecAddress, from?: AztecAddress): Promise<Balances> {
-    return {
-      token0: await this.token0.methods.balance_of_public(address).simulate({ from: from ?? address }),
-      token1: await this.token1.methods.balance_of_public(address).simulate({ from: from ?? address }),
-    };
+    const { result: token0 } = await this.token0.methods.balance_of_public(address).simulate({ from: from ?? address });
+    const { result: token1 } = await this.token1.methods.balance_of_public(address).simulate({ from: from ?? address });
+    return { token0, token1 };
   }
   private async getPrivateBalanceFor(address: AztecAddress, from?: AztecAddress): Promise<Balances> {
-    return {
-      token0: await this.token0.methods.balance_of_private(address).simulate({ from: from ?? address }),
-      token1: await this.token1.methods.balance_of_private(address).simulate({ from: from ?? address }),
-    };
+    const { result: token0 } = await this.token0.methods
+      .balance_of_private(address)
+      .simulate({ from: from ?? address });
+    const { result: token1 } = await this.token1.methods
+      .balance_of_private(address)
+      .simulate({ from: from ?? address });
+    return { token0, token1 };
   }
 }

package/src/base_bot.ts

@@ -1,5 +1,5 @@
 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';
@@ -56,27 +56,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,13 +70,11 @@ 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);
-    return batch.send({ ...opts, wait: NO_WAIT });
+    const { txHash } = await batch.send({ ...opts, wait: NO_WAIT });
+    return txHash;
   }
 
   public async getBalances() {

package/src/config.ts

@@ -11,9 +11,9 @@ import {
   secretStringConfigHelper,
 } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { schemas, zodFor } from '@aztec/stdlib/schemas';
 import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 
@@ -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;
@@ -130,7 +130,6 @@ export const BotConfigSchema = zodFor<BotConfig>()(
       l1Mnemonic: undefined,
       l1PrivateKey: undefined,
       senderPrivateKey: undefined,
-      dataDirectory: undefined,
       dataStoreMapSizeKb: 1_024 * 1_024,
       ...config,
     })),
@@ -244,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

@@ -137,10 +137,11 @@ 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);
-    return batch.send({ ...opts, wait: NO_WAIT });
+    const { txHash } = await batch.send({ ...opts, wait: NO_WAIT });
+    return txHash;
   }
 
   protected override async onTxMined(receipt: TxReceipt, logCtx: object): Promise<void> {
@@ -174,14 +175,7 @@ export class CrossChainBot extends BaseBot {
   ): Promise<PendingL1ToL2Message | undefined> {
     const now = Date.now();
     for (const msg of pendingMessages) {
-      const ready = await isL1ToL2MessageReady(this.node, Fr.fromHexString(msg.msgHash), {
-        // Use forPublicConsumption: false so we wait until blockNumber >= messageBlockNumber.
-        // With forPublicConsumption: true, the check returns true one block early (the sequencer
-        // includes L1→L2 messages before executing the block's txs), but gas estimation simulates
-        // against the current world state which doesn't yet have the message.
-        // See https://linear.app/aztec-labs/issue/A-548 for details.
-        forPublicConsumption: false,
-      });
+      const ready = await isL1ToL2MessageReady(this.node, Fr.fromHexString(msg.msgHash));
       if (ready) {
         return msg;
       }