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

package/dest/amm_bot.d.ts

@@ -1,9 +1,13 @@
-import { AztecAddress, SentTx, TxReceipt, type Wallet } from '@aztec/aztec.js';
+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, PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
+import type { BotStore } from './store/index.js';
 type Balances = {
     token0: bigint;
     token1: bigint;
@@ -12,12 +16,8 @@ export declare class AmmBot extends BaseBot {
     readonly amm: AMMContract;
     readonly token0: TokenContract;
     readonly token1: TokenContract;
-    protected constructor(pxe: PXE, 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>;
+    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>;

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,GAAG,EAAE,GAAG,EACR,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;cA+CvC,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,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

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/aztec.js';
+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';
@@ -8,12 +8,12 @@ export class AmmBot extends BaseBot {
     amm;
     token0;
     token1;
-    constructor(pxe, wallet, defaultAccountAddress, amm, token0, token1, config){
-        super(pxe, wallet, defaultAccountAddress, config), this.amm = amm, this.token0 = token0, this.token1 = 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, dependencies) {
-        const { pxe, wallet, defaultAccountAddress, token0, token1, amm } = await new BotFactory(config, dependencies).setupAmm();
-        return new AmmBot(pxe, wallet, defaultAccountAddress, amm, token0, token1, config);
+    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;
@@ -33,9 +33,9 @@ export class AmmBot extends BaseBot {
             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.get_amount_out_for_exact_in(await tokenIn.methods.balance_of_public(amm.address).simulate({
             from: this.defaultAccountAddress
@@ -44,15 +44,18 @@ export class AmmBot extends BaseBot {
         }), amountIn).simulate({
             from: this.defaultAccountAddress
         });
-        const swapExactTokensInteraction = amm.methods.swap_exact_tokens_for_tokens(tokenIn.address, tokenOut.address, amountIn, amountOutMin, authwitNonce);
-        const opts = this.getSendMethodOpts(swapAuthwit);
-        this.log.verbose(`Proving transaction`, logCtx);
-        const tx = await swapExactTokensInteraction.prove(opts);
+        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 tx.send();
+        return swapExactTokensInteraction.send(opts);
     }
     async onTxMined(receipt, logCtx) {
         const balances = await this.getBalances();
@@ -68,26 +71,26 @@ 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)
         };
     }
-    async getPublicBalanceFor(address) {
+    async getPublicBalanceFor(address, from) {
         return {
             token0: await this.token0.methods.balance_of_public(address).simulate({
-                from: address
+                from: from ?? address
             }),
             token1: await this.token1.methods.balance_of_public(address).simulate({
-                from: address
+                from: from ?? address
             })
         };
     }
-    async getPrivateBalanceFor(address) {
+    async getPrivateBalanceFor(address, from) {
         return {
             token0: await this.token0.methods.balance_of_private(address).simulate({
-                from: address
+                from: from ?? address
             }),
             token1: await this.token1.methods.balance_of_private(address).simulate({
-                from: address
+                from: from ?? address
             })
         };
     }

package/dest/base_bot.d.ts

@@ -1,18 +1,21 @@
-import { AuthWitness, AztecAddress, type SendMethodOptions, SentTx, TxHash, TxReceipt, type Wallet } from '@aztec/aztec.js';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
+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 pxe: PXE;
-    readonly wallet: Wallet;
+    readonly node: AztecNode;
+    readonly wallet: TestWallet;
     readonly defaultAccountAddress: AztecAddress;
     config: BotConfig;
-    protected log: import("@aztec/aztec.js").Logger;
+    protected log: import("@aztec/aztec.js/log").Logger;
     protected attempts: number;
     protected successes: number;
-    protected constructor(pxe: PXE, wallet: Wallet, defaultAccountAddress: AztecAddress, config: BotConfig);
+    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(...authWitnesses: AuthWitness[]): SendMethodOptions;
+    protected getSendMethodOpts(interaction: ContractFunctionInteraction | BatchCall): Promise<SendInteractionOptions>;
 }
 //# sourceMappingURL=base_bot.d.ts.map

package/dest/base_bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base_bot.d.ts","sourceRoot":"","sources":["../src/base_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,YAAY,EAEZ,KAAK,iBAAiB,EACtB,MAAM,EACN,MAAM,EACN,SAAS,EACT,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,8BAAsB,OAAO;aAOT,GAAG,EAAE,GAAG;aACR,MAAM,EAAE,MAAM;aACd,qBAAqB,EAAE,YAAY;IAC5C,MAAM,EAAE,SAAS;IAT1B,SAAS,CAAC,GAAG,mCAAuB;IAEpC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAK;IAC/B,SAAS,CAAC,SAAS,EAAE,MAAM,CAAK;IAEhC,SAAS,aACS,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,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;IAKxE,SAAS,CAAC,iBAAiB,CAAC,GAAG,aAAa,EAAE,WAAW,EAAE,GAAG,iBAAiB;CAoBhF"}
+{"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

@@ -1,15 +1,16 @@
-import { FeeJuicePaymentMethod, createLogger, waitForProven } from '@aztec/aztec.js';
+import { waitForProven } from '@aztec/aztec.js/contracts';
+import { createLogger } from '@aztec/aztec.js/log';
 import { Gas } from '@aztec/stdlib/gas';
 export class BaseBot {
-    pxe;
+    node;
     wallet;
     defaultAccountAddress;
     config;
     log;
     attempts;
     successes;
-    constructor(pxe, wallet, defaultAccountAddress, config){
-        this.pxe = pxe;
+    constructor(node, wallet, defaultAccountAddress, config){
+        this.node = node;
         this.wallet = wallet;
         this.defaultAccountAddress = defaultAccountAddress;
         this.config = config;
@@ -35,7 +36,7 @@ export class BaseBot {
             timeout: txMinedWaitSeconds
         });
         if (followChain === 'PROVEN') {
-            await waitForProven(this.pxe, receipt, {
+            await waitForProven(this.node, receipt, {
                 provenTimeout: txMinedWaitSeconds
             });
         }
@@ -48,10 +49,10 @@ export class BaseBot {
         // no-op
         return Promise.resolve();
     }
-    getSendMethodOpts(...authWitnesses) {
-        const { l2GasLimit, daGasLimit } = this.config;
-        const paymentMethod = new FeeJuicePaymentMethod(this.defaultAccountAddress);
-        let gasSettings, estimateGas;
+    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({
@@ -59,22 +60,21 @@ export class BaseBot {
                     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
+                gasSettings
+            }
         };
     }
 }

package/dest/bot.d.ts

@@ -1,18 +1,17 @@
-import { type AztecAddress, SentTx, type Wallet } from '@aztec/aztec.js';
+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, AztecNodeAdmin, PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
+import type { BotStore } from './store/index.js';
 export declare class Bot extends BaseBot {
     readonly token: TokenContract | PrivateTokenContract;
     readonly recipient: AztecAddress;
-    protected constructor(pxe: PXE, wallet: Wallet, defaultAccountAddress: AztecAddress, token: TokenContract | PrivateTokenContract, recipient: AztecAddress, config: BotConfig);
-    static create(config: BotConfig, dependencies: {
-        pxe?: PXE;
-        node?: AztecNode;
-        nodeAdmin?: AztecNodeAdmin;
-    }): 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;
     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,GAAG,EAAE,GAAG,EACR,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;IAKR,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,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,4 +1,4 @@
-import { BatchCall } from '@aztec/aztec.js';
+import { BatchCall } from '@aztec/aztec.js/contracts';
 import { times } from '@aztec/foundation/collection';
 import { BaseBot } from './base_bot.js';
 import { BotFactory } from './factory.js';
@@ -7,12 +7,12 @@ const TRANSFER_AMOUNT = 1;
 export class Bot extends BaseBot {
     token;
     recipient;
-    constructor(pxe, wallet, defaultAccountAddress, token, recipient, config){
-        super(pxe, wallet, defaultAccountAddress, config), this.token = token, this.recipient = recipient;
+    constructor(node, wallet, defaultAccountAddress, token, recipient, config){
+        super(node, wallet, defaultAccountAddress, config), this.token = token, this.recipient = recipient;
     }
-    static async create(config, dependencies) {
-        const { pxe, wallet, defaultAccountAddress, token, recipient } = await new BotFactory(config, dependencies).setup();
-        return new Bot(pxe, wallet, defaultAccountAddress, 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(', ')}`);
@@ -29,21 +29,20 @@ export class Bot extends BaseBot {
             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 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);
     }
     async getBalances() {
         if (isStandardTokenContract(this.token)) {
             return {
                 sender: await getBalances(this.token, this.defaultAccountAddress),
-                recipient: await getBalances(this.token, this.recipient)
+                recipient: await getBalances(this.token, this.recipient, this.defaultAccountAddress)
             };
         } else {
             return {
@@ -52,7 +51,7 @@ export class Bot extends BaseBot {
                     publicBalance: 0n
                 },
                 recipient: {
-                    privateBalance: await getPrivateBalance(this.token, this.recipient),
+                    privateBalance: await getPrivateBalance(this.token, this.recipient, this.defaultAccountAddress),
                     publicBalance: 0n
                 }
             };

package/dest/config.d.ts

@@ -1,5 +1,6 @@
-import { type ConfigMappingsType, type SecretValue } from '@aztec/foundation/config';
+import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
+import { type DataStoreConfig } from '@aztec/kv-store/config';
 import { type ZodFor } from '@aztec/stdlib/schemas';
 import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 import { z } from 'zod';
@@ -14,22 +15,18 @@ export type BotConfig = {
     nodeUrl: string | undefined;
     /** The URL to the Aztec node admin API to force-flush txs if configured. */
     nodeAdminUrl: string | undefined;
-    /** URL to the PXE for sending txs, or undefined if an in-proc PXE is used. */
-    pxeUrl: string | undefined;
     /** Url of the ethereum host. */
     l1RpcUrls: string[] | undefined;
     /** The mnemonic for the account to bridge fee juice from L1. */
-    l1Mnemonic: SecretValue<string | undefined>;
+    l1Mnemonic: SecretValue<string> | undefined;
     /** The private key for the account to bridge fee juice from L1. */
-    l1PrivateKey: SecretValue<string | undefined>;
+    l1PrivateKey: SecretValue<string> | undefined;
     /** How long to wait for L1 to L2 messages to become available on L2 */
     l1ToL2MessageTimeoutSeconds: number;
     /** Signing private key for the sender account. */
-    senderPrivateKey: SecretValue<Fr | undefined>;
+    senderPrivateKey: SecretValue<Fr> | undefined;
     /** Optional salt to use to instantiate the sender account */
     senderSalt: Fr | undefined;
-    /** Encryption secret for a recipient account. */
-    recipientEncryptionSecret: SecretValue<Fr>;
     /** Salt for the token contract instantiation. */
     tokenSalt: Fr;
     /** Every how many seconds should a new tx be sent. */
@@ -40,6 +37,8 @@ export type BotConfig = {
     publicTransfersPerTx: number;
     /** How to handle fee payments. */
     feePaymentMethod: 'fee_juice';
+    /** 'How much is the bot willing to overpay vs. the current base fee' */
+    baseFeePadding: number;
     /** True to not automatically setup or start the bot on initialization. */
     noStart: boolean;
     /** How long to wait for a tx to be mined before reporting an error. */
@@ -62,23 +61,22 @@ export type BotConfig = {
     stopWhenUnhealthy: boolean;
     /** Deploy an AMM contract and do swaps instead of transfers */
     ammTxs: boolean;
-};
+} & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'>;
 export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     nodeUrl: z.ZodOptional<z.ZodString>;
     nodeAdminUrl: z.ZodOptional<z.ZodString>;
-    pxeUrl: z.ZodOptional<z.ZodString>;
     l1RpcUrls: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    l1Mnemonic: z.ZodType<SecretValue<string | undefined>, any, any>;
-    l1PrivateKey: z.ZodType<SecretValue<string | undefined>, any, any>;
+    l1Mnemonic: z.ZodOptional<z.ZodType<SecretValue<string>, any, any>>;
+    l1PrivateKey: z.ZodOptional<z.ZodType<SecretValue<string>, any, any>>;
     l1ToL2MessageTimeoutSeconds: z.ZodNumber;
-    senderPrivateKey: z.ZodType<SecretValue<Fr | undefined>, any, any>;
+    senderPrivateKey: z.ZodOptional<z.ZodType<SecretValue<Fr>, any, any>>;
     senderSalt: z.ZodOptional<ZodFor<Fr>>;
-    recipientEncryptionSecret: z.ZodType<SecretValue<Fr>, any, any>;
     tokenSalt: ZodFor<Fr>;
     txIntervalSeconds: z.ZodNumber;
     privateTransfersPerTx: z.ZodNumber;
     publicTransfersPerTx: z.ZodNumber;
     feePaymentMethod: z.ZodLiteral<"fee_juice">;
+    baseFeePadding: z.ZodNumber;
     noStart: z.ZodBoolean;
     txMinedWaitSeconds: z.ZodNumber;
     followChain: z.ZodEnum<["NONE", "PENDING", "PROVEN"]>;
@@ -90,17 +88,16 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     maxConsecutiveErrors: z.ZodNumber;
     stopWhenUnhealthy: z.ZodBoolean;
     ammTxs: z.ZodDefault<z.ZodBoolean>;
+    dataDirectory: z.ZodOptional<z.ZodString>;
+    dataStoreMapSizeKb: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
-    l1Mnemonic: SecretValue<string | undefined>;
-    l1PrivateKey: SecretValue<string | undefined>;
     l1ToL2MessageTimeoutSeconds: number;
-    senderPrivateKey: SecretValue<Fr | undefined>;
-    recipientEncryptionSecret: SecretValue<Fr>;
     tokenSalt: Fr;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
@@ -110,10 +107,14 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
     ammTxs: boolean;
+    dataDirectory?: string | undefined;
+    dataStoreMapSizeKb?: number | undefined;
     nodeUrl?: string | undefined;
     nodeAdminUrl?: string | undefined;
-    pxeUrl?: string | undefined;
     l1RpcUrls?: string[] | undefined;
+    l1Mnemonic?: SecretValue<string> | undefined;
+    l1PrivateKey?: SecretValue<string> | undefined;
+    senderPrivateKey?: SecretValue<Fr> | undefined;
     senderSalt?: Fr | undefined;
     l2GasLimit?: number | undefined;
     daGasLimit?: number | undefined;
@@ -123,6 +124,7 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
@@ -131,30 +133,27 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    dataDirectory?: string | undefined;
+    dataStoreMapSizeKb?: number | undefined;
     nodeUrl?: string | undefined;
     nodeAdminUrl?: string | undefined;
-    pxeUrl?: string | undefined;
     l1RpcUrls?: string[] | undefined;
     l1Mnemonic?: any;
     l1PrivateKey?: any;
     senderPrivateKey?: any;
     senderSalt?: any;
-    recipientEncryptionSecret?: any;
     tokenSalt?: any;
     l2GasLimit?: number | undefined;
     daGasLimit?: number | undefined;
     ammTxs?: boolean | undefined;
 }>, {
-    l1Mnemonic: SecretValue<string | undefined>;
-    l1PrivateKey: SecretValue<string | undefined>;
     l1ToL2MessageTimeoutSeconds: number;
-    senderPrivateKey: SecretValue<Fr | undefined>;
-    recipientEncryptionSecret: SecretValue<Fr>;
     tokenSalt: Fr;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
@@ -164,10 +163,14 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
     ammTxs: boolean;
+    dataDirectory: string | undefined;
+    dataStoreMapSizeKb: number;
     nodeUrl: string | undefined;
     nodeAdminUrl: string | undefined;
-    pxeUrl: string | undefined;
     l1RpcUrls: string[] | undefined;
+    l1Mnemonic: SecretValue<string> | undefined;
+    l1PrivateKey: SecretValue<string> | undefined;
+    senderPrivateKey: SecretValue<Fr> | undefined;
     senderSalt: Fr | undefined;
     l2GasLimit: number | undefined;
     daGasLimit: number | undefined;
@@ -177,6 +180,7 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
@@ -185,15 +189,15 @@ export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    dataDirectory?: string | undefined;
+    dataStoreMapSizeKb?: number | undefined;
     nodeUrl?: string | undefined;
     nodeAdminUrl?: string | undefined;
-    pxeUrl?: string | undefined;
     l1RpcUrls?: string[] | undefined;
     l1Mnemonic?: any;
     l1PrivateKey?: any;
     senderPrivateKey?: any;
     senderSalt?: any;
-    recipientEncryptionSecret?: any;
     tokenSalt?: any;
     l2GasLimit?: number | undefined;
     daGasLimit?: number | undefined;

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAQjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,QAAA,MAAM,cAAc,wCAAyC,CAAC;AAC9D,KAAK,cAAc,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtD,oBAAY,uBAAuB;IACjC,aAAa,kBAAkB;IAC/B,oBAAoB,yBAAyB;CAC9C;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,4EAA4E;IAC5E,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,8EAA8E;IAC9E,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,gCAAgC;IAChC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAChC,gEAAgE;IAChE,UAAU,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5C,mEAAmE;IACnE,YAAY,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9C,uEAAuE;IACvE,2BAA2B,EAAE,MAAM,CAAC;IACpC,kDAAkD;IAClD,gBAAgB,EAAE,WAAW,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAC9C,6DAA6D;IAC7D,UAAU,EAAE,EAAE,GAAG,SAAS,CAAC;IAC3B,iDAAiD;IACjD,yBAAyB,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAC3C,iDAAiD;IACjD,SAAS,EAAE,EAAE,CAAC;IACd,sDAAsD;IACtD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,qBAAqB,EAAE,MAAM,CAAC;IAC9B,2DAA2D;IAC3D,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kCAAkC;IAClC,gBAAgB,EAAE,WAAW,CAAC;IAC9B,0EAA0E;IAC1E,OAAO,EAAE,OAAO,CAAC;IACjB,uEAAuE;IACvE,kBAAkB,EAAE,MAAM,CAAC;IAC3B,4EAA4E;IAC5E,WAAW,EAAE,cAAc,CAAC;IAC5B,gFAAgF;IAChF,aAAa,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,sBAAsB,EAAE,OAAO,CAAC;IAChC,+EAA+E;IAC/E,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,+EAA+E;IAC/E,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,4BAA4B;IAC5B,QAAQ,EAAE,uBAAuB,CAAC;IAClC,yEAAyE;IACzE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iDAAiD;IACjD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,+DAA+D;IAC/D,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsCK,CAAC;AAElC,eAAO,MAAM,iBAAiB,EAAE,kBAAkB,CAAC,SAAS,CAkJ3D,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,SAAS,CAE/C;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAE/C;AAED,wBAAgB,WAAW,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAKzD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}