@aztec/bot 0.0.1-commit.fffb133c → 0.0.1-dev

package/dest/cross_chain_bot.d.ts

@@ -0,0 +1,54 @@
+/**
+ * CrossChainBot exercises L2->L1 and L1->L2 messaging.
+ *
+ *   createAndSendTx                          onTxMined
+ *   ──────────────────────────────────────   ──────────────────────────────
+ *
+ *   1. SEED (fire-and-forget)                3. VERIFY L2->L1
+ *      if store has fewer pending messages       Query getTxEffect, confirm
+ *      than seedCount and no seed is              the expected L2->L1 messages
+ *      in-flight:                                appeared in tx effects.
+ *        * kick off L1 inbox tx
+ *        * store msg on completion
+ *
+ *   2. BUILD & SEND BATCH
+ *      Always:
+ *        N x create_l2_to_l1_message
+ *            (random content, fixed
+ *             L1 recipient)
+ *      If a ready L1->L2 msg exists:
+ *        1 x consume_message_from_
+ *            arbitrary_sender_public
+ *        delete consumed msg from store
+ *      Send batch tx (no wait)
+ *
+ */
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { TestContract } from '@aztec/noir-test-contracts.js/Test';
+import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { BaseBot } from './base_bot.js';
+import type { BotConfig } from './config.js';
+import type { BotStore } from './store/index.js';
+/** Bot that exercises both L2→L1 and L1→L2 cross-chain messaging. */
+export declare class CrossChainBot extends BaseBot {
+    private readonly contract;
+    private readonly l1Client;
+    private readonly l1Recipient;
+    private readonly inboxAddress;
+    private readonly rollupVersion;
+    private readonly store;
+    private l2ToL1Sent;
+    private l1ToL2Consumed;
+    private pendingSeedPromise;
+    protected constructor(node: AztecNode, wallet: EmbeddedWallet, defaultAccountAddress: AztecAddress, contract: TestContract, l1Client: ExtendedViemWalletClient, l1Recipient: EthAddress, inboxAddress: EthAddress, rollupVersion: bigint, store: BotStore, config: BotConfig);
+    static create(config: BotConfig, wallet: EmbeddedWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore): Promise<CrossChainBot>;
+    protected createAndSendTx(logCtx: object): Promise<TxHash>;
+    protected onTxMined(receipt: TxReceipt, logCtx: object): Promise<void>;
+    private getReadyL1ToL2Message;
+    private seedNewL1ToL2Message;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fYm90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY3Jvc3NfY2hhaW5fYm90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F3Qkc7QUFDSCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHekQsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFOUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN4QyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFHN0MsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUF3QixNQUFNLGtCQUFrQixDQUFDO0FBS3ZFLHlFQUFxRTtBQUNyRSxxQkFBYSxhQUFjLFNBQVEsT0FBTztJQVN0QyxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVE7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRO0lBQ3pCLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhO0lBQzlCLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQWJ4QixPQUFPLENBQUMsVUFBVSxDQUFLO0lBQ3ZCLE9BQU8sQ0FBQyxjQUFjLENBQUs7SUFDM0IsT0FBTyxDQUFDLGtCQUFrQixDQUE0QjtJQUV0RCxTQUFTLGFBQ1AsSUFBSSxFQUFFLFNBQVMsRUFDZixNQUFNLEVBQUUsY0FBYyxFQUN0QixxQkFBcUIsRUFBRSxZQUFZLEVBQ2xCLFFBQVEsRUFBRSxZQUFZLEVBQ3RCLFFBQVEsRUFBRSx3QkFBd0IsRUFDbEMsV0FBVyxFQUFFLFVBQVUsRUFDdkIsWUFBWSxFQUFFLFVBQVUsRUFDeEIsYUFBYSxFQUFFLE1BQU0sRUFDckIsS0FBSyxFQUFFLFFBQVEsRUFDaEMsTUFBTSxFQUFFLFNBQVMsRUFHbEI7SUFFRCxPQUFhLE1BQU0sQ0FDakIsTUFBTSxFQUFFLFNBQVMsRUFDakIsTUFBTSxFQUFFLGNBQWMsRUFDdEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsY0FBYyxFQUFFLGNBQWMsR0FBRyxTQUFTLEVBQzFDLEtBQUssRUFBRSxRQUFRLEdBQ2QsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQXFCeEI7SUFFRCxVQUFnQixlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBaUQvRDtJQUVELFVBQXlCLFNBQVMsQ0FBQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXVCcEY7WUFHYSxxQkFBcUI7WUFvQnJCLG9CQUFvQjtDQVVuQyJ9

package/dest/cross_chain_bot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cross_chain_bot.d.ts","sourceRoot":"","sources":["../src/cross_chain_bot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEtE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,KAAK,EAAE,QAAQ,EAAwB,MAAM,kBAAkB,CAAC;AAKvE,yEAAqE;AACrE,qBAAa,aAAc,SAAQ,OAAO;IAStC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAbxB,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,kBAAkB,CAA4B;IAEtD,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,cAAc,EACtB,qBAAqB,EAAE,YAAY,EAClB,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,UAAU,EACvB,YAAY,EAAE,UAAU,EACxB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,QAAQ,EAChC,MAAM,EAAE,SAAS,EAGlB;IAED,OAAa,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,aAAa,CAAC,CAqBxB;IAED,UAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiD/D;IAED,UAAyB,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBpF;YAGa,qBAAqB;YAoBrB,oBAAoB;CAUnC"}

package/dest/cross_chain_bot.js

@@ -0,0 +1,134 @@
+/**
+ * CrossChainBot exercises L2->L1 and L1->L2 messaging.
+ *
+ *   createAndSendTx                          onTxMined
+ *   ──────────────────────────────────────   ──────────────────────────────
+ *
+ *   1. SEED (fire-and-forget)                3. VERIFY L2->L1
+ *      if store has fewer pending messages       Query getTxEffect, confirm
+ *      than seedCount and no seed is              the expected L2->L1 messages
+ *      in-flight:                                appeared in tx effects.
+ *        * kick off L1 inbox tx
+ *        * store msg on completion
+ *
+ *   2. BUILD & SEND BATCH
+ *      Always:
+ *        N x create_l2_to_l1_message
+ *            (random content, fixed
+ *             L1 recipient)
+ *      If a ready L1->L2 msg exists:
+ *        1 x consume_message_from_
+ *            arbitrary_sender_public
+ *        delete consumed msg from store
+ *      Send batch tx (no wait)
+ *
+ */ import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
+import { isL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { BaseBot } from './base_bot.js';
+import { BotFactory } from './factory.js';
+import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
+/** Stale message threshold: messages older than this are removed. */ const STALE_MESSAGE_THRESHOLD_MS = 2 * 60 * 60 * 1000; // 2 hours
+/** Bot that exercises both L2→L1 and L1→L2 cross-chain messaging. */ export class CrossChainBot extends BaseBot {
+    contract;
+    l1Client;
+    l1Recipient;
+    inboxAddress;
+    rollupVersion;
+    store;
+    l2ToL1Sent;
+    l1ToL2Consumed;
+    pendingSeedPromise;
+    constructor(node, wallet, defaultAccountAddress, contract, l1Client, l1Recipient, inboxAddress, rollupVersion, store, config){
+        super(node, wallet, defaultAccountAddress, config), this.contract = contract, this.l1Client = l1Client, this.l1Recipient = l1Recipient, this.inboxAddress = inboxAddress, this.rollupVersion = rollupVersion, this.store = store, this.l2ToL1Sent = 0, this.l1ToL2Consumed = 0;
+    }
+    static async create(config, wallet, aztecNode, aztecNodeAdmin, store) {
+        if (config.followChain === 'NONE') {
+            throw new Error(`CrossChainBot requires followChain to be set (got NONE)`);
+        }
+        const factory = new BotFactory(config, wallet, store, aztecNode, aztecNodeAdmin);
+        const { defaultAccountAddress, contract, l1Client, rollupVersion } = await factory.setupCrossChain();
+        const l1Recipient = EthAddress.fromString(l1Client.account.address);
+        const { l1ContractAddresses } = await aztecNode.getNodeInfo();
+        const inboxAddress = EthAddress.fromString(l1ContractAddresses.inboxAddress.toString());
+        return new CrossChainBot(aztecNode, wallet, defaultAccountAddress, contract, l1Client, l1Recipient, inboxAddress, rollupVersion, store, config);
+    }
+    async createAndSendTx(logCtx) {
+        const pendingMessages = await this.store.getUnconsumedL1ToL2Messages();
+        // Send an L1→L2 message if we're below the threshold and not already seeding one
+        if (pendingMessages.length < this.config.l1ToL2SeedCount && !this.pendingSeedPromise) {
+            this.pendingSeedPromise = this.seedNewL1ToL2Message().catch((err)=>this.log.warn(`Failed to seed L1→L2 message: ${err}`, logCtx)).finally(()=>{
+                this.pendingSeedPromise = undefined;
+            });
+        }
+        // Build batch: always L2→L1, optionally consume L1→L2
+        const calls = [];
+        // L2→L1: create messages with random content
+        for(let i = 0; i < this.config.l2ToL1MessagesPerTx; i++){
+            calls.push(this.contract.methods.create_l2_to_l1_message_arbitrary_recipient_public(Fr.random(), this.l1Recipient));
+        }
+        // L1→L2: consume oldest ready message if available
+        const readyMsg = await this.getReadyL1ToL2Message(pendingMessages);
+        if (readyMsg) {
+            calls.push(this.contract.methods.consume_message_from_arbitrary_sender_public(Fr.fromHexString(readyMsg.content), Fr.fromHexString(readyMsg.secret), EthAddress.fromString(readyMsg.sender), new Fr(BigInt(readyMsg.globalLeafIndex))));
+            // Delete consumed message immediately so it works with FOLLOW_CHAIN=NONE
+            await this.store.deleteL1ToL2Message(readyMsg.msgHash);
+            this.l1ToL2Consumed++;
+        } else {
+            this.log.warn(`No ready L1→L2 message to consume`, {
+                ...logCtx,
+                pendingCount: pendingMessages.length
+            });
+        }
+        const batch = new BatchCall(this.wallet, calls);
+        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
+        });
+        return txHash;
+    }
+    async onTxMined(receipt, logCtx) {
+        // 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());
+            if (l2ToL1Msgs.length >= this.config.l2ToL1MessagesPerTx) {
+                this.l2ToL1Sent += l2ToL1Msgs.length;
+            } else {
+                this.log.error(`Expected ${this.config.l2ToL1MessagesPerTx} L2→L1 messages but found ${l2ToL1Msgs.length}`, {
+                    ...logCtx,
+                    blockNumber: receipt.blockNumber,
+                    txHash: receipt.txHash.toString()
+                });
+            }
+        }
+        const pendingCount = (await this.store.getUnconsumedL1ToL2Messages()).length;
+        this.log.info(`CrossChainBot txs mined`, {
+            ...logCtx,
+            l2ToL1Sent: this.l2ToL1Sent,
+            l1ToL2Consumed: this.l1ToL2Consumed,
+            l1ToL2Pending: pendingCount
+        });
+    }
+    /** Finds the oldest pending message that is ready for consumption. */ async getReadyL1ToL2Message(pendingMessages) {
+        const now = Date.now();
+        for (const msg of pendingMessages){
+            const ready = await isL1ToL2MessageReady(this.node, Fr.fromHexString(msg.msgHash));
+            if (ready) {
+                return msg;
+            }
+            // Time-based stale detection: if the message is old and still not ready, remove it
+            if (now - msg.timestamp > STALE_MESSAGE_THRESHOLD_MS) {
+                await this.store.deleteL1ToL2Message(msg.msgHash);
+                this.log.warn(`Removed stale L1→L2 message ${msg.msgHash}`);
+            }
+        }
+        return undefined;
+    }
+    /** Seeds a new L1→L2 message on L1 and stores it. */ async seedNewL1ToL2Message() {
+        await seedL1ToL2Message(this.l1Client, this.inboxAddress, this.contract.address, this.rollupVersion, this.store, this.log);
+    }
+}

package/dest/factory.d.ts

@@ -1,9 +1,11 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { TestContract } from '@aztec/noir-test-contracts.js/Test';
 import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import { TestWallet } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
 import { type BotConfig } from './config.js';
 import type { BotStore } from './store/index.js';
 export declare class BotFactory {
@@ -13,26 +15,39 @@ export declare class BotFactory {
     private readonly aztecNode;
     private readonly aztecNodeAdmin?;
     private log;
-    constructor(config: BotConfig, wallet: TestWallet, store: BotStore, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin | undefined);
+    constructor(config: BotConfig, wallet: EmbeddedWallet, store: BotStore, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin | undefined);
     /**
      * Initializes a new bot by setting up the sender account, registering the recipient,
      * deploying the token contract, and minting tokens if necessary.
      */
     setup(): Promise<{
-        wallet: TestWallet;
+        wallet: EmbeddedWallet;
         defaultAccountAddress: AztecAddress;
         token: TokenContract | PrivateTokenContract;
         node: AztecNode;
         recipient: AztecAddress;
     }>;
     setupAmm(): Promise<{
-        wallet: TestWallet;
+        wallet: EmbeddedWallet;
         defaultAccountAddress: AztecAddress;
         amm: AMMContract;
         token0: TokenContract;
         token1: TokenContract;
         node: AztecNode;
     }>;
+    /**
+     * Initializes the cross-chain bot by deploying TestContract, creating an L1 client,
+     * seeding initial L1→L2 messages, and waiting for the first to be ready.
+     */
+    setupCrossChain(): Promise<{
+        wallet: EmbeddedWallet;
+        defaultAccountAddress: AztecAddress;
+        contract: TestContract;
+        node: AztecNode;
+        l1Client: ExtendedViemWalletClient;
+        rollupVersion: bigint;
+    }>;
+    private setupTestContract;
     private setupAccount;
     private setupAccountWithPrivateKey;
     private setupTestAccount;
@@ -46,4 +61,4 @@ export declare class BotFactory {
     private bridgeL1FeeJuice;
     private withNoMinTxsPerBlock;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBb0J6RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRy9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFdkQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsVUFBVSxFQUNsQixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFDOUM7SUFFSjs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxVQUFVLENBQUM7UUFDbkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLFVBQVUsQ0FBQztRQUNuQixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO1lBTWEsWUFBWTtZQVdaLDBCQUEwQjtZQThDMUIsZ0JBQWdCO1lBZ0JoQixVQUFVO1lBb0RWLGtCQUFrQjtZQWFsQixnQkFBZ0I7WUFzQmhCLE9BQU87WUE2RVAsd0JBQXdCO1lBMEJ4QixVQUFVO1lBMENWLHNCQUFzQjtZQTRCdEIsZ0JBQWdCO1lBZ0NoQixvQkFBb0I7Q0FlbkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBb0J6RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSXRFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRWxFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsY0FBYyxFQUN0QixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFLakQ7SUFFRDs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxjQUFjLENBQUM7UUFDdkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLGNBQWMsQ0FBQztRQUN2QixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO0lBRUQ7OztPQUdHO0lBQ1UsZUFBZSxJQUFJLE9BQU8sQ0FBQztRQUN0QyxNQUFNLEVBQUUsY0FBYyxDQUFDO1FBQ3ZCLHFCQUFxQixFQUFFLFlBQVksQ0FBQztRQUNwQyxRQUFRLEVBQUUsWUFBWSxDQUFDO1FBQ3ZCLElBQUksRUFBRSxTQUFTLENBQUM7UUFDaEIsUUFBUSxFQUFFLHdCQUF3QixDQUFDO1FBQ25DLGFBQWEsRUFBRSxNQUFNLENBQUM7S0FDdkIsQ0FBQyxDQTJERDtZQUVhLGlCQUFpQjtZQVdqQixZQUFZO1lBV1osMEJBQTBCO1lBdUMxQixnQkFBZ0I7WUFlaEIsVUFBVTtZQXVEVixrQkFBa0I7WUFhbEIsZ0JBQWdCO1lBeUJoQixPQUFPO1lBc0ZQLHdCQUF3QjtZQTBCeEIsVUFBVTtZQWdEVixzQkFBc0I7WUEyQnRCLGdCQUFnQjtZQStCaEIsb0JBQW9CO0NBZW5DIn0=

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAoBzD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAPlC,OAAO,CAAC,GAAG,CAAuB;IAElC,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAC9C;IAEJ;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,UAAU,CAAC;QACnB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAMD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,UAAU,CAAC;QACnB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAsBD;YAMa,YAAY;YAWZ,0BAA0B;YA8C1B,gBAAgB;YAgBhB,UAAU;YAoDV,kBAAkB;YAalB,gBAAgB;YAsBhB,OAAO;YA6EP,wBAAwB;YA0BxB,UAAU;YA0CV,sBAAsB;YA4BtB,gBAAgB;YAgChB,oBAAoB;CAenC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAoBzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAItE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAPlC,OAAO,CAAC,GAAG,CAAuB;IAElC,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAKjD;IAED;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAMD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAsBD;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC;QACtC,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,QAAQ,EAAE,YAAY,CAAC;QACvB,IAAI,EAAE,SAAS,CAAC;QAChB,QAAQ,EAAE,wBAAwB,CAAC;QACnC,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CA2DD;YAEa,iBAAiB;YAWjB,YAAY;YAWZ,0BAA0B;YAuC1B,gBAAgB;YAehB,UAAU;YAuDV,kBAAkB;YAalB,gBAAgB;YAyBhB,OAAO;YAsFP,wBAAwB;YA0BxB,UAAU;YAgDV,sBAAsB;YA2BtB,gBAAgB;YA+BhB,oBAAoB;CAenC"}

package/dest/factory.js

@@ -1,6 +1,5 @@
-import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
 import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
 import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
@@ -8,16 +7,20 @@ import { deriveKeys } from '@aztec/aztec.js/keys';
 import { createLogger } from '@aztec/aztec.js/log';
 import { waitForL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
 import { waitForTx } from '@aztec/aztec.js/node';
+import { ContractInitializationStatus } from '@aztec/aztec.js/wallet';
 import { createEthereumChain } from '@aztec/ethereum/chain';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { RollupContract } from '@aztec/ethereum/contracts';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { Timer } from '@aztec/foundation/timer';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { GasSettings } from '@aztec/stdlib/gas';
+import { TestContract } from '@aztec/noir-test-contracts.js/Test';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { SupportedTokenContracts } from './config.js';
+import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
 import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
 const MINT_BALANCE = 1e12;
 const MIN_BALANCE = 1e3;
@@ -35,13 +38,16 @@ export class BotFactory {
         this.aztecNode = aztecNode;
         this.aztecNodeAdmin = aztecNodeAdmin;
         this.log = createLogger('bot');
+        // Set fee padding on the wallet so that all transactions during setup
+        // (token deploy, minting, etc.) use the configured padding, not the default.
+        this.wallet.setMinFeePadding(config.minFeePadding);
     }
     /**
    * Initializes a new bot by setting up the sender account, registering the recipient,
    * deploying the token contract, and minting tokens if necessary.
    */ async setup() {
         const defaultAccountAddress = await this.setupAccount();
-        const recipient = (await this.wallet.createAccount()).address;
+        const recipient = (await this.wallet.createSchnorrAccount(Fr.random(), Fr.random())).address;
         const token = await this.setupToken(defaultAccountAddress);
         await this.mintTokens(token, defaultAccountAddress);
         return {
@@ -70,6 +76,66 @@ export class BotFactory {
         };
     }
     /**
+   * Initializes the cross-chain bot by deploying TestContract, creating an L1 client,
+   * seeding initial L1→L2 messages, and waiting for the first to be ready.
+   */ async setupCrossChain() {
+        const defaultAccountAddress = await this.setupAccount();
+        // Create L1 client (same pattern as bridgeL1FeeJuice)
+        const l1RpcUrls = this.config.l1RpcUrls;
+        if (!l1RpcUrls?.length) {
+            throw new Error('L1 RPC URLs required for cross-chain bot');
+        }
+        const mnemonicOrPrivateKey = this.config.l1PrivateKey?.getValue() ?? this.config.l1Mnemonic?.getValue();
+        if (!mnemonicOrPrivateKey) {
+            throw new Error('L1 mnemonic or private key required for cross-chain bot');
+        }
+        const { l1ChainId, l1ContractAddresses } = await this.aztecNode.getNodeInfo();
+        const chain = createEthereumChain(l1RpcUrls, l1ChainId);
+        const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+        // Fetch Rollup version (needed for Inbox L2Actor struct)
+        const rollupContract = new RollupContract(l1Client, l1ContractAddresses.rollupAddress.toString());
+        const rollupVersion = await rollupContract.getVersion();
+        // Deploy TestContract
+        const contract = await this.setupTestContract(defaultAccountAddress);
+        // Recover any pending messages from store (clean up stale ones first)
+        await this.store.cleanupOldPendingMessages();
+        const pendingMessages = await this.store.getUnconsumedL1ToL2Messages();
+        // Seed initial L1→L2 messages if pipeline is empty
+        const seedCount = Math.max(0, this.config.l1ToL2SeedCount - pendingMessages.length);
+        for(let i = 0; i < seedCount; i++){
+            await seedL1ToL2Message(l1Client, EthAddress.fromString(l1ContractAddresses.inboxAddress.toString()), contract.address, rollupVersion, this.store, this.log);
+        }
+        // Block until at least one message is ready
+        const allMessages = await this.store.getUnconsumedL1ToL2Messages();
+        if (allMessages.length > 0) {
+            this.log.info(`Waiting for first L1→L2 message to be ready...`);
+            const firstMsg = allMessages[0];
+            await waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(firstMsg.msgHash), {
+                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
+            });
+            this.log.info(`First L1→L2 message is ready`);
+        }
+        return {
+            wallet: this.wallet,
+            defaultAccountAddress,
+            contract,
+            node: this.aztecNode,
+            l1Client,
+            rollupVersion
+        };
+    }
+    async setupTestContract(deployer) {
+        const deployOpts = {
+            from: deployer
+        };
+        const deploy = TestContract.deploy(this.wallet, {
+            salt: this.config.tokenSalt,
+            universalDeploy: true
+        });
+        const instance = await this.registerOrDeployContract('TestContract', deploy, deployOpts);
+        return TestContract.at(instance.address, this.wallet);
+    }
+    /**
    * Checks if the sender account contract is initialized, and initializes it if necessary.
    * @returns The sender wallet.
    */ async setupAccount() {
@@ -85,14 +151,9 @@ export class BotFactory {
     async setupAccountWithPrivateKey(secret) {
         const salt = this.config.senderSalt ?? Fr.ONE;
         const signingKey = deriveSigningKey(secret);
-        const accountData = {
-            secret,
-            salt,
-            contract: new SchnorrAccountContract(signingKey)
-        };
-        const accountManager = await this.wallet.createAccount(accountData);
+        const accountManager = await this.wallet.createSchnorrAccount(secret, salt, signingKey);
         const metadata = await this.wallet.getContractMetadata(accountManager.address);
-        if (metadata.isContractInitialized) {
+        if (metadata.initializationStatus === ContractInitializationStatus.INITIALIZED) {
             this.log.info(`Account at ${accountManager.address.toString()} already initialized`);
             const timer = new Timer();
             const address = accountManager.address;
@@ -105,15 +166,10 @@ export class BotFactory {
             const claim = await this.getOrCreateBridgeClaim(address);
             const paymentMethod = new FeeJuicePaymentMethodWithClaim(accountManager.address, claim);
             const deployMethod = await accountManager.getDeployMethod();
-            const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1 + this.config.minFeePadding);
-            const gasSettings = GasSettings.default({
-                maxFeesPerGas
-            });
             await this.withNoMinTxsPerBlock(async ()=>{
-                const txHash = await deployMethod.send({
-                    from: AztecAddress.ZERO,
+                const { txHash } = await deployMethod.send({
+                    from: NO_FROM,
                     fee: {
-                        gasSettings,
                         paymentMethod
                     },
                     wait: NO_WAIT
@@ -131,12 +187,7 @@ export class BotFactory {
     }
     async setupTestAccount() {
         const [initialAccountData] = await getInitialTestAccountsData();
-        const accountData = {
-            secret: initialAccountData.secret,
-            salt: initialAccountData.salt,
-            contract: new SchnorrAccountContract(initialAccountData.signingKey)
-        };
-        const accountManager = await this.wallet.createAccount(accountData);
+        const accountManager = await this.wallet.createSchnorrAccount(initialAccountData.secret, initialAccountData.salt, initialAccountData.signingKey);
         return accountManager.address;
     }
     /**
@@ -145,40 +196,50 @@ export class BotFactory {
    * @returns The TokenContract instance.
    */ async setupToken(sender) {
         let deploy;
-        let tokenInstance;
+        const salt = this.config.tokenSalt;
         const deployOpts = {
-            from: sender,
-            contractAddressSalt: this.config.tokenSalt,
-            universalDeploy: true
+            from: sender
         };
         let token;
+        let instance;
         if (this.config.contract === SupportedTokenContracts.TokenContract) {
-            deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18);
-            tokenInstance = await deploy.getInstance(deployOpts);
-            token = TokenContract.at(tokenInstance.address, this.wallet);
+            deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18, {
+                salt,
+                universalDeploy: true
+            });
+            instance = await deploy.getInstance();
+            token = TokenContract.at(instance.address, this.wallet);
         } else if (this.config.contract === SupportedTokenContracts.PrivateTokenContract) {
             // Generate keys for the contract since PrivateToken uses SinglePrivateMutable which requires keys
             const tokenSecretKey = Fr.random();
             const tokenPublicKeys = (await deriveKeys(tokenSecretKey)).publicKeys;
-            deploy = PrivateTokenContract.deployWithPublicKeys(tokenPublicKeys, this.wallet, MINT_BALANCE, sender);
+            deploy = PrivateTokenContract.deploy(this.wallet, MINT_BALANCE, sender, {
+                salt,
+                universalDeploy: true,
+                publicKeys: tokenPublicKeys
+            });
             deployOpts.skipInstancePublication = true;
             deployOpts.skipClassPublication = true;
             deployOpts.skipInitialization = false;
             // Register the contract with the secret key before deployment
-            tokenInstance = await deploy.getInstance(deployOpts);
-            token = PrivateTokenContract.at(tokenInstance.address, this.wallet);
-            await this.wallet.registerContract(tokenInstance, PrivateTokenContract.artifact, tokenSecretKey);
+            instance = await deploy.getInstance();
+            token = PrivateTokenContract.at(instance.address, this.wallet);
+            await this.wallet.registerContract(instance, PrivateTokenContract.artifact, tokenSecretKey);
+            // The contract constructor initializes private storage vars that need the contract's own nullifier key.
+            deployOpts.additionalScopes = [
+                instance.address
+            ];
         } else {
             throw new Error(`Unsupported token contract type: ${this.config.contract}`);
         }
-        const address = tokenInstance?.address ?? (await deploy.getInstance(deployOpts)).address;
+        const address = instance.address;
         const metadata = await this.wallet.getContractMetadata(address);
         if (metadata.isContractPublished) {
             this.log.info(`Token at ${address.toString()} already deployed`);
             await deploy.register();
         } else {
             this.log.info(`Deploying token contract at ${address.toString()}`);
-            const txHash = await deploy.send({
+            const { txHash } = await deploy.send({
                 ...deployOpts,
                 wait: NO_WAIT
             });
@@ -196,27 +257,29 @@ export class BotFactory {
    * Checks if the token contract is deployed and deploys it if necessary.
    * @param wallet - Wallet to deploy the token contract from.
    * @returns The TokenContract instance.
-   */ async setupTokenContract(deployer, contractAddressSalt, name, ticker, decimals = 18) {
+   */ async setupTokenContract(deployer, salt, name, ticker, decimals = 18) {
         const deployOpts = {
-            from: deployer,
-            contractAddressSalt,
-            universalDeploy: true
+            from: deployer
         };
-        const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals);
+        const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals, {
+            salt,
+            universalDeploy: true
+        });
         const instance = await this.registerOrDeployContract('Token - ' + name, deploy, deployOpts);
         return TokenContract.at(instance.address, this.wallet);
     }
-    async setupAmmContract(deployer, contractAddressSalt, token0, token1, lpToken) {
+    async setupAmmContract(deployer, salt, token0, token1, lpToken) {
         const deployOpts = {
-            from: deployer,
-            contractAddressSalt,
-            universalDeploy: true
+            from: deployer
         };
-        const deploy = AMMContract.deploy(this.wallet, token0.address, token1.address, lpToken.address);
+        const deploy = AMMContract.deploy(this.wallet, token0.address, token1.address, lpToken.address, {
+            salt,
+            universalDeploy: true
+        });
         const instance = await this.registerOrDeployContract('AMM', deploy, deployOpts);
         const amm = AMMContract.at(instance.address, this.wallet);
         this.log.info(`AMM deployed at ${amm.address}`);
-        const minterReceipt = await lpToken.methods.set_minter(amm.address, true).send({
+        const { receipt: minterReceipt } = await lpToken.methods.set_minter(amm.address, true).send({
             from: deployer,
             wait: {
                 timeout: this.config.txMinedWaitSeconds
@@ -230,13 +293,13 @@ export class BotFactory {
         const getPrivateBalances = ()=>Promise.all([
                 token0.methods.balance_of_private(liquidityProvider).simulate({
                     from: liquidityProvider
-                }),
+                }).then((r)=>r.result),
                 token1.methods.balance_of_private(liquidityProvider).simulate({
                     from: liquidityProvider
-                }),
+                }).then((r)=>r.result),
                 lpToken.methods.balance_of_private(liquidityProvider).simulate({
                     from: liquidityProvider
-                })
+                }).then((r)=>r.result)
             ]);
         const authwitNonce = Fr.random();
         // keep some tokens for swapping
@@ -255,7 +318,7 @@ export class BotFactory {
             caller: amm.address,
             call: await token1.methods.transfer_to_public_and_prepare_private_balance_increase(liquidityProvider, amm.address, amount1Max, authwitNonce).getFunctionCall()
         });
-        const mintReceipt = await new BatchCall(this.wallet, [
+        const { receipt: mintReceipt } = await new BatchCall(this.wallet, [
             token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
             token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE)
         ]).send({
@@ -265,7 +328,7 @@ export class BotFactory {
             }
         });
         this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
-        const addLiquidityReceipt = await amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
+        const { receipt: addLiquidityReceipt } = await amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
             from: liquidityProvider,
             authWitnesses: [
                 token0Authwit,
@@ -281,7 +344,7 @@ export class BotFactory {
         this.log.info(`Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`);
     }
     async registerOrDeployContract(name, deploy, deployOpts) {
-        const instance = await deploy.getInstance(deployOpts);
+        const instance = await deploy.getInstance();
         const address = instance.address;
         const metadata = await this.wallet.getContractMetadata(address);
         if (metadata.isContractPublished) {
@@ -290,7 +353,7 @@ export class BotFactory {
         } else {
             this.log.info(`Deploying contract ${name} at ${address.toString()}`);
             await this.withNoMinTxsPerBlock(async ()=>{
-                const txHash = await deploy.send({
+                const { txHash } = await deploy.send({
                     ...deployOpts,
                     wait: NO_WAIT
                 });
@@ -327,9 +390,14 @@ export class BotFactory {
             this.log.info(`Skipping minting as ${minter.toString()} has enough tokens`);
             return;
         }
+        // PrivateToken's mint accesses contract-level private storage vars (admin, total_supply).
+        const additionalScopes = isStandardToken ? undefined : [
+            token.address
+        ];
         await this.withNoMinTxsPerBlock(async ()=>{
-            const txHash = await new BatchCall(token.wallet, calls).send({
+            const { txHash } = await new BatchCall(token.wallet, calls).send({
                 from: minter,
+                additionalScopes,
                 wait: NO_WAIT
             });
             this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
@@ -351,8 +419,7 @@ export class BotFactory {
             try {
                 const messageHash = Fr.fromHexString(existingClaim.claim.messageHash);
                 await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.aztecNode, messageHash, {
-                        timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
-                        forPublicConsumption: false
+                        timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
                     }));
                 return existingClaim.claim;
             } catch (err) {
@@ -380,8 +447,7 @@ export class BotFactory {
         const mintAmount = await portal.getTokenManager().getMintAmount();
         const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true);
         await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(claim.messageHash), {
-                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
-                forPublicConsumption: false
+                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
             }));
         this.log.info(`Created a claim for ${mintAmount} L1 fee juice to ${recipient}.`, claim);
         return claim;

package/dest/index.d.ts

@@ -1,8 +1,9 @@
 export { Bot } from './bot.js';
 export { AmmBot } from './amm_bot.js';
+export { CrossChainBot } from './cross_chain_bot.js';
 export { BotRunner } from './runner.js';
 export { BotStore } from './store/bot_store.js';
 export { type BotConfig, getBotConfigFromEnv, getBotDefaultConfig, botConfigMappings, SupportedTokenContracts, } from './config.js';
 export { getBotRunnerApiHandler } from './rpc.js';
 export * from './interface.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDaEQsT0FBTyxFQUNMLEtBQUssU0FBUyxFQUNkLG1CQUFtQixFQUNuQixtQkFBbUIsRUFDbkIsaUJBQWlCLEVBQ2pCLHVCQUF1QixHQUN4QixNQUFNLGFBQWEsQ0FBQztBQUNyQixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDbEQsY0FBYyxnQkFBZ0IsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDeEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sRUFDTCxLQUFLLFNBQVMsRUFDZCxtQkFBbUIsRUFDbkIsbUJBQW1CLEVBQ25CLGlCQUFpQixFQUNqQix1QkFBdUIsR0FDeEIsTUFBTSxhQUFhLENBQUM7QUFDckIsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ2xELGNBQWMsZ0JBQWdCLENBQUMifQ==

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EACL,KAAK,SAAS,EACd,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EACL,KAAK,SAAS,EACd,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,cAAc,gBAAgB,CAAC"}