@aztec/bot 6.0.0-nightly.20260722 → 6.0.0-nightly.20260724

package/dest/factory.d.ts

@@ -16,6 +16,10 @@ export declare class BotFactory {
     private readonly aztecNodeAdmin?;
     private readonly syncChainTip?;
     private log;
+    /** Number of in-flight withNoMinTxsPerBlock calls; see that method for why they are counted. */
+    private noMinTxsPerBlockDepth;
+    /** Set by the first withNoMinTxsPerBlock entrant; resolves to the minTxsPerBlock value to restore. */
+    private savedMinTxsPerBlock?;
     constructor(config: BotConfig, wallet: EmbeddedWallet, store: BotStore, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin | undefined, syncChainTip?: "checkpointed" | "finalized" | "latest" | "proposed" | "proven" | undefined);
     /**
      * Initializes a new bot by setting up the sender account, registering the recipient,
@@ -48,14 +52,16 @@ export declare class BotFactory {
         l1Client: ExtendedViemWalletClient;
         rollupVersion: bigint;
     }>;
-    private setupTestContract;
+    private deployTestContract;
     private setupAccount;
     private setupTestAccount;
     private setupAccountWithPrivateKey;
     private setupToken;
     private setupTokenContract;
-    private setupAmmContract;
-    private fundAmm;
+    private deployAmmContract;
+    private grantLpTokenMinter;
+    private mintAmmLiquidity;
+    private addAmmLiquidity;
     private registerOrDeployContract;
     /** True when the config allows bridging fee juice from L1 (fee_juice mode, an L1 RPC, and an L1 key). */
     private isL1BridgingConfigured;
@@ -63,6 +69,6 @@ export declare class BotFactory {
     private mintTokens;
     private getOrCreateBridgeClaim;
     private bridgeL1FeeJuice;
-    private withNoMinTxsPerBlock;
+    protected withNoMinTxsPerBlock<T>(fn: () => Promise<T>): Promise<T>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBb0J6RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3RFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBR2xFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU9qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQztJQVJoQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsY0FBYyxFQUN0QixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFDL0IsWUFBWSxDQUFDLDZFQUFVLEVBS3pDO0lBRUQ7OztPQUdHO0lBQ1UsS0FBSyxJQUFJLE9BQU8sQ0FBQztRQUM1QixNQUFNLEVBQUUsY0FBYyxDQUFDO1FBQ3ZCLHFCQUFxQixFQUFFLFlBQVksQ0FBQztRQUNwQyxLQUFLLEVBQUUsYUFBYSxHQUFHLG9CQUFvQixDQUFDO1FBQzVDLElBQUksRUFBRSxTQUFTLENBQUM7UUFDaEIsU0FBUyxFQUFFLFlBQVksQ0FBQztLQUN6QixDQUFDLENBT0Q7SUFFWSxRQUFRLElBQUksT0FBTyxDQUFDO1FBQy9CLE1BQU0sRUFBRSxjQUFjLENBQUM7UUFDdkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEdBQUcsRUFBRSxXQUFXLENBQUM7UUFDakIsTUFBTSxFQUFFLGFBQWEsQ0FBQztRQUN0QixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLElBQUksRUFBRSxTQUFTLENBQUM7S0FDakIsQ0FBQyxDQXVCRDtJQUVEOzs7T0FHRztJQUNVLGVBQWUsSUFBSSxPQUFPLENBQUM7UUFDdEMsTUFBTSxFQUFFLGNBQWMsQ0FBQztRQUN2QixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsUUFBUSxFQUFFLFlBQVksQ0FBQztRQUN2QixJQUFJLEVBQUUsU0FBUyxDQUFDO1FBQ2hCLFFBQVEsRUFBRSx3QkFBd0IsQ0FBQztRQUNuQyxhQUFhLEVBQUUsTUFBTSxDQUFDO0tBQ3ZCLENBQUMsQ0E2REQ7WUFFYSxpQkFBaUI7WUFXakIsWUFBWTtZQWtCWixnQkFBZ0I7WUFVaEIsMEJBQTBCO1lBYzFCLFVBQVU7WUF5Q1Ysa0JBQWtCO1lBYWxCLGdCQUFnQjtZQTJCaEIsT0FBTztZQStGUCx3QkFBd0I7SUEyQnRDLHlHQUF5RztJQUN6RyxPQUFPLENBQUMsc0JBQXNCO1lBY2hCLHFCQUFxQjtZQWdDckIsVUFBVTtZQWlEVixzQkFBc0I7WUF3QnRCLGdCQUFnQjtZQWdDaEIsb0JBQW9CO0NBZW5DIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBb0J6RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3RFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBR2xFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU9qRCxxQkFBYSxVQUFVO0lBU25CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQztJQWJoQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxnR0FBZ0c7SUFDaEcsT0FBTyxDQUFDLHFCQUFxQixDQUFLO0lBQ2xDLHNHQUFzRztJQUN0RyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBdUM7SUFFbkUsWUFDbUIsTUFBTSxFQUFFLFNBQVMsRUFDakIsTUFBTSxFQUFFLGNBQWMsRUFDdEIsS0FBSyxFQUFFLFFBQVEsRUFDZixTQUFTLEVBQUUsU0FBUyxFQUNwQixjQUFjLENBQUMsNEJBQWdCLEVBQy9CLFlBQVksQ0FBQyw2RUFBVSxFQUt6QztJQUVEOzs7T0FHRztJQUNVLEtBQUssSUFBSSxPQUFPLENBQUM7UUFDNUIsTUFBTSxFQUFFLGNBQWMsQ0FBQztRQUN2QixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsS0FBSyxFQUFFLGFBQWEsR0FBRyxvQkFBb0IsQ0FBQztRQUM1QyxJQUFJLEVBQUUsU0FBUyxDQUFDO1FBQ2hCLFNBQVMsRUFBRSxZQUFZLENBQUM7S0FDekIsQ0FBQyxDQU9EO0lBRVksUUFBUSxJQUFJLE9BQU8sQ0FBQztRQUMvQixNQUFNLEVBQUUsY0FBYyxDQUFDO1FBQ3ZCLHFCQUFxQixFQUFFLFlBQVksQ0FBQztRQUNwQyxHQUFHLEVBQUUsV0FBVyxDQUFDO1FBQ2pCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsTUFBTSxFQUFFLGFBQWEsQ0FBQztRQUN0QixJQUFJLEVBQUUsU0FBUyxDQUFDO0tBQ2pCLENBQUMsQ0FtQ0Q7SUFFRDs7O09BR0c7SUFDVSxlQUFlLElBQUksT0FBTyxDQUFDO1FBQ3RDLE1BQU0sRUFBRSxjQUFjLENBQUM7UUFDdkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLFFBQVEsRUFBRSxZQUFZLENBQUM7UUFDdkIsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixRQUFRLEVBQUUsd0JBQXdCLENBQUM7UUFDbkMsYUFBYSxFQUFFLE1BQU0sQ0FBQztLQUN2QixDQUFDLENBb0VEO1lBRWEsa0JBQWtCO1lBU2xCLFlBQVk7WUFrQlosZ0JBQWdCO1lBVWhCLDBCQUEwQjtZQWMxQixVQUFVO1lBeUNWLGtCQUFrQjtZQWFsQixpQkFBaUI7WUFTakIsa0JBQWtCO1lBUWxCLGdCQUFnQjtZQWFoQixlQUFlO1lBc0VmLHdCQUF3QjtJQTJCdEMseUdBQXlHO0lBQ3pHLE9BQU8sQ0FBQyxzQkFBc0I7WUFjaEIscUJBQXFCO1lBZ0NyQixVQUFVO1lBaURWLHNCQUFzQjtZQXdCdEIsZ0JBQWdCO0lBZ0M5QixVQUFnQixvQkFBb0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0ErQnhFO0NBQ0YifQ==

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAoBzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAOjD,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;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IARhC,OAAO,CAAC,GAAG,CAAuB;IAElC,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAC/B,YAAY,CAAC,6EAAU,EAKzC;IAED;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAOD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAuBD;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC;QACtC,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,QAAQ,EAAE,YAAY,CAAC;QACvB,IAAI,EAAE,SAAS,CAAC;QAChB,QAAQ,EAAE,wBAAwB,CAAC;QACnC,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CA6DD;YAEa,iBAAiB;YAWjB,YAAY;YAkBZ,gBAAgB;YAUhB,0BAA0B;YAc1B,UAAU;YAyCV,kBAAkB;YAalB,gBAAgB;YA2BhB,OAAO;YA+FP,wBAAwB;IA2BtC,yGAAyG;IACzG,OAAO,CAAC,sBAAsB;YAchB,qBAAqB;YAgCrB,UAAU;YAiDV,sBAAsB;YAwBtB,gBAAgB;YAgChB,oBAAoB;CAenC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAoBzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAOjD,qBAAa,UAAU;IASnB,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;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAbhC,OAAO,CAAC,GAAG,CAAuB;IAElC,gGAAgG;IAChG,OAAO,CAAC,qBAAqB,CAAK;IAClC,sGAAsG;IACtG,OAAO,CAAC,mBAAmB,CAAC,CAAuC;IAEnE,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAC/B,YAAY,CAAC,6EAAU,EAKzC;IAED;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAOD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAmCD;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC;QACtC,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,QAAQ,EAAE,YAAY,CAAC;QACvB,IAAI,EAAE,SAAS,CAAC;QAChB,QAAQ,EAAE,wBAAwB,CAAC;QACnC,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CAoED;YAEa,kBAAkB;YASlB,YAAY;YAkBZ,gBAAgB;YAUhB,0BAA0B;YAc1B,UAAU;YAyCV,kBAAkB;YAalB,iBAAiB;YASjB,kBAAkB;YAQlB,gBAAgB;YAahB,eAAe;YAsEf,wBAAwB;IA2BtC,yGAAyG;IACzG,OAAO,CAAC,sBAAsB;YAchB,qBAAqB;YAgCrB,UAAU;YAiDV,sBAAsB;YAwBtB,gBAAgB;IAgC9B,UAAgB,oBAAoB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CA+BxE;CACF"}

package/dest/factory.js

@@ -31,6 +31,8 @@ export class BotFactory {
     aztecNodeAdmin;
     syncChainTip;
     log;
+    /** Number of in-flight withNoMinTxsPerBlock calls; see that method for why they are counted. */ noMinTxsPerBlockDepth;
+    /** Set by the first withNoMinTxsPerBlock entrant; resolves to the minTxsPerBlock value to restore. */ savedMinTxsPerBlock;
     constructor(config, wallet, store, aztecNode, aztecNodeAdmin, syncChainTip){
         this.config = config;
         this.wallet = wallet;
@@ -39,6 +41,7 @@ export class BotFactory {
         this.aztecNodeAdmin = aztecNodeAdmin;
         this.syncChainTip = syncChainTip;
         this.log = createLogger('bot');
+        this.noMinTxsPerBlockDepth = 0;
         // 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);
@@ -63,11 +66,30 @@ export class BotFactory {
     async setupAmm() {
         const defaultAccountAddress = await this.setupAccount();
         await this.ensureFeeJuiceBalance(defaultAccountAddress);
-        const token0 = await this.setupTokenContract(defaultAccountAddress, this.config.tokenSalt, 'BotToken0', 'BOT0');
-        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);
-        await this.fundAmm(defaultAccountAddress, defaultAccountAddress, amm, token0, token1, liquidityToken);
+        const salt = this.config.tokenSalt;
+        // token0, token1 and the LP token are independent contracts with no shared state, so deploy them
+        // concurrently rather than one slot at a time.
+        const [token0, token1, liquidityToken] = await Promise.all([
+            this.setupTokenContract(defaultAccountAddress, salt, 'BotToken0', 'BOT0'),
+            this.setupTokenContract(defaultAccountAddress, salt, 'BotToken1', 'BOT1'),
+            this.setupTokenContract(defaultAccountAddress, salt, 'BotLPToken', 'BOTLP')
+        ]);
+        const ammDeploy = AMMContract.deploy(this.wallet, token0.address, token1.address, liquidityToken.address, {
+            salt,
+            universalDeploy: true
+        });
+        const ammAddress = (await ammDeploy.getInstance()).address;
+        // The AMM constructor only stores the (already-derived) token addresses, and set_minter only records
+        // the AMM address on the LP token: neither reads the other's on-chain state, so the AMM deploy, the
+        // LP-minter grant, and the token0/token1 mints are mutually independent and run concurrently.
+        const [amm] = await Promise.all([
+            this.deployAmmContract(defaultAccountAddress, ammDeploy),
+            this.grantLpTokenMinter(defaultAccountAddress, liquidityToken, ammAddress),
+            this.mintAmmLiquidity(defaultAccountAddress, token0, token1)
+        ]);
+        // add_liquidity spends the minted token0/token1 balances and mints LP tokens, so it must follow both
+        // the mints and the minter grant, and target the deployed AMM.
+        await this.addAmmLiquidity(defaultAccountAddress, defaultAccountAddress, amm, token0, token1, liquidityToken);
         this.log.info(`AMM initialized and funded`);
         return {
             wallet: this.wallet,
@@ -99,16 +121,30 @@ export class BotFactory {
         // Fetch Rollup version (needed for Inbox L2Actor struct)
         const rollupContract = new RollupContract(l1Client, l1ContractAddresses.rollupAddress.toString());
         const rollupVersion = await rollupContract.getVersion();
-        // Deploy TestContract (pays from the standing balance funded above).
-        const contract = await this.setupTestContract(defaultAccountAddress);
+        // Derive the TestContract address up front (deterministic from the salt). Seeding L1→L2 messages only
+        // needs the L2 recipient address — the messages are queued on L1 and don't require the L2 contract to
+        // exist yet (they're consumed later, after setup completes) — so the deploy (an L2 tx paying from the
+        // standing balance funded above) and the L1 seeding run concurrently.
+        const testContractDeploy = TestContract.deploy(this.wallet, {
+            salt: this.config.tokenSalt,
+            universalDeploy: true
+        });
+        const contractAddress = (await testContractDeploy.getInstance()).address;
         // 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
+        // Seed initial L1→L2 messages if pipeline is empty. The seeds are sent one at a time: they share the
+        // bot's L1 account, so concurrent sends would race on the L1 nonce.
         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);
-        }
+        const inboxAddress = EthAddress.fromString(l1ContractAddresses.inboxAddress.toString());
+        const [contract] = await Promise.all([
+            this.deployTestContract(defaultAccountAddress, testContractDeploy),
+            (async ()=>{
+                for(let i = 0; i < seedCount; i++){
+                    await seedL1ToL2Message(l1Client, inboxAddress, contractAddress, rollupVersion, this.store, this.log);
+                }
+            })()
+        ]);
         // Block until at least one message is ready
         const allMessages = await this.store.getUnconsumedL1ToL2Messages();
         if (allMessages.length > 0) {
@@ -129,15 +165,10 @@ export class BotFactory {
             rollupVersion
         };
     }
-    async setupTestContract(deployer) {
-        const deployOpts = {
+    async deployTestContract(deployer, deploy) {
+        const instance = await this.registerOrDeployContract('TestContract', deploy, {
             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);
     }
     /**
@@ -231,48 +262,45 @@ export class BotFactory {
         const instance = await this.registerOrDeployContract('Token - ' + name, deploy, deployOpts);
         return TokenContract.at(instance.address, this.wallet);
     }
-    async setupAmmContract(deployer, salt, token0, token1, lpToken) {
-        const deployOpts = {
+    async deployAmmContract(deployer, deploy) {
+        const instance = await this.registerOrDeployContract('AMM', deploy, {
             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 setMinterInteraction = lpToken.methods.set_minter(amm.address, true);
-        const { receipt: minterReceipt } = await setMinterInteraction.send({
+        return amm;
+    }
+    /** Grants the AMM minting rights over the LP token. set_minter only records the address, so it does not
+   * require the AMM contract to be deployed first. */ async grantLpTokenMinter(deployer, lpToken, amm) {
+        const { receipt } = await lpToken.methods.set_minter(amm, true).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;
+        this.log.info(`Set LP token minter to AMM txHash=${receipt.txHash.toString()}`);
     }
-    async fundAmm(defaultAccountAddress, liquidityProvider, amm, token0, token1, lpToken) {
-        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)
-            ]);
+    async mintAmmLiquidity(minter, token0, token1) {
+        this.log.info(`Minting ${MINT_BALANCE} tokens of each BotToken0 and BotToken1 for ${minter}`);
+        const mintBatch = new BatchCall(this.wallet, [
+            token0.methods.mint_to_private(minter, MINT_BALANCE),
+            token1.methods.mint_to_private(minter, MINT_BALANCE)
+        ]);
+        const { receipt } = await mintBatch.send({
+            from: minter,
+            wait: {
+                timeout: this.config.txMinedWaitSeconds
+            }
+        });
+        this.log.info(`Sent mint tx: ${receipt.txHash.toString()}`);
+    }
+    async addAmmLiquidity(defaultAccountAddress, liquidityProvider, amm, token0, token1, lpToken) {
         const authwitNonce = 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 ${liquidityProvider}: token0=${t0Bal}, token1=${t1Bal}, lp=${lpBal}`);
         // Add authwitnesses for the transfers in AMM::add_liquidity function
         const token0Authwit = await this.wallet.createAuthWit(defaultAccountAddress, {
             caller: amm.address,
@@ -282,19 +310,7 @@ 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 mintBatch = new BatchCall(this.wallet, [
-            token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
-            token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE)
-        ]);
-        const { receipt: mintReceipt } = await mintBatch.send({
-            from: liquidityProvider,
-            wait: {
-                timeout: this.config.txMinedWaitSeconds
-            }
-        });
-        this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
-        const addLiquidityInteraction = amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce);
-        const { receipt: addLiquidityReceipt } = await addLiquidityInteraction.send({
+        const { receipt } = await amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
             from: liquidityProvider,
             authWitnesses: [
                 token0Authwit,
@@ -304,10 +320,20 @@ export class BotFactory {
                 timeout: this.config.txMinedWaitSeconds
             }
         });
-        this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`);
+        this.log.info(`Sent tx to add liquidity to the AMM: ${receipt.txHash.toString()}`);
         this.log.info(`Liquidity added`);
-        const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
-        this.log.info(`Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`);
+        const [t0Bal, t1Bal, lpBal] = await 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)
+        ]);
+        this.log.info(`Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${t0Bal}, token1=${t1Bal}, lp=${lpBal}`);
     }
     async registerOrDeployContract(name, deploy, deployOpts) {
         const instance = await deploy.getInstance();
@@ -468,18 +494,37 @@ export class BotFactory {
             this.log.verbose(`No node admin client or flushing not requested (not setting minTxsPerBlock to 0)`);
             return fn();
         }
-        const { minTxsPerBlock } = await this.aztecNodeAdmin.getConfig();
-        this.log.warn(`Setting sequencer minTxsPerBlock to 0 from ${minTxsPerBlock} to flush setup transactions`);
-        await this.aztecNodeAdmin.setConfig({
-            minTxsPerBlock: 0
-        });
+        const aztecNodeAdmin = this.aztecNodeAdmin;
+        // Setup steps run concurrently, so this wrapper can be re-entered while another call is in flight.
+        // Reference-count the entrants: the first saves the current value and zeroes it, the last restores it.
+        // A naive save/zero/restore per call could interleave, with a late entrant reading the already-zeroed
+        // value and "restoring" 0 at the end.
+        if (this.noMinTxsPerBlockDepth++ === 0) {
+            this.savedMinTxsPerBlock = (async ()=>{
+                const { minTxsPerBlock } = await aztecNodeAdmin.getConfig();
+                this.log.warn(`Setting sequencer minTxsPerBlock to 0 from ${minTxsPerBlock} to flush setup transactions`);
+                await aztecNodeAdmin.setConfig({
+                    minTxsPerBlock: 0
+                });
+                return {
+                    minTxsPerBlock
+                };
+            })();
+        }
         try {
+            await this.savedMinTxsPerBlock;
             return await fn();
         } finally{
-            this.log.warn(`Restoring sequencer minTxsPerBlock to ${minTxsPerBlock}`);
-            await this.aztecNodeAdmin.setConfig({
-                minTxsPerBlock
-            });
+            if (--this.noMinTxsPerBlockDepth === 0) {
+                // If saving/zeroing itself failed there is nothing to restore.
+                const saved = await this.savedMinTxsPerBlock.catch(()=>undefined);
+                if (saved) {
+                    this.log.warn(`Restoring sequencer minTxsPerBlock to ${saved.minTxsPerBlock}`);
+                    await aztecNodeAdmin.setConfig({
+                        minTxsPerBlock: saved.minTxsPerBlock
+                    });
+                }
+            }
         }
     }
 }

package/package.json

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

package/src/factory.ts

@@ -44,6 +44,11 @@ const FEE_JUICE_TOP_UP_THRESHOLD = 100n * 10n ** 18n;
 export class BotFactory {
   private log = createLogger('bot');
 
+  /** Number of in-flight withNoMinTxsPerBlock calls; see that method for why they are counted. */
+  private noMinTxsPerBlockDepth = 0;
+  /** Set by the first withNoMinTxsPerBlock entrant; resolves to the minTxsPerBlock value to restore. */
+  private savedMinTxsPerBlock?: Promise<{ minTxsPerBlock?: number }>;
+
   constructor(
     private readonly config: BotConfig,
     private readonly wallet: EmbeddedWallet,
@@ -86,23 +91,35 @@ export class BotFactory {
   }> {
     const defaultAccountAddress = await this.setupAccount();
     await this.ensureFeeJuiceBalance(defaultAccountAddress);
-    const token0 = await this.setupTokenContract(defaultAccountAddress, this.config.tokenSalt, 'BotToken0', 'BOT0');
-    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,
-    );
 
-    await this.fundAmm(defaultAccountAddress, defaultAccountAddress, amm, token0, token1, liquidityToken);
+    const salt = this.config.tokenSalt;
+
+    // token0, token1 and the LP token are independent contracts with no shared state, so deploy them
+    // concurrently rather than one slot at a time.
+    const [token0, token1, liquidityToken] = await Promise.all([
+      this.setupTokenContract(defaultAccountAddress, salt, 'BotToken0', 'BOT0'),
+      this.setupTokenContract(defaultAccountAddress, salt, 'BotToken1', 'BOT1'),
+      this.setupTokenContract(defaultAccountAddress, salt, 'BotLPToken', 'BOTLP'),
+    ]);
+
+    const ammDeploy = AMMContract.deploy(this.wallet, token0.address, token1.address, liquidityToken.address, {
+      salt,
+      universalDeploy: true,
+    });
+    const ammAddress = (await ammDeploy.getInstance()).address;
+
+    // The AMM constructor only stores the (already-derived) token addresses, and set_minter only records
+    // the AMM address on the LP token: neither reads the other's on-chain state, so the AMM deploy, the
+    // LP-minter grant, and the token0/token1 mints are mutually independent and run concurrently.
+    const [amm] = await Promise.all([
+      this.deployAmmContract(defaultAccountAddress, ammDeploy),
+      this.grantLpTokenMinter(defaultAccountAddress, liquidityToken, ammAddress),
+      this.mintAmmLiquidity(defaultAccountAddress, token0, token1),
+    ]);
+
+    // add_liquidity spends the minted token0/token1 balances and mints LP tokens, so it must follow both
+    // the mints and the minter grant, and target the deployed AMM.
+    await this.addAmmLiquidity(defaultAccountAddress, defaultAccountAddress, amm, token0, token1, liquidityToken);
     this.log.info(`AMM initialized and funded`);
 
     return { wallet: this.wallet, defaultAccountAddress, amm, token0, token1, node: this.aztecNode };
@@ -140,25 +157,32 @@ export class BotFactory {
     const rollupContract = new RollupContract(l1Client, l1ContractAddresses.rollupAddress.toString());
     const rollupVersion = await rollupContract.getVersion();
 
-    // Deploy TestContract (pays from the standing balance funded above).
-    const contract = await this.setupTestContract(defaultAccountAddress);
+    // Derive the TestContract address up front (deterministic from the salt). Seeding L1→L2 messages only
+    // needs the L2 recipient address — the messages are queued on L1 and don't require the L2 contract to
+    // exist yet (they're consumed later, after setup completes) — so the deploy (an L2 tx paying from the
+    // standing balance funded above) and the L1 seeding run concurrently.
+    const testContractDeploy = TestContract.deploy(this.wallet, {
+      salt: this.config.tokenSalt,
+      universalDeploy: true,
+    });
+    const contractAddress = (await testContractDeploy.getInstance()).address;
 
     // 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
+    // Seed initial L1→L2 messages if pipeline is empty. The seeds are sent one at a time: they share the
+    // bot's L1 account, so concurrent sends would race on the L1 nonce.
     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,
-      );
-    }
+    const inboxAddress = EthAddress.fromString(l1ContractAddresses.inboxAddress.toString());
+    const [contract] = await Promise.all([
+      this.deployTestContract(defaultAccountAddress, testContractDeploy),
+      (async () => {
+        for (let i = 0; i < seedCount; i++) {
+          await seedL1ToL2Message(l1Client, inboxAddress, contractAddress, rollupVersion, this.store, this.log);
+        }
+      })(),
+    ]);
 
     // Block until at least one message is ready
     const allMessages = await this.store.getUnconsumedL1ToL2Messages();
@@ -182,10 +206,8 @@ export class BotFactory {
     };
   }
 
-  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);
+  private async deployTestContract(deployer: AztecAddress, deploy: DeployMethod<TestContract>): Promise<TestContract> {
+    const instance = await this.registerOrDeployContract('TestContract', deploy, { from: deployer });
     return TestContract.at(instance.address, this.wallet);
   }
 
@@ -289,34 +311,37 @@ export class BotFactory {
     return TokenContract.at(instance.address, this.wallet);
   }
 
-  private async setupAmmContract(
-    deployer: AztecAddress,
-    salt: Fr,
-    token0: TokenContract,
-    token1: TokenContract,
-    lpToken: TokenContract,
-  ): Promise<AMMContract> {
-    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);
+  private async deployAmmContract(deployer: AztecAddress, deploy: DeployMethod<AMMContract>): Promise<AMMContract> {
+    const instance = await this.registerOrDeployContract('AMM', deploy, { from: deployer });
     const amm = AMMContract.at(instance.address, this.wallet);
-
     this.log.info(`AMM deployed at ${amm.address}`);
-    const setMinterInteraction = lpToken.methods.set_minter(amm.address, true);
-    const { receipt: minterReceipt } = await setMinterInteraction.send({
+    return amm;
+  }
+
+  /** Grants the AMM minting rights over the LP token. set_minter only records the address, so it does not
+   * require the AMM contract to be deployed first. */
+  private async grantLpTokenMinter(deployer: AztecAddress, lpToken: TokenContract, amm: AztecAddress): Promise<void> {
+    const { receipt } = await lpToken.methods.set_minter(amm, true).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`);
+    this.log.info(`Set LP token minter to AMM txHash=${receipt.txHash.toString()}`);
+  }
 
-    return amm;
+  private async mintAmmLiquidity(minter: AztecAddress, token0: TokenContract, token1: TokenContract): Promise<void> {
+    this.log.info(`Minting ${MINT_BALANCE} tokens of each BotToken0 and BotToken1 for ${minter}`);
+    const mintBatch = new BatchCall(this.wallet, [
+      token0.methods.mint_to_private(minter, MINT_BALANCE),
+      token1.methods.mint_to_private(minter, MINT_BALANCE),
+    ]);
+    const { receipt } = await mintBatch.send({
+      from: minter,
+      wait: { timeout: this.config.txMinedWaitSeconds },
+    });
+    this.log.info(`Sent mint tx: ${receipt.txHash.toString()}`);
   }
 
-  private async fundAmm(
+  private async addAmmLiquidity(
     defaultAccountAddress: AztecAddress,
     liquidityProvider: AztecAddress,
     amm: AMMContract,
@@ -324,22 +349,6 @@ export class BotFactory {
     token1: TokenContract,
     lpToken: TokenContract,
   ): Promise<void> {
-    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
@@ -348,12 +357,6 @@ 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 ${liquidityProvider}: token0=${t0Bal}, token1=${t1Bal}, lp=${lpBal}`,
-    );
-
     // Add authwitnesses for the transfers in AMM::add_liquidity function
     const token0Authwit = await this.wallet.createAuthWit(defaultAccountAddress, {
       caller: amm.address,
@@ -378,36 +381,33 @@ export class BotFactory {
         .getFunctionCall(),
     });
 
-    const mintBatch = new BatchCall(this.wallet, [
-      token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
-      token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
-    ]);
-    const { receipt: mintReceipt } = await mintBatch.send({
-      from: liquidityProvider,
-      wait: { timeout: this.config.txMinedWaitSeconds },
-    });
-
-    this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
-
-    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 },
-    });
+    const { receipt } = await amm.methods
+      .add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce)
+      .send({
+        from: liquidityProvider,
+        authWitnesses: [token0Authwit, token1Authwit],
+        wait: { timeout: this.config.txMinedWaitSeconds },
+      });
 
-    this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`);
+    this.log.info(`Sent tx to add liquidity to the AMM: ${receipt.txHash.toString()}`);
     this.log.info(`Liquidity added`);
 
-    const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
+    const [t0Bal, t1Bal, lpBal] = await 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),
+    ]);
     this.log.info(
-      `Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`,
+      `Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${t0Bal}, token1=${t1Bal}, lp=${lpBal}`,
     );
   }
 
@@ -590,19 +590,36 @@ export class BotFactory {
     return claim as L2AmountClaim;
   }
 
-  private async withNoMinTxsPerBlock<T>(fn: () => Promise<T>): Promise<T> {
+  protected 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)`);
       return fn();
     }
-    const { minTxsPerBlock } = await this.aztecNodeAdmin.getConfig();
-    this.log.warn(`Setting sequencer minTxsPerBlock to 0 from ${minTxsPerBlock} to flush setup transactions`);
-    await this.aztecNodeAdmin.setConfig({ minTxsPerBlock: 0 });
+    const aztecNodeAdmin = this.aztecNodeAdmin;
+    // Setup steps run concurrently, so this wrapper can be re-entered while another call is in flight.
+    // Reference-count the entrants: the first saves the current value and zeroes it, the last restores it.
+    // A naive save/zero/restore per call could interleave, with a late entrant reading the already-zeroed
+    // value and "restoring" 0 at the end.
+    if (this.noMinTxsPerBlockDepth++ === 0) {
+      this.savedMinTxsPerBlock = (async () => {
+        const { minTxsPerBlock } = await aztecNodeAdmin.getConfig();
+        this.log.warn(`Setting sequencer minTxsPerBlock to 0 from ${minTxsPerBlock} to flush setup transactions`);
+        await aztecNodeAdmin.setConfig({ minTxsPerBlock: 0 });
+        return { minTxsPerBlock };
+      })();
+    }
     try {
+      await this.savedMinTxsPerBlock;
       return await fn();
     } finally {
-      this.log.warn(`Restoring sequencer minTxsPerBlock to ${minTxsPerBlock}`);
-      await this.aztecNodeAdmin.setConfig({ minTxsPerBlock });
+      if (--this.noMinTxsPerBlockDepth === 0) {
+        // If saving/zeroing itself failed there is nothing to restore.
+        const saved = await this.savedMinTxsPerBlock!.catch(() => undefined);
+        if (saved) {
+          this.log.warn(`Restoring sequencer minTxsPerBlock to ${saved.minTxsPerBlock}`);
+          await aztecNodeAdmin.setConfig({ minTxsPerBlock: saved.minTxsPerBlock });
+        }
+      }
     }
   }
 }