@aztec/bot 0.0.1-fake-ceab37513c → 0.0.2-commit.217f559981

package/dest/store/bot_store.js

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

package/dest/store/index.d.ts

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

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,KAAK,oBAAoB,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": "0.0.1-fake-ceab37513c",
+  "version": "0.0.2-commit.217f559981",
   "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,18 +54,23 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-fake-ceab37513c",
-    "@aztec/aztec.js": "0.0.1-fake-ceab37513c",
-    "@aztec/entrypoints": "0.0.1-fake-ceab37513c",
-    "@aztec/ethereum": "0.0.1-fake-ceab37513c",
-    "@aztec/foundation": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-contracts.js": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-fake-ceab37513c",
-    "@aztec/protocol-contracts": "0.0.1-fake-ceab37513c",
-    "@aztec/stdlib": "0.0.1-fake-ceab37513c",
-    "@aztec/telemetry-client": "0.0.1-fake-ceab37513c",
+    "@aztec/accounts": "0.0.2-commit.217f559981",
+    "@aztec/aztec.js": "0.0.2-commit.217f559981",
+    "@aztec/entrypoints": "0.0.2-commit.217f559981",
+    "@aztec/ethereum": "0.0.2-commit.217f559981",
+    "@aztec/foundation": "0.0.2-commit.217f559981",
+    "@aztec/kv-store": "0.0.2-commit.217f559981",
+    "@aztec/l1-artifacts": "0.0.2-commit.217f559981",
+    "@aztec/noir-contracts.js": "0.0.2-commit.217f559981",
+    "@aztec/noir-protocol-circuits-types": "0.0.2-commit.217f559981",
+    "@aztec/noir-test-contracts.js": "0.0.2-commit.217f559981",
+    "@aztec/protocol-contracts": "0.0.2-commit.217f559981",
+    "@aztec/stdlib": "0.0.2-commit.217f559981",
+    "@aztec/telemetry-client": "0.0.2-commit.217f559981",
+    "@aztec/wallets": "0.0.2-commit.217f559981",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
+    "viem": "npm:@aztec/viem@2.38.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -73,6 +78,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.20260113.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 { NO_WAIT } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { TxHash, TxReceipt } from '@aztec/aztec.js/tx';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
-import type { AztecNode, AztecNodeAdmin, PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
 import { BotFactory } from './factory.js';
+import type { BotStore } from './store/index.js';
 
 const TRANSFER_BASE_AMOUNT = 1_000;
 const TRANSFER_VARIANCE = 200;
@@ -15,29 +20,35 @@ type Balances = { token0: bigint; token1: bigint };
 
 export class AmmBot extends BaseBot {
   protected constructor(
-    pxe: PXE,
-    wallet: Wallet,
+    node: AztecNode,
+    wallet: EmbeddedWallet,
     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: EmbeddedWallet,
+    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> {
+  protected async createAndSendTx(logCtx: object): Promise<TxHash> {
     const { feePaymentMethod } = this.config;
     const { wallet, amm, token0, token1 } = this;
 
@@ -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, wait: NO_WAIT });
   }
 
   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,11 @@
-import {
-  AuthWitness,
-  AztecAddress,
-  FeeJuicePaymentMethod,
-  type SendMethodOptions,
-  SentTx,
-  TxHash,
-  TxReceipt,
-  type Wallet,
-  createLogger,
-  waitForProven,
-} from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { BatchCall, ContractFunctionInteraction, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
+import { createLogger } from '@aztec/aztec.js/log';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { TxHash, TxReceipt, TxStatus } 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 { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import type { BotConfig } from './config.js';
 
@@ -22,37 +16,28 @@ 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: EmbeddedWallet,
     public readonly defaultAccountAddress: AztecAddress,
     public config: BotConfig,
   ) {}
 
   public async run(): Promise<TxReceipt | TxHash> {
     this.attempts++;
-    const logCtx = { runId: Date.now() * 1000 + Math.floor(Math.random() * 1000) };
     const { followChain, txMinedWaitSeconds } = this.config;
+    const logCtx = { runId: Date.now() * 1000 + Math.floor(Math.random() * 1000), followChain, txMinedWaitSeconds };
 
     this.log.verbose(`Creating tx`, logCtx);
-    const tx = await this.createAndSendTx(logCtx);
-
-    const txHash = await tx.getTxHash();
+    const txHash = await this.createAndSendTx(logCtx);
 
     if (followChain === 'NONE') {
       this.log.info(`Transaction ${txHash.toString()} sent, not waiting for it to be mined`);
       return txHash;
     }
 
-    this.log.verbose(
-      `Awaiting tx ${txHash.toString()} to be on the ${followChain} chain (timeout ${txMinedWaitSeconds}s)`,
-      logCtx,
-    );
-    const receipt = await tx.wait({
-      timeout: txMinedWaitSeconds,
-    });
-    if (followChain === 'PROVEN') {
-      await waitForProven(this.pxe, receipt, { provenTimeout: txMinedWaitSeconds });
-    }
+    const waitForStatus = TxStatus[followChain];
+    this.log.verbose(`Awaiting tx ${txHash.toString()} to be on the ${followChain} chain`, logCtx);
+    const receipt = await waitForTx(this.node, txHash, { timeout: txMinedWaitSeconds, waitForStatus });
     this.successes++;
     this.log.info(
       `Tx #${this.attempts} ${receipt.txHash} successfully mined in block ${receipt.blockNumber} (stats: ${this.successes}/${this.attempts} success)`,
@@ -64,31 +49,34 @@ export abstract class BaseBot {
     return receipt;
   }
 
-  protected abstract createAndSendTx(logCtx: object): Promise<SentTx>;
+  protected abstract createAndSendTx(logCtx: object): Promise<TxHash>;
 
   protected onTxMined(_receipt: TxReceipt, _logCtx: object): Promise<void> {
     // no-op
     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, minFeePadding } = this.config;
+
+    this.wallet.setMinFeePadding(minFeePadding);
 
-    let gasSettings, estimateGas;
+    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,47 @@
-import { type AztecAddress, BatchCall, SentTx, type Wallet } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
+import { TxHash } from '@aztec/aztec.js/tx';
 import { times } from '@aztec/foundation/collection';
 import type { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
-import type { AztecNode, AztecNodeAdmin, PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
 import { 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: EmbeddedWallet,
     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: EmbeddedWallet,
+    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>) {
@@ -36,7 +49,7 @@ export class Bot extends BaseBot {
     this.config = { ...this.config, ...config };
   }
 
-  protected async createAndSendTx(logCtx: object): Promise<SentTx> {
+  protected async createAndSendTx(logCtx: object): Promise<TxHash> {
     const { privateTransfersPerTx, publicTransfersPerTx, feePaymentMethod } = this.config;
     const { token, recipient, wallet } = this;
 
@@ -56,15 +69,14 @@ 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, wait: NO_WAIT });
   }
 
   public async getBalances() {