@rango-dev/provider-ledger 0.19.0 → 0.19.1-next.0

package/dist/{solana-KA6FNSW3.js → solana-IAFAKOIV.js}

@@ -1,2 +1,2 @@
-import{a as o}from"./chunk-OOX2UCLJ.js";import{b as e,c as l,g as c,h as f}from"./chunk-XYQB3WYG.js";import{a}from"./chunk-CVKDPNYM.js";import{generalSolanaTransactionExecutor as w}from"@rango-dev/signer-solana";import{PublicKey as T}from"@solana/web3.js";import{SignerError as h,SignerErrorCode as y}from"rango-types";function x(g){return"version"in g}a(x,"isVersionedTransaction");var m=class{static{a(this,"SolanaSigner")}async signMessage(t){try{let r=await c();return(await new o(r).signOffchainMessage(e(),Buffer.from(t))).signature.toString()}catch(r){throw new h(y.SIGN_TX_ERROR,void 0,r)}}async signAndSendTx(t){try{return{hash:await w(t,a(async n=>{let p=await c(),i=new o(p),s;x(n)?s=await i.signTransaction(e(),n.message.serialize()):s=await i.signTransaction(e(),n.serialize());let u=await i.getAddress(e()),S=new T(u.address);return n.addSignature(S,Buffer.from(s.signature)),n.serialize()},"DefaultSolanaSigner"))}}catch(r){throw l(r)}finally{await f()}}};export{m as SolanaSigner,x as isVersionedTransaction};
-//# sourceMappingURL=solana-KA6FNSW3.js.map
+import{a as o}from"./chunk-OOX2UCLJ.js";import{b as e,c as l,g as c,h as f}from"./chunk-DCWKMLDG.js";import{a}from"./chunk-CVKDPNYM.js";import{generalSolanaTransactionExecutor as w}from"@rango-dev/signer-solana";import{PublicKey as T}from"@solana/web3.js";import{SignerError as h,SignerErrorCode as y}from"rango-types";function x(g){return"version"in g}a(x,"isVersionedTransaction");var m=class{static{a(this,"SolanaSigner")}async signMessage(t){try{let r=await c();return(await new o(r).signOffchainMessage(e(),Buffer.from(t))).signature.toString()}catch(r){throw new h(y.SIGN_TX_ERROR,void 0,r)}}async signAndSendTx(t){try{return{hash:await w(t,a(async n=>{let p=await c(),i=new o(p),s;x(n)?s=await i.signTransaction(e(),n.message.serialize()):s=await i.signTransaction(e(),n.serialize());let u=await i.getAddress(e()),S=new T(u.address);return n.addSignature(S,Buffer.from(s.signature)),n.serialize()},"DefaultSolanaSigner"))}}catch(r){throw l(r)}finally{await f()}}};export{m as SolanaSigner,x as isVersionedTransaction};
+//# sourceMappingURL=solana-IAFAKOIV.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/provider-ledger",
-  "version": "0.19.0",
+  "version": "0.19.1-next.0",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -28,7 +28,7 @@
     "@ledgerhq/types-cryptoassets": "^7.11.0",
     "@ledgerhq/types-devices": "^6.24.0",
     "@rango-dev/signer-solana": "^0.43.0",
-    "@rango-dev/wallets-shared": "^0.48.0",
+    "@rango-dev/wallets-shared": "^0.48.1-next.0",
     "@solana/web3.js": "^1.91.4",
     "@types/w3c-web-hid": "^1.0.2",
     "bs58": "^5.0.0",

package/src/helpers.ts

@@ -5,6 +5,7 @@ import {
   ETHEREUM_CHAIN_ID,
   Networks,
   type ProviderConnectResult,
+  retryLazyImport,
 } from '@rango-dev/wallets-shared';
 import bs58 from 'bs58';
 
@@ -60,7 +61,9 @@ export async function getEthereumAccounts(): Promise<ProviderConnectResult> {
     const transport = await transportConnect();
     const derivationPath = getDerivationPath();
 
-    const eth = new (await import('@ledgerhq/hw-app-eth')).default(transport);
+    const eth = new (
+      await retryLazyImport(async () => await import('@ledgerhq/hw-app-eth'))
+    ).default(transport);
 
     const accounts: string[] = [];
 
@@ -84,9 +87,9 @@ export async function getSolanaAccounts(): Promise<ProviderConnectResult> {
     const transport = await transportConnect();
     const derivationPath = getDerivationPath();
 
-    const solana = new (await import('@ledgerhq/hw-app-solana')).default(
-      transport
-    );
+    const solana = new (
+      await retryLazyImport(async () => await import('@ledgerhq/hw-app-solana'))
+    ).default(transport);
 
     const accounts: string[] = [];
 

package/src/signer.ts

@@ -1,11 +1,16 @@
 import type { SignerFactory } from 'rango-types';
 
+import { retryLazyImport } from '@rango-dev/wallets-shared';
 import { DefaultSignerFactory, TransactionType as TxType } from 'rango-types';
 
 export default async function getSigners(): Promise<SignerFactory> {
   const signers = new DefaultSignerFactory();
-  const { EthereumSigner } = await import('./signers/ethereum.js');
-  const { SolanaSigner } = await import('./signers/solana.js');
+  const { EthereumSigner } = await retryLazyImport(
+    async () => await import('./signers/ethereum.js')
+  );
+  const { SolanaSigner } = await retryLazyImport(
+    async () => await import('./signers/solana.js')
+  );
   signers.registerSigner(TxType.EVM, new EthereumSigner());
   signers.registerSigner(TxType.SOLANA, new SolanaSigner());
   return signers;

package/dist/chunk-XYQB3WYG.js

@@ -1,2 +0,0 @@
-import{a as n,m as c}from"./chunk-CVKDPNYM.js";var d="";function E(t){d=t}n(E,"setDerivationPath");function u(){return d}n(u,"getDerivationPath");import{ETHEREUM_CHAIN_ID as l,Networks as a}from"@rango-dev/wallets-shared";import w from"bs58";var m=16,p={21781:"The device is locked",25871:"Related application is not ready on your device",27013:"Action denied by user"};function A(t){return p[t]?p[t]:c(t)?c(t):`Ledger device unknown error 0x${t.toString(m)}`}n(A,"getLedgerErrorMessage");function f(t){return t?.statusCode?new Error(A(t.statusCode)):t?.code==="INSUFFICIENT_FUNDS"?new Error("Insufficient funds for transaction"):t}n(f,"getLedgerError");function L(){let t=new Map;return t.set(a.ETHEREUM,{chainId:l}),t.set(a.SOLANA,{chainId:a.SOLANA}),t}n(L,"getLedgerInstance");async function N(){try{let t=await g(),r=u(),s=new(await import("./Eth-5PCPPYSI.js")).default(t),e=[],i=await s.getAddress(r,!1,!0);return e.push(i.address),{accounts:e,chainId:l,derivationPath:r}}catch(t){throw f(t)}finally{await h()}}n(N,"getEthereumAccounts");async function C(){try{let t=await g(),r=u(),s=new(await import("./Solana-NJS3LWGA.js")).default(t),e=[],i=await s.getAddress(r);return e.push(w.encode(i.address)),{accounts:e,chainId:a.SOLANA,derivationPath:r}}catch(t){throw f(t)}finally{await h()}}n(C,"getSolanaAccounts");var o=null;async function g(){return o=await(await import("./TransportWebHID-JLT4ETY3.js")).default.create(),o}n(g,"transportConnect");async function h(){o&&(await o.close(),o=null)}n(h,"transportDisconnect");export{E as a,u as b,f as c,L as d,N as e,C as f,g,h};
-//# sourceMappingURL=chunk-XYQB3WYG.js.map

package/dist/chunk-XYQB3WYG.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../src/state.ts", "../src/helpers.ts"],
-  "sourcesContent": ["// We keep derivationPath here because we need to maintain it for signing transactions after it is set in connect method\nlet derivationPath = '';\n\nexport function setDerivationPath(path: string) {\n  derivationPath = path;\n}\n\nexport function getDerivationPath() {\n  return derivationPath;\n}\n", "import type Transport from '@ledgerhq/hw-transport';\n\nimport { getAltStatusMessage } from '@ledgerhq/errors';\nimport {\n  ETHEREUM_CHAIN_ID,\n  Networks,\n  type ProviderConnectResult,\n} from '@rango-dev/wallets-shared';\nimport bs58 from 'bs58';\n\nimport { getDerivationPath } from './state.js';\n\nexport const HEXADECIMAL_BASE = 16;\n\nconst ledgerFrequentErrorMessages: { [statusCode: number]: string } = {\n  0x5515: 'The device is locked',\n  0x650f: 'Related application is not ready on your device',\n  0x6985: 'Action denied by user',\n};\n\nfunction getLedgerErrorMessage(statusCode: number): string {\n  if (ledgerFrequentErrorMessages[statusCode]) {\n    return ledgerFrequentErrorMessages[statusCode];\n  } else if (getAltStatusMessage(statusCode)) {\n    return getAltStatusMessage(statusCode) as string;\n  }\n\n  return `Ledger device unknown error 0x${statusCode.toString(\n    HEXADECIMAL_BASE\n  )}`; // Hexadecimal numbers are more commonly recognized and utilized for representing ledger error codes\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function getLedgerError(error: any) {\n  if (error?.statusCode) {\n    return new Error(getLedgerErrorMessage(error.statusCode));\n  }\n\n  if (error?.code === 'INSUFFICIENT_FUNDS') {\n    return new Error('Insufficient funds for transaction');\n  }\n  return error;\n}\n\nexport function getLedgerInstance() {\n  /*\n   * Instances have a required property which is `chainId` and is using in swap execution.\n   * Here we are setting it as Ethereum always since we are supporting only eth for now.\n   */\n  const instances = new Map();\n\n  instances.set(Networks.ETHEREUM, { chainId: ETHEREUM_CHAIN_ID });\n  instances.set(Networks.SOLANA, { chainId: Networks.SOLANA });\n\n  return instances;\n}\n\nexport async function getEthereumAccounts(): Promise<ProviderConnectResult> {\n  try {\n    const transport = await transportConnect();\n    const derivationPath = getDerivationPath();\n\n    const eth = new (await import('@ledgerhq/hw-app-eth')).default(transport);\n\n    const accounts: string[] = [];\n\n    const result = await eth.getAddress(derivationPath, false, true);\n    accounts.push(result.address);\n\n    return {\n      accounts: accounts,\n      chainId: ETHEREUM_CHAIN_ID,\n      derivationPath,\n    };\n  } catch (error) {\n    throw getLedgerError(error);\n  } finally {\n    await transportDisconnect();\n  }\n}\n\nexport async function getSolanaAccounts(): Promise<ProviderConnectResult> {\n  try {\n    const transport = await transportConnect();\n    const derivationPath = getDerivationPath();\n\n    const solana = new (await import('@ledgerhq/hw-app-solana')).default(\n      transport\n    );\n\n    const accounts: string[] = [];\n\n    const result = await solana.getAddress(derivationPath);\n    accounts.push(bs58.encode(result.address));\n\n    return {\n      accounts: accounts,\n      chainId: Networks.SOLANA,\n      derivationPath,\n    };\n  } catch (error) {\n    throw getLedgerError(error);\n  } finally {\n    await transportDisconnect();\n  }\n}\n\nlet transportConnection: Transport | null = null;\n\nexport async function transportConnect() {\n  transportConnection = await (\n    await import('@ledgerhq/hw-transport-webhid')\n  ).default.create();\n\n  return transportConnection;\n}\n\nexport async function transportDisconnect() {\n  if (transportConnection) {\n    await transportConnection.close();\n    transportConnection = null;\n  }\n}\n"],
-  "mappings": "+CACA,IAAIA,EAAiB,GAEd,SAASC,EAAkBC,EAAc,CAC9CF,EAAiBE,CACnB,CAFgBC,EAAAF,EAAA,qBAIT,SAASG,GAAoB,CAClC,OAAOJ,CACT,CAFgBG,EAAAC,EAAA,qBCJhB,OACE,qBAAAC,EACA,YAAAC,MAEK,4BACP,OAAOC,MAAU,OAIV,IAAMC,EAAmB,GAE1BC,EAAgE,CACpE,MAAQ,uBACR,MAAQ,kDACR,MAAQ,uBACV,EAEA,SAASC,EAAsBC,EAA4B,CACzD,OAAIF,EAA4BE,CAAU,EACjCF,EAA4BE,CAAU,EACpCC,EAAoBD,CAAU,EAChCC,EAAoBD,CAAU,EAGhC,iCAAiCA,EAAW,SACjDH,CACF,CAAC,EACH,CAVSK,EAAAH,EAAA,yBAaF,SAASI,EAAeC,EAAY,CACzC,OAAIA,GAAO,WACF,IAAI,MAAML,EAAsBK,EAAM,UAAU,CAAC,EAGtDA,GAAO,OAAS,qBACX,IAAI,MAAM,oCAAoC,EAEhDA,CACT,CATgBF,EAAAC,EAAA,kBAWT,SAASE,GAAoB,CAKlC,IAAMC,EAAY,IAAI,IAEtB,OAAAA,EAAU,IAAIC,EAAS,SAAU,CAAE,QAASC,CAAkB,CAAC,EAC/DF,EAAU,IAAIC,EAAS,OAAQ,CAAE,QAASA,EAAS,MAAO,CAAC,EAEpDD,CACT,CAXgBJ,EAAAG,EAAA,qBAahB,eAAsBI,GAAsD,CAC1E,GAAI,CACF,IAAMC,EAAY,MAAMC,EAAiB,EACnCC,EAAiBC,EAAkB,EAEnCC,EAAM,IAAK,KAAM,QAAO,mBAAsB,GAAG,QAAQJ,CAAS,EAElEK,EAAqB,CAAC,EAEtBC,EAAS,MAAMF,EAAI,WAAWF,EAAgB,GAAO,EAAI,EAC/D,OAAAG,EAAS,KAAKC,EAAO,OAAO,EAErB,CACL,SAAUD,EACV,QAASP,EACT,eAAAI,CACF,CACF,OAASR,EAAO,CACd,MAAMD,EAAeC,CAAK,CAC5B,QAAE,CACA,MAAMa,EAAoB,CAC5B,CACF,CAtBsBf,EAAAO,EAAA,uBAwBtB,eAAsBS,GAAoD,CACxE,GAAI,CACF,IAAMR,EAAY,MAAMC,EAAiB,EACnCC,EAAiBC,EAAkB,EAEnCM,EAAS,IAAK,KAAM,QAAO,sBAAyB,GAAG,QAC3DT,CACF,EAEMK,EAAqB,CAAC,EAEtBC,EAAS,MAAMG,EAAO,WAAWP,CAAc,EACrD,OAAAG,EAAS,KAAKK,EAAK,OAAOJ,EAAO,OAAO,CAAC,EAElC,CACL,SAAUD,EACV,QAASR,EAAS,OAClB,eAAAK,CACF,CACF,OAASR,EAAO,CACd,MAAMD,EAAeC,CAAK,CAC5B,QAAE,CACA,MAAMa,EAAoB,CAC5B,CACF,CAxBsBf,EAAAgB,EAAA,qBA0BtB,IAAIG,EAAwC,KAE5C,eAAsBV,GAAmB,CACvC,OAAAU,EAAsB,MACpB,KAAM,QAAO,+BAA+B,GAC5C,QAAQ,OAAO,EAEVA,CACT,CANsBnB,EAAAS,EAAA,oBAQtB,eAAsBM,GAAsB,CACtCI,IACF,MAAMA,EAAoB,MAAM,EAChCA,EAAsB,KAE1B,CALsBnB,EAAAe,EAAA",
-  "names": ["derivationPath", "setDerivationPath", "path", "__name", "getDerivationPath", "ETHEREUM_CHAIN_ID", "Networks", "bs58", "HEXADECIMAL_BASE", "ledgerFrequentErrorMessages", "getLedgerErrorMessage", "statusCode", "getAltStatusMessage", "__name", "getLedgerError", "error", "getLedgerInstance", "instances", "Networks", "ETHEREUM_CHAIN_ID", "getEthereumAccounts", "transport", "transportConnect", "derivationPath", "getDerivationPath", "eth", "accounts", "result", "transportDisconnect", "getSolanaAccounts", "solana", "bs58", "transportConnection"]
-}