mirror of
https://github.com/Instadapp/dsa-governance.git
synced 2024-07-29 22:27:52 +00:00
Merge branch 'IGP-11' into IGP-12
This commit is contained in:
Thrilok kumar
commit
04669cacb3
|
|
@ -63,7 +63,9 @@ interface ITimelock {
|
|||
|
||||
interface IInstaIndex {
|
||||
function changeMaster(address _newMaster) external;
|
||||
|
||||
function updateMaster() external;
|
||||
|
||||
function master() external view returns (address);
|
||||
}
|
||||
|
||||
|
|
@ -127,12 +129,16 @@ interface IFluidLiquidityAdmin {
|
|||
/// auths can be helpful in reducing governance overhead where it's not needed.
|
||||
/// @param authsStatus_ array of structs setting allowed status for an address.
|
||||
/// status true => add auth, false => remove auth
|
||||
function updateAuths(AdminModuleStructs.AddressBool[] calldata authsStatus_) external;
|
||||
function updateAuths(
|
||||
AdminModuleStructs.AddressBool[] calldata authsStatus_
|
||||
) external;
|
||||
|
||||
/// @notice adds/removes guardians. Only callable by Governance.
|
||||
/// @param guardiansStatus_ array of structs setting allowed status for an address.
|
||||
/// status true => add guardian, false => remove guardian
|
||||
function updateGuardians(AdminModuleStructs.AddressBool[] calldata guardiansStatus_) external;
|
||||
function updateGuardians(
|
||||
AdminModuleStructs.AddressBool[] calldata guardiansStatus_
|
||||
) external;
|
||||
|
||||
/// @notice changes the revenue collector address (contract that is sent revenue). Only callable by Governance.
|
||||
/// @param revenueCollector_ new revenue collector address
|
||||
|
|
@ -145,45 +151,65 @@ interface IFluidLiquidityAdmin {
|
|||
|
||||
/// @notice update tokens rate data version 1. Only callable by Auths.
|
||||
/// @param tokensRateData_ array of RateDataV1Params with rate data to set for each token
|
||||
function updateRateDataV1s(AdminModuleStructs.RateDataV1Params[] calldata tokensRateData_) external;
|
||||
function updateRateDataV1s(
|
||||
AdminModuleStructs.RateDataV1Params[] calldata tokensRateData_
|
||||
) external;
|
||||
|
||||
/// @notice update tokens rate data version 2. Only callable by Auths.
|
||||
/// @param tokensRateData_ array of RateDataV2Params with rate data to set for each token
|
||||
function updateRateDataV2s(AdminModuleStructs.RateDataV2Params[] calldata tokensRateData_) external;
|
||||
function updateRateDataV2s(
|
||||
AdminModuleStructs.RateDataV2Params[] calldata tokensRateData_
|
||||
) external;
|
||||
|
||||
/// @notice updates token configs: fee charge on borrowers interest & storage update utilization threshold.
|
||||
/// Only callable by Auths.
|
||||
/// @param tokenConfigs_ contains token address, fee & utilization threshold
|
||||
function updateTokenConfigs(AdminModuleStructs.TokenConfig[] calldata tokenConfigs_) external;
|
||||
function updateTokenConfigs(
|
||||
AdminModuleStructs.TokenConfig[] calldata tokenConfigs_
|
||||
) external;
|
||||
|
||||
/// @notice updates user classes: 0 is for new protocols, 1 is for established protocols.
|
||||
/// Only callable by Auths.
|
||||
/// @param userClasses_ struct array of uint256 value to assign for each user address
|
||||
function updateUserClasses(AdminModuleStructs.AddressUint256[] calldata userClasses_) external;
|
||||
function updateUserClasses(
|
||||
AdminModuleStructs.AddressUint256[] calldata userClasses_
|
||||
) external;
|
||||
|
||||
/// @notice sets user supply configs per token basis. Eg: with interest or interest-free and automated limits.
|
||||
/// Only callable by Auths.
|
||||
/// @param userSupplyConfigs_ struct array containing user supply config, see `UserSupplyConfig` struct for more info
|
||||
function updateUserSupplyConfigs(AdminModuleStructs.UserSupplyConfig[] memory userSupplyConfigs_) external;
|
||||
function updateUserSupplyConfigs(
|
||||
AdminModuleStructs.UserSupplyConfig[] memory userSupplyConfigs_
|
||||
) external;
|
||||
|
||||
/// @notice setting user borrow configs per token basis. Eg: with interest or interest-free and automated limits.
|
||||
/// Only callable by Auths.
|
||||
/// @param userBorrowConfigs_ struct array containing user borrow config, see `UserBorrowConfig` struct for more info
|
||||
function updateUserBorrowConfigs(AdminModuleStructs.UserBorrowConfig[] memory userBorrowConfigs_) external;
|
||||
function updateUserBorrowConfigs(
|
||||
AdminModuleStructs.UserBorrowConfig[] memory userBorrowConfigs_
|
||||
) external;
|
||||
|
||||
/// @notice pause operations for a particular user in class 0 (class 1 users can't be paused by guardians).
|
||||
/// Only callable by Guardians.
|
||||
/// @param user_ address of user to pause operations for
|
||||
/// @param supplyTokens_ token addresses to pause withdrawals for
|
||||
/// @param borrowTokens_ token addresses to pause borrowings for
|
||||
function pauseUser(address user_, address[] calldata supplyTokens_, address[] calldata borrowTokens_) external;
|
||||
function pauseUser(
|
||||
address user_,
|
||||
address[] calldata supplyTokens_,
|
||||
address[] calldata borrowTokens_
|
||||
) external;
|
||||
|
||||
/// @notice unpause operations for a particular user in class 0 (class 1 users can't be paused by guardians).
|
||||
/// Only callable by Guardians.
|
||||
/// @param user_ address of user to unpause operations for
|
||||
/// @param supplyTokens_ token addresses to unpause withdrawals for
|
||||
/// @param borrowTokens_ token addresses to unpause borrowings for
|
||||
function unpauseUser(address user_, address[] calldata supplyTokens_, address[] calldata borrowTokens_) external;
|
||||
function unpauseUser(
|
||||
address user_,
|
||||
address[] calldata supplyTokens_,
|
||||
address[] calldata borrowTokens_
|
||||
) external;
|
||||
|
||||
/// @notice collects revenue for tokens to configured revenueCollector address.
|
||||
/// @param tokens_ array of tokens to collect revenue for
|
||||
|
|
@ -196,21 +222,25 @@ interface IFluidLiquidityAdmin {
|
|||
/// @return borrowExchangePrices_ new borrow rates of overall system for each token
|
||||
function updateExchangePrices(
|
||||
address[] calldata tokens_
|
||||
) external returns (uint256[] memory supplyExchangePrices_, uint256[] memory borrowExchangePrices_);
|
||||
)
|
||||
external
|
||||
returns (
|
||||
uint256[] memory supplyExchangePrices_,
|
||||
uint256[] memory borrowExchangePrices_
|
||||
);
|
||||
}
|
||||
|
||||
interface IFluidVaultT1Factory {
|
||||
function deployVault(address vaultDeploymentLogic_, bytes calldata vaultDeploymentData_) external returns (address vault_);
|
||||
function deployVault(
|
||||
address vaultDeploymentLogic_,
|
||||
bytes calldata vaultDeploymentData_
|
||||
) external returns (address vault_);
|
||||
}
|
||||
|
||||
interface IFluidVaultT1DeploymentLogic {
|
||||
function vaultT1(
|
||||
address supplyToken_,
|
||||
address borrowToken_
|
||||
) external;
|
||||
function vaultT1(address supplyToken_, address borrowToken_) external;
|
||||
}
|
||||
|
||||
|
||||
interface IFluidVaultT1 {
|
||||
/// @notice updates the Vault oracle to `newOracle_`. Must implement the FluidOracle interface.
|
||||
function updateOracle(address newOracle_) external;
|
||||
|
|
@ -232,39 +262,55 @@ interface IFluidVaultT1 {
|
|||
function updateRebalancer(address newRebalancer_) external;
|
||||
|
||||
/// @notice updates the supply rate magnifier to `supplyRateMagnifier_`. Input in 1e2 (1% = 100, 100% = 10_000).
|
||||
function updateSupplyRateMagnifier(uint supplyRateMagnifier_) public
|
||||
function updateSupplyRateMagnifier(uint supplyRateMagnifier_) external;
|
||||
}
|
||||
|
||||
contract PayloadIGP11 {
|
||||
uint256 public constant PROPOSAL_ID = 11;
|
||||
|
||||
address public constant PROPOSER =
|
||||
address public constant PROPOSER_1 =
|
||||
0xA45f7bD6A5Ff45D31aaCE6bCD3d426D9328cea01;
|
||||
|
||||
address public constant PROPOSER_2 =
|
||||
0x059A94A72951c0ae1cc1CE3BF0dB52421bbE8210;
|
||||
|
||||
IGovernorBravo public constant GOVERNOR =
|
||||
IGovernorBravo(0x0204Cd037B2ec03605CFdFe482D8e257C765fA1B);
|
||||
ITimelock public constant TIMELOCK =
|
||||
ITimelock(0x2386DC45AdDed673317eF068992F19421B481F4c);
|
||||
|
||||
address public constant TEAM_MULTISIG =
|
||||
address public constant TEAM_MULTISIG =
|
||||
0x4F6F977aCDD1177DCD81aB83074855EcB9C2D49e;
|
||||
|
||||
address public immutable ADDRESS_THIS;
|
||||
|
||||
IFluidLiquidityAdmin public constant LIQUIDITY = IFluidLiquidityAdmin(0x52Aa899454998Be5b000Ad077a46Bbe360F4e497);
|
||||
IFluidVaultT1Factory public constant VAULT_T1_FACTORY = IFluidVaultT1Factory(0x324c5Dc1fC42c7a4D43d92df1eBA58a54d13Bf2d);
|
||||
IFluidVaultT1DeploymentLogic public constant VAULT_T1_DEPLOYMENT_LOGIC = IFluidVaultT1DeploymentLogic(0x15f6F562Ae136240AB9F4905cb50aCA54bCbEb5F);
|
||||
|
||||
address public constant ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
|
||||
address public constant weETH_ADDRESS = 0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee;
|
||||
address public constant wstETH_ADDRESS = 0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0;
|
||||
IFluidLiquidityAdmin public constant LIQUIDITY =
|
||||
IFluidLiquidityAdmin(0x52Aa899454998Be5b000Ad077a46Bbe360F4e497);
|
||||
IFluidVaultT1Factory public constant VAULT_T1_FACTORY =
|
||||
IFluidVaultT1Factory(0x324c5Dc1fC42c7a4D43d92df1eBA58a54d13Bf2d);
|
||||
IFluidVaultT1DeploymentLogic public constant VAULT_T1_DEPLOYMENT_LOGIC =
|
||||
IFluidVaultT1DeploymentLogic(
|
||||
0x15f6F562Ae136240AB9F4905cb50aCA54bCbEb5F
|
||||
);
|
||||
|
||||
address public constant ETH_ADDRESS =
|
||||
0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
|
||||
address public constant weETH_ADDRESS =
|
||||
0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee;
|
||||
address public constant wstETH_ADDRESS =
|
||||
0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0;
|
||||
|
||||
constructor() {
|
||||
ADDRESS_THIS = address(this);
|
||||
}
|
||||
|
||||
function propose(string memory description) external {
|
||||
require(msg.sender == PROPOSER || msg.sender == TEAM_MULTISIG, "msg.sender-not-proposer-or-multisig");
|
||||
require(
|
||||
msg.sender == PROPOSER_1 ||
|
||||
msg.sender == PROPOSER_2 ||
|
||||
msg.sender == TEAM_MULTISIG,
|
||||
"msg.sender-not-allowed"
|
||||
);
|
||||
|
||||
uint256 totalActions = 1;
|
||||
address[] memory targets = new address[](totalActions);
|
||||
|
|
@ -316,8 +362,8 @@ contract PayloadIGP11 {
|
|||
// Action 8: Update rebalancer on weETH/wstETH vault.
|
||||
action8(vault_);
|
||||
|
||||
// Action 9: Update supply magnifier on wstETH/ETH, wstETH/USDC & wstETH/USDT vault
|
||||
action9(vault_);
|
||||
// Action 9: Update supply magnifier on wstETH/ETH, wstETH/USDC & wstETH/USDT vault
|
||||
action9();
|
||||
|
||||
// Action 10: Update market rates for wstETH on Liquidity.
|
||||
action10();
|
||||
|
|
@ -334,9 +380,10 @@ contract PayloadIGP11 {
|
|||
|
||||
/// @notice Action 1: Set market rates for weETH on Liquidity.
|
||||
function action1() internal {
|
||||
AdminModuleStructs.RateDataV2Params[] memory params_ = new AdminModuleStructs.RateDataV2Params[](1);
|
||||
AdminModuleStructs.RateDataV2Params[]
|
||||
memory params_ = new AdminModuleStructs.RateDataV2Params[](1);
|
||||
|
||||
params_[0] = AdminModuleStructs.RateDataV2Params({
|
||||
params_[0] = AdminModuleStructs.RateDataV2Params({
|
||||
token: weETH_ADDRESS, // weETH
|
||||
kink1: 50 * 1e2, // 50%
|
||||
kink2: 80 * 1e2, // 80%
|
||||
|
|
@ -344,26 +391,27 @@ contract PayloadIGP11 {
|
|||
rateAtUtilizationKink1: 20 * 1e2, // 20%
|
||||
rateAtUtilizationKink2: 40 * 1e2, // 40%
|
||||
rateAtUtilizationMax: 100 * 1e2 // 100%
|
||||
});
|
||||
});
|
||||
|
||||
LIQUIDITY.updateRateDataV2s(params_);
|
||||
LIQUIDITY.updateRateDataV2s(params_);
|
||||
}
|
||||
|
||||
/// @notice Action 2: Set token config for weETH on Liquidity.
|
||||
function action2() internal {
|
||||
AdminModuleStructs.TokenConfig[] memory params_ = new AdminModuleStructs.TokenConfig[](1);
|
||||
AdminModuleStructs.TokenConfig[]
|
||||
memory params_ = new AdminModuleStructs.TokenConfig[](1);
|
||||
|
||||
params_[0] = AdminModuleStructs.TokenConfig({
|
||||
params_[0] = AdminModuleStructs.TokenConfig({
|
||||
token: weETH_ADDRESS, // weETH
|
||||
threshold: 0.3 * 1e2, // 0.3
|
||||
fee: 10 * 1e2 // 10%
|
||||
});
|
||||
});
|
||||
|
||||
LIQUIDITY.updateTokenConfigs(params_);
|
||||
LIQUIDITY.updateTokenConfigs(params_);
|
||||
}
|
||||
|
||||
/// @notice Action 3: Deploy weETH/wstETH vault.
|
||||
function action3() internal returns (address vault_){
|
||||
function action3() internal returns (address vault_) {
|
||||
vault_ = VAULT_T1_FACTORY.deployVault(
|
||||
address(VAULT_T1_DEPLOYMENT_LOGIC),
|
||||
abi.encodeWithSelector(
|
||||
|
|
@ -376,8 +424,9 @@ contract PayloadIGP11 {
|
|||
|
||||
/// @notice Action 4: Set user supply config for the vault on Liquidity Layer.
|
||||
function action4(address vault_) internal {
|
||||
AdminModuleStructs.UserSupplyConfig[] memory configs_ = new AdminModuleStructs.UserSupplyConfig[](1);
|
||||
|
||||
AdminModuleStructs.UserSupplyConfig[]
|
||||
memory configs_ = new AdminModuleStructs.UserSupplyConfig[](1);
|
||||
|
||||
configs_[0] = AdminModuleStructs.UserSupplyConfig({
|
||||
user: address(vault_),
|
||||
token: weETH_ADDRESS,
|
||||
|
|
@ -392,8 +441,9 @@ contract PayloadIGP11 {
|
|||
|
||||
/// @notice Action 5: Set user borrow config for the vault on Liquidity Layer.
|
||||
function action5(address vault_) internal {
|
||||
AdminModuleStructs.UserBorrowConfig[] memory configs_ = new AdminModuleStructs.UserBorrowConfig[](1);
|
||||
|
||||
AdminModuleStructs.UserBorrowConfig[]
|
||||
memory configs_ = new AdminModuleStructs.UserBorrowConfig[](1);
|
||||
|
||||
configs_[0] = AdminModuleStructs.UserBorrowConfig({
|
||||
user: address(vault_),
|
||||
token: wstETH_ADDRESS,
|
||||
|
|
@ -410,45 +460,50 @@ contract PayloadIGP11 {
|
|||
/// @notice Action 6: Update core settings on weETH/wstETH vault.
|
||||
function action6(address vault_) internal {
|
||||
IFluidVaultT1(vault_).updateCoreSettings(
|
||||
100 * 1e2, // 1x supplyRateMagnifier
|
||||
100 * 1e2, // 1x borrowRateMagnifier
|
||||
100 * 1e2, // 1x supplyRateMagnifier
|
||||
100 * 1e2, // 1x borrowRateMagnifier
|
||||
90.5 * 1e2, // 90.5% collateralFactor
|
||||
93 * 1e2, // 93% liquidationThreshold
|
||||
95 * 1e2, // 95% liquidationMaxLimit
|
||||
5 * 1e2, // 5% withdrawGap
|
||||
1 * 1e2, // 2% liquidationPenalty
|
||||
0 // 0% borrowFee
|
||||
93 * 1e2, // 93% liquidationThreshold
|
||||
95 * 1e2, // 95% liquidationMaxLimit
|
||||
5 * 1e2, // 5% withdrawGap
|
||||
1 * 1e2, // 1% liquidationPenalty
|
||||
0 // 0% borrowFee
|
||||
);
|
||||
}
|
||||
|
||||
/// @notice Action 7: Update oracle on weETH/wstETH vault.
|
||||
function action7(address vault_) internal {
|
||||
IFluidVaultT1(vault_).updateOracle(0x9eC721a12b6005aF8c6E8CFa9c86B5f12ff473E4);
|
||||
IFluidVaultT1(vault_).updateOracle(
|
||||
0x9eC721a12b6005aF8c6E8CFa9c86B5f12ff473E4
|
||||
);
|
||||
}
|
||||
|
||||
/// @notice Action 8: Update rebalancer on weETH/wstETH vault.
|
||||
function action8(address vault_) internal {
|
||||
IFluidVaultT1(vault_).updateRebalancer(0x264786EF916af64a1DB19F513F24a3681734ce92);
|
||||
IFluidVaultT1(vault_).updateRebalancer(
|
||||
0x264786EF916af64a1DB19F513F24a3681734ce92
|
||||
);
|
||||
}
|
||||
|
||||
/// @notice Action 9: UpdateSupplyMagnifier on wstETH/ETH, wstETH/USDC & wstETH/USDT vault
|
||||
/// @notice Action 9: UpdateSupplyMagnifier on wstETH/ETH, wstETH/USDC & wstETH/USDT vault
|
||||
function action9() internal {
|
||||
address[] memory wstETHVaults_ = [
|
||||
0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91, // wstETH/ETH
|
||||
0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE, // wstETH/USDC
|
||||
0x1c2bB46f36561bc4F05A94BD50916496aa501078, // wstETH/USDT
|
||||
]
|
||||
|
||||
for (uint256 i = 0; i < wstETHVaults_; i++) {
|
||||
IFluidVaultT1(wstETHVaults_[i]).updateSupplyRateMagnifier(1 * 1e4); // 1x
|
||||
}
|
||||
// wstETH/ETH
|
||||
IFluidVaultT1(0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91)
|
||||
.updateSupplyRateMagnifier(1 * 1e4); // 1x
|
||||
// wstETH/USDC
|
||||
IFluidVaultT1(0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE)
|
||||
.updateSupplyRateMagnifier(1 * 1e4); // 1x
|
||||
// wstETH/USDT
|
||||
IFluidVaultT1(0x1c2bB46f36561bc4F05A94BD50916496aa501078)
|
||||
.updateSupplyRateMagnifier(1 * 1e4); // 1x
|
||||
}
|
||||
|
||||
/// @notice Action 10: Update market rates for wstETH on Liquidity.
|
||||
function action10() internal {
|
||||
AdminModuleStructs.RateDataV2Params[] memory params_ = new AdminModuleStructs.RateDataV2Params[](1);
|
||||
AdminModuleStructs.RateDataV2Params[]
|
||||
memory params_ = new AdminModuleStructs.RateDataV2Params[](1);
|
||||
|
||||
params_[0] = AdminModuleStructs.RateDataV2Params({
|
||||
params_[0] = AdminModuleStructs.RateDataV2Params({
|
||||
token: wstETH_ADDRESS, // wstETH
|
||||
kink1: 50 * 1e2, // 50%
|
||||
kink2: 80 * 1e2, // 80%
|
||||
|
|
@ -456,21 +511,22 @@ contract PayloadIGP11 {
|
|||
rateAtUtilizationKink1: 15 * 1e2, // 15%
|
||||
rateAtUtilizationKink2: 30 * 1e2, // 30%
|
||||
rateAtUtilizationMax: 150 * 1e2 // 150%
|
||||
});
|
||||
});
|
||||
|
||||
LIQUIDITY.updateRateDataV2s(params_);
|
||||
LIQUIDITY.updateRateDataV2s(params_);
|
||||
}
|
||||
|
||||
/// @notice Action 11: Update token config for wstETH on Liquidity.
|
||||
function action11() internal {
|
||||
AdminModuleStructs.TokenConfig[] memory params_ = new AdminModuleStructs.TokenConfig[](1);
|
||||
AdminModuleStructs.TokenConfig[]
|
||||
memory params_ = new AdminModuleStructs.TokenConfig[](1);
|
||||
|
||||
params_[0] = AdminModuleStructs.TokenConfig({
|
||||
token: wstETH_ADDRESS, // wstETH
|
||||
threshold: 0.3 * 1e2, // 0.3
|
||||
fee: 70 * 1e2 // 70%
|
||||
token: wstETH_ADDRESS, // wstETH
|
||||
threshold: 0.3 * 1e2, // 0.3
|
||||
fee: 70 * 1e2 // 70%
|
||||
});
|
||||
|
||||
LIQUIDITY.updateTokenConfigs(params_);
|
||||
LIQUIDITY.updateTokenConfigs(params_);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1
deployments/mainnet_1/PayloadIGP11.json
Normal file
1
deployments/mainnet_1/PayloadIGP11.json
Normal file
File diff suppressed because one or more lines are too long
22
scripts/deployIGP11.js
Normal file
22
scripts/deployIGP11.js
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
const hre = require("hardhat");
|
||||
const { ethers } = hre;
|
||||
|
||||
async function main() {
|
||||
const PayloadIGP11 = await ethers.getContractFactory("PayloadIGP11")
|
||||
const payloadIGP11 = await PayloadIGP11.deploy()
|
||||
await payloadIGP11.deployed()
|
||||
|
||||
console.log("PayloadIGP11: ", payloadIGP11.address)
|
||||
|
||||
await hre.run("verify:verify", {
|
||||
address: payloadIGP11.address,
|
||||
constructorArguments: []
|
||||
})
|
||||
}
|
||||
|
||||
main()
|
||||
.then(() => process.exit(0))
|
||||
.catch(error => {
|
||||
console.error(error);
|
||||
process.exit(1);
|
||||
});
|
||||
Loading…
Reference in New Issue
Block a user