fix: add groupLabels and liquidity to stats (#600)

Zapper-fi · Jun 8, 2022 · 913c112 · 913c112
1 parent 8096038
commit 913c112
Show file tree

Hide file tree

Showing 63 changed files with 239 additions and 110 deletions.
diff --git a/src/apps/across/ethereum/across.pool.token-fetcher.ts b/src/apps/across/ethereum/across.pool.token-fetcher.ts
@@ -52,8 +52,14 @@ export class EthereumAcrossPoolTokenFetcher implements PositionFetcher<AppTokenP
         const tokens = [underlyingToken];
         const secondaryLabel = buildDollarDisplayItem(price);
         const images = [getAppImg(ACROSS_DEFINITION.id)];
-        const dataProps = {};
-        const displayProps = { label, secondaryLabel, images };
+        const liquidity = price * supply;
+        const dataProps = { liquidity };
+        const displayProps = {
+          label,
+          secondaryLabel,
+          images,
+          statsItems: [{ label: 'Liquidity', value: buildDollarDisplayItem(liquidity) }],
+        };
 
         const token: AppTokenPosition = {
           type: ContractType.APP_TOKEN,

diff --git a/src/apps/aelin/aelin.definition.ts b/src/apps/aelin/aelin.definition.ts
@@ -10,7 +10,7 @@ export const AELIN_DEFINITION = appDefinition({
   groups: {
     pool: { id: 'pool', type: GroupType.TOKEN, label: 'Pools' },
     vAelin: { id: 'v-aelin', type: GroupType.TOKEN, label: 'vAELIN' },
-    farm: { id: 'farm', type: GroupType.POSITION, label: 'Staking' },
+    farm: { id: 'farm', type: GroupType.POSITION, label: 'Staking', groupLabel: 'Farms' },
   },
   url: 'https://aelin.xyz/',
   links: {

diff --git a/src/apps/airswap/airswap.definition.ts b/src/apps/airswap/airswap.definition.ts
@@ -16,8 +16,8 @@ export const AIRSWAP_DEFINITION = appDefinition({
     medium: 'https://airswap.medium.com/',
   },
   groups: {
-    sASTv2: { id: 's-ast-v2', type: GroupType.TOKEN, label: 'Staking' },
-    sASTv3: { id: 's-ast-v3', type: GroupType.TOKEN, label: 'Staking' },
+    sASTv2: { id: 's-ast-v2', type: GroupType.TOKEN, label: 'Staking', groupLabel: 'Farms' },
+    sASTv3: { id: 's-ast-v3', type: GroupType.TOKEN, label: 'Staking', groupLabel: 'Farms' },
   },
   tags: [AppTag.DECENTRALIZED_EXCHANGE],
   supportedNetworks: {

diff --git a/src/apps/airswap/ethereum/airswap.s-ast-v2.token-fetcher.ts b/src/apps/airswap/ethereum/airswap.s-ast-v2.token-fetcher.ts
@@ -42,6 +42,7 @@ export class EthereumAirswapSAstV2TokenFetcher implements PositionFetcher<AppTok
     }
 
     const supply = Number(supplyRaw) / 10 ** decimals;
+    const liquidity = underlyingToken.price * supply;
 
     const token: AppTokenPosition = {
       type: ContractType.APP_TOKEN,
@@ -55,11 +56,17 @@ export class EthereumAirswapSAstV2TokenFetcher implements PositionFetcher<AppTok
       tokens: [underlyingToken],
       price: underlyingToken.price,
       pricePerShare: 1,
-      dataProps: {},
+      dataProps: { liquidity },
       displayProps: {
         label: 'sAST v2',
         secondaryLabel: buildDollarDisplayItem(underlyingToken.price),
         images: [getTokenImg(underlyingToken.address, network)],
+        statsItems: [
+          {
+            label: 'Liquidity',
+            value: buildDollarDisplayItem(liquidity),
+          },
+        ],
       },
     };
 

diff --git a/src/apps/airswap/ethereum/airswap.s-ast-v3.token-fetcher.ts b/src/apps/airswap/ethereum/airswap.s-ast-v3.token-fetcher.ts
@@ -42,6 +42,7 @@ export class EthereumAirswapSAstV3TokenFetcher implements PositionFetcher<AppTok
     }
 
     const supply = Number(supplyRaw) / 10 ** decimals;
+    const liquidity = underlyingToken.price * supply;
 
     const token: AppTokenPosition = {
       type: ContractType.APP_TOKEN,
@@ -55,11 +56,19 @@ export class EthereumAirswapSAstV3TokenFetcher implements PositionFetcher<AppTok
       tokens: [underlyingToken],
       price: underlyingToken.price,
       pricePerShare: 1,
-      dataProps: {},
+      dataProps: {
+        liquidity,
+      },
       displayProps: {
         label: 'sAST v3',
         secondaryLabel: buildDollarDisplayItem(underlyingToken.price),
         images: [getTokenImg(underlyingToken.address, network)],
+        statsItems: [
+          {
+            label: 'Liquidity',
+            value: buildDollarDisplayItem(liquidity),
+          },
+        ],
       },
     };
 

diff --git a/src/apps/alpha-v1/ethereum/alpha-v1.lending.token-fetcher.ts b/src/apps/alpha-v1/ethereum/alpha-v1.lending.token-fetcher.ts
@@ -20,6 +20,7 @@ import { AlphaV1ContractFactory } from '../contracts';
 type AlphaV1LendingTokenDataProps = {
   supplyApy: number;
   reserve: number;
+  liquidity: number;
 };
 
 const appId = ALPHA_V1_DEFINITION.id;
@@ -70,12 +71,16 @@ export class EthereumAlphaV1LendingTokenFetcher implements PositionFetcher<AppTo
     const utilizationRate = new BigNumber(totalDebtValueRaw.div(totalEthRaw).toString());
     const supplyApy = this.tripleSlope(utilizationRate).times(utilizationRate).times(0.9).toNumber();
     const tokens = [ethToken];
+    const liquidity = price * supply;
 
     // Display Props
     const label = symbol;
     const secondaryLabel = buildDollarDisplayItem(price);
     const images = [getTokenImg(ethToken.address, network)];
-    const statsItems = [{ label: 'Supply APY', value: buildPercentageDisplayItem(supplyApy) }];
+    const statsItems = [
+      { label: 'Supply APY', value: buildPercentageDisplayItem(supplyApy) },
+      { label: 'Liquidity', value: buildDollarDisplayItem(liquidity) },
+    ];
 
     const token: AppTokenPosition<AlphaV1LendingTokenDataProps> = {
       type: ContractType.APP_TOKEN,
@@ -93,6 +98,7 @@ export class EthereumAlphaV1LendingTokenFetcher implements PositionFetcher<AppTo
       dataProps: {
         supplyApy,
         reserve,
+        liquidity,
       },
 
       displayProps: {

diff --git a/src/apps/balancer-v2/balancer-v2.definition.ts b/src/apps/balancer-v2/balancer-v2.definition.ts
@@ -17,7 +17,7 @@ export const BALANCER_V2_DEFINITION = appDefinition({
   },
   groups: {
     pool: { id: 'pool', type: GroupType.TOKEN, label: 'Pools' },
-    farm: { id: 'farm', type: GroupType.POSITION, label: 'Staked' },
+    farm: { id: 'farm', type: GroupType.POSITION, label: 'Staked', groupLabel: 'Farms' },
     votingEscrow: { id: 'voting-escrow', type: GroupType.POSITION, label: 'Voting Escrow' },
     claimable: { id: 'claimable', type: GroupType.POSITION, label: 'Claimable' },
   },

diff --git a/src/apps/compound/helper/compound.borrow.contract-position-helper.ts b/src/apps/compound/helper/compound.borrow.contract-position-helper.ts
@@ -93,7 +93,10 @@ export class CompoundBorrowContractPositionHelper {
       const tertiaryLabel = isNumber(borrowApy) ? `${(borrowApy * 100).toFixed(3)}% APR` : '';
       const images = appToken.displayProps.images;
       const statsItems = isNumber(borrowApy)
-        ? [{ label: 'Borrow APR', value: buildPercentageDisplayItem(borrowApy) }]
+        ? [
+            { label: 'Borrow APR', value: buildPercentageDisplayItem(borrowApy) },
+            { label: 'Liquidity', value: buildDollarDisplayItem(dataProps.liquidity) },
+          ]
         : [];
 
       const contractPosition: ContractPosition<CompoundSupplyTokenDataProps> = {

diff --git a/src/apps/concentrator/ethereum/concentrator.acrv.token-fetcher.ts b/src/apps/concentrator/ethereum/concentrator.acrv.token-fetcher.ts
@@ -2,6 +2,7 @@ import { Inject } from '@nestjs/common';
 
 import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
 import { Register } from '~app-toolkit/decorators';
+import { buildDollarDisplayItem } from '~app-toolkit/helpers/presentation/display-item.present';
 import { getAppImg } from '~app-toolkit/helpers/presentation/image.present';
 import { ContractType } from '~position/contract.interface';
 import { PositionFetcher } from '~position/position-fetcher.interface';
@@ -40,6 +41,7 @@ export class EthereumConcentratorAcrvTokenFetcher implements PositionFetcher<App
     const supply = Number(supplyRaw) / 10 ** decimals;
     const pricePerShare = Number(underlyingRaw) / Number(supplyRaw);
     const price = underlyingToken.price * pricePerShare;
+    const liquidity = price * supply;
 
     // TODO: add additional properties from https://concentrator-api.aladdin.club/apy/
     const label = `Concentrator aCRV`;
@@ -57,10 +59,11 @@ export class EthereumConcentratorAcrvTokenFetcher implements PositionFetcher<App
       tokens: [underlyingToken],
       price,
       pricePerShare,
-      dataProps: {},
+      dataProps: { liquidity },
       displayProps: {
         label,
         images,
+        statsItems: [{ label: 'Liquidity', value: buildDollarDisplayItem(liquidity) }],
       },
     };
 

diff --git a/src/apps/curve/curve.definition.ts b/src/apps/curve/curve.definition.ts
@@ -15,7 +15,7 @@ export const CURVE_DEFINITION = appDefinition({
     telegram: 'https://t.me/curvefi',
   },
   groups: {
-    farm: { id: 'farm', type: GroupType.POSITION, label: 'Staking' },
+    farm: { id: 'farm', type: GroupType.POSITION, label: 'Staking', groupLabel: 'Farms' },
     pool: { id: 'pool', type: GroupType.TOKEN, label: 'Pools' },
     votingEscrow: { id: 'votingEscrow', type: GroupType.POSITION, label: 'Voting Escrow' },
     vestingEscrow: { id: 'vestingEscrow', type: GroupType.POSITION, label: 'Vesting' },

diff --git a/src/apps/dfx/dfx.definition.ts b/src/apps/dfx/dfx.definition.ts
@@ -16,8 +16,8 @@ export const DFX_DEFINITION = appDefinition({
     medium: 'https://medium.com/dfxfinance',
   },
   groups: {
-    dfxCurve: { id: 'dfx-curve', type: GroupType.TOKEN, label: 'DFX Curves' },
-    staking: { id: 'staking', type: GroupType.POSITION, label: 'DFX Staking' },
+    dfxCurve: { id: 'dfx-curve', type: GroupType.TOKEN, label: 'DFX Curves', groupLabel: 'Pools' },
+    staking: { id: 'staking', type: GroupType.POSITION, label: 'DFX Staking', groupLabel: 'Farms' },
   },
   tags: [AppTag.DECENTRALIZED_EXCHANGE, AppTag.LIQUIDITY_POOL, AppTag.STABLECOIN],
   supportedNetworks: {

diff --git a/src/apps/dfx/ethereum/dfx.staking.contract-position-fetcher.ts b/src/apps/dfx/ethereum/dfx.staking.contract-position-fetcher.ts
@@ -67,6 +67,7 @@ export class EthereumDfxStakingContractPositionFetcher implements PositionFetche
         const label = `Staked ${getLabelFromToken(stakedToken)}`;
         const images = getImagesFromToken(stakedToken);
         const secondaryLabel = buildDollarDisplayItem(stakedToken.price);
+        const statsItems = [{ label: 'Liquidity', value: buildDollarDisplayItem(liquidity) }];
 
         const position: ContractPosition<DfxCurveContractPositionDataProps> = {
           type: ContractType.POSITION,
@@ -82,6 +83,7 @@ export class EthereumDfxStakingContractPositionFetcher implements PositionFetche
             label,
             secondaryLabel,
             images,
+            statsItems,
           },
         };
         return position;

diff --git a/src/apps/dfx/polygon/dfx.staking.contract-position-fetcher.ts b/src/apps/dfx/polygon/dfx.staking.contract-position-fetcher.ts
@@ -67,6 +67,7 @@ export class PolygonDfxStakingContractPositionFetcher implements PositionFetcher
         const label = `Staked ${getLabelFromToken(stakedToken)}`;
         const images = getImagesFromToken(stakedToken);
         const secondaryLabel = buildDollarDisplayItem(stakedToken.price);
+        const statsItems = [{ label: 'Liquidity', value: buildDollarDisplayItem(liquidity) }];
 
         const position: ContractPosition<DfxCurveContractPositionDataProps> = {
           type: ContractType.POSITION,
@@ -82,6 +83,7 @@ export class PolygonDfxStakingContractPositionFetcher implements PositionFetcher
             label,
             secondaryLabel,
             images,
+            statsItems,
           },
         };
         return position;

diff --git a/src/apps/enzyme-finance/ethereum/enzyme-finance.vault.token-fetcher.ts b/src/apps/enzyme-finance/ethereum/enzyme-finance.vault.token-fetcher.ts
@@ -96,12 +96,18 @@ export class EthereumEnzymeFinanceVaultTokenFetcher implements PositionFetcher<A
         const pricePerShare = 1;
         const price = totalAssetUnderManagement / supply;
         const tokens = compact(underlyingTokens);
+        const liquidity = price * supply;
 
         const label = name;
         const secondaryLabel = buildDollarDisplayItem(price);
         const images = [getAppImg(appId)];
-        const dataProps = {};
-        const displayProps = { label, secondaryLabel, images };
+        const dataProps = { liquidity };
+        const displayProps = {
+          label,
+          secondaryLabel,
+          images,
+          statsItems: [{ label: 'Liquidity', value: buildDollarDisplayItem(liquidity) }],
+        };
 
         const token: AppTokenPosition = {
           type: ContractType.APP_TOKEN,

diff --git a/src/apps/euler/ethereum/euler.d-token.token-fetcher.ts b/src/apps/euler/ethereum/euler.d-token.token-fetcher.ts
@@ -83,7 +83,13 @@ export class EthereumEulerDTokenTokenFetcher implements PositionFetcher<AppToken
 
         if (totalSupply.isZero() || !underlyingToken) return null;
 
-        const liquidity = Number(totalSupply) * underlyingToken.price;
+        const dataProps = {
+          name: `Euler D token ${market.name}`,
+          liquidity: Number(totalSupply) * underlyingToken.price,
+          interestRate: Number(market.interestRate) / 10 ** 18,
+          borrowAPY: Number(market.borrowAPY) / 10 ** 18,
+          supplyAPY: Number(market.borrowAPY) / 10 ** 18,
+        };
 
         return {
           address: market.dTokenAddress,
@@ -96,20 +102,23 @@ export class EthereumEulerDTokenTokenFetcher implements PositionFetcher<AppToken
           network,
           decimals: 18,
           tokens: [underlyingToken],
-          dataProps: {
-            name: `Euler D token ${market.name}`,
-            interestRate: Number(market.interestRate) / 10 ** 18,
-            borrowAPY: Number(market.borrowAPY) / 10 ** 18,
-            supplyAPY: Number(market.borrowAPY) / 10 ** 18,
-          },
+          dataProps,
           displayProps: {
             label: `Euler D token ${market.name}`,
             secondaryLabel: buildDollarDisplayItem(underlyingToken.price),
             images: getImagesFromToken(underlyingToken),
             statsItems: [
               {
                 label: 'Liquidity',
-                value: buildDollarDisplayItem(liquidity),
+                value: buildDollarDisplayItem(dataProps.liquidity),
+              },
+              {
+                label: 'Borrow APY',
+                value: buildDollarDisplayItem(dataProps.borrowAPY),
+              },
+              {
+                label: 'Supply APY',
+                value: buildDollarDisplayItem(dataProps.supplyAPY),
               },
             ],
           },

diff --git a/src/apps/euler/ethereum/euler.e-token.token-fetcher.ts b/src/apps/euler/ethereum/euler.e-token.token-fetcher.ts
@@ -87,7 +87,16 @@ export class EthereumEulerETokenTokenFetcher implements PositionFetcher<AppToken
 
         const pricePerShare = Number(totalSupply.toString()) / Number(market.totalBalances);
 
-        const liquidity = Number(totalSupply) * pricePerShare;
+        const dataProps = {
+          name: `Euler E token ${market.name}`,
+          liquidity: Number(totalSupply) * underlyingToken.price,
+          underlyingAddress: market.id,
+          interestRate: Number(market.interestRate) / 10 ** 18,
+          borrowAPY: Number(market.borrowAPY) / 10 ** 18,
+          supplyAPY: Number(market.borrowAPY) / 10 ** 18,
+          totalSupply: totalSupply.toString(),
+          totalBalances: market.totalBalances,
+        };
 
         return {
           address: market.eTokenAddress,
@@ -100,23 +109,23 @@ export class EthereumEulerETokenTokenFetcher implements PositionFetcher<AppToken
           network,
           decimals: 18,
           tokens: [underlyingToken],
-          dataProps: {
-            name: `Euler E token ${market.name}`,
-            underlyingAddress: market.id,
-            interestRate: Number(market.interestRate) / 10 ** 18,
-            borrowAPY: Number(market.borrowAPY) / 10 ** 18,
-            supplyAPY: Number(market.borrowAPY) / 10 ** 18,
-            totalSupply: totalSupply.toString(),
-            totalBalances: market.totalBalances,
-          },
+          dataProps,
           displayProps: {
             label: `Euler E token ${market.name}`,
             secondaryLabel: buildDollarDisplayItem(pricePerShare),
             images: getImagesFromToken(underlyingToken),
             statsItems: [
               {
                 label: 'Liquidity',
-                value: buildDollarDisplayItem(liquidity),
+                value: buildDollarDisplayItem(dataProps.liquidity),
+              },
+              {
+                label: 'Borrow APY',
+                value: buildDollarDisplayItem(dataProps.borrowAPY),
+              },
+              {
+                label: 'Supply APY',
+                value: buildDollarDisplayItem(dataProps.supplyAPY),
               },
             ],
           },

diff --git a/src/apps/euler/ethereum/euler.p-token.token-fetcher.ts b/src/apps/euler/ethereum/euler.p-token.token-fetcher.ts
@@ -83,7 +83,13 @@ export class EthereumEulerPTokenTokenFetcher implements PositionFetcher<AppToken
 
         if (totalSupply.isZero() || !underlyingToken) return null;
 
-        const liquidity = Number(totalSupply) * underlyingToken.price;
+        const dataProps = {
+          name: market.name,
+          liquidity: Number(totalSupply) * underlyingToken.price,
+          interestRate: Number(market.interestRate) / 10 ** 18,
+          borrowAPY: Number(market.borrowAPY) / 10 ** 18,
+          supplyAPY: Number(market.borrowAPY) / 10 ** 18,
+        };
 
         return {
           address: market.pTokenAddress,
@@ -96,20 +102,23 @@ export class EthereumEulerPTokenTokenFetcher implements PositionFetcher<AppToken
           network,
           decimals: 18,
           tokens: [underlyingToken],
-          dataProps: {
-            name: market.name,
-            interestRate: Number(market.interestRate) / 10 ** 18,
-            borrowAPY: Number(market.borrowAPY) / 10 ** 18,
-            supplyAPY: Number(market.borrowAPY) / 10 ** 18,
-          },
+          dataProps,
           displayProps: {
             label: `Euler P token ${market.name}`,
             secondaryLabel: buildDollarDisplayItem(underlyingToken.price),
             images: getImagesFromToken(underlyingToken),
             statsItems: [
               {
                 label: 'Liquidity',
-                value: buildDollarDisplayItem(liquidity),
+                value: buildDollarDisplayItem(dataProps.liquidity),
+              },
+              {
+                label: 'Borrow APY',
+                value: buildDollarDisplayItem(dataProps.borrowAPY),
+              },
+              {
+                label: 'Supply APY',
+                value: buildDollarDisplayItem(dataProps.supplyAPY),
               },
             ],
           },