@aztec/end-to-end 0.86.0-starknet.1 → 0.87.0-nightly.20250521

package/src/e2e_p2p/p2p_network.ts

@@ -6,10 +6,12 @@ import {
   type ExtendedViemWalletClient,
   L1TxUtils,
   RollupContract,
+  deployL1Contract,
   getExpectedAddress,
   getL1ContractsConfigEnvVars,
+  l1Artifacts,
 } from '@aztec/ethereum';
-import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
+import { ChainMonitor } from '@aztec/ethereum/test';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
@@ -42,9 +44,10 @@ const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f2067060
 const l1ContractsConfig = getL1ContractsConfigEnvVars();
 export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
 
-export const SHORTENED_BLOCK_TIME_CONFIG = {
+export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
   aztecSlotDuration: 12,
   ethereumSlotDuration: 4,
+  aztecProofSubmissionWindow: 640,
 };
 
 export class P2PNetworkTest {
@@ -83,7 +86,7 @@ export class P2PNetworkTest {
     this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
 
     // Set up the base account and node private keys for the initial network deployment
-    this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(0)!.toString('hex')}`;
+    this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1)!.toString('hex')}`;
     this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
     this.proposerPrivateKeys = generatePrivateKeys(PROPOSER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
     this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
@@ -192,7 +195,7 @@ export class P2PNetworkTest {
     await this.addBootstrapNode();
     await this.snapshotManager.snapshot(
       'add-validators',
-      async ({ deployL1ContractsValues, aztecNodeConfig, dateProvider }) => {
+      async ({ deployL1ContractsValues, dateProvider, cheatCodes }) => {
         const rollup = getContract({
           address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
           abi: RollupAbi,
@@ -207,31 +210,34 @@ export class P2PNetworkTest {
           client: deployL1ContractsValues.l1Client,
         });
 
+        const { address: multiAdderAddress } = await deployL1Contract(
+          deployL1ContractsValues.l1Client,
+          l1Artifacts.multiAdder.contractAbi,
+          l1Artifacts.multiAdder.contractBytecode,
+          [rollup.address, deployL1ContractsValues.l1Client.account.address],
+        );
+
+        const multiAdder = getContract({
+          address: multiAdderAddress.toString(),
+          abi: l1Artifacts.multiAdder.contractAbi,
+          client: deployL1ContractsValues.l1Client,
+        });
+
         const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
         await Promise.all(
-          [
-            await stakingAsset.write.mint([deployL1ContractsValues.l1Client.account.address, stakeNeeded], {} as any),
-            await stakingAsset.write.approve(
-              [deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(), stakeNeeded],
-              {} as any,
-            ),
-          ].map(txHash => deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash })),
+          [await stakingAsset.write.mint([multiAdder.address, stakeNeeded], {} as any)].map(txHash =>
+            deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash }),
+          ),
         );
 
         const { validators } = this.getValidators();
         this.validators = validators;
+
         await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
-          hash: await rollup.write.cheat__InitialiseValidatorSet([this.validators]),
+          hash: await multiAdder.write.addValidators([this.validators]),
         });
 
-        const slotsInEpoch = await rollup.read.getEpochDuration();
-        const timestamp = await rollup.read.getTimestampForSlot([slotsInEpoch]);
-        const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
-        try {
-          await cheatCodes.warp(Number(timestamp));
-        } catch (err) {
-          this.logger.debug('Warp failed, time already satisfied');
-        }
+        const timestamp = await cheatCodes.rollup.advanceToEpoch(2n);
 
         // Send and await a tx to make sure we mine a block for the warp to correctly progress.
         await this._sendDummyTx(deployL1ContractsValues.l1Client);

package/src/fixtures/l1_to_l2_messaging.ts

@@ -46,5 +46,5 @@ export async function sendL1ToL2Message(
   const receivedMsgHash = topics.args.hash;
   const receivedGlobalLeafIndex = topics.args.index;
 
-  return [Fr.fromHexString(receivedMsgHash), new Fr(receivedGlobalLeafIndex)];
+  return { msgHash: Fr.fromHexString(receivedMsgHash), globalLeafIndex: new Fr(receivedGlobalLeafIndex), txReceipt };
 }

package/src/fixtures/setup_p2p_test.ts

@@ -15,9 +15,9 @@ import { TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
 import { getPrivateKeyFromIndex } from './utils.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 
-// Setup snapshots will create a node with index 0, so all of our loops here
-// need to start from 1 to avoid running validators with the same key
-export const PROPOSER_PRIVATE_KEYS_START_INDEX = 1;
+// Setup snapshots will create a node with index 0, and run extra bootstrap with
+// index 1, so all of our loops here need to start from 2 to avoid running validators with the same key
+export const PROPOSER_PRIVATE_KEYS_START_INDEX = 2;
 export const ATTESTER_PRIVATE_KEYS_START_INDEX = 1001;
 
 export interface NodeContext {

package/src/simulators/token_simulator.ts

@@ -1,4 +1,3 @@
-/* eslint-disable jsdoc/require-jsdoc */
 import { type AztecAddress, BatchCall, type Logger, type Wallet } from '@aztec/aztec.js';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 

package/src/spartan/setup_test_wallets.ts

@@ -170,9 +170,12 @@ export async function performTransfers({
   for (let i = 0; i < rounds; i++) {
     const interactions = await Promise.all(
       testWallets.wallets.map(async w =>
-        (
-          await TokenContract.at(testWallets.tokenAddress, w)
-        ).methods.transfer_in_public(w.getAddress(), recipient, transferAmount, 0),
+        (await TokenContract.at(testWallets.tokenAddress, w)).methods.transfer_in_public(
+          w.getAddress(),
+          recipient,
+          transferAmount,
+          0,
+        ),
       ),
     );