Deploy on testnets (#9)

* replace pangolin to koi * bump sphinx to 0.1.12 * bump sphinx to 0.1.13 * deploy on testnets * connect on testnets * connect proposal * connected * tron shasta
darwinia-network · Jun 11, 2024 · 6c57c49 · 6c57c49
1 parent 5e42a11
commit 6c57c49
Show file tree

Hide file tree

Showing 16 changed files with 13,213 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -32,17 +32,17 @@ ORMPUpgradeablePort: TFRF7t9m7pGLnwwX8TFsZvj85EvQ6gSBCm
 ### Testnet
 - Arbitrum Sepolia
 - Sepolia
-- Darwinia Pangolin
+- Darwinia Koi
 - Tanssi Pangoro
 - Taiko Hekla
 
 #### Tron shasta
 ```
 SUBAPIMultiSig: TEYbMKVNpumbN5myf5uN6VgFStckj9DGe5
-ORMP: TN1j3Ttt1c1mB3X2zdKkdMsUK6pZyLCxSr
-Oracle: TGaaHxjof9QcfKwggnFVM3QwjGKzbuNzNk
-Relayer: TRediXQ8qcTqorMQqJ2jQgqnjUojWZo2qc
-ORMPUpgradeablePort: TQ49GJrj2wQ7RdhRGT26izeRypcQqwNFpo
+ORMP: TPJifBA5MvFf918VYnajd2XmEept4iBX55
+Oracle: TDULRJrJ2bbsvW3KKtEnnq9moPn5PyUWpd
+Relayer: TZGjiJcoqUo6JSZeYvrwN6qvpEcLm21QbG
+ORMPUpgradeablePort: TSZCvXyP618r4AxYmVD15Zu46VB3AFeAyd 
 ```
 
 ## Supported Lines
@@ -57,9 +57,9 @@ ORMPUpgradeablePort: TQ49GJrj2wQ7RdhRGT26izeRypcQqwNFpo
 - Ethereum <> Arbitrum
 
 ### Testnet
-- Darwinia Pangolin <> Arbitrum Sepolia
-- Darwinia Pangolin <> Tron Shasta
-- Darwinia Pangolin <> Sepolia
+- Darwinia Koi <> Arbitrum Sepolia
+- Darwinia Koi <> Tron Shasta
+- Darwinia Koi <> Sepolia
 - Sepolia <> Arbitrum Sepolia
 - Sepolia <> Tron Shasta
 - Sepolia <> Tanssi Pangoro

diff --git a/foundry.toml b/foundry.toml
@@ -29,7 +29,7 @@ fs_permissions = [
 [rpc_endpoints]
 ## testnets
 arbitrum_sepolia = "https://sepolia-rollup.arbitrum.io/rpc"
-darwinia_pangolin = "https://pangolin-rpc.darwinia.network"
+darwinia_koi = "https://koi-rpc.darwinia.network"
 sepolia = "https://rpc.ankr.com/eth_sepolia"
 taiko_hekla = "https://rpc.hekla.taiko.xyz"
 tanssi_pangoro = "https://fraa-flashbox-2871-rpc.a.stagenet.tanssi.network"

diff --git a/lib/sphinx b/lib/sphinx
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "@hujw77/plugins": "0.1.11"
+    "@hujw77/plugins": "0.1.13"
   }
 }
diff --git a/proposal/0x93d4442747a911efd7420c742b09092e7513e83e24852adcb2bf6fcc9982ff9d/deployment.json b/proposal/0x93d4442747a911efd7420c742b09092e7513e83e24852adcb2bf6fcc9982ff9d/deployment.json
diff --git a/proposal/0x93d4442747a911efd7420c742b09092e7513e83e24852adcb2bf6fcc9982ff9d/signature.json b/proposal/0x93d4442747a911efd7420c742b09092e7513e83e24852adcb2bf6fcc9982ff9d/signature.json
@@ -0,0 +1,14 @@
+[
+  {
+    "signer": "0x0f14341a7f464320319025540e8fe48ad0fe5aec",
+    "signature": "0x1d16174421b4e8e7fc31cdbb008df2ff467a68377c0c1ff106869beffd8e2db92fc901df1bb47f06b51cc9ef97bfa3f32adf73bfe3de96d09ee7e511c79382a11b"
+  },
+  {
+    "signer": "0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85",
+    "signature": "0x623fbffcc227549a15cb063d9f4a9891ccb97eb41e8045b6c688612d0d3605ac0e164bde46055f2a9ca06ee00007551071862ccb3f68fb52d001215cb113cc6c1c"
+  },
+  {
+    "signer": "0x53405FB4d71591E33fe07bFbC90bD82E65720ad0",
+    "signature": "0x74a11b6df988725cca194cbd8bdbc6c85a5a6f1c470de60453bef9a0dafa1e4261ad0092fd14a35a344a408fcf58db9811f826f1e5096bde8e52ddbf4499b4351b"
+  }
+]
diff --git a/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/deployment.json b/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/deployment.json
diff --git a/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/signature.json b/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/signature.json
@@ -0,0 +1,14 @@
+[
+  {
+    "signer": "0x0f14341a7f464320319025540e8fe48ad0fe5aec",
+    "signature": "0x626b72298c88296a7dc2d6060f56aab27b0072653c8861caf079b59f01135a1d37ca99c5ef3b6aa3354815b477f8c68b209095d0d0e0c30280c1d9b17e4572df1b"
+  },
+  {
+    "signer": "0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85",
+    "signature": "0x5f2def7c593f6c748ada2d40cc4f2ea3da8f03ce2b822be96e9a47c96a6c93374c85cda84b81c9288b394176448e85abda5b89deb86caea666a5df8babe6ecab1b"
+  },
+  {
+    "signer": "0x53405FB4d71591E33fe07bFbC90bD82E65720ad0",
+    "signature": "0x4aa9358ae576f2718b43c61c9d30961983c9884cc81e7130a9f44acf33d8e2cc63dff9ef07dd36c8c9bf755fb32d05c9aa203371ed8f123437dabd5cf723d4d21b"
+  }
+]
diff --git a/script/Base.sol b/script/Base.sol
@@ -17,7 +17,7 @@ abstract contract Base is Script, Sphinx, SphinxConstants {
 
     function configureSphinx() public override {
         sphinxConfig.projectName = "RING-DAO";
-        sphinxConfig.testnets = ["sepolia", "darwinia_pangolin", "arbitrum_sepolia", "tanssi_pangoro", "taiko_hekla"];
+        sphinxConfig.testnets = ["sepolia", "darwinia_koi", "arbitrum_sepolia", "tanssi_pangoro", "taiko_hekla"];
         sphinxConfig.mainnets = ["ethereum", "darwinia", "crab", "arbitrum", "blast", "polygon", "moonbeam"];
     }
 

diff --git a/script/Connect.s.sol b/script/Connect.s.sol
@@ -58,14 +58,27 @@ contract ConnectScript is Base, OracleConfig, RelayerConfig {
         }
         connect(block.chainid);
         // darwinia connect to tron
-        if (block.chainid == 46) {
-            if (
-                0x3Bc5362EC3a3DBc07292aEd4ef18Be18De02DA3a
-                    != III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).peerOf(728126428)
-            ) {
-                III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).setPeer(
-                    728126428, 0x3Bc5362EC3a3DBc07292aEd4ef18Be18De02DA3a
-                );
+        if (IS_PROD) {
+            if (block.chainid == 46) {
+                if (
+                    0x3Bc5362EC3a3DBc07292aEd4ef18Be18De02DA3a
+                        != III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).peerOf(728126428)
+                ) {
+                    III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).setPeer(
+                        728126428, 0x3Bc5362EC3a3DBc07292aEd4ef18Be18De02DA3a
+                    );
+                }
+            }
+        } else {
+            if (block.chainid == 701 || block.chainid == 11155111) {
+                if (
+                    0xb5F017129950C21d870019f6066C42E25acDAAe3
+                        != III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).peerOf(2494104990)
+                ) {
+                    III(0x2cd1867Fb8016f93710B6386f7f9F1D540A60812).setPeer(
+                        2494104990, 0xb5F017129950C21d870019f6066C42E25acDAAe3
+                    );
+                }
             }
         }
     }

diff --git a/script/input/11155111.toml b/script/input/11155111.toml
@@ -5,11 +5,11 @@ chainAlias = "sepolia"
 rpcUrl = "https://sepolia.infura.io/v3/b9794ad1ddf84dfb8c34d6bb5dca2001" 
 
 [remote]
-chains = [43,45,167009,421614]
+chains = [701,45,167009,421614]
 
 [ormp]
 [ormp.oracle]
-[ormp.oracle.43]
+[ormp.oracle.701]
 fee = 50000000000 
 
 [ormp.oracle.45]
@@ -23,7 +23,7 @@ fee = 27500000000000
 
 
 [ormp.relayer]
-[ormp.relayer.43]
+[ormp.relayer.701]
 dstPriceRatio = 13888 
 dstGasPriceInWei = 160000000000 
 baseGas = 200000

diff --git a/script/input/167009.toml b/script/input/167009.toml
@@ -5,11 +5,11 @@ chainAlias = "taiko_hekla"
 rpcUrl = "https://rpc.hekla.taiko.xyz" 
 
 [remote]
-chains = [43,45,421614,11155111]
+chains = [701,45,421614,11155111]
 
 [ormp]
 [ormp.oracle]
-[ormp.oracle.43]
+[ormp.oracle.701]
 fee = 50000000000
 
 [ormp.oracle.45]
@@ -23,7 +23,7 @@ fee = 2750000000000000
 
 
 [ormp.relayer]
-[ormp.relayer.43]
+[ormp.relayer.701]
 dstPriceRatio = 13888 
 dstGasPriceInWei = 160000000000 
 baseGas = 200000

diff --git a/script/input/421614.toml b/script/input/421614.toml
@@ -5,11 +5,11 @@ chainAlias = "arbitrum_sepolia"
 rpcUrl = "https://sepolia-rollup.arbitrum.io/rpc" 
 
 [remote]
-chains = [43,45,167009,11155111]
+chains = [701,45,167009,11155111]
 
 [ormp]
 [ormp.oracle]
-[ormp.oracle.43]
+[ormp.oracle.701]
 fee = 50000000000
 
 [ormp.oracle.45]
@@ -23,7 +23,7 @@ fee = 27500000000000000
 
 
 [ormp.relayer]
-[ormp.relayer.43]
+[ormp.relayer.701]
 dstPriceRatio = 13888 
 dstGasPriceInWei = 160000000000 
 baseGas = 200000

diff --git a/script/input/45.toml b/script/input/45.toml
@@ -5,11 +5,11 @@ chainAlias = "tanssi_pangoro"
 rpcUrl = "https://fraa-flashbox-2871-rpc.a.stagenet.tanssi.network" 
 
 [remote]
-chains = [43,167009,421614,11155111]
+chains = [701,167009,421614,11155111]
 
 [ormp]
 [ormp.oracle]
-[ormp.oracle.43]
+[ormp.oracle.701]
 fee = "100000000000000000"
 
 [ormp.oracle.167009]
@@ -23,7 +23,7 @@ fee = "100000000000000000"
 
 
 [ormp.relayer]
-[ormp.relayer.43]
+[ormp.relayer.701]
 dstPriceRatio = 10000000000 
 dstGasPriceInWei = 1050000000
 baseGas = 100000

diff --git a/script/input/43.toml → script/input/701.toml b/script/input/43.toml → script/input/701.toml
@@ -1,8 +1,8 @@
 [local]
-name = "Darwinia Pangolin"
-chainId = 43
-chainAlias = "darwinia_pangolin"
-rpcUrl = "https://pangolin-rpc.darwinia.network" 
+name = "Darwinia Koi"
+chainId = 701
+chainAlias = "darwinia_koi"
+rpcUrl = "https://koi-rpc.darwinia.network" 
 
 [remote]
 chains = [45,167009,421614,11155111]

diff --git a/yarn.lock b/yarn.lock
@@ -494,24 +494,24 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
   integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
 
-"@hujw77/contracts@^0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@hujw77/contracts/-/contracts-0.1.11.tgz#a55d8666e5cb290e6171ba318a0847163fcb9b30"
-  integrity sha512-6a011L7bjnul0oFOtb0T0xlBs0gaH2dxniCVSAqBLf1QNGWfSvezBlfI99JGrqy687ctcvJzSXI1yzZyyP7/bQ==
+"@hujw77/contracts@^0.1.12":
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/@hujw77/contracts/-/contracts-0.1.12.tgz#ef95986c3efa1f1456c909e95813ada14f444968"
+  integrity sha512-dtMeMLjsi+hTS/iTeIBzPG642zfjiyTQ2IlmVmx3d97Q4iLdrzsldbGq60n1+dK5wAkrw3QB9QnIqiAnFuLuqw==
   dependencies:
     "@openzeppelin/contracts" "4.9.3"
     ethers "^6.7.0"
     solmate "6.2.0"
 
-"@hujw77/core@^0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@hujw77/core/-/core-0.1.11.tgz#98010531b3eafe0a3004760d4ce587de61029651"
-  integrity sha512-S5rU/DtH6V2OgIoCcTlP05Ict72GMMdNwB8egmGxi5TPpGqwxJ9fG43NCCIMTenbvsZZMlt8VZp8sebpoWiPUQ==
+"@hujw77/core@^0.1.12":
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/@hujw77/core/-/core-0.1.12.tgz#5c13baf69b976b3eb6fc8c73f1f4e0788992eccf"
+  integrity sha512-6jdhG14V8tujN+VkgKSNa+Q2BTChbGLAWmHHajzU/dGSGjZD7QTRysI+BLCTh6DZR3u3GZK4HEv2Ie9aYs5SDw==
   dependencies:
     "@amplitude/node" "^1.10.2"
     "@eth-optimism/common-ts" "^0.7.1"
     "@ethersproject/bignumber" "^5.7.0"
-    "@hujw77/contracts" "^0.1.11"
+    "@hujw77/contracts" "^0.1.12"
     "@nomicfoundation/hardhat-ethers" "^3.0.4"
     "@nomicfoundation/hardhat-verify" "^2.0.2"
     "@openzeppelin/hardhat-upgrades" "^1.22.1"
@@ -531,16 +531,16 @@
     undici "^5.21.1"
     yesno "^0.4.0"
 
-"@hujw77/[email protected].11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@hujw77/plugins/-/plugins-0.1.11.tgz#2f4391edfd17684ba3ef512343359907ce433541"
-  integrity sha512-QyDJyTUU2vwpyIqktcOcBUruwpu+8kSzZj3pD+EhLXw5fV//hIKeI+g/QE5TOaNYjPm5xbGF7KsOuYM0D/Osvg==
+"@hujw77/[email protected].13":
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/@hujw77/plugins/-/plugins-0.1.13.tgz#9ff8dab0da8cde34405c98997faca8aad9ff305b"
+  integrity sha512-FW1pnfRvajiVzkUE6EPF5fhD6ap8A0mOktdxCx+J4kobOM82KlwK6PLlEA88+M+lqCIJdJR2/CD8q8D5HunWJw==
   dependencies:
     "@eth-optimism/common-ts" "^0.7.1"
     "@eth-optimism/contracts" "^0.5.40"
     "@ethersproject/bignumber" "^5.7.0"
-    "@hujw77/contracts" "^0.1.11"
-    "@hujw77/core" "^0.1.11"
+    "@hujw77/contracts" "^0.1.12"
+    "@hujw77/core" "^0.1.12"
     "@nomicfoundation/hardhat-ethers" "^3.0.5"
     "@openzeppelin/contracts" "^4.8.1"
     "@openzeppelin/hardhat-upgrades" "^1.22.1"