@aztec/bot 0.85.0 → 0.86.0

package/dest/amm_bot.d.ts

@@ -1,4 +1,4 @@
-import { SentTx, type Wallet } from '@aztec/aztec.js';
+import { 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';
@@ -19,6 +19,7 @@ export declare class AmmBot extends BaseBot {
         nodeAdmin?: AztecNodeAdmin;
     }): Promise<AmmBot>;
     protected createAndSendTx(logCtx: object): Promise<SentTx>;
+    protected onTxMined(receipt: TxReceipt, logCtx: object): Promise<void>;
     getAmmBalances(): Promise<Balances>;
     getBalances(): Promise<{
         senderPublic: 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,EAAoB,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACxE,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;AAK7C,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,qBAAa,MAAO,SAAQ,OAAO;aAIf,GAAG,EAAE,WAAW;aAChB,MAAM,EAAE,aAAa;aACrB,MAAM,EAAE,aAAa;IALvC,SAAS,aACP,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACE,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;cAKF,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAmCzD,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,EAAoB,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;aAIf,GAAG,EAAE,WAAW;aAChB,MAAM,EAAE,aAAa;aACrB,MAAM,EAAE,aAAa;IALvC,SAAS,aACP,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACE,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;cAKF,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"}

package/dest/amm_bot.js

@@ -1,7 +1,9 @@
 import { Fr } from '@aztec/aztec.js';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { BaseBot } from './base_bot.js';
 import { BotFactory } from './factory.js';
-const TRANSFER_AMOUNT = 1_000;
+const TRANSFER_BASE_AMOUNT = 1_000;
+const TRANSFER_VARIANCE = 200;
 export class AmmBot extends BaseBot {
     amm;
     token0;
@@ -16,21 +18,43 @@ export class AmmBot extends BaseBot {
     async createAndSendTx(logCtx) {
         const { feePaymentMethod } = this.config;
         const { wallet, amm, token0, token1 } = this;
-        this.log.verbose(`Preparing tx with ${feePaymentMethod} fee to swap tokens`, logCtx);
-        const ammBalances = await this.getAmmBalances();
-        const amountIn = TRANSFER_AMOUNT;
+        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 nonce = Fr.random();
+        const [tokenIn, tokenOut] = Math.random() < 0.5 ? [
+            token0,
+            token1
+        ] : [
+            token1,
+            token0
+        ];
         const swapAuthwit = await wallet.createAuthWit({
             caller: amm.address,
-            action: token0.methods.transfer_to_public(wallet.getAddress(), amm.address, amountIn, nonce)
+            action: tokenIn.methods.transfer_to_public(wallet.getAddress(), amm.address, amountIn, nonce)
         });
-        const amountOutMin = await amm.methods.get_amount_out_for_exact_in(ammBalances.token0, ammBalances.token1, amountIn).simulate();
-        const swapExactTokensInteraction = amm.methods.swap_exact_tokens_for_tokens(token0.address, token1.address, amountIn, amountOutMin, nonce);
+        const amountOutMin = await amm.methods.get_amount_out_for_exact_in(await tokenIn.methods.balance_of_public(amm.address).simulate(), await tokenOut.methods.balance_of_public(amm.address).simulate(), amountIn).simulate();
+        const swapExactTokensInteraction = amm.methods.swap_exact_tokens_for_tokens(tokenIn.address, tokenOut.address, amountIn, amountOutMin, nonce);
         const opts = this.getSendMethodOpts(swapAuthwit);
         this.log.verbose(`Proving transaction`, logCtx);
         const tx = await swapExactTokensInteraction.prove(opts);
+        this.log.info(`Tx. Balances: ${jsonStringify(balances)}`, {
+            ...logCtx,
+            balances
+        });
         return tx.send();
     }
+    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);
     }

package/dest/base_bot.d.ts

@@ -11,6 +11,7 @@ export declare abstract class BaseBot {
     protected constructor(pxe: PXE, wallet: Wallet, 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;
 }
 //# 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,EAEX,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;aAMW,GAAG,EAAE,GAAG;aAAkB,MAAM,EAAE,MAAM;IAAS,MAAM,EAAE,SAAS;IALxG,SAAS,CAAC,GAAG,mCAAuB;IAEpC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAK;IAC/B,SAAS,CAAC,SAAS,EAAE,MAAM,CAAK;IAEhC,SAAS,aAA6B,GAAG,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,EAAS,MAAM,EAAE,SAAS;IAE3F,GAAG,IAAI,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC;IAiC/C,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEnE,SAAS,CAAC,iBAAiB,CAAC,GAAG,aAAa,EAAE,WAAW,EAAE,GAAG,iBAAiB;CAkBhF"}
+{"version":3,"file":"base_bot.d.ts","sourceRoot":"","sources":["../src/base_bot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAEX,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;aAMW,GAAG,EAAE,GAAG;aAAkB,MAAM,EAAE,MAAM;IAAS,MAAM,EAAE,SAAS;IALxG,SAAS,CAAC,GAAG,mCAAuB;IAEpC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAK;IAC/B,SAAS,CAAC,SAAS,EAAE,MAAM,CAAK;IAEhC,SAAS,aAA6B,GAAG,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,EAAS,MAAM,EAAE,SAAS;IAE3F,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;CAkBhF"}

package/dest/base_bot.js

@@ -39,8 +39,13 @@ export class BaseBot {
         }
         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();
+    }
     getSendMethodOpts(...authWitnesses) {
         const sender = this.wallet.getAddress();
         const { l2GasLimit, daGasLimit, skipPublicSimulation } = this.config;

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EAQZ,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAIjF,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,aAAa,CAAC;AAMnF,qBAAa,UAAU;IAOnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,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;IA4B3E;;;OAGG;IACU,KAAK;;;;;;IAQL,QAAQ;;;;;;;IAarB;;;OAGG;YACW,YAAY;YAQZ,0BAA0B;YA8B1B,gBAAgB;IAc9B;;OAEG;YACW,iBAAiB;IAK/B;;;;OAIG;YACW,UAAU;IA8BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAYZ,gBAAgB;YAoBhB,OAAO;YAyCP,wBAAwB;IAoBtC;;;OAGG;YACW,UAAU;YAuCV,gBAAgB;YAgChB,cAAc;YAMd,WAAW;CAU1B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EAQZ,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAIjF,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,aAAa,CAAC;AAMnF,qBAAa,UAAU;IAOnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,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;IA4B3E;;;OAGG;IACU,KAAK;;;;;;IAQL,QAAQ;;;;;;;IAarB;;;OAGG;YACW,YAAY;YAQZ,0BAA0B;YAgC1B,gBAAgB;IAc9B;;OAEG;YACW,iBAAiB;IAK/B;;;;OAIG;YACW,UAAU;IA8BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAYZ,gBAAgB;YAoBhB,OAAO;YA2DP,wBAAwB;IAoBtC;;;OAGG;YACW,UAAU;YAuCV,gBAAgB;YAgChB,cAAc;YAMd,WAAW;CAU1B"}

package/dest/factory.js

@@ -1,8 +1,9 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { getDeployedTestAccountsWallets, getInitialTestAccounts } from '@aztec/accounts/testing';
 import { BatchCall, FeeJuicePaymentMethodWithClaim, L1FeeJuicePortalManager, createLogger, createPXEClient, retryUntil } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
+import { Timer } from '@aztec/foundation/timer';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -65,7 +66,7 @@ export class BotFactory {
         const token1 = await this.setupTokenContract(wallet, this.config.tokenSalt, 'BotToken1', 'BOT1');
         const liquidityToken = await this.setupTokenContract(wallet, this.config.tokenSalt, 'BotLPToken', 'BOTLP');
         const amm = await this.setupAmmContract(wallet, this.config.tokenSalt, token0, token1, liquidityToken);
-        await this.fundAmm(wallet, amm, token0, token1);
+        await this.fundAmm(wallet, amm, token0, token1, liquidityToken);
         this.log.info(`AMM initialized and funded`);
         return {
             wallet,
@@ -92,7 +93,9 @@ export class BotFactory {
         const isInit = (await this.pxe.getContractMetadata(account.getAddress())).isContractInitialized;
         if (isInit) {
             this.log.info(`Account at ${account.getAddress().toString()} already initialized`);
+            const timer = new Timer();
             const wallet = await account.register();
+            this.log.info(`Account at ${account.getAddress()} registered. duration=${timer.ms()}`);
             return wallet;
         } else {
             const address = account.getAddress();
@@ -202,13 +205,20 @@ export class BotFactory {
         this.log.info(`Liquidity token initialized`);
         return amm;
     }
-    async fundAmm(wallet, amm, token0, token1) {
+    async fundAmm(wallet, amm, token0, token1, lpToken) {
+        const getPrivateBalances = ()=>Promise.all([
+                token0.methods.balance_of_private(wallet.getAddress()),
+                token1.methods.balance_of_private(wallet.getAddress()),
+                lpToken.methods.balance_of_private(wallet.getAddress())
+            ]);
         const nonce = Fr.random();
         // keep some tokens for swapping
         const amount0Max = MINT_BALANCE / 2;
         const amount0Min = MINT_BALANCE / 4;
         const amount1Max = MINT_BALANCE / 2;
         const amount1Min = MINT_BALANCE / 4;
+        const [t0Bal, t1Bal, lpBal] = await getPrivateBalances();
+        this.log.info(`Minting ${MINT_BALANCE} tokens of each BotToken0 and BotToken1. Current private balances of ${wallet.getAddress()}: token0=${t0Bal}, token1=${t1Bal}, lp=${lpBal}`);
         const token0Authwit = await wallet.createAuthWit({
             caller: amm.address,
             action: token0.methods.transfer_to_public(wallet.getAddress(), amm.address, amount0Max, nonce)
@@ -217,7 +227,6 @@ export class BotFactory {
             caller: amm.address,
             action: token1.methods.transfer_to_public(wallet.getAddress(), amm.address, amount1Max, nonce)
         });
-        this.log.info(`Minting tokens`);
         const mintTx = new BatchCall(wallet, [
             token0.methods.mint_to_private(wallet.getAddress(), wallet.getAddress(), MINT_BALANCE),
             token1.methods.mint_to_private(wallet.getAddress(), wallet.getAddress(), MINT_BALANCE)
@@ -226,7 +235,6 @@ export class BotFactory {
         await mintTx.wait({
             timeout: this.config.txMinedWaitSeconds
         });
-        this.log.info(`Funding AMM`);
         const addLiquidityTx = amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, nonce).send({
             authWitnesses: [
                 token0Authwit,
@@ -237,6 +245,9 @@ export class BotFactory {
         await addLiquidityTx.wait({
             timeout: this.config.txMinedWaitSeconds
         });
+        this.log.info(`Liquidity added`);
+        const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
+        this.log.info(`Updated private balances of ${wallet.getAddress()} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`);
     }
     async registerOrDeployContract(name, deploy, deployOpts) {
         const address = (await deploy.getInstance(deployOpts)).address;
@@ -302,8 +313,8 @@ export class BotFactory {
         }
         const { l1ChainId } = await this.pxe.getNodeInfo();
         const chain = createEthereumChain(l1RpcUrls, l1ChainId);
-        const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
-        const portal = await L1FeeJuicePortalManager.new(this.pxe, publicClient, walletClient, this.log);
+        const extendedClient = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+        const portal = await L1FeeJuicePortalManager.new(this.pxe, extendedClient, this.log);
         const mintAmount = await portal.getTokenManager().getMintAmount();
         const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true);
         const isSynced = async ()=>await this.pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -13,8 +13,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "bb": "node --no-warnings ./dest/bb/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -52,16 +50,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.85.0",
-    "@aztec/aztec.js": "0.85.0",
-    "@aztec/entrypoints": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/noir-contracts.js": "0.85.0",
-    "@aztec/noir-protocol-circuits-types": "0.85.0",
-    "@aztec/protocol-contracts": "0.85.0",
-    "@aztec/stdlib": "0.85.0",
-    "@aztec/telemetry-client": "0.85.0",
+    "@aztec/accounts": "0.86.0",
+    "@aztec/aztec.js": "0.86.0",
+    "@aztec/entrypoints": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/noir-contracts.js": "0.86.0",
+    "@aztec/noir-protocol-circuits-types": "0.86.0",
+    "@aztec/protocol-contracts": "0.86.0",
+    "@aztec/stdlib": "0.86.0",
+    "@aztec/telemetry-client": "0.86.0",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"

package/src/amm_bot.ts

@@ -1,4 +1,5 @@
-import { AztecAddress, Fr, SentTx, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, Fr, SentTx, TxReceipt, type Wallet } from '@aztec/aztec.js';
+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';
@@ -7,7 +8,8 @@ import { BaseBot } from './base_bot.js';
 import type { BotConfig } from './config.js';
 import { BotFactory } from './factory.js';
 
-const TRANSFER_AMOUNT = 1_000;
+const TRANSFER_BASE_AMOUNT = 1_000;
+const TRANSFER_VARIANCE = 200;
 
 type Balances = { token0: bigint; token1: bigint };
 
@@ -35,24 +37,34 @@ export class AmmBot extends BaseBot {
     const { feePaymentMethod } = this.config;
     const { wallet, amm, token0, token1 } = this;
 
-    this.log.verbose(`Preparing tx with ${feePaymentMethod} fee to swap tokens`, logCtx);
+    const balances = this.getBalances();
+    this.log.info(`Preparing tx with ${feePaymentMethod} fee to swap tokens. Balances: ${jsonStringify(balances)}`, {
+      ...logCtx,
+      balances,
+    });
 
-    const ammBalances = await this.getAmmBalances();
-    const amountIn = TRANSFER_AMOUNT;
+    // 1000 ± 200
+    const amountIn = Math.floor(TRANSFER_BASE_AMOUNT + (Math.random() - 0.5) * TRANSFER_VARIANCE);
     const nonce = Fr.random();
 
+    const [tokenIn, tokenOut] = Math.random() < 0.5 ? [token0, token1] : [token1, token0];
+
     const swapAuthwit = await wallet.createAuthWit({
       caller: amm.address,
-      action: token0.methods.transfer_to_public(wallet.getAddress(), amm.address, amountIn, nonce),
+      action: tokenIn.methods.transfer_to_public(wallet.getAddress(), amm.address, amountIn, nonce),
     });
 
     const amountOutMin = await amm.methods
-      .get_amount_out_for_exact_in(ammBalances.token0, ammBalances.token1, amountIn)
+      .get_amount_out_for_exact_in(
+        await tokenIn.methods.balance_of_public(amm.address).simulate(),
+        await tokenOut.methods.balance_of_public(amm.address).simulate(),
+        amountIn,
+      )
       .simulate();
 
     const swapExactTokensInteraction = amm.methods.swap_exact_tokens_for_tokens(
-      token0.address,
-      token1.address,
+      tokenIn.address,
+      tokenOut.address,
       amountIn,
       amountOutMin,
       nonce,
@@ -63,9 +75,16 @@ export class AmmBot extends BaseBot {
     this.log.verbose(`Proving transaction`, logCtx);
     const tx = await swapExactTokensInteraction.prove(opts);
 
+    this.log.info(`Tx. Balances: ${jsonStringify(balances)}`, { ...logCtx, balances });
+
     return tx.send();
   }
 
+  protected override async onTxMined(receipt: TxReceipt, logCtx: object): Promise<void> {
+    const balances = await this.getBalances();
+    this.log.info(`Balances after swap in tx ${receipt.txHash}: ${jsonStringify(balances)}`, { ...logCtx, balances });
+  }
+
   public getAmmBalances(): Promise<Balances> {
     return this.getPublicBalanceFor(this.amm.address);
   }

package/src/base_bot.ts

@@ -52,11 +52,19 @@ export abstract class BaseBot {
       `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;
   }
 
   protected abstract createAndSendTx(logCtx: object): Promise<SentTx>;
 
+  protected onTxMined(_receipt: TxReceipt, _logCtx: object): Promise<void> {
+    // no-op
+    return Promise.resolve();
+  }
+
   protected getSendMethodOpts(...authWitnesses: AuthWitness[]): SendMethodOptions {
     const sender = this.wallet.getAddress();
     const { l2GasLimit, daGasLimit, skipPublicSimulation } = this.config;

package/src/factory.ts

@@ -15,8 +15,9 @@ import {
   createPXEClient,
   retryUntil,
 } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
+import { Timer } from '@aztec/foundation/timer';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -85,7 +86,7 @@ export class BotFactory {
     const liquidityToken = await this.setupTokenContract(wallet, this.config.tokenSalt, 'BotLPToken', 'BOTLP');
     const amm = await this.setupAmmContract(wallet, this.config.tokenSalt, token0, token1, liquidityToken);
 
-    await this.fundAmm(wallet, amm, token0, token1);
+    await this.fundAmm(wallet, amm, token0, token1, liquidityToken);
     this.log.info(`AMM initialized and funded`);
 
     return { wallet, amm, token0, token1, pxe: this.pxe };
@@ -110,7 +111,9 @@ export class BotFactory {
     const isInit = (await this.pxe.getContractMetadata(account.getAddress())).isContractInitialized;
     if (isInit) {
       this.log.info(`Account at ${account.getAddress().toString()} already initialized`);
+      const timer = new Timer();
       const wallet = await account.register();
+      this.log.info(`Account at ${account.getAddress()} registered. duration=${timer.ms()}`);
       return wallet;
     } else {
       const address = account.getAddress();
@@ -232,7 +235,15 @@ export class BotFactory {
     amm: AMMContract,
     token0: TokenContract,
     token1: TokenContract,
+    lpToken: TokenContract,
   ): Promise<void> {
+    const getPrivateBalances = () =>
+      Promise.all([
+        token0.methods.balance_of_private(wallet.getAddress()),
+        token1.methods.balance_of_private(wallet.getAddress()),
+        lpToken.methods.balance_of_private(wallet.getAddress()),
+      ]);
+
     const nonce = Fr.random();
 
     // keep some tokens for swapping
@@ -241,6 +252,12 @@ export class BotFactory {
     const amount1Max = MINT_BALANCE / 2;
     const amount1Min = MINT_BALANCE / 4;
 
+    const [t0Bal, t1Bal, lpBal] = await getPrivateBalances();
+
+    this.log.info(
+      `Minting ${MINT_BALANCE} tokens of each BotToken0 and BotToken1. Current private balances of ${wallet.getAddress()}: token0=${t0Bal}, token1=${t1Bal}, lp=${lpBal}`,
+    );
+
     const token0Authwit = await wallet.createAuthWit({
       caller: amm.address,
       action: token0.methods.transfer_to_public(wallet.getAddress(), amm.address, amount0Max, nonce),
@@ -250,7 +267,6 @@ export class BotFactory {
       action: token1.methods.transfer_to_public(wallet.getAddress(), amm.address, amount1Max, nonce),
     });
 
-    this.log.info(`Minting tokens`);
     const mintTx = new BatchCall(wallet, [
       token0.methods.mint_to_private(wallet.getAddress(), wallet.getAddress(), MINT_BALANCE),
       token1.methods.mint_to_private(wallet.getAddress(), wallet.getAddress(), MINT_BALANCE),
@@ -259,13 +275,18 @@ export class BotFactory {
     this.log.info(`Sent mint tx: ${await mintTx.getTxHash()}`);
     await mintTx.wait({ timeout: this.config.txMinedWaitSeconds });
 
-    this.log.info(`Funding AMM`);
     const addLiquidityTx = amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, nonce).send({
       authWitnesses: [token0Authwit, token1Authwit],
     });
 
     this.log.info(`Sent tx to add liquidity to the AMM: ${await addLiquidityTx.getTxHash()}`);
     await addLiquidityTx.wait({ timeout: this.config.txMinedWaitSeconds });
+    this.log.info(`Liquidity added`);
+
+    const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
+    this.log.info(
+      `Updated private balances of ${wallet.getAddress()} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`,
+    );
   }
 
   private async registerOrDeployContract<T extends ContractBase>(
@@ -345,9 +366,9 @@ export class BotFactory {
 
     const { l1ChainId } = await this.pxe.getNodeInfo();
     const chain = createEthereumChain(l1RpcUrls, l1ChainId);
-    const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+    const extendedClient = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
-    const portal = await L1FeeJuicePortalManager.new(this.pxe, publicClient, walletClient, this.log);
+    const portal = await L1FeeJuicePortalManager.new(this.pxe, extendedClient, this.log);
     const mintAmount = await portal.getTokenManager().getMintAmount();
     const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true /* mint */);