@aztec/bot 2.1.0-rc.9 → 3.0.0-devnet.2

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 = 1;
+    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=bot_store.d.ts.map

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,KAAK;IAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;gBAG1C,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAAkC;IAK1D;;OAEG;IACU,eAAe,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB1F;;OAEG;IACU,cAAc,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAwB1F;;OAEG;IACU,iBAAiB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtE;;OAEG;IACU,kBAAkB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA0B7D;;OAEG;IACU,gBAAgB,CAAC,QAAQ,GAAE,MAA4B,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBtF;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAIpC"}

package/dest/store/bot_store.js

@@ -0,0 +1,107 @@
+import { Fr } from '@aztec/foundation/fields';
+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=index.d.ts.map

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

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": "2.1.0-rc.9",
+  "version": "3.0.0-devnet.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,16 +54,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "2.1.0-rc.9",
-    "@aztec/aztec.js": "2.1.0-rc.9",
-    "@aztec/entrypoints": "2.1.0-rc.9",
-    "@aztec/ethereum": "2.1.0-rc.9",
-    "@aztec/foundation": "2.1.0-rc.9",
-    "@aztec/noir-contracts.js": "2.1.0-rc.9",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.9",
-    "@aztec/protocol-contracts": "2.1.0-rc.9",
-    "@aztec/stdlib": "2.1.0-rc.9",
-    "@aztec/telemetry-client": "2.1.0-rc.9",
+    "@aztec/accounts": "3.0.0-devnet.2",
+    "@aztec/aztec.js": "3.0.0-devnet.2",
+    "@aztec/entrypoints": "3.0.0-devnet.2",
+    "@aztec/ethereum": "3.0.0-devnet.2",
+    "@aztec/foundation": "3.0.0-devnet.2",
+    "@aztec/kv-store": "3.0.0-devnet.2",
+    "@aztec/noir-contracts.js": "3.0.0-devnet.2",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.2",
+    "@aztec/protocol-contracts": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
+    "@aztec/telemetry-client": "3.0.0-devnet.2",
+    "@aztec/test-wallet": "3.0.0-devnet.2",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"

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 }),
     };
   }
 }

package/src/base_bot.ts

@@ -1,17 +1,16 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import {
-  AuthWitness,
-  AztecAddress,
-  FeeJuicePaymentMethod,
-  type SendMethodOptions,
+  BatchCall,
+  ContractFunctionInteraction,
+  type SendInteractionOptions,
   SentTx,
-  TxHash,
-  TxReceipt,
-  type Wallet,
-  createLogger,
   waitForProven,
-} from '@aztec/aztec.js';
+} from '@aztec/aztec.js/contracts';
+import { createLogger } from '@aztec/aztec.js/log';
+import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
 import { Gas } from '@aztec/stdlib/gas';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 
 import type { BotConfig } from './config.js';
 
@@ -22,8 +21,8 @@ export abstract class BaseBot {
   protected successes: number = 0;
 
   protected constructor(
-    public readonly pxe: PXE,
-    public readonly wallet: Wallet,
+    public readonly node: AztecNode,
+    public readonly wallet: TestWallet,
     public readonly defaultAccountAddress: AztecAddress,
     public config: BotConfig,
   ) {}
@@ -51,7 +50,7 @@ export abstract class BaseBot {
       timeout: txMinedWaitSeconds,
     });
     if (followChain === 'PROVEN') {
-      await waitForProven(this.pxe, receipt, { provenTimeout: txMinedWaitSeconds });
+      await waitForProven(this.node, receipt, { provenTimeout: txMinedWaitSeconds });
     }
     this.successes++;
     this.log.info(
@@ -71,24 +70,27 @@ export abstract class BaseBot {
     return Promise.resolve();
   }
 
-  protected getSendMethodOpts(...authWitnesses: AuthWitness[]): SendMethodOptions {
-    const { l2GasLimit, daGasLimit } = this.config;
-    const paymentMethod = new FeeJuicePaymentMethod(this.defaultAccountAddress);
+  protected async getSendMethodOpts(
+    interaction: ContractFunctionInteraction | BatchCall,
+  ): Promise<SendInteractionOptions> {
+    const { l2GasLimit, daGasLimit, baseFeePadding } = this.config;
 
-    let gasSettings, estimateGas;
+    this.wallet.setBaseFeePadding(baseFeePadding);
+
+    let gasSettings;
     if (l2GasLimit !== undefined && l2GasLimit > 0 && daGasLimit !== undefined && daGasLimit > 0) {
       gasSettings = { gasLimits: Gas.from({ l2Gas: l2GasLimit, daGas: daGasLimit }) };
-      estimateGas = false;
       this.log.verbose(`Using gas limits ${l2GasLimit} L2 gas ${daGasLimit} DA gas`);
     } else {
-      estimateGas = true;
       this.log.verbose(`Estimating gas for transaction`);
+      ({ estimatedGas: gasSettings } = await interaction.simulate({
+        fee: { estimateGas: true },
+        from: this.defaultAccountAddress,
+      }));
     }
-    const baseFeePadding = 2; // Send 3x the current base fee
     return {
       from: this.defaultAccountAddress,
-      fee: { estimateGas, paymentMethod, gasSettings, baseFeePadding },
-      authWitnesses,
+      fee: { gasSettings },
     };
   }
 }

package/src/bot.ts

@@ -1,34 +1,46 @@
-import { type AztecAddress, BatchCall, SentTx, type Wallet } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { BatchCall, SentTx } from '@aztec/aztec.js/contracts';
 import { times } from '@aztec/foundation/collection';
 import type { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
-import type { AztecNode, AztecNodeAdmin, 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';
 import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
 
 const TRANSFER_AMOUNT = 1;
 
 export class Bot extends BaseBot {
   protected constructor(
-    pxe: PXE,
-    wallet: Wallet,
+    node: AztecNode,
+    wallet: TestWallet,
     defaultAccountAddress: AztecAddress,
     public readonly token: TokenContract | PrivateTokenContract,
     public readonly recipient: AztecAddress,
     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<Bot> {
-    const { pxe, wallet, defaultAccountAddress, token, recipient } = await new BotFactory(config, dependencies).setup();
-    return new Bot(pxe, wallet, defaultAccountAddress, token, recipient, config);
+    const { defaultAccountAddress, token, recipient } = await new BotFactory(
+      config,
+      wallet,
+      store,
+      aztecNode,
+      aztecNodeAdmin,
+    ).setup();
+    return new Bot(aztecNode, wallet, defaultAccountAddress, token, recipient, config);
   }
 
   public updateConfig(config: Partial<BotConfig>) {
@@ -56,22 +68,21 @@ export class Bot extends BaseBot {
           token.methods.transfer(TRANSFER_AMOUNT, this.defaultAccountAddress, recipient),
         );
 
-    const opts = this.getSendMethodOpts();
     const batch = new BatchCall(wallet, calls);
+    const opts = await this.getSendMethodOpts(batch);
 
     this.log.verbose(`Simulating transaction with ${calls.length}`, logCtx);
     await batch.simulate({ from: this.defaultAccountAddress });
 
-    this.log.verbose(`Proving transaction`, logCtx);
-    const provenTx = await batch.prove(opts);
-    return provenTx.send();
+    this.log.verbose(`Sending transaction`, logCtx);
+    return batch.send(opts);
   }
 
   public async getBalances() {
     if (isStandardTokenContract(this.token)) {
       return {
         sender: await getBalances(this.token, this.defaultAccountAddress),
-        recipient: await getBalances(this.token, this.recipient),
+        recipient: await getBalances(this.token, this.recipient, this.defaultAccountAddress),
       };
     } else {
       return {
@@ -80,7 +91,7 @@ export class Bot extends BaseBot {
           publicBalance: 0n,
         },
         recipient: {
-          privateBalance: await getPrivateBalance(this.token, this.recipient),
+          privateBalance: await getPrivateBalance(this.token, this.recipient, this.defaultAccountAddress),
           publicBalance: 0n,
         },
       };