From 0e3566fc74ba40071a0c2f0e857492dd21dcb0d7 Mon Sep 17 00:00:00 2001
From: echo <hujw77@gmail.com>
Date: Wed, 23 Oct 2024 21:15:39 +0800
Subject: [PATCH] fix

---
 script/msgport/Connect.s.sol  |  4 ++--
 script/msgport/Deploy.s.sol   |  2 +-
 script/msgport/OneClick.s.sol | 15 ++++++++++-----
 script/self/SwapOwner.s.sol   |  5 ++++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/script/msgport/Connect.s.sol b/script/msgport/Connect.s.sol
index ef0aae9..093bc93 100644
--- a/script/msgport/Connect.s.sol
+++ b/script/msgport/Connect.s.sol
@@ -28,7 +28,7 @@ contract ConnectScript is Base, OracleConfig, RelayerConfig {
 
     string[] networks;
 
-    DeployScript internal deploy;
+    DeployScript deploy;
 
     function setUp() public {
         if (block.chainid == 31337) {
@@ -51,7 +51,7 @@ contract ConnectScript is Base, OracleConfig, RelayerConfig {
         RelayerConfig.init(local, config);
     }
 
-    function run() public virtual sphinx {
+    function _run() internal virtual {
         bool IS_PROD = vmSafe.envOr("IS_PROD", true);
         if (IS_PROD) {
             networks = sphinxConfig.mainnets;
diff --git a/script/msgport/Deploy.s.sol b/script/msgport/Deploy.s.sol
index 8b2cd2a..7196170 100644
--- a/script/msgport/Deploy.s.sol
+++ b/script/msgport/Deploy.s.sol
@@ -22,7 +22,7 @@ contract DeployScript is Base {
     ];
     uint64 quorum = 3;
 
-    function run() public sphinx {
+    function _run() internal virtual {
         deployMsgport();
         // deployXAccount();
     }
diff --git a/script/msgport/OneClick.s.sol b/script/msgport/OneClick.s.sol
index f291d5e..a1d18b4 100644
--- a/script/msgport/OneClick.s.sol
+++ b/script/msgport/OneClick.s.sol
@@ -2,14 +2,19 @@
 pragma solidity 0.8.17;
 
 import "./Connect.s.sol";
+import "./Deploy.s.sol";
 import "../self/SwapOwner.s.sol";
 
-contract OneClickScript is ConnectScript {
+contract OneClickScript is DeployScript, ConnectScript, SwapOwnerScript {
     SwapOwnerScript swap = new SwapOwnerScript();
 
-    function run() public override sphinx {
-        deploy.run();
-        super.run();
-        swap.run();
+    function run() public sphinx {
+        _run();
+    }
+
+    function _run() internal override(DeployScript, ConnectScript, SwapOwnerScript) {
+        DeployScript._run();
+        ConnectScript._run();
+        SwapOwnerScript._run();
     }
 }
diff --git a/script/self/SwapOwner.s.sol b/script/self/SwapOwner.s.sol
index 2e3f5d7..ff43f6f 100644
--- a/script/self/SwapOwner.s.sol
+++ b/script/self/SwapOwner.s.sol
@@ -11,7 +11,10 @@ contract SwapOwnerScript is Base {
     address aki = 0x53405FB4d71591E33fe07bFbC90bD82E65720ad0;
     address bear = 0x5b7544b3f6aBd9E03Fba494796B1eE6F9543E2e4;
 
-    function run() public sphinx {
+    function _run() internal virtual {
+        if (block.chainid != 2818) {
+            return;
+        }
         address self = safeAddress();
 
         ISafe(self).swapOwner(0x52386BE2397e8EAc26298F733b390684203fB580, aki, bear);