@aztec/bot 2.0.0-rc.7 → 2.0.2-rc.1

package/dest/config.js

@@ -85,7 +85,7 @@ export const botConfigMappings = {
     l1ToL2MessageTimeoutSeconds: {
         env: 'BOT_L1_TO_L2_TIMEOUT_SECONDS',
         description: 'How long to wait for L1 to L2 messages to become available on L2',
-        ...numberConfigHelper(60)
+        ...numberConfigHelper(3600)
     },
     senderPrivateKey: {
         env: 'BOT_PRIVATE_KEY',

package/dest/factory.d.ts

@@ -67,6 +67,5 @@ export declare class BotFactory {
     private mintTokens;
     private bridgeL1FeeJuice;
     private withNoMinTxsPerBlock;
-    private advanceL2Block;
 }
 //# 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,EAQZ,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAIzB,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,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAIjF,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,aAAa,CAAC;AAMnF,qBAAa,UAAU;IAOnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,GAAG,CAAuB;gBAGf,MAAM,EAAE,SAAS,EAClC,YAAY,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE;IA4B3E;;;OAGG;IACU,KAAK;;;;;;;IASL,QAAQ;;;;;;;;IAuCrB;;;OAGG;YACW,YAAY;YASZ,0BAA0B;YA8B1B,gBAAgB;IAc9B;;OAEG;YACW,iBAAiB;IAK/B;;;;OAIG;YACW,UAAU;IA+BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAaZ,gBAAgB;YAqBhB,OAAO;YA0EP,wBAAwB;IAkBtC;;;OAGG;YACW,UAAU;YAmCV,gBAAgB;YAgChB,oBAAoB;YAapB,cAAc;CAM7B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EAQZ,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAIjF,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,aAAa,CAAC;AAMnF,qBAAa,UAAU;IAOnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,GAAG,CAAuB;gBAGf,MAAM,EAAE,SAAS,EAClC,YAAY,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE;IA4B3E;;;OAGG;IACU,KAAK;;;;;;;IASL,QAAQ;;;;;;;;IAuCrB;;;OAGG;YACW,YAAY;YASZ,0BAA0B;YA8B1B,gBAAgB;IAc9B;;OAEG;YACW,iBAAiB;IAK/B;;;;OAIG;YACW,UAAU;IA+BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAaZ,gBAAgB;YAqBhB,OAAO;YA0EP,wBAAwB;IAkBtC;;;OAGG;YACW,UAAU;YAmCV,gBAAgB;YAgChB,oBAAoB;CAYnC"}

package/dest/factory.js

@@ -1,6 +1,6 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { getDeployedTestAccountsWallets, getInitialTestAccounts } from '@aztec/accounts/testing';
-import { BatchCall, FeeJuicePaymentMethodWithClaim, L1FeeJuicePortalManager, createLogger, createPXEClient, retryUntil } from '@aztec/aztec.js';
+import { BatchCall, FeeJuicePaymentMethodWithClaim, L1FeeJuicePortalManager, createLogger, createPXEClient, waitForL1ToL2MessageReady } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { Timer } from '@aztec/foundation/timer';
@@ -328,12 +328,11 @@ export class BotFactory {
         const portal = await L1FeeJuicePortalManager.new(this.pxe, extendedClient, this.log);
         const mintAmount = await portal.getTokenManager().getMintAmount();
         const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true);
-        const isSynced = async ()=>await this.pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
-        await retryUntil(isSynced, `message ${claim.messageHash} sync`, this.config.l1ToL2MessageTimeoutSeconds, 1);
+        await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.pxe, Fr.fromHexString(claim.messageHash), {
+                timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
+                forPublicConsumption: false
+            }));
         this.log.info(`Created a claim for ${mintAmount} L1 fee juice to ${recipient}.`, claim);
-        // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
-        await this.advanceL2Block();
-        await this.advanceL2Block();
         return claim;
     }
     async withNoMinTxsPerBlock(fn) {
@@ -352,10 +351,4 @@ export class BotFactory {
             });
         }
     }
-    async advanceL2Block() {
-        await this.withNoMinTxsPerBlock(async ()=>{
-            const initialBlockNumber = await this.node.getBlockNumber();
-            await retryUntil(async ()=>await this.node.getBlockNumber() >= initialBlockNumber + 1);
-        });
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.2-rc.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,16 +54,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "2.0.0-rc.7",
-    "@aztec/aztec.js": "2.0.0-rc.7",
-    "@aztec/entrypoints": "2.0.0-rc.7",
-    "@aztec/ethereum": "2.0.0-rc.7",
-    "@aztec/foundation": "2.0.0-rc.7",
-    "@aztec/noir-contracts.js": "2.0.0-rc.7",
-    "@aztec/noir-protocol-circuits-types": "2.0.0-rc.7",
-    "@aztec/protocol-contracts": "2.0.0-rc.7",
-    "@aztec/stdlib": "2.0.0-rc.7",
-    "@aztec/telemetry-client": "2.0.0-rc.7",
+    "@aztec/accounts": "2.0.2-rc.1",
+    "@aztec/aztec.js": "2.0.2-rc.1",
+    "@aztec/entrypoints": "2.0.2-rc.1",
+    "@aztec/ethereum": "2.0.2-rc.1",
+    "@aztec/foundation": "2.0.2-rc.1",
+    "@aztec/noir-contracts.js": "2.0.2-rc.1",
+    "@aztec/noir-protocol-circuits-types": "2.0.2-rc.1",
+    "@aztec/protocol-contracts": "2.0.2-rc.1",
+    "@aztec/stdlib": "2.0.2-rc.1",
+    "@aztec/telemetry-client": "2.0.2-rc.1",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"

package/src/config.ts

@@ -154,7 +154,7 @@ export const botConfigMappings: ConfigMappingsType<BotConfig> = {
   l1ToL2MessageTimeoutSeconds: {
     env: 'BOT_L1_TO_L2_TIMEOUT_SECONDS',
     description: 'How long to wait for L1 to L2 messages to become available on L2',
-    ...numberConfigHelper(60),
+    ...numberConfigHelper(3600),
   },
   senderPrivateKey: {
     env: 'BOT_PRIVATE_KEY',

package/src/factory.ts

@@ -13,7 +13,7 @@ import {
   type PXE,
   createLogger,
   createPXEClient,
-  retryUntil,
+  waitForL1ToL2MessageReady,
 } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
@@ -410,15 +410,15 @@ export class BotFactory {
     const mintAmount = await portal.getTokenManager().getMintAmount();
     const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true /* mint */);
 
-    const isSynced = async () => await this.pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
-    await retryUntil(isSynced, `message ${claim.messageHash} sync`, this.config.l1ToL2MessageTimeoutSeconds, 1);
+    await this.withNoMinTxsPerBlock(() =>
+      waitForL1ToL2MessageReady(this.pxe, Fr.fromHexString(claim.messageHash), {
+        timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
+        forPublicConsumption: false,
+      }),
+    );
 
     this.log.info(`Created a claim for ${mintAmount} L1 fee juice to ${recipient}.`, claim);
 
-    // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
-    await this.advanceL2Block();
-    await this.advanceL2Block();
-
     return claim;
   }
 
@@ -434,11 +434,4 @@ export class BotFactory {
       await this.nodeAdmin.setConfig({ minTxsPerBlock });
     }
   }
-
-  private async advanceL2Block() {
-    await this.withNoMinTxsPerBlock(async () => {
-      const initialBlockNumber = await this.node!.getBlockNumber();
-      await retryUntil(async () => (await this.node!.getBlockNumber()) >= initialBlockNumber + 1);
-    });
-  }
 }