@aztec/ethereum 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/dest/queries.js

@@ -1,6 +1,4 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { SlasherAbi } from '@aztec/l1-artifacts/SlasherAbi';
-import { getContract } from 'viem';
 import { ReadOnlyGovernanceContract } from './contracts/governance.js';
 import { GovernanceProposerContract } from './contracts/governance_proposer.js';
 import { RollupContract } from './contracts/rollup.js';
@@ -11,21 +9,18 @@ import { RollupContract } from './contracts/rollup.js';
     const rollupAddress = addresses.rollupAddress ?? await governanceProposer.getRollupAddress();
     const rollup = new RollupContract(publicClient, rollupAddress.toString());
     const slasherProposer = await rollup.getSlashingProposer();
-    const slasherAddress = await rollup.getSlasher();
-    const slasher = getContract({
-        address: slasherAddress,
-        abi: SlasherAbi,
-        client: publicClient
-    });
-    const [l1StartBlock, l1GenesisTime, aztecEpochDuration, aztecSlotDuration, aztecProofSubmissionEpochs, aztecTargetCommitteeSize, activationThreshold, ejectionThreshold, governanceProposerQuorum, governanceProposerRoundSize, slashingQuorum, slashingRoundSize, slashingLifetimeInRounds, slashingExecutionDelayInRounds, slashingOffsetInRounds, slashingAmounts, slashingVetoer, manaTarget, provingCostPerMana, rollupVersion, genesisArchiveTreeRoot, exitDelay] = await Promise.all([
+    const slasher = await rollup.getSlasherContract();
+    const [l1StartBlock, l1GenesisTime, aztecEpochDuration, aztecSlotDuration, aztecProofSubmissionEpochs, aztecTargetCommitteeSize, lagInEpochs, activationThreshold, ejectionThreshold, localEjectionThreshold, governanceProposerQuorum, governanceProposerRoundSize, slashingQuorum, slashingRoundSize, slashingLifetimeInRounds, slashingExecutionDelayInRounds, slashingOffsetInRounds, slashingAmounts, slashingVetoer, slashingDisableDuration, manaTarget, provingCostPerMana, rollupVersion, genesisArchiveTreeRoot, exitDelay] = await Promise.all([
         rollup.getL1StartBlock(),
         rollup.getL1GenesisTime(),
         rollup.getEpochDuration(),
         rollup.getSlotDuration(),
         rollup.getProofSubmissionEpochs(),
         rollup.getTargetCommitteeSize(),
+        rollup.getLagInEpochs(),
         rollup.getActivationThreshold(),
         rollup.getEjectionThreshold(),
+        rollup.getLocalEjectionThreshold(),
         governanceProposer.getQuorumSize(),
         governanceProposer.getRoundSize(),
         slasherProposer?.getQuorumSize() ?? 0n,
@@ -38,7 +33,8 @@ import { RollupContract } from './contracts/rollup.js';
             0n,
             0n
         ],
-        slasher.read.VETOER(),
+        slasher?.getVetoer() ?? EthAddress.ZERO,
+        slasher?.getSlashingDisableDuration() ?? 0,
         rollup.getManaTarget(),
         rollup.getProvingCostPerMana(),
         rollup.getVersion(),
@@ -52,16 +48,19 @@ import { RollupContract } from './contracts/rollup.js';
         aztecSlotDuration: Number(aztecSlotDuration),
         aztecProofSubmissionEpochs: Number(aztecProofSubmissionEpochs),
         aztecTargetCommitteeSize: Number(aztecTargetCommitteeSize),
+        lagInEpochs: Number(lagInEpochs),
         governanceProposerQuorum: Number(governanceProposerQuorum),
         governanceProposerRoundSize: Number(governanceProposerRoundSize),
         activationThreshold,
         ejectionThreshold,
+        localEjectionThreshold,
         slashingQuorum: Number(slashingQuorum),
         slashingRoundSizeInEpochs: Number(slashingRoundSize / aztecEpochDuration),
         slashingLifetimeInRounds: Number(slashingLifetimeInRounds),
         slashingExecutionDelayInRounds: Number(slashingExecutionDelayInRounds),
-        slashingVetoer: EthAddress.fromString(slashingVetoer),
-        manaTarget: manaTarget,
+        slashingVetoer,
+        slashingDisableDuration,
+        manaTarget,
         provingCostPerMana: provingCostPerMana,
         rollupVersion: Number(rollupVersion),
         genesisArchiveTreeRoot,

package/dest/test/chain_monitor.d.ts

@@ -10,6 +10,7 @@ export type ChainMonitorEventMap = {
     'l2-block': [{
         l2BlockNumber: number;
         l1BlockNumber: number;
+        l2SlotNumber: number;
         timestamp: bigint;
     }];
     'l2-block-proven': [{
@@ -26,6 +27,10 @@ export type ChainMonitorEventMap = {
         timestamp: bigint;
         committee: EthAddress[] | undefined;
     }];
+    'l2-slot': [{
+        l2SlotNumber: number;
+        timestamp: bigint;
+    }];
 };
 /** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */
 export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
@@ -51,11 +56,17 @@ export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
     totalL2Messages: number;
     /** Current L2 epoch number */
     l2EpochNumber: bigint;
+    /** Current L2 slot number */
+    l2SlotNumber: bigint;
     constructor(rollup: RollupContract, dateProvider?: DateProvider, logger?: import("@aztec/foundation/log").Logger, intervalMs?: number);
     start(): this;
     stop(): Promise<void>;
     private getInbox;
     protected safeRun(): void;
     run(force?: boolean): Promise<this>;
+    waitUntilL2Slot(slot: number | bigint): Promise<void>;
+    waitUntilL1Block(block: number | bigint): Promise<void>;
+    waitUntilL1Timestamp(timestamp: number | bigint): Promise<void>;
+    waitUntilL2Block(l2BlockNumber: number | bigint): Promise<void>;
 }
 //# sourceMappingURL=chain_monitor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../src/test/chain_monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClF,iBAAiB,EAAE,CAAC;QAAE,mBAAmB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/F,aAAa,EAAE,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;CACjG,CAAC;AAEF,8GAA8G;AAC9G,qBAAa,YAAa,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAuBhE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAzB7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,MAAM,CAA6B;IAE3C,OAAO,CAAC,OAAO,CAAiC;IAEhD,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,qCAAqC;IAC9B,mBAAmB,EAAG,MAAM,CAAC;IACpC,4CAA4C;IACrC,gBAAgB,EAAG,MAAM,CAAC;IACjC,2CAA2C;IACpC,sBAAsB,EAAG,MAAM,CAAC;IACvC,wDAAwD;IACjD,eAAe,EAAE,MAAM,CAAK;IACnC,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;gBAGX,MAAM,EAAE,cAAc,EACtB,YAAY,GAAE,YAAiC,EAC/C,MAAM,yCAA8C,EACpD,UAAU,SAAM;IAMnC,KAAK;IAQC,IAAI;YAaI,QAAQ;IAQtB,SAAS,CAAC,OAAO;IAcX,GAAG,CAAC,KAAK,UAAQ;CAoExB"}
+{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../src/test/chain_monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxG,iBAAiB,EAAE,CAAC;QAAE,mBAAmB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/F,aAAa,EAAE,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IAChG,SAAS,EAAE,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1D,CAAC;AAEF,8GAA8G;AAC9G,qBAAa,YAAa,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAyBhE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IA3B7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,MAAM,CAA6B;IAE3C,OAAO,CAAC,OAAO,CAAiC;IAEhD,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,qCAAqC;IAC9B,mBAAmB,EAAG,MAAM,CAAC;IACpC,4CAA4C;IACrC,gBAAgB,EAAG,MAAM,CAAC;IACjC,2CAA2C;IACpC,sBAAsB,EAAG,MAAM,CAAC;IACvC,wDAAwD;IACjD,eAAe,EAAE,MAAM,CAAK;IACnC,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,6BAA6B;IACtB,YAAY,EAAG,MAAM,CAAC;gBAGV,MAAM,EAAE,cAAc,EACtB,YAAY,GAAE,YAAiC,EAC/C,MAAM,yCAA8C,EACpD,UAAU,SAAM;IAMnC,KAAK;IAQC,IAAI;YAaI,QAAQ;IAQtB,SAAS,CAAC,OAAO;IAcX,GAAG,CAAC,KAAK,UAAQ;IAkFhB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBrD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvD,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB/D,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAevE"}

package/dest/test/chain_monitor.js

@@ -21,6 +21,7 @@ import { EventEmitter } from 'events';
     /** L1 timestamp for the proven L2 block */ l2ProvenBlockTimestamp;
     /** Total number of L2 messages pushed into the Inbox */ totalL2Messages;
     /** Current L2 epoch number */ l2EpochNumber;
+    /** Current L2 slot number */ l2SlotNumber;
     constructor(rollup, dateProvider = new DateProvider(), logger = createLogger('aztecjs:utils:chain_monitor'), intervalMs = 200){
         super(), this.rollup = rollup, this.dateProvider = dateProvider, this.logger = logger, this.intervalMs = intervalMs, this.running = new Set(), this.totalL2Messages = 0;
         this.l1Client = rollup.client;
@@ -71,11 +72,15 @@ import { EventEmitter } from 'events';
             return this;
         }
         this.l1BlockNumber = newL1BlockNumber;
-        const block = await this.l1Client.getBlock({
-            blockNumber: BigInt(newL1BlockNumber),
-            includeTransactions: false
-        });
-        const timestamp = block.timestamp;
+        const [l2SlotNumber, l2Epoch, l1block] = await Promise.all([
+            this.rollup.getSlotNumber(),
+            this.rollup.getCurrentEpoch(),
+            this.l1Client.getBlock({
+                blockNumber: BigInt(newL1BlockNumber),
+                includeTransactions: false
+            })
+        ]);
+        const timestamp = l1block.timestamp;
         const timestampString = new Date(Number(timestamp) * 1000).toTimeString().split(' ')[0];
         this.emit('l1-block', {
             l1BlockNumber: newL1BlockNumber,
@@ -84,19 +89,20 @@ import { EventEmitter } from 'events';
         let msg = `L1 block ${newL1BlockNumber} mined at ${timestampString}`;
         const newL2BlockNumber = Number(await this.rollup.getBlockNumber());
         if (this.l2BlockNumber !== newL2BlockNumber) {
-            const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2BlockNumber));
+            const epochNumber = await this.rollup.getEpochNumberForBlock(BigInt(newL2BlockNumber));
             msg += ` with new L2 block ${newL2BlockNumber} for epoch ${epochNumber}`;
             this.l2BlockNumber = newL2BlockNumber;
             this.l2BlockTimestamp = timestamp;
             this.emit('l2-block', {
                 l2BlockNumber: newL2BlockNumber,
                 l1BlockNumber: newL1BlockNumber,
+                l2SlotNumber: Number(l2SlotNumber),
                 timestamp
             });
         }
         const newL2ProvenBlockNumber = Number(await this.rollup.getProvenBlockNumber());
         if (this.l2ProvenBlockNumber !== newL2ProvenBlockNumber) {
-            const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2ProvenBlockNumber));
+            const epochNumber = await this.rollup.getEpochNumberForBlock(BigInt(newL2ProvenBlockNumber));
             msg += ` with proof up to L2 block ${newL2ProvenBlockNumber} for epoch ${epochNumber}`;
             this.l2ProvenBlockNumber = newL2ProvenBlockNumber;
             this.l2ProvenBlockTimestamp = timestamp;
@@ -116,10 +122,6 @@ import { EventEmitter } from 'events';
                 l1BlockNumber: newL1BlockNumber
             });
         }
-        const [l2SlotNumber, l2Epoch] = await Promise.all([
-            this.rollup.getSlotNumber(),
-            this.rollup.getCurrentEpoch()
-        ]);
         let committee;
         if (l2Epoch !== this.l2EpochNumber) {
             this.l2EpochNumber = l2Epoch;
@@ -129,7 +131,14 @@ import { EventEmitter } from 'events';
                 timestamp,
                 committee
             });
-            msg += ` starting new epoch ${this.l2EpochNumber} with committee ${committee?.join(', ') ?? 'undefined'}`;
+            msg += ` starting new epoch ${this.l2EpochNumber} `;
+        }
+        if (l2SlotNumber !== this.l2SlotNumber) {
+            this.l2SlotNumber = l2SlotNumber;
+            this.emit('l2-slot', {
+                l2SlotNumber: Number(l2SlotNumber),
+                timestamp
+            });
         }
         this.logger.info(msg, {
             currentTimestamp: this.dateProvider.nowInSeconds(),
@@ -144,4 +153,64 @@ import { EventEmitter } from 'events';
         });
         return this;
     }
+    waitUntilL2Slot(slot) {
+        const targetSlot = typeof slot === 'bigint' ? slot.valueOf() : slot;
+        if (this.l2SlotNumber >= targetSlot) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.l2SlotNumber >= targetSlot) {
+                    this.off('l2-slot', listener);
+                    resolve();
+                }
+            };
+            this.on('l2-slot', listener);
+        });
+    }
+    waitUntilL1Block(block) {
+        const targetBlock = typeof block === 'bigint' ? block.valueOf() : block;
+        if (this.l1BlockNumber >= targetBlock) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.l1BlockNumber >= targetBlock) {
+                    this.off('l1-block', listener);
+                    resolve();
+                }
+            };
+            this.on('l1-block', listener);
+        });
+    }
+    waitUntilL1Timestamp(timestamp) {
+        const targetTimestamp = typeof timestamp === 'bigint' ? timestamp.valueOf() : timestamp;
+        if (this.l1BlockNumber >= targetTimestamp) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.timestamp >= targetTimestamp) {
+                    this.off('l1-block', listener);
+                    resolve();
+                }
+            };
+            this.on('l1-block', listener);
+        });
+    }
+    waitUntilL2Block(l2BlockNumber) {
+        const targetBlock = typeof l2BlockNumber === 'bigint' ? l2BlockNumber.valueOf() : l2BlockNumber;
+        if (this.l2BlockNumber >= targetBlock) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.l2BlockNumber >= targetBlock) {
+                    this.off('l2-block', listener);
+                    resolve();
+                }
+            };
+            this.on('l2-block', listener);
+        });
+    }
 }

package/dest/test/delayed_tx_utils.d.ts

@@ -1,7 +1,7 @@
 import { type Logger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { type L1TxUtilsConfig } from '../l1_tx_utils.js';
-import { L1TxUtilsWithBlobs } from '../l1_tx_utils_with_blobs.js';
+import { type L1TxUtilsConfig } from '../l1_tx_utils/index.js';
+import { L1TxUtilsWithBlobs } from '../l1_tx_utils/l1_tx_utils_with_blobs.js';
 import type { ExtendedViemWalletClient } from '../types.js';
 import { type Delayer } from './tx_delayer.js';
 export declare class DelayedTxUtils extends L1TxUtilsWithBlobs {

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

@@ -1 +1 @@
-{"version":3,"file":"delayed_tx_utils.d.ts","sourceRoot":"","sources":["../../src/test/delayed_tx_utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,iBAAiB,CAAC;AAE5D,qBAAa,cAAe,SAAQ,kBAAkB;IAC7C,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;WAEtB,aAAa,CACzB,SAAS,EAAE,kBAAkB,EAC7B,oBAAoB,EAAE,MAAM,EAC5B,MAAM,EAAE,wBAAwB;IAW3B,aAAa,CAAC,oBAAoB,EAAE,MAAM;CAOlD;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,kBAWlC"}
+{"version":3,"file":"delayed_tx_utils.d.ts","sourceRoot":"","sources":["../../src/test/delayed_tx_utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,iBAAiB,CAAC;AAE5D,qBAAa,cAAe,SAAQ,kBAAkB;IAC7C,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;WAEtB,aAAa,CACzB,SAAS,EAAE,kBAAkB,EAC7B,oBAAoB,EAAE,MAAM,EAC5B,MAAM,EAAE,wBAAwB;IAW3B,aAAa,CAAC,oBAAoB,EAAE,MAAM;CAOlD;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,kBAWlC"}

package/dest/test/delayed_tx_utils.js

@@ -1,8 +1,8 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { createViemSigner } from '../l1_tx_utils.js';
-import { L1TxUtilsWithBlobs } from '../l1_tx_utils_with_blobs.js';
+import { createViemSigner } from '../l1_tx_utils/index.js';
+import { L1TxUtilsWithBlobs } from '../l1_tx_utils/l1_tx_utils_with_blobs.js';
 import { withDelayer } from './tx_delayer.js';
 export class DelayedTxUtils extends L1TxUtilsWithBlobs {
     delayer;

package/dest/test/eth_cheat_codes.d.ts

@@ -1,6 +1,6 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import type { TestDateProvider } from '@aztec/foundation/timer';
-import { type Hex } from 'viem';
+import type { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
+import { type Hex, type Transaction } from 'viem';
 import type { ViemPublicClient } from '../types.js';
 /**
  * A class that provides utility functions for interacting with ethereum (L1).
@@ -10,6 +10,10 @@ export declare class EthCheatCodes {
      * The RPC URL to use for interacting with the chain
      */
     rpcUrls: string[];
+    /**
+     * The date provider to use for time operations
+     */
+    dateProvider: DateProvider | TestDateProvider;
     /**
      * The logger to use for the eth cheatcodes
      */
@@ -20,11 +24,16 @@ export declare class EthCheatCodes {
      * The RPC URL to use for interacting with the chain
      */
     rpcUrls: string[], 
+    /**
+     * The date provider to use for time operations
+     */
+    dateProvider: DateProvider | TestDateProvider, 
     /**
      * The logger to use for the eth cheatcodes
      */
     logger?: import("@aztec/foundation/log").Logger);
     rpcCall(method: string, params: any[]): Promise<any>;
+    private doRpcCall;
     /**
      * Get the auto mine status of the underlying chain
      * @returns True if automine is on, false otherwise
@@ -104,13 +113,12 @@ export declare class EthCheatCodes {
     /**
      * Set the next block timestamp and mines the block.
      * Optionally resets interval mining so the next block is mined in `blockInterval` seconds from now.
-     * Optionally updates a provided date provider to follow L1 time.
+     * Always updates the injected date provider to follow L1 time.
      * @param timestamp - The timestamp to set the next block to
      */
     warp(timestamp: number | bigint, opts?: {
         silent?: boolean;
         resetBlockInterval?: boolean;
-        updateDateProvider?: TestDateProvider;
     }): Promise<void>;
     /**
      * Load the value at a storage slot of a contract address on eth
@@ -125,7 +133,9 @@ export declare class EthCheatCodes {
      * @param slot - The storage slot
      * @param value - The value to set the storage slot to
      */
-    store(contract: EthAddress, slot: bigint, value: bigint): Promise<void>;
+    store(contract: EthAddress, slot: bigint, value: bigint, opts?: {
+        silent?: boolean;
+    }): Promise<void>;
     /**
      * Computes the slot value for a given map and key.
      * @param baseSlot - The base slot of the map (specified in Aztec.nr contract)
@@ -190,6 +200,22 @@ export declare class EthCheatCodes {
         value?: number | bigint;
     })[][]): Promise<void>;
     traceTransaction(txHash: Hex): Promise<any>;
-    execWithPausedAnvil(fn: () => Promise<void>): Promise<void>;
+    getTxPoolStatus(): Promise<{
+        pending: number;
+        queued: number;
+    }>;
+    getTxPoolContents(): Promise<TxPoolTransaction[]>;
+    /**
+     * Mines an empty block by temporarily removing all pending transactions from the mempool,
+     * mining a block, and then re-adding the transactions back to the pool.
+     */
+    mineEmptyBlock(blockCount?: number): Promise<void>;
+    execWithPausedAnvil<T>(fn: () => Promise<T>): Promise<T>;
+    syncDateProvider(): Promise<void>;
 }
+type TxPoolState = 'pending' | 'queued';
+export type TxPoolTransaction = Transaction & {
+    poolState: TxPoolState;
+};
+export {};
 //# sourceMappingURL=eth_cheat_codes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/eth_cheat_codes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,KAAK,GAAG,EAAsC,MAAM,MAAM,CAAC;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD;;GAEG;AACH,qBAAa,aAAa;IAGtB;;OAEG;IACI,OAAO,EAAE,MAAM,EAAE;IACxB;;OAEG;IACI,MAAM;IATf,SAAgB,YAAY,EAAE,gBAAgB,CAAC;;IAE7C;;OAEG;IACI,OAAO,EAAE,MAAM,EAAE;IACxB;;OAEG;IACI,MAAM,yCAAuC;IAOhD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;IAS3C;;;OAGG;IACU,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAU7C;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAK3C;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAKvC;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAKzC;;;OAGG;IACU,IAAI,CAAC,cAAc,GAAE,MAAM,GAAG,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAKvD,MAAM;IAQpB;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrC;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASrE,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnE;;;OAGG;IACU,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D;;;OAGG;IACU,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/E;;;OAGG;IACI,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAQlD;;;OAGG;IACU,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/F;;;OAGG;IACU,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3F;;;OAGG;IACU,eAAe,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IASxD;;;OAGG;IACU,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3E;;;;;OAKG;IACU,IAAI,CACf,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAAC,kBAAkB,CAAC,EAAE,gBAAgB,CAAA;KAAO,GACnG,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;OAKG;IACU,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKtE;;;;;OAKG;IACU,KAAK,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpF;;;;;OAKG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;IAMvD;;;OAGG;IACU,kBAAkB,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrE;;;OAGG;IACU,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IASpE;;;;OAIG;IACU,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/E;;;;OAIG;IACU,WAAW,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;IAKtE;;;;OAIG;IACU,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;IAKnE;;;;OAIG;IACU,qBAAqB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAK7D;;;OAGG;IACI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM1C;;;OAGG;IACI,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBlD;;;;;OAKG;IACU,oBAAoB,CAC/B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,CAAC,GAAG,GAAG;QAAE,EAAE,EAAE,UAAU,GAAG,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,UAAU,GAAG,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,EAAE,EAAO,GAClH,OAAO,CAAC,IAAI,CAAC;IAaT,gBAAgB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAIrC,mBAAmB,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAgCzE"}
+{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/eth_cheat_codes.ts"],"names":[],"mappings":"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"}