LIVE-1890 Replace all deprecated uses of open(deviceId) with withDevi…

…ce (LedgerHQ#1856)
alexalouit · Apr 7, 2022 · 7ef865d · 7ef865d
1 parent c2256fe
commit 7ef865d
Show file tree

Hide file tree

Showing 8 changed files with 634 additions and 653 deletions.
diff --git a/src/bridge/jsHelpers.ts b/src/bridge/jsHelpers.ts
diff --git a/src/families/bitcoin/js-signOperation.ts b/src/families/bitcoin/js-signOperation.ts
@@ -5,7 +5,7 @@ import { log } from "@ledgerhq/logs";
 import type { Account, Operation, SignOperationEvent } from "./../../types";
 import { isSegwitDerivationMode } from "./../../derivation";
 import { encodeOperationId } from "./../../operation";
-import { open, close } from "./../../hw";
+import { withDevice } from "../../hw/deviceAccess";
 import type { Transaction } from "./types";
 import { getNetworkParameters } from "./networks";
 import { buildTransaction } from "./js-buildTransaction";
@@ -22,14 +22,13 @@ const signOperation = ({
   deviceId: any;
   transaction: Transaction;
 }): Observable<SignOperationEvent> =>
-  Observable.create((o) => {
-    async function main() {
-      const { currency } = account;
-      const transport = await open(deviceId);
-      const hwApp = new Btc(transport);
-      const walletAccount = getWalletAccount(account);
-
-      try {
+  withDevice(deviceId)((transport) =>
+    Observable.create((o) => {
+      async function main() {
+        const { currency } = account;
+        const hwApp = new Btc(transport);
+        const walletAccount = getWalletAccount(account);
+
         log("hw", `signTransaction ${currency.id} for account ${account.id}`);
         const txInfo = await buildTransaction(account, transaction);
         let senders = new Set<string>();
@@ -152,15 +151,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;
diff --git a/src/families/crypto_org/js-signOperation.ts b/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",
         });
@@ -165,15 +163,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;
diff --git a/src/families/elrond/js-signOperation.ts b/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;
diff --git a/src/families/polkadot/js-signOperation.ts b/src/families/polkadot/js-signOperation.ts
@@ -11,7 +11,7 @@ import type {
   OperationType,
   SignOperationEvent,
 } from "../../types";
-import { open, close } from "../../hw";
+import { withDevice } from "../../hw/deviceAccess";
 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> =>
-  new Observable((o) => {
-    async function main() {
-      const transport = await open(deviceId);
-
-      try {
-        o.next({
-          type: "device-signature-requested",
-        });
+  withDevice(deviceId)(
+    (transport) =>
+      new Observable((o) => {
+        async function main() {
+          o.next({
+            type: "device-signature-requested",
+          });
 
-        if (!transaction.fees) {
-          throw new FeeNotLoaded();
+          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,
+            },
+          });
         }
 
-        // 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)
+        main().then(
+          () => o.complete(),
+          (e) => o.error(e)
         );
-        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;