Testnet redeploy (#79)

* fix * upgrade lib * testnet redeploy
ringecosystem · Nov 7, 2023 · 5b5b6a6 · 5b5b6a6
1 parent aff5554
commit 5b5b6a6
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -5,9 +5,9 @@ Oracle and Relayer based Message Protocol.
 ### Canonical Cross-chain Deployment Addresses
 |  Contract  |  Canonical Cross-chain Deployment Address  |
 |------------|--------------------------------------------|
-| ORMP       | 0x009D223Aad560e72282db9c0438Ef1ef2bf7703D |
-| Oracle     | 0x00BD655DDfA7aFeF4BB109FE1F938724527B49D8 |
-| Relayer    | 0x003605167cd4C36063a7B63e604497e623Bb8B10 |
+| ORMP       | 0x00000000001523057a05d6293C1e5171eE33eE0A |
+| Oracle     | 0x0000000000ba03146Cc235509E802873D418a6bc |
+| Relayer    | 0x0000000000808fE9bDCc1d180EfbF5C53552a6b1 |
 
 ## Usage
 To install with [**Foundry**](https://github.com/gakonst/foundry):

diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -2,5 +2,5 @@
 
 set -eo pipefail
 
-forge script script/deploy/Deploy.s.sol:Deploy --chain-id 44    # --broadcast --verify
-forge script script/deploy/Deploy.s.sol:Deploy --chain-id 421614 # --broadcast --verify # --skip-simulation
+forge script script/deploy/Deploy.s.sol:Deploy --chain-id 44     --broadcast --verify
+forge script script/deploy/Deploy.s.sol:Deploy --chain-id 421614 --broadcast --verify --skip-simulation
diff --git a/bin/fee.sh b/bin/fee.sh
@@ -4,4 +4,4 @@ set -eo pipefail
 
 set -x
 forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 421614 --chain-id 44     --broadcast
-forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 44     --chain-id 421614 --broadcast # --skip-simulation
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 44     --chain-id 421614 --broadcast --skip-simulation --slow
diff --git a/bin/verify.sh b/bin/verify.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 
 c3=$PWD/script/input/c3.json
 
-deployer=$(jq -r ".DEPLOYER" $C3)
+deployer=$(jq -r ".DEPLOYER" $c3)
 ormp=$(jq -r ".ORMP_ADDR" $c3)
 oracle=$(jq -r ".ORACLE_ADDR" $c3)
 relayer=$(jq -r ".RELAYER_ADDR" $c3)

diff --git a/lib/create3-deploy b/lib/create3-deploy
diff --git a/script/deploy/Deploy.s.sol b/script/deploy/Deploy.s.sol
@@ -59,12 +59,12 @@ contract Deploy is Common {
         config = ScriptTools.readInput(instanceId);
         c3 = ScriptTools.readInput("../c3");
 
-        ORMP_ADDR = c3.readAddress("ORMP_ADDR");
-        ORMP_SALT = c3.readBytes32("ORMP_SALT");
-        ORACLE_ADDR = c3.readAddress("ORACLE_ADDR");
-        ORACLE_SALT = c3.readBytes32("ORACLE_SALT");
-        RELAYER_ADDR = c3.readAddress("RELAYER_ADDR");
-        RELAYER_SALT = c3.readBytes32("RELAYER_SALT");
+        ORMP_ADDR = c3.readAddress(".ORMP_ADDR");
+        ORMP_SALT = c3.readBytes32(".ORMP_SALT");
+        ORACLE_ADDR = c3.readAddress(".ORACLE_ADDR");
+        ORACLE_SALT = c3.readBytes32(".ORACLE_SALT");
+        RELAYER_ADDR = c3.readAddress(".RELAYER_ADDR");
+        RELAYER_SALT = c3.readBytes32(".RELAYER_SALT");
 
         deployer = config.readAddress(".DEPLOYER");
         dao = config.readAddress(".DAO");
@@ -84,7 +84,7 @@ contract Deploy is Common {
 
         ScriptTools.exportContract(outputName, "DAO", dao);
         ScriptTools.exportContract(outputName, "ORMP", ORMP_ADDR);
-        ScriptTools.exportContract(outputName, "ORACLE", ORMP_ADDR);
+        ScriptTools.exportContract(outputName, "ORACLE", ORACLE_ADDR);
         ScriptTools.exportContract(outputName, "RELAYER", RELAYER_ADDR);
     }
 
@@ -137,13 +137,13 @@ contract Deploy is Common {
         III(RELAYER_ADDR).setApproved(relayerOperator, true);
         require(III(RELAYER_ADDR).isApproved(relayerOperator), "!r-operator");
 
-        III(ORMP_ADDR).changeSetter(dao);
-        require(III(ORMP_ADDR).setter() == dao, "!dao");
+        // III(ORMP_ADDR).changeSetter(dao);
+        // require(III(ORMP_ADDR).setter() == dao, "!dao");
 
-        III(ORACLE_ADDR).changeOwner(dao);
-        require(III(ORACLE_ADDR).owner() == dao, "!dao");
+        // III(ORACLE_ADDR).changeOwner(dao);
+        // require(III(ORACLE_ADDR).owner() == dao, "!dao");
 
-        III(RELAYER_ADDR).changeOwner(dao);
-        require(III(RELAYER_ADDR).owner() == dao, "!dao");
+        // III(RELAYER_ADDR).changeOwner(dao);
+        // require(III(RELAYER_ADDR).owner() == dao, "!dao");
     }
 }
diff --git a/script/input/421614/oracle.c.json b/script/input/421614/oracle.c.json
@@ -1,3 +1,3 @@
 {
-  "44": "0x00d917EC19A6b8837ADFcF8adE3D6faF62e0F587"
+  "44": "0x00000000007317c91F57D86A410934A490E62E1E"
 }
diff --git a/script/input/44/oracle.c.json b/script/input/44/oracle.c.json
@@ -1,3 +1,3 @@
 {
-  "421614": "0x00d917EC19A6b8837ADFcF8adE3D6faF62e0F587"
+  "421614": "0x00000000007317c91F57D86A410934A490E62E1E"
 }
diff --git a/script/input/c3.json b/script/input/c3.json
@@ -5,5 +5,5 @@
   "ORACLE_ADDR": "0x0000000000ba03146Cc235509E802873D418a6bc",
   "ORACLE_SALT": "0x7945140b3deab397a3ed2a87a716d03930e85e019b9bd2c21d28713feb5ab1de",
   "RELAYER_ADDR": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1",
-  "RELATER_SALT": "0x9d38bcb32422a45bc9c08605d4457bcd3dadddfee1573a352ace5f1defa45621"
+  "RELAYER_SALT": "0x9d38bcb32422a45bc9c08605d4457bcd3dadddfee1573a352ace5f1defa45621"
 }
diff --git a/script/output/421614/ORMP.v.json b/script/output/421614/ORMP.v.json
diff --git a/script/output/421614/Oracle.v.json b/script/output/421614/Oracle.v.json
diff --git a/script/output/421614/Relayer.v.json b/script/output/421614/Relayer.v.json
diff --git a/script/output/421614/deploy.a-latest.json b/script/output/421614/deploy.a-latest.json
@@ -1,6 +1,6 @@
 {
   "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
-  "ORACLE": "0x00BD655DDfA7aFeF4BB109FE1F938724527B49D8",
-  "ORMP": "0x009D223Aad560e72282db9c0438Ef1ef2bf7703D",
-  "RELAYER": "0x003605167cd4C36063a7B63e604497e623Bb8B10"
+  "ORACLE": "0x0000000000ba03146Cc235509E802873D418a6bc",
+  "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
+  "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
 }
diff --git a/script/output/44/ORMP.v.json b/script/output/44/ORMP.v.json
diff --git a/script/output/44/Oracle.v.json b/script/output/44/Oracle.v.json
diff --git a/script/output/44/Relayer.v.json b/script/output/44/Relayer.v.json
diff --git a/script/output/44/deploy.a-latest.json b/script/output/44/deploy.a-latest.json
@@ -1,6 +1,6 @@
 {
   "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
-  "ORACLE": "0x00BD655DDfA7aFeF4BB109FE1F938724527B49D8",
-  "RELAYER": "0x003605167cd4C36063a7B63e604497e623Bb8B10",
-  "ORMP": "0x009D223Aad560e72282db9c0438Ef1ef2bf7703D"
+  "ORACLE": "0x0000000000ba03146Cc235509E802873D418a6bc",
+  "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
+  "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
 }