ORMPOracle deploy on mainnet (#116)

* ORMPOracle deploy on mainnet * upgrade on crab * renam * revert * change fee * fix ci * fix ci
ringecosystem · Feb 7, 2024 · 1e946a7 · 1e946a7
1 parent 4a98829
commit 1e946a7
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 74 deletions.
diff --git a/README.md b/README.md
@@ -6,11 +6,22 @@ Oracle and Relayer based Message Protocol.
 |  Contract  |  Canonical Cross-chain Deployment Address  |
 |------------|--------------------------------------------|
 | ORMP       | 0x00000000001523057a05d6293C1e5171eE33eE0A |
-| Oracle     | 0x00000000046bc530804d66B6b64f7aF69B4E4E81 |
 | ORMPOracle | 0x0000000003ebeF32D8f0ED406a5CA8805c80AFba |
 | Relayer    | 0x0000000000808fE9bDCc1d180EfbF5C53552a6b1 |
 | MsgDAO     | 0x000000000879926D12aF396788C0785B7e581e53 |
 
+## Supported Chains
+### Mainnet
+- Arbitrum
+- Crab
+- Darwinia
+- Ethereum
+
+### Testnet
+- Arbitrum Sepolia
+- Pangolin
+- Sepolia
+
 ## Usage
 To install with [**Foundry**](https://github.com/gakonst/foundry):
 ```sh

diff --git a/bin/dao.sh b/bin/dao.sh
@@ -25,7 +25,11 @@ set -x
 # seth send -F $deployer $relayer "changeOwner(address)" $dao --chain arbitrum
 # seth send -F $deployer $relayer "changeOwner(address)" $dao --chain ethereum
 
-seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain pangolin
-# seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain crab
-seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain sepolia
-seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain arbitrum-sepolia
+# seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain pangolin
+# seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain sepolia
+# seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain arbitrum-sepolia
+
+seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain crab
+seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain darwinia
+seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain ethereum 
+seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain arbitrum
diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -2,10 +2,11 @@
 
 set -eo pipefail
 
-# forge script script/deploy/Deploy.s.sol:Deploy --chain-id 1     --broadcast --verify --slow --legacy
-# forge script script/deploy/Deploy.s.sol:Deploy --chain-id 46    --broadcast --verify --slow
-# forge script script/deploy/Deploy.s.sol:Deploy --chain-id 42161 --broadcast --verify --slow --legacy
+forge script script/deploy/Deploy.s.sol:Deploy --chain-id 1     --broadcast --verify --slow
+forge script script/deploy/Deploy.s.sol:Deploy --chain-id 44    --broadcast --verify --slow
+forge script script/deploy/Deploy.s.sol:Deploy --chain-id 46    --broadcast --verify --slow
+forge script script/deploy/Deploy.s.sol:Deploy --chain-id 42161 --broadcast --verify --slow --legacy --skip-simulation
 
-forge script script/deploy/Deploy.s.sol:Deploy --chain-id 43       --broadcast --verify --skip-simulation
-forge script script/deploy/Deploy.s.sol:Deploy --chain-id 421614   --broadcast --verify --skip-simulation --slow
-forge script script/deploy/Deploy.s.sol:Deploy --chain-id 11155111 --broadcast --verify --skip-simulation
+# forge script script/deploy/Deploy.s.sol:Deploy --chain-id 43       --broadcast --verify --skip-simulation
+# forge script script/deploy/Deploy.s.sol:Deploy --chain-id 421614   --broadcast --verify --skip-simulation --slow
+# forge script script/deploy/Deploy.s.sol:Deploy --chain-id 11155111 --broadcast --verify --skip-simulation
diff --git a/bin/fee.sh b/bin/fee.sh
@@ -3,23 +3,18 @@
 set -eo pipefail
 
 set -x
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 42161 --chain-id 46    --broadcast --slow
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 1     --chain-id 46    --broadcast --slow
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 46    --chain-id 42161 --broadcast --slow --legacy --skip-simulation
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 1     --chain-id 42161 --broadcast --slow --legacy --skip-simulation
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 46    --chain-id 1     --broadcast --slow --legacy
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 42161 --chain-id 1     --broadcast --slow --legacy
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 46     --chain-id 44 --broadcast --slow --legacy
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 44     --chain-id 46 --broadcast --slow --legacy
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 46    --chain-id 1     --broadcast --slow 
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 42161 --chain-id 1     --broadcast --slow 
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 42161 --chain-id 46    --broadcast --slow
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 1     --chain-id 46    --broadcast --slow
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 44    --chain-id 46    --broadcast --slow --legacy
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 46    --chain-id 42161 --broadcast --slow --legacy --skip-simulation
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 1     --chain-id 42161 --broadcast --slow --legacy --skip-simulation
+forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 46    --chain-id 44    --broadcast --slow --legacy
 
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 11155111 --chain-id 44       --broadcast --slow
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 421614   --chain-id 44       --broadcast --slow
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 44       --chain-id 11155111 --broadcast --slow
-# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 44       --chain-id 421614   --broadcast --skip-simulation --legacy --slow
-
-forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 11155111 --chain-id 43       --broadcast
-forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 421614   --chain-id 43       --broadcast
-forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 43       --chain-id 11155111 --broadcast
-forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 421614   --chain-id 11155111 --broadcast
-forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 43       --chain-id 421614   --broadcast --skip-simulation --legacy --slow
-forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 11155111 --chain-id 421614   --broadcast --skip-simulation --legacy --slow
+# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 11155111 --chain-id 43       --broadcast
+# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 421614   --chain-id 43       --broadcast
+# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 43       --chain-id 11155111 --broadcast
+# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 421614   --chain-id 11155111 --broadcast
+# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 43       --chain-id 421614   --broadcast --skip-simulation --legacy --slow
+# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 11155111 --chain-id 421614   --broadcast --skip-simulation --legacy --slow
diff --git a/bin/upgrade.sh b/bin/upgrade.sh
@@ -6,11 +6,11 @@ c3=$PWD/script/input/c3.json
 
 deployer=$(jq -r ".DEPLOYER" $c3)
 ormp=$(jq -r ".ORMP_ADDR" $c3)
-oracle=$(jq -r ".ORACLEV2_ADDR" $c3)
+oracle=$(jq -r ".ORMPORACLE_ADDR" $c3)
 relayer=$(jq -r ".RELAYER_ADDR" $c3)
 
 set -x
 
 seth send -F $deployer $ormp "setDefaultConfig(address,address)" $oracle $relayer --chain crab
-seth send -F $deployer $ormp "setDefaultConfig(address,address)" $oracle $relayer --chain sepolia
-seth send -F $deployer $ormp "setDefaultConfig(address,address)" $oracle $relayer --chain arbitrum-sepolia
+# seth send -F $deployer $ormp "setDefaultConfig(address,address)" $oracle $relayer --chain sepolia
+# seth send -F $deployer $ormp "setDefaultConfig(address,address)" $oracle $relayer --chain arbitrum-sepolia
diff --git a/bin/verify.sh b/bin/verify.sh
@@ -31,9 +31,12 @@ verify() {
 # verify $oracle  46    $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/OracleV2.sol:OracleV2
 # verify $oracle  42161 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/OracleV2.sol:OracleV2
 
-# verify $oracle  44       $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
-verify $oracle  421614   $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
-verify $oracle  11155111 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
+verify $oracle  1     $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
+verify $oracle  44    $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
+verify $oracle  46    $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
+verify $oracle  42161 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
+# verify $oracle  421614   $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
+# verify $oracle  11155111 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/ORMPOracle.sol:ORMPOracle
 
 # verify $ormp    42161 $(cast abi-encode "constructor(address)" $deployer)               src/ORMP.sol:ORMP
 # verify $ormp    46    $(cast abi-encode "constructor(address)" $deployer)               src/ORMP.sol:ORMP

diff --git a/script/deploy/Deploy.s.sol b/script/deploy/Deploy.s.sol
@@ -127,10 +127,10 @@ contract Deploy is Common {
 
     /// @notice Set the protocol config
     function setConfig() public broadcast {
-        ORMP(ORMP_ADDR).setDefaultConfig(ORACLE_ADDR, RELAYER_ADDR);
-        (address o, address r) = ORMP(ORMP_ADDR).defaultUC();
-        require(o == ORACLE_ADDR, "!oracle");
-        require(r == RELAYER_ADDR, "!relayer");
+        // ORMP(ORMP_ADDR).setDefaultConfig(ORACLE_ADDR, RELAYER_ADDR);
+        // (address o, address r) = ORMP(ORMP_ADDR).defaultUC();
+        // require(o == ORACLE_ADDR, "!oracle");
+        // require(r == RELAYER_ADDR, "!relayer");
 
         III(ORACLE_ADDR).setApproved(oracleOperator, true);
         require(III(ORACLE_ADDR).isApproved(oracleOperator), "!o-operator");

diff --git a/script/input/42161/fee.c.json b/script/input/42161/fee.c.json
@@ -17,7 +17,7 @@
     "1": {
       "dstPriceRatio": 10000000000,
       "dstGasPriceInWei": 50000000000,
-      "baseGas": 100000,
+      "baseGas": 120000,
       "gasPerByte": 16
     }
   }

diff --git a/script/input/44/fee.c.json b/script/input/44/fee.c.json
@@ -2,12 +2,6 @@
   "ORACLE": {
     "46": {
       "fee": 10000000000000000000
-    },
-    "421614": {
-      "fee": 1000000000000000000
-    },
-    "11155111": {
-      "fee": 1000000000000000000
     }
   },
   "RELAYER": {
@@ -16,18 +10,6 @@
       "dstGasPriceInWei": 180000000000,
       "baseGas": 200000,
       "gasPerByte": 16
-    },
-    "421614": {
-      "dstPriceRatio": 9000000000000000,
-      "dstGasPriceInWei": 1000000,
-      "baseGas": 1,
-      "gasPerByte": 16
-    },
-    "11155111": {
-      "dstPriceRatio": 9000000000000000,
-      "dstGasPriceInWei": 1000000,
-      "baseGas": 100000,
-      "gasPerByte": 16
     }
   }
 }
diff --git a/script/input/46/fee.c.json b/script/input/46/fee.c.json
@@ -14,7 +14,7 @@
     "1": {
       "dstPriceRatio": 9000000000000000,
       "dstGasPriceInWei": 40000000000,
-      "baseGas": 100000,
+      "baseGas": 120000,
       "gasPerByte": 16
     },
     "44": {

diff --git a/script/output/1/ORMPOracle.v.json b/script/output/1/ORMPOracle.v.json
diff --git a/script/output/1/deploy.a-latest.json b/script/output/1/deploy.a-latest.json
@@ -1,6 +1,6 @@
 {
   "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
-  "ORACLE": "0x0000000005Be70A35b6534bFBd21eC0c98B27b1f",
+  "ORACLE": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba",
   "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
   "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
 }
diff --git a/script/output/42161/ORMPOracle.v.json b/script/output/42161/ORMPOracle.v.json
diff --git a/script/output/42161/deploy.a-latest.json b/script/output/42161/deploy.a-latest.json
@@ -1,6 +1,6 @@
 {
   "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
-  "ORACLE": "0x0000000005Be70A35b6534bFBd21eC0c98B27b1f",
+  "ORACLE": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba",
   "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
   "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
 }
diff --git a/script/output/44/ORMPOracle.v.json b/script/output/44/ORMPOracle.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": "0x000000000DA67291724858F7e759A43B2d23225e",
+  "ORACLE": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba",
   "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
   "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
 }
diff --git a/script/output/46/ORMPOracle.v.json b/script/output/46/ORMPOracle.v.json
diff --git a/script/output/46/deploy.a-latest.json b/script/output/46/deploy.a-latest.json
@@ -1,6 +1,6 @@
 {
   "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
-  "ORACLE": "0x0000000005Be70A35b6534bFBd21eC0c98B27b1f",
+  "ORACLE": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba",
   "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
   "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
 }
diff --git a/test/bench/ORMP.b.sol b/test/bench/ORMP.b.sol
@@ -21,17 +21,16 @@ import "forge-std/Test.sol";
 import {Chains} from "create3-deploy/script/Chains.sol";
 import "../../src/Verifier.sol";
 import "../../src/ORMP.sol";
-import "../../src/eco/Oracle.sol";
+import "../../src/eco/ORMPOracle.sol";
 import "../../src/eco/Relayer.sol";
 
 contract ORMPBenchmarkTest is Test {
     using Chains for uint256;
 
     ORMP ormp = ORMP(0x00000000001523057a05d6293C1e5171eE33eE0A);
-    Oracle oracle = Oracle(payable(0x00000000046bc530804d66B6b64f7aF69B4E4E81));
+    ORMPOracle oracle = ORMPOracle(payable(0x0000000003ebeF32D8f0ED406a5CA8805c80AFba));
     Relayer relayer = Relayer(payable(0x0000000000808fE9bDCc1d180EfbF5C53552a6b1));
 
-    bytes32 root;
     address immutable self = address(this);
     uint256 chain1 = Chains.Darwinia;
     uint256 chain2 = Chains.Arbitrum;
@@ -69,23 +68,21 @@ contract ORMPBenchmarkTest is Test {
     }
 
     function perform_recv(Message memory message) public {
-        root = ormp.root();
+        bytes32 root = ormp.root();
+        uint256 blockNumber = block.number;
         Verifier.Proof memory proof =
             Verifier.Proof({blockNumber: block.number, messageIndex: message.index, messageProof: ormp.prove()});
 
         vm.createSelectFork(message.toChainId.toChainName());
-        // TODO: setDefaltOracle
         vm.store(address(oracle), bytes32(uint256(0)), bytes32(uint256(uint160(self))));
         assertEq(oracle.owner(), self);
+        vm.prank(address(oracle.owner()));
+        oracle.importMessageRoot(message.fromChainId, blockNumber, root);
 
         vm.prank(address(relayer));
         ormp.recv(message, abi.encode(proof));
     }
 
-    function messageRootOf(uint256) external view returns (bytes32) {
-        return root;
-    }
-
     function perform_send(uint256 fromChainId, uint256 toChainId, bytes calldata encoded) public {
         vm.createSelectFork(fromChainId.toChainName());
         uint256 f = ormp.fee(toChainId, self, 0, encoded, abi.encode(uint256(0)));