Use castings according to padding

packages/contracts-bedrock/snapshots/semver-lock.json

@@ -16,12 +16,12 @@
     "sourceCodeHash": "0xf9ba98657dc235355146e381b654fe3ed766feb7cd87636ec0c9d4c6dd3e1973"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0x1d3d411c6d34bed2a16a91cdae4ff5a7d46aab72b94165522bc871ffdcba1905",
-    "sourceCodeHash": "0xe7aa40445e938825a0ef414fe46958bdb4de9c4ebbd737dddc96f3afa1d4e3db"
+    "initCodeHash": "0x997aa1eb8c9323ece8942344d0d27bac71f6a4f4ccf7dac7b9ab7232f90bed93",
+    "sourceCodeHash": "0xc9214c3ac97f51d3e3435500a987346518eaa04cf2cb672827d295b8bd226a61"
   },
   "src/L1/OPContractsManagerInterop.sol": {
-    "initCodeHash": "0xb68bdca9d8189a4f21750e7f75e3e2c51f12ebf38b7defd553c43de15eb2c0a6",
-    "sourceCodeHash": "0x1bf5afe631f621078379773a0b0d6fda9d2b3bddd0acd7bd38fc461a2c8107bd"
+    "initCodeHash": "0xef5ec182708fa5c29cf2f42a6109d748cac653981f8a773ce1d6453aff863362",
+    "sourceCodeHash": "0xf9e820880250d9a1889d07e87f3dfc2c86397cd743f6e6ac9101e621b90f912d"
   },
   "src/L1/OPPrestateUpdater.sol": {
     "initCodeHash": "0x4e8acd5a9fa64ca3cfd2f1bef65303dd0c48f475bda7267b6ac3570a70cceb13",

packages/contracts-bedrock/src/L1/OPContractsManager.sol

@@ -144,9 +144,9 @@ contract OPContractsManager is ISemver {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.2.1
+    /// @custom:semver 1.2.2
     function version() public pure virtual returns (string memory) {
-        return "1.2.1";
+        return "1.2.2";
     }
 
     /// @notice Address of the SuperchainConfig contract shared by all chains.
@@ -529,7 +529,8 @@ contract OPContractsManager is ISemver {
                         _l2ChainId: l2ChainId,
                         _proxyAdmin: _opChainConfigs[i].proxyAdmin,
                         _saltMixer: string.concat(
-                            "v2.0.0-", string(bytes.concat(bytes20(address(_opChainConfigs[i].systemConfigProxy))))
+                            "v2.0.0-",
+                            string(bytes.concat(bytes32(uint256(uint160(address(_opChainConfigs[i].systemConfigProxy))))))
                         ),
                         _contractName: "AnchorStateRegistry"
                     })

packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol

@@ -13,9 +13,9 @@ import { ISystemConfigInterop } from "interfaces/L1/ISystemConfigInterop.sol";
 import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
 
 contract OPContractsManagerInterop is OPContractsManager {
-    /// @custom:semver +interop.5
+    /// @custom:semver +interop.6
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop.5");
+        return string.concat(super.version(), "+interop.6");
     }
 
     constructor(

packages/contracts-bedrock/test/L1/OPContractsManager.t.sol

@@ -246,7 +246,7 @@ contract OPContractsManager_Upgrade_Harness is CommonTest {
 
         // Retrieve the l2ChainId, which was read from the superchain-registry, and saved in Artifacts
         // encoded as an address.
-        l2ChainId = uint256(bytes32(bytes20(address(artifacts.mustGetAddress("L2ChainId")))) >> 96);
+        l2ChainId = uint256(uint160(address(artifacts.mustGetAddress("L2ChainId"))));
 
         delayedWETHPermissionedGameProxy =
             IDelayedWETH(payable(artifacts.mustGetAddress("PermissionedDelayedWETHProxy")));
@@ -270,7 +270,10 @@ contract OPContractsManager_Upgrade_Harness is CommonTest {
         bytes32 salt = keccak256(
             abi.encode(
                 l2ChainId,
-                string.concat("v2.0.0-", string(bytes.concat(bytes20(address(opChainConfigs[0].systemConfigProxy))))),
+                string.concat(
+                    "v2.0.0-",
+                    string(bytes.concat(bytes32(uint256(uint160(address(opChainConfigs[0].systemConfigProxy))))))
+                ),
                 "AnchorStateRegistry"
             )
         );