@aztec/bot 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

package/dest/index.js

@@ -1,6 +1,7 @@
 export { Bot } from './bot.js';
 export { AmmBot } from './amm_bot.js';
 export { BotRunner } from './runner.js';
+export { BotStore } from './store/bot_store.js';
 export { getBotConfigFromEnv, getBotDefaultConfig, botConfigMappings, SupportedTokenContracts } from './config.js';
 export { getBotRunnerApiHandler } from './rpc.js';
 export * from './interface.js';

package/dest/interface.d.ts

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
 import { z } from 'zod';
 import { type BotConfig } from './config.js';
@@ -20,4 +20,4 @@ export interface BotRunnerApi {
     update(config: BotConfig): Promise<void>;
 }
 export declare const BotRunnerApiSchema: ApiSchemaFor<BotRunnerApi>;
-//# sourceMappingURL=interface.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUxRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBbUIsTUFBTSxhQUFhLENBQUM7QUFFOUQsZUFBTyxNQUFNLGFBQWE7Ozs7OztFQUV4QixDQUFDO0FBRUgsTUFBTSxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sYUFBYSxDQUFDLENBQUM7QUFFcEQsTUFBTSxXQUFXLFlBQVk7SUFDM0IsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN2QixJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3RCLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDckIsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN2QixTQUFTLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2hDLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDNUIsTUFBTSxDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQzFDO0FBRUQsZUFBTyxNQUFNLGtCQUFrQixFQUFFLFlBQVksQ0FBQyxZQUFZLENBUXpELENBQUMifQ==

package/dest/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,aAAa,CAAC;AAE9D,eAAO,MAAM,aAAa;;;;;;EAExB,CAAC;AAEH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpD,MAAM,WAAW,YAAY;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,YAAY,CAQzD,CAAC"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,aAAa,CAAC;AAE9D,eAAO,MAAM,aAAa;;;;;;EAExB,CAAC;AAEH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpD,MAAM,WAAW,YAAY;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,YAAY,CAQzD,CAAC"}

package/dest/interface.js

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { z } from 'zod';
 import { BotConfigSchema } from './config.js';
 export const BotInfoSchema = z.object({

package/dest/rpc.d.ts

@@ -1,4 +1,4 @@
 import type { ApiHandler } from '@aztec/foundation/json-rpc/server';
 import type { BotRunner } from './runner.js';
 export declare function getBotRunnerApiHandler(botRunner: BotRunner): ApiHandler;
-//# sourceMappingURL=rpc.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcnBjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBR3BFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU3Qyx3QkFBZ0Isc0JBQXNCLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxVQUFVLENBRXZFIn0=

package/dest/runner.d.ts

@@ -1,26 +1,25 @@
-import { type AztecNode, type PXE } from '@aztec/aztec.js';
-import { type AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+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 BotConfig } from './config.js';
+import type { TestWallet } from '@aztec/test-wallet/server';
+import type { BotConfig } from './config.js';
 import type { BotInfo, BotRunnerApi } from './interface.js';
+import { BotStore } from './store/index.js';
 export declare class BotRunner implements BotRunnerApi, Traceable {
     #private;
     private config;
+    private readonly wallet;
+    private readonly aztecNode;
+    private readonly telemetry;
+    private readonly aztecNodeAdmin;
+    private readonly store;
     private log;
     private bot?;
-    private pxe?;
-    private node;
-    private nodeAdmin?;
     private runningPromise;
     private consecutiveErrors;
     private healthy;
     readonly tracer: Tracer;
-    constructor(config: BotConfig, dependencies: {
-        pxe?: PXE;
-        node?: AztecNode;
-        nodeAdmin?: AztecNodeAdmin;
-        telemetry: TelemetryClient;
-    });
+    constructor(config: BotConfig, wallet: TestWallet, 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;
@@ -51,4 +50,4 @@ export declare class BotRunner implements BotRunnerApi, Traceable {
     /** Returns the bot sender address. */
     getInfo(): Promise<BotInfo>;
 }
-//# sourceMappingURL=runner.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBR3RELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxLQUFLLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBYSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZHLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSzVELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3QyxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTVDLHFCQUFhLFNBQVUsWUFBVyxZQUFZLEVBQUUsU0FBUzs7SUFVckQsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFDL0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBZHhCLE9BQU8sQ0FBQyxHQUFHLENBQXVCO0lBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBbUI7SUFDL0IsT0FBTyxDQUFDLGNBQWMsQ0FBaUI7SUFDdkMsT0FBTyxDQUFDLGlCQUFpQixDQUFLO0lBQzlCLE9BQU8sQ0FBQyxPQUFPLENBQVE7SUFFdkIsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNVLE1BQU0sRUFBRSxTQUFTLEVBQ1IsTUFBTSxFQUFFLFVBQVUsRUFDbEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsU0FBUyxFQUFFLGVBQWUsRUFDMUIsY0FBYyxFQUFFLGNBQWMsR0FBRyxTQUFTLEVBQzFDLEtBQUssRUFBRSxRQUFRLEVBS2pDO0lBRUQsNkVBQTZFO0lBQ2hFLEtBQUssa0JBSWpCO1lBR2EsT0FBTztJQU1yQjs7O09BR0c7SUFDVSxLQUFLLGtCQU1qQjtJQUVEOztPQUVHO0lBQ1UsSUFBSSxrQkFPaEI7SUFFTSxTQUFTLFlBRWY7SUFFRCwwQ0FBMEM7SUFDbkMsU0FBUyxZQUVmO0lBRUQ7OztPQUdHO0lBQ1UsTUFBTSxDQUFDLE1BQU0sRUFBRSxTQUFTLGlCQWFwQztJQUVEOzs7T0FHRztJQUNVLEdBQUcsa0JBc0JmO0lBRUQscURBQXFEO0lBQzlDLFNBQVMsdUJBR2Y7SUFFRCxzQ0FBc0M7SUFDekIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FNdkM7Q0F1Q0YifQ==

package/dest/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAuC,MAAM,iBAAiB,CAAC;AAGhG,OAAO,EAAE,KAAK,cAAc,EAA8B,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAA8B,MAAM,yBAAyB,CAAC;AAKxH,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE5D,qBAAa,SAAU,YAAW,YAAY,EAAE,SAAS;;IAarD,OAAO,CAAC,MAAM;IAZhB,OAAO,CAAC,GAAG,CAAuB;IAClC,OAAO,CAAC,GAAG,CAAC,CAAmB;IAC/B,OAAO,CAAC,GAAG,CAAC,CAAM;IAClB,OAAO,CAAC,IAAI,CAAY;IACxB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,OAAO,CAAQ;IAEvB,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGrB,MAAM,EAAE,SAAS,EACzB,YAAY,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,EAAE,eAAe,CAAA;KAAE;IAgBvG,6EAA6E;IAChE,KAAK;YAOJ,OAAO;IAMrB;;;OAGG;IACU,KAAK;IAQlB;;OAEG;IACU,IAAI;IAQV,SAAS;IAIhB,0CAA0C;IACnC,SAAS;IAIhB;;;OAGG;IACU,MAAM,CAAC,MAAM,EAAE,SAAS;IAerC;;;OAGG;IACU,GAAG;IAwBhB,qDAAqD;IAC9C,SAAS;IAKhB,sCAAsC;IACzB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;CA6CzC"}
+{"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"}

package/dest/runner.js

@@ -4,43 +4,36 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { createAztecNodeClient, createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 import { omit } from '@aztec/foundation/collection';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { createAztecNodeAdminClient } from '@aztec/stdlib/interfaces/client';
-import { makeTracedFetch, trackSpan } from '@aztec/telemetry-client';
+import { trackSpan } from '@aztec/telemetry-client';
 import { AmmBot } from './amm_bot.js';
 import { Bot } from './bot.js';
-import { getVersions } from './config.js';
 export class BotRunner {
     config;
+    wallet;
+    aztecNode;
+    telemetry;
+    aztecNodeAdmin;
+    store;
     log;
     bot;
-    pxe;
-    node;
-    nodeAdmin;
     runningPromise;
     consecutiveErrors;
     healthy;
     tracer;
-    constructor(config, dependencies){
+    constructor(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store){
         this.config = config;
+        this.wallet = wallet;
+        this.aztecNode = aztecNode;
+        this.telemetry = telemetry;
+        this.aztecNodeAdmin = aztecNodeAdmin;
+        this.store = store;
         this.log = createLogger('bot');
         this.consecutiveErrors = 0;
         this.healthy = true;
-        this.tracer = dependencies.telemetry.getTracer('Bot');
-        this.pxe = dependencies.pxe;
-        if (!dependencies.node && !config.nodeUrl) {
-            throw new Error(`Missing node URL in config or dependencies`);
-        }
-        const versions = getVersions();
-        const fetch = makeTracedFetch([
-            1,
-            2,
-            3
-        ], true);
-        this.node = dependencies.node ?? createAztecNodeClient(config.nodeUrl, versions, fetch);
-        this.nodeAdmin = dependencies.nodeAdmin ?? (config.nodeAdminUrl ? createAztecNodeAdminClient(config.nodeAdminUrl, versions, fetch) : undefined);
+        this.tracer = telemetry.getTracer('Bot');
         this.runningPromise = new RunningPromise(()=>this.#work(), this.log, config.txIntervalSeconds * 1000);
     }
     /** Initializes the bot if needed. Blocks until the bot setup is finished. */ async setup() {
@@ -70,6 +63,7 @@ export class BotRunner {
             this.log.verbose(`Stopping bot`);
             await this.runningPromise.stop();
         }
+        await this.store.close();
         this.log.info(`Stopped bot`);
     }
     isHealthy() {
@@ -130,22 +124,14 @@ export class BotRunner {
         if (!this.bot) {
             throw new Error(`Bot is not initialized`);
         }
-        const botAddress = await this.bot.then((b)=>b.wallet.getAddress());
+        const botAddress = await this.bot.then((b)=>b.defaultAccountAddress);
         return {
             botAddress
         };
     }
     async #createBot() {
         try {
-            this.bot = this.config.ammTxs ? AmmBot.create(this.config, {
-                pxe: this.pxe,
-                node: this.node,
-                nodeAdmin: this.nodeAdmin
-            }) : Bot.create(this.config, {
-                pxe: this.pxe,
-                node: this.node,
-                nodeAdmin: this.nodeAdmin
-            });
+            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);
             await this.bot;
         } catch (err) {
             this.log.error(`Error setting up bot: ${err}`);
@@ -154,7 +140,7 @@ export class BotRunner {
     }
     async #work() {
         if (this.config.maxPendingTxs > 0) {
-            const pendingTxCount = await this.node.getPendingTxCount();
+            const pendingTxCount = await this.aztecNode.getPendingTxCount();
             if (pendingTxCount >= this.config.maxPendingTxs) {
                 this.log.verbose(`Not sending bot tx since node has ${pendingTxCount} pending txs`);
                 return;

package/dest/store/bot_store.d.ts

@@ -0,0 +1,44 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { L2AmountClaim } from '@aztec/aztec.js/ethereum';
+import { type Logger } from '@aztec/foundation/log';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+export interface BridgeClaimData {
+    claim: L2AmountClaim;
+    timestamp: number;
+    recipient: string;
+}
+/**
+ * Simple data store for the bot to persist L1 bridge claims.
+ */
+export declare class BotStore {
+    private readonly store;
+    private readonly log;
+    static readonly SCHEMA_VERSION: number;
+    private readonly bridgeClaims;
+    constructor(store: AztecAsyncKVStore, log?: Logger);
+    /**
+     * Saves a bridge claim for a recipient.
+     */
+    saveBridgeClaim(recipient: AztecAddress, claim: L2AmountClaim): Promise<void>;
+    /**
+     * Gets a bridge claim for a recipient if it exists.
+     */
+    getBridgeClaim(recipient: AztecAddress): Promise<BridgeClaimData | undefined>;
+    /**
+     * Deletes a bridge claim for a recipient.
+     */
+    deleteBridgeClaim(recipient: AztecAddress): Promise<void>;
+    /**
+     * Gets all stored bridge claims.
+     */
+    getAllBridgeClaims(): Promise<BridgeClaimData[]>;
+    /**
+     * Cleans up old bridge claims (older than 24 hours).
+     */
+    cleanupOldClaims(maxAgeMs?: number): Promise<number>;
+    /**
+     * Closes the store.
+     */
+    close(): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm90X3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvYm90X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsTUFBTSxXQUFXLGVBQWU7SUFDOUIsS0FBSyxFQUFFLGFBQWEsQ0FBQztJQUNyQixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkI7QUFFRDs7R0FFRztBQUNILHFCQUFhLFFBQVE7SUFLakIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRztJQUx0QixnQkFBdUIsY0FBYyxTQUFLO0lBQzFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFnQztJQUU3RCxZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLEdBQUcsR0FBRSxNQUFrQyxFQUd6RDtJQUVEOztPQUVHO0lBQ1UsZUFBZSxDQUFDLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0J6RjtJQUVEOztPQUVHO0lBQ1UsY0FBYyxDQUFDLFNBQVMsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUMsQ0FzQnpGO0lBRUQ7O09BRUc7SUFDVSxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHckU7SUFFRDs7T0FFRztJQUNVLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQXdCNUQ7SUFFRDs7T0FFRztJQUNVLGdCQUFnQixDQUFDLFFBQVEsR0FBRSxNQUE0QixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FlckY7SUFFRDs7T0FFRztJQUNVLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2xDO0NBQ0YifQ==

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

@@ -0,0 +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,SAAK;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"}

package/dest/store/bot_store.js

@@ -0,0 +1,107 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createLogger } from '@aztec/foundation/log';
+/**
+ * Simple data store for the bot to persist L1 bridge claims.
+ */ export class BotStore {
+    store;
+    log;
+    static SCHEMA_VERSION = 1;
+    bridgeClaims;
+    constructor(store, log = createLogger('bot:store')){
+        this.store = store;
+        this.log = log;
+        this.bridgeClaims = store.openMap('bridge_claims');
+    }
+    /**
+   * Saves a bridge claim for a recipient.
+   */ async saveBridgeClaim(recipient, claim) {
+        // Convert Fr fields and BigInts to strings for JSON serialization
+        const serializableClaim = {
+            claimAmount: claim.claimAmount.toString(),
+            claimSecret: claim.claimSecret.toString(),
+            claimSecretHash: claim.claimSecretHash.toString(),
+            messageHash: claim.messageHash,
+            messageLeafIndex: claim.messageLeafIndex.toString()
+        };
+        const data = {
+            claim: serializableClaim,
+            timestamp: Date.now(),
+            recipient: recipient.toString()
+        };
+        await this.bridgeClaims.set(recipient.toString(), JSON.stringify(data));
+        this.log.info(`Saved bridge claim for ${recipient.toString()}`);
+    }
+    /**
+   * Gets a bridge claim for a recipient if it exists.
+   */ async getBridgeClaim(recipient) {
+        const data = await this.bridgeClaims.getAsync(recipient.toString());
+        if (!data) {
+            return undefined;
+        }
+        const parsed = JSON.parse(data);
+        // Reconstruct L2AmountClaim from serialized data
+        const claim = {
+            claimAmount: BigInt(parsed.claim.claimAmount),
+            claimSecret: Fr.fromString(parsed.claim.claimSecret),
+            claimSecretHash: Fr.fromString(parsed.claim.claimSecretHash),
+            messageHash: parsed.claim.messageHash,
+            messageLeafIndex: BigInt(parsed.claim.messageLeafIndex)
+        };
+        return {
+            claim,
+            timestamp: parsed.timestamp,
+            recipient: parsed.recipient
+        };
+    }
+    /**
+   * Deletes a bridge claim for a recipient.
+   */ async deleteBridgeClaim(recipient) {
+        await this.bridgeClaims.delete(recipient.toString());
+        this.log.info(`Deleted bridge claim for ${recipient.toString()}`);
+    }
+    /**
+   * Gets all stored bridge claims.
+   */ async getAllBridgeClaims() {
+        const claims = [];
+        const entries = this.bridgeClaims.entriesAsync();
+        for await (const [_, data] of entries){
+            const parsed = JSON.parse(data);
+            // Reconstruct L2AmountClaim from serialized data
+            const claim = {
+                claimAmount: BigInt(parsed.claim.claimAmount),
+                claimSecret: Fr.fromString(parsed.claim.claimSecret),
+                claimSecretHash: Fr.fromString(parsed.claim.claimSecretHash),
+                messageHash: parsed.claim.messageHash,
+                messageLeafIndex: BigInt(parsed.claim.messageLeafIndex)
+            };
+            claims.push({
+                claim,
+                timestamp: parsed.timestamp,
+                recipient: parsed.recipient
+            });
+        }
+        return claims;
+    }
+    /**
+   * Cleans up old bridge claims (older than 24 hours).
+   */ async cleanupOldClaims(maxAgeMs = 24 * 60 * 60 * 1000) {
+        const now = Date.now();
+        let cleanedCount = 0;
+        const entries = this.bridgeClaims.entriesAsync();
+        for await (const [key, data] of entries){
+            const parsed = JSON.parse(data);
+            if (now - parsed.timestamp > maxAgeMs) {
+                await this.bridgeClaims.delete(key);
+                cleanedCount++;
+                this.log.info(`Cleaned up old bridge claim for ${parsed.recipient}`);
+            }
+        }
+        return cleanedCount;
+    }
+    /**
+   * Closes the store.
+   */ async close() {
+        await this.store.close();
+        this.log.info('Closed bot data store');
+    }
+}

package/dest/store/index.d.ts

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

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

@@ -0,0 +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"}

package/dest/store/index.js

@@ -0,0 +1 @@
+export { BotStore } from './bot_store.js';

package/dest/utils.d.ts

@@ -1,4 +1,4 @@
-import type { ContractBase } from '@aztec/aztec.js';
+import { ContractBase } from '@aztec/aztec.js/contracts';
 import type { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import type { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -9,11 +9,11 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
  * @param who - Address to get the balance for.
  * @returns - Private and public token balances as bigints.
  */
-export declare function getBalances(token: TokenContract, who: AztecAddress): Promise<{
+export declare function getBalances(token: TokenContract, who: AztecAddress, from?: AztecAddress): Promise<{
     privateBalance: bigint;
     publicBalance: bigint;
 }>;
-export declare function getPrivateBalance(token: PrivateTokenContract, who: AztecAddress): Promise<bigint>;
+export declare function getPrivateBalance(token: PrivateTokenContract, who: AztecAddress, from?: AztecAddress): Promise<bigint>;
 export declare function isStandardTokenContract(token: ContractBase): token is TokenContract;
 export declare function isAMMContract(contract: ContractBase): contract is AMMContract;
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNsRixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRTs7Ozs7R0FLRztBQUNILHdCQUFzQixXQUFXLENBQy9CLEtBQUssRUFBRSxhQUFhLEVBQ3BCLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLElBQUksQ0FBQyxFQUFFLFlBQVksR0FDbEIsT0FBTyxDQUFDO0lBQUUsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUFDLGFBQWEsRUFBRSxNQUFNLENBQUE7Q0FBRSxDQUFDLENBSTVEO0FBRUQsd0JBQXNCLGlCQUFpQixDQUNyQyxLQUFLLEVBQUUsb0JBQW9CLEVBQzNCLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLElBQUksQ0FBQyxFQUFFLFlBQVksR0FDbEIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUdqQjtBQUVELHdCQUFnQix1QkFBdUIsQ0FBQyxLQUFLLEVBQUUsWUFBWSxHQUFHLEtBQUssSUFBSSxhQUFhLENBRW5GO0FBRUQsd0JBQWdCLGFBQWEsQ0FBQyxRQUFRLEVBQUUsWUFBWSxHQUFHLFFBQVEsSUFBSSxXQUFXLENBRTdFIn0=

package/dest/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAI5D;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,oBAAoB,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAGvG;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,YAAY,GAAG,KAAK,IAAI,aAAa,CAEnF;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,GAAG,QAAQ,IAAI,WAAW,CAE7E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,YAAY,EACjB,IAAI,CAAC,EAAE,YAAY,GAClB,OAAO,CAAC;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAI5D;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,oBAAoB,EAC3B,GAAG,EAAE,YAAY,EACjB,IAAI,CAAC,EAAE,YAAY,GAClB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,YAAY,GAAG,KAAK,IAAI,aAAa,CAEnF;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,GAAG,QAAQ,IAAI,WAAW,CAE7E"}

package/dest/utils.js

@@ -3,21 +3,21 @@
  * @param token - Token contract.
  * @param who - Address to get the balance for.
  * @returns - Private and public token balances as bigints.
- */ export async function getBalances(token, who) {
+ */ export async function getBalances(token, who, from) {
     const privateBalance = await token.methods.balance_of_private(who).simulate({
-        from: who
+        from: from ?? who
     });
     const publicBalance = await token.methods.balance_of_public(who).simulate({
-        from: who
+        from: from ?? who
     });
     return {
         privateBalance,
         publicBalance
     };
 }
-export async function getPrivateBalance(token, who) {
+export async function getPrivateBalance(token, who, from) {
     const privateBalance = await token.methods.get_balance(who).simulate({
-        from: who
+        from: from ?? who
     });
     return privateBalance;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.20251212",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -10,8 +10,8 @@
     "../package.common.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "bb": "node --no-warnings ./dest/bb/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
@@ -54,16 +54,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-canary.a9708bd",
-    "@aztec/aztec.js": "3.0.0-canary.a9708bd",
-    "@aztec/entrypoints": "3.0.0-canary.a9708bd",
-    "@aztec/ethereum": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/noir-contracts.js": "3.0.0-canary.a9708bd",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-canary.a9708bd",
-    "@aztec/protocol-contracts": "3.0.0-canary.a9708bd",
-    "@aztec/stdlib": "3.0.0-canary.a9708bd",
-    "@aztec/telemetry-client": "3.0.0-canary.a9708bd",
+    "@aztec/accounts": "3.0.0-devnet.20251212",
+    "@aztec/aztec.js": "3.0.0-devnet.20251212",
+    "@aztec/entrypoints": "3.0.0-devnet.20251212",
+    "@aztec/ethereum": "3.0.0-devnet.20251212",
+    "@aztec/foundation": "3.0.0-devnet.20251212",
+    "@aztec/kv-store": "3.0.0-devnet.20251212",
+    "@aztec/noir-contracts.js": "3.0.0-devnet.20251212",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.20251212",
+    "@aztec/protocol-contracts": "3.0.0-devnet.20251212",
+    "@aztec/stdlib": "3.0.0-devnet.20251212",
+    "@aztec/telemetry-client": "3.0.0-devnet.20251212",
+    "@aztec/test-wallet": "3.0.0-devnet.20251212",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"
@@ -73,6 +75,7 @@
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
     "@types/source-map-support": "^0.5.10",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",

package/src/amm_bot.ts

@@ -1,12 +1,17 @@
-import { AztecAddress, Fr, SentTx, TxReceipt, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { SentTx } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { 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, PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
 import { BotFactory } from './factory.js';
+import type { BotStore } from './store/index.js';
 
 const TRANSFER_BASE_AMOUNT = 1_000;
 const TRANSFER_VARIANCE = 200;
@@ -15,26 +20,32 @@ type Balances = { token0: bigint; token1: bigint };
 
 export class AmmBot extends BaseBot {
   protected constructor(
-    pxe: PXE,
-    wallet: Wallet,
+    node: AztecNode,
+    wallet: TestWallet,
     defaultAccountAddress: AztecAddress,
     public readonly amm: AMMContract,
     public readonly token0: TokenContract,
     public readonly token1: TokenContract,
     config: BotConfig,
   ) {
-    super(pxe, wallet, defaultAccountAddress, config);
+    super(node, wallet, defaultAccountAddress, config);
   }
 
   static async create(
     config: BotConfig,
-    dependencies: { pxe?: PXE; node?: AztecNode; nodeAdmin?: AztecNodeAdmin },
+    wallet: TestWallet,
+    aztecNode: AztecNode,
+    aztecNodeAdmin: AztecNodeAdmin | undefined,
+    store: BotStore,
   ): Promise<AmmBot> {
-    const { pxe, wallet, defaultAccountAddress, token0, token1, amm } = await new BotFactory(
+    const { defaultAccountAddress, token0, token1, amm } = await new BotFactory(
       config,
-      dependencies,
+      wallet,
+      store,
+      aztecNode,
+      aztecNodeAdmin,
     ).setupAmm();
-    return new AmmBot(pxe, wallet, defaultAccountAddress, amm, token0, token1, config);
+    return new AmmBot(aztecNode, wallet, defaultAccountAddress, amm, token0, token1, config);
   }
 
   protected async createAndSendTx(logCtx: object): Promise<SentTx> {
@@ -53,9 +64,11 @@ export class AmmBot extends BaseBot {
 
     const [tokenIn, tokenOut] = Math.random() < 0.5 ? [token0, token1] : [token1, token0];
 
-    const swapAuthwit = await wallet.createAuthWit({
+    const swapAuthwit = await wallet.createAuthWit(this.defaultAccountAddress, {
       caller: amm.address,
-      action: tokenIn.methods.transfer_to_public(this.defaultAccountAddress, amm.address, amountIn, authwitNonce),
+      call: await tokenIn.methods
+        .transfer_to_public(this.defaultAccountAddress, amm.address, amountIn, authwitNonce)
+        .getFunctionCall(),
     });
 
     const amountOutMin = await amm.methods
@@ -66,22 +79,17 @@ export class AmmBot extends BaseBot {
       )
       .simulate({ from: this.defaultAccountAddress });
 
-    const swapExactTokensInteraction = amm.methods.swap_exact_tokens_for_tokens(
-      tokenIn.address,
-      tokenOut.address,
-      amountIn,
-      amountOutMin,
-      authwitNonce,
-    );
+    const swapExactTokensInteraction = amm.methods
+      .swap_exact_tokens_for_tokens(tokenIn.address, tokenOut.address, amountIn, amountOutMin, authwitNonce)
+      .with({
+        authWitnesses: [swapAuthwit],
+      });
 
-    const opts = this.getSendMethodOpts(swapAuthwit);
-
-    this.log.verbose(`Proving transaction`, logCtx);
-    const tx = await swapExactTokensInteraction.prove(opts);
+    const opts = await this.getSendMethodOpts(swapExactTokensInteraction);
 
+    this.log.verbose(`Sending transaction`, logCtx);
     this.log.info(`Tx. Balances: ${jsonStringify(balances)}`, { ...logCtx, balances });
-
-    return tx.send();
+    return swapExactTokensInteraction.send(opts);
   }
 
   protected override async onTxMined(receipt: TxReceipt, logCtx: object): Promise<void> {
@@ -97,20 +105,20 @@ export class AmmBot extends BaseBot {
     return {
       senderPublic: await this.getPublicBalanceFor(this.defaultAccountAddress),
       senderPrivate: await this.getPrivateBalanceFor(this.defaultAccountAddress),
-      amm: await this.getPublicBalanceFor(this.amm.address),
+      amm: await this.getPublicBalanceFor(this.amm.address, this.defaultAccountAddress),
     };
   }
 
-  private async getPublicBalanceFor(address: AztecAddress): Promise<Balances> {
+  private async getPublicBalanceFor(address: AztecAddress, from?: AztecAddress): Promise<Balances> {
     return {
-      token0: await this.token0.methods.balance_of_public(address).simulate({ from: address }),
-      token1: await this.token1.methods.balance_of_public(address).simulate({ from: address }),
+      token0: await this.token0.methods.balance_of_public(address).simulate({ from: from ?? address }),
+      token1: await this.token1.methods.balance_of_public(address).simulate({ from: from ?? address }),
     };
   }
-  private async getPrivateBalanceFor(address: AztecAddress): Promise<Balances> {
+  private async getPrivateBalanceFor(address: AztecAddress, from?: AztecAddress): Promise<Balances> {
     return {
-      token0: await this.token0.methods.balance_of_private(address).simulate({ from: address }),
-      token1: await this.token1.methods.balance_of_private(address).simulate({ from: address }),
+      token0: await this.token0.methods.balance_of_private(address).simulate({ from: from ?? address }),
+      token1: await this.token1.methods.balance_of_private(address).simulate({ from: from ?? address }),
     };
   }
 }