Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: resolved conflicts after rebase: market config, internal/external validation for codesize and fixed bad conflict resolution

Browse Source
This commit is contained in:
Hadrien Charlanes 2021-05-26 09:27:45 +02:00
parent b63d29c1d6
commit a4b6064f56
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/protocol/libraries/logic/ValidationLogic.sol
View File

@ -42,7 +42,7 @@ library ValidationLogic {
*/ */
function validateDeposit(DataTypes.ReserveData storage reserve, uint256 amount) internal view { function validateDeposit(DataTypes.ReserveData storage reserve, uint256 amount) internal view {
DataTypes.ReserveConfigurationMap memory reserveConfiguration = reserve.configuration; DataTypes.ReserveConfigurationMap memory reserveConfiguration = reserve.configuration;
(bool isActive, bool isFrozen, , bool isPaused) = reserveConfiguration.getFlagsMemory(); (bool isActive, bool isFrozen, , , bool isPaused) = reserveConfiguration.getFlagsMemory();
(, , , uint256 reserveDecimals, ) = reserveConfiguration.getParamsMemory(); (, , , uint256 reserveDecimals, ) = reserveConfiguration.getParamsMemory();
uint256 supplyCap = reserveConfiguration.getSupplyCapMemory(); uint256 supplyCap = reserveConfiguration.getSupplyCapMemory();
@ -124,7 +124,7 @@ library ValidationLogic {
mapping(uint256 => address) storage reserves, mapping(uint256 => address) storage reserves,
uint256 reservesCount, uint256 reservesCount,
address oracle address oracle
) internal view { ) external view {
ValidateBorrowLocalVars memory vars; ValidateBorrowLocalVars memory vars;
DataTypes.ReserveConfigurationMap memory reserveConfiguration = reserve.configuration; DataTypes.ReserveConfigurationMap memory reserveConfiguration = reserve.configuration;
@ -372,7 +372,7 @@ library ValidationLogic {
address[] memory assets, address[] memory assets,
uint256[] memory amounts, uint256[] memory amounts,
mapping(address => DataTypes.ReserveData) storage reservesData mapping(address => DataTypes.ReserveData) storage reservesData
) internal view { ) external view {
for (uint256 i = 0; i < assets.length; i++) { for (uint256 i = 0; i < assets.length; i++) {
require(!reservesData[assets[i]].configuration.getPaused(), Errors.VL_RESERVE_PAUSED); require(!reservesData[assets[i]].configuration.getPaused(), Errors.VL_RESERVE_PAUSED);
} }

4
markets/matic/reservesConfigs.ts
View File

@ -92,8 +92,8 @@ export const strategyMATIC: IReserveParams = {
borrowCap: '0', borrowCap: '0',
supplyCap: '0', supplyCap: '0',
reserveFactor: '2000', reserveFactor: '2000',
borrowCap: MAX_BORROW_CAP, borrowCap: '0',
supplyCap: MAX_SUPPLY_CAP, supplyCap: '0',
}; };
export const strategyAAVE: IReserveParams = { export const strategyAAVE: IReserveParams = {