script: remove GeneralConfigExtended

script/20240403-deploy-sepolia/deploy-sepolia.s.sol

@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
 import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol";
 
 import { ISharedArgument } from "@ronin/script/interfaces/ISharedArgument.sol";
@@ -22,7 +25,7 @@ import { SLPDeploy } from "@ronin/script/contracts/token/SLPDeploy.s.sol";
 import { USDCDeploy } from "@ronin/script/contracts/token/USDCDeploy.s.sol";
 import { MockERC721Deploy } from "@ronin/script/contracts/token/MockERC721Deploy.s.sol";
 
-import { GeneralConfigExtended } from "../GeneralConfigExtended.sol";
+import { GeneralConfig } from "../GeneralConfig.sol";
 import { Network } from "../utils/Network.sol";
 
 contract DeploySepolia is BaseMigration {
@@ -41,13 +44,17 @@ contract DeploySepolia is BaseMigration {
   MainchainBridgeAdminUtils _mainchainProposalUtils;
 
   function _configByteCode() internal virtual override returns (bytes memory) {
-    return abi.encodePacked(type(GeneralConfigExtended).creationCode);
+    return abi.encodePacked(type(GeneralConfig).creationCode);
   }
 
   function _sharedArguments() internal virtual override returns (bytes memory rawArgs) {
     return "";
   }
 
+  function _getProxyAdmin() internal virtual override returns (address payable) {
+    return payable(0x55ba00EeB8D8d33Df1b1985459D310b9CAfB19f2);
+  }
+
   function setUp() public override {
     super.setUp();
   }
@@ -58,7 +65,7 @@ contract DeploySepolia is BaseMigration {
   }
 
   function _deployContractsOnMainchain() internal {
-    // _mainchainPauseEnforcer = new MainchainPauseEnforcerDeploy().run();
+    _mainchainPauseEnforcer = new MainchainPauseEnforcerDeploy().run();
     _mainchainGatewayV3 = new MainchainGatewayV3Deploy().run();
     _mainchainBridgeManager = new MainchainBridgeManagerDeploy().run();
 

script/BridgeMigration.sol

@@ -10,7 +10,7 @@ import { RoninBridgeManager } from "@ronin/contracts/ronin/gateway/RoninBridgeMa
 import { ErrorHandler } from "@ronin/contracts/libraries/ErrorHandler.sol";
 import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";
 
-import { GeneralConfigExtended } from "./GeneralConfigExtended.sol";
+import { GeneralConfig } from "./GeneralConfig.sol";
 import { IGeneralConfigExtended } from "./IGeneralConfigExtended.sol";
 import { Network } from "./utils/Network.sol";
 import { Contract } from "./utils/Contract.sol";
@@ -24,7 +24,7 @@ contract BridgeMigration is BaseMigration {
   IGeneralConfigExtended internal constant _config = IGeneralConfigExtended(address(CONFIG));
 
   function _configByteCode() internal virtual override returns (bytes memory) {
-    return abi.encodePacked(type(GeneralConfigExtended).creationCode);
+    return abi.encodePacked(type(GeneralConfig).creationCode);
   }
 
   function _sharedArguments() internal virtual override returns (bytes memory rawArgs) {

script/GeneralConfig.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.23;
 import { console2 as console } from "forge-std/console2.sol";
 import { BaseGeneralConfig } from "foundry-deployment-kit/BaseGeneralConfig.sol";
 import { DefaultNetwork } from "foundry-deployment-kit/utils/DefaultNetwork.sol";
+import { TNetwork } from "foundry-deployment-kit/types/Types.sol";
 import { Contract } from "./utils/Contract.sol";
 import { Network } from "./utils/Network.sol";
 import { Utils } from "./utils/Utils.sol";
@@ -70,4 +71,10 @@ contract GeneralConfig is BaseGeneralConfig, Utils {
     if (sender == address(0x0) && isLocalNetwork) sender = payable(DEFAULT_SENDER);
     require(sender != address(0x0), "GeneralConfig: Sender is address(0x0)");
   }
+
+  function getCompanionNetwork(TNetwork network) external pure returns (Network) {
+    if (network == DefaultNetwork.RoninTestnet.key()) return Network.Sepolia;
+    if (network == DefaultNetwork.RoninMainnet.key()) return Network.EthMainnet;
+    revert("Network: Unknown companion network");
+  }
 }