From a0c9d5d412a33b732f8ddad5e94baed6a4d5626d Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Sat, 15 Jun 2024 00:16:13 -0400 Subject: [PATCH 1/7] IGP27 --- contracts/payloads/IGP27/PayloadIGP27.sol | 502 ++++++++++++++++++++++ 1 file changed, 502 insertions(+) create mode 100644 contracts/payloads/IGP27/PayloadIGP27.sol diff --git a/contracts/payloads/IGP27/PayloadIGP27.sol b/contracts/payloads/IGP27/PayloadIGP27.sol new file mode 100644 index 0000000..aef9b8e --- /dev/null +++ b/contracts/payloads/IGP27/PayloadIGP27.sol @@ -0,0 +1,502 @@ +pragma solidity ^0.7.0; +pragma experimental ABIEncoderV2; + +interface IGovernorBravo { + function _acceptAdmin() external; + + function _setVotingDelay(uint newVotingDelay) external; + + function _setVotingPeriod(uint newVotingPeriod) external; + + function _acceptAdminOnTimelock() external; + + function _setImplementation(address implementation_) external; + + function propose( + address[] memory targets, + uint[] memory values, + string[] memory signatures, + bytes[] memory calldatas, + string memory description + ) external returns (uint); + + function admin() external view returns (address); + + function pendingAdmin() external view returns (address); + + function timelock() external view returns (address); + + function votingDelay() external view returns (uint256); + + function votingPeriod() external view returns (uint256); +} + +interface ITimelock { + function acceptAdmin() external; + + function setDelay(uint delay_) external; + + function setPendingAdmin(address pendingAdmin_) external; + + function queueTransaction( + address target, + uint value, + string memory signature, + bytes memory data, + uint eta + ) external returns (bytes32); + + function executeTransaction( + address target, + uint value, + string memory signature, + bytes memory data, + uint eta + ) external payable returns (bytes memory); + + function pendingAdmin() external view returns (address); + + function admin() external view returns (address); + + function delay() external view returns (uint256); +} + +interface AdminModuleStructs { + struct AddressBool { + address addr; + bool value; + } + + struct AddressUint256 { + address addr; + uint256 value; + } + + struct RateDataV1Params { + address token; + uint256 kink; + uint256 rateAtUtilizationZero; + uint256 rateAtUtilizationKink; + uint256 rateAtUtilizationMax; + } + + struct RateDataV2Params { + address token; + uint256 kink1; + uint256 kink2; + uint256 rateAtUtilizationZero; + uint256 rateAtUtilizationKink1; + uint256 rateAtUtilizationKink2; + uint256 rateAtUtilizationMax; + } + + struct TokenConfig { + address token; + uint256 fee; + uint256 threshold; + uint256 maxUtilization; + } + + struct UserSupplyConfig { + address user; + address token; + uint8 mode; + uint256 expandPercent; + uint256 expandDuration; + uint256 baseWithdrawalLimit; + } + + struct UserBorrowConfig { + address user; + address token; + uint8 mode; + uint256 expandPercent; + uint256 expandDuration; + uint256 baseDebtCeiling; + uint256 maxDebtCeiling; + } +} + +interface IProxy { + function setAdmin(address newAdmin_) external; + + function setDummyImplementation(address newDummyImplementation_) external; + + function addImplementation( + address implementation_, + bytes4[] calldata sigs_ + ) external; + + function removeImplementation(address implementation_) external; + + function getAdmin() external view returns (address); + + function getDummyImplementation() external view returns (address); + + function getImplementationSigs( + address impl_ + ) external view returns (bytes4[] memory); + + function getSigsImplementation(bytes4 sig_) external view returns (address); + + function readFromStorage( + bytes32 slot_ + ) external view returns (uint256 result_); +} + +interface IFluidLiquidityAdmin { + /// @notice adds/removes auths. Auths generally could be contracts which can have restricted actions defined on contract. + /// 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; + + /// @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; + + /// @notice changes the revenue collector address (contract that is sent revenue). Only callable by Governance. + /// @param revenueCollector_ new revenue collector address + function updateRevenueCollector(address revenueCollector_) external; + + /// @notice changes current status, e.g. for pausing or unpausing all user operations. Only callable by Auths. + /// @param newStatus_ new status + /// status = 2 -> pause, status = 1 -> resume. + function changeStatus(uint256 newStatus_) external; + + /// @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; + + /// @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; + + /// @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; + + /// @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; + + /// @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; + + /// @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; + + /// @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; + + /// @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; + + /// @notice collects revenue for tokens to configured revenueCollector address. + /// @param tokens_ array of tokens to collect revenue for + /// @dev Note that this can revert if token balance is < revenueAmount (utilization > 100%) + function collectRevenue(address[] calldata tokens_) external; + + /// @notice gets the current updated exchange prices for n tokens and updates all prices, rates related data in storage. + /// @param tokens_ tokens to update exchange prices for + /// @return supplyExchangePrices_ new supply rates of overall system for each token + /// @return borrowExchangePrices_ new borrow rates of overall system for each token + function updateExchangePrices( + address[] calldata tokens_ + ) + external + returns ( + uint256[] memory supplyExchangePrices_, + uint256[] memory borrowExchangePrices_ + ); +} + +interface IFluidVaultT1Factory { + /// @notice Deploys a new vault using the specified deployment logic `vaultDeploymentLogic_` and data `vaultDeploymentData_`. + /// Only accounts with deployer access or the owner can deploy a new vault. + /// @param vaultDeploymentLogic_ The address of the vault deployment logic contract. + /// @param vaultDeploymentData_ The data to be used for vault deployment. + /// @return vault_ Returns the address of the newly deployed vault. + function deployVault( + address vaultDeploymentLogic_, + bytes calldata vaultDeploymentData_ + ) external returns (address vault_); + + /// @notice Sets an address as allowed vault deployment logic (`deploymentLogic_`) contract or not. + /// This function can only be called by the owner. + /// @param deploymentLogic_ The address of the vault deployment logic contract to be set. + /// @param allowed_ A boolean indicating whether the specified address is allowed to deploy new type of vault. + function setVaultDeploymentLogic( + address deploymentLogic_, + bool allowed_ + ) external; +} + + +interface IFluidVaultT1 { + /// @notice updates the Vault oracle to `newOracle_`. Must implement the FluidOracle interface. + function updateOracle(address newOracle_) external; + + /// @notice updates the all Vault core settings according to input params. + /// All input values are expected in 1e2 (1% = 100, 100% = 10_000). + function updateCoreSettings( + uint256 supplyRateMagnifier_, + uint256 borrowRateMagnifier_, + uint256 collateralFactor_, + uint256 liquidationThreshold_, + uint256 liquidationMaxLimit_, + uint256 withdrawGap_, + uint256 liquidationPenalty_, + uint256 borrowFee_ + ) external; + + /// @notice updates the allowed rebalancer to `newRebalancer_`. + 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_) external; + + /// @notice updates the collateral factor to `collateralFactor_`. Input in 1e2 (1% = 100, 100% = 10_000). + function updateCollateralFactor(uint collateralFactor_) external; +} + +interface IFTokenAdmin { + /// @notice updates the rewards rate model contract. + /// Only callable by LendingFactory auths. + /// @param rewardsRateModel_ the new rewards rate model contract address. + /// can be set to address(0) to set no rewards (to save gas) + function updateRewards(address rewardsRateModel_) external; + + /// @notice Balances out the difference between fToken supply at Liquidity vs totalAssets(). + /// Deposits underlying from rebalancer address into Liquidity but doesn't mint any shares + /// -> thus making deposit available as rewards. + /// Only callable by rebalancer. + /// @return assets_ amount deposited to Liquidity + function rebalance() external payable returns (uint256 assets_); + + /// @notice gets the liquidity exchange price of the underlying asset, calculates the updated exchange price (with reward rates) + /// and writes those values to storage. + /// Callable by anyone. + /// @return tokenExchangePrice_ exchange price of fToken share to underlying asset + /// @return liquidityExchangePrice_ exchange price at Liquidity for the underlying asset + function updateRates() + external + returns (uint256 tokenExchangePrice_, uint256 liquidityExchangePrice_); + + /// @notice sends any potentially stuck funds to Liquidity contract. Only callable by LendingFactory auths. + function rescueFunds(address token_) external; + + /// @notice Updates the rebalancer address (ReserveContract). Only callable by LendingFactory auths. + function updateRebalancer(address rebalancer_) external; +} + +contract PayloadIGP27 { + uint256 public constant PROPOSAL_ID = 27; + + address public constant PROPOSER = + 0xA45f7bD6A5Ff45D31aaCE6bCD3d426D9328cea01; + + address public constant PROPOSER_AVO_MULTISIG = + 0x059A94A72951c0ae1cc1CE3BF0dB52421bbE8210; + + address public constant PROPOSER_AVO_MULTISIG_2 = + 0x9efdE135CA4832AbF0408c44c6f5f370eB0f35e8; + + IGovernorBravo public constant GOVERNOR = + IGovernorBravo(0x0204Cd037B2ec03605CFdFe482D8e257C765fA1B); + ITimelock public immutable TIMELOCK = + ITimelock(0x2386DC45AdDed673317eF068992F19421B481F4c); + + address public immutable ADDRESS_THIS; + + address public constant TEAM_MULTISIG = + 0x4F6F977aCDD1177DCD81aB83074855EcB9C2D49e; + + IFluidLiquidityAdmin public constant LIQUIDITY = + IFluidLiquidityAdmin(0x52Aa899454998Be5b000Ad077a46Bbe360F4e497); + IFluidVaultT1Factory public constant VAULT_T1_FACTORY = + IFluidVaultT1Factory(0x324c5Dc1fC42c7a4D43d92df1eBA58a54d13Bf2d); + + address public constant F_USDT = 0x5C20B550819128074FD538Edf79791733ccEdd18; + address public constant F_USDC = 0x9Fb7b4477576Fe5B32be4C1843aFB1e55F251B33; + + address public constant ETH_ADDRESS = + 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; + address public constant wstETH_ADDRESS = + 0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0; + address public constant weETH_ADDRESS = + 0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee; + + address public constant sUSDe_ADDRESS = + 0x9D39A5DE30e57443BfF2A8307A4256c8797A3497; + address public constant USDC_ADDRESS = + 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48; + address public constant USDT_ADDRESS = + 0xdAC17F958D2ee523a2206206994597C13D831ec7; + + constructor() { + ADDRESS_THIS = address(this); + } + + function propose(string memory description) external { + require( + msg.sender == PROPOSER || + msg.sender == TEAM_MULTISIG || + address(this) == PROPOSER_AVO_MULTISIG || + address(this) == PROPOSER_AVO_MULTISIG_2, + "msg.sender-not-allowed" + ); + + uint256 totalActions = 1; + address[] memory targets = new address[](totalActions); + uint256[] memory values = new uint256[](totalActions); + string[] memory signatures = new string[](totalActions); + bytes[] memory calldatas = new bytes[](totalActions); + + // Action 1: call executePayload on timelock contract to execute payload related to Fluid + targets[0] = address(TIMELOCK); + values[0] = 0; + signatures[0] = "executePayload(address,string,bytes)"; + calldatas[0] = abi.encode(ADDRESS_THIS, "execute()", abi.encode()); + + uint256 proposedId = GOVERNOR.propose( + targets, + values, + signatures, + calldatas, + description + ); + + require(proposedId == PROPOSAL_ID, "PROPOSAL_IS_NOT_SAME"); + } + + function execute() external { + require(address(this) == address(TIMELOCK), "not-valid-caller"); + + // Action 1: Update rewards for fUSDC & fUSDT. + action1(); + + // Action 2: Update USDC, USDT & wstETH market rate curve. + action2(); + + // Action 3: Set max utilization to 85% for wstETH & Update Reserve fee to 10%. + action3(); + } + + function verifyProposal() external view {} + + /***********************************| + | Proposal Payload Actions | + |__________________________________*/ + + /// @notice Action 1: Update rewards for fUSDC & fUSDT. + function action1() internal { + IFTokenAdmin(F_USDC).updateRewards( + 0xf6109Ad48f5Cf9e28938774aD4069C90f81D648E + ); + + IFTokenAdmin(F_USDT).updateRewards( + 0xf6109Ad48f5Cf9e28938774aD4069C90f81D648E + ); + } + + /// @notice Action 2: Update USDC, USDT & wstETH market rate curve. + function action2() internal { + AdminModuleStructs.RateDataV2Params[] + memory params_ = new AdminModuleStructs.RateDataV2Params[](3); + + params_[0] = AdminModuleStructs.RateDataV2Params({ + token: USDC_ADDRESS, // USDC + kink1: 80 * 1e2, // 80% + kink2: 93 * 1e2, // 93% + rateAtUtilizationZero: 0, // 0% + rateAtUtilizationKink1: 12 * 1e2, // 12% + rateAtUtilizationKink2: 18 * 1e2, // 18% + rateAtUtilizationMax: 33.33 * 1e2 // 33.33% + }); + + params_[1] = AdminModuleStructs.RateDataV2Params({ + token: USDT_ADDRESS, // USDT + kink1: 80 * 1e2, // 80% + kink2: 93 * 1e2, // 93% + rateAtUtilizationZero: 0, // 0% + rateAtUtilizationKink1: 12 * 1e2, // 12% + rateAtUtilizationKink2: 18 * 1e2, // 18% + rateAtUtilizationMax: 33.33 * 1e2 // 33.33% + }); + + params_[2] = AdminModuleStructs.RateDataV2Params({ + token: wstETH_ADDRESS, // wstETH + kink1: 50 * 1e2, // 50% + kink2: 90 * 1e2, // 90% + rateAtUtilizationZero: 0, // 0% + rateAtUtilizationKink1: 15 * 1e2, // 15% + rateAtUtilizationKink2: 12 * 1e2, // 12% + rateAtUtilizationMax: 100 * 1e2 // 100% + }); + + LIQUIDITY.updateRateDataV2s(params_); + } + + + /// @notice Action 3: Set max utilization to 85% for wstETH & Update Reserve fee to 10%. + function action3() internal { + AdminModuleStructs.TokenConfig[] + memory tokenConfigs_ = new AdminModuleStructs.TokenConfig[](2); + + tokenConfigs_[0] = AdminModuleStructs.TokenConfig({ + token: wstETH_ADDRESS, + fee: 10 * 1e2, // 10% + threshold: 0.3 * 1e2, // 0.3% + maxUtilization: 88 * 1e2 // 88% + }); + + tokenConfigs_[1] = AdminModuleStructs.TokenConfig({ + token: ETH_ADDRESS, + fee: 10 * 1e2, // 10% + threshold: 0.3 * 1e2, // 0.3% + maxUtilization: 0 + }); + + LIQUIDITY.updateTokenConfigs(tokenConfigs_); + } +} From 9aada6d44dce7b5428fee172dadf85c279e87cd4 Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Sat, 15 Jun 2024 00:19:15 -0400 Subject: [PATCH 2/7] wip --- contracts/payloads/IGP27/PayloadIGP27.sol | 51 +---------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/contracts/payloads/IGP27/PayloadIGP27.sol b/contracts/payloads/IGP27/PayloadIGP27.sol index aef9b8e..780329a 100644 --- a/contracts/payloads/IGP27/PayloadIGP27.sol +++ b/contracts/payloads/IGP27/PayloadIGP27.sol @@ -250,55 +250,6 @@ interface IFluidLiquidityAdmin { ); } -interface IFluidVaultT1Factory { - /// @notice Deploys a new vault using the specified deployment logic `vaultDeploymentLogic_` and data `vaultDeploymentData_`. - /// Only accounts with deployer access or the owner can deploy a new vault. - /// @param vaultDeploymentLogic_ The address of the vault deployment logic contract. - /// @param vaultDeploymentData_ The data to be used for vault deployment. - /// @return vault_ Returns the address of the newly deployed vault. - function deployVault( - address vaultDeploymentLogic_, - bytes calldata vaultDeploymentData_ - ) external returns (address vault_); - - /// @notice Sets an address as allowed vault deployment logic (`deploymentLogic_`) contract or not. - /// This function can only be called by the owner. - /// @param deploymentLogic_ The address of the vault deployment logic contract to be set. - /// @param allowed_ A boolean indicating whether the specified address is allowed to deploy new type of vault. - function setVaultDeploymentLogic( - address deploymentLogic_, - bool allowed_ - ) external; -} - - -interface IFluidVaultT1 { - /// @notice updates the Vault oracle to `newOracle_`. Must implement the FluidOracle interface. - function updateOracle(address newOracle_) external; - - /// @notice updates the all Vault core settings according to input params. - /// All input values are expected in 1e2 (1% = 100, 100% = 10_000). - function updateCoreSettings( - uint256 supplyRateMagnifier_, - uint256 borrowRateMagnifier_, - uint256 collateralFactor_, - uint256 liquidationThreshold_, - uint256 liquidationMaxLimit_, - uint256 withdrawGap_, - uint256 liquidationPenalty_, - uint256 borrowFee_ - ) external; - - /// @notice updates the allowed rebalancer to `newRebalancer_`. - 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_) external; - - /// @notice updates the collateral factor to `collateralFactor_`. Input in 1e2 (1% = 100, 100% = 10_000). - function updateCollateralFactor(uint collateralFactor_) external; -} - interface IFTokenAdmin { /// @notice updates the rewards rate model contract. /// Only callable by LendingFactory auths. @@ -494,7 +445,7 @@ contract PayloadIGP27 { token: ETH_ADDRESS, fee: 10 * 1e2, // 10% threshold: 0.3 * 1e2, // 0.3% - maxUtilization: 0 + maxUtilization: 0 // 0 }); LIQUIDITY.updateTokenConfigs(tokenConfigs_); From 75bcec006de35e9b79df580b1e1bfc828e580c67 Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Sat, 15 Jun 2024 07:29:43 -0400 Subject: [PATCH 3/7] Update contracts/payloads/IGP27/PayloadIGP27.sol Co-authored-by: bergben --- contracts/payloads/IGP27/PayloadIGP27.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/payloads/IGP27/PayloadIGP27.sol b/contracts/payloads/IGP27/PayloadIGP27.sol index 780329a..a3c3e59 100644 --- a/contracts/payloads/IGP27/PayloadIGP27.sol +++ b/contracts/payloads/IGP27/PayloadIGP27.sol @@ -445,7 +445,7 @@ contract PayloadIGP27 { token: ETH_ADDRESS, fee: 10 * 1e2, // 10% threshold: 0.3 * 1e2, // 0.3% - maxUtilization: 0 // 0 + maxUtilization: 100 * 1e2 // set to 100% to disable and have default limit of 100% (avoiding SLOAD). }); LIQUIDITY.updateTokenConfigs(tokenConfigs_); From 0e947f5c7b31ed87fe2bb515e56b74e31c6b66f2 Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Sat, 15 Jun 2024 07:29:55 -0400 Subject: [PATCH 4/7] Update contracts/payloads/IGP27/PayloadIGP27.sol Co-authored-by: bergben --- contracts/payloads/IGP27/PayloadIGP27.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/payloads/IGP27/PayloadIGP27.sol b/contracts/payloads/IGP27/PayloadIGP27.sol index a3c3e59..86f69a9 100644 --- a/contracts/payloads/IGP27/PayloadIGP27.sol +++ b/contracts/payloads/IGP27/PayloadIGP27.sol @@ -429,7 +429,7 @@ contract PayloadIGP27 { } - /// @notice Action 3: Set max utilization to 85% for wstETH & Update Reserve fee to 10%. + /// @notice Action 3: Set max utilization to 88% for wstETH & Update ETH Reserve fee to 10%. function action3() internal { AdminModuleStructs.TokenConfig[] memory tokenConfigs_ = new AdminModuleStructs.TokenConfig[](2); From 07bba465f8b4731945eba1ff61274c08573c4eee Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Sat, 15 Jun 2024 07:31:18 -0400 Subject: [PATCH 5/7] fix --- contracts/payloads/IGP27/PayloadIGP27.sol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/payloads/IGP27/PayloadIGP27.sol b/contracts/payloads/IGP27/PayloadIGP27.sol index 86f69a9..d73b10e 100644 --- a/contracts/payloads/IGP27/PayloadIGP27.sol +++ b/contracts/payloads/IGP27/PayloadIGP27.sol @@ -400,9 +400,9 @@ contract PayloadIGP27 { kink1: 80 * 1e2, // 80% kink2: 93 * 1e2, // 93% rateAtUtilizationZero: 0, // 0% - rateAtUtilizationKink1: 12 * 1e2, // 12% - rateAtUtilizationKink2: 18 * 1e2, // 18% - rateAtUtilizationMax: 33.33 * 1e2 // 33.33% + rateAtUtilizationKink1: 10 * 1e2, // 10% + rateAtUtilizationKink2: 15 * 1e2, // 15% + rateAtUtilizationMax: 25 * 1e2 // 25% }); params_[1] = AdminModuleStructs.RateDataV2Params({ @@ -410,9 +410,9 @@ contract PayloadIGP27 { kink1: 80 * 1e2, // 80% kink2: 93 * 1e2, // 93% rateAtUtilizationZero: 0, // 0% - rateAtUtilizationKink1: 12 * 1e2, // 12% - rateAtUtilizationKink2: 18 * 1e2, // 18% - rateAtUtilizationMax: 33.33 * 1e2 // 33.33% + rateAtUtilizationKink1: 10 * 1e2, // 10% + rateAtUtilizationKink2: 15 * 1e2, // 15% + rateAtUtilizationMax: 25 * 1e2 // 25% }); params_[2] = AdminModuleStructs.RateDataV2Params({ From a4055cfd5d461d88e9e4b364c62805fc1e23bf43 Mon Sep 17 00:00:00 2001 From: Samyak Jain <34437877+KaymasJain@users.noreply.github.com> Date: Sat, 15 Jun 2024 18:31:53 +0400 Subject: [PATCH 6/7] minor fix --- contracts/payloads/IGP27/PayloadIGP27.sol | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contracts/payloads/IGP27/PayloadIGP27.sol b/contracts/payloads/IGP27/PayloadIGP27.sol index d73b10e..37b6cc3 100644 --- a/contracts/payloads/IGP27/PayloadIGP27.sol +++ b/contracts/payloads/IGP27/PayloadIGP27.sol @@ -418,7 +418,7 @@ contract PayloadIGP27 { params_[2] = AdminModuleStructs.RateDataV2Params({ token: wstETH_ADDRESS, // wstETH kink1: 50 * 1e2, // 50% - kink2: 90 * 1e2, // 90% + kink2: 93 * 1e2, // 93% rateAtUtilizationZero: 0, // 0% rateAtUtilizationKink1: 15 * 1e2, // 15% rateAtUtilizationKink2: 12 * 1e2, // 12% @@ -428,7 +428,6 @@ contract PayloadIGP27 { LIQUIDITY.updateRateDataV2s(params_); } - /// @notice Action 3: Set max utilization to 88% for wstETH & Update ETH Reserve fee to 10%. function action3() internal { AdminModuleStructs.TokenConfig[] From 3f93aa35765776edb318a1b8e2d02f00773b27c7 Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Sat, 15 Jun 2024 11:21:32 -0400 Subject: [PATCH 7/7] fix --- contracts/payloads/IGP27/PayloadIGP27.sol | 2 -- 1 file changed, 2 deletions(-) diff --git a/contracts/payloads/IGP27/PayloadIGP27.sol b/contracts/payloads/IGP27/PayloadIGP27.sol index 37b6cc3..0640402 100644 --- a/contracts/payloads/IGP27/PayloadIGP27.sol +++ b/contracts/payloads/IGP27/PayloadIGP27.sol @@ -304,8 +304,6 @@ contract PayloadIGP27 { IFluidLiquidityAdmin public constant LIQUIDITY = IFluidLiquidityAdmin(0x52Aa899454998Be5b000Ad077a46Bbe360F4e497); - IFluidVaultT1Factory public constant VAULT_T1_FACTORY = - IFluidVaultT1Factory(0x324c5Dc1fC42c7a4D43d92df1eBA58a54d13Bf2d); address public constant F_USDT = 0x5C20B550819128074FD538Edf79791733ccEdd18; address public constant F_USDC = 0x9Fb7b4477576Fe5B32be4C1843aFB1e55F251B33;