Contracts V2 #1300
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ coverage/ | |
| out/ | ||
| cache/ | ||
| broadcast/ | ||
| /types/ | ||
| tsconfig.tsbuildinfo | ||
| lcov.info | ||
| tenderly.yaml | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| import {Script} from "forge-std/Script.sol"; | ||
| import {GatewayProxy} from "../src/GatewayProxy.sol"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| import {Script} from "forge-std/Script.sol"; | ||
| import {BeefyClient} from "../src/BeefyClient.sol"; | ||
|
|
@@ -18,7 +18,7 @@ contract DeployBeefyClient is Script { | |
| function readConfig() internal pure returns (Config memory config) { | ||
| // Checkpoint generated using the script `./beefy-checkpoint.js` script in Polkadot-JS. | ||
| config = Config({ | ||
| startBlock: 21_087_413, | ||
| current: BeefyClient.ValidatorSet({ | ||
| id: 644, | ||
| length: 297, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,20 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| import {WETH9} from "canonical-weth/WETH9.sol"; | ||
| import {Script} from "forge-std/Script.sol"; | ||
| import {BeefyClient} from "../src/BeefyClient.sol"; | ||
|
|
||
| import {IGatewayV2} from "../src/v2/IGateway.sol"; | ||
| import {GatewayProxy} from "../src/GatewayProxy.sol"; | ||
| import {Gateway} from "../src/Gateway.sol"; | ||
| import {MockGatewayV2} from "../test/mocks/MockGatewayV2.sol"; | ||
| import {Agent} from "../src/Agent.sol"; | ||
| import {AgentExecutor} from "../src/AgentExecutor.sol"; | ||
| import {Constants} from "../src/Constants.sol"; | ||
| import {ChannelID, ParaID, OperatingMode} from "../src/Types.sol"; | ||
| import {Initializer} from "../src/Initializer.sol"; | ||
| import {SafeNativeTransfer} from "../src/utils/SafeTransfer.sol"; | ||
| import {stdJson} from "forge-std/StdJson.sol"; | ||
| import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol"; | ||
|
|
@@ -49,26 +51,15 @@ contract DeployLocal is Script { | |
| uint256 randaoCommitDelay = vm.envUint("RANDAO_COMMIT_DELAY"); | ||
| uint256 randaoCommitExpiration = vm.envUint("RANDAO_COMMIT_EXP"); | ||
| uint256 minimumSignatures = vm.envUint("MINIMUM_REQUIRED_SIGNATURES"); | ||
| BeefyClient beefyClient = new BeefyClient( | ||
| randaoCommitDelay, randaoCommitExpiration, minimumSignatures, startBlock, current, next | ||
| ); | ||
|
|
||
| uint8 foreignTokenDecimals = uint8(vm.envUint("FOREIGN_TOKEN_DECIMALS")); | ||
| uint128 maxDestinationFee = uint128(vm.envUint("RESERVE_TRANSFER_MAX_DESTINATION_FEE")); | ||
|
|
||
| AgentExecutor executor = new AgentExecutor(); | ||
| Gateway gatewayLogic = new Gateway(address(beefyClient), address(executor)); | ||
|
|
||
| bool rejectOutboundMessages = vm.envBool("REJECT_OUTBOUND_MESSAGES"); | ||
| OperatingMode defaultOperatingMode; | ||
|
|
@@ -78,30 +69,32 @@ contract DeployLocal is Script { | |
| defaultOperatingMode = OperatingMode.Normal; | ||
| } | ||
|
|
||
| // Deploy WETH for testing | ||
| address weth = address(new WETH9()); | ||
|
|
||
| Initializer.Config memory config = Initializer.Config({ | ||
| mode: defaultOperatingMode, | ||
| deliveryCost: uint128(vm.envUint("DELIVERY_COST")), | ||
| registerTokenFee: uint128(vm.envUint("REGISTER_TOKEN_FEE")), | ||
| assetHubCreateAssetFee: uint128(vm.envUint("CREATE_ASSET_FEE")), | ||
| assetHubReserveTransferFee: uint128(vm.envUint("RESERVE_TRANSFER_FEE")), | ||
| exchangeRate: ud60x18(vm.envUint("EXCHANGE_RATE")), | ||
| multiplier: ud60x18(vm.envUint("FEE_MULTIPLIER")), | ||
| rescueOperator: address(0), | ||
| foreignTokenDecimals: foreignTokenDecimals, | ||
| maxDestinationFee: maxDestinationFee, | ||
| weth: weth | ||
| }); | ||
|
|
||
| GatewayProxy gateway = new GatewayProxy(address(gatewayLogic), abi.encode(config)); | ||
|
|
||
| // Fund the sovereign account for the BridgeHub parachain. Used to reward relayers | ||
| // of messages originating from BridgeHub | ||
| uint256 initialDeposit = vm.envUint("BRIDGE_HUB_INITIAL_DEPOSIT"); | ||
|
|
||
| address bridgeHubAgent = | ||
| IGatewayV2(address(gateway)).agentOf(Constants.BRIDGE_HUB_AGENT_ID); | ||
| address assetHubAgent = IGatewayV2(address(gateway)).agentOf(Constants.ASSET_HUB_AGENT_ID); | ||
|
|
||
| payable(bridgeHubAgent).safeNativeTransfer(initialDeposit); | ||
| payable(assetHubAgent).safeNativeTransfer(initialDeposit); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| import {AgentExecutor} from "../src/AgentExecutor.sol"; | ||
| import {Gateway} from "../src//Gateway.sol"; | ||
|
|
@@ -20,22 +20,9 @@ contract DeployLocalGatewayLogic is Script { | |
|
|
||
| address beefyClient = vm.envAddress("BEEFY_CLIENT_CONTRACT_ADDRESS"); | ||
|
|
||
| AgentExecutor executor = new AgentExecutor(); | ||
|
|
||
| new Gateway(address(beefyClient), address(executor)); | ||
|
|
||
| vm.stopBroadcast(); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,11 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| import {WETH9} from "canonical-weth/WETH9.sol"; | ||
| import {Script} from "forge-std/Script.sol"; | ||
| import {BeefyClient} from "../src/BeefyClient.sol"; | ||
| import {IGatewayV2} from "../src/v2/IGateway.sol"; | ||
| import {GatewayProxy} from "../src/GatewayProxy.sol"; | ||
| import {Gateway} from "../src/Gateway.sol"; | ||
| import {Agent} from "../src/Agent.sol"; | ||
|
|
@@ -32,8 +31,8 @@ contract FundAgent is Script { | |
| bytes32 bridgeHubAgentID = vm.envBytes32("BRIDGE_HUB_AGENT_ID"); | ||
| bytes32 assetHubAgentID = vm.envBytes32("ASSET_HUB_AGENT_ID"); | ||
|
|
||
| address bridgeHubAgent = IGatewayV2(gatewayAddress).agentOf(bridgeHubAgentID); | ||
| address assetHubAgent = IGatewayV2(gatewayAddress).agentOf(assetHubAgentID); | ||
|
|
||
| payable(bridgeHubAgent).safeNativeTransfer(initialDeposit); | ||
| payable(assetHubAgent).safeNativeTransfer(initialDeposit); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| import {WETH9} from "canonical-weth/WETH9.sol"; | ||
| import {Script} from "forge-std/Script.sol"; | ||
| import {BeefyClient} from "../src/BeefyClient.sol"; | ||
|
|
||
| import {IShell} from "../src/interfaces/IShell.sol"; | ||
| import {GatewayProxy} from "../src/GatewayProxy.sol"; | ||
| import {Gateway} from "../src/Gateway.sol"; | ||
| import {MockGatewayV2} from "../test/mocks/MockGatewayV2.sol"; | ||
| import {Initializer} from "../src/Initializer.sol"; | ||
| import {Agent} from "../src/Agent.sol"; | ||
| import {AgentExecutor} from "../src/AgentExecutor.sol"; | ||
| import {ChannelID, ParaID, OperatingMode} from "../src/Types.sol"; | ||
|
|
@@ -36,9 +36,7 @@ contract UpgradeShell is Script { | |
| address beefyClient; | ||
| ParaID bridgeHubParaID; | ||
| bytes32 bridgeHubAgentID; | ||
| Initializer.Config initializerParams; | ||
| } | ||
|
|
||
| function readConfig() internal pure returns (Config memory config) { | ||
|
|
@@ -47,19 +45,18 @@ contract UpgradeShell is Script { | |
| beefyClient: 0x6eD05bAa904df3DE117EcFa638d4CB84e1B8A00C, | ||
| bridgeHubParaID: ParaID.wrap(1002), | ||
| bridgeHubAgentID: 0x03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314, | ||
| initializerParams: Initializer.Config({ | ||
| mode: OperatingMode.Normal, | ||
| deliveryCost: mDot(100), // 0.1 DOT | ||
| registerTokenFee: 0.002 ether, | ||
| assetHubCreateAssetFee: mDot(100), // 0.1 DOT | ||
| assetHubReserveTransferFee: mDot(100), // 0.1 DOT | ||
| exchangeRate: ud60x18(0.0024e18), | ||
| multiplier: ud60x18(1.33e18), | ||
| rescueOperator: 0x4B8a782D4F03ffcB7CE1e95C5cfe5BFCb2C8e967, | ||
|
There was a problem hiding this comment. Probably don't need this anymore, since we have already dropped the operator on mainnet? |
||
| foreignTokenDecimals: 10, | ||
| maxDestinationFee: dot(2), | ||
| weth: 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2 | ||
| }) | ||
| }); | ||
| } | ||
|
|
@@ -73,18 +70,15 @@ contract UpgradeShell is Script { | |
| AgentExecutor executor = new AgentExecutor(); | ||
|
|
||
| // Gateway implementation | ||
| Gateway gatewayLogic = new Gateway(config.beefyClient, address(executor)); | ||
|
|
||
| IShell shell = IShell(config.gatewayProxy); | ||
|
|
||
| shell.upgrade( | ||
| address(gatewayLogic), | ||
| address(gatewayLogic).codehash, | ||
| abi.encode(config.initializerParams) | ||
| ); | ||
|
|
||
| vm.stopBroadcast(); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| import {WETH9} from "canonical-weth/WETH9.sol"; | ||
| import {Script} from "forge-std/Script.sol"; | ||
| import {stdJson} from "forge-std/StdJson.sol"; | ||
| import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol"; | ||
|
|
||
| import {BeefyClient} from "../../src/BeefyClient.sol"; | ||
| import {IShell} from "../../src/interfaces/IShell.sol"; | ||
| import {GatewayProxy} from "../../src/GatewayProxy.sol"; | ||
| import {Gateway} from "../../src/Gateway.sol"; | ||
| import {MockGatewayV2} from "../../test/mocks/MockGatewayV2.sol"; | ||
| import {Initializer} from "../../src/Initializer.sol"; | ||
| import {Agent} from "../../src/Agent.sol"; | ||
| import {AgentExecutor} from "../../src/AgentExecutor.sol"; | ||
| import {ChannelID, ParaID, OperatingMode} from "../../src/Types.sol"; | ||
|
|
@@ -25,32 +25,25 @@ contract UpgradeShell is Script { | |
| struct Config { | ||
| address gatewayProxy; | ||
| address beefyClient; | ||
| Initializer.Config initializerParams; | ||
| } | ||
|
|
||
| function readConfig() internal pure returns (Config memory config) { | ||
| config = Config({ | ||
| gatewayProxy: 0x9Ed8b47Bc3417e3BD0507ADC06E56e2Fa360A4E9, | ||
| beefyClient: 0x6DFaD3D73A28c48E4F4c616ECda80885b415283a, | ||
| initializerParams: Initializer.Config({ | ||
| mode: OperatingMode.Normal, | ||
| deliveryCost: 200_000_000_000, // 0.2 Wnd | ||
| registerTokenFee: 0.002 ether, | ||
| assetHubCreateAssetFee: 200_000_000_000, // 0.2 Wnd | ||
| assetHubReserveTransferFee: 200_000_000_000, // 0.2 Wnd | ||
| exchangeRate: ud60x18(2_400_000_000_000_000), | ||
| multiplier: ud60x18(1_330_000_000_000_000_000), | ||
| rescueOperator: 0x302F0B71B8aD3CF6dD90aDb668E49b2168d652fd, | ||
| foreignTokenDecimals: 12, | ||
| maxDestinationFee: 2_000_000_000_000, | ||
| weth: 0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9 | ||
| }) | ||
| }); | ||
| } | ||
|
|
@@ -64,18 +57,15 @@ contract UpgradeShell is Script { | |
| AgentExecutor executor = new AgentExecutor(); | ||
|
|
||
| // Gateway implementation | ||
| Gateway gatewayLogic = new Gateway(config.beefyClient, address(executor)); | ||
|
|
||
| IShell shell = IShell(config.gatewayProxy); | ||
|
|
||
| shell.upgrade( | ||
| address(gatewayLogic), | ||
| address(gatewayLogic).codehash, | ||
| abi.encode(config.initializerParams) | ||
| ); | ||
|
|
||
| vm.stopBroadcast(); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]> | ||
| pragma solidity 0.8.28; | ||
|
|
||
| /// @title An agent contract that acts on behalf of a consensus system on Polkadot | ||
| /// @dev Instances of this contract act as an agents for arbitrary consensus systems on Polkadot. These consensus systems | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make weth first item.
Commit:
e1a8578