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

package/dest/config.d.ts

@@ -1,5 +1,6 @@
-import { type ConfigMappingsType } from '@aztec/foundation/config';
+import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
+import { type DataStoreConfig } from '@aztec/kv-store/config';
 import { type ZodFor } from '@aztec/stdlib/schemas';
 import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 import { z } from 'zod';
@@ -7,24 +8,26 @@ declare const BotFollowChain: readonly ["NONE", "PENDING", "PROVEN"];
 type BotFollowChain = (typeof BotFollowChain)[number];
 export declare enum SupportedTokenContracts {
     TokenContract = "TokenContract",
-    EasyPrivateTokenContract = "EasyPrivateTokenContract"
+    PrivateTokenContract = "PrivateTokenContract"
 }
 export type BotConfig = {
     /** The URL to the Aztec node to check for tx pool status. */
     nodeUrl: string | undefined;
-    /** URL to the PXE for sending txs, or undefined if an in-proc PXE is used. */
-    pxeUrl: string | undefined;
+    /** The URL to the Aztec node admin API to force-flush txs if configured. */
+    nodeAdminUrl: string | undefined;
     /** Url of the ethereum host. */
     l1RpcUrls: string[] | undefined;
     /** The mnemonic for the account to bridge fee juice from L1. */
-    l1Mnemonic: string | undefined;
+    l1Mnemonic: SecretValue<string> | undefined;
     /** The private key for the account to bridge fee juice from L1. */
-    l1PrivateKey: string | undefined;
+    l1PrivateKey: SecretValue<string> | undefined;
+    /** How long to wait for L1 to L2 messages to become available on L2 */
+    l1ToL2MessageTimeoutSeconds: number;
     /** Signing private key for the sender account. */
-    senderPrivateKey: Fr | undefined;
-    /** Encryption secret for a recipient account. */
-    recipientEncryptionSecret: Fr;
-    /** Salt for the token contract deployment. */
+    senderPrivateKey: SecretValue<Fr> | undefined;
+    /** Optional salt to use to instantiate the sender account */
+    senderSalt: Fr | undefined;
+    /** Salt for the token contract instantiation. */
     tokenSalt: Fr;
     /** Every how many seconds should a new tx be sent. */
     txIntervalSeconds: number;
@@ -34,6 +37,8 @@ export type BotConfig = {
     publicTransfersPerTx: number;
     /** How to handle fee payments. */
     feePaymentMethod: 'fee_juice';
+    /** 'How much is the bot willing to overpay vs. the current base fee' */
+    baseFeePadding: number;
     /** True to not automatically setup or start the bot on initialization. */
     noStart: boolean;
     /** How long to wait for a tx to be mined before reporting an error. */
@@ -44,8 +49,6 @@ export type BotConfig = {
     maxPendingTxs: number;
     /** Whether to flush after sending each 'setup' transaction */
     flushSetupTransactions: boolean;
-    /** Whether to skip public simulation of txs before sending them. */
-    skipPublicSimulation: boolean;
     /** L2 gas limit for the tx (empty to have the bot trigger an estimate gas). */
     l2GasLimit: number | undefined;
     /** DA gas limit for the tx (empty to have the bot trigger an estimate gas). */
@@ -56,127 +59,149 @@ export type BotConfig = {
     maxConsecutiveErrors: number;
     /** Stops the bot if service becomes unhealthy */
     stopWhenUnhealthy: boolean;
-};
+    /** Deploy an AMM contract and do swaps instead of transfers */
+    ammTxs: boolean;
+} & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'>;
 export declare const BotConfigSchema: z.ZodEffects<z.ZodObject<{
     nodeUrl: z.ZodOptional<z.ZodString>;
-    pxeUrl: z.ZodOptional<z.ZodString>;
+    nodeAdminUrl: z.ZodOptional<z.ZodString>;
     l1RpcUrls: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    l1Mnemonic: z.ZodOptional<z.ZodString>;
-    l1PrivateKey: z.ZodOptional<z.ZodString>;
-    senderPrivateKey: z.ZodOptional<ZodFor<Fr>>;
-    recipientEncryptionSecret: ZodFor<Fr>;
+    l1Mnemonic: z.ZodOptional<z.ZodType<SecretValue<string>, any, any>>;
+    l1PrivateKey: z.ZodOptional<z.ZodType<SecretValue<string>, any, any>>;
+    l1ToL2MessageTimeoutSeconds: z.ZodNumber;
+    senderPrivateKey: z.ZodOptional<z.ZodType<SecretValue<Fr>, any, any>>;
+    senderSalt: z.ZodOptional<ZodFor<Fr>>;
     tokenSalt: ZodFor<Fr>;
     txIntervalSeconds: z.ZodNumber;
     privateTransfersPerTx: z.ZodNumber;
     publicTransfersPerTx: z.ZodNumber;
     feePaymentMethod: z.ZodLiteral<"fee_juice">;
+    baseFeePadding: z.ZodNumber;
     noStart: z.ZodBoolean;
     txMinedWaitSeconds: z.ZodNumber;
     followChain: z.ZodEnum<["NONE", "PENDING", "PROVEN"]>;
     maxPendingTxs: z.ZodNumber;
     flushSetupTransactions: z.ZodBoolean;
-    skipPublicSimulation: z.ZodBoolean;
     l2GasLimit: z.ZodOptional<z.ZodNumber>;
     daGasLimit: z.ZodOptional<z.ZodNumber>;
     contract: z.ZodNativeEnum<typeof SupportedTokenContracts>;
     maxConsecutiveErrors: z.ZodNumber;
     stopWhenUnhealthy: z.ZodBoolean;
+    ammTxs: z.ZodDefault<z.ZodBoolean>;
+    dataDirectory: z.ZodOptional<z.ZodString>;
+    dataStoreMapSizeKb: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
-    recipientEncryptionSecret: Fr;
+    l1ToL2MessageTimeoutSeconds: number;
     tokenSalt: Fr;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
-    skipPublicSimulation: boolean;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    ammTxs: boolean;
+    dataDirectory?: string | undefined;
+    dataStoreMapSizeKb?: number | undefined;
     nodeUrl?: string | undefined;
-    pxeUrl?: string | undefined;
+    nodeAdminUrl?: string | undefined;
     l1RpcUrls?: string[] | undefined;
-    l1Mnemonic?: string | undefined;
-    l1PrivateKey?: string | undefined;
-    senderPrivateKey?: Fr | undefined;
+    l1Mnemonic?: SecretValue<string> | undefined;
+    l1PrivateKey?: SecretValue<string> | undefined;
+    senderPrivateKey?: SecretValue<Fr> | undefined;
+    senderSalt?: Fr | undefined;
     l2GasLimit?: number | undefined;
     daGasLimit?: number | undefined;
 }, {
+    l1ToL2MessageTimeoutSeconds: number;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
-    skipPublicSimulation: boolean;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    dataDirectory?: string | undefined;
+    dataStoreMapSizeKb?: number | undefined;
     nodeUrl?: string | undefined;
-    pxeUrl?: string | undefined;
+    nodeAdminUrl?: string | undefined;
     l1RpcUrls?: string[] | undefined;
-    l1Mnemonic?: string | undefined;
-    l1PrivateKey?: string | undefined;
+    l1Mnemonic?: any;
+    l1PrivateKey?: any;
     senderPrivateKey?: any;
-    recipientEncryptionSecret?: any;
+    senderSalt?: any;
     tokenSalt?: any;
     l2GasLimit?: number | undefined;
     daGasLimit?: number | undefined;
+    ammTxs?: boolean | undefined;
 }>, {
-    recipientEncryptionSecret: Fr;
+    l1ToL2MessageTimeoutSeconds: number;
     tokenSalt: Fr;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
-    skipPublicSimulation: boolean;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    ammTxs: boolean;
+    dataDirectory: string | undefined;
+    dataStoreMapSizeKb: number;
     nodeUrl: string | undefined;
-    pxeUrl: string | undefined;
+    nodeAdminUrl: string | undefined;
     l1RpcUrls: string[] | undefined;
-    l1Mnemonic: string | undefined;
-    l1PrivateKey: string | undefined;
-    senderPrivateKey: Fr | undefined;
+    l1Mnemonic: SecretValue<string> | undefined;
+    l1PrivateKey: SecretValue<string> | undefined;
+    senderPrivateKey: SecretValue<Fr> | undefined;
+    senderSalt: Fr | undefined;
     l2GasLimit: number | undefined;
     daGasLimit: number | undefined;
 }, {
+    l1ToL2MessageTimeoutSeconds: number;
     txIntervalSeconds: number;
     privateTransfersPerTx: number;
     publicTransfersPerTx: number;
     feePaymentMethod: "fee_juice";
+    baseFeePadding: number;
     noStart: boolean;
     txMinedWaitSeconds: number;
     followChain: "NONE" | "PENDING" | "PROVEN";
     maxPendingTxs: number;
     flushSetupTransactions: boolean;
-    skipPublicSimulation: boolean;
     contract: SupportedTokenContracts;
     maxConsecutiveErrors: number;
     stopWhenUnhealthy: boolean;
+    dataDirectory?: string | undefined;
+    dataStoreMapSizeKb?: number | undefined;
     nodeUrl?: string | undefined;
-    pxeUrl?: string | undefined;
+    nodeAdminUrl?: string | undefined;
     l1RpcUrls?: string[] | undefined;
-    l1Mnemonic?: string | undefined;
-    l1PrivateKey?: string | undefined;
+    l1Mnemonic?: any;
+    l1PrivateKey?: any;
     senderPrivateKey?: any;
-    recipientEncryptionSecret?: any;
+    senderSalt?: any;
     tokenSalt?: any;
     l2GasLimit?: number | undefined;
     daGasLimit?: number | undefined;
+    ammTxs?: boolean | undefined;
 }>;
 export declare const botConfigMappings: ConfigMappingsType<BotConfig>;
 export declare function getBotConfigFromEnv(): BotConfig;

package/dest/config.d.ts.map

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

package/dest/config.js

@@ -1,7 +1,8 @@
-import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
+import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper, pickConfigMappings, secretFrConfigHelper, secretStringConfigHelper } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
+import { dataConfigMappings } from '@aztec/kv-store/config';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { schemas } from '@aztec/stdlib/schemas';
 import { z } from 'zod';
 const BotFollowChain = [
@@ -11,42 +12,49 @@ const BotFollowChain = [
 ];
 export var SupportedTokenContracts = /*#__PURE__*/ function(SupportedTokenContracts) {
     SupportedTokenContracts["TokenContract"] = "TokenContract";
-    SupportedTokenContracts["EasyPrivateTokenContract"] = "EasyPrivateTokenContract";
+    SupportedTokenContracts["PrivateTokenContract"] = "PrivateTokenContract";
     return SupportedTokenContracts;
 }({});
 export const BotConfigSchema = z.object({
     nodeUrl: z.string().optional(),
-    pxeUrl: z.string().optional(),
+    nodeAdminUrl: z.string().optional(),
     l1RpcUrls: z.array(z.string()).optional(),
-    l1Mnemonic: z.string().optional(),
-    l1PrivateKey: z.string().optional(),
-    senderPrivateKey: schemas.Fr.optional(),
-    recipientEncryptionSecret: schemas.Fr,
+    l1Mnemonic: schemas.SecretValue(z.string()).optional(),
+    l1PrivateKey: schemas.SecretValue(z.string()).optional(),
+    l1ToL2MessageTimeoutSeconds: z.number(),
+    senderPrivateKey: schemas.SecretValue(schemas.Fr).optional(),
+    senderSalt: schemas.Fr.optional(),
     tokenSalt: schemas.Fr,
     txIntervalSeconds: z.number(),
     privateTransfersPerTx: z.number().int().nonnegative(),
     publicTransfersPerTx: z.number().int().nonnegative(),
     feePaymentMethod: z.literal('fee_juice'),
+    baseFeePadding: z.number().int().nonnegative(),
     noStart: z.boolean(),
     txMinedWaitSeconds: z.number(),
     followChain: z.enum(BotFollowChain),
     maxPendingTxs: z.number().int().nonnegative(),
     flushSetupTransactions: z.boolean(),
-    skipPublicSimulation: z.boolean(),
     l2GasLimit: z.number().int().nonnegative().optional(),
     daGasLimit: z.number().int().nonnegative().optional(),
     contract: z.nativeEnum(SupportedTokenContracts),
     maxConsecutiveErrors: z.number().int().nonnegative(),
-    stopWhenUnhealthy: z.boolean()
+    stopWhenUnhealthy: z.boolean(),
+    ammTxs: z.boolean().default(false),
+    dataDirectory: z.string().optional(),
+    dataStoreMapSizeKb: z.number().optional()
 }).transform((config)=>({
         nodeUrl: undefined,
-        pxeUrl: undefined,
+        nodeAdminUrl: undefined,
         l1RpcUrls: undefined,
+        senderSalt: undefined,
+        l2GasLimit: undefined,
+        daGasLimit: undefined,
         l1Mnemonic: undefined,
         l1PrivateKey: undefined,
         senderPrivateKey: undefined,
-        l2GasLimit: undefined,
-        daGasLimit: undefined,
+        dataDirectory: undefined,
+        dataStoreMapSizeKb: 1_024 * 1_024,
         ...config
     }));
 export const botConfigMappings = {
@@ -54,9 +62,9 @@ export const botConfigMappings = {
         env: 'AZTEC_NODE_URL',
         description: 'The URL to the Aztec node to check for tx pool status.'
     },
-    pxeUrl: {
-        env: 'BOT_PXE_URL',
-        description: 'URL to the PXE for sending txs, or undefined if an in-proc PXE is used.'
+    nodeAdminUrl: {
+        env: 'AZTEC_NODE_ADMIN_URL',
+        description: 'The URL to the Aztec node admin API to force-flush txs if configured.'
     },
     l1RpcUrls: {
         env: 'ETHEREUM_HOSTS',
@@ -65,26 +73,32 @@ export const botConfigMappings = {
     },
     l1Mnemonic: {
         env: 'BOT_L1_MNEMONIC',
-        description: 'The mnemonic for the account to bridge fee juice from L1.'
+        description: 'The mnemonic for the account to bridge fee juice from L1.',
+        ...secretStringConfigHelper()
     },
     l1PrivateKey: {
         env: 'BOT_L1_PRIVATE_KEY',
-        description: 'The private key for the account to bridge fee juice from L1.'
+        description: 'The private key for the account to bridge fee juice from L1.',
+        ...secretStringConfigHelper()
+    },
+    l1ToL2MessageTimeoutSeconds: {
+        env: 'BOT_L1_TO_L2_TIMEOUT_SECONDS',
+        description: 'How long to wait for L1 to L2 messages to become available on L2',
+        ...numberConfigHelper(3600)
     },
     senderPrivateKey: {
         env: 'BOT_PRIVATE_KEY',
         description: 'Signing private key for the sender account.',
-        parseEnv: (val)=>val ? Fr.fromHexString(val) : undefined
+        ...secretFrConfigHelper()
     },
-    recipientEncryptionSecret: {
-        env: 'BOT_RECIPIENT_ENCRYPTION_SECRET',
-        description: 'Encryption secret for a recipient account.',
-        parseEnv: (val)=>Fr.fromHexString(val),
-        defaultValue: Fr.fromHexString('0xcafecafe')
+    senderSalt: {
+        env: 'BOT_ACCOUNT_SALT',
+        description: 'The salt to use to deploy the sender account.',
+        parseEnv: (val)=>val ? Fr.fromHexString(val) : undefined
     },
     tokenSalt: {
         env: 'BOT_TOKEN_SALT',
-        description: 'Salt for the token contract deployment.',
+        description: 'The salt to use to deploy the token contract.',
         parseEnv: (val)=>Fr.fromHexString(val),
         defaultValue: Fr.fromHexString('1')
     },
@@ -109,6 +123,11 @@ export const botConfigMappings = {
         parseEnv: (val)=>val || undefined,
         defaultValue: 'fee_juice'
     },
+    baseFeePadding: {
+        env: 'BOT_BASE_FEE_PADDING',
+        description: 'How much is the bot willing to overpay vs. the current base fee',
+        ...numberConfigHelper(3)
+    },
     noStart: {
         env: 'BOT_NO_START',
         description: 'True to not automatically setup or start the bot on initialization.',
@@ -140,11 +159,6 @@ export const botConfigMappings = {
         description: 'Make a request for the sequencer to build a block after each setup transaction.',
         ...booleanConfigHelper(false)
     },
-    skipPublicSimulation: {
-        env: 'BOT_SKIP_PUBLIC_SIMULATION',
-        description: 'Whether to skip public simulation of txs before sending them.',
-        ...booleanConfigHelper(false)
-    },
     l2GasLimit: {
         env: 'BOT_L2_GAS_LIMIT',
         description: 'L2 gas limit for the tx (empty to have the bot trigger an estimate gas).',
@@ -175,7 +189,16 @@ export const botConfigMappings = {
         env: 'BOT_STOP_WHEN_UNHEALTHY',
         description: 'Stops the bot if service becomes unhealthy',
         ...booleanConfigHelper(false)
-    }
+    },
+    ammTxs: {
+        env: 'BOT_AMM_TXS',
+        description: 'Deploy an AMM and send swaps to it',
+        ...booleanConfigHelper(false)
+    },
+    ...pickConfigMappings(dataConfigMappings, [
+        'dataStoreMapSizeKb',
+        'dataDirectory'
+    ])
 };
 export function getBotConfigFromEnv() {
     return getConfigFromMappings(botConfigMappings);
@@ -185,7 +208,7 @@ export function getBotDefaultConfig() {
 }
 export function getVersions() {
     return {
-        l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString(),
+        l2ProtocolContractsHash: protocolContractsHash.toString(),
         l2CircuitsVkTreeRoot: getVKTreeRoot().toString()
     };
 }

package/dest/factory.d.ts

@@ -1,26 +1,38 @@
-import { AztecAddress, type AztecNode, type PXE } from '@aztec/aztec.js';
-import { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+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 type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { type BotConfig } from './config.js';
+import type { BotStore } from './store/index.js';
 export declare class BotFactory {
     private readonly config;
-    private pxe;
-    private node?;
+    private readonly wallet;
+    private readonly store;
+    private readonly aztecNode;
+    private readonly aztecNodeAdmin?;
     private log;
-    constructor(config: BotConfig, dependencies?: {
-        pxe?: PXE;
-        node?: AztecNode;
-    });
+    constructor(config: BotConfig, wallet: TestWallet, store: BotStore, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin | undefined);
     /**
      * Initializes a new bot by setting up the sender account, registering the recipient,
      * deploying the token contract, and minting tokens if necessary.
      */
     setup(): Promise<{
-        wallet: import("@aztec/aztec.js").AccountWalletWithSecretKey;
-        token: TokenContract | EasyPrivateTokenContract;
-        pxe: PXE;
+        wallet: TestWallet;
+        defaultAccountAddress: AztecAddress;
+        token: TokenContract | PrivateTokenContract;
+        node: AztecNode;
         recipient: AztecAddress;
     }>;
+    setupAmm(): Promise<{
+        wallet: TestWallet;
+        defaultAccountAddress: AztecAddress;
+        amm: AMMContract;
+        token0: TokenContract;
+        token1: TokenContract;
+        node: AztecNode;
+    }>;
     /**
      * Checks if the sender account contract is initialized, and initializes it if necessary.
      * @returns The sender wallet.
@@ -29,22 +41,32 @@ export declare class BotFactory {
     private setupAccountWithPrivateKey;
     private setupTestAccount;
     /**
-     * Registers the recipient for txs in the pxe.
+     * 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.
      */
-    private registerRecipient;
+    private setupToken;
     /**
      * 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.
      */
-    private setupToken;
+    private setupTokenContract;
+    private setupAmmContract;
+    private fundAmm;
+    private registerOrDeployContract;
     /**
      * Mints private and public tokens for the sender if their balance is below the minimum.
      * @param token - Token contract.
      */
     private mintTokens;
+    /**
+     * Gets or creates a bridge claim for the recipient.
+     * Checks if a claim already exists in the store and reuses it if valid.
+     * Only creates a new bridge if fee juice balance is below threshold.
+     */
+    private getOrCreateBridgeClaim;
     private bridgeL1FeeJuice;
-    private advanceL2Block;
-    private tryFlushTxs;
+    private withNoMinTxsPerBlock;
 }
 //# sourceMappingURL=factory.d.ts.map

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,EACZ,KAAK,SAAS,EAMd,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAK/D,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,aAAa,CAAC;AAMnF,qBAAa,UAAU;IAKT,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,OAAO,CAAC,GAAG,CAAuB;gBAEL,MAAM,EAAE,SAAS,EAAE,YAAY,GAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAA;KAAO;IAwBlG;;;OAGG;IACU,KAAK;;;;;;IAQlB;;;OAGG;YACW,YAAY;YAQZ,0BAA0B;YA4B1B,gBAAgB;IAc9B;;OAEG;YACW,iBAAiB;IAK/B;;;;OAIG;YACW,UAAU;IA8BxB;;;OAGG;YACW,UAAU;YAuCV,gBAAgB;YA+BhB,cAAc;YAMd,WAAW;CAU1B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAgBzD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAPlC,OAAO,CAAC,GAAG,CAAuB;gBAGf,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,EAAE,cAAc,YAAA;IAGlD;;;OAGG;IACU,KAAK;;;;;;;IAQL,QAAQ;;;;;;;;IAwBrB;;;OAGG;YACW,YAAY;YAWZ,0BAA0B;YAwC1B,gBAAgB;IAW9B;;;;OAIG;YACW,UAAU;IA+BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAYZ,gBAAgB;YAoBhB,OAAO;YA8EP,wBAAwB;IAkBtC;;;OAGG;YACW,UAAU;IAmCxB;;;;OAIG;YACW,sBAAsB;YA4BtB,gBAAgB;YAgChB,oBAAoB;CAenC"}