@aztec/end-to-end 0.0.1-commit.f1df4d2 → 0.0.1-commit.f2ce05ee

package/dest/shared/uniswap_l1_l2.js

@@ -6,7 +6,7 @@ import { Fr } from '@aztec/aztec.js/fields';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { extractEvent } from '@aztec/ethereum/utils';
-import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { sha256ToField } from '@aztec/foundation/crypto/sha256';
 import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
 import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
@@ -166,8 +166,8 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // ensure that uniswap contract didn't eat the funds.
             await wethCrossChainHarness.expectPublicBalanceOnL2(uniswapL2Contract.address, 0n);
             // Since the outbox is only consumable when the epoch is proven, we need to advance to the next epoch.
-            const checkpointNumber = CheckpointNumber.fromBlockNumber(l2UniswapInteractionReceipt.blockNumber);
-            const epoch = await rollup.getEpochNumberForCheckpoint(checkpointNumber);
+            const block = await aztecNode.getBlock(l2UniswapInteractionReceipt.blockNumber);
+            const epoch = await rollup.getEpochNumberForCheckpoint(block.checkpointNumber);
             await cheatCodes.rollup.advanceToEpoch(EpochNumber(epoch + 1));
             await waitForProven(aztecNode, l2UniswapInteractionReceipt, {
                 provenTimeout: 300
@@ -574,7 +574,8 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 rollupVersion: new Fr(version),
                 chainId: new Fr(l1Client.chain.id)
             });
-            const epoch = await rollup.getEpochNumberForCheckpoint(CheckpointNumber.fromBlockNumber(withdrawReceipt.blockNumber));
+            const block = await aztecNode.getBlock(withdrawReceipt.blockNumber);
+            const epoch = await rollup.getEpochNumberForCheckpoint(block.checkpointNumber);
             const swapResult = await computeL2ToL1MembershipWitness(aztecNode, epoch, swapPrivateLeaf);
             const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, epoch, withdrawLeaf);
             const swapPrivateL2MessageIndex = swapResult.leafIndex;
@@ -664,7 +665,8 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 rollupVersion: new Fr(version),
                 chainId: new Fr(l1Client.chain.id)
             });
-            const epoch = await rollup.getEpochNumberForCheckpoint(CheckpointNumber.fromBlockNumber(withdrawReceipt.blockNumber));
+            const block = await aztecNode.getBlock(withdrawReceipt.blockNumber);
+            const epoch = await rollup.getEpochNumberForCheckpoint(block.checkpointNumber);
             const swapResult = await computeL2ToL1MembershipWitness(aztecNode, epoch, swapPublicLeaf);
             const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, epoch, withdrawLeaf);
             const swapPublicL2MessageIndex = swapResult.leafIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.f1df4d2",
+  "version": "0.0.1-commit.f2ce05ee",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -26,44 +26,44 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.f1df4d2",
-    "@aztec/archiver": "0.0.1-commit.f1df4d2",
-    "@aztec/aztec": "0.0.1-commit.f1df4d2",
-    "@aztec/aztec-node": "0.0.1-commit.f1df4d2",
-    "@aztec/aztec.js": "0.0.1-commit.f1df4d2",
-    "@aztec/bb-prover": "0.0.1-commit.f1df4d2",
-    "@aztec/bb.js": "0.0.1-commit.f1df4d2",
-    "@aztec/blob-client": "0.0.1-commit.f1df4d2",
-    "@aztec/blob-lib": "0.0.1-commit.f1df4d2",
-    "@aztec/bot": "0.0.1-commit.f1df4d2",
-    "@aztec/cli": "0.0.1-commit.f1df4d2",
-    "@aztec/constants": "0.0.1-commit.f1df4d2",
-    "@aztec/entrypoints": "0.0.1-commit.f1df4d2",
-    "@aztec/epoch-cache": "0.0.1-commit.f1df4d2",
-    "@aztec/ethereum": "0.0.1-commit.f1df4d2",
-    "@aztec/foundation": "0.0.1-commit.f1df4d2",
-    "@aztec/kv-store": "0.0.1-commit.f1df4d2",
-    "@aztec/l1-artifacts": "0.0.1-commit.f1df4d2",
-    "@aztec/merkle-tree": "0.0.1-commit.f1df4d2",
-    "@aztec/node-keystore": "0.0.1-commit.f1df4d2",
-    "@aztec/noir-contracts.js": "0.0.1-commit.f1df4d2",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.f1df4d2",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f1df4d2",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.f1df4d2",
-    "@aztec/p2p": "0.0.1-commit.f1df4d2",
-    "@aztec/protocol-contracts": "0.0.1-commit.f1df4d2",
-    "@aztec/prover-client": "0.0.1-commit.f1df4d2",
-    "@aztec/prover-node": "0.0.1-commit.f1df4d2",
-    "@aztec/pxe": "0.0.1-commit.f1df4d2",
-    "@aztec/sequencer-client": "0.0.1-commit.f1df4d2",
-    "@aztec/simulator": "0.0.1-commit.f1df4d2",
-    "@aztec/slasher": "0.0.1-commit.f1df4d2",
-    "@aztec/stdlib": "0.0.1-commit.f1df4d2",
-    "@aztec/telemetry-client": "0.0.1-commit.f1df4d2",
-    "@aztec/test-wallet": "0.0.1-commit.f1df4d2",
-    "@aztec/validator-client": "0.0.1-commit.f1df4d2",
-    "@aztec/validator-ha-signer": "0.0.1-commit.f1df4d2",
-    "@aztec/world-state": "0.0.1-commit.f1df4d2",
+    "@aztec/accounts": "0.0.1-commit.f2ce05ee",
+    "@aztec/archiver": "0.0.1-commit.f2ce05ee",
+    "@aztec/aztec": "0.0.1-commit.f2ce05ee",
+    "@aztec/aztec-node": "0.0.1-commit.f2ce05ee",
+    "@aztec/aztec.js": "0.0.1-commit.f2ce05ee",
+    "@aztec/bb-prover": "0.0.1-commit.f2ce05ee",
+    "@aztec/bb.js": "0.0.1-commit.f2ce05ee",
+    "@aztec/blob-client": "0.0.1-commit.f2ce05ee",
+    "@aztec/blob-lib": "0.0.1-commit.f2ce05ee",
+    "@aztec/bot": "0.0.1-commit.f2ce05ee",
+    "@aztec/cli": "0.0.1-commit.f2ce05ee",
+    "@aztec/constants": "0.0.1-commit.f2ce05ee",
+    "@aztec/entrypoints": "0.0.1-commit.f2ce05ee",
+    "@aztec/epoch-cache": "0.0.1-commit.f2ce05ee",
+    "@aztec/ethereum": "0.0.1-commit.f2ce05ee",
+    "@aztec/foundation": "0.0.1-commit.f2ce05ee",
+    "@aztec/kv-store": "0.0.1-commit.f2ce05ee",
+    "@aztec/l1-artifacts": "0.0.1-commit.f2ce05ee",
+    "@aztec/merkle-tree": "0.0.1-commit.f2ce05ee",
+    "@aztec/node-keystore": "0.0.1-commit.f2ce05ee",
+    "@aztec/noir-contracts.js": "0.0.1-commit.f2ce05ee",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.f2ce05ee",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f2ce05ee",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.f2ce05ee",
+    "@aztec/p2p": "0.0.1-commit.f2ce05ee",
+    "@aztec/protocol-contracts": "0.0.1-commit.f2ce05ee",
+    "@aztec/prover-client": "0.0.1-commit.f2ce05ee",
+    "@aztec/prover-node": "0.0.1-commit.f2ce05ee",
+    "@aztec/pxe": "0.0.1-commit.f2ce05ee",
+    "@aztec/sequencer-client": "0.0.1-commit.f2ce05ee",
+    "@aztec/simulator": "0.0.1-commit.f2ce05ee",
+    "@aztec/slasher": "0.0.1-commit.f2ce05ee",
+    "@aztec/stdlib": "0.0.1-commit.f2ce05ee",
+    "@aztec/telemetry-client": "0.0.1-commit.f2ce05ee",
+    "@aztec/test-wallet": "0.0.1-commit.f2ce05ee",
+    "@aztec/validator-client": "0.0.1-commit.f2ce05ee",
+    "@aztec/validator-ha-signer": "0.0.1-commit.f2ce05ee",
+    "@aztec/world-state": "0.0.1-commit.f2ce05ee",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/config.ts

@@ -6,7 +6,7 @@ export type ClientFlowConfig = {
   recursions?: number[];
 };
 
-type ClientFlows = 'accountDeployments' | 'deployments' | 'transfers' | 'bridging' | 'amm';
+type ClientFlows = 'accountDeployments' | 'deployments' | 'transfers' | 'bridging' | 'amm' | 'storageProof';
 
 export type ClientFlowsConfig = {
   [key in ClientFlows]: ClientFlowConfig;
@@ -34,6 +34,10 @@ export const KEY_FLOWS_CONFIG: ClientFlowsConfig = {
     feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
     recursions: [0, 1],
   },
+  storageProof: {
+    accounts: ['ecdsar1'],
+    feePaymentMethods: ['sponsored_fpc'],
+  },
 };
 
 export const FULL_FLOWS_CONFIG: ClientFlowsConfig = {
@@ -58,4 +62,8 @@ export const FULL_FLOWS_CONFIG: ClientFlowsConfig = {
     feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
     recursions: [0, 1, 2],
   },
+  storageProof: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
+  },
 };

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -13,7 +13,7 @@ import type {
 } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
-import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { sleep } from '@aztec/foundation/sleep';
 import { TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -86,9 +86,8 @@ export class CrossChainMessagingTest {
   }
 
   async advanceToEpochProven(l2TxReceipt: TxReceipt): Promise<EpochNumber> {
-    const epoch = await this.rollup.getEpochNumberForCheckpoint(
-      CheckpointNumber.fromBlockNumber(l2TxReceipt.blockNumber!),
-    );
+    const block = await this.aztecNode.getBlock(l2TxReceipt.blockNumber!);
+    const epoch = await this.rollup.getEpochNumberForCheckpoint(block!.checkpointNumber);
     // Warp to the next epoch.
     await this.cheatCodes.rollup.advanceToEpoch(EpochNumber(epoch + 1));
     // Wait for the tx to be proven.

package/src/e2e_epochs/epochs_test.ts

@@ -194,6 +194,7 @@ export class EpochsTestContext {
       l1GenesisTime: await this.rollup.getL1GenesisTime(),
       ethereumSlotDuration,
       proofSubmissionEpochs: Number(await this.rollup.getProofSubmissionEpochs()),
+      targetCommitteeSize: await this.rollup.getTargetCommitteeSize(),
     };
 
     this.logger.info(

package/src/e2e_p2p/shared.ts

@@ -145,6 +145,7 @@ export async function awaitCommitteeExists({
     'non-empty committee',
     60,
   );
+  logger.warn(`Committee has been formed`, { committee: committee!.map(c => c.toString()) });
   return committee!.map(c => c.toString() as `0x${string}`);
 }