@aztec/aztec.js 0.87.6 → 1.0.0-nightly.20250604

package/dest/contract/proven_tx.js

@@ -7,11 +7,11 @@ import { SentTx } from './sent_tx.js';
     stats;
     constructor(wallet, tx, // eslint-disable-next-line jsdoc/require-jsdoc
     stats){
-        super(tx.data, tx.clientIvcProof, tx.contractClassLogs, tx.publicFunctionCalldata), this.wallet = wallet, this.stats = stats;
+        super(tx.data, tx.clientIvcProof, tx.contractClassLogFields, tx.publicFunctionCalldata), this.wallet = wallet, this.stats = stats;
     }
     // Clone the TX data to get a serializable object.
     getPlainDataTx() {
-        return new Tx(this.data, this.clientIvcProof, this.contractClassLogs, this.publicFunctionCalldata);
+        return new Tx(this.data, this.clientIvcProof, this.contractClassLogFields, this.publicFunctionCalldata);
     }
     /**
    * Sends the transaction to the network via the provided wallet.

package/dest/test/anvil_test_watcher.d.ts

@@ -15,8 +15,9 @@ export declare class AnvilTestWatcher {
     private isSandbox;
     private rollup;
     private rollupCheatCodes;
+    private l2SlotDuration;
     private filledRunningPromise?;
-    private mineIfOutdatedPromise?;
+    private syncDateProviderPromise?;
     private markingAsProvenRunningPromise?;
     private logger;
     private isMarkingAsProven;
@@ -27,7 +28,7 @@ export declare class AnvilTestWatcher {
     stop(): Promise<void>;
     trigger(): Promise<void>;
     markAsProven(): Promise<void>;
-    mineIfOutdated(): Promise<void>;
+    syncDateProviderToL1IfBehind(): Promise<void>;
     warpTimeIfNeeded(): Promise<void>;
 }
 //# sourceMappingURL=anvil_test_watcher.d.ts.map

package/dest/test/anvil_test_watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/test/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAezB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAjBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAE3C,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAC/C,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,EAAE,gBAAgB,YAAA;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IAwBL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,cAAc;IAoBd,gBAAgB;CAwCvB"}
+{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/test/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAgBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAlBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,EAAE,gBAAgB,YAAA;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IA2BL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,4BAA4B;IAiB5B,gBAAgB;CAwCvB"}

package/dest/test/anvil_test_watcher.js

@@ -15,8 +15,9 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
     isSandbox;
     rollup;
     rollupCheatCodes;
+    l2SlotDuration;
     filledRunningPromise;
-    mineIfOutdatedPromise;
+    syncDateProviderPromise;
     markingAsProvenRunningPromise;
     logger;
     isMarkingAsProven;
@@ -46,6 +47,8 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
         if (this.filledRunningPromise) {
             throw new Error('Watcher already watching for filled slot');
         }
+        const config = await this.rollupCheatCodes.getConfig();
+        this.l2SlotDuration = config.slotDuration;
         // If auto mining is not supported (e.g., we are on a real network), then we
         // will simple do nothing. But if on an anvil or the like, this make sure that
         // the sandbox and tests don't break because time is frozen and we never get to
@@ -54,8 +57,8 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
         if (isAutoMining) {
             this.filledRunningPromise = new RunningPromise(()=>this.warpTimeIfNeeded(), this.logger, 200);
             this.filledRunningPromise.start();
-            this.mineIfOutdatedPromise = new RunningPromise(()=>this.mineIfOutdated(), this.logger, 200);
-            this.mineIfOutdatedPromise.start();
+            this.syncDateProviderPromise = new RunningPromise(()=>this.syncDateProviderToL1IfBehind(), this.logger, 200);
+            this.syncDateProviderPromise.start();
             this.markingAsProvenRunningPromise = new RunningPromise(()=>this.markAsProven(), this.logger, 200);
             this.markingAsProvenRunningPromise.start();
             this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
@@ -65,12 +68,12 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
     }
     async stop() {
         await this.filledRunningPromise?.stop();
-        await this.mineIfOutdatedPromise?.stop();
+        await this.syncDateProviderPromise?.stop();
         await this.markingAsProvenRunningPromise?.stop();
     }
     async trigger() {
         await this.filledRunningPromise?.trigger();
-        await this.mineIfOutdatedPromise?.trigger();
+        await this.syncDateProviderPromise?.trigger();
         await this.markingAsProvenRunningPromise?.trigger();
     }
     async markAsProven() {
@@ -79,21 +82,19 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
         }
         await this.rollupCheatCodes.markAsProven();
     }
-    async mineIfOutdated() {
+    async syncDateProviderToL1IfBehind() {
         // this doesn't apply to the sandbox, because we don't have a date provider in the sandbox
         if (!this.dateProvider) {
             return;
         }
         const l1Time = await this.cheatcodes.timestamp() * 1000;
         const wallTime = this.dateProvider.now();
-        // If the wall time is more than 24 seconds away from L1 time,
-        // mine a block and sync the clocks
-        if (Math.abs(wallTime - l1Time) > 24 * 1000) {
-            this.logger.warn(`Wall time is more than 24 seconds away from L1 time, mining a block and syncing clocks`);
-            await this.cheatcodes.evmMine();
-            const newL1Time = await this.cheatcodes.timestamp();
-            this.logger.info(`New L1 time: ${newL1Time}`);
-            this.dateProvider.setTime(newL1Time * 1000);
+        if (l1Time > wallTime) {
+            this.logger.warn(`L1 is ahead of wall time. Syncing wall time to L1 time`);
+            this.dateProvider.setTime(l1Time);
+        } else if (l1Time + Number(this.l2SlotDuration) * 1000 < wallTime) {
+            this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to wall time`);
+            await this.cheatcodes.warp(Math.ceil(wallTime / 1000));
         }
     }
     async warpTimeIfNeeded() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aztec/aztec.js",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
-  "version": "0.87.6",
+  "version": "1.0.0-nightly.20250604",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -78,13 +78,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.87.6",
-    "@aztec/entrypoints": "0.87.6",
-    "@aztec/ethereum": "0.87.6",
-    "@aztec/foundation": "0.87.6",
-    "@aztec/l1-artifacts": "0.87.6",
-    "@aztec/protocol-contracts": "0.87.6",
-    "@aztec/stdlib": "0.87.6",
+    "@aztec/constants": "1.0.0-nightly.20250604",
+    "@aztec/entrypoints": "1.0.0-nightly.20250604",
+    "@aztec/ethereum": "1.0.0-nightly.20250604",
+    "@aztec/foundation": "1.0.0-nightly.20250604",
+    "@aztec/l1-artifacts": "1.0.0-nightly.20250604",
+    "@aztec/protocol-contracts": "1.0.0-nightly.20250604",
+    "@aztec/stdlib": "1.0.0-nightly.20250604",
     "axios": "^1.8.2",
     "tslib": "^2.4.0",
     "viem": "2.23.7"

package/src/contract/proven_tx.ts

@@ -13,12 +13,12 @@ export class ProvenTx extends Tx {
     // eslint-disable-next-line jsdoc/require-jsdoc
     public stats?: ProvingStats,
   ) {
-    super(tx.data, tx.clientIvcProof, tx.contractClassLogs, tx.publicFunctionCalldata);
+    super(tx.data, tx.clientIvcProof, tx.contractClassLogFields, tx.publicFunctionCalldata);
   }
 
   // Clone the TX data to get a serializable object.
   protected getPlainDataTx(): Tx {
-    return new Tx(this.data, this.clientIvcProof, this.contractClassLogs, this.publicFunctionCalldata);
+    return new Tx(this.data, this.clientIvcProof, this.contractClassLogFields, this.publicFunctionCalldata);
   }
 
   /**

package/src/test/anvil_test_watcher.ts

@@ -22,9 +22,10 @@ export class AnvilTestWatcher {
 
   private rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
   private rollupCheatCodes: RollupCheatCodes;
+  private l2SlotDuration!: bigint;
 
   private filledRunningPromise?: RunningPromise;
-  private mineIfOutdatedPromise?: RunningPromise;
+  private syncDateProviderPromise?: RunningPromise;
   private markingAsProvenRunningPromise?: RunningPromise;
 
   private logger: Logger = createLogger(`aztecjs:utils:watcher`);
@@ -63,6 +64,9 @@ export class AnvilTestWatcher {
       throw new Error('Watcher already watching for filled slot');
     }
 
+    const config = await this.rollupCheatCodes.getConfig();
+    this.l2SlotDuration = config.slotDuration;
+
     // If auto mining is not supported (e.g., we are on a real network), then we
     // will simple do nothing. But if on an anvil or the like, this make sure that
     // the sandbox and tests don't break because time is frozen and we never get to
@@ -72,8 +76,8 @@ export class AnvilTestWatcher {
     if (isAutoMining) {
       this.filledRunningPromise = new RunningPromise(() => this.warpTimeIfNeeded(), this.logger, 200);
       this.filledRunningPromise.start();
-      this.mineIfOutdatedPromise = new RunningPromise(() => this.mineIfOutdated(), this.logger, 200);
-      this.mineIfOutdatedPromise.start();
+      this.syncDateProviderPromise = new RunningPromise(() => this.syncDateProviderToL1IfBehind(), this.logger, 200);
+      this.syncDateProviderPromise.start();
       this.markingAsProvenRunningPromise = new RunningPromise(() => this.markAsProven(), this.logger, 200);
       this.markingAsProvenRunningPromise.start();
       this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
@@ -84,13 +88,13 @@ export class AnvilTestWatcher {
 
   async stop() {
     await this.filledRunningPromise?.stop();
-    await this.mineIfOutdatedPromise?.stop();
+    await this.syncDateProviderPromise?.stop();
     await this.markingAsProvenRunningPromise?.stop();
   }
 
   async trigger() {
     await this.filledRunningPromise?.trigger();
-    await this.mineIfOutdatedPromise?.trigger();
+    await this.syncDateProviderPromise?.trigger();
     await this.markingAsProvenRunningPromise?.trigger();
   }
 
@@ -101,7 +105,7 @@ export class AnvilTestWatcher {
     await this.rollupCheatCodes.markAsProven();
   }
 
-  async mineIfOutdated() {
+  async syncDateProviderToL1IfBehind() {
     // this doesn't apply to the sandbox, because we don't have a date provider in the sandbox
     if (!this.dateProvider) {
       return;
@@ -109,15 +113,12 @@ export class AnvilTestWatcher {
 
     const l1Time = (await this.cheatcodes.timestamp()) * 1000;
     const wallTime = this.dateProvider.now();
-
-    // If the wall time is more than 24 seconds away from L1 time,
-    // mine a block and sync the clocks
-    if (Math.abs(wallTime - l1Time) > 24 * 1000) {
-      this.logger.warn(`Wall time is more than 24 seconds away from L1 time, mining a block and syncing clocks`);
-      await this.cheatcodes.evmMine();
-      const newL1Time = await this.cheatcodes.timestamp();
-      this.logger.info(`New L1 time: ${newL1Time}`);
-      this.dateProvider.setTime(newL1Time * 1000);
+    if (l1Time > wallTime) {
+      this.logger.warn(`L1 is ahead of wall time. Syncing wall time to L1 time`);
+      this.dateProvider.setTime(l1Time);
+    } else if (l1Time + Number(this.l2SlotDuration) * 1000 < wallTime) {
+      this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to wall time`);
+      await this.cheatcodes.warp(Math.ceil(wallTime / 1000));
     }
   }