fix(sturdy): Fix Sturdy TVL and remove legacy TVL fetcher (#682)

Zapper-fi · Jun 21, 2022 · 9e89e65 · 9e89e65
1 parent 71fb81e
commit 9e89e65
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 66 deletions.
diff --git a/src/apps/sturdy/ethereum/sturdy.stable-debt.token-fetcher.ts b/src/apps/sturdy/ethereum/sturdy.stable-debt.token-fetcher.ts
@@ -13,7 +13,7 @@ const appId = STURDY_DEFINITION.id;
 const groupId = STURDY_DEFINITION.groups.stableDebt.id;
 const network = Network.ETHEREUM_MAINNET;
 
-@Register.TokenPositionFetcher({ appId, groupId, network })
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class EthereumSturdyStableDebtTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(@Inject(SturdyLendingTokenHelper) private readonly sturdyLendingTokenHelper: SturdyLendingTokenHelper) {}
 
@@ -23,9 +23,10 @@ export class EthereumSturdyStableDebtTokenFetcher implements PositionFetcher<App
       groupId,
       network,
       protocolDataProviderAddress: '0xa422ca380bd70eef876292839222159e41aaee17',
+      isDebt: true,
       resolveTokenAddress: ({ reserveTokenAddressesData }) => reserveTokenAddressesData.stableDebtTokenAddress,
       resolveLendingRate: ({ reserveData }) => reserveData.stableBorrowRate,
-      resolveLabel: ({ reserveToken }) => `Borrowed ${getLabelFromToken(reserveToken)}`,
+      resolveLabel: ({ reserveToken }) => getLabelFromToken(reserveToken),
       resolveApyLabel: ({ apy }) => `${(apy * 100).toFixed(3)}% APR (stable)`,
     });
   }

diff --git a/src/apps/sturdy/ethereum/sturdy.supply.token-fetcher.ts b/src/apps/sturdy/ethereum/sturdy.supply.token-fetcher.ts
@@ -13,7 +13,7 @@ const appId = STURDY_DEFINITION.id;
 const groupId = STURDY_DEFINITION.groups.supply.id;
 const network = Network.ETHEREUM_MAINNET;
 
-@Register.TokenPositionFetcher({ appId, groupId, network })
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class EthereumSturdySupplyTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(@Inject(SturdyLendingTokenHelper) private readonly sturdyLendingTokenHelper: SturdyLendingTokenHelper) {}
 

diff --git a/src/apps/sturdy/ethereum/sturdy.tvl-fetcher.ts b/src/apps/sturdy/ethereum/sturdy.tvl-fetcher.ts
diff --git a/src/apps/sturdy/ethereum/sturdy.variable-debt.token-fetcher.ts b/src/apps/sturdy/ethereum/sturdy.variable-debt.token-fetcher.ts
@@ -13,7 +13,7 @@ const appId = STURDY_DEFINITION.id;
 const groupId = STURDY_DEFINITION.groups.variableDebt.id;
 const network = Network.ETHEREUM_MAINNET;
 
-@Register.TokenPositionFetcher({ appId, groupId, network })
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class EthereumSturdyVariableDebtTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(@Inject(SturdyLendingTokenHelper) private readonly sturdyLendingTokenHelper: SturdyLendingTokenHelper) {}
 
@@ -23,9 +23,10 @@ export class EthereumSturdyVariableDebtTokenFetcher implements PositionFetcher<A
       groupId,
       network,
       protocolDataProviderAddress: '0xa422ca380bd70eef876292839222159e41aaee17',
+      isDebt: true,
       resolveTokenAddress: ({ reserveTokenAddressesData }) => reserveTokenAddressesData.variableDebtTokenAddress,
       resolveLendingRate: ({ reserveData }) => reserveData.variableBorrowRate,
-      resolveLabel: ({ reserveToken }) => `Borrowed ${getLabelFromToken(reserveToken)}`,
+      resolveLabel: ({ reserveToken }) => getLabelFromToken(reserveToken),
       resolveApyLabel: ({ apy }) => `${(apy * 100).toFixed(3)}% APR (variable)`,
     });
   }

diff --git a/src/apps/sturdy/fantom/sturdy.stable-debt.token-fetcher.ts b/src/apps/sturdy/fantom/sturdy.stable-debt.token-fetcher.ts
@@ -13,7 +13,7 @@ const appId = STURDY_DEFINITION.id;
 const groupId = STURDY_DEFINITION.groups.stableDebt.id;
 const network = Network.FANTOM_OPERA_MAINNET;
 
-@Register.TokenPositionFetcher({ appId, groupId, network })
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class FantomSturdyStableDebtTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(@Inject(SturdyLendingTokenHelper) private readonly sturdyLendingTokenHelper: SturdyLendingTokenHelper) {}
 
@@ -23,9 +23,10 @@ export class FantomSturdyStableDebtTokenFetcher implements PositionFetcher<AppTo
       groupId,
       network,
       protocolDataProviderAddress: '0x7ff2520cd7b76e8c49b5db51505b842d665f3e9a',
+      isDebt: true,
       resolveTokenAddress: ({ reserveTokenAddressesData }) => reserveTokenAddressesData.stableDebtTokenAddress,
       resolveLendingRate: ({ reserveData }) => reserveData.stableBorrowRate,
-      resolveLabel: ({ reserveToken }) => `Borrowed ${getLabelFromToken(reserveToken)}`,
+      resolveLabel: ({ reserveToken }) => getLabelFromToken(reserveToken),
       resolveApyLabel: ({ apy }) => `${(apy * 100).toFixed(3)}% APR (stable)`,
     });
   }

diff --git a/src/apps/sturdy/fantom/sturdy.supply.token-fetcher.ts b/src/apps/sturdy/fantom/sturdy.supply.token-fetcher.ts
@@ -13,7 +13,7 @@ const appId = STURDY_DEFINITION.id;
 const groupId = STURDY_DEFINITION.groups.supply.id;
 const network = Network.FANTOM_OPERA_MAINNET;
 
-@Register.TokenPositionFetcher({ appId, groupId, network })
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class FantomSturdySupplyTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(@Inject(SturdyLendingTokenHelper) private readonly sturdyLendingTokenHelper: SturdyLendingTokenHelper) {}
 

diff --git a/src/apps/sturdy/fantom/sturdy.tvl-fetcher.ts b/src/apps/sturdy/fantom/sturdy.tvl-fetcher.ts
diff --git a/src/apps/sturdy/fantom/sturdy.variable-debt.token-fetcher.ts b/src/apps/sturdy/fantom/sturdy.variable-debt.token-fetcher.ts
@@ -13,7 +13,7 @@ const appId = STURDY_DEFINITION.id;
 const groupId = STURDY_DEFINITION.groups.variableDebt.id;
 const network = Network.FANTOM_OPERA_MAINNET;
 
-@Register.TokenPositionFetcher({ appId, groupId, network })
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class FantomSturdyVariableDebtTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(@Inject(SturdyLendingTokenHelper) private readonly sturdyLendingTokenHelper: SturdyLendingTokenHelper) {}
 
@@ -23,9 +23,10 @@ export class FantomSturdyVariableDebtTokenFetcher implements PositionFetcher<App
       groupId,
       network,
       protocolDataProviderAddress: '0x7ff2520cd7b76e8c49b5db51505b842d665f3e9a',
+      isDebt: true,
       resolveTokenAddress: ({ reserveTokenAddressesData }) => reserveTokenAddressesData.variableDebtTokenAddress,
       resolveLendingRate: ({ reserveData }) => reserveData.variableBorrowRate,
-      resolveLabel: ({ reserveToken }) => `Borrowed ${getLabelFromToken(reserveToken)}`,
+      resolveLabel: ({ reserveToken }) => getLabelFromToken(reserveToken),
       resolveApyLabel: ({ apy }) => `${(apy * 100).toFixed(3)}% APR (variable)`,
     });
   }

diff --git a/src/apps/sturdy/helpers/sturdy.lending.token-helper.ts b/src/apps/sturdy/helpers/sturdy.lending.token-helper.ts
@@ -14,6 +14,7 @@ type SturdyLendingTokenHelperParams = Pick<
   | 'groupId'
   | 'network'
   | 'protocolDataProviderAddress'
+  | 'isDebt'
   | 'resolveTokenAddress'
   | 'resolveLendingRate'
   | 'resolveLabel'
@@ -32,6 +33,7 @@ export class SturdyLendingTokenHelper {
     groupId,
     network,
     protocolDataProviderAddress,
+    isDebt,
     resolveTokenAddress,
     resolveLendingRate,
     resolveLabel,
@@ -42,6 +44,7 @@ export class SturdyLendingTokenHelper {
       groupId,
       network,
       protocolDataProviderAddress,
+      isDebt,
       resolveContract: ({ address }) => this.contractFactory.sturdyLendingPool({ network, address }),
       resolveReserveTokens: ({ contract }) => contract.getReservesList(),
       resolveReserveTokenAddresses: async ({ contract, multicall, reserveTokenAddress }) =>

diff --git a/src/apps/sturdy/sturdy.module.ts b/src/apps/sturdy/sturdy.module.ts
@@ -6,12 +6,10 @@ import { SturdyContractFactory } from './contracts';
 import { EthereumSturdyBalanceFetcher } from './ethereum/sturdy.balance-fetcher';
 import { EthereumSturdyStableDebtTokenFetcher } from './ethereum/sturdy.stable-debt.token-fetcher';
 import { EthereumSturdySupplyTokenFetcher } from './ethereum/sturdy.supply.token-fetcher';
-import { EthereumSturdyTvlFetcher } from './ethereum/sturdy.tvl-fetcher';
 import { EthereumSturdyVariableDebtTokenFetcher } from './ethereum/sturdy.variable-debt.token-fetcher';
 import { FantomSturdyBalanceFetcher } from './fantom/sturdy.balance-fetcher';
 import { FantomSturdyStableDebtTokenFetcher } from './fantom/sturdy.stable-debt.token-fetcher';
 import { FantomSturdySupplyTokenFetcher } from './fantom/sturdy.supply.token-fetcher';
-import { FantomSturdyTvlFetcher } from './fantom/sturdy.tvl-fetcher';
 import { FantomSturdyVariableDebtTokenFetcher } from './fantom/sturdy.variable-debt.token-fetcher';
 import { SturdyLendingTokenHelper } from './helpers/sturdy.lending.token-helper';
 import { SturdyAppDefinition, STURDY_DEFINITION } from './sturdy.definition';
@@ -28,13 +26,11 @@ import { SturdyAppDefinition, STURDY_DEFINITION } from './sturdy.definition';
     EthereumSturdySupplyTokenFetcher,
     EthereumSturdyStableDebtTokenFetcher,
     EthereumSturdyVariableDebtTokenFetcher,
-    EthereumSturdyTvlFetcher,
     // Fantom
     FantomSturdyBalanceFetcher,
     FantomSturdySupplyTokenFetcher,
     FantomSturdyStableDebtTokenFetcher,
     FantomSturdyVariableDebtTokenFetcher,
-    FantomSturdyTvlFetcher,
   ],
 })
 export class SturdyAppModule extends AbstractApp() {}