Skip to content

chore: ink instance code diff #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

chore: ink instance code diff #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ...2371a08EfAaBf791F624054F3_0x4758213271BFdC72224A7a8742dC865fC97756e1/AaveOracle.sol.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
===================================================================
--- src/core/contracts/misc/AaveOracle.sol
+++ src/contracts/misc/AaveOracle.sol
@@ -85,9 +85,9 @@
address[] memory sources
) internal {
require(
assets.length == sources.length,
- Errors.INCONSISTENT_PARAMS_LENGTH
+ Errors.InconsistentParamsLength()
);
for (uint256 i = 0; i < assets.length; i++) {
assetsSources[assets[i]] = AggregatorInterface(sources[i]);
emit AssetSourceUpdated(assets[i], sources[i]);
@@ -152,8 +152,8 @@
);
require(
aclManager.isAssetListingAdmin(msg.sender) ||
aclManager.isPoolAdmin(msg.sender),
- Errors.CALLER_NOT_ASSET_LISTING_OR_POOL_ADMIN
+ Errors.CallerNotAssetListingOrPoolAdmin()
);
}
}
40 changes: 40 additions & 0 deletions ...AaBf791F624054F3_0x4758213271BFdC72224A7a8742dC865fC97756e1/AggregatorInterface.sol.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
===================================================================
--- src/core/contracts/dependencies/chainlink/AggregatorInterface.sol
+++ src/contracts/dependencies/chainlink/AggregatorInterface.sol
@@ -2,8 +2,36 @@
// Chainlink Contracts v0.8
pragma solidity ^0.8.0;

interface AggregatorInterface {
+ function decimals() external view returns (uint8);
+
+ function description() external view returns (string memory);
+
+ function getRoundData(
+ uint80 _roundId
+ )
+ external
+ view
+ returns (
+ uint80 roundId,
+ int256 answer,
+ uint256 startedAt,
+ uint256 updatedAt,
+ uint80 answeredInRound
+ );
+
+ function latestRoundData()
+ external
+ view
+ returns (
+ uint80 roundId,
+ int256 answer,
+ uint256 startedAt,
+ uint256 updatedAt,
+ uint80 answeredInRound
+ );
+
function latestAnswer() external view returns (int256);

function latestTimestamp() external view returns (uint256);

188 changes: 188 additions & 0 deletions ...E2fA2371a08EfAaBf791F624054F3_0x4758213271BFdC72224A7a8742dC865fC97756e1/Errors.sol.patch
View file
Open in desktop

Large diffs are not rendered by default.

116 changes: 116 additions & 0 deletions ...06E2fA2371a08EfAaBf791F624054F3_0x4758213271BFdC72224A7a8742dC865fC97756e1/settings.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
Index: settings
===================================================================
--- settings
+++ settings
@@ -1,65 +1,57 @@
{
- "remappings": [
- "aave-v3-core/=src/core/",
- "aave-v3-periphery/=src/periphery/",
- "aave-collector-unification/=lib/aave-collector-unification/",
- "solidity-utils/=lib/solidity-utils/src/",
- "aave-helpers/=lib/aave-helpers/src/",
- "aave-address-book/=lib/aave-address-book/src/",
- "forge-std/=lib/forge-std/src/",
- "ds-test/=lib/forge-std/lib/ds-test/src/",
- "@aave/core-v2/=lib/aave-collector-unification/lib/protocol-v2/",
- "@aave/core-v3/=lib/aave-address-book/lib/aave-v3-core/",
- "@aave/periphery-v3/=lib/aave-address-book/lib/aave-v3-periphery/",
- "governance-crosschain-bridges/=lib/aave-helpers/lib/governance-crosschain-bridges/",
- "protocol-v2/=lib/aave-collector-unification/lib/protocol-v2/"
- ],
+ "evmVersion": "shanghai",
+ "libraries": {
+ "src/contracts/protocol/libraries/logic/BorrowLogic.sol": {
+ "BorrowLogic": "0xFeD9871528E713B5038c4c44BbE7a315f56cAdc6"
+ },
+ "src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol": {
+ "ConfiguratorLogic": "0x6E2aFD57a161d12f34f416c29619BFeAcAC8AA18"
+ },
+ "src/contracts/protocol/libraries/logic/EModeLogic.sol": {
+ "EModeLogic": "0xD1bddC05A3BB5A7907d82A1b4F1E21dBCE69c3d5"
+ },
+ "src/contracts/protocol/libraries/logic/FlashLoanLogic.sol": {
+ "FlashLoanLogic": "0x5e84CEe2afb7B37d2AB14722C39A7c1C26F5B0BB"
+ },
+ "src/contracts/protocol/libraries/logic/LiquidationLogic.sol": {
+ "LiquidationLogic": "0x36Ae486289bB807C3C79A1427b9c3D934294ef43"
+ },
+ "src/contracts/protocol/libraries/logic/PoolLogic.sol": {
+ "PoolLogic": "0xE51B69e5722Bf547866A4d7Bc190c6e81b626806"
+ },
+ "src/contracts/protocol/libraries/logic/SupplyLogic.sol": {
+ "SupplyLogic": "0x034Fd14b9Ae6bB066a1F9f85A55e990b0b25c168"
+ }
+ },
+ "metadata": {
+ "appendCBOR": true,
+ "bytecodeHash": "none",
+ "useLiteralContent": false
+ },
"optimizer": {
"enabled": true,
"runs": 200
},
- "metadata": {
- "useLiteralContent": false,
- "bytecodeHash": "ipfs",
- "appendCBOR": true
- },
"outputSelection": {
"*": {
+ "": [
+ "*"
+ ],
"*": [
- "evm.bytecode",
- "evm.deployedBytecode",
- "devdoc",
- "userdoc",
- "metadata",
- "abi"
+ "*"
]
}
},
- "evmVersion": "paris",
- "libraries": {
- "src/core/contracts/protocol/libraries/logic/BorrowLogic.sol": {
- "BorrowLogic": "0x5547D7d54d10C359108e36d098016c4020443Fd4"
- },
- "src/core/contracts/protocol/libraries/logic/BridgeLogic.sol": {
- "BridgeLogic": "0xd948Cfb92eBF175E4bD772305fdEe8f39e934520"
- },
- "src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol": {
- "ConfiguratorLogic": "0x433c792f11D102249DccD55452dDD84c7A2Ef8f2"
- },
- "src/core/contracts/protocol/libraries/logic/EModeLogic.sol": {
- "EModeLogic": "0xB341e4f99c73caA2136302f468ac3b75827C1736"
- },
- "src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol": {
- "FlashLoanLogic": "0x0063Bcd116694c21F6A94AA78E10eF4d7819a609"
- },
- "src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol": {
- "LiquidationLogic": "0x5125bCf6380C5D5Ccad4d4A88C3664DF646Bc6c3"
- },
- "src/core/contracts/protocol/libraries/logic/PoolLogic.sol": {
- "PoolLogic": "0x7b8186933eAd860f49114fb10e3a7f17a11bEd8a"
- },
- "src/core/contracts/protocol/libraries/logic/SupplyLogic.sol": {
- "SupplyLogic": "0x589F82Ff8162Fa96545b435435713E9D6ca79fBB"
- }
- }
+ "remappings": [
+ "solidity-utils/=lib/solidity-utils/src/",
+ "forge-std/=lib/forge-std/src/",
+ "ds-test/=lib/forge-std/lib/ds-test/src/",
+ "openzeppelin-contracts-upgradeable/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/",
+ "openzeppelin-contracts/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/",
+ "@openzeppelin/contracts-upgradeable/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/contracts/",
+ "@openzeppelin/contracts/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/",
+ "erc4626-tests/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/erc4626-tests/",
+ "halmos-cheatcodes/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/halmos-cheatcodes/src/"
+ ],
+ "viaIR": false
}
\ No newline at end of file
21 changes: 21 additions & 0 deletions ...07227de9383D2ce7243158081_0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809/ACLManager.sol.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
===================================================================
--- src/core/contracts/protocol/configuration/ACLManager.sol
+++ src/contracts/protocol/configuration/ACLManager.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
pragma solidity ^0.8.10;

import {AccessControl} from "../../dependencies/openzeppelin/contracts/AccessControl.sol";
import {IPoolAddressesProvider} from "../../interfaces/IPoolAddressesProvider.sol";
@@ -31,9 +31,9 @@
*/
constructor(IPoolAddressesProvider provider) {
ADDRESSES_PROVIDER = provider;
address aclAdmin = provider.getACLAdmin();
- require(aclAdmin != address(0), Errors.ACL_ADMIN_CANNOT_BE_ZERO);
+ require(aclAdmin != address(0), Errors.AclAdminCannotBeZero());
_setupRole(DEFAULT_ADMIN_ROLE, aclAdmin);
}

/// @inheritdoc IACLManager
Loading
Loading