This commit is contained in:
Thrilok kumar 2024-07-02 15:52:51 -04:00
parent e66446d8bf
commit bdfc3c1f54

View File

@ -149,6 +149,10 @@ interface IProxy {
} }
interface IFluidLiquidityAdmin { interface IFluidLiquidityAdmin {
function readFromStorage(
bytes32 slot_
) external view returns (uint256 result_);
/// @notice adds/removes auths. Auths generally could be contracts which can have restricted actions defined on contract. /// @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. /// auths can be helpful in reducing governance overhead where it's not needed.
/// @param authsStatus_ array of structs setting allowed status for an address. /// @param authsStatus_ array of structs setting allowed status for an address.
@ -315,6 +319,14 @@ interface IFluidVaultT1Factory {
address vaultAuth_, address vaultAuth_,
bool allowed_ bool allowed_
) external; ) external;
function getVaultAddress(
uint256 vaultId_
) external view returns (address vault_);
function readFromStorage(
bytes32 slot_
) external view returns (uint256 result_);
} }
interface IFluidVaultT1DeploymentLogic { interface IFluidVaultT1DeploymentLogic {
@ -609,7 +621,7 @@ contract PayloadIGP30 {
liquidationPenalty: 2 * 1e2, // 2% liquidationPenalty: 2 * 1e2, // 2%
borrowFee: 0 * 1e2, // 0% borrowFee: 0 * 1e2, // 0%
oracle: address() oracle: address(0)
}); });
// Deploy wBTC/ETH vault. // Deploy wBTC/ETH vault.
@ -799,13 +811,13 @@ contract PayloadIGP30 {
mode: vaultConfig.borrowMode, mode: vaultConfig.borrowMode,
expandPercent: vaultConfig.supplyExpandPercent, expandPercent: vaultConfig.supplyExpandPercent,
expandDuration: vaultConfig.borrowExpandDuration, expandDuration: vaultConfig.borrowExpandDuration,
baseDebtCeilingInUSD: getRawAmount( baseDebtCeiling: getRawAmount(
vaultConfig.borrow, vaultConfig.borrowToken,
vaultConfig.borrowBaseLimitInUSD, vaultConfig.borrowBaseLimitInUSD,
false false
), ),
maxDebtCeilingInUSD: getRawAmount( maxDebtCeiling: getRawAmount(
vaultConfig.borrow, vaultConfig.borrowToken,
vaultConfig.borrowMaxLimitInUSD, vaultConfig.borrowMaxLimitInUSD,
false false
) )
@ -877,9 +889,7 @@ contract PayloadIGP30 {
function getUserBorrowData( function getUserBorrowData(
address token_, address token_,
address oldVault_, address oldVault_,
address newVault_, address newVault_
uint256 baseLimit,
uint256 maxLimit
) )
internal internal
view view
@ -956,8 +966,7 @@ contract PayloadIGP30 {
configs_[0] = getUserSupplyData( configs_[0] = getUserSupplyData(
newConstants.supplyToken, newConstants.supplyToken,
data.oldVaultAddress, data.oldVaultAddress,
data.newVaultAddress, data.newVaultAddress
data.supplyBaseAllowance
); );
LIQUIDITY.updateUserSupplyConfigs(configs_); LIQUIDITY.updateUserSupplyConfigs(configs_);
@ -971,9 +980,7 @@ contract PayloadIGP30 {
configs_[0] = getUserBorrowData( configs_[0] = getUserBorrowData(
newConstants.borrowToken, newConstants.borrowToken,
data.oldVaultAddress, data.oldVaultAddress,
data.newVaultAddress, data.newVaultAddress
data.borrowBaseAllowance,
data.borrowMaxAllowance
); );
LIQUIDITY.updateUserBorrowConfigs(configs_); LIQUIDITY.updateUserBorrowConfigs(configs_);
@ -1009,7 +1016,7 @@ contract PayloadIGP30 {
usdPrice = 1; usdPrice = 1;
decimals = 6; decimals = 6;
} else { } else {
revert; revert("not-found");
} }
uint256 exchangePrice = isSupply ? supplyExchangePrice : borrowExchangePrice; uint256 exchangePrice = isSupply ? supplyExchangePrice : borrowExchangePrice;