diff --git a/forge/script/marketupdates/GovernorProposal.s.sol b/forge/script/marketupdates/GovernorProposal.s.sol index 8b7e405..046305f 100644 --- a/forge/script/marketupdates/GovernorProposal.s.sol +++ b/forge/script/marketupdates/GovernorProposal.s.sol @@ -8,11 +8,10 @@ import "@comet-contracts/IGovernorBravo.sol"; import "@comet-contracts/IComp.sol"; import "@comet-contracts/marketupdates/CometProxyAdminOld.sol"; -import "./helpers/DeployedAddresses.sol"; import "./helpers/GovernanceHelper.sol"; import "./helpers/MarketUpdateAddresses.sol"; -contract GovernorProposal is Script, DeployedAddresses { +contract GovernorProposal is Script { function run() external { string memory chainName = vm.envString("CHAIN_NAME"); // Access the env variable diff --git a/forge/script/marketupdates/helpers/DeployedAddresses.sol b/forge/script/marketupdates/helpers/DeployedAddresses.sol deleted file mode 100644 index 1fd1c58..0000000 --- a/forge/script/marketupdates/helpers/DeployedAddresses.sol +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity ^0.8.15; - -contract DeployedAddresses { - address public constant computedMarketUpdateTimelockAddress = 0xd528bbD6912d08FAA3AaA41c3Ead5A23Db675c43; - address public constant computedMarketUpdateProposerAddress = 0xE97FBDfDDC9b13AB7339b7E7099ee96405dA880c; - address public constant computedConfiguratorAddress = 0x4618B5c7460911FB419FD6dF4ed274Ed64Ef5b12; - address public constant computedCometProxyAdminAddress = 0x0754f2f56281f77eD3Fb01E95031ab0Ce575CD48; - address public constant computedMarketAdminPermissionCheckerAddress = 0x6f886e3fD5eFd68Af38Cef0a3D4BC267d550D0d4; -} diff --git a/foundry.toml b/foundry.toml index 8ab7344..74a0efe 100644 --- a/foundry.toml +++ b/foundry.toml @@ -8,9 +8,7 @@ cache_path = 'forge/cache' # disable for CI (used for debugging liquidity issues) no_match_test = "test.*SwapVia" -evm_version = "shanghai" - -fs_permissions = [{ access = "read-write", path = "./forge/script/helperContracts/DeployedAddresses.sol" }] +evm_version = "london" remappings = [ "@forge-std/=forge/lib/forge-std/",