fix(position): Update tokenId's type to String (#2903)

Zapper-fi · Aug 21, 2023 · 86e103a · 86e103a
1 parent 3a0c48f
commit 86e103a
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 24 deletions.
diff --git a/src/apps/y2k-finance/arbitrum/y2k-finance.farm-v1.contract-position-fetcher.ts b/src/apps/y2k-finance/arbitrum/y2k-finance.farm-v1.contract-position-fetcher.ts
@@ -43,29 +43,42 @@ export class ArbitrumY2KFinanceFarmV1ContractPositionFetcher extends ContractPos
     return farms.map(farm => ({ address: farm }));
   }
 
-  async getTokenDefinitions(
-    params: GetTokenDefinitionsParams<Y2KFinanceStakingRewards, DefaultContractPositionDefinition>,
-  ): Promise<UnderlyingTokenDefinition[] | null> {
+  async getTokenDefinitions({
+    contract,
+  }: GetTokenDefinitionsParams<Y2KFinanceStakingRewards, DefaultContractPositionDefinition>): Promise<
+    UnderlyingTokenDefinition[] | null
+  > {
+    const [stakingToken, tokenIdRaw, rewardsToken] = await Promise.all([
+      contract.stakingToken(),
+      contract.id(),
+      contract.rewardsToken(),
+    ]);
+
     return [
       {
         metaType: MetaType.SUPPLIED,
-        address: await params.contract.stakingToken(),
+        address: stakingToken,
         network: this.network,
-        tokenId: (await params.contract.id()).toNumber(),
+        tokenId: tokenIdRaw.toString(),
       },
       {
         metaType: MetaType.CLAIMABLE,
-        address: await params.contract.rewardsToken(),
+        address: rewardsToken,
         network: this.network,
       },
     ];
   }
 
-  async getLabel(
-    params: GetDisplayPropsParams<Y2KFinanceStakingRewards, DefaultDataProps, DefaultContractPositionDefinition>,
-  ): Promise<string> {
+  async getLabel({
+    contractPosition,
+  }: GetDisplayPropsParams<
+    Y2KFinanceStakingRewards,
+    DefaultDataProps,
+    DefaultContractPositionDefinition
+  >): Promise<string> {
+    const stakingTokenAddress = contractPosition.tokens[0];
     const vault = this.contractFactory.y2KFinanceVaultV1({
-      address: await params.contract.stakingToken(),
+      address: stakingTokenAddress.address,
       network: this.network,
     });
     const name = await vault.name();

diff --git a/src/apps/y2k-finance/arbitrum/y2k-finance.mint-v1.contract-position-fetcher.ts b/src/apps/y2k-finance/arbitrum/y2k-finance.mint-v1.contract-position-fetcher.ts
@@ -58,21 +58,22 @@ export class ArbitrumY2KFinanceMintV1ContractPositionFetcher extends ContractPos
   async getTokenDefinitions(
     params: GetTokenDefinitionsParams<Y2KFinanceVaultV1, DefaultContractPositionDefinition>,
   ): Promise<UnderlyingTokenDefinition[] | null> {
-    const epochIds = await this.getEpochIds(params.multicall, params.contract);
+    const epochIdsRaw = await this.getEpochIds(params.multicall, params.contract);
     const claimableAsset = await params.contract.asset();
+    const epochIds = epochIdsRaw.map(x => x.toString());
     return epochIds
-      .map(id => [
+      .map(tokenId => [
         {
           metaType: MetaType.SUPPLIED,
           address: params.contract.address,
           network: this.network,
-          tokenId: id.toNumber(),
+          tokenId,
         },
         {
           metaType: MetaType.CLAIMABLE,
           address: claimableAsset,
           network: this.network,
-          tokenId: id.toNumber(),
+          tokenId,
         },
       ])
       .flat();

diff --git a/src/apps/y2k-finance/arbitrum/y2k-finance.mint-v2.contract-position-fetcher.ts b/src/apps/y2k-finance/arbitrum/y2k-finance.mint-v2.contract-position-fetcher.ts
@@ -46,22 +46,23 @@ export class ArbitrumY2KFinanceMintV2ContractPositionFetcher extends ContractPos
   async getTokenDefinitions(
     params: GetTokenDefinitionsParams<Y2KFinanceCarousel, DefaultContractPositionDefinition>,
   ): Promise<UnderlyingTokenDefinition[] | null> {
-    const epochIds = await params.contract.getAllEpochs();
+    const epochIdsRaw = await params.contract.getAllEpochs();
     const claimableAsset = await params.contract.asset();
     const emission = await params.contract.emissionsToken();
+    const epochIds = epochIdsRaw.map(x => x.toString());
     return epochIds
-      .map(id => [
+      .map(tokenId => [
         {
           metaType: MetaType.SUPPLIED,
           address: params.contract.address,
           network: this.network,
-          tokenId: id.toNumber(),
+          tokenId,
         },
         {
           metaType: MetaType.CLAIMABLE,
           address: claimableAsset,
           network: this.network,
-          tokenId: id.toNumber(),
+          tokenId,
         },
         {
           metaType: MetaType.CLAIMABLE,

diff --git a/src/position/selectors/app-token-selector.interface.ts b/src/position/selectors/app-token-selector.interface.ts
@@ -10,7 +10,7 @@ export type LoggingTags = {
 export type AppTokenSelectorKey = {
   address: string;
   network: Network;
-  tokenId?: number;
+  tokenId?: string;
 };
 
 export type GetOne = (opts: AppTokenSelectorKey) => Promise<AppTokenPosition | null>;

diff --git a/src/position/selectors/token-dependency-selector.interface.ts b/src/position/selectors/token-dependency-selector.interface.ts
@@ -10,7 +10,7 @@ export type LoggingTags = {
 export type TokenDependencySelectorKey = {
   address: string;
   network: Network;
-  tokenId?: number;
+  tokenId?: string;
 };
 
 export type TokenDependency = BaseToken | AppTokenPosition | NonFungibleToken;

diff --git a/src/position/template/app-token.template.position-fetcher.ts b/src/position/template/app-token.template.position-fetcher.ts
@@ -208,8 +208,7 @@ export abstract class AppTokenTemplatePositionFetcher<
               const isMaybeTokenIdMatch =
                 isUndefined(definition.tokenId) ||
                 (token.type === ContractType.APP_TOKEN && token.dataProps.tokenId === definition.tokenId) ||
-                (token.type === ContractType.NON_FUNGIBLE_TOKEN &&
-                  Number(token.assets?.[0].tokenId) === definition.tokenId);
+                (token.type === ContractType.NON_FUNGIBLE_TOKEN && token.assets?.[0].tokenId === definition.tokenId);
 
               return isAddressMatch && isNetworkMatch && isMaybeTokenIdMatch;
             });

diff --git a/src/position/template/app-token.template.types.ts b/src/position/template/app-token.template.types.ts
@@ -17,7 +17,7 @@ export type DefaultAppTokenDataProps = {
 export type UnderlyingTokenDefinition = {
   address: string;
   network: Network;
-  tokenId?: number;
+  tokenId?: string;
 };
 
 // PHASE 1: List addresses and definitions

diff --git a/src/position/template/contract-position.template.types.ts b/src/position/template/contract-position.template.types.ts
@@ -14,7 +14,7 @@ export type UnderlyingTokenDefinition = {
   metaType: MetaType;
   address: string;
   network: Network;
-  tokenId?: number;
+  tokenId?: string;
 };
 
 // PHASE 1: List definitions