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

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.76.4",
+  "version": "0.77.0-testnet-ignition.21",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -38,7 +38,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo ./src/account_contract/artifacts",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
     "../package.common.json",
@@ -72,19 +72,18 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.76.4",
-    "@aztec/circuits.js": "0.76.4",
-    "@aztec/ethereum": "0.76.4",
-    "@aztec/foundation": "0.76.4",
-    "@aztec/l1-artifacts": "0.76.4",
-    "@aztec/protocol-contracts": "0.76.4",
-    "@aztec/types": "0.76.4",
+    "@aztec/constants": "0.77.0-testnet-ignition.21",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.21",
+    "@aztec/foundation": "0.77.0-testnet-ignition.21",
+    "@aztec/l1-artifacts": "0.77.0-testnet-ignition.21",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.21",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.21",
     "axios": "^1.7.2",
     "tslib": "^2.4.0",
     "viem": "2.22.8"
@@ -94,7 +93,6 @@
     "@types/jest": "^29.5.0",
     "@types/node": "^18.7.23",
     "buffer": "^6.0.3",
-    "copy-webpack-plugin": "^12.0.2",
     "crypto-browserify": "^3.12.0",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",
@@ -104,9 +102,7 @@
     "ts-loader": "^9.4.4",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4",
-    "util": "^0.12.5",
-    "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4"
+    "util": "^0.12.5"
   },
   "files": [
     "dest",

package/src/account/contract.ts

@@ -1,8 +1,10 @@
-import { type CompleteAddress } from '@aztec/circuit-types';
-import { type NodeInfo } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
+import { Fr } from '@aztec/foundation/fields';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';
+import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { deriveKeys } from '@aztec/stdlib/keys';
 
-import { type AccountInterface, type AuthWitnessProvider } from './interface.js';
+import type { AccountInterface, AuthWitnessProvider } from './interface.js';
 
 // docs:start:account-contract-interface
 /**
@@ -13,7 +15,7 @@ export interface AccountContract {
   /**
    * Returns the artifact of this account contract.
    */
-  getContractArtifact(): ContractArtifact;
+  getContractArtifact(): Promise<ContractArtifact>;
 
   /**
    * Returns the deployment arguments for this instance, or undefined if this contract does not require deployment.
@@ -37,3 +39,18 @@ export interface AccountContract {
   getAuthWitnessProvider(address: CompleteAddress): AuthWitnessProvider;
 }
 // docs:end:account-contract-interface
+
+/**
+ * Compute the address of an account contract from secret and salt.
+ */
+export async function getAccountContractAddress(accountContract: AccountContract, secret: Fr, salt: Fr) {
+  const { publicKeys } = await deriveKeys(secret);
+  const constructorArgs = await accountContract.getDeploymentArgs();
+  const artifact = await accountContract.getContractArtifact();
+  const instance = await getContractInstanceFromDeployParams(artifact, {
+    constructorArgs,
+    salt,
+    publicKeys,
+  });
+  return instance.address;
+}

package/src/account/index.ts

@@ -6,9 +6,9 @@
  *
  * @packageDocumentation
  */
-import { type Fr } from '@aztec/circuits.js';
+import type { Fr } from '@aztec/foundation/fields';
 
-export { type AccountContract } from './contract.js';
+export { type AccountContract, getAccountContractAddress } from './contract.js';
 export { type AccountInterface, type AuthWitnessProvider } from './interface.js';
 export * from './wallet.js';
 

package/src/account/interface.ts

@@ -1,8 +1,9 @@
-import { type AuthWitness, type CompleteAddress } from '@aztec/circuit-types';
-import { type AztecAddress } from '@aztec/circuits.js';
-import { type Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/fields';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { CompleteAddress } from '@aztec/stdlib/contract';
 
-import { type EntrypointInterface } from '../entrypoint/entrypoint.js';
+import type { EntrypointInterface } from '../entrypoint/entrypoint.js';
 
 // docs:start:account-interface
 /** Creates authorization witnesses. */

package/src/account/wallet.ts

@@ -1,7 +1,8 @@
-import { type AuthWitness, type PXE } from '@aztec/circuit-types';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
 
-import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js';
-import { type AccountInterface } from './interface.js';
+import type { IntentAction, IntentInnerHash } from '../utils/authwit.js';
+import type { AccountInterface } from './interface.js';
 
 /**
  * The wallet interface.

package/src/account_manager/deploy_account_method.ts

@@ -1,15 +1,15 @@
-import { type PublicKeys } from '@aztec/circuits.js';
 import {
   type ContractArtifact,
   type FunctionArtifact,
   FunctionSelector,
   encodeArguments,
   getFunctionArtifactByName,
-} from '@aztec/foundation/abi';
+} from '@aztec/stdlib/abi';
+import type { PublicKeys } from '@aztec/stdlib/keys';
 
-import { type AuthWitnessProvider } from '../account/interface.js';
-import { type Wallet } from '../account/wallet.js';
-import { type ExecutionRequestInit } from '../api/entrypoint.js';
+import type { AuthWitnessProvider } from '../account/interface.js';
+import type { Wallet } from '../account/wallet.js';
+import type { ExecutionRequestInit } from '../api/entrypoint.js';
 import { Contract } from '../contract/contract.js';
 import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js';
 import { EntrypointPayload, computeCombinedPayloadHash } from '../entrypoint/payload.js';

package/src/account_manager/deploy_account_sent_tx.ts

@@ -1,7 +1,8 @@
-import { type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types';
-import { type FieldsOf } from '@aztec/foundation/types';
+import type { FieldsOf } from '@aztec/foundation/types';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
-import { type Wallet } from '../account/index.js';
+import type { Wallet } from '../account/index.js';
 import { DefaultWaitOpts, SentTx, type WaitOpts } from '../contract/sent_tx.js';
 
 /** Extends a transaction receipt with a wallet instance for the newly deployed contract. */

package/src/account_manager/index.ts

@@ -1,11 +1,14 @@
-import { CompleteAddress, type PXE } from '@aztec/circuit-types';
-import { type ContractInstanceWithAddress, deriveKeys, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
-
-import { type AccountContract } from '../account/contract.js';
-import { type Salt } from '../account/index.js';
-import { type AccountInterface } from '../account/interface.js';
-import { type DeployOptions } from '../contract/deploy_method.js';
+import { CompleteAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import { deriveKeys } from '@aztec/stdlib/keys';
+
+import type { AccountContract } from '../account/contract.js';
+import type { Salt, Wallet } from '../account/index.js';
+import type { AccountInterface } from '../account/interface.js';
+import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js';
+import { Contract } from '../contract/index.js';
 import { DefaultWaitOpts, type WaitOpts } from '../contract/sent_tx.js';
 import { DefaultMultiCallEntrypoint } from '../entrypoint/default_multi_call_entrypoint.js';
 import { AccountWalletWithSecretKey, SignerlessWallet } from '../wallet/index.js';
@@ -18,7 +21,12 @@ import { DeployAccountSentTx } from './deploy_account_sent_tx.js';
 export type DeployAccountOptions = Pick<
   DeployOptions,
   'fee' | 'skipClassRegistration' | 'skipPublicDeployment' | 'skipInitialization'
->;
+> & {
+  /**
+   * Wallet used for deploying the account contract. Must be funded in order to pay for the fee.
+   */
+  deployWallet?: Wallet;
+};
 
 /**
  * Manages a user account. Provides methods for calculating the account's address, deploying the account contract,
@@ -40,7 +48,8 @@ export class AccountManager {
     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,
@@ -113,7 +122,7 @@ export class AccountManager {
    */
   public async register(): Promise<AccountWalletWithSecretKey> {
     await this.pxe.registerContract({
-      artifact: this.accountContract.getContractArtifact(),
+      artifact: await this.accountContract.getContractArtifact(),
       instance: this.getInstance(),
     });
 
@@ -126,31 +135,46 @@ export class AccountManager {
    * 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.
    */
-  public async getDeployMethod() {
+  public async getDeployMethod(deployWallet?: Wallet) {
+    const artifact = await this.accountContract.getContractArtifact();
+
     if (!(await this.isDeployable())) {
-      throw new Error(
-        `Account contract ${this.accountContract.getContractArtifact().name} does not require deployment.`,
-      );
+      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 { l1ChainId: chainId, protocolVersion } = await this.pxe.getNodeInfo();
-    const deployWallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
+    const args = (await this.accountContract.getDeploymentArgs()) ?? [];
 
-    // We use a signerless wallet with the multi call entrypoint in order to make multiple calls in one go
+    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();
+    // 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()) ?? [];
+    // 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(),
-      deployWallet,
-      this.accountContract.getContractArtifact(),
+      wallet,
+      artifact,
       args,
       'constructor',
       'entrypoint',
@@ -166,7 +190,7 @@ export class AccountManager {
    * @returns A SentTx object that can be waited to get the associated Wallet.
    */
   public deploy(opts?: DeployAccountOptions): DeployAccountSentTx {
-    const sentTx = this.getDeployMethod()
+    const sentTx = this.getDeployMethod(opts?.deployWallet)
       .then(deployMethod =>
         deployMethod.send({
           contractAddressSalt: new Fr(this.salt),
@@ -188,8 +212,8 @@ export class AccountManager {
    * @param opts - Options to wait for the tx to be mined.
    * @returns A Wallet instance.
    */
-  public async waitSetup(opts: WaitOpts = DefaultWaitOpts): Promise<AccountWalletWithSecretKey> {
-    await ((await this.isDeployable()) ? this.deploy().wait(opts) : this.register());
+  public async waitSetup(opts: DeployAccountOptions & WaitOpts = DefaultWaitOpts): Promise<AccountWalletWithSecretKey> {
+    await ((await this.isDeployable()) ? this.deploy(opts).wait(opts) : this.register());
     return this.getWallet();
   }
 
@@ -200,3 +224,6 @@ export class AccountManager {
     return (await this.accountContract.getDeploymentArgs()) !== undefined;
   }
 }
+
+export { DeployAccountMethod } from './deploy_account_method.js';
+export { type DeployAccountTxReceipt, DeployAccountSentTx } from './deploy_account_sent_tx.js';

package/src/api/abi.ts

@@ -1,3 +1,10 @@
-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';

package/src/api/account.ts

@@ -1,5 +1,10 @@
-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';

package/src/api/addresses.ts

@@ -1,2 +1,2 @@
-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';

package/src/api/cheat_codes.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';
@@ -18,8 +18,8 @@ export class CheatCodes {
     public rollup: RollupCheatCodes,
   ) {}
 
-  static async create(rpcUrl: string, pxe: PXE): Promise<CheatCodes> {
-    const ethCheatCodes = new EthCheatCodes(rpcUrl);
+  static async create(rpcUrls: string[], pxe: PXE): Promise<CheatCodes> {
+    const ethCheatCodes = new EthCheatCodes(rpcUrls);
     const aztecCheatCodes = new AztecCheatCodes(pxe);
     const rollupCheatCodes = new RollupCheatCodes(
       ethCheatCodes,
@@ -28,8 +28,8 @@ export class CheatCodes {
     return new CheatCodes(ethCheatCodes, aztecCheatCodes, rollupCheatCodes);
   }
 
-  static createRollup(rpcUrl: string, addresses: Pick<L1ContractAddresses, 'rollupAddress'>): RollupCheatCodes {
-    const ethCheatCodes = new EthCheatCodes(rpcUrl);
+  static createRollup(rpcUrls: string[], addresses: Pick<L1ContractAddresses, 'rollupAddress'>): RollupCheatCodes {
+    const ethCheatCodes = new EthCheatCodes(rpcUrls);
     return new RollupCheatCodes(ethCheatCodes, addresses);
   }
 }

package/src/api/ethereum/anvil_test_watcher.ts

@@ -1,12 +1,14 @@
-import { type EthAddress } from '@aztec/circuits.js';
-import { type EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
+import type { ViemPublicClient } from '@aztec/ethereum';
+import type { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { type TestDateProvider } from '@aztec/foundation/timer';
+import type { TestDateProvider } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
 
-import { type GetContractReturnType, type HttpTransport, type PublicClient, getAddress, getContract } from 'viem';
-import type * as chains from 'viem/chains';
+import { type GetContractReturnType, getAddress, getContract } from 'viem';
+
+import { RollupCheatCodes } from './cheat_codes.js';
 
 /**
  * Represents a watcher for a rollup contract.
@@ -18,17 +20,21 @@ import type * as chains from 'viem/chains';
 export class AnvilTestWatcher {
   private isSandbox: boolean = false;
 
-  private rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, chains.Chain>>;
+  private rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>;
+  private rollupCheatCodes: RollupCheatCodes;
 
   private filledRunningPromise?: RunningPromise;
   private mineIfOutdatedPromise?: RunningPromise;
+  private markingAsProvenRunningPromise?: RunningPromise;
 
   private logger: Logger = createLogger(`aztecjs:utils:watcher`);
 
+  private isMarkingAsProven = true;
+
   constructor(
     private cheatcodes: EthCheatCodes,
     rollupAddress: EthAddress,
-    publicClient: PublicClient<HttpTransport, chains.Chain>,
+    publicClient: ViemPublicClient,
     private dateProvider?: TestDateProvider,
   ) {
     this.rollup = getContract({
@@ -37,9 +43,17 @@ export class AnvilTestWatcher {
       client: publicClient,
     });
 
+    this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
+      rollupAddress,
+    });
+
     this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
   }
 
+  setIsMarkingAsProven(isMarkingAsProven: boolean) {
+    this.isMarkingAsProven = isMarkingAsProven;
+  }
+
   setIsSandbox(isSandbox: boolean) {
     this.isSandbox = isSandbox;
   }
@@ -60,6 +74,8 @@ export class AnvilTestWatcher {
       this.filledRunningPromise.start();
       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 {
       this.logger.info(`Watcher not started because not auto mining`);
@@ -69,6 +85,14 @@ export class AnvilTestWatcher {
   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() {

package/src/api/ethereum/chain_monitor.ts

@@ -1,7 +1,7 @@
-import { type RollupContract } from '@aztec/ethereum/contracts';
+import type { RollupContract } from '@aztec/ethereum/contracts';
 import { createLogger } from '@aztec/foundation/log';
 
-import { type PublicClient } from 'viem';
+import type { PublicClient } from 'viem';
 
 /** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */
 export class ChainMonitor {
@@ -14,6 +14,10 @@ export class ChainMonitor {
   public l2BlockNumber!: number;
   /** Current L2 proven block number */
   public l2ProvenBlockNumber!: number;
+  /** L1 timestamp for the current L2 block */
+  public l2BlockTimestamp!: bigint;
+  /** L1 timestamp for the proven L2 block */
+  public l2ProvenBlockTimestamp!: bigint;
 
   constructor(
     private readonly rollup: RollupContract,
@@ -28,6 +32,7 @@ export class ChainMonitor {
       throw new Error('Chain monitor already started');
     }
     this.handle = setInterval(this.safeRun.bind(this), this.intervalMs);
+    return this;
   }
 
   stop() {
@@ -61,6 +66,7 @@ export class ChainMonitor {
       const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2BlockNumber));
       msg += ` with new L2 block ${newL2BlockNumber} for epoch ${epochNumber}`;
       this.l2BlockNumber = newL2BlockNumber;
+      this.l2BlockTimestamp = timestamp;
     }
 
     const newL2ProvenBlockNumber = Number(await this.rollup.getProvenBlockNumber());
@@ -68,6 +74,7 @@ export class ChainMonitor {
       const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2ProvenBlockNumber));
       msg += ` with proof up to L2 block ${newL2ProvenBlockNumber} for epoch ${epochNumber}`;
       this.l2ProvenBlockNumber = newL2ProvenBlockNumber;
+      this.l2ProvenBlockTimestamp = timestamp;
     }
 
     this.logger.info(msg, {

package/src/api/ethereum/cheat_codes.ts

@@ -1,31 +1,27 @@
+import type { ViemPublicClient } from '@aztec/ethereum';
 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 { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 
-import {
-  type GetContractReturnType,
-  type Hex,
-  type PublicClient,
-  type WalletClient,
-  createWalletClient,
-  getContract,
-  http,
-  publicActions,
-} from 'viem';
+import { type GetContractReturnType, type Hex, createPublicClient, fallback, getContract, http, keccak256 } from 'viem';
 import { foundry } from 'viem/chains';
 
 export { EthCheatCodes };
 
 /** Cheat codes for the L1 rollup contract. */
 export class RollupCheatCodes {
-  private client: WalletClient & PublicClient;
-  private rollup: GetContractReturnType<typeof RollupAbi, WalletClient>;
+  private client: ViemPublicClient;
+  private rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>;
 
   private logger = createLogger('aztecjs:cheat_codes');
 
   constructor(private ethCheatCodes: EthCheatCodes, addresses: Pick<L1ContractAddresses, 'rollupAddress'>) {
-    this.client = createWalletClient({ chain: foundry, transport: http(ethCheatCodes.rpcUrl) }).extend(publicActions);
+    this.client = createPublicClient({
+      chain: foundry,
+      transport: fallback(ethCheatCodes.rpcUrls.map(url => http(url))),
+    });
     this.rollup = getContract({
       abi: RollupAbi,
       address: addresses.rollupAddress.toString(),
@@ -110,14 +106,36 @@ export class RollupCheatCodes {
    * @param maybeBlockNumber - The block number to mark as proven (defaults to latest pending)
    */
   public async markAsProven(maybeBlockNumber?: number | bigint) {
-    const blockNumber = maybeBlockNumber
-      ? BigInt(maybeBlockNumber)
-      : await this.rollup.read.getTips().then(({ pendingBlockNumber }) => pendingBlockNumber);
-
-    await this.asOwner(async account => {
-      await this.rollup.write.setAssumeProvenThroughBlockNumber([blockNumber], { account, chain: this.client.chain });
-      this.logger.warn(`Marked ${blockNumber} as proven`);
-    });
+    const { pending, proven } = await this.getTips();
+
+    let blockNumber = maybeBlockNumber;
+    if (blockNumber === undefined || blockNumber > pending) {
+      blockNumber = pending;
+    }
+    if (blockNumber <= proven) {
+      this.logger.warn(`Block ${blockNumber} is already proven`);
+      return;
+    }
+
+    // @note @LHerskind this is heavily dependent on the storage layout and size of values
+    // The rollupStore is a struct and if the size of elements or the struct changes, this can break
+
+    // Convert string to bytes and then compute keccak256
+    const storageSlot = keccak256(Buffer.from('aztec.stf.storage', 'utf-8'));
+    const provenBlockNumberSlot = BigInt(storageSlot) + 1n;
+
+    const tipsBefore = await this.getTips();
+
+    await this.ethCheatCodes.store(
+      EthAddress.fromString(this.rollup.address),
+      provenBlockNumberSlot,
+      BigInt(blockNumber),
+    );
+
+    const tipsAfter = await this.getTips();
+    this.logger.info(
+      `Proven tip moved: ${tipsBefore.proven} -> ${tipsAfter.proven}. Pending tip: ${tipsAfter.pending}.`,
+    );
   }
 
   /**
@@ -125,7 +143,7 @@ export class RollupCheatCodes {
    * @param action - The action to execute
    */
   public async asOwner(
-    action: (owner: Hex, rollup: GetContractReturnType<typeof RollupAbi, WalletClient>) => Promise<void>,
+    action: (owner: Hex, rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>) => Promise<void>,
   ) {
     const owner = await this.rollup.read.owner();
     await this.ethCheatCodes.startImpersonating(owner);
@@ -136,8 +154,31 @@ export class RollupCheatCodes {
   /** Directly calls the L1 gas fee oracle. */
   public async updateL1GasFeeOracle() {
     await this.asOwner(async (account, rollup) => {
-      await rollup.write.updateL1GasFeeOracle({ account, chain: this.client.chain });
+      const hash = await rollup.write.updateL1GasFeeOracle({ account, chain: this.client.chain });
+      await this.client.waitForTransactionReceipt({ hash });
       this.logger.warn(`Updated L1 gas fee oracle`);
     });
   }
+
+  /**
+   * Bumps proving cost per mana.
+   * @param bumper - Callback to calculate the new proving cost per mana based on current value.
+   */
+  public async bumpProvingCostPerMana(bumper: (before: bigint) => bigint) {
+    const currentCost = await this.rollup.read.getProvingCostPerManaInEth();
+    const newCost = bumper(currentCost);
+    await this.setProvingCostPerMana(newCost);
+  }
+
+  /**
+   * Directly updates proving cost per mana.
+   * @param ethValue - The new proving cost per mana in ETH
+   */
+  public async setProvingCostPerMana(ethValue: bigint) {
+    await this.asOwner(async (account, rollup) => {
+      const hash = await rollup.write.setProvingCostPerMana([ethValue], { account, chain: this.client.chain });
+      await this.client.waitForTransactionReceipt({ hash });
+      this.logger.warn(`Updated proving cost per mana to ${ethValue}`);
+    });
+  }
 }

package/src/api/ethereum/index.ts

@@ -12,4 +12,8 @@ export { getL1ContractAddresses } from './l1_contracts.js';
 export { RollupCheatCodes, EthCheatCodes } from './cheat_codes.js';
 export { ChainMonitor } from './chain_monitor.js';
 export { AnvilTestWatcher } from './anvil_test_watcher.js';
-export { deployL1Contract, deployL1Contracts, DeployL1Contracts } from '@aztec/ethereum/deploy-l1-contracts';
+export {
+  deployL1Contract,
+  deployL1Contracts,
+  type DeployL1ContractsReturnType,
+} from '@aztec/ethereum/deploy-l1-contracts';