Claude/implement feature mkg0qknhgvlcv5r6 lf6 eq

.gitignore

@@ -19,6 +19,7 @@ yarn-debug.log*
 yarn-error.log*
 l1-contracts/yarn-error.log*
 l1-contracts/lcov.info
+l1-contracts/UNTESTED_LINES_REPORT.md
 l1-contracts/report/*
 l1-contracts/coverage/*
 l1-contracts/out/*
@@ -37,3 +38,10 @@ l1-contracts/test/foundry/integration/deploy-scripts/script-out/*
 l1-contracts/test/foundry/l1/integration/upgrade-envs/script-out/*.toml
 l1-contracts/zkout/*
 .lycheecache
+
+# Foundry binary
+foundry-zksync/
+l1-contracts/foundry-zksync/
+
+# Lock files
+l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/.lock

l1-contracts/deploy-scripts/AdminFunctions.s.sol

@@ -29,6 +29,7 @@ import {BridgehubBurnCTMAssetData} from "contracts/core/bridgehub/IBridgehubBase
 import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol";
 import {L2_ASSET_ROUTER_ADDR} from "contracts/common/l2-helpers/L2ContractAddresses.sol";
 import {IL2AssetRouter} from "contracts/bridge/asset-router/IL2AssetRouter.sol";
+import {NEW_ENCODING_VERSION} from "contracts/bridge/asset-router/IAssetRouterBase.sol";
 import {L2DACommitmentScheme} from "contracts/common/Config.sol";
 
 bytes32 constant SET_TOKEN_MULTIPLIER_SETTER_ROLE = keccak256("SET_TOKEN_MULTIPLIER_SETTER_ROLE");
@@ -515,8 +516,7 @@ contract AdminFunctions is Script, IAdminFunctions {
                 })
             );
 
-            // TODO: use constant for the 0x01
-            secondBridgeData = abi.encodePacked(bytes1(0x01), abi.encode(chainAssetId, bridgehubData));
+            secondBridgeData = abi.encodePacked(NEW_ENCODING_VERSION, abi.encode(chainAssetId, bridgehubData));
         }
 
         calls = Utils.prepareAdminL1L2TwoBridgesTransaction(

l1-contracts/deploy-scripts/gateway/GatewayGovernanceUtils.s.sol

@@ -19,7 +19,7 @@ import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.so
 import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol";
 import {GatewayTransactionFilterer} from "contracts/transactionFilterer/GatewayTransactionFilterer.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {IAssetRouterBase, SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION} from "contracts/bridge/asset-router/IAssetRouterBase.sol";
+import {IAssetRouterBase, SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION, NEW_ENCODING_VERSION} from "contracts/bridge/asset-router/IAssetRouterBase.sol";
 import {CTM_DEPLOYMENT_TRACKER_ENCODING_VERSION} from "contracts/core/ctm-deployment/CTMDeploymentTracker.sol";
 import {IL2AssetRouter, L2AssetRouter} from "contracts/bridge/asset-router/L2AssetRouter.sol";
 import {L1Nullifier} from "contracts/bridge/L1Nullifier.sol";
@@ -165,7 +165,7 @@ abstract contract GatewayGovernanceUtils is Script {
         // chains that migrate from L1.
         {
             bytes memory secondBridgeData = abi.encodePacked(
-                bytes1(0x01),
+                NEW_ENCODING_VERSION,
                 abi.encode(_gatewayGovernanceConfig.chainTypeManagerProxy, prepareGWGovCallsStruct._gatewayCTMAddress)
             );
 

l1-contracts/deploy-scripts/gateway/GatewayPreparation.sol

@@ -22,7 +22,7 @@ import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.so
 import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol";
 import {GatewayTransactionFilterer} from "contracts/transactionFilterer/GatewayTransactionFilterer.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION} from "contracts/bridge/asset-router/IAssetRouterBase.sol";
+import {SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION, NEW_ENCODING_VERSION} from "contracts/bridge/asset-router/IAssetRouterBase.sol";
 
 import {IL2AssetRouter, L2AssetRouter} from "contracts/bridge/asset-router/L2AssetRouter.sol";
 import {L1Nullifier} from "contracts/bridge/L1Nullifier.sol";
@@ -314,7 +314,7 @@ contract GatewayPreparation is Script {
         initializeConfig();
 
         bytes memory secondBridgeData = abi.encodePacked(
-            bytes1(0x01),
+            NEW_ENCODING_VERSION,
             abi.encode(config.chainTypeManagerProxy, gatewayCTMAddress)
         );
 
@@ -405,8 +405,7 @@ contract GatewayPreparation is Script {
             })
         );
 
-        // TODO: use constant for the 0x01
-        bytes memory secondBridgeData = abi.encodePacked(bytes1(0x01), abi.encode(chainAssetId, bridgehubData));
+        bytes memory secondBridgeData = abi.encodePacked(NEW_ENCODING_VERSION, abi.encode(chainAssetId, bridgehubData));
 
         bytes32 l2TxHash = Utils.runAdminL1L2TwoBridgesTransaction(
             _getL1GasPrice(),

l1-contracts/foundry.toml

@@ -35,6 +35,7 @@ fs_permissions = [
     { access = "read", path = "zkout" },
     { access = "read", path = "./deploy-scripts/evm-predeploys/evm-predeploy-datas" },
     { access = "read", path = "../configs/genesis/" },
+    { access = "read", path = "../configs/" },
 ]
 ignored_error_codes = ["missing-receive-ether", "code-size"]
 ignored_warnings_from = ["test", "contracts/dev-contracts"]

l1-contracts/package.json

@@ -69,7 +69,9 @@
     "test:invariant:l1-context": "WHERE=L1 scripts/run-invariant-tests",
     "test:invariant:l2-context": "WHERE=L2 scripts/run-invariant-tests",
     "coverage:foundry": "forge coverage --ffi --match-path 'test/foundry/l1/*' --no-match-coverage 'contracts/(bridge/.*L2.*\\.sol|governance/L2AdminFactory\\.sol|state-transition/L2TestnetVerifier\\.sol|state-transition/L2Verifier\\.sol|state-transition/verifiers/.*\\.sol)' --no-match-test 'test_StageProofsForkScriptBased|test_StageProofsForkFileBased|test_DefaultUpgrade' --no-match-contract 'ChainRegistrarTest'",
-    "coverage-report": "forge coverage --report lcov --ffi --match-path 'test/foundry/l1/*' --no-match-coverage 'contracts/(governance/L2AdminFactory\\.sol|state-transition/L2TestnetVerifier\\.sol|state-transition/L2Verifier\\.sol|state-transition/verifiers/.*\\.sol)' --no-match-test 'test_StageProofsForkScriptBased|test_StageProofsForkFileBased|test_DefaultUpgrade' --no-match-contract 'ChainRegistrarTest' && genhtml -o report lcov.info --branch-coverage  --ignore-errors category lcov.info --ignore-errors inconsistent",
+    "coverage-report": "forge coverage --report lcov -r ./lcov.info --ffi --match-path 'test/foundry/l1/*' --no-match-coverage 'contracts/(governance/L2AdminFactory\\.sol|state-transition/L2TestnetVerifier\\.sol|state-transition/L2Verifier\\.sol|state-transition/verifiers/.*\\.sol)' --no-match-test 'test_StageProofsForkScriptBased|test_StageProofsForkFileBased|test_DefaultUpgrade' --no-match-contract 'ChainRegistrarTest' && genhtml -o report lcov.info --branch-coverage  --ignore-errors category lcov.info --ignore-errors inconsistent",
+    "coverage-untested": "yarn coverage-report && ts-node scripts/generate-untested-lines-report.ts ./lcov.info ./UNTESTED_LINES_REPORT.md",
+    "coverage-untested-quick": "ts-node scripts/generate-untested-lines-report.ts ./lcov.info ./UNTESTED_LINES_REPORT.md",
     "deploy-no-build": "ts-node scripts/deploy.ts",
     "register-zk-chain": "ts-node scripts/register-zk-chain.ts",
     "deploy-weth-bridges": "ts-node scripts/deploy-weth-bridges.ts",

l1-contracts/scripts/generate-untested-lines-report.ts

@@ -0,0 +1,220 @@
+import * as fs from "fs";
+
+/**
+ * This script parses an lcov.info file and generates a report of untested lines.
+ * Usage: ts-node scripts/generate-untested-lines-report.ts [lcov-file-path] [output-file-path]
+ *
+ * If no arguments provided, uses defaults:
+ * - lcov file: ./lcov.info
+ * - output file: ./UNTESTED_LINES_REPORT.md
+ */
+
+interface FileInfo {
+  path: string;
+  totalLines: number;
+  coveredLines: number;
+  untestedLines: number[];
+  coveragePercent: number;
+}
+
+interface ParsedLcov {
+  files: Map<string, FileInfo>;
+}
+
+function parseLcov(lcovContent: string): ParsedLcov {
+  const files = new Map<string, FileInfo>();
+  let currentFile: FileInfo | null = null;
+
+  const lines = lcovContent.split("\n");
+
+  for (const line of lines) {
+    if (line.startsWith("SF:")) {
+      // Source file
+      const filePath = line.substring(3);
+      currentFile = {
+        path: filePath,
+        totalLines: 0,
+        coveredLines: 0,
+        untestedLines: [],
+        coveragePercent: 0,
+      };
+    } else if (line.startsWith("DA:") && currentFile) {
+      // Data line: DA:line_number,hit_count
+      const parts = line.substring(3).split(",");
+      const lineNumber = parseInt(parts[0], 10);
+      const hitCount = parseInt(parts[1], 10);
+
+      if (hitCount === 0) {
+        currentFile.untestedLines.push(lineNumber);
+      }
+    } else if (line.startsWith("LF:") && currentFile) {
+      // Lines Found (total executable lines)
+      currentFile.totalLines = parseInt(line.substring(3), 10);
+    } else if (line.startsWith("LH:") && currentFile) {
+      // Lines Hit (covered lines)
+      currentFile.coveredLines = parseInt(line.substring(3), 10);
+    } else if (line === "end_of_record" && currentFile) {
+      // End of file record
+      if (currentFile.totalLines > 0) {
+        currentFile.coveragePercent = (currentFile.coveredLines / currentFile.totalLines) * 100;
+        files.set(currentFile.path, currentFile);
+      }
+      currentFile = null;
+    }
+  }
+
+  return { files };
+}
+
+function generateReport(parsed: ParsedLcov, outputPath: string): void {
+  const fileInfos = Array.from(parsed.files.values());
+
+  // Filter to contract files only (matching forge coverage calculation)
+  // Also exclude L2-only contracts that cannot be tested with L1 tests
+  const contractFiles = fileInfos.filter(
+    (f) =>
+      (f.path.includes("/contracts/") || f.path.startsWith("contracts/")) &&
+      !f.path.includes("/test/") &&
+      !f.path.includes("/dev-contracts/") &&
+      !f.path.includes("Mock") &&
+      !f.path.includes("Test") &&
+      // Exclude L2-only contracts (cannot be tested with L1 foundry tests)
+      !f.path.includes("L2NativeTokenVault") &&
+      !f.path.includes("L2AssetRouter") &&
+      !f.path.includes("L2AssetTracker") &&
+      !f.path.includes("L2Bridgehub") &&
+      !f.path.includes("L2SharedBridgeLegacy") &&
+      !f.path.includes("L2ChainAssetHandler") &&
+      !f.path.includes("L2MessageRoot") &&
+      !f.path.includes("L2WrappedBaseToken") &&
+      !f.path.includes("InteropCenter") &&
+      !f.path.includes("InteropHandler") &&
+      !f.path.includes("/l2-upgrades/") &&
+      !f.path.includes("/l2-system/")
+  );
+
+  // Filter to only files with untested lines for detailed reporting
+  const filesWithUntestedLines = contractFiles.filter((f) => f.untestedLines.length > 0);
+
+  // Sort by number of untested lines (descending)
+  filesWithUntestedLines.sort((a, b) => b.untestedLines.length - a.untestedLines.length);
+
+  // Generate markdown report
+  const lines: string[] = [];
+  lines.push("# Untested Lines Report");
+  lines.push("");
+  lines.push(`Generated at: ${new Date().toISOString()}`);
+  lines.push("");
+  lines.push("This report shows all source code files with untested lines,");
+  lines.push("sorted by number of untested lines (highest first).");
+  lines.push("");
+  lines.push("## Summary");
+  lines.push("");
+
+  // Calculate overall coverage from contract files (matching forge coverage behavior)
+  const totalLines = contractFiles.reduce((sum, f) => sum + f.totalLines, 0);
+  const totalCovered = contractFiles.reduce((sum, f) => sum + f.coveredLines, 0);
+  const totalUntested = filesWithUntestedLines.reduce((sum, f) => sum + f.untestedLines.length, 0);
+  const overallCoverage = totalLines > 0 ? (totalCovered / totalLines) * 100 : 0;
+
+  lines.push(`- **Total files with untested code:** ${filesWithUntestedLines.length}`);
+  lines.push(`- **Total untested lines:** ${totalUntested}`);
+  lines.push(`- **Total executable lines:** ${totalLines}`);
+  lines.push(`- **Overall line coverage:** ${overallCoverage.toFixed(2)}%`);
+  lines.push("");
+  lines.push("## Files with Untested Lines");
+  lines.push("");
+
+  // Table header
+  lines.push("| File | Coverage | Untested Lines | Specific Lines |");
+  lines.push("|------|----------|----------------|----------------|");
+
+  for (const file of filesWithUntestedLines) {
+    // Simplify path for display
+    const displayPath = file.path.replace(/^.*\/contracts\//, "contracts/");
+
+    // Format untested lines as ranges where possible
+    const lineRanges = formatLineRanges(file.untestedLines);
+
+    // Truncate line ranges if too long
+    const maxRangeLength = 300;
+    const truncatedRanges =
+      lineRanges.length > maxRangeLength ? lineRanges.substring(0, maxRangeLength) + "..." : lineRanges;
+
+    lines.push(
+      `| ${displayPath} | ${file.coveragePercent.toFixed(1)}% | ${file.untestedLines.length} | ${truncatedRanges} |`
+    );
+  }
+
+  lines.push("");
+  lines.push("## Detailed Untested Lines by File");
+  lines.push("");
+
+  for (const file of filesWithUntestedLines.slice(0, 30)) {
+    // Top 30 files
+    const displayPath = file.path.replace(/^.*\/contracts\//, "contracts/");
+    lines.push(`### ${displayPath}`);
+    lines.push("");
+    lines.push(`- Coverage: ${file.coveragePercent.toFixed(2)}%`);
+    lines.push(`- Total lines: ${file.totalLines}`);
+    lines.push(`- Covered lines: ${file.coveredLines}`);
+    lines.push(`- Untested lines (${file.untestedLines.length}): ${formatLineRanges(file.untestedLines)}`);
+    lines.push("");
+  }
+
+  if (filesWithUntestedLines.length > 30) {
+    lines.push(`... and ${filesWithUntestedLines.length - 30} more files with untested code.`);
+    lines.push("");
+  }
+
+  // Write report
+  fs.writeFileSync(outputPath, lines.join("\n"));
+  console.log(`Report generated: ${outputPath}`);
+}
+
+function formatLineRanges(lineNumbers: number[]): string {
+  if (lineNumbers.length === 0) return "";
+
+  const sorted = [...lineNumbers].sort((a, b) => a - b);
+  const ranges: string[] = [];
+  let rangeStart = sorted[0];
+  let rangeEnd = sorted[0];
+
+  for (let i = 1; i < sorted.length; i++) {
+    if (sorted[i] === rangeEnd + 1) {
+      rangeEnd = sorted[i];
+    } else {
+      ranges.push(rangeStart === rangeEnd ? `${rangeStart}` : `${rangeStart}-${rangeEnd}`);
+      rangeStart = sorted[i];
+      rangeEnd = sorted[i];
+    }
+  }
+  ranges.push(rangeStart === rangeEnd ? `${rangeStart}` : `${rangeStart}-${rangeEnd}`);
+
+  return ranges.join(", ");
+}
+
+// Main execution
+const args = process.argv.slice(2);
+const lcovPath = args[0] || "./lcov.info";
+const outputPath = args[1] || "./UNTESTED_LINES_REPORT.md";
+
+if (!fs.existsSync(lcovPath)) {
+  console.error(`Error: lcov file not found at ${lcovPath}`);
+  console.error("");
+  console.error("Please run coverage first:");
+  console.error("  yarn coverage-report");
+  console.error("");
+  console.error("Or specify a different lcov file:");
+  console.error("  ts-node scripts/generate-untested-lines-report.ts <lcov-file> [output-file]");
+  process.exit(1);
+}
+
+console.log(`Reading lcov from: ${lcovPath}`);
+const lcovContent = fs.readFileSync(lcovPath, "utf-8");
+
+console.log("Parsing lcov data...");
+const parsed = parseLcov(lcovContent);
+
+console.log(`Found ${parsed.files.size} files in lcov data`);
+generateReport(parsed, outputPath);

l1-contracts/test/foundry/l1/integration/L1GatewayTests.t.sol

@@ -21,7 +21,7 @@ import {L2CanonicalTransaction, L2Message, TxStatus, ConfirmTransferResultData}
 import {IL1Nullifier} from "contracts/bridge/interfaces/IL1Nullifier.sol";
 
 import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol";
-import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol";
+import {IAssetRouterBase, NEW_ENCODING_VERSION} from "contracts/bridge/asset-router/IAssetRouterBase.sol";
 import {AssetRouterBase} from "contracts/bridge/asset-router/AssetRouterBase.sol";
 
 import {IGetters, IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol";
@@ -367,7 +367,9 @@ contract L1GatewayTests is
         _mockMessageInclusion(gatewayChainId, merkleProofData, TxStatus.Success);
 
         // Reverts if deposit was faked
-        bytes32 txDataHash = keccak256(bytes.concat(bytes1(0x01), abi.encode(chainAdmin, assetId, transferData)));
+        bytes32 txDataHash = keccak256(
+            bytes.concat(NEW_ENCODING_VERSION, abi.encode(chainAdmin, assetId, transferData))
+        );
         vm.expectRevert(abi.encodeWithSelector(DepositDoesNotExist.selector, bytes32(0), txDataHash));
         addresses.l1Nullifier.bridgeConfirmTransferResult(transferResultData);
     }
@@ -382,7 +384,9 @@ contract L1GatewayTests is
         uint256 amount = 1 ether;
         bytes memory transferData = abi.encode(amount, alice, ETH_TOKEN_ADDRESS);
         //bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount));
-        bytes32 txDataHash = keccak256(bytes.concat(bytes1(0x01), abi.encode(alice, ETH_TOKEN_ASSET_ID, transferData)));
+        bytes32 txDataHash = keccak256(
+            bytes.concat(NEW_ENCODING_VERSION, abi.encode(alice, ETH_TOKEN_ASSET_ID, transferData))
+        );
         _setDepositHappened(migratingChainId, merkleProofData.l2TxHash, txDataHash);
         require(
             addresses.l1Nullifier.depositHappened(migratingChainId, merkleProofData.l2TxHash) == txDataHash,
@@ -509,7 +513,9 @@ contract L1GatewayTests is
         bytes memory transferData = _getTransferData();
 
         // Set Deposit Happened
-        bytes32 txDataHash = keccak256(bytes.concat(bytes1(0x01), abi.encode(chainAdmin, assetId, transferData)));
+        bytes32 txDataHash = keccak256(
+            bytes.concat(NEW_ENCODING_VERSION, abi.encode(chainAdmin, assetId, transferData))
+        );
         _setDepositHappened(gatewayChainId, merkleProofData.l2TxHash, txDataHash);
 
         ConfirmTransferResultData memory transferResultData = _getConfirmTransferResultData(