fix: use forceApprove on generator for assetListing

bgd-labs · Oct 29, 2023 · 3454783 · 3454783
1 parent 1bad653
commit 3454783
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/generator/features/assetListing.ts b/generator/features/assetListing.ts
@@ -105,7 +105,7 @@ export const assetListing: FeatureModule<Listing[]> = {
         ),
         execute: cfg.map(
           (cfg) =>
-            `IERC20(${cfg.assetSymbol}).approve(address(${pool}.POOL), 10 * ${cfg.decimals});
+            `IERC20(${cfg.assetSymbol}).forceApprove(address(${pool}.POOL), 10 * ${cfg.decimals});
             ${pool}.POOL.supply(${cfg.assetSymbol}, 10 ** ${cfg.decimals}, address(${pool}.COLLECTOR), 0);`
         ),
         fn: [
@@ -187,7 +187,7 @@ export const assetListingCustom: FeatureModule<ListingWithCustomImpl[]> = {
         ),
         execute: cfg.map(
           (cfg) =>
-            `IERC20(${cfg.base.assetSymbol}).approve(address(${pool}.POOL), 10 * ${cfg.base.decimals});
+            `IERC20(${cfg.base.assetSymbol}).forceApprove(address(${pool}.POOL), 10 * ${cfg.base.decimals});
             ${pool}.POOL.supply(${cfg.base.assetSymbol}, 10 ** ${cfg.base.decimals}, ${pool}.COLLECTOR, 0);`
         ),
         fn: [

diff --git a/generator/templates/proposal.template.ts b/generator/templates/proposal.template.ts
@@ -29,6 +29,9 @@ export const proposalTemplate = (options: Options, poolConfig: PoolConfig) => {
   const usesConfigEngine = poolConfig.features.some(
     (f) => ![FEATURE.OTHERS, FEATURE.FLASH_BORROWER].includes(f)
   );
+  const isAssetListing = poolConfig.features.some(
+    (f) => [FEATURE.ASSET_LISTING, FEATURE.ASSET_LISTING_CUSTOM].includes(f)
+  );
   if (innerExecute) {
     if (usesConfigEngine) {
       optionalExecute = `function _postExecute() internal override {
@@ -50,10 +53,12 @@ export const proposalTemplate = (options: Options, poolConfig: PoolConfig) => {
  contract ${contractName} is ${
     usesConfigEngine ? `Aave${version}Payload${chain}` : 'IProposalGenericExecutor'
   } {
+   ${isAssetListing ? 'using SafeERC20 for IERC20;' : ''}
+
    ${constants}
- 
+
    ${optionalExecute}
- 
+
    ${functions}
  }`;
 

diff --git a/generator/utils/importsResolver.ts b/generator/utils/importsResolver.ts
@@ -97,6 +97,9 @@ export function prefixWithImports(code: string) {
   if (findMatch(code, 'IERC20')) {
     imports += `import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';\n`;
   }
+  if (findMatch(code, 'forceApprove')) {
+    imports += `import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';\n`;
+  }
 
   return imports + code;
 }