@ledgerhq/live-common 21.36.3 → 21.36.4

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 { withDevice } from "../../hw/deviceAccess";
+import CryptoOrgApp from "@ledgerhq/hw-app-cosmos";
+import { utils } from "@crypto-com/chain-jslib";
 import { buildTransaction } from "./js-buildTransaction";
 import { isTestNet } from "./logic";
 
@@ -104,9 +104,11 @@ const signOperation = ({
   deviceId: any;
   transaction: Transaction;
 }): Observable<SignOperationEvent> =>
-  withDevice(deviceId)((transport) =>
-    Observable.create((o) => {
-      async function main() {
+  Observable.create((o) => {
+    async function main() {
+      const transport = await open(deviceId);
+
+      try {
         o.next({
           type: "device-signature-requested",
         });
@@ -163,13 +165,15 @@ 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/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 { withDevice } from "../../hw/deviceAccess";
+import { open, close } from "../../hw";
 import { encodeOperationId } from "../../operation";
 import Elrond from "./hw-app-elrond";
 import { buildTransaction } from "./js-buildTransaction";
@@ -48,9 +48,11 @@ const signOperation = ({
   deviceId: any;
   transaction: Transaction;
 }): Observable<SignOperationEvent> =>
-  withDevice(deviceId)((transport) =>
-    Observable.create((o) => {
-      async function main() {
+  Observable.create((o) => {
+    async function main() {
+      const transport = await open(deviceId);
+
+      try {
         if (!transaction.fees) {
           throw new FeeNotLoaded();
         }
@@ -87,13 +89,15 @@ 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/polkadot/js-signOperation.ts

@@ -11,7 +11,7 @@ import type {
   OperationType,
   SignOperationEvent,
 } from "../../types";
-import { withDevice } from "../../hw/deviceAccess";
+import { open, close } from "../../hw";
 import { encodeOperationId } from "../../operation";
 import { buildTransaction } from "./js-buildTransaction";
 import { calculateAmount, getNonce, isFirstBond } from "./logic";
@@ -157,69 +157,69 @@ const signOperation = ({
   deviceId: any;
   transaction: Transaction;
 }): Observable<SignOperationEvent> =>
-  withDevice(deviceId)(
-    (transport) =>
-      new Observable((o) => {
-        async function main() {
-          o.next({
-            type: "device-signature-requested",
-          });
+  new Observable((o) => {
+    async function main() {
+      const transport = await open(deviceId);
 
-          if (!transaction.fees) {
-            throw new FeeNotLoaded();
-          }
-
-          // Ensure amount is filled when useAllAmount
-          const transactionToSign = {
-            ...transaction,
-            amount: calculateAmount({
-              a: account,
-              t: transaction,
-            }),
-          };
-          const { unsigned, registry } = await buildTransaction(
-            account,
-            transactionToSign,
-            true
-          );
-          const payload = registry
-            .createType("ExtrinsicPayload", unsigned, {
-              version: unsigned.version,
-            })
-            .toU8a({
-              method: true,
-            });
-          // Sign by device
-          const polkadot = new Polkadot(transport);
-          // FIXME: the type of payload Uint8Array is not compatible with the signature of sign which accept a string
-          const r = await polkadot.sign(
-            account.freshAddressPath,
-            payload as any
-          );
-          const signed = await signExtrinsic(unsigned, r.signature, registry);
-          o.next({
-            type: "device-signature-granted",
-          });
-          const operation = buildOptimisticOperation(
-            account,
-            transactionToSign,
-            transactionToSign.fees ?? new BigNumber(0)
-          );
-          o.next({
-            type: "signed",
-            signedOperation: {
-              operation,
-              signature: signed,
-              expirationDate: null,
-            },
-          });
+      try {
+        o.next({
+          type: "device-signature-requested",
+        });
+
+        if (!transaction.fees) {
+          throw new FeeNotLoaded();
         }
 
-        main().then(
-          () => o.complete(),
-          (e) => o.error(e)
+        // Ensure amount is filled when useAllAmount
+        const transactionToSign = {
+          ...transaction,
+          amount: calculateAmount({
+            a: account,
+            t: transaction,
+          }),
+        };
+        const { unsigned, registry } = await buildTransaction(
+          account,
+          transactionToSign,
+          true
         );
-      })
-  );
+        const payload = registry
+          .createType("ExtrinsicPayload", unsigned, {
+            version: unsigned.version,
+          })
+          .toU8a({
+            method: true,
+          });
+        // Sign by device
+        const polkadot = new Polkadot(transport);
+        // FIXME: the type of payload Uint8Array is not compatible with the signature of sign which accept a string
+        const r = await polkadot.sign(account.freshAddressPath, payload as any);
+        const signed = await signExtrinsic(unsigned, r.signature, registry);
+        o.next({
+          type: "device-signature-granted",
+        });
+        const operation = buildOptimisticOperation(
+          account,
+          transactionToSign,
+          transactionToSign.fees ?? new BigNumber(0)
+        );
+        o.next({
+          type: "signed",
+          signedOperation: {
+            operation,
+            signature: signed,
+            expirationDate: null,
+          },
+        });
+      } finally {
+        close(transport, deviceId);
+      }
+    }
+
+    main().then(
+      () => o.complete(),
+      (e) => o.error(e)
+    );
+  });
 
 export default signOperation;