feat(tron-wallet-snap): add CoreAssetsAdapter and mapControllerAsset

eslint-suppressions.json

@@ -1338,15 +1338,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
     }
@@ -1361,20 +1353,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
     }
@@ -1387,11 +1366,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
@@ -1410,16 +1384,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
@@ -1438,34 +1402,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
@@ -1479,11 +1425,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
@@ -1494,11 +1435,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
@@ -1507,11 +1443,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
@@ -1528,14 +1459,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": {
@@ -1554,9 +1477,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": {
@@ -1567,14 +1487,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": {
@@ -1590,26 +1502,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,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- 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))

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": "NpxOo6DkB0sBh8xpisBu3o+7G6MJriDNsADcHVb/Qp8=",
+    "shasum": "3Mn3cc4eA7OmuOAA4zs+kMMQGCj1gs982z50E37I+pc=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

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

@@ -25,6 +25,7 @@ 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';
@@ -125,10 +126,17 @@ const snapAssetsAdapter = new SnapAssetsAdapter({
   snapClient,
   configProvider,
 });
+const coreAssetsAdapter = new CoreAssetsAdapter({
+  logger,
+  assetsProvider,
+  trongridApiClient,
+  tronHttpClient,
+});
 
 // Business Services
 const assetsService = new AssetsService({
   snapAdapter: snapAssetsAdapter,
+  coreAdapter: coreAssetsAdapter,
 });
 
 const transactionsService = new TransactionsService({

packages/tron-wallet-snap/src/services/assets/AssetsService.test.ts

@@ -28,7 +28,16 @@ type MockState = {
 
 jest.mock('../../context', () => ({
   configProvider: {
-    get() {
+    get(): {
+      priceApi: {
+        cacheTtlsMilliseconds: {
+          fiatExchangeRates: number;
+          spotPrices: number;
+          historicalPrices: number;
+        };
+      };
+      activeNetworks: never[];
+    } {
       return {
         priceApi: {
           cacheTtlsMilliseconds: {
@@ -54,6 +63,8 @@ const { configProvider } = require('../../context');
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const { AssetsService } = require('./AssetsService');
 // eslint-disable-next-line @typescript-eslint/no-require-imports
+const { CoreAssetsAdapter } = require('./adapters/CoreAssetsAdapter');
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const { SnapAssetsAdapter } = require('./adapters/SnapAssetsAdapter');
 
 const mockAccount: KeyringAccount = {
@@ -141,7 +152,9 @@ const minimalTronAccount = createMockTronAccount({
  * @param overrides - Account-specific fields to set.
  * @returns A mock AccountResources object.
  */
-function getMockAccountResources(overrides: Record<string, number> = {}) {
+function getMockAccountResources(
+  overrides: Record<string, number> = {},
+): Record<string, number> {
   return {
     freeNetLimit: 600,
     TotalNetLimit: 0,
@@ -159,7 +172,10 @@ function getMockAccountResources(overrides: Record<string, number> = {}) {
  * @param assetType - The CAIP-19 asset type to match.
  * @returns The matching asset, or undefined.
  */
-function findAsset(assets: AssetEntity[], assetType: KnownCaip19Id) {
+function findAsset(
+  assets: AssetEntity[],
+  assetType: KnownCaip19Id,
+): AssetEntity | undefined {
   return assets.find((a: AssetEntity) => a.assetType === assetType);
 }
 
@@ -275,7 +291,17 @@ async function withAssetsService<ReturnValue>(
     snapClient: mockSnapClient,
     configProvider,
   });
-  const assetsService = new AssetsService({ snapAdapter });
+  const coreAdapter = new CoreAssetsAdapter({
+    logger: mockLogger,
+    assetsProvider: {
+      getAccountAssetByID: jest.fn().mockResolvedValue(null),
+      getAccountAssetsByIDs: jest.fn().mockResolvedValue({}),
+      getAccountAssetsByScope: jest.fn().mockResolvedValue({}),
+    },
+    trongridApiClient: mockTrongridApiClient,
+    tronHttpClient: mockTronHttpClient,
+  });
+  const assetsService = new AssetsService({ snapAdapter, coreAdapter });
 
   return await testFunction({
     assetsService,

packages/tron-wallet-snap/src/services/assets/AssetsService.ts

@@ -9,20 +9,32 @@ import type { CaipAssetType } from '@metamask/utils';
 
 import type { Network } from '../../constants';
 import type { AssetEntity } from '../../entities/assets';
+import type { CoreAssetsAdapter } from './adapters/CoreAssetsAdapter';
 import { SnapAssetsAdapter } from './adapters/SnapAssetsAdapter';
 
 /**
  * Assets domain facade. Currently delegates all behavior to SnapAssetsAdapter
- * (legacy snap-owned reads/writes). Core adapter routing can be introduced later
- * without changing callers.
+ * (legacy snap-owned reads/writes). Core adapter is initialized for upcoming
+ * routing without changing callers.
  */
 export class AssetsService {
   readonly #snapAdapter: SnapAssetsAdapter;
 
+  // Initialized for upcoming Core routing; not read until the migration PR lands.
+  // eslint-disable-next-line no-unused-private-class-members -- reserved adapter slot
+  readonly #coreAdapter: CoreAssetsAdapter;
+
   readonly cacheTtlsMilliseconds: SnapAssetsAdapter['cacheTtlsMilliseconds'];
 
-  constructor({ snapAdapter }: { snapAdapter: SnapAssetsAdapter }) {
+  constructor({
+    snapAdapter,
+    coreAdapter,
+  }: {
+    snapAdapter: SnapAssetsAdapter;
+    coreAdapter: CoreAssetsAdapter;
+  }) {
     this.#snapAdapter = snapAdapter;
+    this.#coreAdapter = coreAdapter;
     this.cacheTtlsMilliseconds = this.#snapAdapter.cacheTtlsMilliseconds;
   }