@aztec/bot 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/amm_bot.d.ts

@@ -1,10 +1,9 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { SentTx } from '@aztec/aztec.js/contracts';
-import { TxReceipt } from '@aztec/aztec.js/tx';
+import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
 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';
 import type { BotStore } from './store/index.js';
@@ -16,9 +15,9 @@ export declare class AmmBot extends BaseBot {
     readonly amm: AMMContract;
     readonly token0: TokenContract;
     readonly token1: TokenContract;
-    protected constructor(node: AztecNode, wallet: TestWallet, defaultAccountAddress: AztecAddress, amm: AMMContract, token0: TokenContract, token1: TokenContract, config: BotConfig);
-    static create(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore): Promise<AmmBot>;
-    protected createAndSendTx(logCtx: object): Promise<SentTx>;
+    protected constructor(node: AztecNode, wallet: EmbeddedWallet, defaultAccountAddress: AztecAddress, amm: AMMContract, token0: TokenContract, token1: TokenContract, config: BotConfig);
+    static create(config: BotConfig, wallet: EmbeddedWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore): Promise<AmmBot>;
+    protected createAndSendTx(logCtx: object): Promise<TxHash>;
     protected onTxMined(receipt: TxReceipt, logCtx: object): Promise<void>;
     getAmmBalances(): Promise<Balances>;
     getBalances(): Promise<{
@@ -30,4 +29,4 @@ export declare class AmmBot extends BaseBot {
     private getPrivateBalanceFor;
 }
 export {};
-//# sourceMappingURL=amm_bot.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW1tX2JvdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2FtbV9ib3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3pELE9BQU8sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFdkQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTlELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDeEMsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTdDLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBS2pELEtBQUssUUFBUSxHQUFHO0lBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7Q0FBRSxDQUFDO0FBRW5ELHFCQUFhLE1BQU8sU0FBUSxPQUFPO2FBS2YsR0FBRyxFQUFFLFdBQVc7YUFDaEIsTUFBTSxFQUFFLGFBQWE7YUFDckIsTUFBTSxFQUFFLGFBQWE7SUFOdkMsU0FBUyxhQUNQLElBQUksRUFBRSxTQUFTLEVBQ2YsTUFBTSxFQUFFLGNBQWMsRUFDdEIscUJBQXFCLEVBQUUsWUFBWSxFQUNuQixHQUFHLEVBQUUsV0FBVyxFQUNoQixNQUFNLEVBQUUsYUFBYSxFQUNyQixNQUFNLEVBQUUsYUFBYSxFQUNyQyxNQUFNLEVBQUUsU0FBUyxFQUdsQjtJQUVELE9BQWEsTUFBTSxDQUNqQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsY0FBYyxFQUN0QixTQUFTLEVBQUUsU0FBUyxFQUNwQixjQUFjLEVBQUUsY0FBYyxHQUFHLFNBQVMsRUFDMUMsS0FBSyxFQUFFLFFBQVEsR0FDZCxPQUFPLENBQUMsTUFBTSxDQUFDLENBU2pCO0lBRUQsVUFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBDL0Q7SUFFRCxVQUF5QixTQUFTLENBQUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHcEY7SUFFTSxjQUFjLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUV6QztJQUVZLFdBQVcsSUFBSSxPQUFPLENBQUM7UUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDO1FBQUMsYUFBYSxFQUFFLFFBQVEsQ0FBQztRQUFDLEdBQUcsRUFBRSxRQUFRLENBQUE7S0FBRSxDQUFDLENBTXRHO1lBRWEsbUJBQW1CO1lBTW5CLG9CQUFvQjtDQU1uQyJ9

package/dest/amm_bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"amm_bot.d.ts","sourceRoot":"","sources":["../src/amm_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAKjD,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,qBAAa,MAAO,SAAQ,OAAO;aAKf,GAAG,EAAE,WAAW;aAChB,MAAM,EAAE,aAAa;aACrB,MAAM,EAAE,aAAa;IANvC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,UAAU,EAClB,qBAAqB,EAAE,YAAY,EACnB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,aAAa,EACrC,MAAM,EAAE,SAAS;WAKN,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,MAAM,CAAC;cAWF,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cA4CvC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9E,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI7B,WAAW,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,QAAQ,CAAC;QAAC,aAAa,EAAE,QAAQ,CAAC;QAAC,GAAG,EAAE,QAAQ,CAAA;KAAE,CAAC;YAQzF,mBAAmB;YAMnB,oBAAoB;CAMnC"}
+{"version":3,"file":"amm_bot.d.ts","sourceRoot":"","sources":["../src/amm_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,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;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAKjD,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,qBAAa,MAAO,SAAQ,OAAO;aAKf,GAAG,EAAE,WAAW;aAChB,MAAM,EAAE,aAAa;aACrB,MAAM,EAAE,aAAa;IANvC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,cAAc,EACtB,qBAAqB,EAAE,YAAY,EACnB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,aAAa,EACrC,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,MAAM,CAAC,CASjB;IAED,UAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA0C/D;IAED,UAAyB,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpF;IAEM,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,CAEzC;IAEY,WAAW,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,QAAQ,CAAC;QAAC,aAAa,EAAE,QAAQ,CAAC;QAAC,GAAG,EAAE,QAAQ,CAAA;KAAE,CAAC,CAMtG;YAEa,mBAAmB;YAMnB,oBAAoB;CAMnC"}

package/dest/amm_bot.js

@@ -1,3 +1,4 @@
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { BaseBot } from './base_bot.js';
@@ -55,7 +56,10 @@ export class AmmBot extends BaseBot {
             ...logCtx,
             balances
         });
-        return swapExactTokensInteraction.send(opts);
+        return swapExactTokensInteraction.send({
+            ...opts,
+            wait: NO_WAIT
+        });
     }
     async onTxMined(receipt, logCtx) {
         const balances = await this.getBalances();

package/dest/base_bot.d.ts

@@ -1,21 +1,21 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { BatchCall, ContractFunctionInteraction, type SendInteractionOptions, SentTx } from '@aztec/aztec.js/contracts';
+import { BatchCall, ContractFunctionInteraction, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
 import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
 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';
 export declare abstract class BaseBot {
     readonly node: AztecNode;
-    readonly wallet: TestWallet;
+    readonly wallet: EmbeddedWallet;
     readonly defaultAccountAddress: AztecAddress;
     config: BotConfig;
     protected log: import("@aztec/aztec.js/log").Logger;
     protected attempts: number;
     protected successes: number;
-    protected constructor(node: AztecNode, wallet: TestWallet, defaultAccountAddress: AztecAddress, config: BotConfig);
+    protected constructor(node: AztecNode, wallet: EmbeddedWallet, defaultAccountAddress: AztecAddress, config: BotConfig);
     run(): Promise<TxReceipt | TxHash>;
-    protected abstract createAndSendTx(logCtx: object): Promise<SentTx>;
+    protected abstract createAndSendTx(logCtx: object): Promise<TxHash>;
     protected onTxMined(_receipt: TxReceipt, _logCtx: object): Promise<void>;
     protected getSendMethodOpts(interaction: ContractFunctionInteraction | BatchCall): Promise<SendInteractionOptions>;
 }
-//# sourceMappingURL=base_bot.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9ib3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9iYXNlX2JvdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLFNBQVMsRUFBRSwyQkFBMkIsRUFBRSxLQUFLLHNCQUFzQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHaEgsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQVksTUFBTSxvQkFBb0IsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFN0MsOEJBQXNCLE9BQU87YUFPVCxJQUFJLEVBQUUsU0FBUzthQUNmLE1BQU0sRUFBRSxjQUFjO2FBQ3RCLHFCQUFxQixFQUFFLFlBQVk7SUFDNUMsTUFBTSxFQUFFLFNBQVM7SUFUMUIsU0FBUyxDQUFDLEdBQUcsdUNBQXVCO0lBRXBDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFLO0lBQy9CLFNBQVMsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFLO0lBRWhDLFNBQVMsYUFDUyxJQUFJLEVBQUUsU0FBUyxFQUNmLE1BQU0sRUFBRSxjQUFjLEVBQ3RCLHFCQUFxQixFQUFFLFlBQVksRUFDNUMsTUFBTSxFQUFFLFNBQVMsRUFDdEI7SUFFUyxHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsR0FBRyxNQUFNLENBQUMsQ0F5QjlDO0lBRUQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFcEUsU0FBUyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUd2RTtJQUVELFVBQWdCLGlCQUFpQixDQUMvQixXQUFXLEVBQUUsMkJBQTJCLEdBQUcsU0FBUyxHQUNuRCxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0FvQmpDO0NBQ0YifQ==

package/dest/base_bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base_bot.d.ts","sourceRoot":"","sources":["../src/base_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,SAAS,EACT,2BAA2B,EAC3B,KAAK,sBAAsB,EAC3B,MAAM,EAEP,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,8BAAsB,OAAO;aAOT,IAAI,EAAE,SAAS;aACf,MAAM,EAAE,UAAU;aAClB,qBAAqB,EAAE,YAAY;IAC5C,MAAM,EAAE,SAAS;IAT1B,SAAS,CAAC,GAAG,uCAAuB;IAEpC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAK;IAC/B,SAAS,CAAC,SAAS,EAAE,MAAM,CAAK;IAEhC,SAAS,aACS,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,UAAU,EAClB,qBAAqB,EAAE,YAAY,EAC5C,MAAM,EAAE,SAAS;IAGb,GAAG,IAAI,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC;IAoC/C,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEnE,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAKxD,iBAAiB,CAC/B,WAAW,EAAE,2BAA2B,GAAG,SAAS,GACnD,OAAO,CAAC,sBAAsB,CAAC;CAqBnC"}
+{"version":3,"file":"base_bot.d.ts","sourceRoot":"","sources":["../src/base_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,KAAK,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAGhH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAY,MAAM,oBAAoB,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,8BAAsB,OAAO;aAOT,IAAI,EAAE,SAAS;aACf,MAAM,EAAE,cAAc;aACtB,qBAAqB,EAAE,YAAY;IAC5C,MAAM,EAAE,SAAS;IAT1B,SAAS,CAAC,GAAG,uCAAuB;IAEpC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAK;IAC/B,SAAS,CAAC,SAAS,EAAE,MAAM,CAAK;IAEhC,SAAS,aACS,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,cAAc,EACtB,qBAAqB,EAAE,YAAY,EAC5C,MAAM,EAAE,SAAS,EACtB;IAES,GAAG,IAAI,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,CAyB9C;IAED,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpE,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGvE;IAED,UAAgB,iBAAiB,CAC/B,WAAW,EAAE,2BAA2B,GAAG,SAAS,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAoBjC;CACF"}

package/dest/base_bot.js

@@ -1,5 +1,6 @@
-import { waitForProven } from '@aztec/aztec.js/contracts';
 import { createLogger } from '@aztec/aztec.js/log';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { TxStatus } from '@aztec/aztec.js/tx';
 import { Gas } from '@aztec/stdlib/gas';
 export class BaseBot {
     node;
@@ -20,26 +21,24 @@ export class BaseBot {
     }
     async run() {
         this.attempts++;
+        const { followChain, txMinedWaitSeconds } = this.config;
         const logCtx = {
-            runId: Date.now() * 1000 + Math.floor(Math.random() * 1000)
+            runId: Date.now() * 1000 + Math.floor(Math.random() * 1000),
+            followChain,
+            txMinedWaitSeconds
         };
-        const { followChain, txMinedWaitSeconds } = this.config;
         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
+        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
         });
-        if (followChain === 'PROVEN') {
-            await waitForProven(this.node, receipt, {
-                provenTimeout: txMinedWaitSeconds
-            });
-        }
         this.successes++;
         this.log.info(`Tx #${this.attempts} ${receipt.txHash} successfully mined in block ${receipt.blockNumber} (stats: ${this.successes}/${this.attempts} success)`, logCtx);
         await this.onTxMined(receipt, logCtx);
@@ -50,8 +49,8 @@ export class BaseBot {
         return Promise.resolve();
     }
     async getSendMethodOpts(interaction) {
-        const { l2GasLimit, daGasLimit, baseFeePadding } = this.config;
-        this.wallet.setBaseFeePadding(baseFeePadding);
+        const { l2GasLimit, daGasLimit, minFeePadding } = this.config;
+        this.wallet.setMinFeePadding(minFeePadding);
         let gasSettings;
         if (l2GasLimit !== undefined && l2GasLimit > 0 && daGasLimit !== undefined && daGasLimit > 0) {
             gasSettings = {

package/dest/bot.d.ts

@@ -1,19 +1,19 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { SentTx } from '@aztec/aztec.js/contracts';
+import { TxHash } from '@aztec/aztec.js/tx';
 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';
 import type { BotStore } from './store/index.js';
 export declare class Bot extends BaseBot {
     readonly token: TokenContract | PrivateTokenContract;
     readonly recipient: AztecAddress;
-    protected constructor(node: AztecNode, wallet: TestWallet, defaultAccountAddress: AztecAddress, token: TokenContract | PrivateTokenContract, recipient: AztecAddress, config: BotConfig);
-    static create(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore): Promise<Bot>;
+    protected constructor(node: AztecNode, wallet: EmbeddedWallet, defaultAccountAddress: AztecAddress, token: TokenContract | PrivateTokenContract, recipient: AztecAddress, config: BotConfig);
+    static create(config: BotConfig, wallet: EmbeddedWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore): Promise<Bot>;
     updateConfig(config: Partial<BotConfig>): void;
-    protected createAndSendTx(logCtx: object): Promise<SentTx>;
+    protected createAndSendTx(logCtx: object): Promise<TxHash>;
     getBalances(): Promise<{
         sender: {
             privateBalance: bigint;
@@ -25,4 +25,4 @@ export declare class Bot extends BaseBot {
         };
     }>;
 }
-//# sourceMappingURL=bot.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvYm90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTlELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QyxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ2xGLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU5RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU3QyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUtqRCxxQkFBYSxHQUFJLFNBQVEsT0FBTzthQUtaLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CO2FBQzNDLFNBQVMsRUFBRSxZQUFZO0lBTHpDLFNBQVMsYUFDUCxJQUFJLEVBQUUsU0FBUyxFQUNmLE1BQU0sRUFBRSxjQUFjLEVBQ3RCLHFCQUFxQixFQUFFLFlBQVksRUFDbkIsS0FBSyxFQUFFLGFBQWEsR0FBRyxvQkFBb0IsRUFDM0MsU0FBUyxFQUFFLFlBQVksRUFDdkMsTUFBTSxFQUFFLFNBQVMsRUFHbEI7SUFFRCxPQUFhLE1BQU0sQ0FDakIsTUFBTSxFQUFFLFNBQVMsRUFDakIsTUFBTSxFQUFFLGNBQWMsRUFDdEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsY0FBYyxFQUFFLGNBQWMsR0FBRyxTQUFTLEVBQzFDLEtBQUssRUFBRSxRQUFRLEdBQ2QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQVNkO0lBRU0sWUFBWSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLFFBRzdDO0lBRUQsVUFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTRCL0Q7SUFFWSxXQUFXOzs7Ozs7Ozs7T0FrQnZCO0NBQ0YifQ==

package/dest/bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAa,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAKjD,qBAAa,GAAI,SAAQ,OAAO;aAKZ,KAAK,EAAE,aAAa,GAAG,oBAAoB;aAC3C,SAAS,EAAE,YAAY;IALzC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,UAAU,EAClB,qBAAqB,EAAE,YAAY,EACnB,KAAK,EAAE,aAAa,GAAG,oBAAoB,EAC3C,SAAS,EAAE,YAAY,EACvC,MAAM,EAAE,SAAS;WAKN,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,GAAG,CAAC;IAWR,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;cAK9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BnD,WAAW;;;;;;;;;;CAmBzB"}
+{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,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;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAKjD,qBAAa,GAAI,SAAQ,OAAO;aAKZ,KAAK,EAAE,aAAa,GAAG,oBAAoB;aAC3C,SAAS,EAAE,YAAY;IALzC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,cAAc,EACtB,qBAAqB,EAAE,YAAY,EACnB,KAAK,EAAE,aAAa,GAAG,oBAAoB,EAC3C,SAAS,EAAE,YAAY,EACvC,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,GAAG,CAAC,CASd;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,QAG7C;IAED,UAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA4B/D;IAEY,WAAW;;;;;;;;;OAkBvB;CACF"}

package/dest/bot.js

@@ -1,4 +1,4 @@
-import { BatchCall } from '@aztec/aztec.js/contracts';
+import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
 import { times } from '@aztec/foundation/collection';
 import { BaseBot } from './base_bot.js';
 import { BotFactory } from './factory.js';
@@ -36,13 +36,16 @@ export class Bot extends BaseBot {
             from: this.defaultAccountAddress
         });
         this.log.verbose(`Sending transaction`, logCtx);
-        return batch.send(opts);
+        return batch.send({
+            ...opts,
+            wait: NO_WAIT
+        });
     }
     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 {
@@ -51,7 +54,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/dest/config.d.ts

@@ -1,11 +1,12 @@
 import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
-import { type ZodFor } from '@aztec/stdlib/schemas';
 import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 import { z } from 'zod';
-declare const BotFollowChain: readonly ["NONE", "PENDING", "PROVEN"];
+declare const BotFollowChain: readonly ["NONE", "PROPOSED", "CHECKPOINTED", "PROVEN"];
 type BotFollowChain = (typeof BotFollowChain)[number];
+declare const BotMode: readonly ["transfer", "amm", "crosschain"];
+type BotMode = (typeof BotMode)[number];
 export declare enum SupportedTokenContracts {
     TokenContract = "TokenContract",
     PrivateTokenContract = "PrivateTokenContract"
@@ -37,8 +38,8 @@ export type BotConfig = {
     publicTransfersPerTx: number;
     /** How to handle fee payments. */
     feePaymentMethod: 'fee_juice';
-    /** 'How much is the bot willing to overpay vs. the current base fee' */
-    baseFeePadding: number;
+    /** 'How much is the bot willing to overpay vs. the current min fee' */
+    minFeePadding: number;
     /** True to not automatically setup or start the bot on initialization. */
     noStart: boolean;
     /** How long to wait for a tx to be mined before reporting an error. */
@@ -59,8 +60,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 declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     nodeUrl: z.ZodOptional<z.ZodString>;
@@ -70,16 +75,16 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     l1PrivateKey: z.ZodOptional<z.ZodType<SecretValue<string>, any, any>>;
     l1ToL2MessageTimeoutSeconds: z.ZodNumber;
     senderPrivateKey: z.ZodOptional<z.ZodType<SecretValue<Fr>, any, any>>;
-    senderSalt: z.ZodOptional<ZodFor<Fr>>;
-    tokenSalt: ZodFor<Fr>;
+    senderSalt: z.ZodOptional<import("@aztec/stdlib/schemas").ZodFor<Fr>>;
+    tokenSalt: import("@aztec/stdlib/schemas").ZodFor<Fr>;
     txIntervalSeconds: z.ZodNumber;
     privateTransfersPerTx: z.ZodNumber;
     publicTransfersPerTx: z.ZodNumber;
     feePaymentMethod: z.ZodLiteral<"fee_juice">;
-    baseFeePadding: z.ZodNumber;
+    minFeePadding: z.ZodNumber;
     noStart: z.ZodBoolean;
     txMinedWaitSeconds: z.ZodNumber;
-    followChain: z.ZodEnum<["NONE", "PENDING", "PROVEN"]>;
+    followChain: z.ZodEnum<["NONE", "PROPOSED", "CHECKPOINTED", "PROVEN"]>;
     maxPendingTxs: z.ZodNumber;
     flushSetupTransactions: z.ZodBoolean;
     l2GasLimit: z.ZodOptional<z.ZodNumber>;
@@ -87,65 +92,71 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     contract: z.ZodNativeEnum<typeof SupportedTokenContracts>;
     maxConsecutiveErrors: z.ZodNumber;
     stopWhenUnhealthy: z.ZodBoolean;
-    ammTxs: z.ZodDefault<z.ZodBoolean>;
+    botMode: z.ZodDefault<z.ZodEnum<["transfer", "amm", "crosschain"]>>;
+    l2ToL1MessagesPerTx: z.ZodDefault<z.ZodNumber>;
+    l1ToL2SeedCount: z.ZodDefault<z.ZodNumber>;
     dataDirectory: z.ZodOptional<z.ZodString>;
     dataStoreMapSizeKb: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
+    nodeUrl?: string | undefined;
+    nodeAdminUrl?: string | undefined;
+    l1RpcUrls?: string[] | undefined;
+    l1Mnemonic?: SecretValue<string> | undefined;
+    l1PrivateKey?: SecretValue<string> | undefined;
     l1ToL2MessageTimeoutSeconds: number;
+    senderPrivateKey?: SecretValue<Fr> | undefined;
+    senderSalt?: Fr | undefined;
     tokenSalt: Fr;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
-    baseFeePadding: number;
+    minFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
-    followChain: "NONE" | "PENDING" | "PROVEN";
+    followChain: "CHECKPOINTED" | "NONE" | "PROPOSED" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
+    l2GasLimit?: number | undefined;
+    daGasLimit?: number | undefined;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
-    ammTxs: boolean;
+    botMode: "amm" | "crosschain" | "transfer";
+    l2ToL1MessagesPerTx: number;
+    l1ToL2SeedCount: number;
     dataDirectory?: string | undefined;
     dataStoreMapSizeKb?: number | undefined;
+}, {
     nodeUrl?: string | undefined;
     nodeAdminUrl?: string | undefined;
     l1RpcUrls?: string[] | undefined;
-    l1Mnemonic?: SecretValue<string> | undefined;
-    l1PrivateKey?: SecretValue<string> | undefined;
-    senderPrivateKey?: SecretValue<Fr> | undefined;
-    senderSalt?: Fr | undefined;
-    l2GasLimit?: number | undefined;
-    daGasLimit?: number | undefined;
-}, {
+    l1Mnemonic?: any;
+    l1PrivateKey?: any;
     l1ToL2MessageTimeoutSeconds: number;
+    senderPrivateKey?: any;
+    senderSalt?: any;
+    tokenSalt?: any;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
-    baseFeePadding: number;
+    minFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
-    followChain: "NONE" | "PENDING" | "PROVEN";
+    followChain: "CHECKPOINTED" | "NONE" | "PROPOSED" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
+    l2GasLimit?: number | undefined;
+    daGasLimit?: number | undefined;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    botMode?: "amm" | "crosschain" | "transfer" | undefined;
+    l2ToL1MessagesPerTx?: number | undefined;
+    l1ToL2SeedCount?: number | undefined;
     dataDirectory?: string | undefined;
     dataStoreMapSizeKb?: number | undefined;
-    nodeUrl?: string | undefined;
-    nodeAdminUrl?: string | undefined;
-    l1RpcUrls?: string[] | undefined;
-    l1Mnemonic?: any;
-    l1PrivateKey?: any;
-    senderPrivateKey?: any;
-    senderSalt?: any;
-    tokenSalt?: any;
-    l2GasLimit?: number | undefined;
-    daGasLimit?: number | undefined;
-    ammTxs?: boolean | undefined;
 }>, {
     l1ToL2MessageTimeoutSeconds: number;
     tokenSalt: Fr;
@@ -153,59 +164,63 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
-    baseFeePadding: number;
+    minFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
-    followChain: "NONE" | "PENDING" | "PROVEN";
+    followChain: "CHECKPOINTED" | "NONE" | "PROPOSED" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
-    ammTxs: boolean;
-    dataDirectory: string | undefined;
-    dataStoreMapSizeKb: number;
+    botMode: "amm" | "crosschain" | "transfer";
+    l2ToL1MessagesPerTx: number;
+    l1ToL2SeedCount: number;
     nodeUrl: string | undefined;
     nodeAdminUrl: string | undefined;
     l1RpcUrls: string[] | undefined;
-    l1Mnemonic: SecretValue<string> | undefined;
-    l1PrivateKey: SecretValue<string> | undefined;
-    senderPrivateKey: SecretValue<Fr> | undefined;
     senderSalt: Fr | undefined;
     l2GasLimit: number | undefined;
     daGasLimit: number | undefined;
+    l1Mnemonic: SecretValue<string> | undefined;
+    l1PrivateKey: SecretValue<string> | undefined;
+    senderPrivateKey: SecretValue<Fr> | undefined;
+    dataDirectory: string | undefined;
+    dataStoreMapSizeKb: number;
 }, {
+    nodeUrl?: string | undefined;
+    nodeAdminUrl?: string | undefined;
+    l1RpcUrls?: string[] | undefined;
+    l1Mnemonic?: any;
+    l1PrivateKey?: any;
     l1ToL2MessageTimeoutSeconds: number;
+    senderPrivateKey?: any;
+    senderSalt?: any;
+    tokenSalt?: any;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
-    baseFeePadding: number;
+    minFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
-    followChain: "NONE" | "PENDING" | "PROVEN";
+    followChain: "CHECKPOINTED" | "NONE" | "PROPOSED" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
+    l2GasLimit?: number | undefined;
+    daGasLimit?: number | undefined;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    botMode?: "amm" | "crosschain" | "transfer" | undefined;
+    l2ToL1MessagesPerTx?: number | undefined;
+    l1ToL2SeedCount?: number | undefined;
     dataDirectory?: string | undefined;
     dataStoreMapSizeKb?: number | undefined;
-    nodeUrl?: string | undefined;
-    nodeAdminUrl?: string | undefined;
-    l1RpcUrls?: string[] | undefined;
-    l1Mnemonic?: any;
-    l1PrivateKey?: any;
-    senderPrivateKey?: any;
-    senderSalt?: any;
-    tokenSalt?: any;
-    l2GasLimit?: number | undefined;
-    daGasLimit?: number | undefined;
-    ammTxs?: boolean | undefined;
 }>;
 export declare const botConfigMappings: ConfigMappingsType<BotConfig>;
 export declare function getBotConfigFromEnv(): BotConfig;
 export declare function getBotDefaultConfig(): BotConfig;
 export declare function getVersions(): Partial<ComponentsVersions>;
 export {};
-//# sourceMappingURL=config.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixXQUFXLEVBU1osTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHdCQUF3QixDQUFDO0FBSWxGLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbkUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixRQUFBLE1BQU0sY0FBYyx5REFBMEQsQ0FBQztBQUMvRSxLQUFLLGNBQWMsR0FBRyxDQUFDLE9BQU8sY0FBYyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUM7QUFFdEQsUUFBQSxNQUFNLE9BQU8sNENBQTZDLENBQUM7QUFDM0QsS0FBSyxPQUFPLEdBQUcsQ0FBQyxPQUFPLE9BQU8sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRXhDLG9CQUFZLHVCQUF1QjtJQUNqQyxhQUFhLGtCQUFrQjtJQUMvQixvQkFBb0IseUJBQXlCO0NBQzlDO0FBRUQsTUFBTSxNQUFNLFNBQVMsR0FBRztJQUN0Qiw2REFBNkQ7SUFDN0QsT0FBTyxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDNUIsNEVBQTRFO0lBQzVFLFlBQVksRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQ2pDLGdDQUFnQztJQUNoQyxTQUFTLEVBQUUsTUFBTSxFQUFFLEdBQUcsU0FBUyxDQUFDO0lBQ2hDLGdFQUFnRTtJQUNoRSxVQUFVLEVBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBQyxHQUFHLFNBQVMsQ0FBQztJQUM1QyxtRUFBbUU7SUFDbkUsWUFBWSxFQUFFLFdBQVcsQ0FBQyxNQUFNLENBQUMsR0FBRyxTQUFTLENBQUM7SUFDOUMsdUVBQXVFO0lBQ3ZFLDJCQUEyQixFQUFFLE1BQU0sQ0FBQztJQUNwQyxrREFBa0Q7SUFDbEQsZ0JBQWdCLEVBQUUsV0FBVyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQztJQUM5Qyw2REFBNkQ7SUFDN0QsVUFBVSxFQUFFLEVBQUUsR0FBRyxTQUFTLENBQUM7SUFDM0IsaURBQWlEO0lBQ2pELFNBQVMsRUFBRSxFQUFFLENBQUM7SUFDZCxzREFBc0Q7SUFDdEQsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLDREQUE0RDtJQUM1RCxxQkFBcUIsRUFBRSxNQUFNLENBQUM7SUFDOUIsMkRBQTJEO0lBQzNELG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUM3QixrQ0FBa0M7SUFDbEMsZ0JBQWdCLEVBQUUsV0FBVyxDQUFDO0lBQzlCLHVFQUF1RTtJQUN2RSxhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLDBFQUEwRTtJQUMxRSxPQUFPLEVBQUUsT0FBTyxDQUFDO0lBQ2pCLHVFQUF1RTtJQUN2RSxrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFDM0IsNEVBQTRFO0lBQzVFLFdBQVcsRUFBRSxjQUFjLENBQUM7SUFDNUIsZ0ZBQWdGO0lBQ2hGLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsOERBQThEO0lBQzlELHNCQUFzQixFQUFFLE9BQU8sQ0FBQztJQUNoQywrRUFBK0U7SUFDL0UsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDL0IsK0VBQStFO0lBQy9FLFVBQVUsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQy9CLDRCQUE0QjtJQUM1QixRQUFRLEVBQUUsdUJBQXVCLENBQUM7SUFDbEMseUVBQXlFO0lBQ3pFLG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUM3QixpREFBaUQ7SUFDakQsaUJBQWlCLEVBQUUsT0FBTyxDQUFDO0lBQzNCLDhDQUE4QztJQUM5QyxPQUFPLEVBQUUsT0FBTyxDQUFDO0lBQ2pCLDJEQUF5RDtJQUN6RCxtQkFBbUIsRUFBRSxNQUFNLENBQUM7SUFDNUIsZ0VBQThEO0lBQzlELGVBQWUsRUFBRSxNQUFNLENBQUM7Q0FDekIsR0FBRyxJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsR0FBRyxvQkFBb0IsQ0FBQyxDQUFDO0FBRWxFLGVBQU8sTUFBTSxlQUFlOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUErQzNCLENBQUM7QUFFRixlQUFPLE1BQU0saUJBQWlCLEVBQUUsa0JBQWtCLENBQUMsU0FBUyxDQW1LM0QsQ0FBQztBQUVGLHdCQUFnQixtQkFBbUIsSUFBSSxTQUFTLENBRS9DO0FBRUQsd0JBQWdCLG1CQUFtQixJQUFJLFNBQVMsQ0FFL0M7QUFFRCx3QkFBZ0IsV0FBVyxJQUFJLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUt6RCJ9

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dest/config.js

@@ -1,21 +1,27 @@
 import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper, pickConfigMappings, secretFrConfigHelper, secretStringConfigHelper } from '@aztec/foundation/config';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { dataConfigMappings } from '@aztec/kv-store/config';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
-import { schemas } from '@aztec/stdlib/schemas';
+import { schemas, zodFor } from '@aztec/stdlib/schemas';
 import { z } from 'zod';
 const BotFollowChain = [
     'NONE',
-    'PENDING',
+    'PROPOSED',
+    'CHECKPOINTED',
     'PROVEN'
 ];
+const BotMode = [
+    'transfer',
+    'amm',
+    'crosschain'
+];
 export var SupportedTokenContracts = /*#__PURE__*/ function(SupportedTokenContracts) {
     SupportedTokenContracts["TokenContract"] = "TokenContract";
     SupportedTokenContracts["PrivateTokenContract"] = "PrivateTokenContract";
     return SupportedTokenContracts;
 }({});
-export const BotConfigSchema = z.object({
+export const BotConfigSchema = zodFor()(z.object({
     nodeUrl: z.string().optional(),
     nodeAdminUrl: z.string().optional(),
     l1RpcUrls: z.array(z.string()).optional(),
@@ -29,7 +35,7 @@ export const BotConfigSchema = z.object({
     privateTransfersPerTx: z.number().int().nonnegative(),
     publicTransfersPerTx: z.number().int().nonnegative(),
     feePaymentMethod: z.literal('fee_juice'),
-    baseFeePadding: z.number().int().nonnegative(),
+    minFeePadding: z.number().int().nonnegative(),
     noStart: z.boolean(),
     txMinedWaitSeconds: z.number(),
     followChain: z.enum(BotFollowChain),
@@ -40,7 +46,9 @@ export const BotConfigSchema = z.object({
     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()
 }).transform((config)=>({
@@ -56,7 +64,7 @@ export const BotConfigSchema = z.object({
         dataDirectory: undefined,
         dataStoreMapSizeKb: 1_024 * 1_024,
         ...config
-    }));
+    })));
 export const botConfigMappings = {
     nodeUrl: {
         env: 'AZTEC_NODE_URL',
@@ -123,8 +131,8 @@ export const botConfigMappings = {
         parseEnv: (val)=>val || undefined,
         defaultValue: 'fee_juice'
     },
-    baseFeePadding: {
-        env: 'BOT_BASE_FEE_PADDING',
+    minFeePadding: {
+        env: 'BOT_MIN_FEE_PADDING',
         description: 'How much is the bot willing to overpay vs. the current base fee',
         ...numberConfigHelper(3)
     },
@@ -143,10 +151,14 @@ export const botConfigMappings = {
         description: 'Which chain the bot follows',
         defaultValue: 'NONE',
         parseEnv (val) {
-            if (!BotFollowChain.includes(val.toUpperCase())) {
+            const upper = val.toUpperCase();
+            if (upper === 'PENDING') {
+                return 'CHECKPOINTED';
+            }
+            if (!BotFollowChain.includes(upper)) {
                 throw new Error(`Invalid value for BOT_FOLLOW_CHAIN: ${val}`);
             }
-            return val;
+            return upper;
         }
     },
     maxPendingTxs: {
@@ -190,10 +202,26 @@ export const botConfigMappings = {
         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',
+        parseEnv (val) {
+            if (!BotMode.includes(val)) {
+                throw new Error(`Invalid value for BOT_MODE: ${val}`);
+            }
+            return val;
+        }
+    },
+    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',