@aztec/bot 0.0.1-commit.b655e406 → 0.0.1-commit.b9865e97

package/src/factory.ts

@@ -1,5 +1,5 @@
-import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import {
   BatchCall,
@@ -7,56 +7,94 @@ import {
   ContractFunctionInteraction,
   type DeployMethod,
   type DeployOptions,
+  NO_WAIT,
 } from '@aztec/aztec.js/contracts';
-import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
 import type { L2AmountClaim } from '@aztec/aztec.js/ethereum';
+import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
 import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
+import { deriveKeys } from '@aztec/aztec.js/keys';
 import { createLogger } from '@aztec/aztec.js/log';
 import { waitForL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
-import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
-import { Fr } from '@aztec/foundation/fields';
+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';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { Timer } from '@aztec/foundation/timer';
 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 { GasSettings } from '@aztec/stdlib/gas';
+import { TestContract } from '@aztec/noir-test-contracts.js/Test';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import { GasFees, GasSettings, ManaUsageEstimate } from '@aztec/stdlib/gas';
 import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
-import { TestWallet } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import { type BotConfig, SupportedTokenContracts } from './config.js';
+import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
 import type { BotStore } from './store/index.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 {
   private log = createLogger('bot');
 
   constructor(
     private readonly config: BotConfig,
-    private readonly wallet: TestWallet,
+    private readonly wallet: EmbeddedWallet,
     private readonly store: BotStore,
     private readonly aztecNode: AztecNode,
     private readonly aztecNodeAdmin?: AztecNodeAdmin,
-  ) {}
+  ) {
+    // 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,
    * deploying the token contract, and minting tokens if necessary.
    */
-  public async setup() {
-    const recipient = (await this.wallet.createAccount()).address;
+  public async setup(): Promise<{
+    wallet: EmbeddedWallet;
+    defaultAccountAddress: AztecAddress;
+    token: TokenContract | PrivateTokenContract;
+    node: AztecNode;
+    recipient: AztecAddress;
+  }> {
     const defaultAccountAddress = await this.setupAccount();
-    const token = await this.setupToken(defaultAccountAddress);
+    const recipient = (await this.wallet.createSchnorrAccount(Fr.random(), Fr.random())).address;
+    const token = await this.setupTokenWithOptionalEarlyRefuel(defaultAccountAddress);
+    await this.ensureFeeJuiceBalance(defaultAccountAddress, token);
     await this.mintTokens(token, defaultAccountAddress);
     return { wallet: this.wallet, defaultAccountAddress, token, node: this.aztecNode, recipient };
   }
 
-  public async setupAmm() {
+  public async setupAmm(): Promise<{
+    wallet: EmbeddedWallet;
+    defaultAccountAddress: AztecAddress;
+    amm: AMMContract;
+    token0: TokenContract;
+    token1: TokenContract;
+    node: AztecNode;
+  }> {
     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,
@@ -78,6 +116,85 @@ export class BotFactory {
     return { wallet: this.wallet, defaultAccountAddress, amm, token0, token1, node: this.aztecNode };
   }
 
+  /**
+   * Initializes the cross-chain bot by deploying TestContract, creating an L1 client,
+   * seeding initial L1→L2 messages, and waiting for the first to be ready.
+   */
+  public async setupCrossChain(): Promise<{
+    wallet: EmbeddedWallet;
+    defaultAccountAddress: AztecAddress;
+    contract: TestContract;
+    node: AztecNode;
+    l1Client: ExtendedViemWalletClient;
+    rollupVersion: bigint;
+  }> {
+    const defaultAccountAddress = await this.setupAccount();
+
+    // Create L1 client (same pattern as bridgeL1FeeJuice)
+    const l1RpcUrls = this.config.l1RpcUrls;
+    if (!l1RpcUrls?.length) {
+      throw new Error('L1 RPC URLs required for cross-chain bot');
+    }
+    const mnemonicOrPrivateKey = this.config.l1PrivateKey?.getValue() ?? this.config.l1Mnemonic?.getValue();
+    if (!mnemonicOrPrivateKey) {
+      throw new Error('L1 mnemonic or private key required for cross-chain bot');
+    }
+    const { l1ChainId, l1ContractAddresses } = await this.aztecNode.getNodeInfo();
+    const chain = createEthereumChain(l1RpcUrls, l1ChainId);
+    const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+
+    // Fetch Rollup version (needed for Inbox L2Actor struct)
+    const rollupContract = new RollupContract(l1Client, l1ContractAddresses.rollupAddress.toString());
+    const rollupVersion = await rollupContract.getVersion();
+
+    // Deploy TestContract
+    const contract = await this.setupTestContract(defaultAccountAddress);
+
+    // Recover any pending messages from store (clean up stale ones first)
+    await this.store.cleanupOldPendingMessages();
+    const pendingMessages = await this.store.getUnconsumedL1ToL2Messages();
+
+    // Seed initial L1→L2 messages if pipeline is empty
+    const seedCount = Math.max(0, this.config.l1ToL2SeedCount - pendingMessages.length);
+    for (let i = 0; i < seedCount; i++) {
+      await seedL1ToL2Message(
+        l1Client,
+        EthAddress.fromString(l1ContractAddresses.inboxAddress.toString()),
+        contract.address,
+        rollupVersion,
+        this.store,
+        this.log,
+      );
+    }
+
+    // Block until at least one message is ready
+    const allMessages = await this.store.getUnconsumedL1ToL2Messages();
+    if (allMessages.length > 0) {
+      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,
+      });
+      this.log.info(`First L1→L2 message is ready`);
+    }
+
+    return {
+      wallet: this.wallet,
+      defaultAccountAddress,
+      contract,
+      node: this.aztecNode,
+      l1Client,
+      rollupVersion,
+    };
+  }
+
+  private async setupTestContract(deployer: AztecAddress): Promise<TestContract> {
+    const deployOpts: DeployOptions = { from: deployer };
+    const deploy = TestContract.deploy(this.wallet, { salt: this.config.tokenSalt, universalDeploy: true });
+    const instance = await this.registerOrDeployContract('TestContract', deploy, deployOpts);
+    return TestContract.at(instance.address, this.wallet);
+  }
+
   /**
    * Checks if the sender account contract is initialized, and initializes it if necessary.
    * @returns The sender wallet.
@@ -96,14 +213,9 @@ export class BotFactory {
   private async setupAccountWithPrivateKey(secret: Fr) {
     const salt = this.config.senderSalt ?? Fr.ONE;
     const signingKey = deriveSigningKey(secret);
-    const accountData = {
-      secret,
-      salt,
-      contract: new SchnorrAccountContract(signingKey!),
-    };
-    const accountManager = await this.wallet.createAccount(accountData);
-    const isInit = (await this.wallet.getContractMetadata(accountManager.address)).isContractInitialized;
-    if (isInit) {
+    const accountManager = await this.wallet.createSchnorrAccount(secret, salt, signingKey);
+    const metadata = await this.wallet.getContractMetadata(accountManager.address);
+    if (metadata.initializationStatus === ContractInitializationStatus.INITIALIZED) {
       this.log.info(`Account at ${accountManager.address.toString()} already initialized`);
       const timer = new Timer();
       const address = accountManager.address;
@@ -118,12 +230,16 @@ export class BotFactory {
 
       const paymentMethod = new FeeJuicePaymentMethodWithClaim(accountManager.address, claim);
       const deployMethod = await accountManager.getDeployMethod();
-      const maxFeesPerGas = (await this.aztecNode.getCurrentBaseFees()).mul(1 + this.config.baseFeePadding);
-      const gasSettings = GasSettings.default({ maxFeesPerGas });
-      const sentTx = deployMethod.send({ from: AztecAddress.ZERO, fee: { gasSettings, paymentMethod } });
-      const txHash = await sentTx.getTxHash();
-      this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`);
-      await this.withNoMinTxsPerBlock(() => sentTx.wait({ timeout: this.config.txMinedWaitSeconds }));
+
+      await this.withNoMinTxsPerBlock(async () => {
+        const { txHash } = await deployMethod.send({
+          from: NO_FROM,
+          fee: { paymentMethod },
+          wait: NO_WAIT,
+        });
+        this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`);
+        return waitForTx(this.aztecNode, txHash, { timeout: this.config.txMinedWaitSeconds });
+      });
       this.log.info(`Account deployed at ${address}`);
 
       // Clean up the consumed bridge claim
@@ -135,49 +251,113 @@ export class BotFactory {
 
   private async setupTestAccount() {
     const [initialAccountData] = await getInitialTestAccountsData();
-    const accountData = {
-      secret: initialAccountData.secret,
-      salt: initialAccountData.salt,
-      contract: new SchnorrAccountContract(initialAccountData.signingKey),
-    };
-    const accountManager = await this.wallet.createAccount(accountData);
+    const accountManager = await this.wallet.createSchnorrAccount(
+      initialAccountData.secret,
+      initialAccountData.salt,
+      initialAccountData.signingKey,
+    );
     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.
+   */
+  private async setupTokenWithOptionalEarlyRefuel(sender: AztecAddress): Promise<TokenContract | PrivateTokenContract> {
+    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.
+   */
+  private async setupTokenContractWithOptionalEarlyRefuel(
+    deployer: AztecAddress,
+    salt: Fr,
+    name: string,
+    ticker: string,
+    decimals = 18,
+  ): Promise<TokenContract> {
+    const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals, { salt, universalDeploy: true });
+    const instance = await deploy.getInstance();
+    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, salt, name, ticker, decimals);
+  }
+
+  private async getTokenInstance(sender: AztecAddress): Promise<TokenContract | PrivateTokenContract> {
+    const salt = this.config.tokenSalt;
+    if (this.config.contract === SupportedTokenContracts.TokenContract) {
+      const deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18, { salt, universalDeploy: true });
+      const instance = await deploy.getInstance();
+      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.deploy(this.wallet, MINT_BALANCE, sender, {
+        salt,
+        universalDeploy: true,
+        publicKeys: tokenPublicKeys,
+      });
+      const instance = await deploy.getInstance();
+      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.
    */
   private async setupToken(sender: AztecAddress): Promise<TokenContract | PrivateTokenContract> {
     let deploy: DeployMethod<TokenContract | PrivateTokenContract>;
-    const deployOpts: DeployOptions = {
-      from: sender,
-      contractAddressSalt: this.config.tokenSalt,
-      universalDeploy: true,
-    };
+    const salt = this.config.tokenSalt;
+    const deployOpts: DeployOptions = { from: sender };
+    let token: TokenContract | PrivateTokenContract;
     if (this.config.contract === SupportedTokenContracts.TokenContract) {
-      deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18);
+      deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18, { salt, universalDeploy: true });
+      const instance = await deploy.getInstance();
+      token = TokenContract.at(instance.address, this.wallet);
     } else if (this.config.contract === SupportedTokenContracts.PrivateTokenContract) {
-      deploy = PrivateTokenContract.deploy(this.wallet, MINT_BALANCE, sender);
+      // Generate keys for the contract since PrivateToken uses SinglePrivateMutable which requires keys
+      const tokenSecretKey = Fr.random();
+      const tokenPublicKeys = (await deriveKeys(tokenSecretKey)).publicKeys;
+      deploy = PrivateTokenContract.deploy(this.wallet, MINT_BALANCE, sender, {
+        salt,
+        universalDeploy: true,
+        publicKeys: tokenPublicKeys,
+      });
       deployOpts.skipInstancePublication = true;
       deployOpts.skipClassPublication = true;
       deployOpts.skipInitialization = false;
+
+      // Register the contract with the secret key before deployment
+      const tokenInstance = await deploy.getInstance();
+      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 = (await deploy.getInstance(deployOpts)).address;
-    if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
-      this.log.info(`Token at ${address.toString()} already deployed`);
-      return deploy.register();
-    } else {
-      this.log.info(`Deploying token contract at ${address.toString()}`);
-      const sentTx = deploy.send(deployOpts);
-      const txHash = await sentTx.getTxHash();
-      this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`);
-      return this.withNoMinTxsPerBlock(() => sentTx.deployed({ timeout: this.config.txMinedWaitSeconds }));
-    }
+    await this.registerOrDeployContract('token', deploy, deployOpts);
+    return token;
   }
 
   /**
@@ -185,33 +365,41 @@ export class BotFactory {
    * @param wallet - Wallet to deploy the token contract from.
    * @returns The TokenContract instance.
    */
-  private setupTokenContract(
+  private async setupTokenContract(
     deployer: AztecAddress,
-    contractAddressSalt: Fr,
+    salt: Fr,
     name: string,
     ticker: string,
     decimals = 18,
   ): Promise<TokenContract> {
-    const deployOpts: DeployOptions = { from: deployer, contractAddressSalt, universalDeploy: true };
-    const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals);
-    return this.registerOrDeployContract('Token - ' + name, deploy, deployOpts);
+    const deployOpts: DeployOptions = { from: deployer };
+    const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals, { salt, universalDeploy: true });
+    const instance = await this.registerOrDeployContract('Token - ' + name, deploy, deployOpts);
+    return TokenContract.at(instance.address, this.wallet);
   }
 
   private async setupAmmContract(
     deployer: AztecAddress,
-    contractAddressSalt: Fr,
+    salt: Fr,
     token0: TokenContract,
     token1: TokenContract,
     lpToken: TokenContract,
   ): Promise<AMMContract> {
-    const deployOpts: DeployOptions = { from: deployer, contractAddressSalt, universalDeploy: true };
-    const deploy = AMMContract.deploy(this.wallet, token0.address, token1.address, lpToken.address);
-    const amm = await this.registerOrDeployContract('AMM', deploy, deployOpts);
+    const deployOpts: DeployOptions = { from: deployer };
+    const deploy = AMMContract.deploy(this.wallet, token0.address, token1.address, lpToken.address, {
+      salt,
+      universalDeploy: true,
+    });
+    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 minterTx = lpToken.methods.set_minter(amm.address, true).send({ from: deployer });
-    this.log.info(`Set LP token minter to AMM txHash=${(await minterTx.getTxHash()).toString()}`);
-    await minterTx.wait({ timeout: this.config.txMinedWaitSeconds });
+    const setMinterInteraction = lpToken.methods.set_minter(amm.address, true);
+    const { receipt: minterReceipt } = await setMinterInteraction.send({
+      from: deployer,
+      wait: { timeout: this.config.txMinedWaitSeconds },
+    });
+    this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`);
     this.log.info(`Liquidity token initialized`);
 
     return amm;
@@ -227,9 +415,18 @@ export class BotFactory {
   ): Promise<void> {
     const getPrivateBalances = () =>
       Promise.all([
-        token0.methods.balance_of_private(liquidityProvider).simulate({ from: liquidityProvider }),
-        token1.methods.balance_of_private(liquidityProvider).simulate({ from: liquidityProvider }),
-        lpToken.methods.balance_of_private(liquidityProvider).simulate({ from: liquidityProvider }),
+        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();
@@ -270,23 +467,31 @@ export class BotFactory {
         .getFunctionCall(),
     });
 
-    const mintTx = 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({ from: liquidityProvider });
+    ]);
+    const { receipt: mintReceipt } = await mintBatch.send({
+      from: liquidityProvider,
+      wait: { timeout: this.config.txMinedWaitSeconds },
+    });
 
-    this.log.info(`Sent mint tx: ${(await mintTx.getTxHash()).toString()}`);
-    await mintTx.wait({ timeout: this.config.txMinedWaitSeconds });
+    this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
 
-    const addLiquidityTx = amm.methods
-      .add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce)
-      .send({
-        from: liquidityProvider,
-        authWitnesses: [token0Authwit, token1Authwit],
-      });
+    const addLiquidityInteraction = amm.methods.add_liquidity(
+      amount0Max,
+      amount1Max,
+      amount0Min,
+      amount1Min,
+      authwitNonce,
+    );
+    const { receipt: addLiquidityReceipt } = await addLiquidityInteraction.send({
+      from: liquidityProvider,
+      authWitnesses: [token0Authwit, token1Authwit],
+      wait: { timeout: this.config.txMinedWaitSeconds },
+    });
 
-    this.log.info(`Sent tx to add liquidity to the AMM: ${(await addLiquidityTx.getTxHash()).toString()}`);
-    await addLiquidityTx.wait({ timeout: this.config.txMinedWaitSeconds });
+    this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`);
     this.log.info(`Liquidity added`);
 
     const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
@@ -299,24 +504,118 @@ export class BotFactory {
     name: string,
     deploy: DeployMethod<T>,
     deployOpts: DeployOptions,
-  ): Promise<T> {
-    const address = (await deploy.getInstance(deployOpts)).address;
-    if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
+  ): Promise<ContractInstanceWithAddress> {
+    const instance = await deploy.getInstance();
+    const address = instance.address;
+    const metadata = await this.wallet.getContractMetadata(address);
+    if (metadata.isContractPublished) {
       this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
-      return deploy.register();
+      await deploy.register();
     } else {
-      this.log.info(`Deploying contract ${name} at ${address.toString()}`);
-      const sentTx = deploy.send(deployOpts);
-      const txHash = await sentTx.getTxHash();
-      this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
-      return this.withNoMinTxsPerBlock(() => sentTx.deployed({ timeout: this.config.txMinedWaitSeconds }));
+      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, fee: { estimateGas: true, paymentMethod } });
+        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.
    */
+  /**
+   * 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.
+   */
+  private async ensureFeeJuiceBalance(
+    account: AztecAddress,
+    token: TokenContract | PrivateTokenContract,
+  ): Promise<void> {
+    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()}`);
+  }
+
   private async mintTokens(token: TokenContract | PrivateTokenContract, minter: AztecAddress) {
     const isStandardToken = isStandardTokenContract(token);
     let privateBalance = 0n;
@@ -346,10 +645,19 @@ export class BotFactory {
       this.log.info(`Skipping minting as ${minter.toString()} has enough tokens`);
       return;
     }
-    const sentTx = new BatchCall(token.wallet, calls).send({ from: minter });
-    const txHash = await sentTx.getTxHash();
-    this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
-    await this.withNoMinTxsPerBlock(() => sentTx.wait({ timeout: this.config.txMinedWaitSeconds }));
+
+    // 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 mintBatch.send({
+        from: minter,
+        additionalScopes,
+        wait: NO_WAIT,
+      });
+      this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
+      return waitForTx(this.aztecNode, txHash, { timeout: this.config.txMinedWaitSeconds });
+    });
   }
 
   /**
@@ -369,7 +677,6 @@ export class BotFactory {
         await this.withNoMinTxsPerBlock(() =>
           waitForL1ToL2MessageReady(this.aztecNode, messageHash, {
             timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
-            forPublicConsumption: false,
           }),
         );
         return existingClaim.claim;
@@ -408,7 +715,6 @@ export class BotFactory {
     await this.withNoMinTxsPerBlock(() =>
       waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(claim.messageHash), {
         timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
-        forPublicConsumption: false,
       }),
     );
 
@@ -417,6 +723,19 @@ export class BotFactory {
     return claim as L2AmountClaim;
   }
 
+  /** Returns worst-case min fees across predicted slots, with fallback to current min fees. */
+  private async getMinFees(): Promise<GasFees> {
+    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();
+    }
+  }
+
   private async withNoMinTxsPerBlock<T>(fn: () => Promise<T>): Promise<T> {
     if (!this.aztecNodeAdmin || !this.config.flushSetupTransactions) {
       this.log.verbose(`No node admin client or flushing not requested (not setting minTxsPerBlock to 0)`);