feat: add more trezor paths, export path type, add ledger bluetooth

Author: gamalielhere

packages/hw-wallets/package.json

@@ -56,6 +56,7 @@
     "@ledgerhq/hw-app-eth": "^6.45.5",
     "@ledgerhq/hw-app-solana": "^7.4.1",
     "@ledgerhq/hw-transport": "^6.31.5",
+    "@ledgerhq/hw-transport-web-ble": "^6.29.5",
     "@ledgerhq/hw-transport-webusb": "^6.29.5",
     "@ledgerhq/live-common": "^34.20.0",
     "@polkadot/types": "^16.1.1",

packages/hw-wallets/src/configs.ts

@@ -61,6 +61,11 @@ const bip44Paths = {
     basePath: "m/44'/137'/0'/0",
     label: "Rootstock",
   },
+  rootstockTestnet: {
+    path: "m/44'/37310'/0'/0/{index}",
+    basePath: "m/44'/37310'/0'/0",
+    label: 'Rootstock Testnet'
+  },
   ethereumClassic: {
     path: "m/44'/61'/0'/0/{index}",
     basePath: "m/44'/61'/0'/0",
@@ -116,5 +121,141 @@ const bip44Paths = {
     basePath: "m/44'/3'/0'/0",
     label: "Dogecoin",
   },
+  // Additional paths from MyEtherWallet
+  poaNetwork: {
+    path: "m/44'/60'/0'/0/{index}",
+    basePath: "m/44'/60'/0'/0",
+    label: 'POA network'
+  },
+  expanse: {
+    path: "m/44'/40'/0'/0/{index}",
+    basePath: "m/44'/40'/0'/0",
+    label: 'Expanse'
+  },
+  ubiq: {
+    path: "m/44'/108'/0'/0/{index}",
+    basePath: "m/44'/108'/0'/0",
+    label: 'Ubiq'
+  },
+  ellaism: {
+    path: "m/44'/163'/0'/0/{index}",
+    basePath: "m/44'/163'/0'/0",
+    label: 'Ellaism'
+  },
+  etherGem: {
+    path: "m/44'/1987'/0'/0/{index}",
+    basePath: "m/44'/1987'/0'/0",
+    label: 'EtherGem'
+  },
+  callisto: {
+    path: "m/44'/820'/0'/0/{index}",
+    basePath: "m/44'/820'/0'/0",
+    label: 'Callisto'
+  },
+  ethereumSocial: {
+    path: "m/44'/1128'/0'/0/{index}",
+    basePath: "m/44'/1128'/0'/0",
+    label: 'Ethereum Social'
+  },
+  musicoin: {
+    path: "m/44'/184'/0'/0/{index}",
+    basePath: "m/44'/184'/0'/0",
+    label: 'Musicoin'
+  },
+  goChain: {
+    path: "m/44'/6060'/0'/0/{index}",
+    basePath: "m/44'/6060'/0'/0",
+    label: 'GoChain'
+  },
+  eosClassic: {
+    path: "m/44'/2018'/0'/0/{index}",
+    basePath: "m/44'/2018'/0'/0",
+    label: 'EOS Classic'
+  },
+  akroma: {
+    path: "m/44'/200625'/0'/0/{index}",
+    basePath: "m/44'/200625'/0'/0",
+    label: 'Akroma'
+  },
+  etherSocialNetwork: {
+    path: "m/44'/31102'/0'/0/{index}",
+    basePath: "m/44'/31102'/0'/0",
+    label: 'EtherSocial Network'
+  },
+  pirl: {
+    path: "m/44'/164'/0'/0/{index}",
+    basePath: "m/44'/164'/0'/0",
+    label: 'PIRL'
+  },
+  ether1: {
+    path: "m/44'/1313114'/0'/0/{index}",
+    basePath: "m/44'/1313114'/0'/0",
+    label: 'Ether-1'
+  },
+  atheios: {
+    path: "m/44'/1620'/0'/0/{index}",
+    basePath: "m/44'/1620'/0'/0",
+    label: 'Atheios'
+  },
+  tomoChain: {
+    path: "m/44'/889'/0'/0/{index}",
+    basePath: "m/44'/889'/0'/0",
+    label: 'TomoChain'
+  },
+  mixBlockchain: {
+    path: "m/44'/76'/0'/0/{index}",
+    basePath: "m/44'/76'/0'/0",
+    label: 'Mix Blockchain'
+  },
+  iolite: {
+    path: "m/44'/1171337'/0'/0/{index}",
+    basePath: "m/44'/1171337'/0'/0",
+    label: 'Iolite'
+  },
+  thundercore: {
+    path: "m/44'/1001'/0'/0/{index}",
+    basePath: "m/44'/1001'/0'/0",
+    label: 'ThunderCore'
+  },
+  solidum: {
+    path: "m/44'/997'/0'/0/{index}",
+    basePath: "m/44'/997'/0'/0",
+    label: 'Solidum'
+  },
+  metadium: {
+    path: "m/44'/916'/0'/0/{index}",
+    basePath: "m/44'/916'/0'/0",
+    label: 'Metadium'
+  },
+  reoscChain: {
+    path: "m/44'/2894'/0'/0/{index}",
+    basePath: "m/44'/2894'/0'/0",
+    label: 'REOSC'
+  },
+  dexon: {
+    path: "m/44'/237'/0'/0/{index}",
+    basePath: "m/44'/237'/0'/0",
+    label: 'DEXON Network'
+  },
+  lightstreamsNetwork: {
+    path: "m/44'/60'/0'/{index}",
+    basePath: "m/44'/60'/0'",
+    label: 'Lightstreams Network'
+  },
+  mintmeComCoin: {
+    path: "m/44'/227'/0'/0/{index}",
+    basePath: "m/44'/227'/0'/0",
+    label: 'MintMe.com Coin'
+  },
+  ethercore: {
+    path: "m/44'/466'/0'/0/{index}",
+    basePath: "m/44'/466'/0'/0",
+    label: 'EtherCore'
+  },
+  binanceChain: {
+    path: "m/44'/714'/{index}",
+    basePath: "m/44'/714'",
+    label: 'Binance Chain'
+  },
 };
 export { walletConfigs, MessengerName, ledgerAppNames, bip44Paths };

packages/hw-wallets/src/index.ts

@@ -114,3 +114,13 @@ class HWwalletManager {
 export default HWwalletManager;
 
 export { ledgerAppNames };
+
+export type {
+  AddressResponse,
+  getAddressRequest,
+  HWWalletProvider,
+  isConnectedRequest,
+  PathType,
+  SignMessageRequest,
+  SignTransactionRequest,
+}

packages/hw-wallets/src/ledger/ethereum/index.ts

@@ -1,5 +1,6 @@
 import type Transport from "@ledgerhq/hw-transport";
 import webUsbTransport from "@ledgerhq/hw-transport-webusb";
+import bleTransport from '@ledgerhq/hw-transport-web-ble';
 import ledgerService from "@ledgerhq/hw-app-eth/lib/services/ledger";
 import { HWwalletCapabilities, NetworkNames } from "@enkryptcom/types";
 import EthApp from "@ledgerhq/hw-app-eth";
@@ -34,17 +35,31 @@ class LedgerEthereum implements HWWalletProvider {
 
   async init(): Promise<boolean> {
     if (!this.transport) {
-      const support = await webUsbTransport.isSupported();
-      if (support) {
-        this.transport = await webUsbTransport.openConnected().then((res) => {
-          if (!res) return webUsbTransport.create();
-          return res;
-        });
-      } else {
-        return Promise.reject(
-          new Error("ledger-ethereum: webusb is not supported"),
-        );
+      try {
+        const BLEsupport = await bleTransport.isSupported();
+        if (BLEsupport) {
+          const transport = await bleTransport.create();
+          transport.on("disconnect", () => { // connection wasnt succesful
+            this.transport = null;
+          })
+          this.transport = transport;
+        }
+
+      } catch {
+        const support = await webUsbTransport.isSupported();
+        if (support) {
+          this.transport = await webUsbTransport.openConnected().then((res) => {
+            if (!res) return webUsbTransport.create();
+            return res;
+          });
+
+        } else {
+          return Promise.reject(
+            new Error("ledger-ethereum: webusb is not supported"),
+          );
+        }
       }
+
     }
     return true;
   }
@@ -142,7 +157,7 @@ class LedgerEthereum implements HWWalletProvider {
 
   close(): Promise<void> {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    return this.transport.close().catch(() => {});
+    return this.transport.close().catch(() => { });
   }
 
   isConnected(networkName: NetworkNames): Promise<boolean> {

packages/hw-wallets/src/trezor/ethereum/configs.ts

@@ -2,7 +2,7 @@ import { NetworkNames } from "@enkryptcom/types";
 import { bip44Paths } from "../../configs";
 
 const DEFAULT_PATHS = [bip44Paths.ethereum];
-const supportedPaths = {
+const networkBasedSupportedPaths = {
   [NetworkNames.Ethereum]: DEFAULT_PATHS,
   [NetworkNames.Matic]: DEFAULT_PATHS,
   [NetworkNames.Avalanche]: DEFAULT_PATHS,
@@ -28,4 +28,39 @@ const supportedPaths = {
   [NetworkNames.Telos]: DEFAULT_PATHS,
   [NetworkNames.Blast]: DEFAULT_PATHS,
 };
-export { supportedPaths };
+const ALL_SUPPORTED_PATHS = [
+  bip44Paths.ethereum,
+  bip44Paths.ethereumTestnet,
+  bip44Paths.ethereumClassic,
+  bip44Paths.rootstock,
+  Object.assign({}, bip44Paths.ethereumLedger, { label: "Ethereum - Ledger" }), // specify ledger
+  bip44Paths.ethereumLedgerLive,
+  bip44Paths.poaNetwork,
+  bip44Paths.expanse,
+  bip44Paths.ubiq,
+  bip44Paths.ellaism,
+  bip44Paths.etherGem,
+  bip44Paths.callisto,
+  bip44Paths.ethereumSocial,
+  bip44Paths.musicoin,
+  bip44Paths.goChain,
+  bip44Paths.eosClassic,
+  bip44Paths.akroma,
+  bip44Paths.etherSocialNetwork,
+  bip44Paths.pirl,
+  bip44Paths.ether1,
+  bip44Paths.atheios,
+  bip44Paths.tomoChain,
+  bip44Paths.mixBlockchain,
+  bip44Paths.iolite,
+  bip44Paths.thundercore,
+  bip44Paths.solidum,
+  bip44Paths.metadium,
+  bip44Paths.reoscChain,
+  bip44Paths.dexon,
+  bip44Paths.lightstreamsNetwork,
+  bip44Paths.mintmeComCoin,
+  bip44Paths.ethercore,
+  bip44Paths.binanceChain,
+];
+export { networkBasedSupportedPaths, ALL_SUPPORTED_PATHS };

packages/hw-wallets/src/trezor/ethereum/index.ts

@@ -12,17 +12,21 @@ import {
   SignMessageRequest,
   SignTransactionRequest,
 } from "../../types";
-import { supportedPaths } from "./configs";
+import { networkBasedSupportedPaths } from "./configs";
 import getTrezorConnect from "../trezorConnect";
 
 class TrezorEthereum implements HWWalletProvider {
   network: NetworkNames;
   TrezorConnect: TrezorConnect;
   HDNodes: Record<string, HDKey>;
+  isExtension: boolean;
 
   constructor(network: NetworkNames) {
     this.network = network;
     this.HDNodes = {};
+    this.isExtension = !!(
+      chrome && chrome.runtime && chrome.runtime.getPlatformInfo
+    );
   }
 
   async init(): Promise<boolean> {
@@ -31,7 +35,7 @@ class TrezorEthereum implements HWWalletProvider {
   }
 
   async getAddress(options: getAddressRequest): Promise<AddressResponse> {
-    if (!supportedPaths[this.network])
+    if (this.isExtension && !networkBasedSupportedPaths[this.network])
       return Promise.reject(new Error("trezor-ethereum: Invalid network name"));
 
     if (!this.HDNodes[options.pathType.basePath]) {
@@ -59,7 +63,7 @@ class TrezorEthereum implements HWWalletProvider {
   }
 
   getSupportedPaths(): PathType[] {
-    return supportedPaths[this.network];
+    return this.isExtension ? networkBasedSupportedPaths[this.network] : [];
   }
 
   close(): Promise<void> {
@@ -130,7 +134,7 @@ class TrezorEthereum implements HWWalletProvider {
   }
 
   static getSupportedNetworks(): NetworkNames[] {
-    return Object.keys(supportedPaths) as NetworkNames[];
+    return Object.keys(networkBasedSupportedPaths) as NetworkNames[];
   }
 
   static getCapabilities(): string[] {