Refactored variable names, reordered the ReserveData struct

This commit is contained in:
The3D 2020-09-13 11:58:45 +02:00
parent 7794839f3c
commit f3856bac12
9 changed files with 1403 additions and 1080 deletions

View File

@ -8,7 +8,7 @@ usePlugin('buidler-typechain');
usePlugin('solidity-coverage');
usePlugin('@nomiclabs/buidler-waffle');
usePlugin('@nomiclabs/buidler-etherscan');
//usePlugin('buidler-gas-reporter');
usePlugin('buidler-gas-reporter');
const DEFAULT_BLOCK_GAS_LIMIT = 10000000;
const DEFAULT_GAS_PRICE = 10;

View File

@ -105,7 +105,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
bool isFirstDeposit = IAToken(aToken).balanceOf(onBehalfOf) == 0;
if (isFirstDeposit) {
_usersConfig[onBehalfOf].setUsingAsCollateral(reserve.index, true);
_usersConfig[onBehalfOf].setUsingAsCollateral(reserve.id, true);
}
IAToken(aToken).mint(onBehalfOf, amount, reserve.liquidityIndex);
@ -151,7 +151,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
reserve.updateInterestRates(asset, aToken, 0, amountToWithdraw);
if (amountToWithdraw == userBalance) {
_usersConfig[msg.sender].setUsingAsCollateral(reserve.index, false);
_usersConfig[msg.sender].setUsingAsCollateral(reserve.id, false);
}
IAToken(aToken).burn(msg.sender, msg.sender, amountToWithdraw, reserve.liquidityIndex);
@ -247,7 +247,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
reserve.updateInterestRates(asset, aToken, paybackAmount, 0);
if (stableDebt.add(variableDebt).sub(paybackAmount) == 0) {
_usersConfig[onBehalfOf].setBorrowing(reserve.index, false);
_usersConfig[onBehalfOf].setBorrowing(reserve.id, false);
}
IERC20(asset).safeTransferFrom(user, aToken, paybackAmount);
@ -360,7 +360,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
_addressesProvider.getPriceOracle()
);
_usersConfig[msg.sender].setUsingAsCollateral(reserve.index, useAsCollateral);
_usersConfig[msg.sender].setUsingAsCollateral(reserve.id, useAsCollateral);
if (useAsCollateral) {
emit ReserveUsedAsCollateralEnabled(asset, msg.sender);
@ -616,7 +616,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
reserve.currentStableBorrowRate,
IStableDebtToken(reserve.stableDebtTokenAddress).getAverageStableRate(),
reserve.liquidityIndex,
reserve.lastVariableBorrowIndex,
reserve.variableBorrowIndex,
reserve.lastUpdateTimestamp
);
}
@ -682,7 +682,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
stableRateLastUpdated = IStableDebtToken(reserve.stableDebtTokenAddress).getUserLastUpdated(
user
);
usageAsCollateralEnabled = _usersConfig[user].isUsingAsCollateral(reserve.index);
usageAsCollateralEnabled = _usersConfig[user].isUsingAsCollateral(reserve.id);
variableBorrowIndex = IVariableDebtToken(reserve.variableDebtTokenAddress).getUserIndex(user);
}
@ -786,7 +786,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
oracle
);
uint256 reserveIndex = reserve.index;
uint256 reserveIndex = reserve.id;
if (!userConfig.isBorrowing(reserveIndex)) {
userConfig.setBorrowing(reserveIndex, true);
}
@ -843,7 +843,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
reserveAlreadyAdded = true;
}
if (!reserveAlreadyAdded) {
_reserves[asset].index = uint8(_reservesList.length);
_reserves[asset].id = uint8(_reservesList.length);
_reservesList.push(asset);
}
}

View File

@ -165,7 +165,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
vars.isCollateralEnabled =
collateralReserve.configuration.getLiquidationThreshold() > 0 &&
userConfig.isUsingAsCollateral(collateralReserve.index);
userConfig.isUsingAsCollateral(collateralReserve.id);
//if collateral isn't enabled as collateral by user, it cannot be liquidated
if (!vars.isCollateralEnabled) {
@ -341,7 +341,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
if (msg.sender != user) {
vars.isCollateralEnabled =
collateralReserve.configuration.getLiquidationThreshold() > 0 &&
userConfig.isUsingAsCollateral(collateralReserve.index);
userConfig.isUsingAsCollateral(collateralReserve.id);
//if collateral isn't enabled as collateral by user, it cannot be liquidated
if (!vars.isCollateralEnabled) {
@ -394,7 +394,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
vars.collateralAtoken.burn(user, receiver, vars.maxCollateralToLiquidate, collateralReserve.liquidityIndex);
if (vars.userCollateralBalance == vars.maxCollateralToLiquidate) {
usersConfig[user].setUsingAsCollateral(collateralReserve.index, false);
usersConfig[user].setUsingAsCollateral(collateralReserve.id, false);
}
address principalAToken = debtReserve.aTokenAddress;

View File

@ -64,7 +64,7 @@ library GenericLogic {
) external view returns (bool) {
if (
!userConfig.isBorrowingAny() ||
!userConfig.isUsingAsCollateral(reservesData[asset].index)
!userConfig.isUsingAsCollateral(reservesData[asset].id)
) {
return true;
}

View File

@ -51,23 +51,27 @@ library ReserveLogic {
struct ReserveData {
//stores the reserve configuration
ReserveConfiguration.Map configuration;
address aTokenAddress;
address stableDebtTokenAddress;
address variableDebtTokenAddress;
address interestRateStrategyAddress;
//the liquidity index. Expressed in ray
uint128 liquidityIndex;
//variable borrow index. Expressed in ray
uint128 variableBorrowIndex;
//the current supply rate. Expressed in ray
uint128 currentLiquidityRate;
//the current variable borrow rate. Expressed in ray
uint128 currentVariableBorrowRate;
//the current stable borrow rate. Expressed in ray
uint128 currentStableBorrowRate;
//variable borrow index. Expressed in ray
uint128 lastVariableBorrowIndex;
uint40 lastUpdateTimestamp;
//the index of the reserve in the list of the active reserves
uint8 index;
//tokens addresses
address aTokenAddress;
address stableDebtTokenAddress;
address variableDebtTokenAddress;
address interestRateStrategyAddress;
//the id of the reserve. Represents the position in the list of the active reserves
uint8 id;
}
/**
@ -106,12 +110,12 @@ library ReserveLogic {
//solium-disable-next-line
if (timestamp == uint40(block.timestamp)) {
//if the index was updated in the same block, no need to perform any calculation
return reserve.lastVariableBorrowIndex;
return reserve.variableBorrowIndex;
}
uint256 cumulated = MathUtils
.calculateCompoundedInterest(reserve.currentVariableBorrowRate, timestamp)
.rayMul(reserve.lastVariableBorrowIndex);
.rayMul(reserve.variableBorrowIndex);
return cumulated;
}
@ -143,9 +147,9 @@ library ReserveLogic {
reserve.currentVariableBorrowRate,
lastUpdateTimestamp
);
index = cumulatedVariableBorrowInterest.rayMul(reserve.lastVariableBorrowIndex);
index = cumulatedVariableBorrowInterest.rayMul(reserve.variableBorrowIndex);
require(index < (1 << 128), Errors.VARIABLE_BORROW_INDEX_OVERFLOW);
reserve.lastVariableBorrowIndex = uint128(index);
reserve.variableBorrowIndex = uint128(index);
}
}
@ -194,8 +198,8 @@ library ReserveLogic {
reserve.liquidityIndex = uint128(WadRayMath.ray());
}
if (reserve.lastVariableBorrowIndex == 0) {
reserve.lastVariableBorrowIndex = uint128(WadRayMath.ray());
if (reserve.variableBorrowIndex == 0) {
reserve.variableBorrowIndex = uint128(WadRayMath.ray());
}
reserve.aTokenAddress = aTokenAddress;
@ -260,7 +264,7 @@ library ReserveLogic {
vars.currentAvgStableRate,
vars.newVariableRate,
reserve.liquidityIndex,
reserve.lastVariableBorrowIndex
reserve.variableBorrowIndex
);
}
}

View File

@ -190,7 +190,7 @@ library ValidationLogic {
require(vars.stableRateBorrowingEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);
require(
!userConfig.isUsingAsCollateral(reserve.index) ||
!userConfig.isUsingAsCollateral(reserve.id) ||
reserve.configuration.getLtv() == 0 ||
amount > IERC20(reserve.aTokenAddress).balanceOf(msg.sender),
Errors.CALLATERAL_SAME_AS_BORROWING_CURRENCY
@ -274,7 +274,7 @@ library ValidationLogic {
require(stableRateEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);
require(
!userConfig.isUsingAsCollateral(reserve.index) ||
!userConfig.isUsingAsCollateral(reserve.id) ||
reserve.configuration.getLtv() == 0 ||
stableBorrowBalance.add(variableBorrowBalance) >
IERC20(reserve.aTokenAddress).balanceOf(msg.sender),

View File

@ -129,9 +129,7 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
* @return the total balance of the user
**/
function balanceOf(address user) public override(ERC20, IERC20) view returns (uint256) {
return super.balanceOf(user).rayMul(POOL.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS));
}
/**

View File

@ -5,7 +5,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x209bb253C2f894D3Cc53b9dC23d308Eb8593613A",
"address": "0x9Dc554694756dC303a087e04bA6918C333Bc26a7",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -15,7 +15,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xa2eDbC6b9E7EBA4b66f6A0B8Af3065CaC5611A6E",
"address": "0xAfC307938C1c0035942c141c31524504c89Aaa8B",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -25,7 +25,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x6424b49739C3fC1d390Cea7A6bafa5B32A7B47b8",
"address": "0x73DE1e0ab6A5C221258703bc546E0CAAcCc6EC87",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -53,7 +53,7 @@
"address": "0x6642B57e4265BAD868C17Fc1d1F4F88DBBA04Aa8"
},
"localhost": {
"address": "0x8Be07B1e05bCB4091344ff2356D40EBf7e0c9b6E"
"address": "0x65e0Cd5B8904A02f2e00BC6f58bf881998D54BDe"
}
},
"LendingPoolDataProvider": {
@ -66,7 +66,7 @@
"address": "0xD9273d497eDBC967F39d419461CfcF382a0A822e"
},
"localhost": {
"address": "0xB44f879C781DfFF5E07aF7d338449E767Aa1c1d2"
"address": "0x5d12dDe3286D94E0d85F9D3B01B7099cfA0aBCf1"
}
},
"PriceOracle": {
@ -75,7 +75,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x34c94f172B5eAcb53230AE62e41e1828B1a4B0F8",
"address": "0xbeA90474c2F3C7c43bC7c36CaAf5272c927Af5a1",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -85,7 +85,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x01C5292e57aB25E38152ceE4A45C2038f233D531",
"address": "0x19E42cA990cF697D3dda0e59131215C43bB6989F",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -95,7 +95,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x3D6bB48D5988B0D8B1d920cef50f59ED7d527F8c",
"address": "0xE30c3983E51bC9d6baE3E9437710a1459e21e81F",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -105,7 +105,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xC414d0323C57aF313F570A09c1D6e691F3C1c195",
"address": "0xDf69898e844197a24C658CcF9fD53dF15948dc8b",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -115,7 +115,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xbEed026d89A715F28b32135A6C3e3c060234f40d",
"address": "0xBe6d8642382C241c9B4B50c89574DbF3f4181E7D",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -169,7 +169,7 @@
"address": "0x2B681757d757fbB80cc51c6094cEF5eE75bF55aA"
},
"localhost": {
"address": "0x045Da1BcEB75D2E0064a66Da1Ad606350CD9730A"
"address": "0xAd49512dFBaD6fc13D67d3935283c0606812E962"
}
},
"WalletBalanceProvider": {
@ -178,7 +178,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xd54dbF2a2D88aFeCA7E288D43e16150b57C6bcd9",
"address": "0xA29C2A7e59aa49C71aF084695337E3AA5e820758",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -188,7 +188,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xa17a59441D6c39D21F2Ff03e7b21f8d2BCAA6023",
"address": "0xbe66dC9DFEe580ED968403e35dF7b5159f873df8",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -198,7 +198,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x36B6f7e34d651DC7fd7EeEc53bf26594209915A8",
"address": "0x93AfC6Df4bB8F62F2493B19e577f8382c0BA9EBC",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -208,7 +208,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x099E8e561f4cfCe0bbDaD063d973eBcf1A1d92B5",
"address": "0x75Ded61646B5945BdDd0CD9a9Db7c8288DA6F810",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -218,7 +218,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x8473D688815861639F6e4442F4433047c2F5571b",
"address": "0xdE7c40e675bF1aA45c18cCbaEb9662B16b0Ddf7E",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -228,7 +228,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xBcf29d6fd8EB2d95b5Ad0Ffdd7ee5272cc49b26c",
"address": "0xDFbeeed692AA81E7f86E72F7ACbEA2A1C4d63544",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -238,7 +238,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x6e77C7e0Fd33A53351335E768593ba56A6C43594",
"address": "0x5191aA68c7dB195181Dd2441dBE23A48EA24b040",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -248,7 +248,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x67a87Be0A08F955EfC629b1cdaaE1eaC48043E6a",
"address": "0x8F9422aa37215c8b3D1Ea1674138107F84D68F26",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -258,7 +258,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xEDf104A35B3293F4BdB987be9D57EFe3b69C19c7",
"address": "0xa89E20284Bd638F31b0011D0fC754Fc9d2fa73e3",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -268,7 +268,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xD8212F51E19A269B8fCc327BF91ede79e218EF17",
"address": "0xaA935993065F2dDB1d13623B1941C7AEE3A60F23",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -278,7 +278,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x1712cE132Cc5E2A5b63e6AF4Ee551070f7Bc4487",
"address": "0x35A2624888e207e4B3434E9a9E250bF6Ee68FeA3",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -288,7 +288,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x6DC0873546006Ce00eC8AA9e97706125D75E3ab6",
"address": "0x1f569c307949a908A4b8Ff7453a88Ca0b8D8df13",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -298,7 +298,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x133EA40EA9975d53D34417F9164a54A635110AE9",
"address": "0x4301cb254CCc126B9eb9cbBE030C6FDA2FA16D4a",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -308,7 +308,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xfe5E2ac37e1cf3f1dFA55De53780692846eD199A",
"address": "0x0766c9592a8686CAB0081b4f35449462c6e82F11",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -318,7 +318,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xcf33a1c13D1599399B3581c3f3cf39e943013A73",
"address": "0xaF6D34adD35E1A565be4539E4d1069c48A49C953",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -328,7 +328,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x6B4Fef015Ea5D2A23C5E5906b41f206c79E36316",
"address": "0x48bb3E35D2D6994374db457a6Bf61de2d9cC8E49",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -338,7 +338,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x556f80053f02Ee04a4f13820AE7a30f787A7A630",
"address": "0x1E59BA56B1F61c3Ee946D8c7e2994B4A9b0cA45C",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -348,7 +348,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x222C21A948139f016EBbd1979250194049b28473",
"address": "0x53813198c75959DDB604462831d8989C29152164",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -358,7 +358,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xb0c6bAc77c65588a5c47d18545D3d265b0030B7e",
"address": "0x0eD6115873ce6B807a03FE0df1f940387779b729",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -368,7 +368,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x9197B2985256CD8a0B41796ab5794D502012766c",
"address": "0xFFfDa24e7E3d5F89a24278f53d6f0F81B3bE0d6B",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -378,7 +378,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x89E72D113048277a670222d9bcACF4FA2c7b20A6",
"address": "0x5889354f21A1C8D8D2f82669d778f6Dab778B519",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -388,7 +388,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x6f4689b37FCC44f24e8dE9Cf2B61f81E71fB9dc0",
"address": "0x09F7bF33B3F8922268B34103af3a8AF83148C9B1",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -398,7 +398,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x77183A4B7c0375bA9A5090Ae68c32A5C567d77c6",
"address": "0x8f3966F7d53Fd5f12b701C8835e1e32541613869",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -408,7 +408,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x209bb253C2f894D3Cc53b9dC23d308Eb8593613A",
"address": "0x9Dc554694756dC303a087e04bA6918C333Bc26a7",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -417,7 +417,7 @@
"address": "0x2cfcA5785261fbC88EFFDd46fCFc04c22525F9e4"
},
"localhost": {
"address": "0xc47cF1C70618CB94e6B1D218468D3E16AE35Fff4"
"address": "0x9305d862ee95a899b83906Cd9CB666aC269E5f66"
}
},
"StableDebtToken": {
@ -426,7 +426,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x3888B5ac0089C12cDF21DD8B0234029f80645324",
"address": "0x02BB514187B830d6A2111197cd7D8cb60650B970",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -436,13 +436,13 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xB76Ea4df0263F99daf33765541b1933AD5bB4410",
"address": "0x6774Ce86Abf5EBB22E9F45b5f55daCbB4170aD7f",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
"AToken": {
"localhost": {
"address": "0x4d39D68f5a2A43E79e7B3A859014cc4233D0EEA1",
"address": "0x007C1a44e85bDa8F562F916685A9DC8BdC6542bF",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"buidlerevm": {
@ -456,7 +456,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x5efEaaE02a5E2BdA1aDAc7aad29D9B4bFFDD90E8",
"address": "0xFBdF1E93D0D88145e3CcA63bf8d513F83FB0903b",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -466,7 +466,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xd334C51Ad3167554876f19F9575394F1cfbc96AF",
"address": "0xEcb928A3c079a1696Aa5244779eEc3dE1717fACd",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -476,7 +476,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0x59A442D1DbAE607fD3cd97859dc14Ff400F7C2ed",
"address": "0xE45fF4A0A8D0E9734C73874c034E03594E15ba28",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -486,7 +486,7 @@
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
},
"localhost": {
"address": "0xE8F349DB32821021520BBe11b7927279BC3BEC6b",
"address": "0x5cCC6Abc4c9F7262B9485797a848Ec6CC28A11dF",
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
}
},
@ -495,7 +495,7 @@
"address": "0xBEF0d4b9c089a5883741fC14cbA352055f35DDA2"
},
"localhost": {
"address": "0xcB70821E9dDE40dc23E973280991A8cdBFD4EC2c"
"address": "0x749258D38b0473d96FEcc14cC5e7DCE12d7Bd6f6"
}
}
}

2329
test.log

File diff suppressed because it is too large Load Diff