feat: gnosis activation proposal

foundry.toml

@@ -2,6 +2,7 @@
 src = 'src'
 test = 'tests'
 script = 'scripts'
+solc = '0.8.19'
 out = 'out'
 libs = ['lib']
 remappings = [

generator/features/__snapshots__/assetListing.spec.ts.snap

@@ -89,6 +89,7 @@ pragma solidity ^0.8.0;
 import {AaveV3Ethereum, AaveV3EthereumEModes} from 'aave-address-book/AaveV3Ethereum.sol';
 import {AaveV3PayloadEthereum} from 'aave-helpers/v3-config-engine/AaveV3PayloadEthereum.sol';
 import {IAaveV3ConfigEngine} from 'aave-helpers/v3-config-engine/IAaveV3ConfigEngine.sol';
+import {IV3RateStrategyFactory} from 'aave-helpers/v3-config-engine/IV3RateStrategyFactory.sol';
 
 /**
  * @title test
@@ -100,7 +101,7 @@ contract AaveV3Ethereum_Test_20231023 is AaveV3PayloadEthereum {
   address public constant PSP = address(0xcAfE001067cDEF266AfB7Eb5A286dCFD277f3dE5);
 
   function _postExecute() internal override {
-    AaveV3Ethereum.POOL.supply(PSP, 10 ** 18, AaveV3Ethereum.COLLECTOR, 0);
+    AaveV3Ethereum.POOL.supply(PSP, 10 ** 18, address(AaveV3Ethereum.COLLECTOR), 0);
   }
 
   function newListings() public pure override returns (IAaveV3ConfigEngine.Listing[] memory) {
@@ -124,7 +125,7 @@ contract AaveV3Ethereum_Test_20231023 is AaveV3PayloadEthereum {
       borrowCap: 5_000,
       debtCeiling: 100_000,
       liqProtocolFee: 20_00,
-      rateStrategyParams: Rates.RateStrategyParams({
+      rateStrategyParams: IV3RateStrategyFactory.RateStrategyParams({
         optimalUsageRatio: _bpsToRay(80_00),
         baseVariableBorrowRate: _bpsToRay(0_00),
         variableRateSlope1: _bpsToRay(10_00),
@@ -146,6 +147,7 @@ pragma solidity ^0.8.0;
 
 import {GovV3Helpers} from 'aave-helpers/GovV3Helpers.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
+import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
 
 import 'forge-std/Test.sol';
 import {ProtocolV3TestBase, ReserveConfig} from 'aave-helpers/ProtocolV3TestBase.sol';
@@ -159,7 +161,7 @@ contract AaveV3Ethereum_Test_20231023_Test is ProtocolV3TestBase {
   AaveV3Ethereum_Test_20231023 internal proposal;
 
   function setUp() public {
-    vm.createSelectFork(vm.rpcUrl('mainnet'), 18420741);
+    vm.createSelectFork(vm.rpcUrl('mainnet'), 18430155);
     proposal = new AaveV3Ethereum_Test_20231023();
   }
 
@@ -172,8 +174,10 @@ contract AaveV3Ethereum_Test_20231023_Test is ProtocolV3TestBase {
 
   function test_collectorHasPSPFunds() public {
     GovV3Helpers.executePayload(vm, address(proposal));
-    assertGte(
-      IERC20(0xcAfE001067cDEF266AfB7Eb5A286dCFD277f3dE5).balanceOf(AaveV3Ethereum.COLLECTOR),
+    assertGe(
+      IERC20(0xcAfE001067cDEF266AfB7Eb5A286dCFD277f3dE5).balanceOf(
+        address(AaveV3Ethereum.COLLECTOR)
+      ),
       10 ** 18
     );
   }
@@ -240,7 +244,7 @@ exports[`feature: assetListing > should return reasonable code 1`] = `
       "address public constant PSP = address(0xcAfE001067cDEF266AfB7Eb5A286dCFD277f3dE5);",
     ],
     "execute": [
-      "AaveV3Ethereum.POOL.supply(PSP, 10 ** 18, AaveV3Ethereum.COLLECTOR, 0);",
+      "AaveV3Ethereum.POOL.supply(PSP, 10 ** 18, address(AaveV3Ethereum.COLLECTOR), 0);",
     ],
     "fn": [
       "function newListings() public pure override returns (IAaveV3ConfigEngine.Listing[] memory) {
@@ -264,7 +268,7 @@ exports[`feature: assetListing > should return reasonable code 1`] = `
                borrowCap: 5_000,
                debtCeiling: 100_000,
                liqProtocolFee: 20_00,
-               rateStrategyParams: Rates.RateStrategyParams({
+               rateStrategyParams: IV3RateStrategyFactory.RateStrategyParams({
                   optimalUsageRatio: _bpsToRay(80_00),
                   baseVariableBorrowRate: _bpsToRay(0_00),
                   variableRateSlope1: _bpsToRay(10_00),
@@ -285,7 +289,7 @@ exports[`feature: assetListing > should return reasonable code 1`] = `
     "fn": [
       "function test_collectorHasPSPFunds() public {
             GovV3Helpers.executePayload(vm,address(proposal));
-            assertGte(IERC20(0xcAfE001067cDEF266AfB7Eb5A286dCFD277f3dE5).balanceOf(AaveV3Ethereum.COLLECTOR), 10 ** 18);
+            assertGe(IERC20(0xcAfE001067cDEF266AfB7Eb5A286dCFD277f3dE5).balanceOf(address(AaveV3Ethereum.COLLECTOR)), 10 ** 18);
           }",
     ],
   },

generator/features/assetListing.ts

@@ -12,7 +12,7 @@ import {TEST_EXECUTE_PROPOSAL} from '../utils/constants';
 
 async function fetchListing(pool: PoolIdentifier): Promise<Listing> {
   const asset = await addressInput({
-    message: 'enter the asset you want to list',
+    message: 'Enter the address of the asset you want to list',
     disableKeepCurrent: true,
   });
 
@@ -105,7 +105,7 @@ export const assetListing: FeatureModule<Listing[]> = {
         ),
         execute: cfg.map(
           (cfg) =>
-            `${pool}.POOL.supply(${cfg.assetSymbol}, 10 ** ${cfg.decimals}, ${pool}.COLLECTOR, 0);`
+            `${pool}.POOL.supply(${cfg.assetSymbol}, 10 ** ${cfg.decimals}, address(${pool}.COLLECTOR), 0);`
         ),
         fn: [
           `function newListings() public pure override returns (IAaveV3ConfigEngine.Listing[] memory) {
@@ -133,7 +133,7 @@ export const assetListing: FeatureModule<Listing[]> = {
                borrowCap: ${cfg.borrowCap},
                debtCeiling: ${cfg.debtCeiling},
                liqProtocolFee: ${cfg.liqProtocolFee},
-               rateStrategyParams: Rates.RateStrategyParams({
+               rateStrategyParams: IV3RateStrategyFactory.RateStrategyParams({
                   optimalUsageRatio: ${cfg.rateStrategyParams.optimalUtilizationRate},
                   baseVariableBorrowRate: ${cfg.rateStrategyParams.baseVariableBorrowRate},
                   variableRateSlope1: ${cfg.rateStrategyParams.variableRateSlope1},
@@ -156,7 +156,7 @@ export const assetListing: FeatureModule<Listing[]> = {
         fn: cfg.map(
           (cfg) => `function test_collectorHas${cfg.assetSymbol}Funds() public {
             ${TEST_EXECUTE_PROPOSAL}
-            assertGte(IERC20(${cfg.asset}).balanceOf(${pool}.COLLECTOR), 10 ** ${cfg.decimals});
+            assertGe(IERC20(${cfg.asset}).balanceOf(address(${pool}.COLLECTOR)), 10 ** ${cfg.decimals});
           }`
         ),
       },
@@ -214,7 +214,7 @@ export const assetListingCustom: FeatureModule<ListingWithCustomImpl[]> = {
                borrowCap: ${cfg.base.borrowCap},
                debtCeiling: ${cfg.base.debtCeiling},
                liqProtocolFee: ${cfg.base.liqProtocolFee},
-               rateStrategyParams: Rates.RateStrategyParams({
+               rateStrategyParams: IV3RateStrategyFactory.RateStrategyParams({
                   optimalUsageRatio: ${cfg.base.rateStrategyParams.optimalUtilizationRate},
                   baseVariableBorrowRate: ${cfg.base.rateStrategyParams.baseVariableBorrowRate},
                   variableRateSlope1: ${cfg.base.rateStrategyParams.variableRateSlope1},

generator/features/collateralsUpdates.ts

@@ -55,9 +55,9 @@ export const collateralsUpdates: FeatureModule<CollateralUpdates> = {
       code: {
         fn: [
           `function collateralsUpdates() public pure override returns (IAaveV3ConfigEngine.CollateralUpdate[] memory) {
-            IAaveV3ConfigEngine.CollateralUpdate[] memory collateralUpdate = new IAaveV3ConfigEngine.CollateralUpdate[](${
-              cfg.length
-            });
+          IAaveV3ConfigEngine.CollateralUpdate[] memory collateralUpdate = new IAaveV3ConfigEngine.CollateralUpdate[](${
+            cfg.length
+          });
 
           ${cfg
             .map(
@@ -68,7 +68,6 @@ export const collateralsUpdates: FeatureModule<CollateralUpdates> = {
                liqBonus: ${cfg.liqBonus},
                debtCeiling: ${cfg.debtCeiling},
                liqProtocolFee: ${cfg.liqProtocolFee}
-               }
              });`
             )
             .join('\n')}

generator/features/eModesUpdates.ts

@@ -1,33 +1,69 @@
 import {CodeArtifact, FEATURE, FeatureModule, PoolIdentifier} from '../types';
 import {addressInput, eModesSelect, percentInput, stringInput} from '../prompts';
 import {EModeCategoryUpdate} from './types';
+import {confirm} from '@inquirer/prompts';
+
+async function fetchEmodeCategoryUpdate<T extends boolean>(
+  disableKeepCurrent?: T,
+  eModeCategory?: string
+): Promise<EModeCategoryUpdate> {
+  return {
+    eModeCategory:
+      eModeCategory ?? (await stringInput({message: 'eModeCategory', disableKeepCurrent})),
+    ltv: await percentInput({
+      message: 'ltv',
+      disableKeepCurrent,
+    }),
+    liqThreshold: await percentInput({
+      message: 'liqThreshold',
+      disableKeepCurrent,
+    }),
+    liqBonus: await percentInput({
+      message: 'liqBonus',
+      disableKeepCurrent,
+    }),
+    priceSource: await addressInput({
+      message: 'Price Source',
+      disableKeepCurrent,
+    }),
+    label: await stringInput({
+      message: 'label',
+      disableKeepCurrent,
+    }),
+  };
+}
 
 async function subCli(pool: PoolIdentifier) {
-  console.log(`Fetching information for EModes on ${pool}`);
-  const eModeCategories = await eModesSelect({
-    message: 'Select the eModes you want to amend',
-    pool,
-  });
   const answers: EmodeUpdates = [];
-  for (const eModeCategory of eModeCategories) {
-    console.log(`collecting info for ${eModeCategory}`);
-    answers.push({
-      eModeCategory,
-      ltv: await percentInput({
-        message: 'ltv',
-      }),
-      liqThreshold: await percentInput({
-        message: 'liqThreshold',
-      }),
-      liqBonus: await percentInput({
-        message: 'liqBonus',
-      }),
-      priceSource: await addressInput({
-        message: 'Price Source',
-      }),
-      label: await stringInput({message: 'label'}),
+
+  const shouldAddNewCategory = await confirm({
+    message: 'Do you wish to add a new emode category?',
+    default: false,
+  });
+  if (shouldAddNewCategory) {
+    let more: boolean = true;
+    while (more) {
+      answers.push(await fetchEmodeCategoryUpdate(true));
+      more = await confirm({message: 'Do you want to add another emode category?', default: false});
+    }
+  }
+
+  const shouldAmendCategory = await confirm({
+    message: 'Do you wish to amend existing emode category?',
+    default: false,
+  });
+  if (shouldAmendCategory) {
+    const eModeCategories = await eModesSelect({
+      message: 'Select the eModes you want to amend',
+      pool,
     });
+
+    for (const eModeCategory of eModeCategories) {
+      console.log(`collecting info for ${eModeCategory}`);
+      answers.push(await fetchEmodeCategoryUpdate(false, eModeCategory));
+    }
   }
+
   return answers;
 }
 
@@ -57,7 +93,9 @@ export const eModeUpdates: FeatureModule<EmodeUpdates> = {
                liqThreshold: ${cfg.liqThreshold},
                liqBonus: ${cfg.liqBonus},
                priceSource: ${cfg.priceSource},
-               label: ${cfg.label}
+               label: ${
+                 cfg.label == 'EngineFlags.KEEP_CURRENT_STRING' ? cfg.label : `"${cfg.label}"`
+               }
              });`
             )
             .join('\n')}

generator/features/priceFeedsUpdates.ts

@@ -31,20 +31,20 @@ export const priceFeedsUpdates: FeatureModule<PriceFeedUpdate[]> = {
       code: {
         fn: [
           `function priceFeedsUpdates() public pure override returns (IAaveV3ConfigEngine.PriceFeedUpdate[] memory) {
-          IAaveV3ConfigEngine.PriceFeedUpdate[] memory priceFeedsUpdates = new IAaveV3ConfigEngine.PriceFeedUpdate[](${
+          IAaveV3ConfigEngine.PriceFeedUpdate[] memory priceFeedUpdates = new IAaveV3ConfigEngine.PriceFeedUpdate[](${
             cfg.length
           });
 
           ${cfg
             .map(
-              (cfg, ix) => `priceFeedsUpdates[${ix}] = IAaveV3ConfigEngine.PriceFeedUpdate({
+              (cfg, ix) => `priceFeedUpdates[${ix}] = IAaveV3ConfigEngine.PriceFeedUpdate({
                asset: ${cfg.asset},
                priceFeed: ${cfg.priceFeed}
              });`
             )
             .join('\n')}
 
-          return priceFeedsUpdates;
+          return priceFeedUpdates;
         }`,
         ],
       },

generator/features/rateUpdates.ts

@@ -54,7 +54,7 @@ export async function fetchRateStrategyParamsV3(disableKeepCurrent?: boolean) {
       disableKeepCurrent,
     }),
     optimalStableToTotalDebtRatio: await percentInput({
-      message: 'stableRateExcessOffset',
+      message: 'optimalStableToTotalDebtRatio',
       toRay: true,
       disableKeepCurrent,
     }),
@@ -94,7 +94,7 @@ export const rateUpdatesV2: FeatureModule<RateStrategyUpdate[]> = {
             .map(
               (cfg, ix) => `rateStrategies[${ix}] = IAaveV2ConfigEngine.RateStrategyUpdate({
                 asset: ${cfg.asset},
-                params: Rates.RateStrategyParams({
+                params: IV2RateStrategyFactory.RateStrategyParams({
                   optimalUtilizationRate: ${cfg.params.optimalUtilizationRate},
                   baseVariableBorrowRate: ${cfg.params.baseVariableBorrowRate},
                   variableRateSlope1: ${cfg.params.variableRateSlope1},
@@ -149,7 +149,7 @@ export const rateUpdatesV3: FeatureModule<RateStrategyUpdate[]> = {
             .map(
               (cfg, ix) => `rateStrategies[${ix}] = IAaveV3ConfigEngine.RateStrategyUpdate({
                   asset: ${cfg.asset},
-                  params: Rates.RateStrategyParams({
+                  params: IV3RateStrategyFactory.RateStrategyParams({
                     optimalUsageRatio: ${cfg.params.optimalUtilizationRate},
                     baseVariableBorrowRate: ${cfg.params.baseVariableBorrowRate},
                     variableRateSlope1: ${cfg.params.variableRateSlope1},

generator/generator.ts

@@ -47,6 +47,7 @@ export async function generateFiles(options: Options, poolConfigs: PoolConfigs):
       default: false,
     });
   }
+
   async function createPayloadAndTest(options: Options, pool: PoolIdentifier) {
     const contractName = generateContractName(options, pool);
     const testCode = await testTemplate(options, poolConfigs[pool]!);
@@ -62,6 +63,7 @@ export async function generateFiles(options: Options, poolConfigs: PoolConfigs):
       contractName: contractName,
     };
   }
+
   console.log('generating script');
   const script = prettier.format(generateScript(options), {
     ...prettierSolCfg,