@aztec/end-to-end 0.82.2 → 0.82.3-nightly.20250403

package/dest/shared/capture_private_execution_steps.js

@@ -11,30 +11,48 @@ const logger = createLogger('e2e:capture-private-execution-steps');
 // Longer term we won't use this hacked together msgpack format
 // Leaving duplicated as this eventually bb will provide a serialization
 // helper for passing to a generic msgpack RPC endpoint.
-async function _createClientIvcProofFiles(directory, executionSteps) {
+async function _createClientIvcProofFiles(directory, executionSteps, rawWitnesses = false) {
     const acirPath = path.join(directory, 'acir.msgpack');
     const witnessPath = path.join(directory, 'witnesses.msgpack');
     await fs.writeFile(acirPath, encode(executionSteps.map((map)=>map.bytecode)));
     await fs.writeFile(witnessPath, encode(executionSteps.map((map)=>serializeWitness(map.witness))));
+    let rawWitnessesPath;
+    if (rawWitnesses) {
+        rawWitnessesPath = path.join(directory, 'witnesses.json');
+        await fs.writeFile(rawWitnessesPath, JSON.stringify(executionSteps.map((step)=>Object.fromEntries(step.witness))));
+    }
     return {
         acirPath,
-        witnessPath
+        witnessPath,
+        rawWitnessesPath
     };
 }
-export async function capturePrivateExecutionStepsIfEnvSet(label, interaction) {
+export async function capturePrivateExecutionStepsIfEnvSet(label, interaction, opts, expectedSteps) {
     // Not included in env_var.ts as internal to e2e tests.
     const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
     if (ivcFolder) {
-        logger.info(`Capturing client ivc execution steps for ${label}`);
+        const profileMode = [
+            'execution-steps',
+            'full'
+        ].includes(process.env.PROFILE_MODE ?? '') ? process.env.PROFILE_MODE : 'execution-steps';
+        logger.info(`Capturing client ivc execution profile for ${label} in mode ${profileMode}`);
         const result = await interaction.profile({
-            profileMode: 'execution-steps'
+            ...opts,
+            profileMode: profileMode
         });
+        if (expectedSteps !== undefined && result.executionSteps.length !== expectedSteps) {
+            throw new Error(`Expected ${expectedSteps} execution steps, got ${result.executionSteps.length}`);
+        }
         const resultsDirectory = path.join(ivcFolder, label);
         logger.info(`Writing private execution steps to ${resultsDirectory}`);
         await fs.mkdir(resultsDirectory, {
             recursive: true
         });
-        await _createClientIvcProofFiles(resultsDirectory, result.executionSteps);
+        await fs.writeFile(path.join(resultsDirectory, 'steps.json'), JSON.stringify(result.executionSteps.map((step)=>({
+                fnName: step.functionName,
+                gateCount: step.gateCount
+            })), null, 2));
+        await _createClientIvcProofFiles(resultsDirectory, result.executionSteps, profileMode === 'full');
         logger.info(`Wrote private execution steps to ${resultsDirectory}`);
     }
 }

package/dest/shared/cross_chain_test_harness.d.ts

@@ -35,6 +35,16 @@ export declare function deployAndInitializeTokenAndBridgeContracts(wallet: Walle
      */
     underlyingERC20: any;
 }>;
+export type CrossChainContext = {
+    l2Token: AztecAddress;
+    l2Bridge: AztecAddress;
+    tokenPortal: EthAddress;
+    underlying: EthAddress;
+    ethAccount: EthAddress;
+    ownerAddress: AztecAddress;
+    inbox: EthAddress;
+    outbox: EthAddress;
+};
 /**
  * A Class for testing cross chain interactions, contains common interactions
  * shared between cross chain tests.
@@ -108,7 +118,7 @@ export declare class CrossChainTestHarness {
     expectPrivateBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
     getL2PublicBalanceOf(owner: AztecAddress): Promise<any>;
     expectPublicBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
-    getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1?: EthAddress): Fr;
+    getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1?: EthAddress): Promise<Fr>;
     withdrawFundsFromBridgeOnL1(amount: bigint, blockNumber: number | bigint, messageIndex: bigint, siblingPath: SiblingPath<number>): Promise<void>;
     transferToPrivateOnL2(shieldAmount: bigint): Promise<void>;
     transferToPublicOnL2(amount: bigint, nonce?: Fr): Promise<void>;
@@ -120,5 +130,6 @@ export declare class CrossChainTestHarness {
      * it's included it becomes available for consumption in the next block because the l1 to l2 message tree.
      */
     makeMessageConsumable(msgHash: Fr | Hex): Promise<void>;
+    toCrossChainContext(): CrossChainContext;
 }
 //# sourceMappingURL=cross_chain_test_harness.d.ts.map

package/dest/shared/cross_chain_test_harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}

package/dest/shared/cross_chain_test_harness.js

@@ -58,7 +58,6 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         underlyingERC20
     };
 }
-// docs:end:deployAndInitializeTokenAndBridgeContracts
 /**
  * A Class for testing cross chain interactions, contains common interactions
  * shared between cross chain tests.
@@ -175,8 +174,8 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         const balance = await this.getL2PublicBalanceOf(owner);
         expect(balance).toBe(expectedBalance);
     }
-    getL2ToL1MessageLeaf(withdrawAmount, callerOnL1 = EthAddress.ZERO) {
-        return this.l1TokenPortalManager.getL2ToL1MessageLeaf(withdrawAmount, this.ethAccount, this.l2Bridge.address, callerOnL1);
+    async getL2ToL1MessageLeaf(withdrawAmount, callerOnL1 = EthAddress.ZERO) {
+        return await this.l1TokenPortalManager.getL2ToL1MessageLeaf(withdrawAmount, this.ethAccount, this.l2Bridge.address, callerOnL1);
     }
     withdrawFundsFromBridgeOnL1(amount, blockNumber, messageIndex, siblingPath) {
         return this.l1TokenPortalManager.withdrawFunds(amount, this.ethAccount, BigInt(blockNumber), messageIndex, siblingPath);
@@ -202,4 +201,16 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         await this.mintTokensPublicOnL2(0n);
         await this.mintTokensPublicOnL2(0n);
     }
+    toCrossChainContext() {
+        return {
+            l2Token: this.l2Token.address,
+            l2Bridge: this.l2Bridge.address,
+            tokenPortal: this.tokenPortalAddress,
+            underlying: this.underlyingERC20Address,
+            ethAccount: this.ethAccount,
+            ownerAddress: this.ownerAddress,
+            inbox: this.l1ContractAddresses.inboxAddress,
+            outbox: this.l1ContractAddresses.outboxAddress
+        };
+    }
 } // docs:end:cross_chain_test_harness

package/dest/shared/uniswap_l1_l2.js

@@ -44,12 +44,14 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
         const uniswapFeeTier = 3000n;
         const minimumOutputAmount = 0n;
         let cheatCodes;
+        let version;
         beforeAll(async ()=>{
             ({ aztecNode, pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet, deployL1ContractsValues, cheatCodes } = await setup());
             if (Number(await publicClient.getBlockNumber()) < expectedForkBlockNumber) {
                 throw new Error('This test must be run on a fork of mainnet with the expected fork block');
             }
             rollup = new RollupContract(deployL1ContractsValues.publicClient, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
+            version = Number(await rollup.getVersion());
             ownerAddress = ownerWallet.getAddress();
             // sponsorAddress = sponsorWallet.getAddress();
             ownerEthAddress = EthAddress.fromString((await walletClient.getAddresses())[0]);
@@ -135,7 +137,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const swapPrivateLeaf = sha256ToField([
                 uniswapL2Contract.address,
-                new Fr(1),
+                new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
                 new Fr(publicClient.chain.id),
                 swapPrivateContent
@@ -148,7 +150,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const withdrawLeaf = sha256ToField([
                 wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
+                new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
                 new Fr(publicClient.chain.id),
                 withdrawContent
@@ -532,7 +534,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const swapPrivateLeaf = sha256ToField([
                 uniswapL2Contract.address,
-                new Fr(1),
+                new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
                 new Fr(publicClient.chain.id),
                 swapPrivateContent
@@ -545,7 +547,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const withdrawLeaf = sha256ToField([
                 wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
+                new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
                 new Fr(publicClient.chain.id),
                 withdrawContent
@@ -612,7 +614,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const swapPublicLeaf = sha256ToField([
                 uniswapL2Contract.address,
-                new Fr(1),
+                new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
                 new Fr(publicClient.chain.id),
                 swapPublicContent
@@ -625,7 +627,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const withdrawLeaf = sha256ToField([
                 wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
+                new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
                 new Fr(publicClient.chain.id),
                 withdrawContent

package/package.json

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