diff --git a/bin/dao.sh b/bin/dao.sh index 4634b1f..3535ae2 100755 --- a/bin/dao.sh +++ b/bin/dao.sh @@ -25,6 +25,7 @@ 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 diff --git a/bin/deploy.sh b/bin/deploy.sh index e94b2b7..efc5a9e 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -6,7 +6,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 43 --broadcast --verify --skip-simulation --slow -forge script script/deploy/Deploy.s.sol:Deploy --chain-id 44 --broadcast --verify --skip-simulation --slow -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 --slow +forge script script/deploy/Deploy.s.sol:Deploy --chain-id 43 --broadcast --verify --skip-simulation --slow +# forge script script/deploy/Deploy.s.sol:Deploy --chain-id 44 --broadcast --verify --skip-simulation --slow +# 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 --slow diff --git a/bin/fee.sh b/bin/fee.sh index 2c4828d..02d12fa 100755 --- a/bin/fee.sh +++ b/bin/fee.sh @@ -12,9 +12,14 @@ set -x # 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)" 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)" 421614 --chain-id 11155111 --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 421614 --broadcast --skip-simulation --legacy --slow +# 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)" 421614 --chain-id 11155111 --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 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 --slow +# forge script script/fee/Fee.s.sol:Fee --sig "run(uint256)" 43 --chain-id 421614 --broadcast --skip-simulation --legacy --slow diff --git a/script/deploy/Deploy.s.sol b/script/deploy/Deploy.s.sol index 284a551..6eebf28 100644 --- a/script/deploy/Deploy.s.sol +++ b/script/deploy/Deploy.s.sol @@ -77,7 +77,7 @@ contract Deploy is Common { require(deployer == msg.sender, "!deployer"); // deployProtocol(); - deployOralce(); + // deployOralce(); // deployRelayer(); setConfig(); @@ -132,8 +132,8 @@ contract Deploy is Common { // 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(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"); diff --git a/script/fee/Fee.s.sol b/script/fee/Fee.s.sol index 2022068..1beabf3 100644 --- a/script/fee/Fee.s.sol +++ b/script/fee/Fee.s.sol @@ -43,7 +43,7 @@ contract Fee is Common { function run(uint256 chainId) public { require(dao == msg.sender, "!dao"); setOracleFee(chainId); - // setRelayerFee(chainId); + setRelayerFee(chainId); } function setOracleFee(uint256 chainId) public broadcast { diff --git a/script/input/11155111/fee.c.json b/script/input/11155111/fee.c.json index 1b3620b..4187987 100644 --- a/script/input/11155111/fee.c.json +++ b/script/input/11155111/fee.c.json @@ -1,5 +1,8 @@ { "ORACLE": { + "43": { + "fee": 500000000000 + }, "44": { "fee": 500000000000 }, @@ -8,6 +11,12 @@ } }, "RELAYER": { + "43": { + "dstPriceRatio": 12000, + "dstGasPriceInWei": 180000000000, + "baseGas": 200000, + "gasPerByte": 16 + }, "44": { "dstPriceRatio": 12000, "dstGasPriceInWei": 180000000000, diff --git a/script/input/421614/fee.c.json b/script/input/421614/fee.c.json index 3df3869..6a0e2eb 100644 --- a/script/input/421614/fee.c.json +++ b/script/input/421614/fee.c.json @@ -1,5 +1,8 @@ { "ORACLE": { + "43": { + "fee": 500000000000 + }, "44": { "fee": 500000000000 }, @@ -8,6 +11,12 @@ } }, "RELAYER": { + "43": { + "dstPriceRatio": 12000, + "dstGasPriceInWei": 180000000000, + "baseGas": 200000, + "gasPerByte": 16 + }, "44": { "dstPriceRatio": 12000, "dstGasPriceInWei": 180000000000, diff --git a/script/input/43/deploy.c.json b/script/input/43/deploy.c.json new file mode 100644 index 0000000..164a43d --- /dev/null +++ b/script/input/43/deploy.c.json @@ -0,0 +1,6 @@ +{ + "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", + "DEPLOYER": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", + "ORACLE_OPERATOR": "0x0b001c95E86D64C1Ad6e43944C568A6C31b53887", + "RELAYER_OPERATOR": "0x0b001c95E86D64C1Ad6e43944C568A6C31b53887" +} diff --git a/script/input/43/fee.c.json b/script/input/43/fee.c.json new file mode 100644 index 0000000..00a4c67 --- /dev/null +++ b/script/input/43/fee.c.json @@ -0,0 +1,25 @@ +{ + "ORACLE": { + "421614": { + "fee": 1000000000000000000 + }, + "11155111": { + "fee": 1000000000000000000 + } + }, + "RELAYER": { + "421614": { + "dstPriceRatio": 9000000000000000, + "dstGasPriceInWei": 1000000, + "baseGas": 1, + "gasPerByte": 16 + }, + "11155111": { + "dstPriceRatio": 9000000000000000, + "dstGasPriceInWei": 1000000, + "baseGas": 100000, + "gasPerByte": 16 + } + } +} + diff --git a/script/output/43/deploy.a-latest.json b/script/output/43/deploy.a-latest.json index fa3c9b4..7e30eed 100644 --- a/script/output/43/deploy.a-latest.json +++ b/script/output/43/deploy.a-latest.json @@ -1,6 +1,6 @@ { "DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", - "ORACLE": "0x000000003e2E2C9C8DD469E129E02E1666898E76", - "RELAYER": "0x000000007e24Da6666c773280804d8021E12e13F", - "ormp": "0x0000000000BD9dcFDa5C60697039E2b3B28b079b" + "ORACLE": "0x0000000004A34ac73374b65a55C93CF9D4Bc3d17", + "ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A", + "RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1" } \ No newline at end of file