@aztec/bot 3.0.0-nightly.20250921 → 3.0.0-nightly.20250923

package/dest/amm_bot.d.ts

@@ -1,7 +1,8 @@
 import { AztecAddress, SentTx, TxReceipt, type Wallet } from '@aztec/aztec.js';
 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';
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
 type Balances = {
@@ -13,11 +14,7 @@ export declare class AmmBot extends BaseBot {
     readonly token0: TokenContract;
     readonly token1: TokenContract;
     protected constructor(node: AztecNode, wallet: Wallet, defaultAccountAddress: AztecAddress, amm: AMMContract, token0: TokenContract, token1: TokenContract, config: BotConfig);
-    static create(config: BotConfig, dependencies: {
-        pxe?: PXE;
-        node?: AztecNode;
-        nodeAdmin?: AztecNodeAdmin;
-    }): Promise<AmmBot>;
+    static create(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined): Promise<AmmBot>;
     protected createAndSendTx(logCtx: object): Promise<SentTx>;
     protected onTxMined(receipt: TxReceipt, logCtx: object): Promise<void>;
     getAmmBalances(): Promise<Balances>;

package/dest/amm_bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"amm_bot.d.ts","sourceRoot":"","sources":["../src/amm_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAM,MAAM,EAAE,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,qBAAa,MAAO,SAAQ,OAAO;aAKf,GAAG,EAAE,WAAW;aAChB,MAAM,EAAE,aAAa;aACrB,MAAM,EAAE,aAAa;IANvC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,qBAAqB,EAAE,YAAY,EACnB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,aAAa,EACrC,MAAM,EAAE,SAAS;WAKN,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAA;KAAE,GACxE,OAAO,CAAC,MAAM,CAAC;cAQF,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAiDvC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9E,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI7B,WAAW,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,QAAQ,CAAC;QAAC,aAAa,EAAE,QAAQ,CAAC;QAAC,GAAG,EAAE,QAAQ,CAAA;KAAE,CAAC;YAQzF,mBAAmB;YAMnB,oBAAoB;CAMnC"}
+{"version":3,"file":"amm_bot.d.ts","sourceRoot":"","sources":["../src/amm_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAM,MAAM,EAAE,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,qBAAa,MAAO,SAAQ,OAAO;aAKf,GAAG,EAAE,WAAW;aAChB,MAAM,EAAE,aAAa;aACrB,MAAM,EAAE,aAAa;IANvC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,qBAAqB,EAAE,YAAY,EACnB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,aAAa,EACrC,MAAM,EAAE,SAAS;WAKN,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,GAAG,SAAS,GACzC,OAAO,CAAC,MAAM,CAAC;cAUF,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAiDvC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9E,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI7B,WAAW,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,QAAQ,CAAC;QAAC,aAAa,EAAE,QAAQ,CAAC;QAAC,GAAG,EAAE,QAAQ,CAAA;KAAE,CAAC;YAQzF,mBAAmB;YAMnB,oBAAoB;CAMnC"}

package/dest/amm_bot.js

@@ -11,9 +11,9 @@ export class AmmBot extends BaseBot {
     constructor(node, wallet, defaultAccountAddress, amm, token0, token1, config){
         super(node, wallet, defaultAccountAddress, config), this.amm = amm, this.token0 = token0, this.token1 = token1;
     }
-    static async create(config, dependencies) {
-        const { node, wallet, defaultAccountAddress, token0, token1, amm } = await new BotFactory(config, dependencies).setupAmm();
-        return new AmmBot(node, wallet, defaultAccountAddress, amm, token0, token1, config);
+    static async create(config, wallet, aztecNode, aztecNodeAdmin) {
+        const { defaultAccountAddress, token0, token1, amm } = await new BotFactory(config, wallet, aztecNode, aztecNodeAdmin).setupAmm();
+        return new AmmBot(aztecNode, wallet, defaultAccountAddress, amm, token0, token1, config);
     }
     async createAndSendTx(logCtx) {
         const { feePaymentMethod } = this.config;

package/dest/bot.d.ts

@@ -1,18 +1,15 @@
 import { type AztecAddress, SentTx, type Wallet } from '@aztec/aztec.js';
 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';
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
 export declare class Bot extends BaseBot {
     readonly token: TokenContract | PrivateTokenContract;
     readonly recipient: AztecAddress;
     protected constructor(node: AztecNode, wallet: Wallet, defaultAccountAddress: AztecAddress, token: TokenContract | PrivateTokenContract, recipient: AztecAddress, config: BotConfig);
-    static create(config: BotConfig, dependencies: {
-        pxe?: PXE;
-        node?: AztecNode;
-        nodeAdmin?: AztecNodeAdmin;
-    }): Promise<Bot>;
+    static create(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin): Promise<Bot>;
     updateConfig(config: Partial<BotConfig>): void;
     protected createAndSendTx(logCtx: object): Promise<SentTx>;
     getBalances(): Promise<{

package/dest/bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAa,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEpF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,qBAAa,GAAI,SAAQ,OAAO;aAKZ,KAAK,EAAE,aAAa,GAAG,oBAAoB;aAC3C,SAAS,EAAE,YAAY;IALzC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,qBAAqB,EAAE,YAAY,EACnB,KAAK,EAAE,aAAa,GAAG,oBAAoB,EAC3C,SAAS,EAAE,YAAY,EACvC,MAAM,EAAE,SAAS;WAKN,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAA;KAAE,GACxE,OAAO,CAAC,GAAG,CAAC;IAQR,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;cAK9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA+BnD,WAAW;;;;;;;;;;CAmBzB"}
+{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAa,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEpF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,qBAAa,GAAI,SAAQ,OAAO;aAKZ,KAAK,EAAE,aAAa,GAAG,oBAAoB;aAC3C,SAAS,EAAE,YAAY;IALzC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,qBAAqB,EAAE,YAAY,EACnB,KAAK,EAAE,aAAa,GAAG,oBAAoB,EAC3C,SAAS,EAAE,YAAY,EACvC,MAAM,EAAE,SAAS;WAKN,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,GAAG,CAAC;IAUR,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;cAK9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA+BnD,WAAW;;;;;;;;;;CAmBzB"}

package/dest/bot.js

@@ -10,9 +10,9 @@ export class Bot extends BaseBot {
     constructor(node, wallet, defaultAccountAddress, token, recipient, config){
         super(node, wallet, defaultAccountAddress, config), this.token = token, this.recipient = recipient;
     }
-    static async create(config, dependencies) {
-        const { node, wallet, defaultAccountAddress, token, recipient } = await new BotFactory(config, dependencies).setup();
-        return new Bot(node, wallet, defaultAccountAddress, token, recipient, config);
+    static async create(config, wallet, aztecNode, aztecNodeAdmin) {
+        const { defaultAccountAddress, token, recipient } = await new BotFactory(config, wallet, aztecNode, aztecNodeAdmin).setup();
+        return new Bot(aztecNode, wallet, defaultAccountAddress, token, recipient, config);
     }
     updateConfig(config) {
         this.log.info(`Updating bot config ${Object.keys(config).join(', ')}`);

package/dest/factory.d.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, type PXE } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -7,16 +7,11 @@ import { TestWallet } from '@aztec/test-wallet';
 import { type BotConfig } from './config.js';
 export declare class BotFactory {
     private readonly config;
-    private pxe;
-    private wallet;
-    private node;
-    private nodeAdmin?;
+    private readonly wallet;
+    private readonly aztecNode;
+    private readonly aztecNodeAdmin?;
     private log;
-    constructor(config: BotConfig, dependencies: {
-        pxe?: PXE;
-        nodeAdmin?: AztecNodeAdmin;
-        node?: AztecNode;
-    });
+    constructor(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin | undefined);
     /**
      * Initializes a new bot by setting up the sender account, registering the recipient,
      * deploying the token contract, and minting tokens if necessary.

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAQZ,KAAK,GAAG,EAKT,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGjF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,aAAa,CAAC;AAMnF,qBAAa,UAAU;IAQnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAPzB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,IAAI,CAAY;IACxB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,GAAG,CAAuB;gBAGf,MAAM,EAAE,SAAS,EAClC,YAAY,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE;IAmC3E;;;OAGG;IACU,KAAK;;;;;;;IAQL,QAAQ;;;;;;;;IAwBrB;;;OAGG;YACW,YAAY;YAWZ,0BAA0B;YAkC1B,gBAAgB;IAW9B;;OAEG;YACW,iBAAiB;IAK/B;;;;OAIG;YACW,UAAU;IA+BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAYZ,gBAAgB;YAoBhB,OAAO;YA8EP,wBAAwB;IAkBtC;;;OAGG;YACW,UAAU;YAmCV,gBAAgB;YAgChB,oBAAoB;CAenC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAUb,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AAMtE,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IANlC,OAAO,CAAC,GAAG,CAAuB;gBAGf,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,EAAE,cAAc,YAAA;IAGlD;;;OAGG;IACU,KAAK;;;;;;;IAQL,QAAQ;;;;;;;;IAwBrB;;;OAGG;YACW,YAAY;YAWZ,0BAA0B;YAkC1B,gBAAgB;IAW9B;;OAEG;YACW,iBAAiB;IAK/B;;;;OAIG;YACW,UAAU;IA+BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAYZ,gBAAgB;YAoBhB,OAAO;YA8EP,wBAAwB;IAkBtC;;;OAGG;YACW,UAAU;YAmCV,gBAAgB;YAgChB,oBAAoB;CAenC"}

package/dest/factory.js

@@ -1,6 +1,6 @@
 import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { BatchCall, FeeJuicePaymentMethodWithClaim, L1FeeJuicePortalManager, createAztecNodeClient, createLogger, createPXEClient, waitForL1ToL2MessageReady } from '@aztec/aztec.js';
+import { BatchCall, FeeJuicePaymentMethodWithClaim, L1FeeJuicePortalManager, createLogger, waitForL1ToL2MessageReady } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { Timer } from '@aztec/foundation/timer';
@@ -8,53 +8,22 @@ import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
-import { makeTracedFetch } from '@aztec/telemetry-client';
-import { TestWallet } from '@aztec/test-wallet';
-import { SupportedTokenContracts, getVersions } from './config.js';
+import { SupportedTokenContracts } from './config.js';
 import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
 const MINT_BALANCE = 1e12;
 const MIN_BALANCE = 1e3;
 export class BotFactory {
     config;
-    pxe;
     wallet;
-    node;
-    nodeAdmin;
+    aztecNode;
+    aztecNodeAdmin;
     log;
-    constructor(config, dependencies){
+    constructor(config, wallet, aztecNode, aztecNodeAdmin){
         this.config = config;
+        this.wallet = wallet;
+        this.aztecNode = aztecNode;
+        this.aztecNodeAdmin = aztecNodeAdmin;
         this.log = createLogger('bot');
-        if (config.flushSetupTransactions && !dependencies.nodeAdmin) {
-            throw new Error(`Either a node admin client or node admin url must be provided if transaction flushing is requested`);
-        }
-        if (config.senderPrivateKey && config.senderPrivateKey.getValue() && !dependencies.node) {
-            throw new Error(`Either a node client or node url must be provided for bridging L1 fee juice to deploy an account with private key`);
-        }
-        if (!dependencies.pxe && !config.pxeUrl) {
-            throw new Error(`Either a PXE client or a PXE URL must be provided`);
-        }
-        this.nodeAdmin = dependencies.nodeAdmin;
-        if (dependencies.pxe) {
-            this.log.info(`Using local PXE`);
-            this.pxe = dependencies.pxe;
-        } else {
-            this.log.info(`Using remote PXE at ${config.pxeUrl}`);
-            this.pxe = createPXEClient(config.pxeUrl, getVersions(), makeTracedFetch([
-                1,
-                2,
-                3
-            ], false));
-        }
-        if (dependencies.node) {
-            this.node = dependencies.node;
-        } else {
-            this.node = createAztecNodeClient(config.nodeUrl, getVersions(), makeTracedFetch([
-                1,
-                2,
-                3
-            ], false));
-        }
-        this.wallet = new TestWallet(this.pxe, this.node);
     }
     /**
    * Initializes a new bot by setting up the sender account, registering the recipient,
@@ -68,7 +37,7 @@ export class BotFactory {
             wallet: this.wallet,
             defaultAccountAddress,
             token,
-            node: this.node,
+            node: this.aztecNode,
             recipient
         };
     }
@@ -86,7 +55,7 @@ export class BotFactory {
             amm,
             token0,
             token1,
-            node: this.node
+            node: this.aztecNode
         };
     }
     /**
@@ -111,7 +80,7 @@ export class BotFactory {
             contract: new SchnorrAccountContract(signingKey)
         };
         const accountManager = await this.wallet.createAccount(accountData);
-        const isInit = (await this.pxe.getContractMetadata(accountManager.getAddress())).isContractInitialized;
+        const isInit = (await this.wallet.getContractMetadata(accountManager.getAddress())).isContractInitialized;
         if (isInit) {
             this.log.info(`Account at ${accountManager.getAddress().toString()} already initialized`);
             const timer = new Timer();
@@ -152,7 +121,7 @@ export class BotFactory {
     /**
    * Registers the recipient for txs in the pxe.
    */ async registerRecipient() {
-        const recipient = await this.pxe.registerAccount(this.config.recipientEncryptionSecret.getValue(), Fr.ONE);
+        const recipient = await this.wallet.registerAccount(this.config.recipientEncryptionSecret.getValue(), Fr.ONE);
         return recipient.address;
     }
     /**
@@ -177,7 +146,7 @@ export class BotFactory {
             throw new Error(`Unsupported token contract type: ${this.config.contract}`);
         }
         const address = (await deploy.getInstance(deployOpts)).address;
-        if ((await this.pxe.getContractMetadata(address)).isContractPublished) {
+        if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
             this.log.info(`Token at ${address.toString()} already deployed`);
             return deploy.register();
         } else {
@@ -278,7 +247,7 @@ export class BotFactory {
     }
     async registerOrDeployContract(name, deploy, deployOpts) {
         const address = (await deploy.getInstance(deployOpts)).address;
-        if ((await this.pxe.getContractMetadata(address)).isContractPublished) {
+        if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
             this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
             return deploy.register();
         } else {
@@ -334,13 +303,13 @@ export class BotFactory {
         if (!mnemonicOrPrivateKey) {
             throw new Error('Either a mnemonic or private key of an L1 account is required to bridge the fee juice to fund the deployment of the account.');
         }
-        const { l1ChainId } = await this.node.getNodeInfo();
+        const { l1ChainId } = await this.aztecNode.getNodeInfo();
         const chain = createEthereumChain(l1RpcUrls, l1ChainId);
         const extendedClient = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
-        const portal = await L1FeeJuicePortalManager.new(this.node, extendedClient, this.log);
+        const portal = await L1FeeJuicePortalManager.new(this.aztecNode, extendedClient, this.log);
         const mintAmount = await portal.getTokenManager().getMintAmount();
         const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true);
-        await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.node, Fr.fromHexString(claim.messageHash), {
+        await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(claim.messageHash), {
                 timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
                 forPublicConsumption: false
             }));
@@ -348,20 +317,20 @@ export class BotFactory {
         return claim;
     }
     async withNoMinTxsPerBlock(fn) {
-        if (!this.nodeAdmin || !this.config.flushSetupTransactions) {
+        if (!this.aztecNodeAdmin || !this.config.flushSetupTransactions) {
             this.log.verbose(`No node admin client or flushing not requested (not setting minTxsPerBlock to 0)`);
             return fn();
         }
-        const { minTxsPerBlock } = await this.nodeAdmin.getConfig();
+        const { minTxsPerBlock } = await this.aztecNodeAdmin.getConfig();
         this.log.warn(`Setting sequencer minTxsPerBlock to 0 from ${minTxsPerBlock} to flush setup transactions`);
-        await this.nodeAdmin.setConfig({
+        await this.aztecNodeAdmin.setConfig({
             minTxsPerBlock: 0
         });
         try {
             return await fn();
         } finally{
             this.log.warn(`Restoring sequencer minTxsPerBlock to ${minTxsPerBlock}`);
-            await this.nodeAdmin.setConfig({
+            await this.aztecNodeAdmin.setConfig({
                 minTxsPerBlock
             });
         }

package/dest/runner.d.ts

@@ -1,26 +1,23 @@
 import { type AztecNode } from '@aztec/aztec.js';
-import { type AztecNodeAdmin, type PXE } from '@aztec/stdlib/interfaces/client';
+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';
+import type { BotConfig } from './config.js';
 import type { BotInfo, BotRunnerApi } from './interface.js';
 export declare class BotRunner implements BotRunnerApi, Traceable {
     #private;
     private config;
+    private readonly wallet;
+    private readonly aztecNode;
+    private readonly telemetry;
+    private readonly aztecNodeAdmin?;
     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);
     /** Initializes the bot if needed. Blocks until the bot setup is finished. */
     setup(): Promise<void>;
     private doSetup;

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,EAAuC,MAAM,iBAAiB,CAAC;AAGtF,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,GAAG,EAA8B,MAAM,iCAAiC,CAAC;AAC5G,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;IAevG,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":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,iBAAiB,CAAC;AAG/D,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,oBAAoB,CAAC;AAKrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE5D,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,CAAC;IAblC,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;gBAGrB,MAAM,EAAE,SAAS,EACR,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,CAAC,EAAE,cAAc,YAAA;IAOlD,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"}

package/dest/runner.js

@@ -4,42 +4,34 @@ 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';
 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;
     log;
     bot;
-    pxe;
-    node;
-    nodeAdmin;
     runningPromise;
     consecutiveErrors;
     healthy;
     tracer;
-    constructor(config, dependencies){
+    constructor(config, wallet, aztecNode, telemetry, aztecNodeAdmin){
         this.config = config;
+        this.wallet = wallet;
+        this.aztecNode = aztecNode;
+        this.telemetry = telemetry;
+        this.aztecNodeAdmin = aztecNodeAdmin;
         this.log = createLogger('bot');
         this.consecutiveErrors = 0;
         this.healthy = true;
-        this.tracer = dependencies.telemetry.getTracer('Bot');
-        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() {
@@ -136,15 +128,7 @@ export class BotRunner {
     }
     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) : Bot.create(this.config, this.wallet, this.aztecNode);
             await this.bot;
         } catch (err) {
             this.log.error(`Error setting up bot: ${err}`);
@@ -153,7 +137,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "3.0.0-nightly.20250921",
+  "version": "3.0.0-nightly.20250923",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,17 +54,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250921",
-    "@aztec/aztec.js": "3.0.0-nightly.20250921",
-    "@aztec/entrypoints": "3.0.0-nightly.20250921",
-    "@aztec/ethereum": "3.0.0-nightly.20250921",
-    "@aztec/foundation": "3.0.0-nightly.20250921",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250921",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250921",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250921",
-    "@aztec/stdlib": "3.0.0-nightly.20250921",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250921",
-    "@aztec/test-wallet": "3.0.0-nightly.20250921",
+    "@aztec/accounts": "3.0.0-nightly.20250923",
+    "@aztec/aztec.js": "3.0.0-nightly.20250923",
+    "@aztec/entrypoints": "3.0.0-nightly.20250923",
+    "@aztec/ethereum": "3.0.0-nightly.20250923",
+    "@aztec/foundation": "3.0.0-nightly.20250923",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250923",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250923",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250923",
+    "@aztec/stdlib": "3.0.0-nightly.20250923",
+    "@aztec/telemetry-client": "3.0.0-nightly.20250923",
+    "@aztec/test-wallet": "3.0.0-nightly.20250923",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"

package/src/amm_bot.ts

@@ -2,7 +2,8 @@ import { AztecAddress, Fr, SentTx, TxReceipt, type Wallet } from '@aztec/aztec.j
 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';
 
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
@@ -28,13 +29,17 @@ export class AmmBot extends BaseBot {
 
   static async create(
     config: BotConfig,
-    dependencies: { pxe?: PXE; node?: AztecNode; nodeAdmin?: AztecNodeAdmin },
+    wallet: TestWallet,
+    aztecNode: AztecNode,
+    aztecNodeAdmin: AztecNodeAdmin | undefined,
   ): Promise<AmmBot> {
-    const { node, wallet, defaultAccountAddress, token0, token1, amm } = await new BotFactory(
+    const { defaultAccountAddress, token0, token1, amm } = await new BotFactory(
       config,
-      dependencies,
+      wallet,
+      aztecNode,
+      aztecNodeAdmin,
     ).setupAmm();
-    return new AmmBot(node, wallet, defaultAccountAddress, amm, token0, token1, config);
+    return new AmmBot(aztecNode, wallet, defaultAccountAddress, amm, token0, token1, config);
   }
 
   protected async createAndSendTx(logCtx: object): Promise<SentTx> {

package/src/bot.ts

@@ -2,7 +2,8 @@ import { type AztecAddress, BatchCall, SentTx, type Wallet } from '@aztec/aztec.
 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';
 
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
@@ -25,13 +26,17 @@ export class Bot extends BaseBot {
 
   static async create(
     config: BotConfig,
-    dependencies: { pxe?: PXE; node?: AztecNode; nodeAdmin?: AztecNodeAdmin },
+    wallet: TestWallet,
+    aztecNode: AztecNode,
+    aztecNodeAdmin?: AztecNodeAdmin,
   ): Promise<Bot> {
-    const { node, wallet, defaultAccountAddress, token, recipient } = await new BotFactory(
+    const { defaultAccountAddress, token, recipient } = await new BotFactory(
       config,
-      dependencies,
+      wallet,
+      aztecNode,
+      aztecNodeAdmin,
     ).setup();
-    return new Bot(node, wallet, defaultAccountAddress, token, recipient, config);
+    return new Bot(aztecNode, wallet, defaultAccountAddress, token, recipient, config);
   }
 
   public updateConfig(config: Partial<BotConfig>) {

package/src/factory.ts

@@ -9,10 +9,7 @@ import {
   type DeployOptions,
   FeeJuicePaymentMethodWithClaim,
   L1FeeJuicePortalManager,
-  type PXE,
-  createAztecNodeClient,
   createLogger,
-  createPXEClient,
   waitForL1ToL2MessageReady,
 } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
@@ -23,58 +20,23 @@ import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
-import { makeTracedFetch } from '@aztec/telemetry-client';
 import { TestWallet } from '@aztec/test-wallet';
 
-import { type BotConfig, SupportedTokenContracts, getVersions } from './config.js';
+import { type BotConfig, SupportedTokenContracts } from './config.js';
 import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
 
 const MINT_BALANCE = 1e12;
 const MIN_BALANCE = 1e3;
 
 export class BotFactory {
-  private pxe: PXE;
-  private wallet: TestWallet;
-  private node: AztecNode;
-  private nodeAdmin?: AztecNodeAdmin;
   private log = createLogger('bot');
 
   constructor(
     private readonly config: BotConfig,
-    dependencies: { pxe?: PXE; nodeAdmin?: AztecNodeAdmin; node?: AztecNode },
-  ) {
-    if (config.flushSetupTransactions && !dependencies.nodeAdmin) {
-      throw new Error(
-        `Either a node admin client or node admin url must be provided if transaction flushing is requested`,
-      );
-    }
-    if (config.senderPrivateKey && config.senderPrivateKey.getValue() && !dependencies.node) {
-      throw new Error(
-        `Either a node client or node url must be provided for bridging L1 fee juice to deploy an account with private key`,
-      );
-    }
-    if (!dependencies.pxe && !config.pxeUrl) {
-      throw new Error(`Either a PXE client or a PXE URL must be provided`);
-    }
-
-    this.nodeAdmin = dependencies.nodeAdmin;
-
-    if (dependencies.pxe) {
-      this.log.info(`Using local PXE`);
-      this.pxe = dependencies.pxe;
-    } else {
-      this.log.info(`Using remote PXE at ${config.pxeUrl!}`);
-      this.pxe = createPXEClient(config.pxeUrl!, getVersions(), makeTracedFetch([1, 2, 3], false));
-    }
-
-    if (dependencies.node) {
-      this.node = dependencies.node;
-    } else {
-      this.node = createAztecNodeClient(config.nodeUrl!, getVersions(), makeTracedFetch([1, 2, 3], false));
-    }
-
-    this.wallet = new TestWallet(this.pxe, this.node);
-  }
+    private readonly wallet: TestWallet,
+    private readonly aztecNode: AztecNode,
+    private readonly aztecNodeAdmin?: AztecNodeAdmin,
+  ) {}
 
   /**
    * Initializes a new bot by setting up the sender account, registering the recipient,
@@ -85,7 +47,7 @@ export class BotFactory {
     const defaultAccountAddress = await this.setupAccount();
     const token = await this.setupToken(defaultAccountAddress);
     await this.mintTokens(token, defaultAccountAddress);
-    return { wallet: this.wallet, defaultAccountAddress, token, node: this.node, recipient };
+    return { wallet: this.wallet, defaultAccountAddress, token, node: this.aztecNode, recipient };
   }
 
   public async setupAmm() {
@@ -109,7 +71,7 @@ export class BotFactory {
     await this.fundAmm(defaultAccountAddress, defaultAccountAddress, amm, token0, token1, liquidityToken);
     this.log.info(`AMM initialized and funded`);
 
-    return { wallet: this.wallet, defaultAccountAddress, amm, token0, token1, node: this.node };
+    return { wallet: this.wallet, defaultAccountAddress, amm, token0, token1, node: this.aztecNode };
   }
 
   /**
@@ -136,7 +98,7 @@ export class BotFactory {
       contract: new SchnorrAccountContract(signingKey!),
     };
     const accountManager = await this.wallet.createAccount(accountData);
-    const isInit = (await this.pxe.getContractMetadata(accountManager.getAddress())).isContractInitialized;
+    const isInit = (await this.wallet.getContractMetadata(accountManager.getAddress())).isContractInitialized;
     if (isInit) {
       this.log.info(`Account at ${accountManager.getAddress().toString()} already initialized`);
       const timer = new Timer();
@@ -176,7 +138,7 @@ export class BotFactory {
    * Registers the recipient for txs in the pxe.
    */
   private async registerRecipient() {
-    const recipient = await this.pxe.registerAccount(this.config.recipientEncryptionSecret.getValue(), Fr.ONE);
+    const recipient = await this.wallet.registerAccount(this.config.recipientEncryptionSecret.getValue(), Fr.ONE);
     return recipient.address;
   }
 
@@ -204,7 +166,7 @@ export class BotFactory {
     }
 
     const address = (await deploy.getInstance(deployOpts)).address;
-    if ((await this.pxe.getContractMetadata(address)).isContractPublished) {
+    if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
       this.log.info(`Token at ${address.toString()} already deployed`);
       return deploy.register();
     } else {
@@ -337,7 +299,7 @@ export class BotFactory {
     deployOpts: DeployOptions,
   ): Promise<T> {
     const address = (await deploy.getInstance(deployOpts)).address;
-    if ((await this.pxe.getContractMetadata(address)).isContractPublished) {
+    if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
       this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
       return deploy.register();
     } else {
@@ -400,16 +362,16 @@ export class BotFactory {
       );
     }
 
-    const { l1ChainId } = await this.node.getNodeInfo();
+    const { l1ChainId } = await this.aztecNode.getNodeInfo();
     const chain = createEthereumChain(l1RpcUrls, l1ChainId);
     const extendedClient = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
-    const portal = await L1FeeJuicePortalManager.new(this.node, extendedClient, this.log);
+    const portal = await L1FeeJuicePortalManager.new(this.aztecNode, extendedClient, this.log);
     const mintAmount = await portal.getTokenManager().getMintAmount();
     const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true /* mint */);
 
     await this.withNoMinTxsPerBlock(() =>
-      waitForL1ToL2MessageReady(this.node, Fr.fromHexString(claim.messageHash), {
+      waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(claim.messageHash), {
         timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
         forPublicConsumption: false,
       }),
@@ -421,18 +383,18 @@ export class BotFactory {
   }
 
   private async withNoMinTxsPerBlock<T>(fn: () => Promise<T>): Promise<T> {
-    if (!this.nodeAdmin || !this.config.flushSetupTransactions) {
+    if (!this.aztecNodeAdmin || !this.config.flushSetupTransactions) {
       this.log.verbose(`No node admin client or flushing not requested (not setting minTxsPerBlock to 0)`);
       return fn();
     }
-    const { minTxsPerBlock } = await this.nodeAdmin.getConfig();
+    const { minTxsPerBlock } = await this.aztecNodeAdmin.getConfig();
     this.log.warn(`Setting sequencer minTxsPerBlock to 0 from ${minTxsPerBlock} to flush setup transactions`);
-    await this.nodeAdmin.setConfig({ minTxsPerBlock: 0 });
+    await this.aztecNodeAdmin.setConfig({ minTxsPerBlock: 0 });
     try {
       return await fn();
     } finally {
       this.log.warn(`Restoring sequencer minTxsPerBlock to ${minTxsPerBlock}`);
-      await this.nodeAdmin.setConfig({ minTxsPerBlock });
+      await this.aztecNodeAdmin.setConfig({ minTxsPerBlock });
     }
   }
 }

package/src/runner.ts

@@ -1,21 +1,19 @@
-import { type AztecNode, createAztecNodeClient, createLogger } from '@aztec/aztec.js';
+import { type AztecNode, createLogger } from '@aztec/aztec.js';
 import { omit } from '@aztec/foundation/collection';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { type AztecNodeAdmin, type PXE, createAztecNodeAdminClient } from '@aztec/stdlib/interfaces/client';
-import { type TelemetryClient, type Traceable, type Tracer, makeTracedFetch, trackSpan } from '@aztec/telemetry-client';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import { type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
+import type { TestWallet } from '@aztec/test-wallet';
 
 import { AmmBot } from './amm_bot.js';
 import type { BaseBot } from './base_bot.js';
 import { Bot } from './bot.js';
-import { type BotConfig, getVersions } from './config.js';
+import type { BotConfig } from './config.js';
 import type { BotInfo, BotRunnerApi } from './interface.js';
 
 export class BotRunner implements BotRunnerApi, Traceable {
   private log = createLogger('bot');
   private bot?: Promise<BaseBot>;
-  private pxe?: PXE;
-  private node: AztecNode;
-  private nodeAdmin?: AztecNodeAdmin;
   private runningPromise: RunningPromise;
   private consecutiveErrors = 0;
   private healthy = true;
@@ -24,18 +22,13 @@ export class BotRunner implements BotRunnerApi, Traceable {
 
   public constructor(
     private config: BotConfig,
-    dependencies: { pxe?: PXE; node?: AztecNode; nodeAdmin?: AztecNodeAdmin; telemetry: TelemetryClient },
+    private readonly wallet: TestWallet,
+    private readonly aztecNode: AztecNode,
+    private readonly telemetry: TelemetryClient,
+    private readonly aztecNodeAdmin?: AztecNodeAdmin,
   ) {
-    this.tracer = dependencies.telemetry.getTracer('Bot');
-    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);
   }
 
@@ -150,8 +143,8 @@ export class BotRunner implements BotRunnerApi, Traceable {
   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 });
+        ? AmmBot.create(this.config, this.wallet, this.aztecNode, this.aztecNodeAdmin)
+        : Bot.create(this.config, this.wallet, this.aztecNode);
       await this.bot;
     } catch (err) {
       this.log.error(`Error setting up bot: ${err}`);
@@ -162,7 +155,7 @@ export class BotRunner implements BotRunnerApi, Traceable {
   @trackSpan('Bot.work')
   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;