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

package/dest/e2e_epochs/epochs_test.d.ts

@@ -7,10 +7,13 @@ import { ProverNode } from '@aztec/prover-node';
 import type { L2BlockNumber } from '@aztec/stdlib/block';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
+export declare const L1_BLOCK_TIME_IN_S: number;
+export declare const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
+export declare const L2_SLOT_DURATION_IN_S: number;
 export declare const WORLD_STATE_BLOCK_HISTORY = 2;
 export declare const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export declare const ARCHIVER_POLL_INTERVAL = 50;
-export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'l1PublishRetryIntervalMS' | 'txPropagationMaxQueryAttempts' | 'proverNodeConfig' | 'ethereumSlotDuration' | 'aztecSlotDuration'>>;
+export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'l1PublishRetryIntervalMS' | 'txPropagationMaxQueryAttempts' | 'proverNodeConfig'>>;
 /**
  * Tests building of epochs using fast block times and short epochs.
  * Spawns an aztec node and a prover node with fake proofs.
@@ -28,15 +31,7 @@ export declare class EpochsTestContext {
     proverNodes: ProverNode[];
     nodes: AztecNodeService[];
     epochDuration: number;
-    L1_BLOCK_TIME_IN_S: number;
-    L2_SLOT_DURATION_IN_S: number;
     static setup(opts?: EpochsTestOpts): Promise<EpochsTestContext>;
-    static getSlotDurations(opts?: EpochsTestOpts): {
-        ethereumSlotDuration: number;
-        aztecSlotDuration: number;
-        aztecEpochDuration: number;
-        aztecProofSubmissionWindow: number;
-    };
     setup(opts?: EpochsTestOpts): Promise<void>;
     teardown(): Promise<void>;
     createProverNode(): Promise<ProverNode>;

package/dest/e2e_epochs/epochs_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,6BAA6B,CAAC;AAK1G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,IAAI,CACF,YAAY,EACV,iBAAiB,GACjB,4BAA4B,GAC5B,oBAAoB,GACpB,mBAAmB,GACnB,0BAA0B,GAC1B,+BAA+B,GAC/B,kBAAkB,GAClB,sBAAsB,GACtB,mBAAmB,CACtB,CACF,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,UAAU,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAE/B,aAAa,EAAG,MAAM,CAAC;IAEvB,kBAAkB,EAAG,MAAM,CAAC;IAC5B,qBAAqB,EAAG,MAAM,CAAC;WAElB,KAAK,CAAC,IAAI,GAAE,cAAmB;WAMrC,gBAAgB,CAAC,IAAI,GAAE,cAAmB;;;;;;IAS3C,KAAK,CAAC,IAAI,GAAE,cAAmB;IAwE/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,OAAO,CAAC,iBAAiB;IAKzB,0FAA0F;IAC7E,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAO/C,sDAAsD;IACzC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAK;IAShE,iEAAiE;IACpD,4BAA4B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,SAAK;IAUjE,4EAA4E;IAC/D,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAO7E,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAUtF"}
+{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,iBAAiB,EAAuC,MAAM,6BAA6B,CAAC;AAK1G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QAAsE,CAAC;AACtG,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,qBAAqB,QAAoD,CAAC;AAEvF,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,IAAI,CACF,YAAY,EACV,iBAAiB,GACjB,4BAA4B,GAC5B,oBAAoB,GACpB,mBAAmB,GACnB,0BAA0B,GAC1B,+BAA+B,GAC/B,kBAAkB,CACrB,CACF,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,UAAU,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAE/B,aAAa,EAAG,MAAM,CAAC;WAEV,KAAK,CAAC,IAAI,GAAE,cAAmB;IAMtC,KAAK,CAAC,IAAI,GAAE,cAAmB;IAoE/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,OAAO,CAAC,iBAAiB;IAKzB,0FAA0F;IAC7E,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAO/C,sDAAsD;IACzC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAK;IAShE,iEAAiE;IACpD,4BAA4B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,SAAK;IAUjE,4EAA4E;IAC/D,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAO7E,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAUtF"}

package/dest/e2e_epochs/epochs_test.js

@@ -7,6 +7,10 @@ import { withLogNameSuffix } from '@aztec/foundation/log';
 import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { join } from 'path';
 import { createAndSyncProverNode, getPrivateKeyFromIndex, setup } from '../fixtures/utils.js';
+// This can be lowered to as much as 2s in non-CI
+export const L1_BLOCK_TIME_IN_S = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
+export const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
+export const L2_SLOT_DURATION_IN_S = L2_SLOT_DURATION_IN_L1_SLOTS * L1_BLOCK_TIME_IN_S;
 export const WORLD_STATE_BLOCK_HISTORY = 2;
 export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
@@ -26,32 +30,16 @@ export const ARCHIVER_POLL_INTERVAL = 50;
     proverNodes = [];
     nodes = [];
     epochDuration;
-    L1_BLOCK_TIME_IN_S;
-    L2_SLOT_DURATION_IN_S;
     static async setup(opts = {}) {
         const test = new EpochsTestContext();
         await test.setup(opts);
         return test;
     }
-    static getSlotDurations(opts = {}) {
-        const envEthereumSlotDuration = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
-        const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
-        const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
-        const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
-        const aztecProofSubmissionWindow = opts.aztecProofSubmissionWindow ?? aztecEpochDuration * 2 - 1;
-        return {
-            ethereumSlotDuration,
-            aztecSlotDuration,
-            aztecEpochDuration,
-            aztecProofSubmissionWindow
-        };
-    }
     async setup(opts = {}) {
-        const { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionWindow } = EpochsTestContext.getSlotDurations(opts);
-        this.L1_BLOCK_TIME_IN_S = ethereumSlotDuration;
-        this.L2_SLOT_DURATION_IN_S = aztecSlotDuration;
         // Set up system without any account nor protocol contracts
         // and with faster block times and shorter epochs.
+        const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
+        const proofSubmissionWindow = opts.aztecProofSubmissionWindow ?? aztecEpochDuration * 2 - 1;
         const context = await setup(0, {
             checkIntervalMs: 50,
             archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
@@ -59,9 +47,9 @@ export const ARCHIVER_POLL_INTERVAL = 50;
             skipProtocolContracts: true,
             salt: 1,
             aztecEpochDuration,
-            aztecSlotDuration,
-            ethereumSlotDuration,
-            aztecProofSubmissionWindow,
+            aztecSlotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
+            ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
+            aztecProofSubmissionWindow: proofSubmissionWindow,
             minTxsPerBlock: 0,
             realProofs: false,
             startProverNode: true,
@@ -71,7 +59,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
             proverId: Fr.fromString('1'),
             // This must be enough so that the tx from the prover is delayed properly,
             // but not so much to hang the sequencer and timeout the teardown
-            txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
+            txPropagationMaxQueryAttempts: 12,
             worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
             ...opts
         });
@@ -98,11 +86,11 @@ export const ARCHIVER_POLL_INTERVAL = 50;
         this.epochDuration = aztecEpochDuration;
         this.constants = {
             epochDuration: aztecEpochDuration,
-            slotDuration: aztecSlotDuration,
+            slotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
             l1StartBlock: await this.rollup.getL1StartBlock(),
             l1GenesisTime: await this.rollup.getL1GenesisTime(),
-            ethereumSlotDuration,
-            proofSubmissionWindow: aztecProofSubmissionWindow
+            ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
+            proofSubmissionWindow
         };
         this.logger.info(`L2 genesis at L1 block ${this.constants.l1StartBlock} (timestamp ${this.constants.l1GenesisTime})`);
     }
@@ -143,7 +131,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
     /** Waits until the epoch begins (ie until the immediately previous L1 block is mined). */ async waitUntilEpochStarts(epoch) {
         const [start] = getTimestampRangeForEpoch(BigInt(epoch), this.constants);
         this.logger.info(`Waiting until L1 timestamp ${start} is reached as the start of epoch ${epoch}`);
-        await waitUntilL1Timestamp(this.l1Client, start - BigInt(this.L1_BLOCK_TIME_IN_S));
+        await waitUntilL1Timestamp(this.l1Client, start - BigInt(L1_BLOCK_TIME_IN_S));
         return start;
     }
     /** Waits until the given L2 block number is mined. */ async waitUntilL2BlockNumber(target, timeout = 60) {

package/dest/e2e_p2p/p2p_network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAQlE,OAAO,EAAE,YAAY,EAA0B,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAa9D,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E,eAAO,MAAM,2BAA2B;;;CAGvC,CAAC;AAEF,qBAAa,cAAc;IA0BhB,gBAAgB,EAAE,MAAM;IACxB,YAAY,EAAE,MAAM;IAC3B,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,WAAW,CAAC;IA9BtB,OAAO,CAAC,eAAe,CAAmB;IACnC,qBAAqB,EAAE,KAAK,MAAM,EAAE,CAAC;IACrC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,YAAY,CAAC;IAEvB,GAAG,EAAG,iBAAiB,CAAC;IACxB,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,UAAU,EAAE;QAAE,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAC/G;IAEE,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAM;IAE/C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,aAAa,CAAC;gBAGnC,QAAQ,EAAE,MAAM,EACT,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAC7B,sBAAsB,EAAE,eAAe,EAE/B,WAAW,CAAC,oBAAQ;WAqCjB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;KAC1C;IAcD,IAAI,aAAa,uBAKhB;IAEK,gBAAgB;IActB,aAAa;;;;;;;;;IA0BP,kBAAkB;IAuDlB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAgBjB,WAAW;;;;YAIH,YAAY;IAQpB,KAAK;IAaL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAKf"}

package/dest/e2e_p2p/p2p_network.js

@@ -1,5 +1,5 @@
 import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
-import { L1TxUtils, RollupContract, deployL1Contract, getExpectedAddress, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
+import { L1TxUtils, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -139,19 +139,14 @@ export class P2PNetworkTest {
                 abi: TestERC20Abi,
                 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([
-                    multiAdder.address,
+                    deployL1ContractsValues.l1Client.account.address,
+                    stakeNeeded
+                ], {}),
+                await stakingAsset.write.approve([
+                    deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
                     stakeNeeded
                 ], {})
             ].map((txHash)=>deployL1ContractsValues.l1Client.waitForTransactionReceipt({
@@ -160,7 +155,7 @@ export class P2PNetworkTest {
             const { validators } = this.getValidators();
             this.validators = validators;
             await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
-                hash: await multiAdder.write.addValidators([
+                hash: await rollup.write.cheat__InitialiseValidatorSet([
                     this.validators
                 ])
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.86.0-nightly.20250513",
+  "version": "0.86.0-starknet.1",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,39 +25,39 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.86.0-nightly.20250513",
-    "@aztec/archiver": "0.86.0-nightly.20250513",
-    "@aztec/aztec": "0.86.0-nightly.20250513",
-    "@aztec/aztec-node": "0.86.0-nightly.20250513",
-    "@aztec/aztec.js": "0.86.0-nightly.20250513",
-    "@aztec/bb-prover": "0.86.0-nightly.20250513",
-    "@aztec/blob-lib": "0.86.0-nightly.20250513",
-    "@aztec/blob-sink": "0.86.0-nightly.20250513",
-    "@aztec/bot": "0.86.0-nightly.20250513",
-    "@aztec/cli": "0.86.0-nightly.20250513",
-    "@aztec/constants": "0.86.0-nightly.20250513",
-    "@aztec/entrypoints": "0.86.0-nightly.20250513",
-    "@aztec/epoch-cache": "0.86.0-nightly.20250513",
-    "@aztec/ethereum": "0.86.0-nightly.20250513",
-    "@aztec/foundation": "0.86.0-nightly.20250513",
-    "@aztec/kv-store": "0.86.0-nightly.20250513",
-    "@aztec/l1-artifacts": "0.86.0-nightly.20250513",
-    "@aztec/merkle-tree": "0.86.0-nightly.20250513",
-    "@aztec/noir-contracts.js": "0.86.0-nightly.20250513",
-    "@aztec/noir-noirc_abi": "0.86.0-nightly.20250513",
-    "@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250513",
-    "@aztec/noir-test-contracts.js": "0.86.0-nightly.20250513",
-    "@aztec/p2p": "0.86.0-nightly.20250513",
-    "@aztec/protocol-contracts": "0.86.0-nightly.20250513",
-    "@aztec/prover-client": "0.86.0-nightly.20250513",
-    "@aztec/prover-node": "0.86.0-nightly.20250513",
-    "@aztec/pxe": "0.86.0-nightly.20250513",
-    "@aztec/sequencer-client": "0.86.0-nightly.20250513",
-    "@aztec/simulator": "0.86.0-nightly.20250513",
-    "@aztec/stdlib": "0.86.0-nightly.20250513",
-    "@aztec/telemetry-client": "0.86.0-nightly.20250513",
-    "@aztec/validator-client": "0.86.0-nightly.20250513",
-    "@aztec/world-state": "0.86.0-nightly.20250513",
+    "@aztec/accounts": "0.86.0-starknet.1",
+    "@aztec/archiver": "0.86.0-starknet.1",
+    "@aztec/aztec": "0.86.0-starknet.1",
+    "@aztec/aztec-node": "0.86.0-starknet.1",
+    "@aztec/aztec.js": "0.86.0-starknet.1",
+    "@aztec/bb-prover": "0.86.0-starknet.1",
+    "@aztec/blob-lib": "0.86.0-starknet.1",
+    "@aztec/blob-sink": "0.86.0-starknet.1",
+    "@aztec/bot": "0.86.0-starknet.1",
+    "@aztec/cli": "0.86.0-starknet.1",
+    "@aztec/constants": "0.86.0-starknet.1",
+    "@aztec/entrypoints": "0.86.0-starknet.1",
+    "@aztec/epoch-cache": "0.86.0-starknet.1",
+    "@aztec/ethereum": "0.86.0-starknet.1",
+    "@aztec/foundation": "0.86.0-starknet.1",
+    "@aztec/kv-store": "0.86.0-starknet.1",
+    "@aztec/l1-artifacts": "0.86.0-starknet.1",
+    "@aztec/merkle-tree": "0.86.0-starknet.1",
+    "@aztec/noir-contracts.js": "0.86.0-starknet.1",
+    "@aztec/noir-noirc_abi": "0.86.0-starknet.1",
+    "@aztec/noir-protocol-circuits-types": "0.86.0-starknet.1",
+    "@aztec/noir-test-contracts.js": "0.86.0-starknet.1",
+    "@aztec/p2p": "0.86.0-starknet.1",
+    "@aztec/protocol-contracts": "0.86.0-starknet.1",
+    "@aztec/prover-client": "0.86.0-starknet.1",
+    "@aztec/prover-node": "0.86.0-starknet.1",
+    "@aztec/pxe": "0.86.0-starknet.1",
+    "@aztec/sequencer-client": "0.86.0-starknet.1",
+    "@aztec/simulator": "0.86.0-starknet.1",
+    "@aztec/stdlib": "0.86.0-starknet.1",
+    "@aztec/telemetry-client": "0.86.0-starknet.1",
+    "@aztec/validator-client": "0.86.0-starknet.1",
+    "@aztec/world-state": "0.86.0-starknet.1",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.5.0",
     "@noble/curves": "^1.0.0",

package/src/e2e_epochs/epochs_test.ts

@@ -23,6 +23,11 @@ import {
   setup,
 } from '../fixtures/utils.js';
 
+// This can be lowered to as much as 2s in non-CI
+export const L1_BLOCK_TIME_IN_S = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
+export const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
+export const L2_SLOT_DURATION_IN_S = L2_SLOT_DURATION_IN_L1_SLOTS * L1_BLOCK_TIME_IN_S;
+
 export const WORLD_STATE_BLOCK_HISTORY = 2;
 export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
@@ -37,8 +42,6 @@ export type EpochsTestOpts = Partial<
     | 'l1PublishRetryIntervalMS'
     | 'txPropagationMaxQueryAttempts'
     | 'proverNodeConfig'
-    | 'ethereumSlotDuration'
-    | 'aztecSlotDuration'
   >
 >;
 
@@ -62,33 +65,17 @@ export class EpochsTestContext {
 
   public epochDuration!: number;
 
-  public L1_BLOCK_TIME_IN_S!: number;
-  public L2_SLOT_DURATION_IN_S!: number;
-
   public static async setup(opts: EpochsTestOpts = {}) {
     const test = new EpochsTestContext();
     await test.setup(opts);
     return test;
   }
 
-  public static getSlotDurations(opts: EpochsTestOpts = {}) {
-    const envEthereumSlotDuration = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
-    const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
-    const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
-    const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
-    const aztecProofSubmissionWindow = opts.aztecProofSubmissionWindow ?? aztecEpochDuration * 2 - 1;
-    return { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionWindow };
-  }
-
   public async setup(opts: EpochsTestOpts = {}) {
-    const { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionWindow } =
-      EpochsTestContext.getSlotDurations(opts);
-
-    this.L1_BLOCK_TIME_IN_S = ethereumSlotDuration;
-    this.L2_SLOT_DURATION_IN_S = aztecSlotDuration;
-
     // Set up system without any account nor protocol contracts
     // and with faster block times and shorter epochs.
+    const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
+    const proofSubmissionWindow = opts.aztecProofSubmissionWindow ?? aztecEpochDuration * 2 - 1;
     const context = await setup(0, {
       checkIntervalMs: 50,
       archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
@@ -96,9 +83,9 @@ export class EpochsTestContext {
       skipProtocolContracts: true,
       salt: 1,
       aztecEpochDuration,
-      aztecSlotDuration,
-      ethereumSlotDuration,
-      aztecProofSubmissionWindow,
+      aztecSlotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
+      ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
+      aztecProofSubmissionWindow: proofSubmissionWindow,
       minTxsPerBlock: 0,
       realProofs: false,
       startProverNode: true,
@@ -108,7 +95,7 @@ export class EpochsTestContext {
       proverId: Fr.fromString('1'),
       // This must be enough so that the tx from the prover is delayed properly,
       // but not so much to hang the sequencer and timeout the teardown
-      txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
+      txPropagationMaxQueryAttempts: 12,
       worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
       ...opts,
     });
@@ -140,11 +127,11 @@ export class EpochsTestContext {
     this.epochDuration = aztecEpochDuration;
     this.constants = {
       epochDuration: aztecEpochDuration,
-      slotDuration: aztecSlotDuration,
+      slotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
       l1StartBlock: await this.rollup.getL1StartBlock(),
       l1GenesisTime: await this.rollup.getL1GenesisTime(),
-      ethereumSlotDuration,
-      proofSubmissionWindow: aztecProofSubmissionWindow,
+      ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
+      proofSubmissionWindow,
     };
 
     this.logger.info(
@@ -198,7 +185,7 @@ export class EpochsTestContext {
   public async waitUntilEpochStarts(epoch: number) {
     const [start] = getTimestampRangeForEpoch(BigInt(epoch), this.constants);
     this.logger.info(`Waiting until L1 timestamp ${start} is reached as the start of epoch ${epoch}`);
-    await waitUntilL1Timestamp(this.l1Client, start - BigInt(this.L1_BLOCK_TIME_IN_S));
+    await waitUntilL1Timestamp(this.l1Client, start - BigInt(L1_BLOCK_TIME_IN_S));
     return start;
   }
 

package/src/e2e_p2p/p2p_network.ts

@@ -6,10 +6,8 @@ import {
   type ExtendedViemWalletClient,
   L1TxUtils,
   RollupContract,
-  deployL1Contract,
   getExpectedAddress,
   getL1ContractsConfigEnvVars,
-  l1Artifacts,
 } from '@aztec/ethereum';
 import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -209,31 +207,21 @@ 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([multiAdder.address, stakeNeeded], {} as any)].map(txHash =>
-            deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash }),
-          ),
+          [
+            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 })),
         );
 
         const { validators } = this.getValidators();
         this.validators = validators;
-
         await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
-          hash: await multiAdder.write.addValidators([this.validators]),
+          hash: await rollup.write.cheat__InitialiseValidatorSet([this.validators]),
         });
 
         const slotsInEpoch = await rollup.read.getEpochDuration();