@aztec/aztec.js 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/account_manager/index.js

@@ -1,6 +1,9 @@
-import { CompleteAddress } from '@aztec/circuit-types';
-import { deriveKeys, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
+import { CompleteAddress } from '@aztec/stdlib/contract';
+import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { deriveKeys } from '@aztec/stdlib/keys';
+import { DeployMethod } from '../contract/deploy_method.js';
+import { Contract } from '../contract/index.js';
 import { DefaultWaitOpts } from '../contract/sent_tx.js';
 import { DefaultMultiCallEntrypoint } from '../entrypoint/default_multi_call_entrypoint.js';
 import { AccountWalletWithSecretKey, SignerlessWallet } from '../wallet/index.js';
@@ -9,13 +12,15 @@ import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
 /**
  * Manages a user account. Provides methods for calculating the account's address, deploying the account contract,
  * and creating and registering the user wallet in the PXE Service.
- */
-export class AccountManager {
-    constructor(pxe, secretKey, accountContract, instance, 
-    /**
+ */ export class AccountManager {
+    pxe;
+    secretKey;
+    accountContract;
+    instance;
+    salt;
+    constructor(pxe, secretKey, accountContract, instance, /**
      * Deployment salt for the account contract
-     */
-    salt) {
+     */ salt){
         this.pxe = pxe;
         this.secretKey = secretKey;
         this.accountContract = accountContract;
@@ -25,10 +30,11 @@ export class AccountManager {
     static async create(pxe, secretKey, accountContract, salt) {
         const { publicKeys } = await deriveKeys(secretKey);
         salt = salt !== undefined ? new Fr(salt) : Fr.random();
-        const instance = await getContractInstanceFromDeployParams(accountContract.getContractArtifact(), {
+        const artifact = await accountContract.getContractArtifact();
+        const instance = await getContractInstanceFromDeployParams(artifact, {
             constructorArgs: await accountContract.getDeploymentArgs(),
             salt: salt,
-            publicKeys,
+            publicKeys
         });
         return new AccountManager(pxe, secretKey, accountContract, instance, salt);
     }
@@ -39,119 +45,115 @@ export class AccountManager {
         return this.getPublicKeys().hash();
     }
     /**
-     * Returns the entrypoint for this account as defined by its account contract.
-     * @returns An entrypoint.
-     */
-    async getAccount() {
+   * Returns the entrypoint for this account as defined by its account contract.
+   * @returns An entrypoint.
+   */ async getAccount() {
         const nodeInfo = await this.pxe.getNodeInfo();
         const completeAddress = await this.getCompleteAddress();
         return this.accountContract.getInterface(completeAddress, nodeInfo);
     }
     /**
-     * Gets the calculated complete address associated with this account.
-     * Does not require the account to be deployed or registered.
-     * @returns The address, partial address, and encryption public key.
-     */
-    getCompleteAddress() {
+   * Gets the calculated complete address associated with this account.
+   * Does not require the account to be deployed or registered.
+   * @returns The address, partial address, and encryption public key.
+   */ getCompleteAddress() {
         return CompleteAddress.fromSecretKeyAndInstance(this.secretKey, this.instance);
     }
     /**
-     * Gets the address for this given account.
-     * Does not require the account to be deployed or registered.
-     * @returns The address.
-     */
-    getAddress() {
+   * Gets the address for this given account.
+   * Does not require the account to be deployed or registered.
+   * @returns The address.
+   */ getAddress() {
         return this.instance.address;
     }
     /**
-     * Returns the contract instance definition associated with this account.
-     * Does not require the account to be deployed or registered.
-     * @returns ContractInstance instance.
-     */
-    getInstance() {
+   * Returns the contract instance definition associated with this account.
+   * Does not require the account to be deployed or registered.
+   * @returns ContractInstance instance.
+   */ getInstance() {
         return this.instance;
     }
     /**
-     * Returns a Wallet instance associated with this account. Use it to create Contract
-     * instances to be interacted with from this account.
-     * @returns A Wallet instance.
-     */
-    async getWallet() {
+   * Returns a Wallet instance associated with this account. Use it to create Contract
+   * instances to be interacted with from this account.
+   * @returns A Wallet instance.
+   */ async getWallet() {
         const entrypoint = await this.getAccount();
         return new AccountWalletWithSecretKey(this.pxe, entrypoint, this.secretKey, this.salt);
     }
     /**
-     * Registers this account in the PXE Service and returns the associated wallet. Registering
-     * the account on the PXE Service is required for managing private state associated with it.
-     * Use the returned wallet to create Contract instances to be interacted with from this account.
-     * @param opts - Options to wait for the account to be synched.
-     * @returns A Wallet instance.
-     */
-    async register() {
+   * Registers this account in the PXE Service and returns the associated wallet. Registering
+   * the account on the PXE Service is required for managing private state associated with it.
+   * Use the returned wallet to create Contract instances to be interacted with from this account.
+   * @param opts - Options to wait for the account to be synched.
+   * @returns A Wallet instance.
+   */ async register() {
         await this.pxe.registerContract({
-            artifact: this.accountContract.getContractArtifact(),
-            instance: this.getInstance(),
+            artifact: await this.accountContract.getContractArtifact(),
+            instance: this.getInstance()
         });
         await this.pxe.registerAccount(this.secretKey, (await this.getCompleteAddress()).partialAddress);
         return this.getWallet();
     }
     /**
-     * Returns the pre-populated deployment method to deploy the account contract that backs this account.
-     * Typically you will not need this method and can call `deploy` directly. Use this for having finer
-     * grained control on when to create, simulate, and send the deployment tx.
-     * @returns A DeployMethod instance that deploys this account contract.
-     */
-    async getDeployMethod() {
-        if (!(await this.isDeployable())) {
-            throw new Error(`Account contract ${this.accountContract.getContractArtifact().name} does not require deployment.`);
+   * Returns the pre-populated deployment method to deploy the account contract that backs this account.
+   * Typically you will not need this method and can call `deploy` directly. Use this for having finer
+   * grained control on when to create, simulate, and send the deployment tx.
+   * @param deployWallet - Wallet used for deploying the account contract.
+   * @returns A DeployMethod instance that deploys this account contract.
+   */ async getDeployMethod(deployWallet) {
+        const artifact = await this.accountContract.getContractArtifact();
+        if (!await this.isDeployable()) {
+            throw new Error(`Account contract ${artifact.name} does not require deployment.`);
         }
         const completeAddress = await this.getCompleteAddress();
         await this.pxe.registerAccount(this.secretKey, completeAddress.partialAddress);
+        const args = await this.accountContract.getDeploymentArgs() ?? [];
+        if (deployWallet) {
+            // If deploying using an existing wallet/account, treat it like regular contract deployment.
+            const thisWallet = await this.getWallet();
+            return new DeployMethod(this.getPublicKeys(), deployWallet, artifact, (address)=>Contract.at(address, artifact, thisWallet), args, 'constructor');
+        }
         const { l1ChainId: chainId, protocolVersion } = await this.pxe.getNodeInfo();
-        const deployWallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
-        // We use a signerless wallet with the multi call entrypoint in order to make multiple calls in one go
+        // We use a signerless wallet with the multi call entrypoint in order to make multiple calls in one go.
         // If we used getWallet, the deployment would get routed via the account contract entrypoint
-        // and it can't be used unless the contract is initialized
-        const args = (await this.accountContract.getDeploymentArgs()) ?? [];
-        return new DeployAccountMethod(this.accountContract.getAuthWitnessProvider(completeAddress), this.getPublicKeys(), deployWallet, this.accountContract.getContractArtifact(), args, 'constructor', 'entrypoint');
+        // and it can't be used unless the contract is initialized.
+        const wallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
+        return new DeployAccountMethod(this.accountContract.getAuthWitnessProvider(completeAddress), this.getPublicKeys(), wallet, artifact, args, 'constructor', 'entrypoint');
     }
     /**
-     * Deploys the account contract that backs this account.
-     * Does not register the associated class nor publicly deploy the instance by default.
-     * Uses the salt provided in the constructor or a randomly generated one.
-     * Registers the account in the PXE Service before deploying the contract.
-     * @param opts - Fee options to be used for the deployment.
-     * @returns A SentTx object that can be waited to get the associated Wallet.
-     */
-    deploy(opts) {
-        const sentTx = this.getDeployMethod()
-            .then(deployMethod => deployMethod.send({
-            contractAddressSalt: new Fr(this.salt),
-            skipClassRegistration: opts?.skipClassRegistration ?? true,
-            skipPublicDeployment: opts?.skipPublicDeployment ?? true,
-            skipInitialization: opts?.skipInitialization ?? false,
-            universalDeploy: true,
-            fee: opts?.fee,
-        }))
-            .then(tx => tx.getTxHash());
+   * Deploys the account contract that backs this account.
+   * Does not register the associated class nor publicly deploy the instance by default.
+   * Uses the salt provided in the constructor or a randomly generated one.
+   * Registers the account in the PXE Service before deploying the contract.
+   * @param opts - Fee options to be used for the deployment.
+   * @returns A SentTx object that can be waited to get the associated Wallet.
+   */ deploy(opts) {
+        const sentTx = this.getDeployMethod(opts?.deployWallet).then((deployMethod)=>deployMethod.send({
+                contractAddressSalt: new Fr(this.salt),
+                skipClassRegistration: opts?.skipClassRegistration ?? true,
+                skipPublicDeployment: opts?.skipPublicDeployment ?? true,
+                skipInitialization: opts?.skipInitialization ?? false,
+                universalDeploy: true,
+                fee: opts?.fee
+            })).then((tx)=>tx.getTxHash());
         return new DeployAccountSentTx(this.pxe, sentTx, this.getWallet());
     }
     /**
-     * Deploys the account contract that backs this account if needed and awaits the tx to be mined.
-     * Uses the salt provided in the constructor or a randomly generated one. If no initialization
-     * is required it skips the transaction, and only registers the account in the PXE Service.
-     * @param opts - Options to wait for the tx to be mined.
-     * @returns A Wallet instance.
-     */
-    async waitSetup(opts = DefaultWaitOpts) {
-        await ((await this.isDeployable()) ? this.deploy().wait(opts) : this.register());
+   * Deploys the account contract that backs this account if needed and awaits the tx to be mined.
+   * Uses the salt provided in the constructor or a randomly generated one. If no initialization
+   * is required it skips the transaction, and only registers the account in the PXE Service.
+   * @param opts - Options to wait for the tx to be mined.
+   * @returns A Wallet instance.
+   */ async waitSetup(opts = DefaultWaitOpts) {
+        await (await this.isDeployable() ? this.deploy(opts).wait(opts) : this.register());
         return this.getWallet();
     }
     /**
-     * Returns whether this account contract has a constructor and needs deployment.
-     */
-    async isDeployable() {
-        return (await this.accountContract.getDeploymentArgs()) !== undefined;
+   * Returns whether this account contract has a constructor and needs deployment.
+   */ async isDeployable() {
+        return await this.accountContract.getDeploymentArgs() !== undefined;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWNjb3VudF9tYW5hZ2VyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQVksTUFBTSxzQkFBc0IsQ0FBQztBQUNqRSxPQUFPLEVBQW9DLFVBQVUsRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3ZILE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQU05QyxPQUFPLEVBQUUsZUFBZSxFQUFpQixNQUFNLHdCQUF3QixDQUFDO0FBQ3hFLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLGdEQUFnRCxDQUFDO0FBQzVGLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBVWxFOzs7R0FHRztBQUNILE1BQU0sT0FBTyxjQUFjO0lBQ3pCLFlBQ1UsR0FBUSxFQUNSLFNBQWEsRUFDYixlQUFnQyxFQUNoQyxRQUFxQztJQUM3Qzs7T0FFRztJQUNhLElBQVU7UUFQbEIsUUFBRyxHQUFILEdBQUcsQ0FBSztRQUNSLGNBQVMsR0FBVCxTQUFTLENBQUk7UUFDYixvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMsYUFBUSxHQUFSLFFBQVEsQ0FBNkI7UUFJN0IsU0FBSSxHQUFKLElBQUksQ0FBTTtJQUN6QixDQUFDO0lBRUosTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBUSxFQUFFLFNBQWEsRUFBRSxlQUFnQyxFQUFFLElBQVc7UUFDeEYsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLE1BQU0sVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ25ELElBQUksR0FBRyxJQUFJLEtBQUss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
+export { DeployAccountMethod } from './deploy_account_method.js';
+export { DeployAccountSentTx } from './deploy_account_sent_tx.js';

package/dest/api/abi.d.ts

@@ -1,4 +1,3 @@
-export { type ContractArtifact, type FunctionArtifact, EventSelector, FunctionSelector } from '@aztec/foundation/abi';
-export { loadContractArtifact, contractArtifactToBuffer, contractArtifactFromBuffer } from '@aztec/types/abi';
-export { type NoirCompiledContract } from '@aztec/types/noir';
+export { type ContractArtifact, type FunctionArtifact, EventSelector, FunctionSelector, loadContractArtifact, contractArtifactToBuffer, contractArtifactFromBuffer, } from '@aztec/stdlib/abi';
+export { type NoirCompiledContract } from '@aztec/stdlib/noir';
 //# sourceMappingURL=abi.d.ts.map

package/dest/api/abi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../src/api/abi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACtH,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9G,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../src/api/abi.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EACpB,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/api/abi.js

@@ -1,3 +1 @@
-export { EventSelector, FunctionSelector } from '@aztec/foundation/abi';
-export { loadContractArtifact, contractArtifactToBuffer, contractArtifactFromBuffer } from '@aztec/types/abi';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9hYmkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFnRCxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN0SCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsd0JBQXdCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQyJ9
+export { EventSelector, FunctionSelector, loadContractArtifact, contractArtifactToBuffer, contractArtifactFromBuffer } from '@aztec/stdlib/abi';

package/dest/api/account.d.ts

@@ -1,4 +1,3 @@
-export { AccountContract, AccountInterface, AuthWitnessProvider, Salt, Wallet } from '../account/index.js';
+export { type AccountContract, type AccountInterface, type AuthWitnessProvider, type Salt, type Wallet, getAccountContractAddress, } from '../account/index.js';
 export { AccountManager } from '../account_manager/index.js';
-export { CompleteAddress } from '@aztec/circuit-types';
 //# sourceMappingURL=account.d.ts.map

package/dest/api/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE3G,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACT,KAAK,MAAM,EACX,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC"}

package/dest/api/account.js

@@ -1,3 +1,2 @@
+export { getAccountContractAddress } from '../account/index.js';
 export { AccountManager } from '../account_manager/index.js';
-export { CompleteAddress } from '@aztec/circuit-types';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvYWNjb3VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFN0QsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDIn0=

package/dest/api/addresses.d.ts

@@ -1,3 +1,3 @@
-export { AztecAddress } from '@aztec/foundation/aztec-address';
-export { CompleteAddress } from '@aztec/circuits.js';
+export { AztecAddress } from '@aztec/stdlib/aztec-address';
+export { CompleteAddress } from '@aztec/stdlib/contract';
 //# sourceMappingURL=addresses.d.ts.map

package/dest/api/addresses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addresses.d.ts","sourceRoot":"","sources":["../../src/api/addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"addresses.d.ts","sourceRoot":"","sources":["../../src/api/addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC"}

package/dest/api/addresses.js

@@ -1,3 +1,2 @@
-export { AztecAddress } from '@aztec/foundation/aztec-address';
-export { CompleteAddress } from '@aztec/circuits.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9hZGRyZXNzZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9
+export { AztecAddress } from '@aztec/stdlib/aztec-address';
+export { CompleteAddress } from '@aztec/stdlib/contract';

package/dest/api/cheat_codes.d.ts

@@ -1,6 +1,6 @@
-import { type PXE } from '@aztec/circuit-types';
 import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
-import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
 import { AztecCheatCodes } from '../utils/aztec_cheatcodes.js';
 import { RollupCheatCodes } from './ethereum/cheat_codes.js';
 /**
@@ -20,7 +20,7 @@ export declare class CheatCodes {
     aztec: AztecCheatCodes, 
     /** Cheat codes for the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes);
-    static create(rpcUrl: string, pxe: PXE): Promise<CheatCodes>;
-    static createRollup(rpcUrl: string, addresses: Pick<L1ContractAddresses, 'rollupAddress'>): RollupCheatCodes;
+    static create(rpcUrls: string[], pxe: PXE): Promise<CheatCodes>;
+    static createRollup(rpcUrls: string[], addresses: Pick<L1ContractAddresses, 'rollupAddress'>): RollupCheatCodes;
 }
 //# sourceMappingURL=cheat_codes.d.ts.map

package/dest/api/cheat_codes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/api/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;;IAL/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAUlE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,GAAG,gBAAgB;CAI7G"}
+{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/api/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;;IAL/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAUrE,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,GAAG,gBAAgB;CAIhH"}

package/dest/api/cheat_codes.js

@@ -3,28 +3,23 @@ import { AztecCheatCodes } from '../utils/aztec_cheatcodes.js';
 import { RollupCheatCodes } from './ethereum/cheat_codes.js';
 /**
  * A class that provides utility functions for interacting with the chain.
- */
-export class CheatCodes {
-    constructor(
-    /** Cheat codes for L1.*/
-    eth, 
-    /** Cheat codes for Aztec L2. */
-    aztec, 
-    /** Cheat codes for the Aztec Rollup contract on L1. */
-    rollup) {
+ */ export class CheatCodes {
+    eth;
+    aztec;
+    rollup;
+    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for Aztec L2. */ aztec, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
         this.eth = eth;
         this.aztec = aztec;
         this.rollup = rollup;
     }
-    static async create(rpcUrl, pxe) {
-        const ethCheatCodes = new EthCheatCodes(rpcUrl);
+    static async create(rpcUrls, pxe) {
+        const ethCheatCodes = new EthCheatCodes(rpcUrls);
         const aztecCheatCodes = new AztecCheatCodes(pxe);
-        const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await pxe.getNodeInfo().then(n => n.l1ContractAddresses));
+        const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await pxe.getNodeInfo().then((n)=>n.l1ContractAddresses));
         return new CheatCodes(ethCheatCodes, aztecCheatCodes, rollupCheatCodes);
     }
-    static createRollup(rpcUrl, addresses) {
-        const ethCheatCodes = new EthCheatCodes(rpcUrl);
+    static createRollup(rpcUrls, addresses) {
+        const ethCheatCodes = new EthCheatCodes(rpcUrls);
         return new RollupCheatCodes(ethCheatCodes, addresses);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBpL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUcvRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDL0QsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFN0Q7O0dBRUc7QUFDSCxNQUFNLE9BQU8sVUFBVTtJQUNyQjtJQUNFLHlCQUF5QjtJQUNsQixHQUFrQjtJQUN6QixnQ0FBZ0M7SUFDekIsS0FBc0I7SUFDN0IsdURBQXVEO0lBQ2hELE1BQXdCO1FBSnhCLFFBQUcsR0FBSCxHQUFHLENBQWU7UUFFbEIsVUFBSyxHQUFMLEtBQUssQ0FBaUI7UUFFdEIsV0FBTSxHQUFOLE1BQU0sQ0FBa0I7SUFDOUIsQ0FBQztJQUVKLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQWMsRUFBRSxHQUFRO1FBQzFDLE1BQU0sYUFBYSxHQUFHLElBQUksYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2hELE1BQU0sZUFBZSxHQUFHLElBQUksZUFBZSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2pELE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxnQkFBZ0IsQ0FDM0MsYUFBYSxFQUNiLE1BQU0sR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxDQUN6RCxDQUFDO1FBQ0YsT0FBTyxJQUFJLFVBQVUsQ0FBQyxhQUFhLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELE1BQU0sQ0FBQyxZQUFZLENBQUMsTUFBYyxFQUFFLFNBQXFEO1FBQ3ZGLE1BQU0sYUFBYSxHQUFHLElBQUksYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2hELE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDeEQsQ0FBQztDQUNGIn0=

package/dest/api/deployment.js

@@ -1,4 +1,3 @@
 export { registerContractClass } from '../deployment/register_class.js';
 export { broadcastPrivateFunction, broadcastUnconstrainedFunction } from '../deployment/broadcast_function.js';
 export { deployInstance } from '../deployment/deploy_instance.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95bWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvZGVwbG95bWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN4RSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUMvRyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUMifQ==

package/dest/api/entrypoint.js

@@ -1,2 +1 @@
 export * from '../entrypoint/entrypoint.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50cnlwb2ludC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvZW50cnlwb2ludC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDZCQUE2QixDQUFDIn0=

package/dest/api/eth_address.js

@@ -1,2 +1 @@
 export { EthAddress } from '@aztec/foundation/eth-address';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRoX2FkZHJlc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBpL2V0aF9hZGRyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQyJ9

package/dest/api/ethereum/anvil_test_watcher.d.ts

@@ -1,8 +1,7 @@
-import { type EthAddress } from '@aztec/circuits.js';
-import { type EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
-import { type TestDateProvider } from '@aztec/foundation/timer';
-import { type HttpTransport, type PublicClient } from 'viem';
-import type * as chains from 'viem/chains';
+import type { ViemPublicClient } from '@aztec/ethereum';
+import type { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { TestDateProvider } from '@aztec/foundation/timer';
 /**
  * Represents a watcher for a rollup contract.
  *
@@ -15,13 +14,18 @@ export declare class AnvilTestWatcher {
     private dateProvider?;
     private isSandbox;
     private rollup;
+    private rollupCheatCodes;
     private filledRunningPromise?;
     private mineIfOutdatedPromise?;
+    private markingAsProvenRunningPromise?;
     private logger;
-    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, publicClient: PublicClient<HttpTransport, chains.Chain>, dateProvider?: TestDateProvider | undefined);
+    private isMarkingAsProven;
+    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, publicClient: ViemPublicClient, dateProvider?: TestDateProvider | undefined);
+    setIsMarkingAsProven(isMarkingAsProven: boolean): void;
     setIsSandbox(isSandbox: boolean): void;
     start(): Promise<void>;
     stop(): Promise<void>;
+    markAsProven(): Promise<void>;
     mineIfOutdated(): Promise<void>;
     warpTimeIfNeeded(): Promise<void>;
 }

package/dest/api/ethereum/anvil_test_watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,EAA8B,KAAK,aAAa,EAAE,KAAK,YAAY,EAA2B,MAAM,MAAM,CAAC;AAClH,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAC;AAE3C;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAWzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAbvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAAqF;IAEnG,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAE/C,OAAO,CAAC,MAAM,CAAiD;gBAGrD,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,EAC/C,YAAY,CAAC,8BAAkB;IAWzC,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IAsBL,IAAI;IAKJ,cAAc;IAoBd,gBAAgB;CAwCvB"}
+{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,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,CAA4D;IAC1E,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,YAAY,EAAE,gBAAgB,EACtB,YAAY,CAAC,8BAAkB;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IAwBL,IAAI;IAMJ,YAAY;IAOZ,cAAc;IAoBd,gBAAgB;CAwCvB"}

package/dest/api/ethereum/anvil_test_watcher.js

@@ -2,26 +2,43 @@ import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { getAddress, getContract } from 'viem';
+import { RollupCheatCodes } from './cheat_codes.js';
 /**
  * Represents a watcher for a rollup contract.
  *
  * It started on a network like anvil where time traveling is allowed, and auto-mine is turned on
  * it will periodically check if the current slot have already been filled, e.g., there was an L2
  * block within the slot. And if so, it will time travel into the next slot.
- */
-export class AnvilTestWatcher {
-    constructor(cheatcodes, rollupAddress, publicClient, dateProvider) {
+ */ export class AnvilTestWatcher {
+    cheatcodes;
+    dateProvider;
+    isSandbox;
+    rollup;
+    rollupCheatCodes;
+    filledRunningPromise;
+    mineIfOutdatedPromise;
+    markingAsProvenRunningPromise;
+    logger;
+    isMarkingAsProven;
+    constructor(cheatcodes, rollupAddress, publicClient, dateProvider){
         this.cheatcodes = cheatcodes;
         this.dateProvider = dateProvider;
         this.isSandbox = false;
         this.logger = createLogger(`aztecjs:utils:watcher`);
+        this.isMarkingAsProven = true;
         this.rollup = getContract({
             address: getAddress(rollupAddress.toString()),
             abi: RollupAbi,
-            client: publicClient,
+            client: publicClient
+        });
+        this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
+            rollupAddress
         });
         this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
     }
+    setIsMarkingAsProven(isMarkingAsProven) {
+        this.isMarkingAsProven = isMarkingAsProven;
+    }
     setIsSandbox(isSandbox) {
         this.isSandbox = isSandbox;
     }
@@ -35,26 +52,34 @@ export class AnvilTestWatcher {
         // the next slot.
         const isAutoMining = await this.cheatcodes.isAutoMining();
         if (isAutoMining) {
-            this.filledRunningPromise = new RunningPromise(() => this.warpTimeIfNeeded(), this.logger, 1000);
+            this.filledRunningPromise = new RunningPromise(()=>this.warpTimeIfNeeded(), this.logger, 1000);
             this.filledRunningPromise.start();
-            this.mineIfOutdatedPromise = new RunningPromise(() => this.mineIfOutdated(), this.logger, 1000);
+            this.mineIfOutdatedPromise = new RunningPromise(()=>this.mineIfOutdated(), this.logger, 1000);
             this.mineIfOutdatedPromise.start();
+            this.markingAsProvenRunningPromise = new RunningPromise(()=>this.markAsProven(), this.logger, 1000);
+            this.markingAsProvenRunningPromise.start();
             this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
-        }
-        else {
+        } else {
             this.logger.info(`Watcher not started because not auto mining`);
         }
     }
     async stop() {
         await this.filledRunningPromise?.stop();
         await this.mineIfOutdatedPromise?.stop();
+        await this.markingAsProvenRunningPromise?.stop();
+    }
+    async markAsProven() {
+        if (!this.isMarkingAsProven) {
+            return;
+        }
+        await this.rollupCheatCodes.markAsProven();
     }
     async mineIfOutdated() {
         // 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 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
@@ -70,15 +95,18 @@ export class AnvilTestWatcher {
         try {
             const currentSlot = await this.rollup.read.getCurrentSlot();
             const pendingBlockNumber = BigInt(await this.rollup.read.getPendingBlockNumber());
-            const blockLog = await this.rollup.read.getBlock([pendingBlockNumber]);
-            const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([currentSlot + 1n]));
+            const blockLog = await this.rollup.read.getBlock([
+                pendingBlockNumber
+            ]);
+            const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
+                currentSlot + 1n
+            ]));
             if (currentSlot === blockLog.slotNumber) {
                 // We should jump to the next slot
                 try {
                     await this.cheatcodes.warp(nextSlotTimestamp);
                     this.dateProvider?.setTime(nextSlotTimestamp * 1000);
-                }
-                catch (e) {
+                } catch (e) {
                     this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
                 }
                 this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
@@ -93,16 +121,13 @@ export class AnvilTestWatcher {
                 try {
                     await this.cheatcodes.warp(nextSlotTimestamp);
                     this.dateProvider?.setTime(nextSlotTimestamp * 1000);
-                }
-                catch (e) {
+                } catch (e) {
                     this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
                 }
                 this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
             }
-        }
-        catch (err) {
+        } catch (err) {
             this.logger.error('mineIfSlotFilled failed');
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FwaS9ldGhlcmV1bS9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFlLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFaEQsT0FBTyxFQUFxRSxVQUFVLEVBQUUsV0FBVyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBR2xIOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxnQkFBZ0I7SUFVM0IsWUFDVSxVQUF5QixFQUNqQyxhQUF5QixFQUN6QixZQUF1RCxFQUMvQyxZQUErQjtRQUgvQixlQUFVLEdBQVYsVUFBVSxDQUFlO1FBR3pCLGlCQUFZLEdBQVosWUFBWSxDQUFtQjtRQWJqQyxjQUFTLEdBQVksS0FBSyxDQUFDO1FBTzNCLFdBQU0sR0FBVyxZQUFZLENBQUMsdUJBQXVCLENBQUMsQ0FBQztRQVE3RCxJQUFJLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQztZQUN4QixPQUFPLEVBQUUsVUFBVSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUM3QyxHQUFHLEVBQUUsU0FBUztZQUNkLE1BQU0sRUFBRSxZQUFZO1NBQ3JCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxhQUFhLEVBQUUsQ0FBQyxDQUFDO0lBQ3RFLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBa0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDN0IsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLO1FBQ1QsSUFBSSxJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztZQUM5QixNQUFNLElBQUksS0FB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

package/dest/api/ethereum/chain_monitor.d.ts

@@ -1,4 +1,4 @@
-import { type RollupContract } from '@aztec/ethereum/contracts';
+import type { RollupContract } from '@aztec/ethereum/contracts';
 /** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */
 export declare class ChainMonitor {
     private readonly rollup;
@@ -12,8 +12,12 @@ export declare class ChainMonitor {
     l2BlockNumber: number;
     /** Current L2 proven block number */
     l2ProvenBlockNumber: number;
+    /** L1 timestamp for the current L2 block */
+    l2BlockTimestamp: bigint;
+    /** L1 timestamp for the proven L2 block */
+    l2ProvenBlockTimestamp: bigint;
     constructor(rollup: RollupContract, logger?: import("@aztec/foundation/log").Logger, intervalMs?: number);
-    start(): void;
+    start(): this;
     stop(): void;
     private safeRun;
     run(): Promise<void>;

package/dest/api/ethereum/chain_monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/chain_monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKhE,8GAA8G;AAC9G,qBAAa,YAAY;IAYrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,UAAU;IAb7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,MAAM,CAA6B;IAE3C,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,qCAAqC;IAC9B,mBAAmB,EAAG,MAAM,CAAC;gBAGjB,MAAM,EAAE,cAAc,EAC/B,MAAM,yCAA8C,EAC3C,UAAU,SAAM;IAKnC,KAAK;IAOL,IAAI;IAOJ,OAAO,CAAC,OAAO;IAMT,GAAG;CAmCV"}
+{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/chain_monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKhE,8GAA8G;AAC9G,qBAAa,YAAY;IAgBrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,UAAU;IAjB7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,MAAM,CAA6B;IAE3C,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;gBAGpB,MAAM,EAAE,cAAc,EAC/B,MAAM,yCAA8C,EAC3C,UAAU,SAAM;IAKnC,KAAK;IAQL,IAAI;IAOJ,OAAO,CAAC,OAAO;IAMT,GAAG;CAqCV"}