Support custom aToken deployments

helpers/contracts-deployments.ts

@@ -288,7 +288,7 @@ export const deployMintableDelegationERC20 = async (
     verify
   );
 export const deployDefaultReserveInterestRateStrategy = async (
-  args: [tEthereumAddress, string, string, string, string, string],
+  args: [tEthereumAddress, string, string, string, string, string, string],
   verify: boolean
 ) =>
   withSaveAndVerify(

helpers/init-helpers.ts

@@ -1,4 +1,4 @@
-import { iMultiPoolsAssets, IReserveParams, tEthereumAddress } from './types';
+import { eContractid, iMultiPoolsAssets, IReserveParams, tEthereumAddress } from './types';
 import { AaveProtocolDataProvider } from '../types/AaveProtocolDataProvider';
 import { chunk, waitForTx } from './misc-utils';
 import {
@@ -11,11 +11,23 @@ import { BigNumberish } from 'ethers';
 import {
   deployDefaultReserveInterestRateStrategy,
   deployDelegationAwareAToken,
+  deployGenericAToken,
   deployStableDebtToken,
   deployVariableDebtToken,
 } from './contracts-deployments';
 import { ZERO_ADDRESS } from './constants';
 
+const chooseATokenDeployment = (id: eContractid) => {
+  switch (id) {
+    case eContractid.AToken:
+      return deployGenericAToken;
+    case eContractid.DelegationAwareAToken:
+      return deployDelegationAwareAToken;
+    default:
+      throw Error(`Missing aToken deployment script for: ${id}`);
+  }
+};
+
 export const initReservesByHelper = async (
   reservesParams: iMultiPoolsAssets<IReserveParams>,
   tokenAddresses: { [symbol: string]: tEthereumAddress },
@@ -36,9 +48,11 @@ export const initReservesByHelper = async (
   const tokensChunks = 4;
   const initChunks = 6;
 
-  // Deploy tokens and rates in chunks
+  // Deploy tokens and rates that uses common aToken in chunks
   const reservesChunks = chunk(
-    Object.entries(reservesParams) as [string, IReserveParams][],
+    Object.entries(reservesParams).filter(
+      ([_, { aTokenImpl }]) => aTokenImpl === eContractid.AToken
+    ) as [string, IReserveParams][],
     tokensChunks
   );
   // Initialize variables for future reserves initialization
@@ -70,10 +84,6 @@ export const initReservesByHelper = async (
     const reservesDecimals: string[] = [];
 
     for (let [assetSymbol, { reserveDecimals }] of reservesChunk) {
-      // Skip UNI due is aDelegatedToken
-      if (assetSymbol === 'UNI') {
-        continue;
-      }
       const assetAddressIndex = Object.keys(tokenAddresses).findIndex(
         (value) => value === assetSymbol
       );
@@ -146,43 +156,56 @@ export const initReservesByHelper = async (
     reserveSymbols = [...reserveSymbols, ...symbols];
   }
 
-  // Deploy UNI token due is delegated aToken
+  // Deploy delegated aware reserves tokens
-  if (tokenAddresses.UNI) {
+  const delegatedAwareReserves = Object.entries(reservesParams).filter(
-    console.log('  - Deploy UNI delegated aToken, debts tokens, and strategy');
+    ([_, { aTokenImpl }]) => aTokenImpl === eContractid.DelegationAwareAToken
+  ) as [string, IReserveParams][];
+
+  for (let [symbol, params] of delegatedAwareReserves) {
+    console.log(`  - Deploy ${symbol} delegation await aToken, debts tokens, and strategy`);
     const {
+      optimalUtilizationRate,
       baseVariableBorrowRate,
       variableRateSlope1,
       variableRateSlope2,
       stableRateSlope1,
       stableRateSlope2,
-    } = reservesParams.UNI;
+    } = params;
-    const aTokenUNI = await deployDelegationAwareAToken(
+    const deployCustomAToken = chooseATokenDeployment(params.aTokenImpl);
-      [poolAddress, tokenAddresses.UNI, 'Aave interest bearing UNI', 'aUNI', ZERO_ADDRESS],
+    const aToken = await deployCustomAToken(
-      verify
-    );
-    const stableDebtUNI = await deployStableDebtToken(
       [
         poolAddress,
-        tokenAddresses.UNI,
+        tokenAddresses[symbol],
-        'Aave stable debt bearing UNI',
+        `Aave interest bearing ${symbol}`,
-        'stableDebtUNI',
+        `a${symbol}`,
         ZERO_ADDRESS,
       ],
       verify
     );
-    const variableDebtUNI = await deployVariableDebtToken(
+    const stableDebt = await deployStableDebtToken(
       [
         poolAddress,
-        tokenAddresses.UNI,
+        tokenAddresses[symbol],
-        'Aave variable debt bearing UNI',
+        `Aave stable debt bearing ${symbol}`,
-        'variableDebtUNI',
+        `stableDebt${symbol}`,
         ZERO_ADDRESS,
       ],
       verify
     );
-    const ratesUNI = await deployDefaultReserveInterestRateStrategy(
+    const variableDebt = await deployVariableDebtToken(
       [
-        tokenAddresses.UNI,
+        poolAddress,
+        tokenAddresses[symbol],
+        `Aave variable debt bearing ${symbol}`,
+        `variableDebt${symbol}`,
+        ZERO_ADDRESS,
+      ],
+      verify
+    );
+    const rates = await deployDefaultReserveInterestRateStrategy(
+      [
+        tokenAddresses[symbol],
+        optimalUtilizationRate,
         baseVariableBorrowRate,
         variableRateSlope1,
         variableRateSlope2,
@@ -192,13 +215,13 @@ export const initReservesByHelper = async (
       verify
     );
 
-    deployedStableTokens.push(stableDebtUNI.address);
+    deployedStableTokens.push(stableDebt.address);
-    deployedVariableTokens.push(variableDebtUNI.address);
+    deployedVariableTokens.push(variableDebt.address);
-    deployedATokens.push(aTokenUNI.address);
+    deployedATokens.push(aToken.address);
-    deployedRates.push(ratesUNI.address);
+    deployedRates.push(rates.address);
-    reserveInitDecimals.push(reservesParams.UNI.reserveDecimals);
+    reserveInitDecimals.push(params.reserveDecimals);
-    reserveTokens.push(tokenAddresses.UNI);
+    reserveTokens.push(tokenAddresses[symbol]);
-    reserveSymbols.push('UNI');
+    reserveSymbols.push(symbol);
   }
 
   // Deploy init reserves per chunks

helpers/types.ts

@@ -260,7 +260,9 @@ export enum TokenContractId {
   ENJ = 'ENJ',
 }
 
-export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {}
+export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {
+  aTokenImpl: eContractid;
+}
 
 export interface IReserveBorrowParams {
   optimalUtilizationRate: string;

markets/aave/reservesConfigs.ts

@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js';
-import {oneRay} from '../../helpers/constants';
+import { oneRay } from '../../helpers/constants';
-import {IReserveParams} from '../../helpers/types';
+import { eContractid, IReserveParams } from '../../helpers/types';
 
 export const strategyBase: IReserveParams = {
   optimalUtilizationRate: new BigNumber(0.8).multipliedBy(oneRay).toFixed(),
@@ -15,6 +15,7 @@ export const strategyBase: IReserveParams = {
   borrowingEnabled: true,
   stableBorrowRateEnabled: true,
   reserveDecimals: '18',
+  aTokenImpl: eContractid.AToken,
 };
 
 export const stablecoinStrategyBase: IReserveParams = {
@@ -30,6 +31,7 @@ export const stablecoinStrategyBase: IReserveParams = {
   borrowingEnabled: true,
   stableBorrowRateEnabled: true,
   reserveDecimals: '18',
+  aTokenImpl: eContractid.AToken,
 };
 
 export const stablecoinStrategyCentralized: IReserveParams = {
@@ -45,6 +47,7 @@ export const stablecoinStrategyCentralized: IReserveParams = {
   borrowingEnabled: true,
   stableBorrowRateEnabled: true,
   reserveDecimals: '6',
+  aTokenImpl: eContractid.AToken,
 };
 
 export const strategyGovernanceTokens: IReserveParams = {
@@ -132,6 +135,7 @@ export const stablecoinStrategySUSD: IReserveParams = {
   borrowingEnabled: true,
   stableBorrowRateEnabled: false,
   reserveDecimals: '18',
+  aTokenImpl: eContractid.AToken,
 };
 
 export const strategySNX: IReserveParams = {
@@ -159,6 +163,7 @@ export const stablecoinStrategyTUSD: IReserveParams = {
 export const strategyUNI: IReserveParams = {
   ...strategyGovernanceTokens,
   stableBorrowRateEnabled: false,
+  aTokenImpl: eContractid.DelegationAwareAToken,
 };
 
 export const stablecoinStrategyUSDC: IReserveParams = {
@@ -190,6 +195,7 @@ export const strategyWBTC: IReserveParams = {
   borrowingEnabled: true,
   stableBorrowRateEnabled: true,
   reserveDecimals: '8',
+  aTokenImpl: eContractid.AToken,
 };
 
 export const strategyWETH: IReserveParams = {
@@ -205,6 +211,7 @@ export const strategyWETH: IReserveParams = {
   borrowingEnabled: true,
   stableBorrowRateEnabled: true,
   reserveDecimals: '18',
+  aTokenImpl: eContractid.AToken,
 };
 
 export const strategyYFI: IReserveParams = {