feat: add rwa data to tokens in tokens controller

Author: oscarwroche

packages/assets-controllers/jest.config.js

@@ -32,4 +32,7 @@ module.exports = merge(baseConfig, {
 
   // We rely on `window` to make requests
   testEnvironment: '<rootDir>/jest.environment.js',
+
+  // Watchman isn't available in some environments (e.g. sandboxed CI/containers)
+  watchman: false,
 });

packages/assets-controllers/src/TokensController.ts

@@ -51,6 +51,7 @@ import { ERC1155Standard } from './Standards/NftStandards/ERC1155/ERC1155Standar
 import {
   fetchTokenMetadata,
   TOKEN_METADATA_NO_SUPPORT_ERROR,
+  TokenRwaData,
 } from './token-service';
 import type {
   TokenListStateChange,
@@ -288,6 +289,9 @@ export class TokensController extends BaseController<
                 if (cachedToken && cachedToken.name && !token.name) {
                   token.name = cachedToken.name; // Update the token name
                 }
+                if (cachedToken?.rwaData) {
+                  token.rwaData = cachedToken.rwaData; // Update the token RWA data
+                }
               }
             }
           }
@@ -426,6 +430,7 @@ export class TokensController extends BaseController<
     image,
     interactingAddress,
     networkClientId,
+    rwaData,
   }: {
     address: string;
     symbol: string;
@@ -434,6 +439,7 @@ export class TokensController extends BaseController<
     image?: string;
     interactingAddress?: string;
     networkClientId: NetworkClientId;
+    rwaData?: TokenRwaData;
   }): Promise<Token[]> {
     const releaseLock = await this.#mutex.acquire();
     const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
@@ -473,7 +479,7 @@ export class TokensController extends BaseController<
         isERC721,
         aggregators: formatAggregatorNames(tokenMetadata?.aggregators ?? []),
         name,
-        ...(tokenMetadata?.rwaData && { rwaData: tokenMetadata.rwaData }),
+        ...(rwaData !== undefined && { rwaData }),
       };
       const previousIndex = newTokens.findIndex(
         (token) => token.address.toLowerCase() === address.toLowerCase(),
@@ -986,7 +992,7 @@ export class TokensController extends BaseController<
 
     await this.#requestApproval(suggestedAssetMeta);
 
-    const { address, symbol, decimals, name, image } = asset;
+    const { address, symbol, decimals, name, image, rwaData } = asset;
     await this.addToken({
       address,
       symbol,
@@ -995,6 +1001,7 @@ export class TokensController extends BaseController<
       image,
       interactingAddress: suggestedAssetMeta.interactingAddress,
       networkClientId,
+      rwaData,
     });
   }