Swap owners

foundry.toml

@@ -37,11 +37,11 @@ tanssi_pangoro = "https://fraa-flashbox-2871-rpc.a.stagenet.tanssi.network"
 
 ## mainnets
 ethereum = "https://mainnet.infura.io/v3/b6400dafb2e14de5bf24429abab8e098"
-darwinia = "https://erpc.ringdao.com/main/evm/46"
-crab = "https://erpc.ringdao.com/main/evm/44"
-arbitrum = "https://erpc.ringdao.com/main/evm/42161"
-blast = "https://erpc.ringdao.com/main/evm/81457"
+darwinia = "https://rpc.darwinia.network"
+crab = "https://crab-rpc.darwinia.network"
+arbitrum = "https://arbitrum-mainnet.infura.io/v3/b6400dafb2e14de5bf24429abab8e098"
+blast = "https://rpc.blast.io"
 polygon = "https://polygon-mainnet.infura.io/v3/b6400dafb2e14de5bf24429abab8e098"
-moonbeam = "https://erpc.ringdao.com/main/evm/1284"
-morph = "https://erpc.ringdao.com/main/evm/2818"
-base = "https://erpc.ringdao.com/main/evm/8453"
+moonbeam = "https://rpc.api.moonbeam.network"
+morph = "https://rpc.morphl2.io"
+base = "https://base-mainnet.infura.io/v3/b6400dafb2e14de5bf24429abab8e098"

proposal/0x0bc48cd18227a8c14104c7111852ba3e509b01bd0d6c4af73f759c7572996107/signature.json

@@ -0,0 +1,14 @@
+[
+  {
+    "signer": "0x0f14341a7f464320319025540e8fe48ad0fe5aec",
+    "signature": "0x26aa9586e8a13597d3413a191ca09a823ca03a3f88af7a7be6d79fa84d11eb9d35d2a2c5a1c9b46cda3724df88918a7357a7d92dcbac3348d0740ca154a1dcb81b"
+  },
+  {
+    "signer": "0x5b7544b3f6abd9e03fba494796b1ee6f9543e2e4",
+    "signature": "0x2c740ca9b2a276af34314fa926758d40b94b35ff621bb17e206074802645fdba30a436b2147c32f563791bf92204d8767ecb877b118ff549863b8ee8c5d0c4ba1c"
+  },
+  {
+    "signer": "0x52386BE2397e8EAc26298F733b390684203fB580",
+    "signature": "0xa064c6c078996f692ce79371d8169213d6c990ca235e98f6d612644f87d742ec06e01231415b071d0a12df09d3d003ff193129a69c162ba15162ffd0d65fc3671c"
+  }
+]

script/Proposal.s.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "./msgport/OneClick.s.sol";
+import "./self/SwapOwner2.s.sol";
 
-contract Proposal is OneClickScript {}
+contract Proposal is SwapOwner2Script {}

script/common/Base.sol

@@ -18,8 +18,8 @@ abstract contract Base is Script, Sphinx, SphinxConstants {
     function configureSphinx() public override {
         sphinxConfig.projectName = "RING-DAO";
         sphinxConfig.testnets = ["sepolia", "arbitrum_sepolia"];
-        // sphinxConfig.mainnets = ["arbitrum", "base", "blast", "crab", "darwinia", "ethereum", "polygon", "moonbeam", "morph"];
-        sphinxConfig.mainnets = ["base", "darwinia"];
+        sphinxConfig.mainnets =
+            ["arbitrum", "base", "blast", "crab", "darwinia", "ethereum", "polygon", "moonbeam", "morph"];
     }
 
     function CREATE3() public returns (address create3) {

script/msgport/Connect.s.sol

@@ -66,9 +66,8 @@ contract ConnectScript is Base, OracleConfig, RelayerConfig {
                     0x3Bc5362EC3a3DBc07292aEd4ef18Be18De02DA3a
                         != III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).peerOf(728126428)
                 ) {
-                    III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).setPeer(
-                        728126428, 0x3Bc5362EC3a3DBc07292aEd4ef18Be18De02DA3a
-                    );
+                    III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812)
+                        .setPeer(728126428, 0x3Bc5362EC3a3DBc07292aEd4ef18Be18De02DA3a);
                 }
             }
         } else {
@@ -77,9 +76,8 @@ contract ConnectScript is Base, OracleConfig, RelayerConfig {
                     0xb5F017129950C21d870019f6066C42E25acDAAe3
                         != III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).peerOf(2494104990)
                 ) {
-                    III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).setPeer(
-                        2494104990, 0xb5F017129950C21d870019f6066C42E25acDAAe3
-                    );
+                    III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812)
+                        .setPeer(2494104990, 0xb5F017129950C21d870019f6066C42E25acDAAe3);
                 }
             }
         }

script/msgport/Deploy.s.sol

@@ -19,7 +19,7 @@ contract DeployScript is Base {
         0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85, // guantong
         0xB9a0CaDD13C5d534b034d878b2fcA9E5a6e1e3A4, // echo
         0xc1A3FEE4132e9285f41F5389570fD9Fbbcb10a1D, // yalin
-        0xFa5727bE643dba6599fC7F812fE60dA3264A8205  // nada
+        0xFa5727bE643dba6599fC7F812fE60dA3264A8205 // nada
     ];
     uint64 quorum = 3;
 
@@ -149,7 +149,7 @@ contract DeployScript is Base {
     function ORACLE() public returns (address) {
         bytes memory byteCode = type(Oracle).creationCode;
         bytes memory initCode = bytes.concat(byteCode, abi.encode(DAO(), ORMPAddr()));
-		return computeAddress(salt2, hash(initCode));
+        return computeAddress(salt2, hash(initCode));
     }
 
     function RELAYER() public returns (address) {

script/self/SwapOwner2.s.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
+import {Base} from "../common/Base.sol";
+
+interface ISafe {
+    function swapOwner(address prevOwner, address oldOwner, address newOwner) external;
+}
+
+interface IRelayer {
+    function isApproved(address) external view returns (bool);
+    function setApproved(address, bool) external;
+}
+
+contract SwapOwner2Script is Base {
+    address guantong = 0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85;
+    address xiaoch = 0x88a39B052d477CfdE47600a7C9950a441Ce61cb4;
+
+	address alex = 0x00E3993566b34e5367d1C602439997BD08c11FF7;
+	address yalin = 0x9a3b34f81F8005709409eAf65AEcA4530011f88d;
+
+    address relayer = 0x114890eB7386F94eae410186F20968bFAf66142a;
+
+    function run() public sphinx {
+        _run();
+    }
+
+    function _run() internal virtual {
+        address self = safeAddress();
+
+        ISafe(self).swapOwner(address(0x1), alex, yalin);
+        ISafe(self).swapOwner(0x5b7544b3f6aBd9E03Fba494796B1eE6F9543E2e4, guantong, xiaoch);
+
+        if (IRelayer(relayer).isApproved(guantong)) {
+            IRelayer(relayer).setApproved(guantong, false);
+        }
+    }
+}