@exodus/hw-ledger 2.9.2 → 2.9.3

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.3](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.9.2...@exodus/hw-ledger@2.9.3) (2024-08-08)
+
+### Bug Fixes
+
+- **ledger:** properly order asset names array ([#7915](https://github.com/ExodusMovement/exodus-hydra/issues/7915)) ([e982d63](https://github.com/ExodusMovement/exodus-hydra/commit/e982d639354234bf93ae27e5f06876895a88aab0))
+
 ## [2.9.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.9.1...@exodus/hw-ledger@2.9.2) (2024-07-25)
 
 ### Bug Fixes

package/lib/module/assets/applications.d.ts

@@ -0,0 +1,23 @@
+declare const applications: {
+    Bitcoin: {
+        applicationName: string;
+        supportedVersions: string;
+        primaryAssetName: string;
+    };
+    Solana: {
+        applicationName: string;
+        supportedVersions: string;
+        primaryAssetName: string;
+    };
+    Ethereum: {
+        applicationName: string;
+        supportedVersions: string;
+        primaryAssetName: string;
+    };
+    Polygon: {
+        applicationName: string;
+        supportedVersions: string;
+        primaryAssetName: string;
+    };
+};
+export default applications;

package/lib/module/assets/applications.js

@@ -0,0 +1,27 @@
+const Bitcoin = {
+    applicationName: 'Bitcoin',
+    supportedVersions: '^2.1.2',
+    primaryAssetName: 'bitcoin',
+};
+const Solana = {
+    applicationName: 'Solana',
+    supportedVersions: '^1.4.0',
+    primaryAssetName: 'solana',
+};
+const Ethereum = {
+    applicationName: 'Ethereum',
+    supportedVersions: '^1.10.0',
+    primaryAssetName: 'ethereum',
+};
+const Polygon = {
+    applicationName: 'Polygon',
+    supportedVersions: '^1.10.0',
+    primaryAssetName: 'matic',
+};
+const applications = {
+    Bitcoin,
+    Solana,
+    Ethereum,
+    Polygon,
+};
+export default applications;

package/lib/module/assets/basemainnet.d.ts

@@ -2,6 +2,7 @@ declare const metadata: {
     applications: {
         applicationName: string;
         supportedVersions: string;
+        primaryAssetName: string;
     }[];
     handler: (transport: import("@ledgerhq/hw-transport").default) => Promise<import("libraries/hw-common/lib").HardwareWalletAssetHandler>;
 };

package/lib/module/assets/basemainnet.js

@@ -1,11 +1,7 @@
+import applications from './applications';
 import ethereum from './ethereum';
 const metadata = {
-    applications: [
-        {
-            applicationName: 'Ethereum',
-            supportedVersions: '^1.10.0',
-        },
-    ],
+    applications: [applications.Ethereum],
     handler: ethereum.handler,
 };
 export default metadata;

package/lib/module/assets/bitcoin.d.ts

@@ -12,6 +12,7 @@ declare const metadata: {
     applications: {
         applicationName: string;
         supportedVersions: string;
+        primaryAssetName: string;
     }[];
     handler: typeof createHandler;
 };

package/lib/module/assets/bitcoin.js

@@ -5,6 +5,7 @@ import { splitBip44DerivationPath } from './utils';
 import assert from 'minimalistic-assert';
 import { assertPsbtOnlyHasAllowedDerivationPaths, tagPsbtWithDerivationPaths, getWalletPolicy, derivationPathsToWalletPolicy, addDummyInputs, } from './utils/psbt';
 import { buildBip322PSBT } from './utils/bip322';
+import applications from './applications';
 async function createHandler(transport) {
     const app = new AppClient(transport);
     const getAddress = async (params) => {
@@ -103,12 +104,7 @@ async function createHandler(transport) {
     };
 }
 const metadata = {
-    applications: [
-        {
-            applicationName: 'Bitcoin',
-            supportedVersions: '^2.1.2',
-        },
-    ],
+    applications: [applications.Bitcoin],
     handler: createHandler,
 };
 export default metadata;

package/lib/module/assets/ethereum.d.ts

@@ -5,6 +5,7 @@ declare const metadata: {
     applications: {
         applicationName: string;
         supportedVersions: string;
+        primaryAssetName: string;
     }[];
     handler: typeof createHandler;
 };

package/lib/module/assets/ethereum.js

@@ -5,6 +5,7 @@ import { TypedDataUtils, SignTypedDataVersion, } from '@metamask/eth-sig-util';
 import assert from 'minimalistic-assert';
 import { buildFauxXPUB } from './utils';
 import { RequiresBlindSigningError } from '../errors';
+import applications from './applications';
 function hashEIP712Message(typedData) {
     const version = SignTypedDataVersion.V4;
     const { sanitizeData, hashStruct } = TypedDataUtils;
@@ -137,12 +138,7 @@ async function createHandler(transport) {
     };
 }
 const metadata = {
-    applications: [
-        {
-            applicationName: 'Ethereum',
-            supportedVersions: '^1.10.0',
-        },
-    ],
+    applications: [applications.Ethereum],
     handler: createHandler,
 };
 export default metadata;

package/lib/module/assets/index.d.ts

@@ -4,11 +4,12 @@ type HandlerFactory = (transport: Transport) => Promise<HardwareWalletAssetHandl
 type AssetMetadata = {
     applications: {
         applicationName: string;
+        primaryAssetName: string;
         supportedVersions: string;
     }[];
     handler: HandlerFactory;
 };
 export declare const assetApplications: Record<string, AssetMetadata>;
 export declare const supportedBaseAssetNames: string[];
-export declare const applicationNameToBaseAssetName: Record<string, string>;
+export declare const applicationNameToBaseAssetNames: Record<string, string[]>;
 export {};

package/lib/module/assets/index.js

@@ -3,6 +3,7 @@ import basemainnet from './basemainnet';
 import ethereum from './ethereum';
 import matic from './matic';
 import solana from './solana';
+import applications from './applications';
 export const assetApplications = {
     basemainnet,
     bitcoin,
@@ -11,7 +12,18 @@ export const assetApplications = {
     ethereum,
 };
 export const supportedBaseAssetNames = Object.keys(assetApplications);
-export const applicationNameToBaseAssetName = Object.entries(assetApplications).reduce((mapping, [assetName, metadata]) => {
-    mapping[metadata.applications[0].applicationName] = assetName;
+export const applicationNameToBaseAssetNames = Object.entries(assetApplications).reduce((mapping, [assetName, metadata]) => {
+    for (const { applicationName } of metadata.applications) {
+        if (!Array.isArray(mapping[applicationName])) {
+            mapping[applicationName] = [];
+        }
+        const isPrimaryAssetForApplication = applications[applicationName]?.primaryAssetName === assetName;
+        if (isPrimaryAssetForApplication) {
+            mapping[applicationName].unshift(assetName);
+        }
+        else {
+            mapping[applicationName].push(assetName);
+        }
+    }
     return mapping;
 }, Object.create(null));

package/lib/module/assets/matic.d.ts

@@ -2,6 +2,7 @@ declare const metadata: {
     applications: {
         applicationName: string;
         supportedVersions: string;
+        primaryAssetName: string;
     }[];
     handler: (transport: import("@ledgerhq/hw-transport").default) => Promise<import("libraries/hw-common/lib").HardwareWalletAssetHandler>;
 };

package/lib/module/assets/matic.js

@@ -1,12 +1,7 @@
+import applications from './applications';
 import ethereum from './ethereum';
 const metadata = {
-    applications: [
-        {
-            applicationName: 'Polygon',
-            supportedVersions: '^1.10.0',
-        },
-        ...ethereum.applications,
-    ],
+    applications: [applications.Polygon, applications.Ethereum],
     handler: ethereum.handler,
 };
 export default metadata;

package/lib/module/assets/solana.d.ts

@@ -5,6 +5,7 @@ declare const metadata: {
     applications: {
         applicationName: string;
         supportedVersions: string;
+        primaryAssetName: string;
     }[];
     handler: typeof createHandler;
 };

package/lib/module/assets/solana.js

@@ -3,6 +3,7 @@ import assert from 'minimalistic-assert';
 import bs58 from 'bs58';
 import { XPubUnsupportedError } from '@exodus/hw-common';
 import { RequiresBlindSigningError } from '../errors';
+import applications from './applications';
 async function createHandler(transport) {
     const app = new AppSolana(transport);
     const getAddress = async (params) => {
@@ -63,12 +64,7 @@ async function createHandler(transport) {
     };
 }
 const metadata = {
-    applications: [
-        {
-            applicationName: 'Solana',
-            supportedVersions: '^1.4.0',
-        },
-    ],
+    applications: [applications.Solana],
     handler: createHandler,
 };
 export default metadata;

package/lib/module/device.js

@@ -1,6 +1,6 @@
 import semver from 'semver';
 import { AssetUnsupportedError, DeviceLockedError, DeviceConnectionError, UserRefusedError, } from '@exodus/hw-common';
-import { applicationNameToBaseAssetName, assetApplications, supportedBaseAssetNames, } from './assets';
+import { applicationNameToBaseAssetNames, assetApplications, supportedBaseAssetNames, } from './assets';
 import applicationFactory from './management/application';
 import { UnsupportedVersionError, ApplicationNotFoundError } from './errors';
 export class LedgerDevice {
@@ -105,16 +105,16 @@ export class LedgerDevice {
         const installedApplications = await this.#listApplications();
         const installedAssets = [];
         installedApplications.forEach(({ name: applicationName }) => {
-            const assetName = applicationNameToBaseAssetName[applicationName];
-            if (assetName)
-                installedAssets.push(assetName);
+            const assetNames = applicationNameToBaseAssetNames[applicationName];
+            if (assetNames)
+                installedAssets.push(...assetNames);
         });
         return installedAssets;
     };
     listUseableAssetNames = async () => {
         const { name: applicationName } = await this.#getInformation();
-        const assetName = applicationNameToBaseAssetName[applicationName];
-        return assetName ? [assetName] : [];
+        const assetNames = applicationNameToBaseAssetNames[applicationName];
+        return assetNames || [];
     };
     getAddress = async (params) => {
         await this.ensureApplicationIsOpened(params.assetName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "2.9.2",
+  "version": "2.9.3",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -20,7 +20,7 @@
   ],
   "scripts": {
     "build": "run -T tsc --build tsconfig.build.json",
-    "build:watch": "run -T tsc --build tsconfig.build.json && (concurrently 'tsc --build -w tsconfig.build.json')",
+    "build:watch": "run -T tsc --build tsconfig.build.json && (concurrently 'run -T tsc --build -w tsconfig.build.json')",
     "clean": "run -T tsc --build --clean",
     "test": "run -T jest --testMatch='**/*.unit.test.js' --coverageDirectory coverage/unit",
     "zemu:install": "docker pull zondax/builder-zemu:speculos-745fe46f81cfc18114b94a37beaefb58a09c0fcd",
@@ -39,7 +39,7 @@
     "@exodus/ledgerhq-devices": "^8.1.0-exodus.3",
     "@exodus/ledgerhq-hw-app-eth": "^6.33.7-exodus.8",
     "@exodus/module": "^1.2.2",
-    "@exodus/redux-dependency-injection": "^3.0.0",
+    "@exodus/redux-dependency-injection": "^4.0.0",
     "@exodus/secp256k1": "^4.0.2-exodus.0",
     "@ledgerhq/hw-app-solana": "^7.0.10",
     "@ledgerhq/hw-transport": "^6.28.5",
@@ -71,5 +71,5 @@
     "tiny-secp256k1": "^2.2.3",
     "ts-jest": "^29.0.3"
   },
-  "gitHead": "3995391eb48639b2d60ced5224a6a8f4902a2466"
+  "gitHead": "221ffd05e9aa1c0ee82f3b8123b91d692066fa88"
 }