fix merge conflicts and bump hashes

matter-labs · Jun 5, 2024 · 704b41b · 704b41b
1 parent d97d8cd
commit 704b41b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 31 deletions.
diff --git a/l1-contracts/test/test_config/constant/hardhat.json b/l1-contracts/test/test_config/constant/hardhat.json
@@ -95,4 +95,4 @@
     "decimals": 18,
     "address": "0x51E83b811930bb4a3aAb3494894ec237Cb6cEc49"
   }
-]
+]
diff --git a/l2-contracts/contracts/bridge/L2SharedBridge.sol b/l2-contracts/contracts/bridge/L2SharedBridge.sol
@@ -39,7 +39,7 @@ contract L2SharedBridge is IL2SharedBridge, Initializable {
     /// This is non-zero only on Era, and should not be renamed for backward compatibility with the SDKs.
     address public override l1Bridge;
 
-    uint256 internal immutable ERA_CHAIN_ID;
+    uint256 public immutable ERA_CHAIN_ID;
 
     /// @dev Contract is expected to be used as proxy implementation.
     /// @dev Disable the initialization to prevent Parity hack.
@@ -59,7 +59,7 @@ contract L2SharedBridge is IL2SharedBridge, Initializable {
         bytes32 _l2TokenProxyBytecodeHash,
         address _aliasedOwner
     ) external reinitializer(2) {
-        if (_l1Bridge == address(0)) {
+        if (_l1SharedBridge == address(0)) {
             revert EmptyAddress();
         }
 
@@ -79,10 +79,10 @@ contract L2SharedBridge is IL2SharedBridge, Initializable {
             l2TokenProxyBytecodeHash = _l2TokenProxyBytecodeHash;
             l2TokenBeacon.transferOwnership(_aliasedOwner);
         } else {
-            if (_l1LegacyBridge == address(0)) {
+            if (_l1Bridge == address(0)) {
                 revert EmptyAddress();
             }
-            l1LegacyBridge = _l1LegacyBridge;
+            l1Bridge = _l1Bridge;
             // l2StandardToken and l2TokenBeacon are already deployed on ERA, and stored in the proxy
         }
     }
@@ -103,7 +103,7 @@ contract L2SharedBridge is IL2SharedBridge, Initializable {
         // Only the L1 bridge counterpart can initiate and finalize the deposit.
         if (
             AddressAliasHelper.undoL1ToL2Alias(msg.sender) != l1Bridge &&
-            AddressAliasHelper.undoL1ToL2Alias(msg.sender) != l1LegacyBridge
+            AddressAliasHelper.undoL1ToL2Alias(msg.sender) != l1SharedBridge
         ) {
             revert InvalidCaller(msg.sender);
         }

diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json
@@ -178,60 +178,35 @@
     "contractName": "bootloader_test",
     "bytecodePath": "bootloader/build/artifacts/bootloader_test.yul.zbin",
     "sourceCodePath": "bootloader/build/bootloader_test.yul",
-<<<<<<< HEAD
     "bytecodeHash": "0x010003cbda052f30cd056d0c758c7cc5be2c31f77461591d4be73dc3291b6ca5",
     "sourceCodeHash": "0xa13475403f910dff1ea0cf7ebf80633d9dcc37b4f8dd9f0c678a935793580932"
-=======
-    "bytecodeHash": "0x010003cbf67ee7370dd2e77fb9ad39f718ded9354be174ea3009c6cb4fb8c06d",
-    "sourceCodeHash": "0x232e09be0ce4a92a3b77558e5724ab67e9deaf68e12e8be682a999655203b066"
->>>>>>> release-v23
   },
   {
     "contractName": "fee_estimate",
     "bytecodePath": "bootloader/build/artifacts/fee_estimate.yul.zbin",
     "sourceCodePath": "bootloader/build/fee_estimate.yul",
-<<<<<<< HEAD
     "bytecodeHash": "0x010009519c960b6baa12091cd1f8538d00fa0d7505c81943ba6e379a5f1c9c9e",
     "sourceCodeHash": "0xbcdce81799656df718b5dfff4ba6ce8aac82087a78c0c33edb0675e55bb8364c"
-=======
-    "bytecodeHash": "0x01000951968c701c02714779299712d9da6e400e56c78d0d07acd984bfe7242a",
-    "sourceCodeHash": "0x9b2d51a24186af7ef58f7c8f53d77f6732f3a8d2dbde556fc8c1152957855fa5"
->>>>>>> release-v23
   },
   {
     "contractName": "gas_test",
     "bytecodePath": "bootloader/build/artifacts/gas_test.yul.zbin",
     "sourceCodePath": "bootloader/build/gas_test.yul",
-<<<<<<< HEAD
     "bytecodeHash": "0x010008d7f0ddbde3a633aa89aff433666ba28dcf3adb35deb26a207ea1824454",
     "sourceCodeHash": "0xe08f6eaca1995981baf257dd86e5dec8b62c1b5ac53a1173142cebca510b7859"
-=======
-    "bytecodeHash": "0x010008d7dffe019f801bf2ee23b93f83afd80ea6d20c8efe82da71fd57cbcb5c",
-    "sourceCodeHash": "0xf6624fe716eec6bcd5d513f069f33d758271b304009d2bdf5c5b7d0573868a1c"
->>>>>>> release-v23
   },
   {
     "contractName": "playground_batch",
     "bytecodePath": "bootloader/build/artifacts/playground_batch.yul.zbin",
     "sourceCodePath": "bootloader/build/playground_batch.yul",
-<<<<<<< HEAD
     "bytecodeHash": "0x01000957fe599ea1dfc3fc958c63b11f46a726d9462078b77c3f28c4db21446c",
     "sourceCodeHash": "0x97e33d4d96f9ee25e171add92ec7d725de58904dfc68466e4aae1807e9997dc2"
-=======
-    "bytecodeHash": "0x01000957420977a293aab097a368f36b123247d87d4695a6cd27ac62598ab171",
-    "sourceCodeHash": "0x23293faa6627f60f8b4d61657c615cb2327162dd1e33c0968e9ab4d5dd605a20"
->>>>>>> release-v23
   },
   {
     "contractName": "proved_batch",
     "bytecodePath": "bootloader/build/artifacts/proved_batch.yul.zbin",
     "sourceCodePath": "bootloader/build/proved_batch.yul",
-<<<<<<< HEAD
     "bytecodeHash": "0x010008e756cd4ef7a22e5bf21b357fda5c90223b7947f38cd3749826a6faff68",
     "sourceCodeHash": "0x62556a75277d8c72961a1fb9e1d0e1f1cef41c0e8f8d26a6e85cda336a734834"
-=======
-    "bytecodeHash": "0x010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e",
-    "sourceCodeHash": "0x8ac4971296d0546fc6366caa4089489177656cbc33cc21247947d98c28c6dee4"
->>>>>>> release-v23
   }
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,4 +95,4 @@ @@
         "decimals": 18,
         "address": "0x51E83b811930bb4a3aAb3494894ec237Cb6cEc49"
       }
-    ]
+    ]