Testnet tokens isolation (#668)

* remove bcd * add whitelist only for mainnet * fix logs
madfish-solutions · Jun 9, 2022 · 64aa321 · 64aa321
1 parent 3bd393d
commit 64aa321
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 111 deletions.
diff --git a/src/lib/better-call-dev/base.ts b/src/lib/better-call-dev/base.ts
diff --git a/src/lib/better-call-dev/index.ts b/src/lib/better-call-dev/index.ts
diff --git a/src/lib/better-call-dev/tokens.ts b/src/lib/better-call-dev/tokens.ts
diff --git a/src/lib/temple/activity/helpers.ts b/src/lib/temple/activity/helpers.ts
@@ -1,7 +1,5 @@
 import BigNumber from 'bignumber.js';
 
-import { BcdTokenTransfer } from 'lib/better-call-dev';
-
 export function tryParseTokenTransfers(
   parameters: any,
   destination: string,
@@ -26,10 +24,6 @@ export function toTokenId(contractAddress: string, tokenId: string | number = 0)
   return `${contractAddress}_${tokenId}`;
 }
 
-export function getBcdTokenTransferId(tokenTrans: BcdTokenTransfer) {
-  return `${tokenTrans.hash}_${tokenTrans.nonce}`;
-}
-
 export function getTzktTokenTransferId(hash: string, nonce?: number) {
   const nonceStr = nonce ? `_${nonce}` : '';
   return `${hash}${nonceStr}`;

diff --git a/src/lib/temple/front/sync-tokens.ts b/src/lib/temple/front/sync-tokens.ts
@@ -1,10 +1,9 @@
-import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 
 import BigNumber from 'bignumber.js';
 import constate from 'constate';
 import { trigger } from 'swr';
 
-import { BCD_NETWORKS_NAMES, BcdNetwork } from 'lib/better-call-dev';
 import {
   useChainId,
   useAccount,
@@ -24,6 +23,8 @@ import { getTokensMetadata } from 'lib/templewallet-api';
 import { fetchWhitelistTokenSlugs } from 'lib/templewallet-api/whitelist-tokens';
 import { getTokenBalances, getTokenBalancesCount, TzktAccountTokenBalance, TZKT_API_BASE_URLS } from 'lib/tzkt';
 
+import { TempleChainId } from '../types';
+
 export const [SyncTokensProvider] = constate(() => {
   const chainId = useChainId(true)!;
   const { publicKeyHash: accountPkh } = useAccount();
@@ -32,15 +33,9 @@ export const [SyncTokensProvider] = constate(() => {
     useTokensMetadata();
   const usdPrices = useUSDPrices();
 
-  const networkId = useMemo(
-    () => (isKnownChainId(chainId) ? BCD_NETWORKS_NAMES.get(chainId) : undefined) ?? null,
-    [chainId]
-  );
-
   const sync = useCallback(async () => {
     makeSync(
       accountPkh,
-      networkId,
       chainId,
       allTokensBaseMetadataRef,
       setTokensBaseMetadata,
@@ -50,7 +45,6 @@ export const [SyncTokensProvider] = constate(() => {
     );
   }, [
     accountPkh,
-    networkId,
     chainId,
     allTokensBaseMetadataRef,
     setTokensBaseMetadata,
@@ -64,17 +58,17 @@ export const [SyncTokensProvider] = constate(() => {
     syncRef.current = sync;
   }, [sync]);
 
-  const networkIdRef = useRef(networkId);
-  if (networkIdRef.current !== networkId) {
-    networkIdRef.current = networkId;
+  const networkIdRef = useRef(chainId);
+  if (networkIdRef.current !== chainId) {
+    networkIdRef.current = chainId;
   }
 
   useEffect(() => {
-    if (!networkId) {
+    if (!chainId) {
       return;
     }
 
-    const isTheSameNetwork = () => networkId === networkIdRef.current;
+    const isTheSameNetwork = () => chainId === networkIdRef.current;
     let timeoutId: any;
 
     const syncAndDefer = async () => {
@@ -92,7 +86,7 @@ export const [SyncTokensProvider] = constate(() => {
     syncAndDefer();
 
     return () => clearTimeout(timeoutId);
-  }, [networkId, accountPkh]);
+  }, [chainId, accountPkh]);
 });
 
 async function fetchTzktTokenBalances(chainId: string, address: string) {
@@ -130,22 +124,21 @@ async function fetchTzktTokenBalances(chainId: string, address: string) {
 
 const makeSync = async (
   accountPkh: string,
-  networkId: BcdNetwork | null,
   chainId: string,
   allTokensBaseMetadataRef: any,
   setTokensBaseMetadata: any,
   setTokensDetailedMetadata: any,
   usdPrices: Record<string, string>,
   fetchMetadata: any
 ) => {
-  if (!networkId) return;
-  const mainnet = networkId === 'mainnet';
+  if (!chainId) return;
+  const mainnet = chainId === TempleChainId.Mainnet;
 
   const [tzktTokens, displayedFungibleTokens, displayedCollectibleTokens, whitelistTokenSlugs] = await Promise.all([
     fetchTzktTokenBalances(chainId, accountPkh),
     fetchDisplayedFungibleTokens(chainId, accountPkh),
     fetchCollectibleTokens(chainId, accountPkh, true),
-    fetchWhitelistTokenSlugs()
+    fetchWhitelistTokenSlugs(chainId)
   ]);
 
   const tzktTokensMap = new Map(

diff --git a/src/lib/templewallet-api/whitelist-tokens.ts b/src/lib/templewallet-api/whitelist-tokens.ts
@@ -1,5 +1,7 @@
 import axios from 'axios';
 
+import { TempleChainId } from 'lib/temple/types';
+
 interface TokenListItem {
   contractAddress: 'tez' | string;
   fa2TokenId?: number;
@@ -30,11 +32,11 @@ const WHITELIST_TOKENS_BASE_URL = 'https://raw.githubusercontent.com/madfish-sol
 
 const api = axios.create({ baseURL: WHITELIST_TOKENS_BASE_URL });
 
-export const fetchWhitelistTokenSlugs = () =>
+export const fetchWhitelistTokenSlugs = (chainId: string) =>
   api
     .get<WhitelistResponse>('tokens/quipuswap.whitelist.json')
     .then(response =>
-      response.data.tokens
+      response.data.tokens && chainId === TempleChainId.Mainnet
         ? response.data.tokens
             .map(token =>
               token.contractAddress === 'tez' ? 'tez' : `${token.contractAddress}_${token.fa2TokenId ?? 0}`