scripts: Update deployment scripts to be compatible with @aave/[email protected]

Author: kartojal

hardhat.config.ts

@@ -81,6 +81,7 @@ const config: HardhatUserConfig = {
       '@aave/core-v3/contracts/protocol/libraries/logic/LiquidationLogic.sol',
       '@aave/core-v3/contracts/protocol/libraries/logic/EModeLogic.sol',
       '@aave/core-v3/contracts/protocol/libraries/logic/BridgeLogic.sol',
+      '@aave/core-v3/contracts/protocol/libraries/logic/FlashLoanLogic.sol',
     ],
     keep: false,
   },

helpers/contracts-deployments.ts

@@ -1,3 +1,4 @@
+import { FlashLoanLogic } from './../types/FlashLoanLogic.d';
 import { DRE } from './misc-utils';
 import { eContractid, tEthereumAddress, TokenContractId, tStringTokenSmallUnits } from './types';
 import { getFirstSigner } from './wallet-helpers';
@@ -57,8 +58,8 @@ export const deployMintableERC20 = async (
     verify
   );
 
-export const deployGenericATokenImpl = async () =>
-  withSave(await new AToken__factory(await getFirstSigner()).deploy(), eContractid.AToken);
+export const deployGenericATokenImpl = async (pool: tEthereumAddress) =>
+  withSave(await new AToken__factory(await getFirstSigner()).deploy(pool), eContractid.AToken);
 
 export const deployPoolAddressesProvider = async (marketId: string, verify?: boolean) =>
   withSaveAndVerify(
@@ -166,12 +167,32 @@ export const deployEModeLogic = async () => {
   return withSave(eModeLogic, eContractid.EModeLogic);
 };
 
+export const deployFlashLoanLogic = async (borrowLogicAddress: tEthereumAddress) => {
+  const flashLoanLogicArtifact = await readArtifact(eContractid.FlashLoanLogic);
+
+  const linkedFlashLoanLogicByteCode = linkBytecode(flashLoanLogicArtifact, {
+    [eContractid.BorrowLogic]: borrowLogicAddress,
+  });
+
+  const flashLoanLogicFactory = await DRE.ethers.getContractFactory(
+    flashLoanLogicArtifact.abi,
+    linkedFlashLoanLogicByteCode
+  );
+
+  const flashLoanLogic = await (
+    await flashLoanLogicFactory.connect(await getFirstSigner()).deploy()
+  ).deployed();
+
+  return withSave(flashLoanLogic, eContractid.FlashLoanLogic);
+};
+
 export const deployAaveLibraries = async (): Promise<PoolLibraryAddresses> => {
   const supplyLogic = await deploySupplyLogic();
   const borrowLogic = await deployBorrowLogic();
   const liquidationLogic = await deployLiquidationLogic();
   const bridgeLogic = await deployBridgeLogic();
   const eModeLogic = await deployEModeLogic();
+  const flashLoanLogic = await deployFlashLoanLogic(borrowLogic.address);
   // Hardcoded solidity placeholders, if any library changes path this will fail.
   // The '__$PLACEHOLDER$__ can be calculated via solidity keccak, but the PoolLibraryAddresses Type seems to
   // require a hardcoded string.
@@ -190,6 +211,8 @@ export const deployAaveLibraries = async (): Promise<PoolLibraryAddresses> => {
     ['contracts/protocol/libraries/logic/EModeLogic.sol:EModeLogic']: eModeLogic.address,
     ['contracts/protocol/libraries/logic/BorrowLogic.sol:BorrowLogic']: borrowLogic.address,
     ['contracts/protocol/libraries/logic/BridgeLogic.sol:BridgeLogic']: bridgeLogic.address,
+    ['contracts/protocol/libraries/logic/FlashLoanLogic.sol:FlashLoanLogic']:
+      flashLoanLogic.address,
   };
 };
 
@@ -246,7 +269,14 @@ export const deployMockAggregator = async (price: tStringTokenSmallUnits, verify
   );
 
 export const deployAaveOracle = async (
-  args: [tEthereumAddress[], tEthereumAddress[], tEthereumAddress, tEthereumAddress, string],
+  args: [
+    tEthereumAddress,
+    tEthereumAddress[],
+    tEthereumAddress[],
+    tEthereumAddress,
+    tEthereumAddress,
+    string
+  ],
   verify?: boolean
 ) =>
   withSaveAndVerify(
@@ -296,7 +326,7 @@ export const deployWalletBalancerProvider = async (verify?: boolean) =>
 
 export const deployDefaultReserveInterestRateStrategy = async (
   args: [tEthereumAddress, string, string, string, string, string, string, string, string, string],
-  verify: boolean
+  verify?: boolean
 ) =>
   withSaveAndVerify(
     await new DefaultReserveInterestRateStrategy__factory(await getFirstSigner()).deploy(...args),
@@ -311,28 +341,28 @@ export const deployReservesSetupHelper = async () =>
     eContractid.ReservesSetupHelper
   );
 
-export const deployDelegationAwareATokenImpl = async (verify?: boolean) =>
+export const deployDelegationAwareATokenImpl = async (pool: tEthereumAddress, verify?: boolean) =>
   withSaveAndVerify(
-    await new DelegationAwareAToken__factory(await getFirstSigner()).deploy(),
+    await new DelegationAwareAToken__factory(await getFirstSigner()).deploy(pool),
     eContractid.DelegationAwareAToken,
-    [],
+    [pool],
     verify
   );
 
-export const deployGenericStableDebtToken = async () =>
+export const deployGenericStableDebtToken = async (pool: tEthereumAddress, verify?: boolean) =>
   withSaveAndVerify(
-    await new StableDebtToken__factory(await getFirstSigner()).deploy(),
+    await new StableDebtToken__factory(await getFirstSigner()).deploy(pool),
     eContractid.StableDebtToken,
-    [],
-    false
+    [pool],
+    verify
   );
 
-export const deployGenericVariableDebtToken = async () =>
+export const deployGenericVariableDebtToken = async (pool: tEthereumAddress, verify?: boolean) =>
   withSaveAndVerify(
-    await new VariableDebtToken__factory(await getFirstSigner()).deploy(),
+    await new VariableDebtToken__factory(await getFirstSigner()).deploy(pool),
     eContractid.VariableDebtToken,
-    [],
-    false
+    [pool],
+    verify
   );
 
 export const deployAllMockTokens = async () => {

helpers/init-helpers.ts

@@ -2,6 +2,7 @@ import { eContractid, iMultiPoolsAssets, IReserveParams, tEthereumAddress } from
 import { chunk, waitForTx } from './misc-utils';
 import {
   getACLManager,
+  getPool,
   getPoolAddressesProvider,
   getPoolConfiguratorProxy,
   getReservesSetupHelper,
@@ -18,7 +19,7 @@ import {
 import { WETHGateway__factory } from '../types';
 import { getFirstSigner } from './wallet-helpers';
 
-import { AaveProtocolDataProvider } from '@aave/core-v3/types';
+import { AaveProtocolDataProvider } from '../types';
 
 export const initReservesByHelper = async (
   reservesParams: iMultiPoolsAssets<IReserveParams>,
@@ -34,9 +35,10 @@ export const initReservesByHelper = async (
   let gasUsage = BigNumber.from('0');
 
   const addressProvider = await getPoolAddressesProvider();
+  const pool = await getPool();
 
   // CHUNK CONFIGURATION
-  const initChunks = 4;
+  const initChunks = 5;
 
   // Initialize variables for future reserves initialization
   let reserveTokens: string[] = [];
@@ -95,10 +97,13 @@ export const initReservesByHelper = async (
   //   rawInsertContractAddressInDb(`variableDebtTokenImpl`, variableDebtTokenImplementationAddress);
   // });
   //gasUsage = gasUsage.add(tx1.gasUsed);
-  stableDebtTokenImplementationAddress = await (await deployGenericStableDebtToken()).address;
-  variableDebtTokenImplementationAddress = await (await deployGenericVariableDebtToken()).address;
+  stableDebtTokenImplementationAddress = await (await deployGenericStableDebtToken(pool.address))
+    .address;
+  variableDebtTokenImplementationAddress = await (
+    await deployGenericVariableDebtToken(pool.address)
+  ).address;
 
-  const aTokenImplementation = await deployGenericATokenImpl();
+  const aTokenImplementation = await deployGenericATokenImpl(pool.address);
   aTokenImplementationAddress = aTokenImplementation.address;
   rawInsertContractAddressInDb(`aTokenImpl`, aTokenImplementationAddress);
 
@@ -107,7 +112,7 @@ export const initReservesByHelper = async (
   ) as [string, IReserveParams][];
 
   if (delegatedAwareReserves.length > 0) {
-    const delegationAwareATokenImplementation = await deployDelegationAwareATokenImpl();
+    const delegationAwareATokenImplementation = await deployDelegationAwareATokenImpl(pool.address);
     delegationAwareATokenImplementationAddress = delegationAwareATokenImplementation.address;
     rawInsertContractAddressInDb(
       `delegationAwareATokenImpl`,
@@ -220,7 +225,6 @@ export const initReservesByHelper = async (
 
   return gasUsage; // Deprecated
 };
-
 export const configureReservesByHelper = async (
   reservesParams: iMultiPoolsAssets<IReserveParams>,
   tokenAddresses: { [symbol: string]: tEthereumAddress },
@@ -323,10 +327,5 @@ export const configureReservesByHelper = async (
   }
 };
 
-export const authorizeWETHGateway = async (
-  wethGateWay: tEthereumAddress,
-  pool: tEthereumAddress
-) =>
-  await new WETHGateway__factory(await getFirstSigner())
-    .attach(wethGateWay)
-    .authorizePool(pool);
+export const authorizeWETHGateway = async (wethGateWay: tEthereumAddress, pool: tEthereumAddress) =>
+  await new WETHGateway__factory(await getFirstSigner()).attach(wethGateWay).authorizePool(pool);

helpers/types.ts

@@ -89,6 +89,7 @@ export enum eContractid {
   ACLManager = 'ACLManager',
   ReservesSetupHelper = 'ReservesSetupHelper',
   MockIncentivesController = 'MockIncentivesController',
+  FlashLoanLogic = 'FlashLoanLogic',
 }
 
 export type tEthereumAddress = string;
@@ -329,27 +330,25 @@ export interface ICommonConfiguration {
   ProviderId: number;
   ProtocolGlobalParams: IProtocolGlobalConfig;
   Mocks: IMocksConfig;
-  ProviderRegistry: iParamsPerNetwork<tEthereumAddress | undefined>;
-  ProviderRegistryOwner: iParamsPerNetwork<tEthereumAddress | undefined>;
-  PoolConfigurator: iParamsPerNetwork<tEthereumAddress>;
-  Pool: iParamsPerNetwork<tEthereumAddress>;
-  RateOracleRatesCommon: iMultiPoolsAssets<IMarketRates>;
-  RateOracle: iParamsPerNetwork<tEthereumAddress>;
-  TokenDistributor: iParamsPerNetwork<tEthereumAddress>;
-  AaveOracle: iParamsPerNetwork<tEthereumAddress>;
-  FallbackOracle: iParamsPerNetwork<tEthereumAddress>;
-  ChainlinkAggregator: iParamsPerNetwork<ITokenAddress>;
-  PoolAdmin: iParamsPerNetwork<tEthereumAddress | undefined>;
+  ProviderRegistry: tEthereumAddress | undefined;
+  ProviderRegistryOwner: tEthereumAddress | undefined;
+  PoolConfigurator: tEthereumAddress | undefined;
+  Pool: tEthereumAddress | undefined;
+  TokenDistributor: tEthereumAddress | undefined;
+  AaveOracle: tEthereumAddress | undefined;
+  FallbackOracle: tEthereumAddress | undefined;
+  ChainlinkAggregator: tEthereumAddress | undefined;
+  PoolAdmin: tEthereumAddress | undefined;
   PoolAdminIndex: number;
-  EmergencyAdmin: iParamsPerNetwork<tEthereumAddress | undefined>;
+  EmergencyAdmin: tEthereumAddress | undefined;
   EmergencyAdminIndex: number;
-  ReserveAssets: iParamsPerNetwork<SymbolMap<tEthereumAddress>>;
+  ReserveAssets: SymbolMap<tEthereumAddress> | SymbolMap<undefined>;
   ReservesConfig: iMultiPoolsAssets<IReserveParams>;
-  ATokenDomainSeparator: iParamsPerNetwork<string>;
-  WETH: iParamsPerNetwork<tEthereumAddress>;
-  WrappedNativeToken: iParamsPerNetwork<tEthereumAddress>;
-  ReserveFactorTreasuryAddress: iParamsPerNetwork<tEthereumAddress>;
-  IncentivesController: iParamsPerNetwork<tEthereumAddress>;
+  ATokenDomainSeparator: string;
+  WETH: tEthereumAddress | undefined;
+  WrappedNativeToken: tEthereumAddress | undefined;
+  ReserveFactorTreasuryAddress: tEthereumAddress;
+  IncentivesController: tEthereumAddress | undefined;
 }
 
 export interface IAaveConfiguration extends ICommonConfiguration {

test/__setup.spec.ts

@@ -1,3 +1,4 @@
+import { ZERO_ADDRESS } from './../helpers/constants';
 import rawHRE from 'hardhat';
 import { ethers, Signer } from 'ethers';
 import { waitForTx } from '../helpers/misc-utils';
@@ -61,6 +62,8 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   await waitForTx(await aclManager.addPoolAdmin(aaveAdmin));
 
+  await waitForTx(await aclManager.addAssetListingAdmin(aaveAdmin));
+
   //setting users[1] as emergency admin, which is in position 2 in the DRE addresses list
   const addressList = await getEthersSignersAddresses();
 
@@ -165,6 +168,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
   const [tokens, aggregators] = getPairsTokenAggregator(allTokenAddresses, allAggregatorsAddresses);
 
   await deployAaveOracle([
+    addressesProvider.address,
     tokens,
     aggregators,
     fallbackOracle.address,
@@ -180,11 +184,17 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   const reservesParams = AaveConfig.ReservesConfig;
 
-  const testHelpers = await deployAaveProtocolDataProvider(addressesProvider.address);
+  const protocolDataProvider = await deployAaveProtocolDataProvider(addressesProvider.address);
+  console.log(5);
 
-  await insertContractAddressInDb(eContractid.AaveProtocolDataProvider, testHelpers.address);
+  await insertContractAddressInDb(
+    eContractid.AaveProtocolDataProvider,
+    protocolDataProvider.address
+  );
   const admin = await deployer.getAddress();
 
+  await addressesProvider.setPoolDataProvider(protocolDataProvider.address);
+
   console.log('Initialize configuration');
 
   const config = AaveConfig;
@@ -208,11 +218,16 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
     VariableDebtTokenNamePrefix,
     SymbolPrefix,
     admin,
-    treasuryAddress,
+    ZERO_ADDRESS,
     mockIncentivesController.address // ZERO_ADDRESS
   );
 
-  await configureReservesByHelper(reservesParams, allReservesAddresses, testHelpers, admin);
+  await configureReservesByHelper(
+    reservesParams,
+    allReservesAddresses,
+    protocolDataProvider,
+    admin
+  );
 
   await deployMockFlashLoanReceiver(addressesProvider.address);