@aztec/end-to-end 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.17

package/dest/spartan/utils.js

@@ -6,11 +6,27 @@ import { z } from 'zod';
 import { AlertChecker } from '../quality_of_service/alert_checker.js';
 const execAsync = promisify(exec);
 const logger = createLogger('e2e:k8s-utils');
+const ethereumHostsSchema = z.string().refine((str)=>str.split(',').every((url)=>{
+        try {
+            new URL(url.trim());
+            return true;
+        } catch  {
+            return false;
+        }
+    }), 'ETHEREUM_HOSTS must be a comma-separated list of valid URLs');
 const k8sLocalConfigSchema = z.object({
+    ETHEREUM_SLOT_DURATION: z.coerce.number().min(1, 'ETHEREUM_SLOT_DURATION env variable must be set'),
+    AZTEC_SLOT_DURATION: z.coerce.number().min(1, 'AZTEC_SLOT_DURATION env variable must be set'),
+    AZTEC_EPOCH_DURATION: z.coerce.number().min(1, 'AZTEC_EPOCH_DURATION env variable must be set'),
+    AZTEC_PROOF_SUBMISSION_WINDOW: z.coerce.number().min(1, 'AZTEC_PROOF_SUBMISSION_WINDOW env variable must be set'),
     INSTANCE_NAME: z.string().min(1, 'INSTANCE_NAME env variable must be set'),
     NAMESPACE: z.string().min(1, 'NAMESPACE env variable must be set'),
     HOST_NODE_PORT: z.coerce.number().min(1, 'HOST_NODE_PORT env variable must be set'),
     CONTAINER_NODE_PORT: z.coerce.number().default(8080),
+    HOST_SEQUENCER_PORT: z.coerce.number().min(1, 'HOST_SEQUENCER_PORT env variable must be set'),
+    CONTAINER_SEQUENCER_PORT: z.coerce.number().default(8080),
+    HOST_PROVER_NODE_PORT: z.coerce.number().min(1, 'HOST_PROVER_NODE_PORT env variable must be set'),
+    CONTAINER_PROVER_NODE_PORT: z.coerce.number().default(8080),
     HOST_PXE_PORT: z.coerce.number().min(1, 'HOST_PXE_PORT env variable must be set'),
     CONTAINER_PXE_PORT: z.coerce.number().default(8080),
     HOST_ETHEREUM_PORT: z.coerce.number().min(1, 'HOST_ETHEREUM_PORT env variable must be set'),
@@ -20,6 +36,9 @@ const k8sLocalConfigSchema = z.object({
     GRAFANA_PASSWORD: z.string().optional(),
     METRICS_API_PATH: z.string().default('/api/datasources/proxy/uid/spartan-metrics-prometheus/api/v1'),
     SPARTAN_DIR: z.string().min(1, 'SPARTAN_DIR env variable must be set'),
+    ETHEREUM_HOSTS: ethereumHostsSchema.optional(),
+    L1_ACCOUNT_MNEMONIC: z.string().default('test test test test test test test test test test test junk'),
+    SEPOLIA_RUN: z.string().default('false'),
     K8S: z.literal('local')
 });
 const k8sGCloudConfigSchema = k8sLocalConfigSchema.extend({
@@ -30,7 +49,7 @@ const k8sGCloudConfigSchema = k8sLocalConfigSchema.extend({
 const directConfigSchema = z.object({
     PXE_URL: z.string().url('PXE_URL must be a valid URL'),
     NODE_URL: z.string().url('NODE_URL must be a valid URL'),
-    ETHEREUM_HOST: z.string().url('ETHEREUM_HOST must be a valid URL'),
+    ETHEREUM_HOSTS: ethereumHostsSchema,
     K8S: z.literal('false')
 });
 const envSchema = z.discriminatedUnion('K8S', [
@@ -86,7 +105,7 @@ export async function startPortForward({ resource, namespace, containerPort, hos
         if (str.includes('Starting port forward')) {
             logger.info(str);
         } else {
-            logger.debug(str);
+            logger.silent(str);
         }
     });
     process.stderr?.on('data', (data)=>{
@@ -196,6 +215,26 @@ export function applyProverFailure({ namespace, spartanDir, durationSeconds, log
         logger
     });
 }
+export function applyProverKill({ namespace, spartanDir, logger }) {
+    return installChaosMeshChart({
+        instanceName: 'prover-kill',
+        targetNamespace: namespace,
+        valuesFile: 'prover-kill.yaml',
+        helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
+        clean: true,
+        logger
+    });
+}
+export function applyProverBrokerKill({ namespace, spartanDir, logger }) {
+    return installChaosMeshChart({
+        instanceName: 'prover-broker-kill',
+        targetNamespace: namespace,
+        valuesFile: 'prover-broker-kill.yaml',
+        helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
+        clean: true,
+        logger
+    });
+}
 export function applyBootNodeFailure({ namespace, spartanDir, durationSeconds, logger }) {
     return installChaosMeshChart({
         instanceName: 'boot-node-failure',
@@ -317,3 +356,72 @@ export async function updateSequencersConfig(env, config) {
         await updateSequencerConfig(env.NODE_URL, config);
     }
 }
+/**
+ * Rolls the Aztec pods in the given namespace.
+ * @param namespace - The namespace to roll the Aztec pods in.
+ * @dev - IMPORTANT: This function DOES NOT delete the underlying PVCs.
+ *        This means that the pods will be restarted with the same persistent storage.
+ *        This is useful for testing, but you should be aware of the implications.
+ */ export async function rollAztecPods(namespace) {
+    await deleteResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=boot-node'
+    });
+    await deleteResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=prover-node'
+    });
+    await deleteResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=prover-broker'
+    });
+    await deleteResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=prover-agent'
+    });
+    await deleteResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=validator'
+    });
+    await deleteResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=pxe'
+    });
+    await sleep(10 * 1000);
+    await waitForResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=boot-node'
+    });
+    await waitForResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=prover-node'
+    });
+    await waitForResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=prover-broker'
+    });
+    await waitForResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=prover-agent'
+    });
+    await waitForResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=validator'
+    });
+    await waitForResourceByLabel({
+        resource: 'pods',
+        namespace: namespace,
+        label: 'app=pxe'
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+  "version": "0.77.0-testnet-ignition.17",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -8,8 +8,7 @@
     "./package.local.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -b && webpack",
-    "build:e2e": "yarn clean && tsc -b",
+    "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
@@ -27,36 +26,36 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/archiver": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/aztec-node": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/aztec.js": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/bb-prover": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/blob-lib": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/blob-sink": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/bot": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/circuit-types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/circuits.js": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/entrypoints": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/epoch-cache": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/ethereum": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/foundation": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/kv-store": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/l1-artifacts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/merkle-tree": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/noir-contracts.js": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/noir-protocol-circuits-types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/p2p": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/protocol-contracts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/prover-client": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/prover-node": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/pxe": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/sequencer-client": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/simulator": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/telemetry-client": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/validator-client": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/world-state": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/accounts": "0.77.0-testnet-ignition.17",
+    "@aztec/archiver": "0.77.0-testnet-ignition.17",
+    "@aztec/aztec": "0.77.0-testnet-ignition.17",
+    "@aztec/aztec-node": "0.77.0-testnet-ignition.17",
+    "@aztec/aztec.js": "0.77.0-testnet-ignition.17",
+    "@aztec/bb-prover": "0.77.0-testnet-ignition.17",
+    "@aztec/blob-lib": "0.77.0-testnet-ignition.17",
+    "@aztec/blob-sink": "0.77.0-testnet-ignition.17",
+    "@aztec/bot": "0.77.0-testnet-ignition.17",
+    "@aztec/constants": "0.77.0-testnet-ignition.17",
+    "@aztec/entrypoints": "0.77.0-testnet-ignition.17",
+    "@aztec/epoch-cache": "0.77.0-testnet-ignition.17",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.17",
+    "@aztec/foundation": "0.77.0-testnet-ignition.17",
+    "@aztec/kv-store": "0.77.0-testnet-ignition.17",
+    "@aztec/l1-artifacts": "0.77.0-testnet-ignition.17",
+    "@aztec/merkle-tree": "0.77.0-testnet-ignition.17",
+    "@aztec/noir-contracts.js": "0.77.0-testnet-ignition.17",
+    "@aztec/noir-protocol-circuits-types": "0.77.0-testnet-ignition.17",
+    "@aztec/p2p": "0.77.0-testnet-ignition.17",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.17",
+    "@aztec/prover-client": "0.77.0-testnet-ignition.17",
+    "@aztec/prover-node": "0.77.0-testnet-ignition.17",
+    "@aztec/pxe": "0.77.0-testnet-ignition.17",
+    "@aztec/sequencer-client": "0.77.0-testnet-ignition.17",
+    "@aztec/simulator": "0.77.0-testnet-ignition.17",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.17",
+    "@aztec/telemetry-client": "0.77.0-testnet-ignition.17",
+    "@aztec/validator-client": "0.77.0-testnet-ignition.17",
+    "@aztec/world-state": "0.77.0-testnet-ignition.17",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.5.0",
     "@noble/curves": "^1.0.0",
@@ -85,6 +84,7 @@
     "lodash.chunk": "^4.2.0",
     "lodash.compact": "^3.0.1",
     "lodash.every": "^4.6.0",
+    "lodash.omit": "^4.5.0",
     "memdown": "^6.1.1",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
@@ -145,19 +145,14 @@
       ]
     },
     "reporters": [
-      [
-        "summary",
-        {
-          "summaryThreshold": 0
-        }
-      ]
+      "default"
     ],
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
     },
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src",
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]

package/src/bench/utils.ts

@@ -1,15 +1,11 @@
-import { type AztecNodeService } from '@aztec/aztec-node';
+import type { AztecNodeService } from '@aztec/aztec-node';
 import { type AztecNode, BatchCall, INITIAL_L2_BLOCK_NUM, type SentTx, type WaitOpts } from '@aztec/aztec.js';
 import { mean, stdDev, timesParallel } from '@aztec/foundation/collection';
 import { randomInt } from '@aztec/foundation/crypto';
 import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking';
 import { type PXEService, type PXEServiceConfig, createPXEService } from '@aztec/pxe';
-import { type MetricsType } from '@aztec/telemetry-client';
-import {
-  type BenchmarkDataPoint,
-  type BenchmarkMetricsType,
-  type BenchmarkTelemetryClient,
-} from '@aztec/telemetry-client/bench';
+import type { MetricsType } from '@aztec/telemetry-client';
+import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 
 import { writeFileSync } from 'fs';
 import { mkdirpSync } from 'fs-extra';
@@ -127,15 +123,27 @@ export function getFolderSize(path: string): number {
  * @param index - Index of the call within a block.
  * @param context - End to end context.
  * @param contract - Benchmarking contract.
+ * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns A BatchCall instance.
  */
-export async function makeCall(index: number, context: EndToEndContext, contract: BenchmarkingContract) {
+export async function makeCall(
+  index: number,
+  context: EndToEndContext,
+  contract: BenchmarkingContract,
+  heavyPublicCompute: boolean,
+) {
   const owner = context.wallet.getAddress();
   const sender = owner;
-  return new BatchCall(context.wallet, [
-    await contract.methods.create_note(owner, sender, index + 1).request(),
-    await contract.methods.increment_balance(owner, index + 1).request(),
-  ]);
+  if (heavyPublicCompute) {
+    return new BatchCall(context.wallet, [
+      await contract.methods.sha256_hash_2048(randomBytesAsBigInts(2048)).request(),
+    ]);
+  } else {
+    return new BatchCall(context.wallet, [
+      await contract.methods.create_note(owner, sender, index + 1).request(),
+      await contract.methods.increment_balance(owner, index + 1).request(),
+    ]);
+  }
 }
 
 /**
@@ -144,14 +152,16 @@ export async function makeCall(index: number, context: EndToEndContext, contract
  * @param txCount - How many txs to send
  * @param context - End to end context.
  * @param contract - Target contract.
+ * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns Array of sent txs.
  */
 export async function sendTxs(
   txCount: number,
   context: EndToEndContext,
   contract: BenchmarkingContract,
+  heavyPublicCompute: boolean = false,
 ): Promise<SentTx[]> {
-  const calls = await timesParallel(txCount, index => makeCall(index, context, contract));
+  const calls = await timesParallel(txCount, index => makeCall(index, context, contract, heavyPublicCompute));
   context.logger.info(`Creating ${txCount} txs`);
   const provenTxs = await Promise.all(calls.map(call => call.prove({ skipPublicSimulation: true })));
   context.logger.info(`Sending ${txCount} txs`);
@@ -177,14 +187,21 @@ export async function createNewPXE(
   startingBlock: number = INITIAL_L2_BLOCK_NUM,
 ): Promise<PXEService> {
   const l1Contracts = await node.getL1ContractAddresses();
+  const { l1ChainId, protocolVersion } = await node.getNodeInfo();
   const pxeConfig = {
     l2StartingBlock: startingBlock,
     l2BlockPollingIntervalMS: 100,
     dataDirectory: undefined,
     dataStoreMapSizeKB: 1024 * 1024,
     l1Contracts,
+    l1ChainId,
+    version: protocolVersion,
   } as PXEServiceConfig;
   const pxe = await createPXEService(node, pxeConfig);
   await pxe.registerContract(contract);
   return pxe;
 }
+
+function randomBytesAsBigInts(length: number): bigint[] {
+  return [...Array(length)].map(_ => BigInt(Math.floor(Math.random() * 255)));
+}

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -1,17 +1,16 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import {
   type AccountWallet,
   type CompleteAddress,
-  ExtendedNote,
   Fr,
   type Logger,
-  Note,
   type TxHash,
   computeSecretHash,
   createLogger,
 } from '@aztec/aztec.js';
+import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
 import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
-import { type TokenContract } from '@aztec/noir-contracts.js/Token';
+import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 
 import { jest } from '@jest/globals';
@@ -19,8 +18,8 @@ import { jest } from '@jest/globals';
 import {
   type ISnapshotManager,
   type SubsystemsContext,
-  addAccounts,
   createSnapshotManager,
+  deployAccounts,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
@@ -91,18 +90,17 @@ export class BlacklistTokenContractTest {
     // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
     jest.setTimeout(120_000);
 
-    await this.snapshotManager.snapshot('3_accounts', addAccounts(3, this.logger), async ({ accountKeys }, { pxe }) => {
-      this.wallets = await Promise.all(
-        accountKeys.map(async ak => {
-          const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-          return account.getWallet();
-        }),
-      );
-      this.admin = this.wallets[0];
-      this.other = this.wallets[1];
-      this.blacklisted = this.wallets[2];
-      this.accounts = this.wallets.map(w => w.getCompleteAddress());
-    });
+    await this.snapshotManager.snapshot(
+      '3_accounts',
+      deployAccounts(3, this.logger),
+      async ({ deployedAccounts }, { pxe }) => {
+        this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
+        this.admin = this.wallets[0];
+        this.other = this.wallets[1];
+        this.blacklisted = this.wallets[2];
+        this.accounts = this.wallets.map(w => w.getCompleteAddress());
+      },
+    );
 
     await this.snapshotManager.snapshot(
       'e2e_blacklist_token_contract',
@@ -160,24 +158,36 @@ export class BlacklistTokenContractTest {
     await this.snapshotManager.teardown();
   }
 
-  async addPendingShieldNoteToPXE(accountIndex: number, amount: bigint, secretHash: Fr, txHash: TxHash) {
-    const note = new Note([new Fr(amount), secretHash]);
-    const extendedNote = new ExtendedNote(
-      note,
-      this.accounts[accountIndex].address,
-      this.asset.address,
-      TokenBlacklistContract.storage.pending_shields.slot,
-      TokenBlacklistContract.notes.TransparentNote.id,
-      txHash,
-    );
-    await this.wallets[accountIndex].addNote(extendedNote);
+  #toBoundedVec(arr: Fr[], maxLen: number) {
+    return { len: arr.length, storage: arr.concat(new Array(maxLen - arr.length).fill(new Fr(0))) };
+  }
+
+  async addPendingShieldNoteToPXE(
+    contract: TokenBlacklistContract,
+    wallet: AccountWallet,
+    amount: bigint,
+    secretHash: Fr,
+    txHash: TxHash,
+  ) {
+    const txEffects = await wallet.getTxEffect(txHash);
+    await contract.methods
+      .deliver_transparent_note(
+        contract.address,
+        amount,
+        secretHash,
+        txHash.hash,
+        this.#toBoundedVec(txEffects!.data.noteHashes, MAX_NOTE_HASHES_PER_TX),
+        txEffects!.data.nullifiers[0],
+        wallet.getAddress(),
+      )
+      .simulate();
   }
 
   async applyMintSnapshot() {
     await this.snapshotManager.snapshot(
       'mint',
       async () => {
-        const { asset, accounts } = this;
+        const { asset, accounts, wallets } = this;
         const amount = 10000n;
 
         const adminMinterRole = new Role().withAdmin().withMinter();
@@ -208,7 +218,7 @@ export class BlacklistTokenContractTest {
         const secretHash = await computeSecretHash(secret);
         const receipt = await asset.methods.mint_private(amount, secretHash).send().wait();
 
-        await this.addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash);
+        await this.addPendingShieldNoteToPXE(asset, wallets[0], amount, secretHash, receipt.txHash);
         const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
         await txClaim.wait({ debug: true });
         this.logger.verbose(`Minting complete.`);

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -1,28 +1,29 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { type AztecNodeConfig } from '@aztec/aztec-node';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
+import type { AztecNodeConfig } from '@aztec/aztec-node';
 import {
   type AccountWallet,
   AztecAddress,
   type AztecNode,
+  CheatCodes,
   type CompleteAddress,
   EthAddress,
   type Logger,
   type PXE,
   createLogger,
 } from '@aztec/aztec.js';
-import { createL1Clients } from '@aztec/ethereum';
-import { InboxAbi, OutboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { type ViemPublicClient, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { InboxAbi, OutboxAbi, RollupAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 
-import { type Chain, type HttpTransport, type PublicClient, getContract } from 'viem';
+import { getContract } from 'viem';
 
 import { MNEMONIC } from '../fixtures/fixtures.js';
 import {
   type ISnapshotManager,
   type SubsystemsContext,
-  addAccounts,
   createSnapshotManager,
+  deployAccounts,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
 import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
@@ -38,7 +39,7 @@ export class CrossChainMessagingTest {
   pxe!: PXE;
   aztecNodeConfig!: AztecNodeConfig;
 
-  publicClient!: PublicClient<HttpTransport, Chain> | undefined;
+  publicClient!: ViemPublicClient | undefined;
 
   user1Wallet!: AccountWallet;
   user2Wallet!: AccountWallet;
@@ -51,6 +52,7 @@ export class CrossChainMessagingTest {
   rollup!: any; // GetContractReturnType<typeof RollupAbi> | undefined;
   inbox!: any; // GetContractReturnType<typeof InboxAbi> | undefined;
   outbox!: any; // GetContractReturnType<typeof OutboxAbi> | undefined;
+  cheatcodes!: CheatCodes;
 
   constructor(testName: string) {
     this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
@@ -58,7 +60,7 @@ export class CrossChainMessagingTest {
   }
 
   async assumeProven() {
-    await this.rollup.write.setAssumeProvenThroughBlockNumber([await this.rollup.read.getPendingBlockNumber()]);
+    await this.cheatcodes.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
   }
 
   async setup() {
@@ -66,6 +68,7 @@ export class CrossChainMessagingTest {
     this.aztecNode = aztecNode;
     this.pxe = pxe;
     this.aztecNodeConfig = aztecNodeConfig;
+    this.cheatcodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
   }
 
   snapshot = <T>(
@@ -84,14 +87,9 @@ export class CrossChainMessagingTest {
 
     await this.snapshotManager.snapshot(
       '3_accounts',
-      addAccounts(3, this.logger),
-      async ({ accountKeys }, { pxe, aztecNodeConfig, aztecNode, deployL1ContractsValues }) => {
-        this.wallets = await Promise.all(
-          accountKeys.map(async ak => {
-            const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-            return account.getWallet();
-          }),
-        );
+      deployAccounts(3, this.logger),
+      async ({ deployedAccounts }, { pxe, aztecNodeConfig, aztecNode, deployL1ContractsValues }) => {
+        this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
         this.accounts = this.wallets.map(w => w.getCompleteAddress());
         this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
 
@@ -118,7 +116,24 @@ export class CrossChainMessagingTest {
         this.logger.verbose(`Public deploy accounts...`);
         await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 3));
 
-        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrl, MNEMONIC);
+        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+
+        const underlyingERC20Address = await deployL1Contract(
+          walletClient,
+          publicClient,
+          TestERC20Abi,
+          TestERC20Bytecode,
+          ['Underlying', 'UND', walletClient.account.address],
+        ).then(({ address }) => address);
+
+        const underlyingERC20 = getContract({
+          address: underlyingERC20Address!.toString(),
+          abi: TestERC20Abi,
+          client: walletClient,
+        });
+
+        // allow anyone to mint
+        await underlyingERC20.write.setFreeForAll([true], {} as any);
 
         this.logger.verbose(`Setting up cross chain harness...`);
         this.crossChainTestHarness = await CrossChainTestHarness.new(
@@ -128,6 +143,7 @@ export class CrossChainMessagingTest {
           walletClient,
           this.wallets[0],
           this.logger,
+          underlyingERC20Address,
         );
 
         this.logger.verbose(`L2 token deployed to: ${this.crossChainTestHarness.l2Token.address}`);
@@ -143,7 +159,7 @@ export class CrossChainMessagingTest {
         this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
         const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
 
-        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrl, MNEMONIC);
+        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
         const inbox = getContract({
           address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),

package/src/e2e_deploy_contract/deploy_test.ts

@@ -1,4 +1,4 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import {
   type AccountWallet,
   type AztecAddress,
@@ -13,9 +13,9 @@ import {
   createLogger,
   getContractInstanceFromDeployParams,
 } from '@aztec/aztec.js';
-import { type StatefulTestContract } from '@aztec/noir-contracts.js/StatefulTest';
+import type { StatefulTestContract } from '@aztec/noir-contracts.js/StatefulTest';
 
-import { type ISnapshotManager, addAccounts, createSnapshotManager } from '../fixtures/snapshot_manager.js';
+import { type ISnapshotManager, createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 
 const { E2E_DATA_PATH: dataPath } = process.env;
 
@@ -47,14 +47,9 @@ export class DeployTest {
   private async applyInitialAccountSnapshot() {
     await this.snapshotManager.snapshot(
       'initial_account',
-      addAccounts(1, this.logger),
-      async ({ accountKeys }, { pxe }) => {
-        this.wallets = await Promise.all(
-          accountKeys.map(async ak => {
-            const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-            return account.getWallet();
-          }),
-        );
+      deployAccounts(1, this.logger),
+      async ({ deployedAccounts }, { pxe }) => {
+        this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
         this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
         this.wallet = this.wallets[0];
       },