@aztec/bot 0.0.1-commit.0c875d939 → 0.0.1-commit.0ec55a70b

package/dest/factory.js

@@ -1,5 +1,5 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
 import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
 import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
@@ -7,6 +7,8 @@ import { deriveKeys } from '@aztec/aztec.js/keys';
 import { createLogger } from '@aztec/aztec.js/log';
 import { waitForL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
 import { waitForTx } from '@aztec/aztec.js/node';
+import { getFeeJuiceBalance } from '@aztec/aztec.js/utils';
+import { ContractInitializationStatus } from '@aztec/aztec.js/wallet';
 import { createEthereumChain } from '@aztec/ethereum/chain';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { RollupContract } from '@aztec/ethereum/contracts';
@@ -17,13 +19,15 @@ 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 { TestContract } from '@aztec/noir-test-contracts.js/Test';
-import { GasSettings } from '@aztec/stdlib/gas';
+import { GasFees, GasSettings, ManaUsageEstimate } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { SupportedTokenContracts } from './config.js';
 import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
 import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
 const MINT_BALANCE = 1e12;
 const MIN_BALANCE = 1e3;
+const FEE_JUICE_TOP_UP_THRESHOLD = 100n * 10n ** 18n;
+const FEE_JUICE_TOP_UP_TARGET = 10_000n * 10n ** 18n;
 export class BotFactory {
     config;
     wallet;
@@ -38,6 +42,9 @@ export class BotFactory {
         this.aztecNode = aztecNode;
         this.aztecNodeAdmin = aztecNodeAdmin;
         this.log = createLogger('bot');
+        // Set fee padding on the wallet so that all transactions during setup
+        // (token deploy, minting, etc.) use the configured padding, not the default.
+        this.wallet.setMinFeePadding(config.minFeePadding);
     }
     /**
    * Initializes a new bot by setting up the sender account, registering the recipient,
@@ -45,7 +52,8 @@ export class BotFactory {
    */ async setup() {
         const defaultAccountAddress = await this.setupAccount();
         const recipient = (await this.wallet.createSchnorrAccount(Fr.random(), Fr.random())).address;
-        const token = await this.setupToken(defaultAccountAddress);
+        const token = await this.setupTokenWithOptionalEarlyRefuel(defaultAccountAddress);
+        await this.ensureFeeJuiceBalance(defaultAccountAddress, token);
         await this.mintTokens(token, defaultAccountAddress);
         return {
             wallet: this.wallet,
@@ -57,7 +65,8 @@ export class BotFactory {
     }
     async setupAmm() {
         const defaultAccountAddress = await this.setupAccount();
-        const token0 = await this.setupTokenContract(defaultAccountAddress, this.config.tokenSalt, 'BotToken0', 'BOT0');
+        const token0 = await this.setupTokenContractWithOptionalEarlyRefuel(defaultAccountAddress, this.config.tokenSalt, 'BotToken0', 'BOT0');
+        await this.ensureFeeJuiceBalance(defaultAccountAddress, token0);
         const token1 = await this.setupTokenContract(defaultAccountAddress, this.config.tokenSalt, 'BotToken1', 'BOT1');
         const liquidityToken = await this.setupTokenContract(defaultAccountAddress, this.config.tokenSalt, 'BotLPToken', 'BOTLP');
         const amm = await this.setupAmmContract(defaultAccountAddress, this.config.tokenSalt, token0, token1, liquidityToken);
@@ -108,12 +117,7 @@ export class BotFactory {
             this.log.info(`Waiting for first L1→L2 message to be ready...`);
             const firstMsg = allMessages[0];
             await waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(firstMsg.msgHash), {
-                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
-                // Use forPublicConsumption: false so we wait until the message is in the current world
-                // state. With true, it returns one block early which causes gas estimation simulation to
-                // fail since it runs against the current state.
-                // See https://linear.app/aztec-labs/issue/A-548 for details.
-                forPublicConsumption: false
+                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
             });
             this.log.info(`First L1→L2 message is ready`);
         }
@@ -154,7 +158,7 @@ export class BotFactory {
         const signingKey = deriveSigningKey(secret);
         const accountManager = await this.wallet.createSchnorrAccount(secret, salt, signingKey);
         const metadata = await this.wallet.getContractMetadata(accountManager.address);
-        if (metadata.isContractInitialized) {
+        if (metadata.initializationStatus === ContractInitializationStatus.INITIALIZED) {
             this.log.info(`Account at ${accountManager.address.toString()} already initialized`);
             const timer = new Timer();
             const address = accountManager.address;
@@ -167,15 +171,10 @@ export class BotFactory {
             const claim = await this.getOrCreateBridgeClaim(address);
             const paymentMethod = new FeeJuicePaymentMethodWithClaim(accountManager.address, claim);
             const deployMethod = await accountManager.getDeployMethod();
-            const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1 + this.config.minFeePadding);
-            const gasSettings = GasSettings.default({
-                maxFeesPerGas
-            });
             await this.withNoMinTxsPerBlock(async ()=>{
-                const txHash = await deployMethod.send({
-                    from: AztecAddress.ZERO,
+                const { txHash } = await deployMethod.send({
+                    from: NO_FROM,
                     fee: {
-                        gasSettings,
                         paymentMethod
                     },
                     wait: NO_WAIT
@@ -197,12 +196,70 @@ export class BotFactory {
         return accountManager.address;
     }
     /**
+   * Setup token and refuel first: if the token already exists (restart scenario),
+   * run ensureFeeJuiceBalance before any step that might need fee juice. When deploying,
+   * use a bridge claim if balance is below threshold.
+   */ async setupTokenWithOptionalEarlyRefuel(sender) {
+        const token = await this.getTokenInstance(sender);
+        const address = token.address;
+        const metadata = await this.wallet.getContractMetadata(address);
+        if (metadata.isContractPublished) {
+            this.log.info(`Token at ${address.toString()} already deployed, refueling before setup`);
+            await this.ensureFeeJuiceBalance(sender, token);
+        }
+        return this.setupToken(sender);
+    }
+    /**
+   * Setup token0 for AMM with refuel-first behaviour when token already exists.
+   */ async setupTokenContractWithOptionalEarlyRefuel(deployer, contractAddressSalt, name, ticker, decimals = 18) {
+        const deployOpts = {
+            from: deployer,
+            contractAddressSalt,
+            universalDeploy: true
+        };
+        const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals);
+        const instance = await deploy.getInstance(deployOpts);
+        const metadata = await this.wallet.getContractMetadata(instance.address);
+        if (metadata.isContractPublished) {
+            this.log.info(`Token ${name} at ${instance.address.toString()} already deployed, refueling before setup`);
+            const token = TokenContract.at(instance.address, this.wallet);
+            await this.ensureFeeJuiceBalance(deployer, token);
+        }
+        return this.setupTokenContract(deployer, contractAddressSalt, name, ticker, decimals);
+    }
+    async getTokenInstance(sender) {
+        const deployOpts = {
+            from: sender,
+            contractAddressSalt: this.config.tokenSalt,
+            universalDeploy: true
+        };
+        if (this.config.contract === SupportedTokenContracts.TokenContract) {
+            const deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18);
+            const instance = await deploy.getInstance(deployOpts);
+            return TokenContract.at(instance.address, this.wallet);
+        }
+        if (this.config.contract === SupportedTokenContracts.PrivateTokenContract) {
+            const tokenSecretKey = Fr.random();
+            const tokenPublicKeys = (await deriveKeys(tokenSecretKey)).publicKeys;
+            const deploy = PrivateTokenContract.deployWithPublicKeys(tokenPublicKeys, this.wallet, MINT_BALANCE, sender);
+            const instance = await deploy.getInstance({
+                ...deployOpts,
+                skipInstancePublication: true,
+                skipClassPublication: true,
+                skipInitialization: false
+            });
+            return PrivateTokenContract.at(instance.address, this.wallet);
+        }
+        throw new Error(`Unsupported token contract type: ${this.config.contract}`);
+    }
+    /**
    * Checks if the token contract is deployed and deploys it if necessary.
-   * @param wallet - Wallet to deploy the token contract from.
-   * @returns The TokenContract instance.
+   * Uses a bridge claim for deploy when balance is below threshold to avoid failing before refuel.
+   * @param sender - Aztec address to deploy the token contract from.
+   * @param existingToken - Optional token instance when called from setupTokenWithOptionalEarlyRefuel.
+   * @returns The TokenContract or PrivateTokenContract instance.
    */ async setupToken(sender) {
         let deploy;
-        let tokenInstance;
         const deployOpts = {
             from: sender,
             contractAddressSalt: this.config.tokenSalt,
@@ -211,8 +268,8 @@ export class BotFactory {
         let token;
         if (this.config.contract === SupportedTokenContracts.TokenContract) {
             deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18);
-            tokenInstance = await deploy.getInstance(deployOpts);
-            token = TokenContract.at(tokenInstance.address, this.wallet);
+            const instance = await deploy.getInstance(deployOpts);
+            token = TokenContract.at(instance.address, this.wallet);
         } else if (this.config.contract === SupportedTokenContracts.PrivateTokenContract) {
             // Generate keys for the contract since PrivateToken uses SinglePrivateMutable which requires keys
             const tokenSecretKey = Fr.random();
@@ -222,31 +279,17 @@ export class BotFactory {
             deployOpts.skipClassPublication = true;
             deployOpts.skipInitialization = false;
             // Register the contract with the secret key before deployment
-            tokenInstance = await deploy.getInstance(deployOpts);
+            const tokenInstance = await deploy.getInstance(deployOpts);
             token = PrivateTokenContract.at(tokenInstance.address, this.wallet);
             await this.wallet.registerContract(tokenInstance, PrivateTokenContract.artifact, tokenSecretKey);
+            // The contract constructor initializes private storage vars that need the contract's own nullifier key.
+            deployOpts.additionalScopes = [
+                tokenInstance.address
+            ];
         } else {
             throw new Error(`Unsupported token contract type: ${this.config.contract}`);
         }
-        const address = tokenInstance?.address ?? (await deploy.getInstance(deployOpts)).address;
-        const metadata = await this.wallet.getContractMetadata(address);
-        if (metadata.isContractPublished) {
-            this.log.info(`Token at ${address.toString()} already deployed`);
-            await deploy.register();
-        } else {
-            this.log.info(`Deploying token contract at ${address.toString()}`);
-            const txHash = await deploy.send({
-                ...deployOpts,
-                wait: NO_WAIT
-            });
-            this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`);
-            await this.withNoMinTxsPerBlock(async ()=>{
-                await waitForTx(this.aztecNode, txHash, {
-                    timeout: this.config.txMinedWaitSeconds
-                });
-                return token;
-            });
-        }
+        await this.registerOrDeployContract('token', deploy, deployOpts);
         return token;
     }
     /**
@@ -273,7 +316,8 @@ export class BotFactory {
         const instance = await this.registerOrDeployContract('AMM', deploy, deployOpts);
         const amm = AMMContract.at(instance.address, this.wallet);
         this.log.info(`AMM deployed at ${amm.address}`);
-        const minterReceipt = await lpToken.methods.set_minter(amm.address, true).send({
+        const setMinterInteraction = lpToken.methods.set_minter(amm.address, true);
+        const { receipt: minterReceipt } = await setMinterInteraction.send({
             from: deployer,
             wait: {
                 timeout: this.config.txMinedWaitSeconds
@@ -287,13 +331,13 @@ export class BotFactory {
         const getPrivateBalances = ()=>Promise.all([
                 token0.methods.balance_of_private(liquidityProvider).simulate({
                     from: liquidityProvider
-                }),
+                }).then((r)=>r.result),
                 token1.methods.balance_of_private(liquidityProvider).simulate({
                     from: liquidityProvider
-                }),
+                }).then((r)=>r.result),
                 lpToken.methods.balance_of_private(liquidityProvider).simulate({
                     from: liquidityProvider
-                })
+                }).then((r)=>r.result)
             ]);
         const authwitNonce = Fr.random();
         // keep some tokens for swapping
@@ -312,17 +356,19 @@ export class BotFactory {
             caller: amm.address,
             call: await token1.methods.transfer_to_public_and_prepare_private_balance_increase(liquidityProvider, amm.address, amount1Max, authwitNonce).getFunctionCall()
         });
-        const mintReceipt = await new BatchCall(this.wallet, [
+        const mintBatch = new BatchCall(this.wallet, [
             token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
             token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE)
-        ]).send({
+        ]);
+        const { receipt: mintReceipt } = await mintBatch.send({
             from: liquidityProvider,
             wait: {
                 timeout: this.config.txMinedWaitSeconds
             }
         });
         this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
-        const addLiquidityReceipt = await amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
+        const addLiquidityInteraction = amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce);
+        const { receipt: addLiquidityReceipt } = await addLiquidityInteraction.send({
             from: liquidityProvider,
             authWitnesses: [
                 token0Authwit,
@@ -345,24 +391,127 @@ export class BotFactory {
             this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
             await deploy.register();
         } else {
-            this.log.info(`Deploying contract ${name} at ${address.toString()}`);
-            await this.withNoMinTxsPerBlock(async ()=>{
-                const txHash = await deploy.send({
+            const sender = deployOpts.from === NO_FROM ? undefined : deployOpts.from;
+            const balance = sender ? await getFeeJuiceBalance(sender, this.aztecNode) : 0n;
+            const useClaim = sender && balance < FEE_JUICE_TOP_UP_THRESHOLD && this.config.feePaymentMethod === 'fee_juice' && !!this.config.l1RpcUrls?.length;
+            const mnemonicOrPrivateKey = this.config.l1PrivateKey?.getValue() ?? this.config.l1Mnemonic?.getValue();
+            if (useClaim && mnemonicOrPrivateKey) {
+                const claim = await this.getOrCreateBridgeClaim(sender);
+                const paymentMethod = new FeeJuicePaymentMethodWithClaim(sender, claim);
+                const { estimatedGas } = await deploy.simulate({
                     ...deployOpts,
-                    wait: NO_WAIT
+                    fee: {
+                        estimateGas: true,
+                        paymentMethod
+                    }
                 });
-                this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
-                return waitForTx(this.aztecNode, txHash, {
-                    timeout: this.config.txMinedWaitSeconds
+                const maxFeesPerGas = (await this.getMinFees()).mul(1 + this.config.minFeePadding);
+                const gasSettings = GasSettings.from({
+                    ...estimatedGas,
+                    maxFeesPerGas,
+                    maxPriorityFeesPerGas: GasFees.empty()
                 });
-            });
+                await this.withNoMinTxsPerBlock(async ()=>{
+                    const { txHash } = await deploy.send({
+                        ...deployOpts,
+                        fee: {
+                            gasSettings,
+                            paymentMethod
+                        },
+                        wait: NO_WAIT
+                    });
+                    this.log.info(`Sent contract ${name} deploy tx ${txHash.toString()} (using bridge claim, balance was ${balance})`);
+                    return waitForTx(this.aztecNode, txHash, {
+                        timeout: this.config.txMinedWaitSeconds
+                    });
+                });
+                await this.store.deleteBridgeClaim(sender);
+            } else {
+                const { estimatedGas } = await deploy.simulate({
+                    ...deployOpts,
+                    fee: {
+                        estimateGas: true
+                    }
+                });
+                this.log.info(`Deploying contract ${name} at ${address.toString()}`, {
+                    estimatedGas
+                });
+                await this.withNoMinTxsPerBlock(async ()=>{
+                    const { txHash } = await deploy.send({
+                        ...deployOpts,
+                        fee: {
+                            gasSettings: estimatedGas
+                        },
+                        wait: NO_WAIT
+                    });
+                    this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
+                    return waitForTx(this.aztecNode, txHash, {
+                        timeout: this.config.txMinedWaitSeconds
+                    });
+                });
+            }
         }
         return instance;
     }
     /**
    * Mints private and public tokens for the sender if their balance is below the minimum.
    * @param token - Token contract.
-   */ async mintTokens(token, minter) {
+   */ /**
+   * Ensures the account has sufficient fee juice by bridging from L1 if balance is below threshold.
+   * Bridges repeatedly until balance reaches the target (10k FJ).
+   * Used on startup/restart to top up when the account has run out after previous runs.
+   */ async ensureFeeJuiceBalance(account, token) {
+        const { feePaymentMethod, l1RpcUrls } = this.config;
+        if (feePaymentMethod !== 'fee_juice' || !l1RpcUrls?.length) {
+            return;
+        }
+        const mnemonicOrPrivateKey = this.config.l1PrivateKey?.getValue() ?? this.config.l1Mnemonic?.getValue();
+        if (!mnemonicOrPrivateKey) {
+            return;
+        }
+        let balance = await getFeeJuiceBalance(account, this.aztecNode);
+        if (balance >= FEE_JUICE_TOP_UP_THRESHOLD) {
+            this.log.info(`Fee juice balance ${balance} above threshold ${FEE_JUICE_TOP_UP_THRESHOLD}, skipping top-up`);
+            return;
+        }
+        this.log.info(`Fee juice balance ${balance} below threshold ${FEE_JUICE_TOP_UP_THRESHOLD}, bridging from L1 until ${FEE_JUICE_TOP_UP_TARGET}`);
+        const maxFeesPerGas = (await this.getMinFees()).mul(1 + this.config.minFeePadding);
+        const minimalInteraction = isStandardTokenContract(token) ? token.methods.transfer_in_public(account, account, 0n, 0) : token.methods.transfer(0n, account, account);
+        while(balance < FEE_JUICE_TOP_UP_TARGET){
+            const claim = await this.bridgeL1FeeJuice(account);
+            const paymentMethod = new FeeJuicePaymentMethodWithClaim(account, claim);
+            const { estimatedGas } = await minimalInteraction.simulate({
+                from: account,
+                fee: {
+                    estimateGas: true,
+                    paymentMethod
+                }
+            });
+            const gasSettings = GasSettings.from({
+                ...estimatedGas,
+                maxFeesPerGas,
+                maxPriorityFeesPerGas: GasFees.empty()
+            });
+            await this.withNoMinTxsPerBlock(async ()=>{
+                const { txHash } = await minimalInteraction.send({
+                    from: account,
+                    fee: {
+                        gasSettings,
+                        paymentMethod
+                    },
+                    wait: NO_WAIT
+                });
+                this.log.info(`Sent fee juice top-up tx ${txHash.toString()}`);
+                return waitForTx(this.aztecNode, txHash, {
+                    timeout: this.config.txMinedWaitSeconds
+                });
+            });
+            balance = await getFeeJuiceBalance(account, this.aztecNode);
+            this.log.info(`Fee juice balance after top-up: ${balance}`);
+        }
+        this.log.info(`Fee juice top-up complete for ${account.toString()}`);
+    }
+    async mintTokens(token, minter) {
         const isStandardToken = isStandardTokenContract(token);
         let privateBalance = 0n;
         let publicBalance = 0n;
@@ -384,9 +533,15 @@ export class BotFactory {
             this.log.info(`Skipping minting as ${minter.toString()} has enough tokens`);
             return;
         }
+        // PrivateToken's mint accesses contract-level private storage vars (admin, total_supply).
+        const additionalScopes = isStandardToken ? undefined : [
+            token.address
+        ];
+        const mintBatch = new BatchCall(token.wallet, calls);
         await this.withNoMinTxsPerBlock(async ()=>{
-            const txHash = await new BatchCall(token.wallet, calls).send({
+            const { txHash } = await mintBatch.send({
                 from: minter,
+                additionalScopes,
                 wait: NO_WAIT
             });
             this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
@@ -408,8 +563,7 @@ export class BotFactory {
             try {
                 const messageHash = Fr.fromHexString(existingClaim.claim.messageHash);
                 await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.aztecNode, messageHash, {
-                        timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
-                        forPublicConsumption: false
+                        timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
                     }));
                 return existingClaim.claim;
             } catch (err) {
@@ -437,12 +591,22 @@ export class BotFactory {
         const mintAmount = await portal.getTokenManager().getMintAmount();
         const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true);
         await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(claim.messageHash), {
-                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
-                forPublicConsumption: false
+                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
             }));
         this.log.info(`Created a claim for ${mintAmount} L1 fee juice to ${recipient}.`, claim);
         return claim;
     }
+    /** Returns worst-case min fees across predicted slots, with fallback to current min fees. */ async getMinFees() {
+        try {
+            const predicted = await this.aztecNode.getPredictedMinFees(ManaUsageEstimate.Limit);
+            if (predicted.length === 0) {
+                return this.aztecNode.getCurrentMinFees();
+            }
+            return predicted.reduce((worst, fees)=>fees.feePerL2Gas > worst.feePerL2Gas ? fees : worst);
+        } catch  {
+            return this.aztecNode.getCurrentMinFees();
+        }
+    }
     async withNoMinTxsPerBlock(fn) {
         if (!this.aztecNodeAdmin || !this.config.flushSetupTransactions) {
             this.log.verbose(`No node admin client or flushing not requested (not setting minTxsPerBlock to 0)`);

package/dest/utils.js

@@ -4,10 +4,10 @@
  * @param who - Address to get the balance for.
  * @returns - Private and public token balances as bigints.
  */ export async function getBalances(token, who, from) {
-    const privateBalance = await token.methods.balance_of_private(who).simulate({
+    const { result: privateBalance } = await token.methods.balance_of_private(who).simulate({
         from: from ?? who
     });
-    const publicBalance = await token.methods.balance_of_public(who).simulate({
+    const { result: publicBalance } = await token.methods.balance_of_public(who).simulate({
         from: from ?? who
     });
     return {
@@ -16,7 +16,7 @@
     };
 }
 export async function getPrivateBalance(token, who, from) {
-    const privateBalance = await token.methods.get_balance(who).simulate({
+    const { result: privateBalance } = await token.methods.get_balance(who).simulate({
         from: from ?? who
     });
     return privateBalance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "0.0.1-commit.0c875d939",
+  "version": "0.0.1-commit.0ec55a70b",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,20 +54,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.0c875d939",
-    "@aztec/aztec.js": "0.0.1-commit.0c875d939",
-    "@aztec/entrypoints": "0.0.1-commit.0c875d939",
-    "@aztec/ethereum": "0.0.1-commit.0c875d939",
-    "@aztec/foundation": "0.0.1-commit.0c875d939",
-    "@aztec/kv-store": "0.0.1-commit.0c875d939",
-    "@aztec/l1-artifacts": "0.0.1-commit.0c875d939",
-    "@aztec/noir-contracts.js": "0.0.1-commit.0c875d939",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.0c875d939",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.0c875d939",
-    "@aztec/protocol-contracts": "0.0.1-commit.0c875d939",
-    "@aztec/stdlib": "0.0.1-commit.0c875d939",
-    "@aztec/telemetry-client": "0.0.1-commit.0c875d939",
-    "@aztec/wallets": "0.0.1-commit.0c875d939",
+    "@aztec/accounts": "0.0.1-commit.0ec55a70b",
+    "@aztec/aztec.js": "0.0.1-commit.0ec55a70b",
+    "@aztec/entrypoints": "0.0.1-commit.0ec55a70b",
+    "@aztec/ethereum": "0.0.1-commit.0ec55a70b",
+    "@aztec/foundation": "0.0.1-commit.0ec55a70b",
+    "@aztec/kv-store": "0.0.1-commit.0ec55a70b",
+    "@aztec/l1-artifacts": "0.0.1-commit.0ec55a70b",
+    "@aztec/noir-contracts.js": "0.0.1-commit.0ec55a70b",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.0ec55a70b",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.0ec55a70b",
+    "@aztec/protocol-contracts": "0.0.1-commit.0ec55a70b",
+    "@aztec/stdlib": "0.0.1-commit.0ec55a70b",
+    "@aztec/telemetry-client": "0.0.1-commit.0ec55a70b",
+    "@aztec/wallets": "0.0.1-commit.0ec55a70b",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2",

package/src/amm_bot.ts

@@ -71,12 +71,14 @@ export class AmmBot extends BaseBot {
         .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,
-      )
+    const { result: tokenInBalance } = await tokenIn.methods
+      .balance_of_public(amm.address)
+      .simulate({ from: this.defaultAccountAddress });
+    const { result: tokenOutBalance } = await tokenOut.methods
+      .balance_of_public(amm.address)
+      .simulate({ from: this.defaultAccountAddress });
+    const { result: amountOutMin } = await amm.methods
+      .get_amount_out_for_exact_in(tokenInBalance, tokenOutBalance, amountIn)
       .simulate({ from: this.defaultAccountAddress });
 
     const swapExactTokensInteraction = amm.methods
@@ -85,11 +87,12 @@ export class AmmBot extends BaseBot {
         authWitnesses: [swapAuthwit],
       });
 
-    const opts = await this.getSendMethodOpts(swapExactTokensInteraction);
+    const opts = this.getSendMethodOpts();
 
     this.log.verbose(`Sending transaction`, logCtx);
     this.log.info(`Tx. Balances: ${jsonStringify(balances)}`, { ...logCtx, balances });
-    return swapExactTokensInteraction.send({ ...opts, wait: NO_WAIT });
+    const { txHash } = await swapExactTokensInteraction.send({ ...opts, wait: NO_WAIT });
+    return txHash;
   }
 
   protected override async onTxMined(receipt: TxReceipt, logCtx: object): Promise<void> {
@@ -110,15 +113,17 @@ export class AmmBot extends BaseBot {
   }
 
   private async getPublicBalanceFor(address: AztecAddress, from?: AztecAddress): Promise<Balances> {
-    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 }),
-    };
+    const { result: token0 } = await this.token0.methods.balance_of_public(address).simulate({ from: from ?? address });
+    const { result: token1 } = await this.token1.methods.balance_of_public(address).simulate({ from: from ?? address });
+    return { token0, token1 };
   }
   private async getPrivateBalanceFor(address: AztecAddress, from?: AztecAddress): Promise<Balances> {
-    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 }),
-    };
+    const { result: token0 } = await this.token0.methods
+      .balance_of_private(address)
+      .simulate({ from: from ?? address });
+    const { result: token1 } = await this.token1.methods
+      .balance_of_private(address)
+      .simulate({ from: from ?? address });
+    return { token0, token1 };
   }
 }

package/src/base_bot.ts

@@ -1,5 +1,5 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { BatchCall, ContractFunctionInteraction, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
+import type { SendInteractionOptions } from '@aztec/aztec.js/contracts';
 import { createLogger } from '@aztec/aztec.js/log';
 import { waitForTx } from '@aztec/aztec.js/node';
 import { TxHash, TxReceipt, TxStatus } from '@aztec/aztec.js/tx';
@@ -56,27 +56,19 @@ export abstract class BaseBot {
     return Promise.resolve();
   }
 
-  protected async getSendMethodOpts(
-    interaction: ContractFunctionInteraction | BatchCall,
-  ): Promise<SendInteractionOptions> {
+  protected getSendMethodOpts(): SendInteractionOptions {
     const { l2GasLimit, daGasLimit, minFeePadding } = this.config;
 
     this.wallet.setMinFeePadding(minFeePadding);
 
-    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,
-      }));
-    }
+    const gasSettings =
+      l2GasLimit !== undefined && l2GasLimit > 0 && daGasLimit !== undefined && daGasLimit > 0
+        ? { gasLimits: Gas.from({ l2Gas: l2GasLimit, daGas: daGasLimit }) }
+        : undefined;
+
     return {
       from: this.defaultAccountAddress,
-      fee: { gasSettings },
+      ...(gasSettings ? { fee: { gasSettings } } : {}),
     };
   }
 }

package/src/bot.ts

@@ -70,13 +70,11 @@ export class Bot extends BaseBot {
         );
 
     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 });
+    const opts = this.getSendMethodOpts();
 
     this.log.verbose(`Sending transaction`, logCtx);
-    return batch.send({ ...opts, wait: NO_WAIT });
+    const { txHash } = await batch.send({ ...opts, wait: NO_WAIT });
+    return txHash;
   }
 
   public async getBalances() {