diff --git a/bin/config.sh b/bin/config.sh index cc6fb48..b2e64c2 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -3,6 +3,8 @@ set -eo pipefail set -x -forge script script/config/Oracle.s.sol:Oracle --sig "run(uint256)" 42161 --chain-id 46 --broadcast --slow -forge script script/config/Oracle.s.sol:Oracle --sig "run(uint256)" 46 --chain-id 42161 --broadcast --slow --legacy +# forge script script/config/Oracle.s.sol:Oracle --sig "run(uint256)" 42161 --chain-id 46 --broadcast --slow +# forge script script/config/Oracle.s.sol:Oracle --sig "run(uint256)" 46 --chain-id 42161 --broadcast --slow --legacy +forge script script/config/Oracle.s.sol:Oracle --sig "run(uint256)" 11155111 --chain-id 44 --broadcast +forge script script/config/Oracle.s.sol:Oracle --sig "run(uint256)" 44 --chain-id 11155111 --broadcast diff --git a/bin/deploy.sh b/bin/deploy.sh index f814231..5ef2760 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -2,5 +2,7 @@ set -eo pipefail -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 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 11155111 --broadcast --verify diff --git a/bin/fee.sh b/bin/fee.sh index 9ff9138..5354b8d 100755 --- a/bin/fee.sh +++ b/bin/fee.sh @@ -3,5 +3,8 @@ 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)" 46 --chain-id 42161 --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)" 46 --chain-id 42161 --broadcast --slow --legacy + +forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 11155111 --chain-id 44 --broadcast +forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 44 --chain-id 11155111 --broadcast diff --git a/foundry.toml b/foundry.toml index dc204a6..d74d608 100644 --- a/foundry.toml +++ b/foundry.toml @@ -11,7 +11,7 @@ cache_path = "cache" broadcast = "broadcast" allow_paths = [] include_paths = [] -force = true +force = false evm_version = "london" gas_reports = ["*"] gas_reports_ignore = [] @@ -69,6 +69,7 @@ pangolin = "https://pangolin-rpc.darwinia.network" crab = "https://crab-rpc.darwinia.network" darwinia = "https://rpc.darwinia.network" arbitrum = "https://arb1.arbitrum.io/rpc" +sepolia = "https://sepolia.infura.io/v3/${INFURA_KEY}" [etherscan] arbitrum = { key = "${ETHERSCAN_ARBITRUM_KEY}" } diff --git a/script/input/11155111/deploy.c.json b/script/input/11155111/deploy.c.json new file mode 100644 index 0000000..164a43d --- /dev/null +++ b/script/input/11155111/deploy.c.json @@ -0,0 +1,6 @@ +{ + "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", + "DEPLOYER": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", + "ORACLE_OPERATOR": "0x0b001c95E86D64C1Ad6e43944C568A6C31b53887", + "RELAYER_OPERATOR": "0x0b001c95E86D64C1Ad6e43944C568A6C31b53887" +} diff --git a/script/input/11155111/fee.c.json b/script/input/11155111/fee.c.json new file mode 100644 index 0000000..40e512c --- /dev/null +++ b/script/input/11155111/fee.c.json @@ -0,0 +1,15 @@ +{ + "ORACLE": { + "44": { + "fee": 500000000000 + } + }, + "RELAYER": { + "44": { + "dstPriceRatio": 12000, + "dstGasPriceInWei": 180000000000, + "baseGas": 200000, + "gasPerByte": 16 + } + } +} diff --git a/script/input/11155111/oracle.c.json b/script/input/11155111/oracle.c.json new file mode 100644 index 0000000..494caeb --- /dev/null +++ b/script/input/11155111/oracle.c.json @@ -0,0 +1,3 @@ +{ + "44": "0x00000000007317c91F57D86A410934A490E62E1E" +} diff --git a/script/input/44/fee.c.json b/script/input/44/fee.c.json index d10d953..c582377 100644 --- a/script/input/44/fee.c.json +++ b/script/input/44/fee.c.json @@ -2,6 +2,9 @@ "ORACLE": { "421614": { "fee": 50000000000000000000 + }, + "11155111": { + "fee": 50000000000000000000 } }, "RELAYER": { @@ -10,6 +13,12 @@ "dstGasPriceInWei": 110000000, "baseGas": 1, "gasPerByte": 16 + }, + "11155111": { + "dstPriceRatio": 9000000000000000, + "dstGasPriceInWei": 10000000000, + "baseGas": 1, + "gasPerByte": 16 } } } diff --git a/script/input/44/oracle.c.json b/script/input/44/oracle.c.json index f7e844f..bd008de 100644 --- a/script/input/44/oracle.c.json +++ b/script/input/44/oracle.c.json @@ -1,3 +1,4 @@ { - "421614": "0x00000000007317c91F57D86A410934A490E62E1E" + "421614": "0x00000000007317c91F57D86A410934A490E62E1E", + "11155111": "0x00000000007317c91F57D86A410934A490E62E1E" } diff --git a/script/output/11155111/deploy.a-latest.json b/script/output/11155111/deploy.a-latest.json new file mode 100644 index 0000000..452186f --- /dev/null +++ b/script/output/11155111/deploy.a-latest.json @@ -0,0 +1,6 @@ +{ + "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", + "ORACLE": "0x0000000000ba03146Cc235509E802873D418a6bc", + "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A", + "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1" +} \ No newline at end of file