Instadapp/dsa-governance
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-governance.git synced 2024-07-29 22:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
Thrilok kumar 2024-03-14 02:18:35 -04:00
parent 97fb3645a7
commit e8acd2fce7
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
contracts/payloads/IGP12/PayloadIGP12.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.7.0; pragma solidity >=0.7.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import { BigMathMinified } from "./libraries/bigMathMinified.sol"; import { BigMathMinified } from "./libraries/bigMathMinified.sol";
@ -246,6 +246,9 @@ contract PayloadIGP12 {
uint256 internal constant X24 = 0xffffff; uint256 internal constant X24 = 0xffffff;
uint256 internal constant X64 = 0xffffffffffffffff; uint256 internal constant X64 = 0xffffffffffffffff;
uint256 internal constant DEFAULT_EXPONENT_SIZE = 8;
uint256 internal constant DEFAULT_EXPONENT_MASK = 0xff;
constructor() { constructor() {
ADDRESS_THIS = address(this); ADDRESS_THIS = address(this);
} }
@ -398,14 +401,14 @@ contract PayloadIGP12 {
address token_, address token_,
address user_, address user_,
uint256 expandPercent_ uint256 expandPercent_
) internal returns(AdminModuleStructs.UserSupplyConfig memory config_){ ) internal view returns(AdminModuleStructs.UserSupplyConfig memory config_){
bytes32 _LIQUDITY_PROTOCOL_SUPPLY_SLOT = LiquiditySlotsLink.calculateDoubleMappingStorageSlot( bytes32 _LIQUDITY_PROTOCOL_SUPPLY_SLOT = LiquiditySlotsLink.calculateDoubleMappingStorageSlot(
LiquiditySlotsLink.LIQUIDITY_USER_SUPPLY_DOUBLE_MAPPING_SLOT, LiquiditySlotsLink.LIQUIDITY_USER_SUPPLY_DOUBLE_MAPPING_SLOT,
user_, user_,
token_ token_
); );
bytes32 userSupplyData_ = LIQUIDITY.readFromStorage(_LIQUDITY_PROTOCOL_SUPPLY_SLOT); uint256 userSupplyData_ = LIQUIDITY.readFromStorage(_LIQUDITY_PROTOCOL_SUPPLY_SLOT);
config_ = AdminModuleStructs.UserSupplyConfig({ config_ = AdminModuleStructs.UserSupplyConfig({
user: user_, user: user_,
@ -421,27 +424,32 @@ contract PayloadIGP12 {
}); });
} }
function getBorrowTokenConfigAndSetExpandPercent( function getUserBorrowDataAndSetExpandPercent(
address token_, address token_,
address user_, address user_,
uint256 expandPercent_ uint256 expandPercent_
) internal returns(AdminModuleStructs.UserSupplyConfig memory config_){ ) internal view returns(AdminModuleStructs.UserBorrowConfig memory config_) {
bytes32 _LIQUDITY_PROTOCOL_SUPPLY_SLOT = LiquiditySlotsLink.calculateDoubleMappingStorageSlot( bytes32 _LIQUDITY_PROTOCOL_BORROW_SLOT = LiquiditySlotsLink.calculateDoubleMappingStorageSlot(
LiquiditySlotsLink.LIQUIDITY_USER_SUPPLY_DOUBLE_MAPPING_SLOT, LiquiditySlotsLink.LIQUIDITY_USER_BORROW_DOUBLE_MAPPING_SLOT,
user_, user_,
token_ token_
); );
bytes32 userSupplyData_ = LIQUIDITY.readFromStorage(_LIQUDITY_PROTOCOL_SUPPLY_SLOT); uint256 userBorrowData_ = LIQUIDITY.readFromStorage(_LIQUDITY_PROTOCOL_BORROW_SLOT);
config_ = AdminModuleStructs.UserSupplyConfig({ config_ = AdminModuleStructs.UserBorrowConfig({
user: user_, user: user_,
token: token_, token: token_,
mode: uint8(userSupplyData_ & 1), mode: uint8(userBorrowData_ & 1),
expandPercent: expandPercent_, expandPercent: expandPercent_,
expandDuration: (userSupplyData_ >> LiquiditySlotsLink.BITS_USER_SUPPLY_EXPAND_DURATION) & X24, expandDuration: (userBorrowData_ >> LiquiditySlotsLink.BITS_USER_BORROW_EXPAND_DURATION) & X24,
baseWithdrawalLimit: BigMathMinified.fromBigNumber( baseDebtCeiling: BigMathMinified.fromBigNumber(
(userSupplyData_ >> LiquiditySlotsLink.BITS_USER_SUPPLY_BASE_WITHDRAWAL_LIMIT) & X18, (userBorrowData_ >> LiquiditySlotsLink.BITS_USER_BORROW_BASE_BORROW_LIMIT) & X18,
DEFAULT_EXPONENT_SIZE,
DEFAULT_EXPONENT_MASK
),
maxDebtCeiling: BigMathMinified.fromBigNumber(
(userBorrowData_ >> LiquiditySlotsLink.BITS_USER_BORROW_MAX_BORROW_LIMIT) & X18,
DEFAULT_EXPONENT_SIZE, DEFAULT_EXPONENT_SIZE,
DEFAULT_EXPONENT_MASK DEFAULT_EXPONENT_MASK
) )