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

Updated addresses provider, configurator

Browse Source
This commit is contained in:
The3D 2020-10-13 10:38:22 +02:00
parent 94c9b7156c
commit 6839be6dca
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/configuration/LendingPoolAddressesProvider.sol
View File

@ -3,8 +3,8 @@ pragma solidity ^0.6.8;
import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol'; import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol';
import { import {
InitializableAdminUpgradeabilityProxy InitializableImmutableAdminUpgradeabilityProxy
} from '../libraries/openzeppelin-upgradeability/InitializableAdminUpgradeabilityProxy.sol'; } from '../libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol'; import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol';
@ -153,14 +153,14 @@ contract LendingPoolAddressesProvider is Ownable, ILendingPoolAddressesProvider
function _updateImpl(bytes32 id, address newAddress) internal { function _updateImpl(bytes32 id, address newAddress) internal {
address payable proxyAddress = payable(_addresses[id]); address payable proxyAddress = payable(_addresses[id]);
InitializableAdminUpgradeabilityProxy proxy = InitializableAdminUpgradeabilityProxy( InitializableImmutableAdminUpgradeabilityProxy proxy = InitializableImmutableAdminUpgradeabilityProxy(
proxyAddress proxyAddress
); );
bytes memory params = abi.encodeWithSignature('initialize(address)', address(this)); bytes memory params = abi.encodeWithSignature('initialize(address)', address(this));
if (proxyAddress == address(0)) { if (proxyAddress == address(0)) {
proxy = new InitializableAdminUpgradeabilityProxy(); proxy = new InitializableImmutableAdminUpgradeabilityProxy(address(this));
proxy.initialize(newAddress, address(this), params); proxy.initialize(newAddress, params);
_addresses[id] = address(proxy); _addresses[id] = address(proxy);
emit ProxyCreated(id, address(proxy)); emit ProxyCreated(id, address(proxy));
} else { } else {

10
contracts/lendingpool/LendingPoolConfigurator.sol
View File

@ -7,8 +7,8 @@ import {
VersionedInitializable VersionedInitializable
} from '../libraries/openzeppelin-upgradeability/VersionedInitializable.sol'; } from '../libraries/openzeppelin-upgradeability/VersionedInitializable.sol';
import { import {
InitializableAdminUpgradeabilityProxy InitializableImmutableAdminUpgradeabilityProxy
} from '../libraries/openzeppelin-upgradeability/InitializableAdminUpgradeabilityProxy.sol'; } from '../libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol'; import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol';
import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol'; import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol';
import {ILendingPool} from '../interfaces/ILendingPool.sol'; import {ILendingPool} from '../interfaces/ILendingPool.sol';
@ -559,7 +559,7 @@ contract LendingPoolConfigurator is VersionedInitializable {
* @param decimals the decimals of the token * @param decimals the decimals of the token
**/ **/
function _initTokenWithProxy(address implementation, uint8 decimals) internal returns (address) { function _initTokenWithProxy(address implementation, uint8 decimals) internal returns (address) {
InitializableAdminUpgradeabilityProxy proxy = new InitializableAdminUpgradeabilityProxy(); InitializableImmutableAdminUpgradeabilityProxy proxy = new InitializableImmutableAdminUpgradeabilityProxy(address(this));
bytes memory params = abi.encodeWithSignature( bytes memory params = abi.encodeWithSignature(
'initialize(uint8,string,string)', 'initialize(uint8,string,string)',
@ -568,7 +568,7 @@ contract LendingPoolConfigurator is VersionedInitializable {
IERC20Detailed(implementation).symbol() IERC20Detailed(implementation).symbol()
); );
proxy.initialize(implementation, address(this), params); proxy.initialize(implementation, params);
return address(proxy); return address(proxy);
} }
@ -578,7 +578,7 @@ contract LendingPoolConfigurator is VersionedInitializable {
address proxyAddress, address proxyAddress,
address implementation address implementation
) internal { ) internal {
InitializableAdminUpgradeabilityProxy proxy = InitializableAdminUpgradeabilityProxy( InitializableImmutableAdminUpgradeabilityProxy proxy = InitializableImmutableAdminUpgradeabilityProxy(
payable(proxyAddress) payable(proxyAddress)
); );