@ledgerhq/live-common 21.36.2 → 22.0.0

package/src/families/crypto_org/js-signOperation.ts

@@ -1,16 +1,16 @@
 import { BigNumber } from "bignumber.js";
 import { Observable } from "rxjs";
+import { utils } from "@crypto-com/chain-jslib";
 import { FeeNotLoaded } from "@ledgerhq/errors";
+import CryptoOrgApp from "@ledgerhq/hw-app-cosmos";
 import {
   CryptoOrgWrongSignatureHeader,
   CryptoOrgSignatureSize,
 } from "./errors";
 import type { Transaction } from "./types";
 import type { Account, Operation, SignOperationEvent } from "../../types";
-import { open, close } from "../../hw";
 import { encodeOperationId } from "../../operation";
-import CryptoOrgApp from "@ledgerhq/hw-app-cosmos";
-import { utils } from "@crypto-com/chain-jslib";
+import { withDevice } from "../../hw/deviceAccess";
 import { buildTransaction } from "./js-buildTransaction";
 import { isTestNet } from "./logic";
 
@@ -104,11 +104,9 @@ const signOperation = ({
   deviceId: any;
   transaction: Transaction;
 }): Observable<SignOperationEvent> =>
-  Observable.create((o) => {
-    async function main() {
-      const transport = await open(deviceId);
-
-      try {
+  withDevice(deviceId)((transport) =>
+    Observable.create((o) => {
+      async function main() {
         o.next({
           type: "device-signature-requested",
         });
@@ -119,10 +117,9 @@ const signOperation = ({
 
         // Get the public key
         const hwApp = new CryptoOrgApp(transport);
-        const address = account.freshAddresses[0];
         const cointype = isTestNet(account.currency.id) ? "tcro" : "cro";
         const { publicKey } = await hwApp.getAddress(
-          address.derivationPath,
+          account.freshAddressPath,
           cointype,
           false
         );
@@ -133,7 +130,7 @@ const signOperation = ({
         );
         // Sign by device
         const { signature } = await hwApp.sign(
-          address.derivationPath,
+          account.freshAddressPath,
           unsigned.toSignDocument(0).toUint8Array()
         );
 
@@ -165,15 +162,13 @@ const signOperation = ({
             },
           });
         }
-      } finally {
-        close(transport, deviceId);
       }
-    }
 
-    main().then(
-      () => o.complete(),
-      (e) => o.error(e)
-    );
-  });
+      main().then(
+        () => o.complete(),
+        (e) => o.error(e)
+      );
+    })
+  );
 
 export default signOperation;

package/src/families/crypto_org/types.ts

@@ -3,10 +3,7 @@ import type {
   TransactionCommon,
   TransactionCommonRaw,
 } from "../../types/transaction";
-export type CoreStatics = Record<any, any>;
-export type CoreAccountSpecifics = Record<any, any>;
-export type CoreOperationSpecifics = Record<any, any>;
-export type CoreCurrencySpecifics = Record<any, any>;
+
 export type CryptoOrgResources = {
   bondedBalance: BigNumber;
   redelegatingBalance: BigNumber;
@@ -38,4 +35,3 @@ export type NetworkInfo = {
 export type NetworkInfoRaw = {
   family: "crypto_org";
 };
-export const reflect = (_declare: any) => {};

package/src/families/elrond/js-signOperation.ts

@@ -3,7 +3,7 @@ import { Observable } from "rxjs";
 import { FeeNotLoaded } from "@ledgerhq/errors";
 import type { Transaction } from "./types";
 import type { Account, Operation, SignOperationEvent } from "../../types";
-import { open, close } from "../../hw";
+import { withDevice } from "../../hw/deviceAccess";
 import { encodeOperationId } from "../../operation";
 import Elrond from "./hw-app-elrond";
 import { buildTransaction } from "./js-buildTransaction";
@@ -48,11 +48,9 @@ const signOperation = ({
   deviceId: any;
   transaction: Transaction;
 }): Observable<SignOperationEvent> =>
-  Observable.create((o) => {
-    async function main() {
-      const transport = await open(deviceId);
-
-      try {
+  withDevice(deviceId)((transport) =>
+    Observable.create((o) => {
+      async function main() {
         if (!transaction.fees) {
           throw new FeeNotLoaded();
         }
@@ -89,15 +87,13 @@ const signOperation = ({
             expirationDate: null,
           },
         });
-      } finally {
-        close(transport, deviceId);
       }
-    }
 
-    main().then(
-      () => o.complete(),
-      (e) => o.error(e)
-    );
-  });
+      main().then(
+        () => o.complete(),
+        (e) => o.error(e)
+      );
+    })
+  );
 
 export default signOperation;

package/src/families/elrond/types.ts

@@ -1,13 +1,10 @@
 import type { BigNumber } from "bignumber.js";
-import { RangeRaw } from "../../range";
+import { Range, RangeRaw } from "../../range";
 import type {
   TransactionCommon,
   TransactionCommonRaw,
 } from "../../types/transaction";
-export type CoreStatics = Record<string, never>;
-export type CoreAccountSpecifics = Record<string, never>;
-export type CoreOperationSpecifics = Record<string, never>;
-export type CoreCurrencySpecifics = Record<string, never>;
+
 export type ElrondResources = {
   nonce: number;
 };
@@ -74,4 +71,3 @@ export type NetworkInfoRaw = {
 export type ElrondPreloadData = {
   validators: Record<string, any>;
 };
-export const reflect = (_declare: any) => {};