@aztec/end-to-end 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107

package/dest/e2e_fees/fees_test.js

@@ -1,9 +1,9 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { createLogger, sleep } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec/testing';
-import { RollupContract, createExtendedL1Client } from '@aztec/ethereum';
+import { createLogger } from '@aztec/aztec.js/log';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { sleep } from '@aztec/foundation/sleep';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
@@ -31,15 +31,13 @@ const { E2E_DATA_PATH: dataPath } = process.env;
  */ export class FeesTest {
     numberOfAccounts;
     snapshotManager;
-    wallets;
     accounts;
     logger;
-    pxe;
     aztecNode;
+    aztecNodeAdmin;
     cheatCodes;
-    aliceWallet;
+    wallet;
     aliceAddress;
-    bobWallet;
     bobAddress;
     sequencerAddress;
     coinbase;
@@ -66,7 +64,6 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     APP_SPONSORED_TX_GAS_LIMIT;
     constructor(testName, numberOfAccounts = 3, setupOptions = {}){
         this.numberOfAccounts = numberOfAccounts;
-        this.wallets = [];
         this.accounts = [];
         this.ALICE_INITIAL_BANANAS = BigInt(1e22);
         this.SUBSCRIPTION_AMOUNT = BigInt(1e19);
@@ -104,10 +101,11 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }
     }
     async getBlockRewards() {
-        const blockReward = await this.rollupContract.getBlockReward();
-        const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress);
+        const blockReward = await this.rollupContract.getCheckpointReward();
+        const rewardConfig = await this.rollupContract.getRewardConfig();
+        const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(rewardConfig.rewardDistributor);
         const toDistribute = balance > blockReward ? blockReward : balance;
-        const sequencerBlockRewards = toDistribute / 2n;
+        const sequencerBlockRewards = toDistribute * BigInt(rewardConfig.sequencerBps) / 10000n;
         const proverBlockRewards = toDistribute - sequencerBlockRewards;
         return {
             sequencerBlockRewards,
@@ -125,7 +123,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({
             from: this.aliceAddress
         });
-        await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, this.aliceWallet, address, amount);
+        await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
         const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({
             from: this.aliceAddress
         });
@@ -138,64 +136,63 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         await this.applyDeployBananaTokenSnapshot();
     }
     async applyInitialAccountsSnapshot() {
-        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig })=>{
-            this.pxe = pxe;
+        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { wallet, aztecNode, cheatCodes })=>{
+            this.wallet = wallet;
             this.aztecNode = aztecNode;
+            this.aztecNodeAdmin = aztecNode;
             this.gasSettings = GasSettings.default({
                 maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2)
             });
-            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, 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.accounts = this.wallets.map((w)=>w.getAddress());
-            [this.aliceWallet, this.bobWallet] = this.wallets.slice(0, 2);
-            [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts;
+            this.cheatCodes = cheatCodes;
+            this.accounts = deployedAccounts.map((a)=>a.address);
+            this.accounts.forEach((a, i)=>this.logger.verbose(`Account ${i} address: ${a}`));
+            [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
             // We set Alice as the FPC admin to avoid the need for deployment of another account.
             this.fpcAdmin = this.aliceAddress;
             const canonicalFeeJuice = await getCanonicalFeeJuice();
-            this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.aliceWallet);
+            this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
         });
     }
     async applyPublicDeployAccountsSnapshot() {
-        await this.snapshotManager.snapshot('public_deploy_accounts', ()=>ensureAccountContractsPublished(this.aliceWallet, this.wallets));
+        await this.snapshotManager.snapshot('public_deploy_accounts', ()=>ensureAccountContractsPublished(this.wallet, this.accounts));
     }
     async applySetupFeeJuiceSnapshot() {
         await this.snapshotManager.snapshot('setup_fee_juice', async ()=>{}, async (_data, context)=>{
             this.context = context;
-            this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.aliceWallet);
+            this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
             this.getGasBalanceFn = getBalancesFn('⛽', this.feeJuiceContract.methods.balance_of_public, this.aliceAddress, this.logger);
             this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
                 aztecNode: context.aztecNode,
                 aztecNodeAdmin: context.aztecNode,
-                pxeService: context.pxe,
                 l1Client: context.deployL1ContractsValues.l1Client,
-                wallet: this.aliceWallet,
+                wallet: this.wallet,
                 logger: this.logger
             });
         });
     }
     async applyDeployBananaTokenSnapshot() {
         await this.snapshotManager.snapshot('deploy_banana_token', async ()=>{
-            const bananaCoin = await BananaCoin.deploy(this.aliceWallet, this.aliceAddress, 'BC', 'BC', 18n).send({
+            const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n).send({
                 from: this.aliceAddress
             }).deployed();
             this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
             return {
                 bananaCoinAddress: bananaCoin.address
             };
-        }, async ({ bananaCoinAddress })=>{
-            this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.aliceWallet);
+        }, ({ bananaCoinAddress })=>{
+            this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.wallet);
             const logger = this.logger;
             this.getBananaPublicBalanceFn = getBalancesFn('🍌.public', this.bananaCoin.methods.balance_of_public, this.aliceAddress, logger);
             this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, this.aliceAddress, logger);
+            return Promise.resolve();
         });
     }
     async applyFPCSetupSnapshot() {
         await this.snapshotManager.snapshot('fpc_setup', async (context)=>{
             const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+            expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
             const bananaCoin = this.bananaCoin;
-            const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin).send({
+            const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin).send({
                 from: this.aliceAddress
             }).deployed();
             this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
@@ -206,8 +203,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
                 l1FeeJuiceAddress: this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress,
                 rollupAddress: context.deployL1ContractsValues.l1ContractAddresses.rollupAddress
             };
-        }, async (data, context)=>{
-            const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.aliceWallet);
+        }, (data, context)=>{
+            const bananaFPC = FPCContract.at(data.bananaFPCAddress, this.wallet);
             this.bananaFPC = bananaFPC;
             this.getCoinbaseBalance = async ()=>{
                 const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
@@ -224,31 +221,33 @@ const { E2E_DATA_PATH: dataPath } = process.env;
                 return await this.rollupContract.getSequencerRewards(this.coinbase);
             };
             this.getProverFee = async (blockNumber)=>{
-                const block = await this.pxe.getBlock(blockNumber);
+                const block = await this.aztecNode.getBlock(blockNumber);
                 // @todo @lherskind As we deal with #13601
                 // Right now the value is from `FeeLib.sol`
                 const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
                 // We round up
                 const mulDiv = (a, b, c)=>a * b / c + (a * b % c > 0n ? 1n : 0n);
                 const { baseFee } = await this.rollupContract.getL1FeesAt(block.header.globalVariables.timestamp);
-                const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()), 1n, await this.rollupContract.getManaTarget()) + await this.rollupContract.getProvingCostPerMana();
+                const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, BigInt(await this.rollupContract.getEpochDuration())), 1n, await this.rollupContract.getManaTarget()) + await this.rollupContract.getProvingCostPerMana();
                 const price = await this.rollupContract.getFeeAssetPerEth();
                 const mana = block.header.totalManaUsed.toBigInt();
                 return mulDiv(mana * proverCost, price, 10n ** 9n);
             };
+            return Promise.resolve();
         });
     }
     async applySponsoredFPCSetupSnapshot() {
         await this.snapshotManager.snapshot('sponsored_fpc_setup', async (context)=>{
             const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
-            const sponsoredFPC = await setupSponsoredFPC(context.pxe);
+            expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+            const sponsoredFPC = await setupSponsoredFPC(this.wallet);
             this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
             return {
                 sponsoredFPCAddress: sponsoredFPC.address
             };
-        }, async (data)=>{
-            this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.aliceWallet);
+        }, (data)=>{
+            this.sponsoredFPC = SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
+            return Promise.resolve();
         });
     }
     async applyFundAliceWithBananas() {

package/dest/e2e_l1_publisher/write_json.d.ts

@@ -1,8 +1,10 @@
-import { AztecAddress, Fr, type L2Block } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { L2Block } from '@aztec/aztec.js/block';
+import { Fr } from '@aztec/aztec.js/fields';
 import { BatchedBlob, Blob } from '@aztec/blob-lib';
 /**
  * Creates a json object that can be used to test the solidity contract.
  * The json object must be put into
  */
 export declare function writeJson(fileName: string, block: L2Block, l1ToL2Content: Fr[], blobs: Blob[], batchedBlob: BatchedBlob, recipientAddress: AztecAddress, deployerAddress: `0x${string}`): Promise<void>;
-//# sourceMappingURL=write_json.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVfanNvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV9sMV9wdWJsaXNoZXIvd3JpdGVfanNvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUE2RCxNQUFNLGlCQUFpQixDQUFDO0FBTy9HOzs7R0FHRztBQUNILHdCQUFzQixTQUFTLENBQzdCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLEtBQUssRUFBRSxPQUFPLEVBQ2QsYUFBYSxFQUFFLEVBQUUsRUFBRSxFQUNuQixLQUFLLEVBQUUsSUFBSSxFQUFFLEVBQ2IsV0FBVyxFQUFFLFdBQVcsRUFDeEIsZ0JBQWdCLEVBQUUsWUFBWSxFQUM5QixlQUFlLEVBQUUsS0FBSyxNQUFNLEVBQUUsR0FDN0IsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXNEZiJ9

package/dest/e2e_l1_publisher/write_json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write_json.d.ts","sourceRoot":"","sources":["../../src/e2e_l1_publisher/write_json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAOpD;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,EAAE,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,YAAY,EAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CAqDf"}
+{"version":3,"file":"write_json.d.ts","sourceRoot":"","sources":["../../src/e2e_l1_publisher/write_json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,IAAI,EAA6D,MAAM,iBAAiB,CAAC;AAO/G;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,EAAE,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,YAAY,EAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CAsDf"}

package/dest/e2e_l1_publisher/write_json.js

@@ -1,4 +1,4 @@
-import { Blob } from '@aztec/blob-lib';
+import { getEthBlobEvaluationInputs, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
 import { writeFile } from 'fs/promises';
 const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
 /**
@@ -16,23 +16,24 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
     };
     const jsonObject = {
         populate: {
-            l1ToL2Content: l1ToL2Content.map(asHex),
+            l1ToL2Content: l1ToL2Content.map((value)=>asHex(value)),
             recipient: asHex(recipientAddress.toField()),
             sender: deployerAddress
         },
         messages: {
-            l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map(asHex)
+            l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map((value)=>asHex(value))
         },
-        block: {
+        checkpoint: {
             // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
             // This should not be a problem for testing as long as the values are not larger than u32.
             archive: asHex(block.archive.root),
-            blobCommitments: Blob.getPrefixedEthBlobCommitments(blobs),
-            batchedBlobInputs: batchedBlob.getEthBlobEvaluationInputs(),
-            blockNumber: block.number,
+            blobCommitments: getPrefixedEthBlobCommitments(blobs),
+            batchedBlobInputs: getEthBlobEvaluationInputs(batchedBlob),
+            checkpointNumber: block.number,
             body: `0x${block.body.toBuffer().toString('hex')}`,
             header: {
                 lastArchiveRoot: asHex(block.header.lastArchive.root),
+                blockHeadersHash: asHex(block.header.blockHeadersHash),
                 contentCommitment: {
                     blobsHash: asHex(block.header.contentCommitment.blobsHash),
                     inHash: asHex(block.header.contentCommitment.inHash),
@@ -48,7 +49,7 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
                 },
                 totalManaUsed: block.header.totalManaUsed.toNumber()
             },
-            headerHash: asHex(block.header.toPropose().hash()),
+            headerHash: asHex(block.getCheckpointHeader().hash()),
             numTxs: block.body.txEffects.length
         }
     };

package/dest/e2e_multi_validator/utils.d.ts

@@ -1,4 +1,4 @@
-import type { AztecAddress } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { EthPrivateKey } from '@aztec/node-keystore';
 export declare function createJSONRPCSigner(keyLookup: Map<string, EthPrivateKey>, stats: Map<string, number>): import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
@@ -9,4 +9,4 @@ export declare function createKeyFile4(fileName: string, validator1Address: EthA
 export declare function createKeyFile5(fileName: string, proverAddress: EthAddress, remoteSignerUrl: string): Promise<void>;
 export declare function createKeyFile6(fileName: string, mnemonic: string, validator1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
 export declare function addressForPrivateKey(privateKey: EthPrivateKey): EthAddress;
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbXVsdGlfdmFsaWRhdG9yL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFXMUQsd0JBQWdCLG1CQUFtQixDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxzR0EwRXBHO0FBR0Qsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFlBQVksRUFBRSxhQUFhLEVBQzNCLGlCQUFpQixFQUFFLE1BQU0sRUFDekIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsWUFBWSxFQUFFLFlBQVksaUJBaUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGlCQUFpQixFQUFFLFVBQVUsRUFDN0IsaUJBQWlCLEVBQUUsVUFBVSxFQUM3QixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsYUFBYSxFQUM1QixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsVUFBVSxFQUNyQixTQUFTLEVBQUUsVUFBVSxFQUNyQixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsWUFBWSxFQUMzQixhQUFhLEVBQUUsWUFBWSxpQkE0QjVCO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBY3hHO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBa0IzQjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsYUFBYSxHQUFHLFVBQVUsQ0FFMUUifQ==

package/dest/e2e_multi_validator/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/e2e_multi_validator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAW1D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,sGA0EpG;AAGD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,UAAU,EAC7B,iBAAiB,EAAE,UAAU,EAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,YAAY,EAC3B,aAAa,EAAE,YAAY,iBAgC5B;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAcxG;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAkB3B;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,aAAa,GAAG,UAAU,CAE1E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/e2e_multi_validator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAW1D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,sGA0EpG;AAGD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,iBAiB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,UAAU,EAC7B,iBAAiB,EAAE,UAAU,EAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,YAAY,EAC3B,aAAa,EAAE,YAAY,iBA4B5B;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAcxG;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAkB3B;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,aAAa,GAAG,UAAU,CAE1E"}

package/dest/e2e_multi_validator/utils.js

@@ -1,4 +1,4 @@
-import { getAddressFromPrivateKey } from '@aztec/ethereum';
+import { getAddressFromPrivateKey } from '@aztec/ethereum/account';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { writeFile } from 'fs/promises';
 import { createServer } from 'http';
@@ -130,9 +130,7 @@ export async function createKeyFile3(fileName, validatorAddress, publisher1Key,
         schemaVersion: 1,
         validators: [
             {
-                attester: {
-                    address: validatorAddress.toChecksumString()
-                },
+                attester: validatorAddress.toChecksumString(),
                 coinbase: coinbase.toChecksumString(),
                 publisher: [
                     publisher1Key,
@@ -155,9 +153,7 @@ export async function createKeyFile4(fileName, validator1Address, validator2Addr
         },
         validators: [
             {
-                attester: {
-                    address: validator1Address.toChecksumString()
-                },
+                attester: validator1Address.toChecksumString(),
                 coinbase: coinbase1.toChecksumString(),
                 publisher: {
                     mnemonic: mnemonic,
@@ -168,9 +164,7 @@ export async function createKeyFile4(fileName, validator1Address, validator2Addr
                 feeRecipient: feeRecipient1.toString()
             },
             {
-                attester: {
-                    address: validator2Address.toChecksumString()
-                },
+                attester: validator2Address.toChecksumString(),
                 coinbase: coinbase2.toChecksumString(),
                 publisher: [
                     publisher2Key,

package/dest/e2e_nested_contract/nested_contract_test.d.ts

@@ -1,4 +1,7 @@
-import { type AccountWallet, AztecAddress, type Logger, type PXE } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
@@ -6,9 +9,9 @@ export declare class NestedContractTest {
     private numberOfAccounts;
     private snapshotManager;
     logger: Logger;
-    wallet: AccountWallet;
+    wallet: Wallet;
     defaultAccountAddress: AztecAddress;
-    pxe: PXE;
+    aztecNode: AztecNode;
     parentContract: ParentContract;
     childContract: ChildContract;
     constructor(testName: string, numberOfAccounts?: number);
@@ -23,4 +26,4 @@ export declare class NestedContractTest {
     snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
     applyManualSnapshots(): Promise<void>;
 }
-//# sourceMappingURL=nested_contract_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVzdGVkX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbmVzdGVkX2NvbnRyYWN0L25lc3RlZF9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUV0RSxPQUFPLEVBRUwsS0FBSyxpQkFBaUIsRUFJdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUl6QyxxQkFBYSxrQkFBa0I7SUFZM0IsT0FBTyxDQUFDLGdCQUFnQjtJQVgxQixPQUFPLENBQUMsZUFBZSxDQUFtQjtJQUMxQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLE1BQU0sQ0FBQztJQUNoQixxQkFBcUIsRUFBRyxZQUFZLENBQUM7SUFDckMsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixjQUFjLEVBQUcsY0FBYyxDQUFDO0lBQ2hDLGFBQWEsRUFBRyxhQUFhLENBQUM7SUFFOUIsWUFDRSxRQUFRLEVBQUUsTUFBTSxFQUNSLGdCQUFnQixTQUFJLEVBSTdCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkFvQnZCO0lBRUssS0FBSyxrQkFFVjtJQUVLLFFBQVEsa0JBRWI7SUFFRCxRQUFRLEdBQUksQ0FBQyw4SkFJMkQ7SUFFbEUsb0JBQW9CLGtCQWtCekI7Q0FDRiJ9

package/dest/e2e_nested_contract/nested_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,aAAa,CAAC;IACvB,qBAAqB,EAAG,YAAY,CAAC;IACrC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAG5B,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI;IAM9B;;;;OAIG;IACG,kBAAkB;IAuBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAkB3B"}
+{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,MAAM,CAAC;IAChB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IAEtB,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;IAE9B,YACE,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI,EAI7B;IAED;;;;OAIG;IACG,kBAAkB,kBAoBvB;IAEK,KAAK,kBAEV;IAEK,QAAQ,kBAEb;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,oBAAoB,kBAkBzB;CACF"}

package/dest/e2e_nested_contract/nested_contract_test.js

@@ -1,5 +1,4 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
@@ -10,7 +9,7 @@ export class NestedContractTest {
     logger;
     wallet;
     defaultAccountAddress;
-    pxe;
+    aztecNode;
     parentContract;
     childContract;
     constructor(testName, numberOfAccounts = 1){
@@ -24,12 +23,11 @@ export class NestedContractTest {
    * 1. Add 3 accounts.
    * 2. Publicly deploy accounts
    */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe })=>{
-            const wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            [this.wallet] = wallets;
-            this.defaultAccountAddress = this.wallet.getAddress();
-            this.pxe = pxe;
+        await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), ({ deployedAccounts }, { wallet, aztecNode })=>{
+            this.wallet = wallet;
+            [{ address: this.defaultAccountAddress }] = deployedAccounts;
+            this.aztecNode = aztecNode;
+            return Promise.resolve();
         });
         await this.snapshotManager.snapshot('public_deploy', async ()=>{}, async ()=>{
             this.logger.verbose(`Public deploy accounts...`);
@@ -57,9 +55,10 @@ export class NestedContractTest {
                 parentContractAddress: parentContract.address,
                 childContractAddress: childContract.address
             };
-        }, async ({ parentContractAddress, childContractAddress })=>{
-            this.parentContract = await ParentContract.at(parentContractAddress, this.wallet);
-            this.childContract = await ChildContract.at(childContractAddress, this.wallet);
+        }, ({ parentContractAddress, childContractAddress })=>{
+            this.parentContract = ParentContract.at(parentContractAddress, this.wallet);
+            this.childContract = ChildContract.at(childContractAddress, this.wallet);
+            return Promise.resolve();
         });
     }
 }

package/dest/e2e_p2p/inactivity_slash_test.d.ts

@@ -0,0 +1,31 @@
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import 'jest-extended';
+import { P2PNetworkTest } from './p2p_network.js';
+export declare class P2PInactivityTest {
+    readonly test: P2PNetworkTest;
+    nodes: AztecNodeService[];
+    activeNodes: AztecNodeService[];
+    inactiveNodes: AztecNodeService[];
+    rollup: RollupContract;
+    offlineValidators: EthAddress[];
+    private dataDir;
+    private inactiveNodeCount;
+    private keepInitialNode;
+    constructor(test: P2PNetworkTest, opts: {
+        inactiveNodeCount: number;
+        keepInitialNode?: boolean;
+    });
+    static create(testName: string, opts: {
+        slashInactivityConsecutiveEpochThreshold: number;
+        inactiveNodeCount: number;
+        keepInitialNode?: boolean;
+    }): Promise<P2PInactivityTest>;
+    setup(): Promise<this>;
+    teardown(): Promise<void>;
+    get ctx(): import("../fixtures/snapshot_manager.js").SubsystemsContext;
+    get logger(): import("../../../foundation/dest/log/pino-logger.js").Logger;
+    get slashingAmount(): bigint;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5hY3Rpdml0eV9zbGFzaF90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9pbmFjdGl2aXR5X3NsYXNoX3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTNELE9BQU8sZUFBZSxDQUFDO0FBS3ZCLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQWlCbEQscUJBQWEsaUJBQWlCO2FBYVYsSUFBSSxFQUFFLGNBQWM7SUFaL0IsS0FBSyxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFDM0IsV0FBVyxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFDakMsYUFBYSxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFFbkMsTUFBTSxFQUFHLGNBQWMsQ0FBQztJQUN4QixpQkFBaUIsRUFBRyxVQUFVLEVBQUUsQ0FBQztJQUV4QyxPQUFPLENBQUMsT0FBTyxDQUFTO0lBQ3hCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUztJQUNsQyxPQUFPLENBQUMsZUFBZSxDQUFVO0lBRWpDLFlBQ2tCLElBQUksRUFBRSxjQUFjLEVBQ3BDLElBQUksRUFBRTtRQUFFLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUFDLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBSy9EO0lBRUQsT0FBYSxNQUFNLENBQ2pCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLElBQUksRUFBRTtRQUFFLHdDQUF3QyxFQUFFLE1BQU0sQ0FBQztRQUFDLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUFDLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLDhCQThCakg7SUFFWSxLQUFLLGtCQTBFakI7SUFFWSxRQUFRLGtCQU1wQjtJQUVELElBQVcsR0FBRyxnRUFFYjtJQUVELElBQVcsTUFBTSxpRUFFaEI7SUFFRCxJQUFXLGNBQWMsV0FFeEI7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"inactivity_slash_test.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/inactivity_slash_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI3D,OAAO,eAAe,CAAC;AAKvB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBlD,qBAAa,iBAAiB;aAaV,IAAI,EAAE,cAAc;IAZ/B,KAAK,EAAG,gBAAgB,EAAE,CAAC;IAC3B,WAAW,EAAG,gBAAgB,EAAE,CAAC;IACjC,aAAa,EAAG,gBAAgB,EAAE,CAAC;IAEnC,MAAM,EAAG,cAAc,CAAC;IACxB,iBAAiB,EAAG,UAAU,EAAE,CAAC;IAExC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,eAAe,CAAU;IAEjC,YACkB,IAAI,EAAE,cAAc,EACpC,IAAI,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,EAK/D;IAED,OAAa,MAAM,CACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;QAAE,wCAAwC,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,8BA8BjH;IAEY,KAAK,kBA0EjB;IAEY,QAAQ,kBAMpB;IAED,IAAW,GAAG,gEAEb;IAED,IAAW,MAAM,iEAEhB;IAED,IAAW,cAAc,WAExB;CACF"}

package/dest/e2e_p2p/inactivity_slash_test.js

@@ -0,0 +1,136 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
+import fs from 'fs';
+import 'jest-extended';
+import os from 'os';
+import path from 'path';
+import { createNodes } from '../fixtures/setup_p2p_test.js';
+import { P2PNetworkTest } from './p2p_network.js';
+const NUM_NODES = 6;
+const NUM_VALIDATORS = NUM_NODES;
+const COMMITTEE_SIZE = NUM_VALIDATORS;
+const SLASHING_QUORUM = 3;
+const EPOCH_DURATION = 2;
+const SLASHING_ROUND_SIZE_IN_EPOCHS = 2;
+const BOOT_NODE_UDP_PORT = 4500;
+const ETHEREUM_SLOT_DURATION = process.env.CI ? 8 : 4;
+const AZTEC_SLOT_DURATION = ETHEREUM_SLOT_DURATION * 2;
+const SLASHING_UNIT = BigInt(1e18);
+const SLASHING_AMOUNT = SLASHING_UNIT * 3n;
+// How many epochs it may take to set everything up, so we dont slash during this period
+const SETUP_EPOCH_DURATION = 8;
+export class P2PInactivityTest {
+    test;
+    nodes;
+    activeNodes;
+    inactiveNodes;
+    rollup;
+    offlineValidators;
+    dataDir;
+    inactiveNodeCount;
+    keepInitialNode;
+    constructor(test, opts){
+        this.test = test;
+        this.dataDir = fs.mkdtempSync(path.join(os.tmpdir(), test.testName));
+        this.inactiveNodeCount = opts.inactiveNodeCount;
+        this.keepInitialNode = opts.keepInitialNode ?? false;
+    }
+    static async create(testName, opts) {
+        const test = await P2PNetworkTest.create({
+            testName,
+            numberOfNodes: 0,
+            numberOfValidators: NUM_VALIDATORS,
+            basePort: BOOT_NODE_UDP_PORT,
+            startProverNode: true,
+            initialConfig: {
+                proverNodeConfig: {
+                    proverNodeEpochProvingDelayMs: AZTEC_SLOT_DURATION * 1000
+                },
+                aztecTargetCommitteeSize: COMMITTEE_SIZE,
+                aztecSlotDuration: AZTEC_SLOT_DURATION,
+                ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
+                aztecProofSubmissionEpochs: 1024,
+                listenAddress: '127.0.0.1',
+                minTxsPerBlock: 0,
+                aztecEpochDuration: EPOCH_DURATION,
+                validatorReexecute: false,
+                sentinelEnabled: true,
+                slashingQuorum: SLASHING_QUORUM,
+                slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE_IN_EPOCHS,
+                slashInactivityTargetPercentage: 0.8,
+                slashGracePeriodL2Slots: SETUP_EPOCH_DURATION * EPOCH_DURATION,
+                slashAmountSmall: SLASHING_UNIT,
+                slashAmountMedium: SLASHING_UNIT * 2n,
+                slashAmountLarge: SLASHING_UNIT * 3n,
+                ...opts
+            }
+        });
+        return new P2PInactivityTest(test, opts);
+    }
+    async setup() {
+        await this.test.applyBaseSnapshots();
+        await this.test.setup();
+        // Set slashing penalties for inactivity
+        const { rollup } = await this.test.getContracts();
+        const [activationThreshold, ejectionThreshold, localEjectionThreshold] = await Promise.all([
+            rollup.getActivationThreshold(),
+            rollup.getEjectionThreshold(),
+            rollup.getLocalEjectionThreshold()
+        ]);
+        const biggestEjection = ejectionThreshold > localEjectionThreshold ? ejectionThreshold : localEjectionThreshold;
+        expect(activationThreshold - SLASHING_AMOUNT).toBeLessThan(biggestEjection);
+        this.test.ctx.aztecNodeConfig.slashInactivityPenalty = SLASHING_AMOUNT;
+        this.rollup = rollup;
+        if (!this.keepInitialNode) {
+            await this.test.ctx.aztecNode.stop();
+        }
+        // Create all active nodes
+        this.activeNodes = await createNodes(this.test.ctx.aztecNodeConfig, this.test.ctx.dateProvider, this.test.bootstrapNodeEnr, NUM_NODES - this.inactiveNodeCount - Number(this.keepInitialNode), BOOT_NODE_UDP_PORT, this.test.prefilledPublicData, this.dataDir, undefined, Number(this.keepInitialNode));
+        // And the ones with an initially disabled sequencer
+        const inactiveConfig = {
+            ...this.test.ctx.aztecNodeConfig,
+            dontStartSequencer: true
+        };
+        this.inactiveNodes = await createNodes(inactiveConfig, this.test.ctx.dateProvider, this.test.bootstrapNodeEnr, this.inactiveNodeCount, BOOT_NODE_UDP_PORT, this.test.prefilledPublicData, this.dataDir, undefined, NUM_NODES - this.inactiveNodeCount);
+        this.nodes = [
+            ...this.keepInitialNode ? [
+                this.test.ctx.aztecNode
+            ] : [],
+            ...this.activeNodes,
+            ...this.inactiveNodes
+        ];
+        if (this.nodes.length !== NUM_NODES) {
+            throw new Error(`Expected ${NUM_NODES} nodes but got ${this.nodes.length}`);
+        }
+        this.offlineValidators = this.test.validators.slice(this.test.validators.length - this.inactiveNodeCount).map((a)=>a.attester);
+        this.test.logger.warn(`Setup complete. Offline validators are ${this.offlineValidators.join(', ')}.`, {
+            validators: this.test.validators,
+            offlineValidators: this.offlineValidators
+        });
+        // Wait for P2P mesh to be fully formed before starting slashing period
+        // This prevents race conditions where validators propose blocks before the network is ready
+        await this.test.waitForP2PMeshConnectivity(this.nodes, NUM_NODES);
+        this.test.logger.warn(`Advancing to epoch ${SETUP_EPOCH_DURATION - 1} (slashing will start after it is completed)`);
+        await this.test.ctx.cheatCodes.rollup.advanceToEpoch(EpochNumber(SETUP_EPOCH_DURATION - 1));
+        return this;
+    }
+    async teardown() {
+        await this.test.stopNodes(this.nodes);
+        await this.test.teardown();
+        for(let i = 0; i < NUM_NODES; i++){
+            fs.rmSync(`${this.dataDir}-${i}`, {
+                recursive: true,
+                force: true,
+                maxRetries: 3
+            });
+        }
+    }
+    get ctx() {
+        return this.test.ctx;
+    }
+    get logger() {
+        return this.test.logger;
+    }
+    get slashingAmount() {
+        return SLASHING_AMOUNT;
+    }
+}