@ledgerhq/live-common 21.36.3 → 21.36.4

package/src/families/tron/bridge/js.ts

@@ -32,7 +32,7 @@ import type {
   AccountBridge,
   DeviceId,
 } from "../../../types/bridge";
-import { withDevice } from "../../../hw/deviceAccess";
+import { open, close } from "../../../hw";
 import signTransaction from "../../../hw/signTransaction";
 import { makeSync, makeScanAccounts } from "../../../bridge/jsHelpers";
 import { formatCurrencyUnit } from "../../../currencies";
@@ -99,63 +99,62 @@ const signOperation = ({
   transaction: Transaction;
   deviceId: DeviceId;
 }): Observable<SignOperationEvent> =>
-  withDevice(deviceId)((transport) =>
-    Observable.create((o) => {
-      async function main() {
-        const subAccount =
-          transaction.subAccountId && account.subAccounts
-            ? account.subAccounts.find(
-                (sa) => sa.id === transaction.subAccountId
-              )
-            : null;
-        const isContractAddressRecipient =
-          (await fetchTronContract(transaction.recipient)) !== undefined;
-        const fee = await getEstimatedFees(
-          account,
-          transaction,
-          isContractAddressRecipient
-        );
-        const balance = subAccount
-          ? subAccount.balance
-          : BigNumber.max(0, account.spendableBalance.minus(fee));
-        transaction.amount = transaction.useAllAmount
-          ? balance
-          : transaction.amount;
-
-        // send trc20 to a new account is forbidden by us (because it will not activate the account)
-        if (
-          transaction.recipient &&
-          transaction.mode === "send" &&
-          subAccount &&
-          subAccount.type === "TokenAccount" &&
-          subAccount.token.tokenType === "trc20" &&
-          !isContractAddressRecipient && // send trc20 to a smart contract is allowed
-          (await fetchTronAccount(transaction.recipient)).length === 0
-        ) {
-          throw new TronSendTrc20ToNewAccountForbidden();
-        }
+  Observable.create((o) => {
+    async function main() {
+      const subAccount =
+        transaction.subAccountId && account.subAccounts
+          ? account.subAccounts.find((sa) => sa.id === transaction.subAccountId)
+          : null;
+      const isContractAddressRecipient =
+        (await fetchTronContract(transaction.recipient)) !== undefined;
+      const fee = await getEstimatedFees(
+        account,
+        transaction,
+        isContractAddressRecipient
+      );
+      const balance = subAccount
+        ? subAccount.balance
+        : BigNumber.max(0, account.spendableBalance.minus(fee));
+      transaction.amount = transaction.useAllAmount
+        ? balance
+        : transaction.amount;
 
-        const getPreparedTransaction = () => {
-          switch (transaction.mode) {
-            case "freeze":
-              return freezeTronTransaction(account, transaction);
+      // send trc20 to a new account is forbidden by us (because it will not activate the account)
+      if (
+        transaction.recipient &&
+        transaction.mode === "send" &&
+        subAccount &&
+        subAccount.type === "TokenAccount" &&
+        subAccount.token.tokenType === "trc20" &&
+        !isContractAddressRecipient && // send trc20 to a smart contract is allowed
+        (await fetchTronAccount(transaction.recipient)).length === 0
+      ) {
+        throw new TronSendTrc20ToNewAccountForbidden();
+      }
 
-            case "unfreeze":
-              return unfreezeTronTransaction(account, transaction);
+      const getPreparedTransaction = () => {
+        switch (transaction.mode) {
+          case "freeze":
+            return freezeTronTransaction(account, transaction);
 
-            case "vote":
-              return voteTronSuperRepresentatives(account, transaction);
+          case "unfreeze":
+            return unfreezeTronTransaction(account, transaction);
 
-            case "claimReward":
-              return claimRewardTronTransaction(account);
+          case "vote":
+            return voteTronSuperRepresentatives(account, transaction);
 
-            default:
-              return createTronTransaction(account, transaction, subAccount);
-          }
-        };
+          case "claimReward":
+            return claimRewardTronTransaction(account);
+
+          default:
+            return createTronTransaction(account, transaction, subAccount);
+        }
+      };
 
-        const preparedTransaction = await getPreparedTransaction();
+      const preparedTransaction = await getPreparedTransaction();
+      const transport = await open(deviceId);
 
+      try {
         o.next({
           type: "device-signature-requested",
         });
@@ -275,14 +274,16 @@ const signOperation = ({
             expirationDate: null,
           },
         });
+      } finally {
+        close(transport, deviceId);
       }
+    }
 
-      main().then(
-        () => o.complete(),
-        (e) => o.error(e)
-      );
-    })
-  );
+    main().then(
+      () => o.complete(),
+      (e) => o.error(e)
+    );
+  });
 
 const broadcast = async ({
   signedOperation: { signature, operation, signatureRaw },