diff --git a/script/deploy/mainnet/014_xOGNGovernanceScript.sol b/script/deploy/mainnet/014_xOGNGovernanceScript.sol index ccd6000b..263260dc 100644 --- a/script/deploy/mainnet/014_xOGNGovernanceScript.sol +++ b/script/deploy/mainnet/014_xOGNGovernanceScript.sol @@ -12,8 +12,8 @@ import {Governance} from "contracts/Governance.sol"; import {GovFive} from "contracts/utils/GovFive.sol"; -import "OpenZeppelin/openzeppelin-contracts@4.6.0/contracts/token/ERC20/extensions/ERC20Votes.sol"; -import "OpenZeppelin/openzeppelin-contracts@4.6.0/contracts/governance/TimelockController.sol"; +import {ERC20Votes} from "OpenZeppelin/openzeppelin-contracts@4.6.0/contracts/token/ERC20/extensions/ERC20Votes.sol"; +import {TimelockController} from "OpenZeppelin/openzeppelin-contracts@4.6.0/contracts/governance/TimelockController.sol"; contract XOGNGovernanceScript is BaseMainnetScript { using GovFive for GovFive.GovFiveProposal; @@ -43,9 +43,6 @@ contract XOGNGovernanceScript is BaseMainnetScript { address xognGov = deployedContracts["XOGN_GOV"]; - address ognRewardsSourceProxy = deployedContracts["OGN_REWARDS_SOURCE"]; - address veOgvImpl = deployedContracts["VEOGV_IMPL"]; - govProposal.setName("Grant access to OGN Governance"); govProposal.setDescription("Grant access to OGN Governance"); diff --git a/tests/staking/ZapperForkTest.t.sol b/tests/staking/ZapperForkTest.t.sol index 263b984d..c2881be2 100644 --- a/tests/staking/ZapperForkTest.t.sol +++ b/tests/staking/ZapperForkTest.t.sol @@ -26,7 +26,7 @@ contract ZapperForkTest is Test { IMintableERC20 public ogv; IMintableERC20 public ogn; - address public ogvWhale = 0x24dD9AEAf497c11eE3A0ac2E6E6e014e12799c4E; + address public ogvWhale = 0x12D7EF3C933D091210cD931224Ead45D9cFdDdE0; constructor() { deployManager = new DeployManager();