Skip to content

Commit

Permalink
Support Polygon (#122)
Browse files Browse the repository at this point in the history 
* support polygon config

* polygon network config

* upgrade lib/create3-deploy

* support polygon

* transfer ownership to dao
  • Loading branch information
@hujw77
hujw77 committed Feb 29, 2024
1 parent 7905ee6 commit 65995d7
Show file tree
Hide file tree
Showing 16 changed files with 74 additions and 23 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Oracle and Relayer based Message Protocol.
- Crab
- Darwinia
- Ethereum
- Polygon

### Testnet
- Arbitrum Sepolia
Expand Down
11 changes: 7 additions & 4 deletions bin/dao.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ set -x
# 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
# 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
# seth send -F $deployer $oracle "changeOwner(address)" $subapi_multisig --chain polygon
seth send -F $deployer $relayer "changeOwner(address)" $dao --chain polygon
seth send -F $deployer $ormp "changeSetter(address)" $dao --chain polygon
9 changes: 5 additions & 4 deletions bin/deploy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

set -eo pipefail

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 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 137 --broadcast --verify
# 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
Expand Down
6 changes: 4 additions & 2 deletions bin/fee.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ set -x
# 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)" 1 --chain-id 46 --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)" 44 --chain-id 46 --broadcast --slow --legacy
# 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)" 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)" 46 --chain-id 137 --broadcast
forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 137 --chain-id 46 --broadcast --slow --legacy

# 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
Expand Down
11 changes: 7 additions & 4 deletions bin/verify.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,22 @@ 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 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 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 137 $(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
verify $ormp 137 $(cast abi-encode "constructor(address)" $deployer) src/ORMP.sol:ORMP
# verify $oracle 42161 $(cast abi-encode "constructor(address,address,address)" $deployer $ormp $subapi) src/eco/Oracle.sol:Oracle
# verify $oracle 46 $(cast abi-encode "constructor(address,address,address)" $deployer $ormp $subapi) src/eco/Oracle.sol:Oracle
# verify $relayer 42161 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/Relayer.sol:Relayer
# verify $relayer 46 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/Relayer.sol:Relayer
verify $relayer 137 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/Relayer.sol:Relayer

# verify $ormp 1 $(cast abi-encode "constructor(address)" $deployer) src/ORMP.sol:ORMP
# verify $oracle 1 $(cast abi-encode "constructor(address,address,address)" $deployer $ormp $subapi) src/eco/Oracle.sol:Oracle
Expand Down
2 changes: 2 additions & 0 deletions foundry.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ darwinia = "https://rpc.darwinia.network"
arbitrum = "https://arb1.arbitrum.io/rpc"
sepolia = "https://sepolia.infura.io/v3/${INFURA_KEY}"
ethereum = "https://mainnet.infura.io/v3/${INFURA_KEY}"
polygon = "https://polygon-mainnet.infura.io/v3/${INFURA_KEY}"

[etherscan]
polygon = { key = "${ETHERSCAN_POLYGON_KEY}" }
arbitrum = { key = "${ETHERSCAN_ARBITRUM_KEY}" }
arbitrum-goerli = { key = "${ETHERSCAN_ARBITRUM_KEY}" }
arbitrum-sepolia = { key = "${ETHERSCAN_ARBITRUM_KEY}" }
Expand Down
2 changes: 1 addition & 1 deletion lib/create3-deploy
Submodule create3-deploy updated 8 files
+11 −14 .gitignore
+1 −1 Makefile
+8 −0 README.md
+4 −0 cli/rust-toolchain.toml
+10 −0 foundry.toml
+46 −0 script/CREATE3Factory.v.json
+14 −1 script/Chains.sol
+12 −0 shell.nix
14 changes: 7 additions & 7 deletions script/deploy/Deploy.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ contract Deploy is Common {
require(deployer == msg.sender, "!deployer");

// deployProtocol();
deployOralce();
// deployOralce();
// deployRelayer();

setConfig();
Expand Down Expand Up @@ -127,15 +127,15 @@ 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");
// III(RELAYER_ADDR).setApproved(relayerOperator, true);
// require(III(RELAYER_ADDR).isApproved(relayerOperator), "!r-operator");
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");
Expand Down
2 changes: 1 addition & 1 deletion script/fee/Fee.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ contract Fee is Common {

function run(uint256 chainId) public {
require(dao == msg.sender, "!dao");
// setOracleFee(chainId);
setOracleFee(chainId);
setRelayerFee(chainId);
}

Expand Down
6 changes: 6 additions & 0 deletions script/input/137/deploy.c.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
"DEPLOYER": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
"ORACLE_OPERATOR": "0x912D7601569cBc2DF8A7f0aaE50BFd18e8C64d05",
"RELAYER_OPERATOR": "0x912D7601569cBc2DF8A7f0aaE50BFd18e8C64d05"
}
15 changes: 15 additions & 0 deletions script/input/137/fee.c.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"ORACLE": {
"46": {
"fee": 4000000000000000
}
},
"RELAYER": {
"46": {
"dstPriceRatio": 40000000,
"dstGasPriceInWei": 180000000000,
"baseGas": 200000,
"gasPerByte": 16
}
}
}
9 changes: 9 additions & 0 deletions script/input/46/fee.c.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"44": {
"fee": 1000000000000000000
},
"137": {
"fee": 2000000000000000000
},
"42161": {
"fee": 360000000000000000000
}
Expand All @@ -23,6 +26,12 @@
"baseGas": 200000,
"gasPerByte": 16
},
"137": {
"dstPriceRatio": 2500000000000,
"dstGasPriceInWei": 70000000000,
"baseGas": 120000,
"gasPerByte": 16
},
"42161": {
"dstPriceRatio": 7000000000000000,
"dstGasPriceInWei": 110000000,
Expand Down
1 change: 1 addition & 0 deletions script/output/137/ORMP.v.json
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions script/output/137/ORMPOracle.v.json
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 65995d7

Please sign in to comment.