feat: src-7 src-9

.changeset/brown-badgers-wave.md

@@ -0,0 +1,5 @@
+---
+"fuels-wallet": patch
+---
+
+Fetch and display NFT data directly from indexer.

.changeset/light-cooks-dress.md

@@ -0,0 +1,5 @@
+---
+"fuels-wallet": minor
+---
+
+Support SRC-7, 9 nft asset data.

.changeset/rotten-grapes-itch.md

@@ -0,0 +1,5 @@
+---
+"fuels-wallet": patch
+---
+
+Fixes intermittent long loading state on the wallet

packages/app/src/systems/Asset/cache/AssetsCache.ts

@@ -9,7 +9,6 @@ type Endpoint = {
 };
 
 export class AssetsCache {
-  private cache: { [chainId: number]: { [assetId: string]: Asset } };
   private static instance: AssetsCache;
   private endpoints: Endpoint[] = [
     {
@@ -21,12 +20,12 @@ export class AssetsCache {
       url: 'https://explorer-indexer-testnet.fuel.network',
     },
   ];
-  private storage: IndexedAssetsDB;
 
-  private constructor() {
-    this.cache = {};
-    this.storage = new IndexedAssetsDB();
-  }
+  asset = {
+    name: '',
+    symbol: '',
+    metadata: {},
+  };
 
   private getIndexerEndpoint(chainId: number) {
     return this.endpoints.find(
@@ -61,50 +60,34 @@ export class AssetsCache {
     }
     const endpoint = this.getIndexerEndpoint(chainId);
     if (!endpoint) return;
-    // try to get from memory cache first
-    this.cache[chainId] = this.cache[chainId] || {};
-    const assetFromCache = this.cache[chainId][assetId];
-    if (assetFromCache?.name) {
-      return assetFromCache;
-    }
-
-    // get from indexed db if not in memory
-    const assetFromDb = await this.storage.getItem(`${chainId}/${assetId}`);
-    if (assetFromDb?.name) {
-      this.cache[chainId][assetId] = assetFromDb;
-      return assetFromDb;
-    }
 
     const assetFromIndexer = await this.fetchAssetFromIndexer(
       endpoint.url,
       assetId
     );
+
     console.log('asd assetFromIndexer', assetFromIndexer);
     if (!assetFromIndexer) return;
 
+    const { isNFT, ...rest } = assetFromIndexer;
     const asset = {
-      ...assetFromIndexer,
-      isNft: false,
+      ...rest,
+      isNft: !!isNFT,
     };
 
     if (assetFromIndexer.contractId) {
       const nftData = await fetchNftData({
         assetId,
         contractId: assetFromIndexer.contractId,
         provider,
-      });
-      Object.assign(asset, nftData);
+      }).catch(() => undefined);
+      if (nftData?.name) {
+        Object.assign(asset, nftData);
+      }
     }
 
-    this.cache[chainId][assetId] = asset;
-    this.storage.setItem(`${chainId}/${assetId}`, asset);
     return asset;
   }
-  asset = {
-    name: '',
-    symbol: '',
-    metadata: {},
-  };
 
   static getInstance() {
     if (!AssetsCache.instance) {
@@ -113,18 +96,3 @@ export class AssetsCache {
     return AssetsCache.instance;
   }
 }
-
-class IndexedAssetsDB {
-  async getItem(key: string) {
-    return db.transaction('r', db.indexedAssets, async () => {
-      const asset = await db.indexedAssets.get({ key });
-      return asset;
-    });
-  }
-
-  async setItem(key: string, data: AssetData) {
-    await db.transaction('rw', db.indexedAssets, async () => {
-      await db.indexedAssets.put({ key, ...data });
-    });
-  }
-}

packages/app/src/systems/Asset/utils/nft.ts

@@ -16,14 +16,9 @@ export const fetchNftData = async ({
     ])
     .dryRun();
 
-  const [total_supply, decimals, name, symbol] = result.value;
+  const [_total_supply, _decimals, name, symbol] = result.value;
 
   return {
-    /*
-      according to sway standards this is how you recognize an NFT:
-      https://docs.fuel.network/docs/sway-standards/src-20-native-asset/#non-fungible-asset-restrictions
-    */
-    isNft: total_supply.toNumber() === 1 && !decimals,
     name: name as string,
     symbol: symbol as string,
   };