@aztec/bot 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/amm_bot.d.ts

@@ -0,0 +1,33 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { SentTx } from '@aztec/aztec.js/contracts';
+import { TxReceipt } from '@aztec/aztec.js/tx';
+import type { AMMContract } from '@aztec/noir-contracts.js/AMM';
+import type { TokenContract } from '@aztec/noir-contracts.js/Token';
+import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
+import { BaseBot } from './base_bot.js';
+import type { BotConfig } from './config.js';
+import type { BotStore } from './store/index.js';
+type Balances = {
+    token0: bigint;
+    token1: bigint;
+};
+export declare class AmmBot extends BaseBot {
+    readonly amm: AMMContract;
+    readonly token0: TokenContract;
+    readonly token1: TokenContract;
+    protected constructor(node: AztecNode, wallet: TestWallet, defaultAccountAddress: AztecAddress, amm: AMMContract, token0: TokenContract, token1: TokenContract, config: BotConfig);
+    static create(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore): Promise<AmmBot>;
+    protected createAndSendTx(logCtx: object): Promise<SentTx>;
+    protected onTxMined(receipt: TxReceipt, logCtx: object): Promise<void>;
+    getAmmBalances(): Promise<Balances>;
+    getBalances(): Promise<{
+        senderPublic: Balances;
+        senderPrivate: Balances;
+        amm: Balances;
+    }>;
+    private getPublicBalanceFor;
+    private getPrivateBalanceFor;
+}
+export {};
+//# sourceMappingURL=amm_bot.d.ts.map

package/dest/amm_bot.d.ts.map

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

package/dest/amm_bot.js

@@ -0,0 +1,97 @@
+import { Fr } from '@aztec/aztec.js/fields';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { BaseBot } from './base_bot.js';
+import { BotFactory } from './factory.js';
+const TRANSFER_BASE_AMOUNT = 1_000;
+const TRANSFER_VARIANCE = 200;
+export class AmmBot extends BaseBot {
+    amm;
+    token0;
+    token1;
+    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, wallet, aztecNode, aztecNodeAdmin, store) {
+        const { defaultAccountAddress, token0, token1, amm } = await new BotFactory(config, wallet, store, aztecNode, aztecNodeAdmin).setupAmm();
+        return new AmmBot(aztecNode, wallet, defaultAccountAddress, amm, token0, token1, config);
+    }
+    async createAndSendTx(logCtx) {
+        const { feePaymentMethod } = this.config;
+        const { wallet, amm, token0, token1 } = this;
+        const balances = this.getBalances();
+        this.log.info(`Preparing tx with ${feePaymentMethod} fee to swap tokens. Balances: ${jsonStringify(balances)}`, {
+            ...logCtx,
+            balances
+        });
+        // 1000 ± 200
+        const amountIn = Math.floor(TRANSFER_BASE_AMOUNT + (Math.random() - 0.5) * TRANSFER_VARIANCE);
+        const authwitNonce = Fr.random();
+        const [tokenIn, tokenOut] = Math.random() < 0.5 ? [
+            token0,
+            token1
+        ] : [
+            token1,
+            token0
+        ];
+        const swapAuthwit = await wallet.createAuthWit(this.defaultAccountAddress, {
+            caller: amm.address,
+            call: await tokenIn.methods.transfer_to_public(this.defaultAccountAddress, amm.address, amountIn, authwitNonce).getFunctionCall()
+        });
+        const amountOutMin = await amm.methods.get_amount_out_for_exact_in(await tokenIn.methods.balance_of_public(amm.address).simulate({
+            from: this.defaultAccountAddress
+        }), await tokenOut.methods.balance_of_public(amm.address).simulate({
+            from: this.defaultAccountAddress
+        }), amountIn).simulate({
+            from: this.defaultAccountAddress
+        });
+        const swapExactTokensInteraction = amm.methods.swap_exact_tokens_for_tokens(tokenIn.address, tokenOut.address, amountIn, amountOutMin, authwitNonce).with({
+            authWitnesses: [
+                swapAuthwit
+            ]
+        });
+        const opts = await this.getSendMethodOpts(swapExactTokensInteraction);
+        this.log.verbose(`Sending transaction`, logCtx);
+        this.log.info(`Tx. Balances: ${jsonStringify(balances)}`, {
+            ...logCtx,
+            balances
+        });
+        return swapExactTokensInteraction.send(opts);
+    }
+    async onTxMined(receipt, logCtx) {
+        const balances = await this.getBalances();
+        this.log.info(`Balances after swap in tx ${receipt.txHash}: ${jsonStringify(balances)}`, {
+            ...logCtx,
+            balances
+        });
+    }
+    getAmmBalances() {
+        return this.getPublicBalanceFor(this.amm.address);
+    }
+    async getBalances() {
+        return {
+            senderPublic: await this.getPublicBalanceFor(this.defaultAccountAddress),
+            senderPrivate: await this.getPrivateBalanceFor(this.defaultAccountAddress),
+            amm: await this.getPublicBalanceFor(this.amm.address, this.defaultAccountAddress)
+        };
+    }
+    async getPublicBalanceFor(address, from) {
+        return {
+            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
+            })
+        };
+    }
+    async getPrivateBalanceFor(address, from) {
+        return {
+            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/dest/base_bot.d.ts

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

package/dest/base_bot.d.ts.map

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

package/dest/base_bot.js

@@ -0,0 +1,80 @@
+import { waitForProven } from '@aztec/aztec.js/contracts';
+import { createLogger } from '@aztec/aztec.js/log';
+import { Gas } from '@aztec/stdlib/gas';
+export class BaseBot {
+    node;
+    wallet;
+    defaultAccountAddress;
+    config;
+    log;
+    attempts;
+    successes;
+    constructor(node, wallet, defaultAccountAddress, config){
+        this.node = node;
+        this.wallet = wallet;
+        this.defaultAccountAddress = defaultAccountAddress;
+        this.config = config;
+        this.log = createLogger('bot');
+        this.attempts = 0;
+        this.successes = 0;
+    }
+    async run() {
+        this.attempts++;
+        const logCtx = {
+            runId: Date.now() * 1000 + Math.floor(Math.random() * 1000)
+        };
+        const { followChain, txMinedWaitSeconds } = this.config;
+        this.log.verbose(`Creating tx`, logCtx);
+        const tx = await this.createAndSendTx(logCtx);
+        const txHash = await tx.getTxHash();
+        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.node, receipt, {
+                provenTimeout: txMinedWaitSeconds
+            });
+        }
+        this.successes++;
+        this.log.info(`Tx #${this.attempts} ${receipt.txHash} successfully mined in block ${receipt.blockNumber} (stats: ${this.successes}/${this.attempts} success)`, logCtx);
+        await this.onTxMined(receipt, logCtx);
+        return receipt;
+    }
+    onTxMined(_receipt, _logCtx) {
+        // no-op
+        return Promise.resolve();
+    }
+    async getSendMethodOpts(interaction) {
+        const { l2GasLimit, daGasLimit, baseFeePadding } = this.config;
+        this.wallet.setBaseFeePadding(baseFeePadding);
+        let gasSettings;
+        if (l2GasLimit !== undefined && l2GasLimit > 0 && daGasLimit !== undefined && daGasLimit > 0) {
+            gasSettings = {
+                gasLimits: Gas.from({
+                    l2Gas: l2GasLimit,
+                    daGas: daGasLimit
+                })
+            };
+            this.log.verbose(`Using gas limits ${l2GasLimit} L2 gas ${daGasLimit} DA gas`);
+        } else {
+            this.log.verbose(`Estimating gas for transaction`);
+            ({ estimatedGas: gasSettings } = await interaction.simulate({
+                fee: {
+                    estimateGas: true
+                },
+                from: this.defaultAccountAddress
+            }));
+        }
+        return {
+            from: this.defaultAccountAddress,
+            fee: {
+                gasSettings
+            }
+        };
+    }
+}

package/dest/bot.d.ts

@@ -1,23 +1,19 @@
-import { type AztecAddress, type Wallet } from '@aztec/aztec.js';
-import type { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { SentTx } from '@aztec/aztec.js/contracts';
+import type { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
-import type { AztecNode, 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';
-export declare class Bot {
-    readonly wallet: Wallet;
-    readonly token: TokenContract | EasyPrivateTokenContract;
+import type { BotStore } from './store/index.js';
+export declare class Bot extends BaseBot {
+    readonly token: TokenContract | PrivateTokenContract;
     readonly recipient: AztecAddress;
-    config: BotConfig;
-    private log;
-    private attempts;
-    private successes;
-    protected constructor(wallet: Wallet, token: TokenContract | EasyPrivateTokenContract, recipient: AztecAddress, config: BotConfig);
-    static create(config: BotConfig, dependencies?: {
-        pxe?: PXE;
-        node?: AztecNode;
-    }): Promise<Bot>;
+    protected constructor(node: AztecNode, wallet: TestWallet, defaultAccountAddress: AztecAddress, token: TokenContract | PrivateTokenContract, recipient: AztecAddress, config: BotConfig);
+    static create(config: BotConfig, wallet: TestWallet, aztecNode: AztecNode, aztecNodeAdmin: AztecNodeAdmin | undefined, store: BotStore): Promise<Bot>;
     updateConfig(config: Partial<BotConfig>): void;
-    run(): Promise<void>;
+    protected createAndSendTx(logCtx: object): Promise<SentTx>;
     getBalances(): Promise<{
         sender: {
             privateBalance: bigint;
@@ -28,6 +24,5 @@ export declare class Bot {
             publicBalance: bigint;
         };
     }>;
-    private getSendMethodOpts;
 }
 //# sourceMappingURL=bot.d.ts.map

package/dest/bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAIjB,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,qBAAa,GAAG;aAOI,MAAM,EAAE,MAAM;aACd,KAAK,EAAE,aAAa,GAAG,wBAAwB;aAC/C,SAAS,EAAE,YAAY;IAChC,MAAM,EAAE,SAAS;IAT1B,OAAO,CAAC,GAAG,CAAuB;IAElC,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,SAAS,CAAa;IAE9B,SAAS,aACS,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,GAAG,wBAAwB,EAC/C,SAAS,EAAE,YAAY,EAChC,MAAM,EAAE,SAAS;WAGb,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,GAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAA;KAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAKjG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;IAKjC,GAAG;IAoEH,WAAW;;;;;;;;;;IAoBxB,OAAO,CAAC,iBAAiB;CAkB1B"}
+{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAa,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAKjD,qBAAa,GAAI,SAAQ,OAAO;aAKZ,KAAK,EAAE,aAAa,GAAG,oBAAoB;aAC3C,SAAS,EAAE,YAAY;IALzC,SAAS,aACP,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,UAAU,EAClB,qBAAqB,EAAE,YAAY,EACnB,KAAK,EAAE,aAAa,GAAG,oBAAoB,EAC3C,SAAS,EAAE,YAAY,EACvC,MAAM,EAAE,SAAS;WAKN,MAAM,CACjB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,GAAG,CAAC;IAWR,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;cAK9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BnD,WAAW;;;;;;;;;;CAmBzB"}

package/dest/bot.js

@@ -1,29 +1,18 @@
-import { BatchCall, FeeJuicePaymentMethod, createLogger } from '@aztec/aztec.js';
-import { timesParallel } from '@aztec/foundation/collection';
-import { Gas } from '@aztec/stdlib/gas';
+import { BatchCall } from '@aztec/aztec.js/contracts';
+import { times } from '@aztec/foundation/collection';
+import { BaseBot } from './base_bot.js';
 import { BotFactory } from './factory.js';
 import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
 const TRANSFER_AMOUNT = 1;
-export class Bot {
-    wallet;
+export class Bot extends BaseBot {
     token;
     recipient;
-    config;
-    log;
-    attempts;
-    successes;
-    constructor(wallet, token, recipient, config){
-        this.wallet = wallet;
-        this.token = token;
-        this.recipient = recipient;
-        this.config = config;
-        this.log = createLogger('bot');
-        this.attempts = 0;
-        this.successes = 0;
+    constructor(node, wallet, defaultAccountAddress, token, recipient, config){
+        super(node, wallet, defaultAccountAddress, config), this.token = token, this.recipient = recipient;
     }
-    static async create(config, dependencies = {}) {
-        const { wallet, token, recipient } = await new BotFactory(config, dependencies).setup();
-        return new Bot(wallet, token, recipient, config);
+    static async create(config, wallet, aztecNode, aztecNodeAdmin, store) {
+        const { defaultAccountAddress, token, recipient } = await new BotFactory(config, wallet, store, aztecNode, aztecNodeAdmin).setup();
+        return new Bot(aztecNode, wallet, defaultAccountAddress, token, recipient, config);
     }
     updateConfig(config) {
         this.log.info(`Updating bot config ${Object.keys(config).join(', ')}`);
@@ -32,91 +21,40 @@ export class Bot {
             ...config
         };
     }
-    async run() {
-        this.attempts++;
-        const logCtx = {
-            runId: Date.now() * 1000 + Math.floor(Math.random() * 1000)
-        };
-        const { privateTransfersPerTx, publicTransfersPerTx, feePaymentMethod, followChain, txMinedWaitSeconds } = this.config;
+    async createAndSendTx(logCtx) {
+        const { privateTransfersPerTx, publicTransfersPerTx, feePaymentMethod } = this.config;
         const { token, recipient, wallet } = this;
-        const sender = wallet.getAddress();
         this.log.verbose(`Preparing tx with ${feePaymentMethod} fee with ${privateTransfersPerTx} private and ${publicTransfersPerTx} public transfers`, logCtx);
-        const calls = [];
-        if (isStandardTokenContract(token)) {
-            calls.push(...await timesParallel(privateTransfersPerTx, ()=>token.methods.transfer(recipient, TRANSFER_AMOUNT).request()));
-            calls.push(...await timesParallel(publicTransfersPerTx, ()=>token.methods.transfer_in_public(sender, recipient, TRANSFER_AMOUNT, 0).request()));
-        } else {
-            calls.push(...await timesParallel(privateTransfersPerTx, ()=>token.methods.transfer(TRANSFER_AMOUNT, sender, recipient).request()));
-        }
-        const opts = this.getSendMethodOpts();
+        const calls = isStandardTokenContract(token) ? [
+            times(privateTransfersPerTx, ()=>token.methods.transfer(recipient, TRANSFER_AMOUNT)),
+            times(publicTransfersPerTx, ()=>token.methods.transfer_in_public(this.defaultAccountAddress, recipient, TRANSFER_AMOUNT, 0))
+        ].flat() : times(privateTransfersPerTx, ()=>token.methods.transfer(TRANSFER_AMOUNT, this.defaultAccountAddress, recipient));
         const batch = new BatchCall(wallet, calls);
+        const opts = await this.getSendMethodOpts(batch);
         this.log.verbose(`Simulating transaction with ${calls.length}`, logCtx);
-        await batch.simulate();
-        this.log.verbose(`Proving transaction`, logCtx);
-        const provenTx = await batch.prove(opts);
-        this.log.verbose(`Sending tx`, logCtx);
-        const tx = provenTx.send();
-        const txHash = await tx.getTxHash();
-        if (followChain === 'NONE') {
-            this.log.info(`Transaction ${txHash} sent, not waiting for it to be mined`);
-            return;
-        }
-        this.log.verbose(`Awaiting tx ${txHash} to be on the ${followChain} chain (timeout ${txMinedWaitSeconds}s)`, logCtx);
-        const receipt = await tx.wait({
-            timeout: txMinedWaitSeconds,
-            provenTimeout: txMinedWaitSeconds,
-            proven: followChain === 'PROVEN'
+        await batch.simulate({
+            from: this.defaultAccountAddress
         });
-        this.log.info(`Tx #${this.attempts} ${receipt.txHash} successfully mined in block ${receipt.blockNumber} (stats: ${this.successes}/${this.attempts} success)`, logCtx);
-        this.successes++;
+        this.log.verbose(`Sending transaction`, logCtx);
+        return batch.send(opts);
     }
     async getBalances() {
         if (isStandardTokenContract(this.token)) {
             return {
-                sender: await getBalances(this.token, this.wallet.getAddress()),
-                recipient: await getBalances(this.token, this.recipient)
+                sender: await getBalances(this.token, this.defaultAccountAddress),
+                recipient: await getBalances(this.token, this.recipient, this.defaultAccountAddress)
             };
         } else {
             return {
                 sender: {
-                    privateBalance: await getPrivateBalance(this.token, this.wallet.getAddress()),
+                    privateBalance: await getPrivateBalance(this.token, this.defaultAccountAddress),
                     publicBalance: 0n
                 },
                 recipient: {
-                    privateBalance: await getPrivateBalance(this.token, this.recipient),
+                    privateBalance: await getPrivateBalance(this.token, this.recipient, this.defaultAccountAddress),
                     publicBalance: 0n
                 }
             };
         }
     }
-    getSendMethodOpts() {
-        const sender = this.wallet.getAddress();
-        const { l2GasLimit, daGasLimit, skipPublicSimulation } = this.config;
-        const paymentMethod = new FeeJuicePaymentMethod(sender);
-        let gasSettings, estimateGas;
-        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`);
-        }
-        const baseFeePadding = 2; // Send 3x the current base fee
-        this.log.verbose(skipPublicSimulation ? `Skipping public simulation` : `Simulating public transfers`);
-        return {
-            fee: {
-                estimateGas,
-                paymentMethod,
-                gasSettings,
-                baseFeePadding
-            },
-            skipPublicSimulation
-        };
-    }
 }