@aztec/end-to-end 1.0.0-nightly.20250730 → 1.0.0-nightly.20250801

package/dest/integration_l1_publisher/write_json.d.ts

@@ -0,0 +1,8 @@
+import { AztecAddress, Fr, type L2Block } from '@aztec/aztec.js';
+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

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

@@ -0,0 +1 @@
+{"version":3,"file":"write_json.d.ts","sourceRoot":"","sources":["../../src/integration_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"}

package/dest/integration_l1_publisher/write_json.js

@@ -0,0 +1,57 @@
+import { Blob } from '@aztec/blob-lib';
+import { writeFile } from 'fs/promises';
+const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
+/**
+ * Creates a json object that can be used to test the solidity contract.
+ * The json object must be put into
+ */ export async function writeJson(fileName, block, l1ToL2Content, blobs, batchedBlob, recipientAddress, deployerAddress) {
+    if (!AZTEC_GENERATE_TEST_DATA) {
+        return;
+    }
+    // Path relative to the package.json in the end-to-end folder
+    const path = `../../l1-contracts/test/fixtures/${fileName}.json`;
+    const asHex = (value, size = 64)=>{
+        const buffer = Buffer.isBuffer(value) ? value : value.toBuffer();
+        return `0x${buffer.toString('hex').padStart(size, '0')}`;
+    };
+    const jsonObject = {
+        populate: {
+            l1ToL2Content: l1ToL2Content.map(asHex),
+            recipient: asHex(recipientAddress.toField()),
+            sender: deployerAddress
+        },
+        messages: {
+            l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map(asHex)
+        },
+        block: {
+            // 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,
+            body: `0x${block.body.toBuffer().toString('hex')}`,
+            header: {
+                lastArchiveRoot: asHex(block.header.lastArchive.root),
+                contentCommitment: {
+                    blobsHash: asHex(block.header.contentCommitment.blobsHash),
+                    inHash: asHex(block.header.contentCommitment.inHash),
+                    outHash: asHex(block.header.contentCommitment.outHash)
+                },
+                slotNumber: Number(block.header.globalVariables.slotNumber),
+                timestamp: Number(block.header.globalVariables.timestamp),
+                coinbase: asHex(block.header.globalVariables.coinbase, 40),
+                feeRecipient: asHex(block.header.globalVariables.feeRecipient),
+                gasFees: {
+                    feePerDaGas: Number(block.header.globalVariables.gasFees.feePerDaGas),
+                    feePerL2Gas: Number(block.header.globalVariables.gasFees.feePerL2Gas)
+                },
+                totalManaUsed: block.header.totalManaUsed.toNumber()
+            },
+            headerHash: asHex(block.header.toPropose().hash()),
+            numTxs: block.body.txEffects.length
+        }
+    };
+    const output = JSON.stringify(jsonObject, null, 2);
+    await writeFile(path, output, 'utf8');
+}

package/dest/shared/uniswap_l1_l2.js

@@ -167,9 +167,9 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             const daiL1BalanceOfPortalBeforeSwap = await daiCrossChainHarness.getL1BalanceOf(daiCrossChainHarness.tokenPortalAddress);
             const swapResult = await computeL2ToL1MembershipWitness(aztecNode, l2UniswapInteractionReceipt.blockNumber, swapPrivateLeaf);
             const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, l2UniswapInteractionReceipt.blockNumber, withdrawLeaf);
-            const swapPrivateL2MessageIndex = swapResult.l2MessageIndex;
+            const swapPrivateL2MessageIndex = swapResult.leafIndex;
             const swapPrivateSiblingPath = swapResult.siblingPath;
-            const withdrawL2MessageIndex = withdrawResult.l2MessageIndex;
+            const withdrawL2MessageIndex = withdrawResult.leafIndex;
             const withdrawSiblingPath = withdrawResult.siblingPath;
             const withdrawMessageMetadata = {
                 _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber),
@@ -559,9 +559,9 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             });
             const swapResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, swapPrivateLeaf);
             const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, withdrawLeaf);
-            const swapPrivateL2MessageIndex = swapResult.l2MessageIndex;
+            const swapPrivateL2MessageIndex = swapResult.leafIndex;
             const swapPrivateSiblingPath = swapResult.siblingPath;
-            const withdrawL2MessageIndex = withdrawResult.l2MessageIndex;
+            const withdrawL2MessageIndex = withdrawResult.leafIndex;
             const withdrawSiblingPath = withdrawResult.siblingPath;
             const withdrawMessageMetadata = {
                 _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),
@@ -643,9 +643,9 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             });
             const swapResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, swapPublicLeaf);
             const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, withdrawLeaf);
-            const swapPublicL2MessageIndex = swapResult.l2MessageIndex;
+            const swapPublicL2MessageIndex = swapResult.leafIndex;
             const swapPublicSiblingPath = swapResult.siblingPath;
-            const withdrawL2MessageIndex = withdrawResult.l2MessageIndex;
+            const withdrawL2MessageIndex = withdrawResult.leafIndex;
             const withdrawSiblingPath = withdrawResult.siblingPath;
             const withdrawMessageMetadata = {
                 _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),

package/package.json

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

package/src/integration_l1_publisher/write_json.ts

@@ -0,0 +1,74 @@
+import { AztecAddress, Fr, type L2Block } from '@aztec/aztec.js';
+import { BatchedBlob, Blob } from '@aztec/blob-lib';
+import { EthAddress } from '@aztec/foundation/eth-address';
+
+import { writeFile } from 'fs/promises';
+
+const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
+
+/**
+ * Creates a json object that can be used to test the solidity contract.
+ * The json object must be put into
+ */
+export async function writeJson(
+  fileName: string,
+  block: L2Block,
+  l1ToL2Content: Fr[],
+  blobs: Blob[],
+  batchedBlob: BatchedBlob,
+  recipientAddress: AztecAddress,
+  deployerAddress: `0x${string}`,
+): Promise<void> {
+  if (!AZTEC_GENERATE_TEST_DATA) {
+    return;
+  }
+  // Path relative to the package.json in the end-to-end folder
+  const path = `../../l1-contracts/test/fixtures/${fileName}.json`;
+
+  const asHex = (value: Fr | Buffer | EthAddress | AztecAddress, size = 64) => {
+    const buffer = Buffer.isBuffer(value) ? value : value.toBuffer();
+    return `0x${buffer.toString('hex').padStart(size, '0')}`;
+  };
+
+  const jsonObject = {
+    populate: {
+      l1ToL2Content: l1ToL2Content.map(asHex),
+      recipient: asHex(recipientAddress.toField()),
+      sender: deployerAddress,
+    },
+    messages: {
+      l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(asHex),
+    },
+    block: {
+      // 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,
+      body: `0x${block.body.toBuffer().toString('hex')}`,
+      header: {
+        lastArchiveRoot: asHex(block.header.lastArchive.root),
+        contentCommitment: {
+          blobsHash: asHex(block.header.contentCommitment.blobsHash),
+          inHash: asHex(block.header.contentCommitment.inHash),
+          outHash: asHex(block.header.contentCommitment.outHash),
+        },
+        slotNumber: Number(block.header.globalVariables.slotNumber),
+        timestamp: Number(block.header.globalVariables.timestamp),
+        coinbase: asHex(block.header.globalVariables.coinbase, 40),
+        feeRecipient: asHex(block.header.globalVariables.feeRecipient),
+        gasFees: {
+          feePerDaGas: Number(block.header.globalVariables.gasFees.feePerDaGas),
+          feePerL2Gas: Number(block.header.globalVariables.gasFees.feePerL2Gas),
+        },
+        totalManaUsed: block.header.totalManaUsed.toNumber(),
+      },
+      headerHash: asHex(block.header.toPropose().hash()),
+      numTxs: block.body.txEffects.length,
+    },
+  };
+
+  const output = JSON.stringify(jsonObject, null, 2);
+  await writeFile(path, output, 'utf8');
+}

package/src/shared/uniswap_l1_l2.ts

@@ -290,10 +290,10 @@ export const uniswapL1L2TestSuite = (
         withdrawLeaf,
       );
 
-      const swapPrivateL2MessageIndex = swapResult!.l2MessageIndex;
+      const swapPrivateL2MessageIndex = swapResult!.leafIndex;
       const swapPrivateSiblingPath = swapResult!.siblingPath;
 
-      const withdrawL2MessageIndex = withdrawResult!.l2MessageIndex;
+      const withdrawL2MessageIndex = withdrawResult!.leafIndex;
       const withdrawSiblingPath = withdrawResult!.siblingPath;
 
       const withdrawMessageMetadata = {
@@ -868,10 +868,10 @@ export const uniswapL1L2TestSuite = (
         withdrawLeaf,
       );
 
-      const swapPrivateL2MessageIndex = swapResult!.l2MessageIndex;
+      const swapPrivateL2MessageIndex = swapResult!.leafIndex;
       const swapPrivateSiblingPath = swapResult!.siblingPath;
 
-      const withdrawL2MessageIndex = withdrawResult!.l2MessageIndex;
+      const withdrawL2MessageIndex = withdrawResult!.leafIndex;
       const withdrawSiblingPath = withdrawResult!.siblingPath;
 
       const withdrawMessageMetadata = {
@@ -1002,10 +1002,10 @@ export const uniswapL1L2TestSuite = (
         withdrawLeaf,
       );
 
-      const swapPublicL2MessageIndex = swapResult!.l2MessageIndex;
+      const swapPublicL2MessageIndex = swapResult!.leafIndex;
       const swapPublicSiblingPath = swapResult!.siblingPath;
 
-      const withdrawL2MessageIndex = withdrawResult!.l2MessageIndex;
+      const withdrawL2MessageIndex = withdrawResult!.leafIndex;
       const withdrawSiblingPath = withdrawResult!.siblingPath;
 
       const withdrawMessageMetadata = {