fix(yearn): Fix Yearn token prices (Zapper-fi#1185)

0xrmvdao · Aug 16, 2022 · 569aa53 · 569aa53
1 parent 91b06cc
commit 569aa53
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/apps/yearn/ethereum/yearn.v1-vault.token-fetcher.ts b/src/apps/yearn/ethereum/yearn.v1-vault.token-fetcher.ts
@@ -37,12 +37,12 @@ export class EthereumYearnV1VaultTokenFetcher extends YearnVaultTokenFetcher<Yea
     return this.contractFactory.yearnVault({ network: this.network, address });
   }
 
-  async getPricePerShare({ contract, appToken }: PricePerShareStageParams<YearnVault>) {
+  async getPricePerShare({ contract }: PricePerShareStageParams<YearnVault>) {
     const pricePerShareRaw = await contract.getPricePerFullShare().catch(err => {
       if (isMulticallUnderlyingError(err)) return 0;
       throw err;
     });
-    return Number(pricePerShareRaw) / 10 ** appToken.decimals;
+    return Number(pricePerShareRaw) / 10 ** 18;
   }
 
   async getDataProps(

diff --git a/src/apps/yearn/ethereum/yearn.yield.token-fetcher.ts b/src/apps/yearn/ethereum/yearn.yield.token-fetcher.ts
@@ -58,15 +58,14 @@ export class EthereumYearnYieldTokenFetcher extends AppTokenTemplatePositionFetc
 
   async getPricePerShare({
     contract,
-    appToken,
   }: PricePerShareStageParams<YearnVault, YearnYieldTokenDataProps>): Promise<number> {
     return contract
       .getPricePerFullShare()
       .catch(err => {
         if (isMulticallUnderlyingError(err)) return 0;
         throw err;
       })
-      .then(pps => Number(pps) / 10 ** appToken.decimals);
+      .then(pps => Number(pps) / 10 ** 18);
   }
 
   async getDataProps(

diff --git a/src/position/template/app-token.template.position-fetcher.ts b/src/position/template/app-token.template.position-fetcher.ts
@@ -9,7 +9,6 @@ import {
   buildPercentageDisplayItem,
 } from '~app-toolkit/helpers/presentation/display-item.present';
 import { getImagesFromToken } from '~app-toolkit/helpers/presentation/image.present';
-import { Erc20 } from '~contract/contracts';
 import { IMulticallWrapper } from '~multicall';
 import { ContractType } from '~position/contract.interface';
 import { DefaultDataProps, DisplayProps, StatsItem } from '~position/display.interface';
@@ -73,16 +72,19 @@ export abstract class AppTokenTemplatePositionFetcher<T extends Contract, V exte
   abstract getAddresses(): Promise<string[]>;
 
   // Token Props
-  async getSymbol({ contract }: TokenPropsStageParams<T>): Promise<string> {
-    return (contract as unknown as Erc20).symbol();
+  async getSymbol({ address, multicall }: TokenPropsStageParams<T>): Promise<string> {
+    const erc20 = this.appToolkit.globalContracts.erc20({ address, network: this.network });
+    return multicall.wrap(erc20).symbol();
   }
 
-  async getDecimals({ contract }: TokenPropsStageParams<T>): Promise<number> {
-    return (contract as unknown as Erc20).decimals();
+  async getDecimals({ address, multicall }: TokenPropsStageParams<T>): Promise<number> {
+    const erc20 = this.appToolkit.globalContracts.erc20({ address, network: this.network });
+    return multicall.wrap(erc20).decimals();
   }
 
-  async getSupply({ contract }: TokenPropsStageParams<T>): Promise<BigNumberish> {
-    return (contract as unknown as Erc20).totalSupply();
+  async getSupply({ address, multicall }: TokenPropsStageParams<T>): Promise<BigNumberish> {
+    const erc20 = this.appToolkit.globalContracts.erc20({ address, network: this.network });
+    return multicall.wrap(erc20).totalSupply();
   }
 
   // Price Properties