Skip to content

Commit

Permalink
fix: cleanup diffs
Browse files Browse the repository at this point in the history
  • Loading branch information
@brotherlymite
brotherlymite committed Aug 13, 2024
1 parent 491f98b commit b87c28f
Show file tree
Hide file tree
Showing 24 changed files with 66 additions and 8,211 deletions.
145 changes: 1 addition & 144 deletions diffs/MAINNET_ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER_DIFF.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,148 +3,5 @@ diff --git a/./downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER.sol b/./downloads/Z
index 91cc016..35ccb13 100644
--- a/./downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER.sol
+++ b/./downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER.sol
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0 ^0.8.10;

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol

/**
* @dev Interface of the ERC20 standard as defined in the EIP.
@@ -77,7 +77,7 @@ interface IERC20 {
event Approval(address indexed owner, address indexed spender, uint256 value);
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IAaveIncentivesController.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IAaveIncentivesController.sol

/**
* @title IAaveIncentivesController
@@ -96,7 +96,7 @@ interface IAaveIncentivesController {
function handleAction(address user, uint256 totalSupply, uint256 userBalance) external;
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IPoolAddressesProvider.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IPoolAddressesProvider.sol

/**
* @title IPoolAddressesProvider
@@ -323,7 +323,7 @@ interface IPoolAddressesProvider {
function setPoolDataProvider(address newDataProvider) external;
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IScaledBalanceToken.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IScaledBalanceToken.sol

/**
* @title IScaledBalanceToken
@@ -395,7 +395,7 @@ interface IScaledBalanceToken {
function getPreviousIndex(address user) external view returns (uint256);
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/protocol/libraries/helpers/Errors.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/protocol/libraries/helpers/Errors.sol

/**
* @title Errors library
@@ -503,7 +503,7 @@ library Errors {
string public constant INVALID_FREEZE_STATE = '99'; // Reserve is already in the passed freeze state
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/protocol/libraries/math/WadRayMath.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/protocol/libraries/math/WadRayMath.sol

/**
* @title WadRayMath library
@@ -629,7 +629,7 @@ library WadRayMath {
}
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/protocol/libraries/types/DataTypes.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/protocol/libraries/types/DataTypes.sol

library DataTypes {
/**
@@ -942,7 +942,7 @@ library DataTypes {
}
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol

interface IERC20Detailed is IERC20 {
function name() external view returns (string memory);
@@ -952,7 +952,7 @@ interface IERC20Detailed is IERC20 {
function decimals() external view returns (uint8);
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IPoolDataProvider.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IPoolDataProvider.sol

/**
* @title IPoolDataProvider
@@ -1207,7 +1207,7 @@ interface IPoolDataProvider {
function getVirtualUnderlyingBalance(address asset) external view returns (uint256);
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IPool.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IPool.sol

/**
* @title IPool
@@ -2039,7 +2039,7 @@ interface IPool {
function getSupplyLogic() external returns (address);
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol

/**
* @title ReserveConfiguration library
@@ -2676,7 +2676,7 @@ library ReserveConfiguration {
}
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/protocol/libraries/configuration/UserConfiguration.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/protocol/libraries/configuration/UserConfiguration.sol

/**
* @title UserConfiguration library
@@ -2908,7 +2908,7 @@ library UserConfiguration {
}
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IInitializableDebtToken.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IInitializableDebtToken.sol

/**
* @title IInitializableDebtToken
@@ -2957,7 +2957,7 @@ interface IInitializableDebtToken {
) external;
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IStableDebtToken.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IStableDebtToken.sol

/**
* @title IStableDebtToken
@@ -3094,7 +3094,7 @@ interface IStableDebtToken is IInitializableDebtToken {
function UNDERLYING_ASSET_ADDRESS() external view returns (address);
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/interfaces/IVariableDebtToken.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/interfaces/IVariableDebtToken.sol

/**
* @title IVariableDebtToken
@@ -3137,7 +3137,7 @@ interface IVariableDebtToken is IScaledBalanceToken, IInitializableDebtToken {
function UNDERLYING_ASSET_ADDRESS() external view returns (address);
}

-// downloads/MAINNET/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/lib/aave-v3-origin/src/core/contracts/misc/AaveProtocolDataProvider.sol
+// downloads/ZKSYNC/AAVE_PROTOCOL_DATA_PROVIDER/AaveProtocolDataProvider/src/core/contracts/misc/AaveProtocolDataProvider.sol

/**
* @title AaveProtocolDataProvider

```
111 changes: 1 addition & 110 deletions diffs/MAINNET_ZKSYNC/ACL_MANAGER_DIFF.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,114 +3,5 @@ diff --git a/./downloads/MAINNET/ACL_MANAGER.sol b/./downloads/ZKSYNC/ACL_MANAGE
index 8e5aac3..88e1973 100644
--- a/./downloads/MAINNET/ACL_MANAGER.sol
+++ b/./downloads/ZKSYNC/ACL_MANAGER.sol
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.10 ^0.8.0;
+pragma solidity ^0.8.0 ^0.8.10;

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/dependencies/openzeppelin/contracts/Context.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/dependencies/openzeppelin/contracts/Context.sol

/*
* @dev Provides information about the current execution context, including the
@@ -24,7 +24,7 @@ abstract contract Context {
}
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/dependencies/openzeppelin/contracts/IAccessControl.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/dependencies/openzeppelin/contracts/IAccessControl.sol

/**
* @dev External interface of AccessControl declared to support ERC165 detection.
@@ -114,7 +114,7 @@ interface IAccessControl {
function renounceRole(bytes32 role, address account) external;
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/dependencies/openzeppelin/contracts/IERC165.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/dependencies/openzeppelin/contracts/IERC165.sol

/**
* @dev Interface of the ERC165 standard, as defined in the
@@ -137,7 +137,7 @@ interface IERC165 {
function supportsInterface(bytes4 interfaceId) external view returns (bool);
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/dependencies/openzeppelin/contracts/Strings.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/dependencies/openzeppelin/contracts/Strings.sol

/**
* @dev String operations.
@@ -202,7 +202,7 @@ library Strings {
}
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/interfaces/IPoolAddressesProvider.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/interfaces/IPoolAddressesProvider.sol

/**
* @title IPoolAddressesProvider
@@ -429,7 +429,7 @@ interface IPoolAddressesProvider {
function setPoolDataProvider(address newDataProvider) external;
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/protocol/libraries/helpers/Errors.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/protocol/libraries/helpers/Errors.sol

/**
* @title Errors library
@@ -497,7 +497,7 @@ library Errors {
string public constant PRICE_ORACLE_SENTINEL_CHECK_FAILED = '59'; // 'Price oracle sentinel validation failed'
string public constant ASSET_NOT_BORROWABLE_IN_ISOLATION = '60'; // 'Asset is not borrowable in isolation mode'
string public constant RESERVE_ALREADY_INITIALIZED = '61'; // 'Reserve has already been initialized'
- string public constant USER_IN_ISOLATION_MODE = '62'; // 'User is in isolation mode'
+ string public constant USER_IN_ISOLATION_MODE_OR_LTV_ZERO = '62'; // 'User is in isolation mode or ltv is zero'
string public constant INVALID_LTV = '63'; // 'Invalid ltv parameter for the reserve'
string public constant INVALID_LIQ_THRESHOLD = '64'; // 'Invalid liquidity threshold parameter for the reserve'
string public constant INVALID_LIQ_BONUS = '65'; // 'Invalid liquidity bonus parameter for the reserve'
@@ -527,9 +527,17 @@ library Errors {
string public constant SILOED_BORROWING_VIOLATION = '89'; // 'User is trying to borrow multiple assets including a siloed one'
string public constant RESERVE_DEBT_NOT_ZERO = '90'; // the total debt of the reserve needs to be 0
string public constant FLASHLOAN_DISABLED = '91'; // FlashLoaning for this asset is disabled
+ string public constant INVALID_MAX_RATE = '92'; // The expect maximum borrow rate is invalid
+ string public constant WITHDRAW_TO_ATOKEN = '93'; // Withdrawing to the aToken is not allowed
+ string public constant SUPPLY_TO_ATOKEN = '94'; // Supplying to the aToken is not allowed
+ string public constant SLOPE_2_MUST_BE_GTE_SLOPE_1 = '95'; // Variable interest rate slope 2 can not be lower than slope 1
+ string public constant CALLER_NOT_RISK_OR_POOL_OR_EMERGENCY_ADMIN = '96'; // 'The caller of the function is not a risk, pool or emergency admin'
+ string public constant LIQUIDATION_GRACE_SENTINEL_CHECK_FAILED = '97'; // 'Liquidation grace sentinel validation failed'
+ string public constant INVALID_GRACE_PERIOD = '98'; // Grace period above a valid range
+ string public constant INVALID_FREEZE_STATE = '99'; // Reserve is already in the passed freeze state
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/dependencies/openzeppelin/contracts/ERC165.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/dependencies/openzeppelin/contracts/ERC165.sol

/**
* @dev Implementation of the {IERC165} interface.
@@ -554,7 +562,7 @@ abstract contract ERC165 is IERC165 {
}
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/interfaces/IACLManager.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/interfaces/IACLManager.sol

/**
* @title IACLManager
@@ -727,7 +735,7 @@ interface IACLManager {
function isAssetListingAdmin(address admin) external view returns (bool);
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/dependencies/openzeppelin/contracts/AccessControl.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/dependencies/openzeppelin/contracts/AccessControl.sol

/**
* @dev Contract module that allows children to implement role-based access
@@ -937,7 +945,7 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
}
}

-// downloads/MAINNET/ACL_MANAGER/ACLManager/@aave/core-v3/contracts/protocol/configuration/ACLManager.sol
+// downloads/ZKSYNC/ACL_MANAGER/ACLManager/src/core/contracts/protocol/configuration/ACLManager.sol

/**
* @title ACLManager

```
Loading

0 comments on commit b87c28f

Please sign in to comment.