Fix deploy scripts after merging dev

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

@@ -328,17 +328,10 @@ contract DeployL1Script is Script {
     }
 
     function deployChainAdmin() internal {
-        bytes memory accessControlRestrictionBytecode = abi.encodePacked(
+        bytes memory bytecode = abi.encodePacked(
             type(ChainAdmin).creationCode,
-            abi.encode(uint256(0), config.ownerAddress)
+            abi.encode(config.ownerAddress, address(0))
         );
-
-        address accessControlRestriction = deployViaCreate2(accessControlRestrictionBytecode);
-        console.log("Access control restriction deployed at:", accessControlRestriction);
-        address[] memory restrictions = new address[](1);
-        restrictions[0] = accessControlRestriction;
-
-        bytes memory bytecode = abi.encodePacked(type(ChainAdmin).creationCode, abi.encode(restrictions));
         address contractAddress = deployViaCreate2(bytecode);
         console.log("ChainAdmin deployed at:", contractAddress);
         addresses.chainAdmin = contractAddress;

l1-contracts/deploy-scripts/DeployL2Contracts.sol

@@ -93,7 +93,6 @@ contract DeployL2Script is Script {
         deploySharedBridge();
         deploySharedBridgeProxy(legacyBridge);
         initializeChain();
-        finalizeRegistration();
 
         saveOutput();
     }

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

@@ -82,7 +82,23 @@ contract RegisterHyperchainScript is Script {
     }
 
     function loadChain() internal {
-        chainConfig = chainRegistrar.proposedChains[config.proposalAuthor][config.chainChainId];
+        (
+            uint256 chainId,
+            ChainRegistrar.BaseToken memory baseToken,
+            address blobOperator,
+            address operator,
+            address governor,
+            PubdataPricingMode pubdataPricingMode
+        ) = chainRegistrar.proposedChains(config.proposalAuthor, config.chainChainId);
+
+        chainConfig = ChainRegistrar.ChainConfig({
+            chainId: chainId,
+            baseToken: baseToken,
+            operator: operator,
+            blobOperator: blobOperator,
+            governor: governor,
+            pubdataPricingMode: pubdataPricingMode
+        });
     }
 
     function checkTokenAddress() internal view {

system-contracts/scripts/calculate-hashes.ts

@@ -106,7 +106,7 @@ const readBytecode = (details: ContractDetails): string => {
   try {
     if (details.bytecodePath.endsWith(".json")) {
       const jsonFile = fs.readFileSync(absolutePath, "utf8");
-      return ethers.utils.hexlify(JSON.parse(jsonFile).bytecode.object);
+      return "0x" + ethers.utils.hexlify(JSON.parse(jsonFile).bytecode.object);
     } else {
       return ethers.utils.hexlify(fs.readFileSync(absolutePath).toString(), { allowMissingPrefix: true });
     }

system-contracts/scripts/preprocess-bootloader.ts

@@ -53,7 +53,7 @@ function getSystemContextCodeHash() {
   let bytecode;
   try {
     const artifact = JSON.parse(fs.readFileSync("zkout/SystemContext.sol/SystemContext.json", { encoding: "utf-8" }));
-    bytecode = artifact.bytecode.object;
+    bytecode = "0x" + artifact.bytecode.object;
   } catch (e) {
     bytecode = hre.artifacts.readArtifactSync("SystemContext").bytecode;
   }