@aztec/bot 0.0.1-commit.d431d1c → 0.0.1-commit.dbf9cec

package/dest/l1_to_l2_seeding.js

@@ -0,0 +1,63 @@
+import { generateClaimSecret } from '@aztec/aztec.js/ethereum';
+import { compactArray } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { InboxAbi } from '@aztec/l1-artifacts';
+import { decodeEventLog, getContract } from 'viem';
+/** Sends an L1→L2 message via the Inbox contract and stores it. */ export async function seedL1ToL2Message(l1Client, inboxAddress, l2Recipient, rollupVersion, store, log) {
+    log.info('Seeding L1→L2 message');
+    const [secret, secretHash] = await generateClaimSecret(log);
+    const content = Fr.random();
+    const inbox = getContract({
+        address: inboxAddress.toString(),
+        abi: InboxAbi,
+        client: l1Client
+    });
+    const txHash = await inbox.write.sendL2Message([
+        {
+            actor: l2Recipient.toString(),
+            version: rollupVersion
+        },
+        content.toString(),
+        secretHash.toString()
+    ], {
+        gas: 1_000_000n
+    });
+    log.info(`L1→L2 message sent in tx ${txHash}`);
+    const txReceipt = await l1Client.waitForTransactionReceipt({
+        hash: txHash
+    });
+    if (txReceipt.status !== 'success') {
+        throw new Error(`L1→L2 message tx failed: ${txHash}`);
+    }
+    // Extract MessageSent event
+    const messageSentLogs = compactArray(txReceipt.logs.filter((l)=>l.address.toLowerCase() === inboxAddress.toString().toLowerCase()).map((l)=>{
+        try {
+            return decodeEventLog({
+                abi: InboxAbi,
+                eventName: 'MessageSent',
+                data: l.data,
+                topics: l.topics
+            });
+        } catch  {
+            return undefined;
+        }
+    }));
+    if (messageSentLogs.length !== 1) {
+        throw new Error(`Expected 1 MessageSent event, got ${messageSentLogs.length}`);
+    }
+    const event = messageSentLogs[0];
+    const msgHash = event.args.hash;
+    const globalLeafIndex = event.args.index;
+    const msg = {
+        content: content.toString(),
+        secret: secret.toString(),
+        secretHash: secretHash.toString(),
+        msgHash,
+        sender: l1Client.account.address,
+        globalLeafIndex: globalLeafIndex.toString(),
+        timestamp: Date.now()
+    };
+    await store.savePendingL1ToL2Message(msg);
+    log.info(`Seeded L1→L2 message msgHash=${msg.msgHash}`);
+    return msg;
+}

package/dest/runner.d.ts

@@ -1,7 +1,7 @@
 import type { AztecNode } from '@aztec/aztec.js/node';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
-import type { TestWallet } from '@aztec/test-wallet/server';
+import type { EmbeddedWallet } from '@aztec/wallets/embedded';
 import type { BotConfig } from './config.js';
 import type { BotInfo, BotRunnerApi } from './interface.js';
 import { BotStore } from './store/index.js';
@@ -19,7 +19,7 @@ export declare class BotRunner implements BotRunnerApi, Traceable {
     private consecutiveErrors;
     private healthy;
     readonly tracer: Tracer;
-    constructor(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, telemetry: TelemetryClient, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore);
+    constructor(config: BotConfig, wallet: EmbeddedWallet, aztecNode: AztecNode, telemetry: TelemetryClient, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore);
     /** Initializes the bot if needed. Blocks until the bot setup is finished. */
     setup(): Promise<void>;
     private doSetup;
@@ -50,4 +50,4 @@ export declare class BotRunner implements BotRunnerApi, Traceable {
     /** Returns the bot sender address. */
     getInfo(): Promise<BotInfo>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBR3RELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxLQUFLLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBYSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZHLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSzVELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3QyxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTVDLHFCQUFhLFNBQVUsWUFBVyxZQUFZLEVBQUUsU0FBUzs7SUFVckQsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFDL0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBZHhCLE9BQU8sQ0FBQyxHQUFHLENBQXVCO0lBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBbUI7SUFDL0IsT0FBTyxDQUFDLGNBQWMsQ0FBaUI7SUFDdkMsT0FBTyxDQUFDLGlCQUFpQixDQUFLO0lBQzlCLE9BQU8sQ0FBQyxPQUFPLENBQVE7SUFFdkIsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNVLE1BQU0sRUFBRSxTQUFTLEVBQ1IsTUFBTSxFQUFFLFVBQVUsRUFDbEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsU0FBUyxFQUFFLGVBQWUsRUFDMUIsY0FBYyxFQUFFLGNBQWMsR0FBRyxTQUFTLEVBQzFDLEtBQUssRUFBRSxRQUFRLEVBS2pDO0lBRUQsNkVBQTZFO0lBQ2hFLEtBQUssa0JBSWpCO1lBR2EsT0FBTztJQU1yQjs7O09BR0c7SUFDVSxLQUFLLGtCQU1qQjtJQUVEOztPQUVHO0lBQ1UsSUFBSSxrQkFPaEI7SUFFTSxTQUFTLFlBRWY7SUFFRCwwQ0FBMEM7SUFDbkMsU0FBUyxZQUVmO0lBRUQ7OztPQUdHO0lBQ1UsTUFBTSxDQUFDLE1BQU0sRUFBRSxTQUFTLGlCQWFwQztJQUVEOzs7T0FHRztJQUNVLEdBQUcsa0JBc0JmO0lBRUQscURBQXFEO0lBQzlDLFNBQVMsdUJBR2Y7SUFFRCxzQ0FBc0M7SUFDekIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FNdkM7Q0F1Q0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBR3RELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxLQUFLLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBYSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZHLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSzlELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU3QyxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTVDLHFCQUFhLFNBQVUsWUFBVyxZQUFZLEVBQUUsU0FBUzs7SUFVckQsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFDL0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBZHhCLE9BQU8sQ0FBQyxHQUFHLENBQXVCO0lBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBbUI7SUFDL0IsT0FBTyxDQUFDLGNBQWMsQ0FBaUI7SUFDdkMsT0FBTyxDQUFDLGlCQUFpQixDQUFLO0lBQzlCLE9BQU8sQ0FBQyxPQUFPLENBQVE7SUFFdkIsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNVLE1BQU0sRUFBRSxTQUFTLEVBQ1IsTUFBTSxFQUFFLGNBQWMsRUFDdEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsU0FBUyxFQUFFLGVBQWUsRUFDMUIsY0FBYyxFQUFFLGNBQWMsR0FBRyxTQUFTLEVBQzFDLEtBQUssRUFBRSxRQUFRLEVBS2pDO0lBRUQsNkVBQTZFO0lBQ2hFLEtBQUssa0JBSWpCO1lBR2EsT0FBTztJQU1yQjs7O09BR0c7SUFDVSxLQUFLLGtCQU1qQjtJQUVEOztPQUVHO0lBQ1UsSUFBSSxrQkFPaEI7SUFFTSxTQUFTLFlBRWY7SUFFRCwwQ0FBMEM7SUFDbkMsU0FBUyxZQUVmO0lBRUQ7OztPQUdHO0lBQ1UsTUFBTSxDQUFDLE1BQU0sRUFBRSxTQUFTLGlCQWFwQztJQUVEOzs7T0FHRztJQUNVLEdBQUcsa0JBc0JmO0lBRUQscURBQXFEO0lBQzlDLFNBQVMsdUJBR2Y7SUFFRCxzQ0FBc0M7SUFDekIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FNdkM7Q0FtREYifQ==

package/dest/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AACvG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,qBAAa,SAAU,YAAW,YAAY,EAAE,SAAS;;IAUrD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAdxB,OAAO,CAAC,GAAG,CAAuB;IAClC,OAAO,CAAC,GAAG,CAAC,CAAmB;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,OAAO,CAAQ;IAEvB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,YACU,MAAM,EAAE,SAAS,EACR,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,KAAK,EAAE,QAAQ,EAKjC;IAED,6EAA6E;IAChE,KAAK,kBAIjB;YAGa,OAAO;IAMrB;;;OAGG;IACU,KAAK,kBAMjB;IAED;;OAEG;IACU,IAAI,kBAOhB;IAEM,SAAS,YAEf;IAED,0CAA0C;IACnC,SAAS,YAEf;IAED;;;OAGG;IACU,MAAM,CAAC,MAAM,EAAE,SAAS,iBAapC;IAED;;;OAGG;IACU,GAAG,kBAsBf;IAED,qDAAqD;IAC9C,SAAS,uBAGf;IAED,sCAAsC;IACzB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAMvC;CAuCF"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AACvG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAK9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,qBAAa,SAAU,YAAW,YAAY,EAAE,SAAS;;IAUrD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAdxB,OAAO,CAAC,GAAG,CAAuB;IAClC,OAAO,CAAC,GAAG,CAAC,CAAmB;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,OAAO,CAAQ;IAEvB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,YACU,MAAM,EAAE,SAAS,EACR,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,KAAK,EAAE,QAAQ,EAKjC;IAED,6EAA6E;IAChE,KAAK,kBAIjB;YAGa,OAAO;IAMrB;;;OAGG;IACU,KAAK,kBAMjB;IAED;;OAEG;IACU,IAAI,kBAOhB;IAEM,SAAS,YAEf;IAED,0CAA0C;IACnC,SAAS,YAEf;IAED;;;OAGG;IACU,MAAM,CAAC,MAAM,EAAE,SAAS,iBAapC;IAED;;;OAGG;IACU,GAAG,kBAsBf;IAED,qDAAqD;IAC9C,SAAS,uBAGf;IAED,sCAAsC;IACzB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAMvC;CAmDF"}

package/dest/runner.js

@@ -377,6 +377,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
 import { trackSpan } from '@aztec/telemetry-client';
 import { AmmBot } from './amm_bot.js';
 import { Bot } from './bot.js';
+import { CrossChainBot } from './cross_chain_bot.js';
 _dec = trackSpan('Bot.setup'), _dec1 = trackSpan('Bot.work');
 export class BotRunner {
     config;
@@ -535,7 +536,22 @@ export class BotRunner {
     }
     async #createBot() {
         try {
-            this.bot = this.config.ammTxs ? AmmBot.create(this.config, this.wallet, this.aztecNode, this.aztecNodeAdmin, this.store) : Bot.create(this.config, this.wallet, this.aztecNode, this.aztecNodeAdmin, this.store);
+            switch(this.config.botMode){
+                case 'crosschain':
+                    this.bot = CrossChainBot.create(this.config, this.wallet, this.aztecNode, this.aztecNodeAdmin, this.store);
+                    break;
+                case 'amm':
+                    this.bot = AmmBot.create(this.config, this.wallet, this.aztecNode, this.aztecNodeAdmin, this.store);
+                    break;
+                case 'transfer':
+                    this.bot = Bot.create(this.config, this.wallet, this.aztecNode, this.aztecNodeAdmin, this.store);
+                    break;
+                default:
+                    {
+                        const _exhaustive = this.config.botMode;
+                        throw new Error(`Unsupported bot mode: [${_exhaustive}]`);
+                    }
+            }
             await this.bot;
         } catch (err) {
             this.log.error(`Error setting up bot: ${err}`);

package/dest/store/bot_store.d.ts

@@ -1,21 +1,40 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { L2AmountClaim } from '@aztec/aztec.js/ethereum';
 import { type Logger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 export interface BridgeClaimData {
     claim: L2AmountClaim;
     timestamp: number;
     recipient: string;
 }
+export interface PendingL1ToL2Message {
+    /** Random content field sent in the message. */
+    content: string;
+    /** Secret for consuming the message. */
+    secret: string;
+    /** Hash of the secret. */
+    secretHash: string;
+    /** Hash of the L1→L2 message. */
+    msgHash: string;
+    /** L1 sender address (hex). */
+    sender: string;
+    /** Global leaf index in the L1→L2 message tree. */
+    globalLeafIndex: string;
+    /** Timestamp when the message was seeded. */
+    timestamp: number;
+}
 /**
  * Simple data store for the bot to persist L1 bridge claims.
  */
 export declare class BotStore {
     private readonly store;
     private readonly log;
+    private readonly dateProvider;
     static readonly SCHEMA_VERSION = 1;
     private readonly bridgeClaims;
-    constructor(store: AztecAsyncKVStore, log?: Logger);
+    private readonly pendingL1ToL2;
+    constructor(store: AztecAsyncKVStore, log?: Logger, dateProvider?: DateProvider);
     /**
      * Saves a bridge claim for a recipient.
      */
@@ -36,9 +55,15 @@ export declare class BotStore {
      * Cleans up old bridge claims (older than 24 hours).
      */
     cleanupOldClaims(maxAgeMs?: number): Promise<number>;
-    /**
-     * Closes the store.
-     */
+    /** Saves a pending L1→L2 message keyed by msgHash. */
+    savePendingL1ToL2Message(msg: PendingL1ToL2Message): Promise<void>;
+    /** Returns all unconsumed pending L1→L2 messages. */
+    getUnconsumedL1ToL2Messages(): Promise<PendingL1ToL2Message[]>;
+    /** Deletes a consumed L1→L2 message from the store. */
+    deleteL1ToL2Message(msgHash: string): Promise<void>;
+    /** Cleans up pending L1→L2 messages older than maxAgeMs. */
+    cleanupOldPendingMessages(maxAgeMs?: number): Promise<number>;
+    /** Closes the store. */
     close(): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm90X3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvYm90X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsTUFBTSxXQUFXLGVBQWU7SUFDOUIsS0FBSyxFQUFFLGFBQWEsQ0FBQztJQUNyQixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkI7QUFFRDs7R0FFRztBQUNILHFCQUFhLFFBQVE7SUFLakIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRztJQUx0QixnQkFBdUIsY0FBYyxLQUFLO0lBQzFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFnQztJQUU3RCxZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLEdBQUcsR0FBRSxNQUFrQyxFQUd6RDtJQUVEOztPQUVHO0lBQ1UsZUFBZSxDQUFDLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0J6RjtJQUVEOztPQUVHO0lBQ1UsY0FBYyxDQUFDLFNBQVMsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUMsQ0FzQnpGO0lBRUQ7O09BRUc7SUFDVSxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHckU7SUFFRDs7T0FFRztJQUNVLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQXdCNUQ7SUFFRDs7T0FFRztJQUNVLGdCQUFnQixDQUFDLFFBQVEsR0FBRSxNQUE0QixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FlckY7SUFFRDs7T0FFRztJQUNVLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2xDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm90X3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvYm90X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBRXhFLE1BQU0sV0FBVyxlQUFlO0lBQzlCLEtBQUssRUFBRSxhQUFhLENBQUM7SUFDckIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixTQUFTLEVBQUUsTUFBTSxDQUFDO0NBQ25CO0FBRUQsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQyxnREFBZ0Q7SUFDaEQsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQix3Q0FBd0M7SUFDeEMsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLDBCQUEwQjtJQUMxQixVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLG1DQUFpQztJQUNqQyxPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLCtCQUErQjtJQUMvQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YscURBQW1EO0lBQ25ELGVBQWUsRUFBRSxNQUFNLENBQUM7SUFDeEIsNkNBQTZDO0lBQzdDLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkI7QUFFRDs7R0FFRztBQUNILHFCQUFhLFFBQVE7SUFNakIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRztJQUNwQixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFQL0IsZ0JBQXVCLGNBQWMsS0FBSztJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBZ0M7SUFDN0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQWdDO0lBRTlELFlBQ21CLEtBQUssRUFBRSxpQkFBaUIsRUFDeEIsR0FBRyxHQUFFLE1BQWtDLEVBQ3ZDLFlBQVksR0FBRSxZQUFpQyxFQUlqRTtJQUVEOztPQUVHO0lBQ1UsZUFBZSxDQUFDLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0J6RjtJQUVEOztPQUVHO0lBQ1UsY0FBYyxDQUFDLFNBQVMsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUMsQ0FzQnpGO0lBRUQ7O09BRUc7SUFDVSxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHckU7SUFFRDs7T0FFRztJQUNVLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQXdCNUQ7SUFFRDs7T0FFRztJQUNVLGdCQUFnQixDQUFDLFFBQVEsR0FBRSxNQUE0QixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FlckY7SUFFRCx3REFBc0Q7SUFDekMsd0JBQXdCLENBQUMsR0FBRyxFQUFFLG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHOUU7SUFFRCx1REFBcUQ7SUFDeEMsMkJBQTJCLElBQUksT0FBTyxDQUFDLG9CQUFvQixFQUFFLENBQUMsQ0FNMUU7SUFFRCx5REFBdUQ7SUFDMUMsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRy9EO0lBRUQsOERBQTREO0lBQy9DLHlCQUF5QixDQUFDLFFBQVEsR0FBRSxNQUE0QixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FZOUY7SUFFRCx3QkFBd0I7SUFDWCxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsQztDQUNGIn0=

package/dest/store/bot_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot_store.d.ts","sourceRoot":"","sources":["../../src/store/bot_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,QAAQ;IAKjB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,gBAAuB,cAAc,KAAK;IAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAE7D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAAkC,EAGzD;IAED;;OAEG;IACU,eAAe,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBzF;IAED;;OAEG;IACU,cAAc,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAsBzF;IAED;;OAEG;IACU,iBAAiB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrE;IAED;;OAEG;IACU,kBAAkB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAwB5D;IAED;;OAEG;IACU,gBAAgB,CAAC,QAAQ,GAAE,MAA4B,GAAG,OAAO,CAAC,MAAM,CAAC,CAerF;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;CACF"}
+{"version":3,"file":"bot_store.d.ts","sourceRoot":"","sources":["../../src/store/bot_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,gDAAgD;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,0BAA0B;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,mCAAiC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,qDAAmD;IACnD,eAAe,EAAE,MAAM,CAAC;IACxB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,QAAQ;IAMjB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAP/B,gBAAuB,cAAc,KAAK;IAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgC;IAE9D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAAkC,EACvC,YAAY,GAAE,YAAiC,EAIjE;IAED;;OAEG;IACU,eAAe,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBzF;IAED;;OAEG;IACU,cAAc,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAsBzF;IAED;;OAEG;IACU,iBAAiB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrE;IAED;;OAEG;IACU,kBAAkB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAwB5D;IAED;;OAEG;IACU,gBAAgB,CAAC,QAAQ,GAAE,MAA4B,GAAG,OAAO,CAAC,MAAM,CAAC,CAerF;IAED,wDAAsD;IACzC,wBAAwB,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;IAED,uDAAqD;IACxC,2BAA2B,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAM1E;IAED,yDAAuD;IAC1C,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG/D;IAED,8DAA4D;IAC/C,yBAAyB,CAAC,QAAQ,GAAE,MAA4B,GAAG,OAAO,CAAC,MAAM,CAAC,CAY9F;IAED,wBAAwB;IACX,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;CACF"}

package/dest/store/bot_store.js

@@ -1,16 +1,21 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 /**
  * Simple data store for the bot to persist L1 bridge claims.
  */ export class BotStore {
     store;
     log;
+    dateProvider;
     static SCHEMA_VERSION = 1;
     bridgeClaims;
-    constructor(store, log = createLogger('bot:store')){
+    pendingL1ToL2;
+    constructor(store, log = createLogger('bot:store'), dateProvider = new DateProvider()){
         this.store = store;
         this.log = log;
+        this.dateProvider = dateProvider;
         this.bridgeClaims = store.openMap('bridge_claims');
+        this.pendingL1ToL2 = store.openMap('pending_l1_to_l2');
     }
     /**
    * Saves a bridge claim for a recipient.
@@ -25,7 +30,7 @@ import { createLogger } from '@aztec/foundation/log';
         };
         const data = {
             claim: serializableClaim,
-            timestamp: Date.now(),
+            timestamp: this.dateProvider.now(),
             recipient: recipient.toString()
         };
         await this.bridgeClaims.set(recipient.toString(), JSON.stringify(data));
@@ -85,7 +90,7 @@ import { createLogger } from '@aztec/foundation/log';
     /**
    * Cleans up old bridge claims (older than 24 hours).
    */ async cleanupOldClaims(maxAgeMs = 24 * 60 * 60 * 1000) {
-        const now = Date.now();
+        const now = this.dateProvider.now();
         let cleanedCount = 0;
         const entries = this.bridgeClaims.entriesAsync();
         for await (const [key, data] of entries){
@@ -98,9 +103,35 @@ import { createLogger } from '@aztec/foundation/log';
         }
         return cleanedCount;
     }
-    /**
-   * Closes the store.
-   */ async close() {
+    /** Saves a pending L1→L2 message keyed by msgHash. */ async savePendingL1ToL2Message(msg) {
+        await this.pendingL1ToL2.set(msg.msgHash, JSON.stringify(msg));
+        this.log.info(`Saved pending L1→L2 message ${msg.msgHash}`);
+    }
+    /** Returns all unconsumed pending L1→L2 messages. */ async getUnconsumedL1ToL2Messages() {
+        const messages = [];
+        for await (const [_, data] of this.pendingL1ToL2.entriesAsync()){
+            messages.push(JSON.parse(data));
+        }
+        return messages;
+    }
+    /** Deletes a consumed L1→L2 message from the store. */ async deleteL1ToL2Message(msgHash) {
+        await this.pendingL1ToL2.delete(msgHash);
+        this.log.info(`Deleted consumed L1→L2 message ${msgHash}`);
+    }
+    /** Cleans up pending L1→L2 messages older than maxAgeMs. */ async cleanupOldPendingMessages(maxAgeMs = 24 * 60 * 60 * 1000) {
+        const now = this.dateProvider.now();
+        let cleanedCount = 0;
+        for await (const [key, data] of this.pendingL1ToL2.entriesAsync()){
+            const parsed = JSON.parse(data);
+            if (now - parsed.timestamp > maxAgeMs) {
+                await this.pendingL1ToL2.delete(key);
+                cleanedCount++;
+                this.log.info(`Cleaned up old pending L1→L2 message ${key}`);
+            }
+        }
+        return cleanedCount;
+    }
+    /** Closes the store. */ async close() {
         await this.store.close();
         this.log.info('Closed bot data store');
     }

package/dest/store/index.d.ts

@@ -1,2 +1,2 @@
-export { BotStore, type BridgeClaimData } from './bot_store.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sZ0JBQWdCLENBQUMifQ==
+export { BotStore, type BridgeClaimData, type PendingL1ToL2Message } from './bot_store.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLEtBQUssZUFBZSxFQUFFLEtBQUssb0JBQW9CLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyJ9

package/dest/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC"}

package/package.json

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

package/src/amm_bot.ts

@@ -1,12 +1,12 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { SentTx } from '@aztec/aztec.js/contracts';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
-import { TxReceipt } from '@aztec/aztec.js/tx';
+import { 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';
 import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
+import type { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
@@ -21,7 +21,7 @@ type Balances = { token0: bigint; token1: bigint };
 export class AmmBot extends BaseBot {
   protected constructor(
     node: AztecNode,
-    wallet: TestWallet,
+    wallet: EmbeddedWallet,
     defaultAccountAddress: AztecAddress,
     public readonly amm: AMMContract,
     public readonly token0: TokenContract,
@@ -33,7 +33,7 @@ export class AmmBot extends BaseBot {
 
   static async create(
     config: BotConfig,
-    wallet: TestWallet,
+    wallet: EmbeddedWallet,
     aztecNode: AztecNode,
     aztecNodeAdmin: AztecNodeAdmin | undefined,
     store: BotStore,
@@ -48,7 +48,7 @@ export class AmmBot extends BaseBot {
     return new AmmBot(aztecNode, wallet, defaultAccountAddress, amm, token0, token1, config);
   }
 
-  protected async createAndSendTx(logCtx: object): Promise<SentTx> {
+  protected async createAndSendTx(logCtx: object): Promise<TxHash> {
     const { feePaymentMethod } = this.config;
     const { wallet, amm, token0, token1 } = this;
 
@@ -89,7 +89,7 @@ export class AmmBot extends BaseBot {
 
     this.log.verbose(`Sending transaction`, logCtx);
     this.log.info(`Tx. Balances: ${jsonStringify(balances)}`, { ...logCtx, balances });
-    return swapExactTokensInteraction.send(opts);
+    return swapExactTokensInteraction.send({ ...opts, wait: NO_WAIT });
   }
 
   protected override async onTxMined(receipt: TxReceipt, logCtx: object): Promise<void> {

package/src/base_bot.ts

@@ -1,16 +1,11 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import {
-  BatchCall,
-  ContractFunctionInteraction,
-  type SendInteractionOptions,
-  SentTx,
-  waitForProven,
-} from '@aztec/aztec.js/contracts';
+import { BatchCall, ContractFunctionInteraction, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
 import { createLogger } from '@aztec/aztec.js/log';
-import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { TxHash, TxReceipt, TxStatus } from '@aztec/aztec.js/tx';
 import { Gas } from '@aztec/stdlib/gas';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
+import type { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import type { BotConfig } from './config.js';
 
@@ -22,36 +17,27 @@ export abstract class BaseBot {
 
   protected constructor(
     public readonly node: AztecNode,
-    public readonly wallet: TestWallet,
+    public readonly wallet: EmbeddedWallet,
     public readonly defaultAccountAddress: AztecAddress,
     public config: BotConfig,
   ) {}
 
   public async run(): Promise<TxReceipt | TxHash> {
     this.attempts++;
-    const logCtx = { runId: Date.now() * 1000 + Math.floor(Math.random() * 1000) };
     const { followChain, txMinedWaitSeconds } = this.config;
+    const logCtx = { runId: Date.now() * 1000 + Math.floor(Math.random() * 1000), followChain, txMinedWaitSeconds };
 
     this.log.verbose(`Creating tx`, logCtx);
-    const tx = await this.createAndSendTx(logCtx);
-
-    const txHash = await tx.getTxHash();
+    const txHash = await this.createAndSendTx(logCtx);
 
     if (followChain === 'NONE') {
       this.log.info(`Transaction ${txHash.toString()} sent, not waiting for it to be mined`);
       return txHash;
     }
 
-    this.log.verbose(
-      `Awaiting tx ${txHash.toString()} to be on the ${followChain} chain (timeout ${txMinedWaitSeconds}s)`,
-      logCtx,
-    );
-    const receipt = await tx.wait({
-      timeout: txMinedWaitSeconds,
-    });
-    if (followChain === 'PROVEN') {
-      await waitForProven(this.node, receipt, { provenTimeout: txMinedWaitSeconds });
-    }
+    const waitForStatus = TxStatus[followChain];
+    this.log.verbose(`Awaiting tx ${txHash.toString()} to be on the ${followChain} chain`, logCtx);
+    const receipt = await waitForTx(this.node, txHash, { timeout: txMinedWaitSeconds, waitForStatus });
     this.successes++;
     this.log.info(
       `Tx #${this.attempts} ${receipt.txHash} successfully mined in block ${receipt.blockNumber} (stats: ${this.successes}/${this.attempts} success)`,
@@ -63,7 +49,7 @@ export abstract class BaseBot {
     return receipt;
   }
 
-  protected abstract createAndSendTx(logCtx: object): Promise<SentTx>;
+  protected abstract createAndSendTx(logCtx: object): Promise<TxHash>;
 
   protected onTxMined(_receipt: TxReceipt, _logCtx: object): Promise<void> {
     // no-op

package/src/bot.ts

@@ -1,10 +1,11 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { BatchCall, SentTx } from '@aztec/aztec.js/contracts';
+import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
+import { TxHash } from '@aztec/aztec.js/tx';
 import { times } from '@aztec/foundation/collection';
 import type { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
+import type { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
@@ -17,7 +18,7 @@ const TRANSFER_AMOUNT = 1;
 export class Bot extends BaseBot {
   protected constructor(
     node: AztecNode,
-    wallet: TestWallet,
+    wallet: EmbeddedWallet,
     defaultAccountAddress: AztecAddress,
     public readonly token: TokenContract | PrivateTokenContract,
     public readonly recipient: AztecAddress,
@@ -28,7 +29,7 @@ export class Bot extends BaseBot {
 
   static async create(
     config: BotConfig,
-    wallet: TestWallet,
+    wallet: EmbeddedWallet,
     aztecNode: AztecNode,
     aztecNodeAdmin: AztecNodeAdmin | undefined,
     store: BotStore,
@@ -48,7 +49,7 @@ export class Bot extends BaseBot {
     this.config = { ...this.config, ...config };
   }
 
-  protected async createAndSendTx(logCtx: object): Promise<SentTx> {
+  protected async createAndSendTx(logCtx: object): Promise<TxHash> {
     const { privateTransfersPerTx, publicTransfersPerTx, feePaymentMethod } = this.config;
     const { token, recipient, wallet } = this;
 
@@ -75,14 +76,14 @@ export class Bot extends BaseBot {
     await batch.simulate({ from: this.defaultAccountAddress });
 
     this.log.verbose(`Sending transaction`, logCtx);
-    return batch.send(opts);
+    return batch.send({ ...opts, wait: NO_WAIT });
   }
 
   public async getBalances() {
     if (isStandardTokenContract(this.token)) {
       return {
         sender: await getBalances(this.token, this.defaultAccountAddress),
-        recipient: await getBalances(this.token, this.recipient, this.defaultAccountAddress),
+        recipient: await getBalances(this.token, this.recipient),
       };
     } else {
       return {
@@ -91,7 +92,7 @@ export class Bot extends BaseBot {
           publicBalance: 0n,
         },
         recipient: {
-          privateBalance: await getPrivateBalance(this.token, this.recipient, this.defaultAccountAddress),
+          privateBalance: await getPrivateBalance(this.token, this.recipient),
           publicBalance: 0n,
         },
       };

package/src/config.ts

@@ -19,9 +19,12 @@ import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 
 import { z } from 'zod';
 
-const BotFollowChain = ['NONE', 'PENDING', 'PROVEN'] as const;
+const BotFollowChain = ['NONE', 'PROPOSED', 'CHECKPOINTED', 'PROVEN'] as const;
 type BotFollowChain = (typeof BotFollowChain)[number];
 
+const BotMode = ['transfer', 'amm', 'crosschain'] as const;
+type BotMode = (typeof BotMode)[number];
+
 export enum SupportedTokenContracts {
   TokenContract = 'TokenContract',
   PrivateTokenContract = 'PrivateTokenContract',
@@ -76,8 +79,12 @@ export type BotConfig = {
   maxConsecutiveErrors: number;
   /** Stops the bot if service becomes unhealthy */
   stopWhenUnhealthy: boolean;
-  /** Deploy an AMM contract and do swaps instead of transfers */
-  ammTxs: boolean;
+  /** Bot mode: transfer, amm, or crosschain. */
+  botMode: BotMode;
+  /** Number of L2→L1 messages per tx (crosschain mode). */
+  l2ToL1MessagesPerTx: number;
+  /** Max L1→L2 messages to keep in-flight (crosschain mode). */
+  l1ToL2SeedCount: number;
 } & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'>;
 
 export const BotConfigSchema = zodFor<BotConfig>()(
@@ -107,7 +114,9 @@ export const BotConfigSchema = zodFor<BotConfig>()(
       contract: z.nativeEnum(SupportedTokenContracts),
       maxConsecutiveErrors: z.number().int().nonnegative(),
       stopWhenUnhealthy: z.boolean(),
-      ammTxs: z.boolean().default(false),
+      botMode: z.enum(BotMode).default('transfer'),
+      l2ToL1MessagesPerTx: z.number().int().nonnegative().default(1),
+      l1ToL2SeedCount: z.number().int().nonnegative().default(1),
       dataDirectory: z.string().optional(),
       dataStoreMapSizeKb: z.number().optional(),
     })
@@ -213,10 +222,14 @@ export const botConfigMappings: ConfigMappingsType<BotConfig> = {
     description: 'Which chain the bot follows',
     defaultValue: 'NONE',
     parseEnv(val) {
-      if (!(BotFollowChain as readonly string[]).includes(val.toUpperCase())) {
+      const upper = val.toUpperCase();
+      if (upper === 'PENDING') {
+        return 'CHECKPOINTED';
+      }
+      if (!(BotFollowChain as readonly string[]).includes(upper)) {
         throw new Error(`Invalid value for BOT_FOLLOW_CHAIN: ${val}`);
       }
-      return val as BotFollowChain;
+      return upper as BotFollowChain;
     },
   },
   maxPendingTxs: {
@@ -264,10 +277,26 @@ export const botConfigMappings: ConfigMappingsType<BotConfig> = {
     description: 'Stops the bot if service becomes unhealthy',
     ...booleanConfigHelper(false),
   },
-  ammTxs: {
-    env: 'BOT_AMM_TXS',
-    description: 'Deploy an AMM and send swaps to it',
-    ...booleanConfigHelper(false),
+  botMode: {
+    env: 'BOT_MODE',
+    description: 'Bot mode: transfer, amm, or crosschain',
+    defaultValue: 'transfer' as BotMode,
+    parseEnv(val: string) {
+      if (!(BotMode as readonly string[]).includes(val)) {
+        throw new Error(`Invalid value for BOT_MODE: ${val}`);
+      }
+      return val as BotMode;
+    },
+  },
+  l2ToL1MessagesPerTx: {
+    env: 'BOT_L2_TO_L1_MESSAGES_PER_TX',
+    description: 'Number of L2→L1 messages per tx (crosschain mode)',
+    ...numberConfigHelper(1),
+  },
+  l1ToL2SeedCount: {
+    env: 'BOT_L1_TO_L2_SEED_COUNT',
+    description: 'Max L1→L2 messages to keep in-flight (crosschain mode)',
+    ...numberConfigHelper(1),
   },
   ...pickConfigMappings(dataConfigMappings, ['dataStoreMapSizeKb', 'dataDirectory']),
 };