feat(tron-wallet-snap): route asset reads through Core when migration is on

eslint-suppressions.json

@@ -1352,15 +1352,7 @@
       "count": 20
     }
   },
-  "packages/tron-wallet-snap/src/caching/InMemoryCache.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/caching/StateCache.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    },
     "no-restricted-syntax": {
       "count": 1
     }
@@ -1375,20 +1367,7 @@
       "count": 2
     }
   },
-  "packages/tron-wallet-snap/src/clients/price-api/PriceApiClient.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
-  "packages/tron-wallet-snap/src/clients/price-api/types.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/clients/security-alerts-api/utils.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    },
     "no-restricted-syntax": {
       "count": 5
     }
@@ -1401,11 +1380,6 @@
       "count": 1
     }
   },
-  "packages/tron-wallet-snap/src/clients/token-api/TokenApiClient.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/clients/trongrid/TrongridApiClient.test.ts": {
     "require-atomic-updates": {
       "count": 1
@@ -1424,16 +1398,6 @@
       "count": 42
     }
   },
-  "packages/tron-wallet-snap/src/handlers/clientRequest/clientRequest.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
-  "packages/tron-wallet-snap/src/handlers/clientRequest/validation.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/handlers/cronjob/cronjob.test.tsx": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 2
@@ -1452,34 +1416,16 @@
       "count": 1
     }
   },
-  "packages/tron-wallet-snap/src/services/accounts/AccountsService.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/services/assets/AssetsRepository.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 2
     }
   },
   "packages/tron-wallet-snap/src/services/assets/AssetsService.test.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 3
-    },
     "@typescript-eslint/no-explicit-any": {
       "count": 1
     }
   },
-  "packages/tron-wallet-snap/src/services/assets/adapters/SnapAssetsAdapter.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
-  "packages/tron-wallet-snap/src/services/config/ConfigProvider.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/services/send/FeeCalculatorService.ts": {
     "no-restricted-syntax": {
       "count": 1
@@ -1493,11 +1439,6 @@
       "count": 15
     }
   },
-  "packages/tron-wallet-snap/src/services/send/SendService.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/services/send/TransactionExpirationRefresherService.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 5
@@ -1508,11 +1449,6 @@
       "count": 7
     }
   },
-  "packages/tron-wallet-snap/src/services/staking/StakingService.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/services/state/State.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1
@@ -1521,11 +1457,6 @@
       "count": 1
     }
   },
-  "packages/tron-wallet-snap/src/services/transaction-expiration-refresher/TransactionExpirationRefresherService.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/services/transaction-scan/TransactionScanService.ts": {
     "no-restricted-syntax": {
       "count": 5
@@ -1542,14 +1473,6 @@
     },
     "@typescript-eslint/no-explicit-any": {
       "count": 7
-    },
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
-  "packages/tron-wallet-snap/src/services/wallet/WalletService.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
     }
   },
   "packages/tron-wallet-snap/src/ui/confirmation/components/TransactionAlert/TransactionAlert.test.tsx": {
@@ -1568,9 +1491,6 @@
   "packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignMessage/render.test.tsx": {
     "@typescript-eslint/no-explicit-any": {
       "count": 3
-    },
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
     }
   },
   "packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignTransaction/ConfirmSignTransaction.test.tsx": {
@@ -1581,14 +1501,6 @@
   "packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignTransaction/render.test.tsx": {
     "@typescript-eslint/no-explicit-any": {
       "count": 14
-    },
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
-  "packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignTransaction/render.tsx": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
     }
   },
   "packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmTransactionRequest/ConfirmTransactionRequest.test.tsx": {
@@ -1604,26 +1516,11 @@
       "count": 2
     }
   },
-  "packages/tron-wallet-snap/src/utils/deriveTronFromCoinTypeNode.test.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
-  "packages/tron-wallet-snap/src/utils/deriveTronFromCoinTypeNode.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/utils/getExplorerUrl.test.ts": {
     "n/no-process-env": {
       "count": 3
     }
   },
-  "packages/tron-wallet-snap/src/validation/keyring-structs.test.ts": {
-    "import-x/no-extraneous-dependencies": {
-      "count": 1
-    }
-  },
   "packages/tron-wallet-snap/src/validation/transaction.test.ts": {
     "@typescript-eslint/no-explicit-any": {
       "count": 1

packages/tron-wallet-snap/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Route fungible asset reads and snap-owned fetch/save through Core AssetsController when the Tron assets migration flag is active ([#145](https://github.com/MetaMask/internal-snaps/pull/145))
+- Add `CoreAssetsAdapter` and `mapControllerAsset` for AssetsController integration (wired unused until routing lands) ([#144](https://github.com/MetaMask/internal-snaps/pull/144))
+
+### Changed
+
+- Extract shared asset util functions and inject `SnapAssetsAdapter` from `context` into `AssetsService` ([#143](https://github.com/MetaMask/internal-snaps/pull/143))
+- Rename `getByKeyringAccountId` to `getAccountAssets` (with essential-asset synthesis) and update keyring callers ([#143](https://github.com/MetaMask/internal-snaps/pull/143))
+
 ## [3.1.0]
 
 ### Added

packages/tron-wallet-snap/package.json

@@ -60,6 +60,7 @@
     "@metamask/snaps-jest": "^10.2.0",
     "@metamask/snaps-sdk": "^11.2.0",
     "@metamask/superstruct": "^3.4.1",
+    "@metamask/utils": "^11.9.0",
     "@types/lodash": "^4.17.15",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.3.1",

packages/tron-wallet-snap/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/internal-snaps.git"
   },
   "source": {
-    "shasum": "e7sZ7XY8fvO4GLcznlb5N/Fh95+ANPKS/GzYoHHz2pc=",
+    "shasum": "/+UBD1D/nG2/4YyYITJKLK8Nc6DcA979PExNHNV9czY=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/tron-wallet-snap/src/context.ts

@@ -25,6 +25,8 @@ import { RpcHandler } from './handlers/rpc/rpc';
 import { UserInputHandler } from './handlers/user-input/userInput';
 import { AccountsRepository } from './services/accounts/AccountsRepository';
 import { AccountsService } from './services/accounts/AccountsService';
+import { CoreAssetsAdapter } from './services/assets/adapters/CoreAssetsAdapter';
+import { SnapAssetsAdapter } from './services/assets/adapters/SnapAssetsAdapter';
 import { AssetsRepository } from './services/assets/AssetsRepository';
 import { AssetsService } from './services/assets/AssetsService';
 import { ConfigProvider } from './services/config';
@@ -113,8 +115,7 @@ const securityAlertsApiClient = new SecurityAlertsApiClient(
   logger,
 );
 
-// Business Services
-const assetsService = new AssetsService({
+const snapAssetsAdapter = new SnapAssetsAdapter({
   logger,
   state,
   assetsRepository,
@@ -123,8 +124,20 @@ const assetsService = new AssetsService({
   priceApiClient,
   tokenApiClient,
   snapClient,
-  remoteFeatureFlagsProvider,
+  configProvider,
+});
+const coreAssetsAdapter = new CoreAssetsAdapter({
+  logger,
   assetsProvider,
+  trongridApiClient,
+  tronHttpClient,
+});
+
+// Business Services
+const assetsService = new AssetsService({
+  snapAdapter: snapAssetsAdapter,
+  coreAdapter: coreAssetsAdapter,
+  remoteFeatureFlagsProvider,
 });
 
 const transactionsService = new TransactionsService({

packages/tron-wallet-snap/src/handlers/keyring/keyring.test.ts

@@ -85,7 +85,7 @@ describe('KeyringHandler', () => {
       }),
     } as unknown as jest.Mocked<AccountsService>;
     mockAssetsService = {
-      getByKeyringAccountId: jest.fn().mockResolvedValue([]),
+      getAccountAssets: jest.fn().mockResolvedValue([]),
     } as unknown as jest.Mocked<AssetsService>;
     mockTransactionsService = {
       checkAddressActivity: jest.fn(),
@@ -649,7 +649,7 @@ describe('KeyringHandler', () => {
       const result = await keyringHandler.getAccountAssets(mockAccount.id);
 
       expect(result).toStrictEqual([]);
-      expect(mockAssetsService.getByKeyringAccountId).toHaveBeenCalledWith(
+      expect(mockAssetsService.getAccountAssets).toHaveBeenCalledWith(
         mockAccount.id,
       );
     });

packages/tron-wallet-snap/src/handlers/keyring/keyring.ts

@@ -191,7 +191,7 @@ export class KeyringHandler implements KeyringSnapRpc {
       this.#logger.info('Listing account assets', { accountId });
 
       const assetEntities =
-        await this.#assetsService.getByKeyringAccountId(accountId);
+        await this.#assetsService.getAccountAssets(accountId);
       const result = assetEntities
         .filter(
           (asset) =>
@@ -280,8 +280,7 @@ export class KeyringHandler implements KeyringSnapRpc {
 
       await this.#getAccountOrThrow(accountId);
 
-      const assetsList =
-        await this.#assetsService.getByKeyringAccountId(accountId);
+      const assetsList = await this.#assetsService.getAccountAssets(accountId);
 
       const assetsToUse = assetsList
         .filter((asset) => assets.includes(asset.assetType))