More fixes, some stable tests fail WIP

contracts/protocol/lendingpool/LendingPool.sol

@@ -26,6 +26,9 @@ import {UserConfiguration} from '../libraries/configuration/UserConfiguration.so
 import {DataTypes} from '../libraries/types/DataTypes.sol';
 import {LendingPoolStorage} from './LendingPoolStorage.sol';
 
+// TEST
+import { console } from 'hardhat/console.sol';
+
 /**
  * @title LendingPool contract
  * @dev Main point of interaction with an Aave protocol's market
@@ -206,7 +209,7 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
     address onBehalfOf
   ) external override whenNotPaused {
     DataTypes.ReserveData storage reserve = _reserves[asset];
-
+  
     _executeBorrow(
       ExecuteBorrowParams(
         asset,

contracts/protocol/libraries/logic/ValidationLogic.sol

@@ -16,6 +16,8 @@ import {Helpers} from '../helpers/Helpers.sol';
 import {IReserveInterestRateStrategy} from '../../../interfaces/IReserveInterestRateStrategy.sol';
 import {DataTypes} from '../types/DataTypes.sol';
 
+import {console} from 'hardhat/console.sol';
+
 /**
  * @title ReserveLogic library
  * @author Aave
@@ -194,7 +196,7 @@ library ValidationLogic {
       //check if the borrow mode is stable and if stable rate borrowing is enabled on this reserve
 
       require(vars.stableRateBorrowingEnabled, Errors.VL_STABLE_BORROWING_NOT_ENABLED);
-
+      console.log("Reserve aToken balance on borrowing address:", IERC20(reserve.aTokenAddress).balanceOf(userAddress));
       require(
         !userConfig.isUsingAsCollateral(reserve.id) ||
           reserve.configuration.getLtv() == 0 ||

helpers/contracts-deployments.ts

@@ -298,79 +298,111 @@ export const deployDefaultReserveInterestRateStrategy = async (
 export const deployStableDebtToken = async (
   args: [tEthereumAddress, tEthereumAddress, string, string, tEthereumAddress],
   verify: boolean
-) =>
+) => {
-  withSaveAndVerify(
+  const instance = await withSaveAndVerify(
     await new StableDebtTokenFactory(await getFirstSigner()).deploy(),
     eContractid.StableDebtToken,
-    args,
+    [],
     verify
   );
 
+  await instance.initialize(
+    args[0],
+    args[1],
+    args[2],
+    "18",
+    args[3],
+    args[4]
+  );
+
+  return instance;
+}
+ 
+
 export const deployVariableDebtToken = async (
   args: [tEthereumAddress, tEthereumAddress, string, string, tEthereumAddress],
   verify: boolean
-) =>
+) => {
-  withSaveAndVerify(
+  const instance = await withSaveAndVerify(
     await new VariableDebtTokenFactory(await getFirstSigner()).deploy(),
     eContractid.VariableDebtToken,
-    args,
+    [],
     verify
   );
 
+  await instance.initialize(
+    args[0],
+    args[1],
+    args[2],
+    "18",
+    args[3],
+    args[4]
+  );
+
+  return instance;
+}
+
+
 export const deployGenericAToken = async (
-  [poolAddress, underlyingAssetAddress, treasuryAddress, name, symbol,incentivesController]: [
+  [poolAddress, underlyingAssetAddress, treasuryAddress, incentivesController, name, symbol]: [
+    tEthereumAddress,
     tEthereumAddress,
     tEthereumAddress,
     tEthereumAddress,
     string,
-    string,
+    string
-    tEthereumAddress
   ],
   verify: boolean
 ) => {
-  const args: [
+  const instance = await withSaveAndVerify(
-    tEthereumAddress,
-    tEthereumAddress,
-    string,
-    string,
-    tEthereumAddress,
-    tEthereumAddress
-
-  ] = [poolAddress, underlyingAssetAddress, treasuryAddress, name, symbol, incentivesController];
-  return withSaveAndVerify(
     await new ATokenFactory(await getFirstSigner()).deploy(),
     eContractid.AToken,
-    args,
+    [],
     verify
   );
+  
+  await instance.initialize(
+    poolAddress, 
+    treasuryAddress,
+    underlyingAssetAddress, 
+    incentivesController, 
+    "18", 
+    name, 
+    symbol
+  );
+
+  return instance;
 };
 
 export const deployDelegationAwareAToken = async (
-  [poolAddress, underlyingAssetAddress, treasuryAddress, name, symbol, incentivesController]: [
+  [pool, underlyingAssetAddress, treasuryAddress, incentivesController, name, symbol]: [
+    tEthereumAddress,
     tEthereumAddress,
     tEthereumAddress,
     tEthereumAddress,
     string,
-    string,
+    string
-    tEthereumAddress
   ],
   verify: boolean
 ) => {
-  const args: [
+  const instance = await withSaveAndVerify(
-    tEthereumAddress,
-    tEthereumAddress,
-    string,
-    string,
-    tEthereumAddress,
-    tEthereumAddress
-  ] = [poolAddress, underlyingAssetAddress, treasuryAddress, name, symbol, incentivesController];
-
-  return withSaveAndVerify(
     await new DelegationAwareATokenFactory(await getFirstSigner()).deploy(),
     eContractid.DelegationAwareAToken,
-    args,
+    [],
     verify
   );
+  
+  await instance.initialize(
+    pool,
+    treasuryAddress,
+    underlyingAssetAddress,
+    incentivesController,
+    "18",
+    name,
+    symbol
+  )
+
+  return instance;
 };
 
 export const deployAllMockTokens = async (verify?: boolean) => {
@@ -447,16 +479,29 @@ export const deployWETHGateway = async (
   );
 
 export const deployMockStableDebtToken = async (
-  args: [tEthereumAddress, tEthereumAddress, string, string, tEthereumAddress],
+  args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string],
   verify?: boolean
-) =>
+) => {
-  withSaveAndVerify(
+  const instance = await withSaveAndVerify(
     await new MockStableDebtTokenFactory(await getFirstSigner()).deploy(),
     eContractid.MockStableDebtToken,
-    args,
+    [],
     verify
   );
 
+  await instance.initialize(
+    args[0],
+    args[1],
+    args[2],
+    "18",
+    args[3],
+    args[4]
+  );
+
+  return instance;
+}
+
+
 export const deployWETHMocked = async (verify?: boolean) =>
   withSaveAndVerify(
     await new WETH9MockedFactory(await getFirstSigner()).deploy(),
@@ -466,26 +511,53 @@ export const deployWETHMocked = async (verify?: boolean) =>
   );
 
 export const deployMockVariableDebtToken = async (
-  args: [tEthereumAddress, tEthereumAddress, string, string, tEthereumAddress],
+  args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string],
   verify?: boolean
-) =>
+) => {
-  withSaveAndVerify(
+  const instance = await withSaveAndVerify(
     await new MockVariableDebtTokenFactory(await getFirstSigner()).deploy(),
     eContractid.MockVariableDebtToken,
-    args,
+    [],
     verify
   );
 
+  await instance.initialize(
+    args[0],
+    args[1],
+    args[2],
+    "18",
+    args[3],
+    args[4]
+  );
+
+  return instance;
+}
+
+
 export const deployMockAToken = async (
-  args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string, tEthereumAddress],
+args: [tEthereumAddress, tEthereumAddress, tEthereumAddress,tEthereumAddress, string, string],
   verify?: boolean
-) =>
+) => {
-  withSaveAndVerify(
+  const instance = await withSaveAndVerify(
     await new MockATokenFactory(await getFirstSigner()).deploy(),
     eContractid.MockAToken,
-    args,
+    [],
     verify
   );
+  
+  await instance.initialize(
+    args[0],
+    args[2],
+    args[1],
+    args[3],
+    "18",
+    args[4],
+    args[5],
+  );
+
+  return instance;
+}
+
 
 export const deploySelfdestructTransferMock = async (verify?: boolean) =>
   withSaveAndVerify(

helpers/init-helpers.ts

@@ -231,11 +231,11 @@ export const initReservesByHelper = async (
       treasury: treasuryAddress,
       incentivesController: ZERO_ADDRESS,
       underlyingAssetName: reserveSymbols[i],
-      aTokenName: `Aave Interest Bearing ${reserveSymbols[i]}`,
+      aTokenName: `Aave interest bearing ${reserveSymbols[i]}`,
       aTokenSymbol: `a${reserveSymbols[i]}`,
-      variableDebtTokenName: `Aave Variable Debt ${reserveSymbols[i]}`,
+      variableDebtTokenName: `Aave variable debt bearing ${reserveSymbols[i]}`,
       variableDebtTokenSymbol: `variableDebt${reserveSymbols[i]}`,
-      stableDebtTokenName: `Aave Stable Debt ${reserveSymbols[i]}`,
+      stableDebtTokenName: `Aave stable debt bearing ${reserveSymbols[i]}`,
       stableDebtTokenSymbol: `stableDebt${reserveSymbols[i]}`
     });
   }
@@ -263,9 +263,9 @@ export const initReservesByHelper = async (
         poolAddress,
         tokenAddresses[symbol],
         treasuryAddress,
+        ZERO_ADDRESS,
         `Aave interest bearing ${symbol}`,
         `a${symbol}`,
-        ZERO_ADDRESS,
       ],
       verify
     );
@@ -273,9 +273,9 @@ export const initReservesByHelper = async (
       [
         poolAddress,
         tokenAddresses[symbol],
+        ZERO_ADDRESS, // Incentives controller
         `Aave stable debt bearing ${symbol}`,
-        `stableDebt${symbol}`,
+        `stableDebt${symbol}`
-        ZERO_ADDRESS,
       ],
       verify
     );
@@ -283,9 +283,9 @@ export const initReservesByHelper = async (
       [
         poolAddress,
         tokenAddresses[symbol],
+        ZERO_ADDRESS, // Incentives controller
         `Aave variable debt bearing ${symbol}`,
         `variableDebt${symbol}`,
-        ZERO_ADDRESS,
       ],
       verify
     );
@@ -573,9 +573,9 @@ export const initTokenReservesByHelper = async (
         [
           poolAddress,
           tokenAddresses[symbol],
+          ZERO_ADDRESS, // Incentives controller
           `Aave stable debt bearing ${symbol}`,
-          `stableDebt${symbol}`,
+          `stableDebt${symbol}`
-          ZERO_ADDRESS,
         ],
         verify
       );
@@ -586,9 +586,9 @@ export const initTokenReservesByHelper = async (
         [
           poolAddress,
           tokenAddresses[symbol],
+          ZERO_ADDRESS, // Incentives Controller
           `Aave variable debt bearing ${symbol}`,
-          `variableDebt${symbol}`,
+          `variableDebt${symbol}`
-          ZERO_ADDRESS,
         ],
         verify
       );
@@ -604,9 +604,9 @@ export const initTokenReservesByHelper = async (
           poolAddress,
           tokenAddresses[symbol],
           treasuryAddress,
-          `Aave interest bearing ${symbol}`,
-          `a${symbol}`,
           ZERO_ADDRESS,
+          `Aave interest bearing ${symbol}`,
+          `a${symbol}`
         ],
         verify
       );

test/delegation-aware-atoken.spec.ts

@@ -9,6 +9,7 @@ import { DRE } from '../helpers/misc-utils';
 import {
   ConfigNames,
   getATokenDomainSeparatorPerNetwork,
+  getTreasuryAddress,
   loadPoolConfig,
 } from '../helpers/configuration';
 import { waitForTx } from '../helpers/misc-utils';
@@ -19,6 +20,7 @@ import {
 import { DelegationAwareATokenFactory } from '../types';
 import { DelegationAwareAToken } from '../types/DelegationAwareAToken';
 import { MintableDelegationERC20 } from '../types/MintableDelegationERC20';
+import AaveConfig from '../markets/aave';
 
 const { parseEther } = ethers.utils;
 
@@ -33,11 +35,11 @@ makeSuite('AToken: underlying delegation', (testEnv: TestEnv) => {
     delegationERC20 = await deployMintableDelegationERC20(['DEL', 'DEL', '18']);
 
     delegationAToken = await deployDelegationAwareAToken(
-      [pool.address, ZERO_ADDRESS, delegationERC20.address, ZERO_ADDRESS, '18', 'aDEL', 'aDEL'],
+      [pool.address, delegationERC20.address, await getTreasuryAddress(AaveConfig), ZERO_ADDRESS, 'aDEL', 'aDEL'],
       false
     );
     
-    await delegationAToken.initialize(pool.address, ZERO_ADDRESS, delegationERC20.address, ZERO_ADDRESS, '18', 'aDEL', 'aDEL');
+    //await delegationAToken.initialize(pool.address, ZERO_ADDRESS, delegationERC20.address, ZERO_ADDRESS, '18', 'aDEL', 'aDEL');
 
     console.log((await delegationAToken.decimals()).toString());
   });

test/helpers/actions.ts

@@ -161,6 +161,9 @@ export const deposit = async (
   if (sendValue) {
     txOptions.value = await convertToCurrencyDecimals(reserve, sendValue);
   }
+
+  //console.log("Depositing %s %s, expecting %s", amountToDeposit.toString(), reserveSymbol, expectedResult);
+
   if (expectedResult === 'success') {
     const txResult = await waitForTx(
       await pool
@@ -348,7 +351,7 @@ export const borrow = async (
   );
 
   const amountToBorrow = await convertToCurrencyDecimals(reserve, amount);
-
+  //console.log("Borrowing %s %s with rate mode %s expecting", amountToBorrow.toString(), reserveSymbol, interestRateMode, expectedResult);
   if (expectedResult === 'success') {
     const txResult = await waitForTx(
       await pool

test/upgradeability.spec.ts

@@ -10,6 +10,7 @@ import {
   getAToken,
   getMockStableDebtToken,
   getMockVariableDebtToken,
+  getStableDebtToken,
   getVariableDebtToken,
 } from '../helpers/contracts-getters';
 import {
@@ -30,25 +31,25 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
       pool.address,
       dai.address,
       ZERO_ADDRESS,
+      ZERO_ADDRESS,
       'Aave Interest bearing DAI updated',
       'aDAI',
-      ZERO_ADDRESS,
     ]);
 
     const stableDebtTokenInstance = await deployMockStableDebtToken([
       pool.address,
       dai.address,
+      ZERO_ADDRESS,
       'Aave stable debt bearing DAI updated',
       'stableDebtDAI',
-      ZERO_ADDRESS,
     ]);
 
     const variableDebtTokenInstance = await deployMockVariableDebtToken([
       pool.address,
       dai.address,
+      ZERO_ADDRESS,
       'Aave variable debt bearing DAI updated',
       'variableDebtDAI',
-      ZERO_ADDRESS,
     ]);
 
     newATokenAddress = aTokenInstance.address;
@@ -59,8 +60,26 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
   it('Tries to update the DAI Atoken implementation with a different address than the lendingPoolManager', async () => {
     const {dai, configurator, users} = testEnv;
 
+    const name = await (await getAToken(newATokenAddress)).name();
+    const symbol = await (await getAToken(newATokenAddress)).symbol();
+
+    const updateATokenInputParams: {
+      asset: string;
+      treasury: string;
+      incentivesController: string;
+      name: string;
+      symbol: string;
+      implementation: string;
+    } = {
+      asset: dai.address,
+      treasury: ZERO_ADDRESS,
+      incentivesController: ZERO_ADDRESS,
+      name: name,
+      symbol: symbol,
+      implementation: newATokenAddress,
+    };
     await expect(
-      configurator.connect(users[1].signer).updateAToken(dai.address, newATokenAddress)
+      configurator.connect(users[1].signer).updateAToken(updateATokenInputParams)
     ).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
   });
 
@@ -68,8 +87,24 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
     const {dai, configurator, aDai} = testEnv;
 
     const name = await (await getAToken(newATokenAddress)).name();
+    const symbol = await (await getAToken(newATokenAddress)).symbol();
 
-    await configurator.updateAToken(dai.address, newATokenAddress);
+    const updateATokenInputParams: {
+      asset: string;
+      treasury: string;
+      incentivesController: string;
+      name: string;
+      symbol: string;
+      implementation: string;
+    } = {
+      asset: dai.address,
+      treasury: ZERO_ADDRESS,
+      incentivesController: ZERO_ADDRESS,
+      name: name,
+      symbol: symbol,
+      implementation: newATokenAddress,
+    };
+    await configurator.updateAToken(updateATokenInputParams);
 
     const tokenName = await aDai.name();
 
@@ -79,19 +114,53 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
   it('Tries to update the DAI Stable debt token implementation with a different address than the lendingPoolManager', async () => {
     const {dai, configurator, users} = testEnv;
 
+    const name = await (await getStableDebtToken(newStableTokenAddress)).name();
+    const symbol = await (await getStableDebtToken(newStableTokenAddress)).symbol();
+
+    
+    const updateDebtTokenInput: {
+      asset: string;
+      incentivesController: string;
+      name: string;
+      symbol: string;
+      implementation: string;
+    } = {
+      asset: dai.address,
+      incentivesController: ZERO_ADDRESS,
+      name: name,
+      symbol: symbol,
+      implementation: newStableTokenAddress,
+    }
+
     await expect(
       configurator
         .connect(users[1].signer)
-        .updateStableDebtToken(dai.address, newStableTokenAddress)
+        .updateStableDebtToken(updateDebtTokenInput)
     ).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
   });
 
   it('Upgrades the DAI stable debt token implementation ', async () => {
     const {dai, configurator, pool, helpersContract} = testEnv;
 
-    const name = await (await getAToken(newATokenAddress)).name();
+    const name = await (await getStableDebtToken(newStableTokenAddress)).name();
+    const symbol = await (await getStableDebtToken(newStableTokenAddress)).symbol();
 
-    await configurator.updateStableDebtToken(dai.address, newStableTokenAddress);
+    
+    const updateDebtTokenInput: {
+      asset: string;
+      incentivesController: string;
+      name: string;
+      symbol: string;
+      implementation: string;
+    } = {
+      asset: dai.address,
+      incentivesController: ZERO_ADDRESS,
+      name: name,
+      symbol: symbol,
+      implementation: newStableTokenAddress,
+    }
+
+    await configurator.updateStableDebtToken(updateDebtTokenInput);
 
     const {stableDebtTokenAddress} = await helpersContract.getReserveTokensAddresses(dai.address);
 
@@ -104,20 +173,53 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
 
   it('Tries to update the DAI variable debt token implementation with a different address than the lendingPoolManager', async () => {
     const {dai, configurator, users} = testEnv;
+    
+    const name = await (await getVariableDebtToken(newVariableTokenAddress)).name();
+    const symbol = await (await getVariableDebtToken(newVariableTokenAddress)).symbol();
+    
+    const updateDebtTokenInput: {
+      asset: string;
+      incentivesController: string;
+      name: string;
+      symbol: string;
+      implementation: string;
+    } = {
+      asset: dai.address,
+      incentivesController: ZERO_ADDRESS,
+      name: name,
+      symbol: symbol,
+      implementation: newVariableTokenAddress,
+    }
 
     await expect(
       configurator
         .connect(users[1].signer)
-        .updateVariableDebtToken(dai.address, newVariableTokenAddress)
+        .updateVariableDebtToken(updateDebtTokenInput)
     ).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
   });
 
   it('Upgrades the DAI variable debt token implementation ', async () => {
     const {dai, configurator, pool, helpersContract} = testEnv;
+    
+    const name = await (await getVariableDebtToken(newVariableTokenAddress)).name();
+    const symbol = await (await getVariableDebtToken(newVariableTokenAddress)).symbol();
+    
+    const updateDebtTokenInput: {
+      asset: string;
+      incentivesController: string;
+      name: string;
+      symbol: string;
+      implementation: string;
+    } = {
+      asset: dai.address,
+      incentivesController: ZERO_ADDRESS,
+      name: name,
+      symbol: symbol,
+      implementation: newVariableTokenAddress,
+    }
+    //const name = await (await getAToken(newATokenAddress)).name();
 
-    const name = await (await getAToken(newATokenAddress)).name();
+    await configurator.updateVariableDebtToken(updateDebtTokenInput);
-
-    await configurator.updateVariableDebtToken(dai.address, newVariableTokenAddress);
 
     const {variableDebtTokenAddress} = await helpersContract.getReserveTokensAddresses(dai.address);