more fixes

matter-labs · Dec 17, 2024 · 250de04 · 250de04
1 parent 3ea5878
commit 250de04
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol
@@ -77,7 +77,7 @@ error ChainIdCantBeCurrentChain();
 error ChainIdMismatch();
 // 0x23f3c357
 error ChainIdNotRegistered(uint256 chainId);
-//
+// 0x5de72107
 error ChainNotLegacy();
 // 0x78d2ed02
 error ChainAlreadyLive();
@@ -111,7 +111,7 @@ error EmptyBytes32();
 error EmptyDeposit();
 // 0x627e0872
 error ETHDepositNotSupported();
-//
+// 0x1bdfd505
 error FailedToTransferTokens(address tokenContract, address to, uint256 amount);
 // 0xac4a3f98
 error FacetExists(bytes4 selector, address);
@@ -371,22 +371,16 @@ error IncorrectPricingMode();
 error NotSettlementLayer();
 // 0x7a4902ad
 error TimerAlreadyStarted();
-
 // 0x09aa9830
 error MerklePathLengthMismatch(uint256 pathLength, uint256 expectedLength);
-
 // 0xc33e6128
 error MerkleNothingToProve();
-
 // 0xafbb7a4e
 error MerkleIndexOrHeightMismatch();
-
 // 0x1b582fcf
 error MerkleWrongIndex(uint256 index, uint256 maxNodeNumber);
-
 // 0x485cfcaa
 error MerkleWrongLength(uint256 newLeavesLength, uint256 leafNumber);
-
 // 0xce63ce17
 error NoCTMForAssetId(bytes32 assetId);
 

diff --git a/l2-contracts/test/foundry/unit/data-availability/TestStateDiffComposer.sol b/l2-contracts/test/foundry/unit/data-availability/TestStateDiffComposer.sol
@@ -51,12 +51,12 @@ contract TestStateDiffComposer {
             ++bytecodesNumber;
             bytecodes = bytes.concat(bytecodes, bytes4(uint32(bytecode.length)), bytecode);
             currentRollingBytecodesHash = keccak256(
-                abi.encode(currentRollingBytecodesHash, L2ContractHelper.hashL2Bytecode(bytecode))
+                abi.encode(currentRollingBytecodesHash, L2ContractHelper.hashL2BytecodeMemory(bytecode))
             );
         }
         if (includeToCorrectHash) {
             correctRollingBytecodesHash = keccak256(
-                abi.encode(correctRollingBytecodesHash, L2ContractHelper.hashL2Bytecode(bytecode))
+                abi.encode(correctRollingBytecodesHash, L2ContractHelper.hashL2BytecodeMemory(bytecode))
             );
         }
     }
@@ -94,4 +94,4 @@ contract TestStateDiffComposer {
     function generateTotalStateDiffsAndPubdata() public returns (bytes memory _totalL2ToL1PubdataAndStateDiffs) {
         _totalL2ToL1PubdataAndStateDiffs = abi.encodePacked(getTotalPubdata(), uncomressedStateDiffsPart);
     }
-}
+}
diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json
@@ -101,8 +101,8 @@
     "contractName": "L2GenesisUpgrade",
     "bytecodePath": "artifacts-zk/contracts-preprocessed/L2GenesisUpgrade.sol/L2GenesisUpgrade.json",
     "sourceCodePath": "contracts-preprocessed/L2GenesisUpgrade.sol",
-    "bytecodeHash": "0x010000d5ccd1ae684d3b7c366a7c643ec0a641be78ecd64e3ebf38701d1b1b76",
-    "sourceCodeHash": "0xa10c74ce45ca34ac3c8ba7497929764adb59077ee66699795e193b320127f15b"
+    "bytecodeHash": "0x010000d52f1349a6ff1aa7516fe971064a9840ca3ed88f90b716b57054f22ae3",
+    "sourceCodeHash": "0x72b898ee6c0e03c4bc096dbed69a4ab6a22a7ba56743ba2aed1f2e6951c55824"
   },
   {
     "contractName": "MsgValueSimulator",