@ledgerhq/live-common 21.36.2 → 21.36.3

package/lib/families/bitcoin/js-signOperation.js

@@ -64,7 +64,7 @@ var hw_app_btc_1 = __importDefault(require("@ledgerhq/hw-app-btc"));
 var logs_1 = require("@ledgerhq/logs");
 var derivation_1 = require("./../../derivation");
 var operation_1 = require("./../../operation");
-var hw_1 = require("./../../hw");
+var deviceAccess_1 = require("../../hw/deviceAccess");
 var networks_1 = require("./networks");
 var js_buildTransaction_1 = require("./js-buildTransaction");
 var cache_1 = require("./cache");
@@ -72,146 +72,137 @@ var wallet_btc_1 = __importStar(require("./wallet-btc"));
 var logic_1 = require("./logic");
 var signOperation = function (_a) {
     var account = _a.account, deviceId = _a.deviceId, transaction = _a.transaction;
-    return rxjs_1.Observable.create(function (o) {
-        function main() {
-            return __awaiter(this, void 0, void 0, function () {
-                var currency, transport, hwApp, walletAccount, txInfo, senders_1, recipients_1, fee_1, lockTime, unixtime, networkParams, sigHashType, segwit, hasTimestamp, initialTimestamp, perCoin, additionals, expiryHeight, hasExtraData, signature, operation;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            currency = account.currency;
-                            return [4 /*yield*/, (0, hw_1.open)(deviceId)];
-                        case 1:
-                            transport = _a.sent();
-                            hwApp = new hw_app_btc_1["default"](transport);
-                            walletAccount = (0, wallet_btc_1.getWalletAccount)(account);
-                            _a.label = 2;
-                        case 2:
-                            _a.trys.push([2, , 6, 7]);
-                            (0, logs_1.log)("hw", "signTransaction ".concat(currency.id, " for account ").concat(account.id));
-                            return [4 /*yield*/, (0, js_buildTransaction_1.buildTransaction)(account, transaction)];
-                        case 3:
-                            txInfo = _a.sent();
-                            senders_1 = new Set();
-                            recipients_1 = [];
-                            fee_1 = new bignumber_js_1.BigNumber(0);
-                            // Maybe better not re-calculate these fields here, instead include them
-                            // in Transaction type and set them in prepareTransaction?
-                            return [4 /*yield*/, (0, cache_1.calculateFees)({
-                                    account: account,
-                                    transaction: transaction
-                                }).then(function (res) {
-                                    senders_1 = new Set(res.txInputs.map(function (i) { return i.address; }).filter(Boolean));
-                                    recipients_1 = res.txOutputs
-                                        .filter(function (o) { return o.address && !o.isChange; })
-                                        .map(function (o) { return o.address; });
-                                    fee_1 = res.fees;
-                                })];
-                        case 4:
-                            // Maybe better not re-calculate these fields here, instead include them
-                            // in Transaction type and set them in prepareTransaction?
-                            _a.sent();
-                            lockTime = void 0;
-                            // (legacy) Set lockTime for Komodo to enable reward claiming on UTXOs created by
-                            // Ledger Live. We should only set this if the currency is Komodo and
-                            // lockTime isn't already defined.
-                            if (currency.id === "komodo" && lockTime === undefined) {
-                                unixtime = Math.floor(Date.now() / 1000);
-                                lockTime = unixtime - 777;
-                            }
-                            networkParams = (0, networks_1.getNetworkParameters)(currency.id);
-                            sigHashType = networkParams.sigHash;
-                            if (isNaN(sigHashType)) {
-                                throw new Error("sigHashType should not be NaN");
-                            }
-                            segwit = (0, derivation_1.isSegwitDerivationMode)(account.derivationMode);
-                            hasTimestamp = currency.id === "peercoin";
-                            initialTimestamp = hasTimestamp
-                                ? Math.floor(Date.now() / 1000)
-                                : undefined;
-                            perCoin = logic_1.perCoinLogic[currency.id];
-                            additionals = [currency.id];
-                            if (account.derivationMode === "native_segwit") {
-                                additionals.push("bech32");
-                            }
-                            if (account.derivationMode === "taproot") {
-                                additionals.push("bech32m");
-                            }
-                            if (perCoin === null || perCoin === void 0 ? void 0 : perCoin.getAdditionals) {
-                                additionals = additionals.concat(perCoin.getAdditionals({
-                                    transaction: transaction
-                                }));
-                            }
-                            expiryHeight = (perCoin === null || perCoin === void 0 ? void 0 : perCoin.hasExpiryHeight)
-                                ? Buffer.from([0x00, 0x00, 0x00, 0x00])
-                                : undefined;
-                            hasExtraData = (perCoin === null || perCoin === void 0 ? void 0 : perCoin.hasExtraData) || false;
-                            return [4 /*yield*/, wallet_btc_1["default"].signAccountTx({
-                                    btc: hwApp,
-                                    fromAccount: walletAccount,
-                                    txInfo: txInfo,
-                                    lockTime: lockTime,
-                                    sigHashType: sigHashType,
-                                    segwit: segwit,
-                                    hasTimestamp: hasTimestamp,
-                                    initialTimestamp: initialTimestamp,
-                                    additionals: additionals,
-                                    expiryHeight: expiryHeight,
-                                    hasExtraData: hasExtraData,
-                                    onDeviceSignatureGranted: function () {
-                                        return o.next({
-                                            type: "device-signature-granted"
-                                        });
-                                    },
-                                    onDeviceSignatureRequested: function () {
-                                        return o.next({
-                                            type: "device-signature-requested"
-                                        });
-                                    },
-                                    onDeviceStreaming: function (_a) {
-                                        var progress = _a.progress, index = _a.index, total = _a.total;
-                                        return o.next({
-                                            type: "device-streaming",
-                                            progress: progress,
-                                            index: index,
-                                            total: total
-                                        });
-                                    }
-                                })];
-                        case 5:
-                            signature = _a.sent();
-                            operation = {
-                                id: (0, operation_1.encodeOperationId)(account.id, "", "OUT"),
-                                hash: "",
-                                type: "OUT",
-                                value: new bignumber_js_1.BigNumber(transaction.amount).plus(fee_1),
-                                fee: fee_1,
-                                blockHash: null,
-                                blockHeight: null,
-                                senders: Array.from(senders_1),
-                                recipients: recipients_1,
-                                accountId: account.id,
-                                date: new Date(),
-                                extra: {}
-                            };
-                            o.next({
-                                type: "signed",
-                                signedOperation: {
-                                    operation: operation,
-                                    signature: signature,
-                                    expirationDate: null
+    return (0, deviceAccess_1.withDevice)(deviceId)(function (transport) {
+        return rxjs_1.Observable.create(function (o) {
+            function main() {
+                return __awaiter(this, void 0, void 0, function () {
+                    var currency, hwApp, walletAccount, txInfo, senders, recipients, fee, lockTime, unixtime, networkParams, sigHashType, segwit, hasTimestamp, initialTimestamp, perCoin, additionals, expiryHeight, hasExtraData, signature, operation;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                currency = account.currency;
+                                hwApp = new hw_app_btc_1["default"](transport);
+                                walletAccount = (0, wallet_btc_1.getWalletAccount)(account);
+                                (0, logs_1.log)("hw", "signTransaction ".concat(currency.id, " for account ").concat(account.id));
+                                return [4 /*yield*/, (0, js_buildTransaction_1.buildTransaction)(account, transaction)];
+                            case 1:
+                                txInfo = _a.sent();
+                                senders = new Set();
+                                recipients = [];
+                                fee = new bignumber_js_1.BigNumber(0);
+                                // Maybe better not re-calculate these fields here, instead include them
+                                // in Transaction type and set them in prepareTransaction?
+                                return [4 /*yield*/, (0, cache_1.calculateFees)({
+                                        account: account,
+                                        transaction: transaction
+                                    }).then(function (res) {
+                                        senders = new Set(res.txInputs.map(function (i) { return i.address; }).filter(Boolean));
+                                        recipients = res.txOutputs
+                                            .filter(function (o) { return o.address && !o.isChange; })
+                                            .map(function (o) { return o.address; });
+                                        fee = res.fees;
+                                    })];
+                            case 2:
+                                // Maybe better not re-calculate these fields here, instead include them
+                                // in Transaction type and set them in prepareTransaction?
+                                _a.sent();
+                                // (legacy) Set lockTime for Komodo to enable reward claiming on UTXOs created by
+                                // Ledger Live. We should only set this if the currency is Komodo and
+                                // lockTime isn't already defined.
+                                if (currency.id === "komodo" && lockTime === undefined) {
+                                    unixtime = Math.floor(Date.now() / 1000);
+                                    lockTime = unixtime - 777;
+                                }
+                                networkParams = (0, networks_1.getNetworkParameters)(currency.id);
+                                sigHashType = networkParams.sigHash;
+                                if (isNaN(sigHashType)) {
+                                    throw new Error("sigHashType should not be NaN");
+                                }
+                                segwit = (0, derivation_1.isSegwitDerivationMode)(account.derivationMode);
+                                hasTimestamp = currency.id === "peercoin";
+                                initialTimestamp = hasTimestamp
+                                    ? Math.floor(Date.now() / 1000)
+                                    : undefined;
+                                perCoin = logic_1.perCoinLogic[currency.id];
+                                additionals = [currency.id];
+                                if (account.derivationMode === "native_segwit") {
+                                    additionals.push("bech32");
+                                }
+                                if (account.derivationMode === "taproot") {
+                                    additionals.push("bech32m");
                                 }
-                            });
-                            return [3 /*break*/, 7];
-                        case 6:
-                            (0, hw_1.close)(transport, deviceId);
-                            return [7 /*endfinally*/];
-                        case 7: return [2 /*return*/];
-                    }
+                                if (perCoin === null || perCoin === void 0 ? void 0 : perCoin.getAdditionals) {
+                                    additionals = additionals.concat(perCoin.getAdditionals({
+                                        transaction: transaction
+                                    }));
+                                }
+                                expiryHeight = (perCoin === null || perCoin === void 0 ? void 0 : perCoin.hasExpiryHeight)
+                                    ? Buffer.from([0x00, 0x00, 0x00, 0x00])
+                                    : undefined;
+                                hasExtraData = (perCoin === null || perCoin === void 0 ? void 0 : perCoin.hasExtraData) || false;
+                                return [4 /*yield*/, wallet_btc_1["default"].signAccountTx({
+                                        btc: hwApp,
+                                        fromAccount: walletAccount,
+                                        txInfo: txInfo,
+                                        lockTime: lockTime,
+                                        sigHashType: sigHashType,
+                                        segwit: segwit,
+                                        hasTimestamp: hasTimestamp,
+                                        initialTimestamp: initialTimestamp,
+                                        additionals: additionals,
+                                        expiryHeight: expiryHeight,
+                                        hasExtraData: hasExtraData,
+                                        onDeviceSignatureGranted: function () {
+                                            return o.next({
+                                                type: "device-signature-granted"
+                                            });
+                                        },
+                                        onDeviceSignatureRequested: function () {
+                                            return o.next({
+                                                type: "device-signature-requested"
+                                            });
+                                        },
+                                        onDeviceStreaming: function (_a) {
+                                            var progress = _a.progress, index = _a.index, total = _a.total;
+                                            return o.next({
+                                                type: "device-streaming",
+                                                progress: progress,
+                                                index: index,
+                                                total: total
+                                            });
+                                        }
+                                    })];
+                            case 3:
+                                signature = _a.sent();
+                                operation = {
+                                    id: (0, operation_1.encodeOperationId)(account.id, "", "OUT"),
+                                    hash: "",
+                                    type: "OUT",
+                                    value: new bignumber_js_1.BigNumber(transaction.amount).plus(fee),
+                                    fee: fee,
+                                    blockHash: null,
+                                    blockHeight: null,
+                                    senders: Array.from(senders),
+                                    recipients: recipients,
+                                    accountId: account.id,
+                                    date: new Date(),
+                                    extra: {}
+                                };
+                                o.next({
+                                    type: "signed",
+                                    signedOperation: {
+                                        operation: operation,
+                                        signature: signature,
+                                        expirationDate: null
+                                    }
+                                });
+                                return [2 /*return*/];
+                        }
+                    });
                 });
-            });
-        }
-        main().then(function () { return o.complete(); }, function (e) { return o.error(e); });
+            }
+            main().then(function () { return o.complete(); }, function (e) { return o.error(e); });
+        });
     });
 };
 exports["default"] = signOperation;

package/lib/families/bitcoin/js-signOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-signOperation.js","sourceRoot":"","sources":["../../../src/families/bitcoin/js-signOperation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"js-signOperation.js","sourceRoot":"","sources":["../../../src/families/bitcoin/js-signOperation.ts"],"names":[],"mappings":"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"}

package/lib/families/crypto_org/js-signOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-signOperation.d.ts","sourceRoot":"","sources":["../../../src/families/crypto_org/js-signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAMlC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAa,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAsF1E;;GAEG;AACH,QAAA,MAAM,aAAa;aAKR,OAAO;cACN,GAAG;iBACA,WAAW;MACtB,WAAW,kBAAkB,CAuE7B,CAAC;AAEL,eAAe,aAAa,CAAC"}
+{"version":3,"file":"js-signOperation.d.ts","sourceRoot":"","sources":["../../../src/families/crypto_org/js-signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAQlC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAa,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAoF1E;;GAEG;AACH,QAAA,MAAM,aAAa;aAKR,OAAO;cACN,GAAG;iBACA,WAAW;MACtB,WAAW,kBAAkB,CAmE9B,CAAC;AAEJ,eAAe,aAAa,CAAC"}

package/lib/families/crypto_org/js-signOperation.js

@@ -41,12 +41,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var bignumber_js_1 = require("bignumber.js");
 var rxjs_1 = require("rxjs");
+var chain_jslib_1 = require("@crypto-com/chain-jslib");
 var errors_1 = require("@ledgerhq/errors");
+var hw_app_cosmos_1 = __importDefault(require("@ledgerhq/hw-app-cosmos"));
 var errors_2 = require("./errors");
-var hw_1 = require("../../hw");
 var operation_1 = require("../../operation");
-var hw_app_cosmos_1 = __importDefault(require("@ledgerhq/hw-app-cosmos"));
-var chain_jslib_1 = require("@crypto-com/chain-jslib");
+var deviceAccess_1 = require("../../hw/deviceAccess");
 var js_buildTransaction_1 = require("./js-buildTransaction");
 var logic_1 = require("./logic");
 var buildOptimisticOperation = function (account, transaction, fee) {
@@ -117,68 +117,61 @@ function padZero(original_array, wanted_length) {
  */
 var signOperation = function (_a) {
     var account = _a.account, deviceId = _a.deviceId, transaction = _a.transaction;
-    return rxjs_1.Observable.create(function (o) {
-        function main() {
-            var _a;
-            return __awaiter(this, void 0, void 0, function () {
-                var transport, hwApp, address, cointype, publicKey, unsigned, signature, base64Sig, signed, operation;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, (0, hw_1.open)(deviceId)];
-                        case 1:
-                            transport = _b.sent();
-                            _b.label = 2;
-                        case 2:
-                            _b.trys.push([2, , 6, 7]);
-                            o.next({
-                                type: "device-signature-requested"
-                            });
-                            if (!transaction.fees) {
-                                throw new errors_1.FeeNotLoaded();
-                            }
-                            hwApp = new hw_app_cosmos_1["default"](transport);
-                            address = account.freshAddresses[0];
-                            cointype = (0, logic_1.isTestNet)(account.currency.id) ? "tcro" : "cro";
-                            return [4 /*yield*/, hwApp.getAddress(address.derivationPath, cointype, false)];
-                        case 3:
-                            publicKey = (_b.sent()).publicKey;
-                            return [4 /*yield*/, (0, js_buildTransaction_1.buildTransaction)(account, transaction, publicKey)];
-                        case 4:
-                            unsigned = _b.sent();
-                            return [4 /*yield*/, hwApp.sign(address.derivationPath, unsigned.toSignDocument(0).toUint8Array())];
-                        case 5:
-                            signature = (_b.sent()).signature;
-                            // Ledger has encoded the sig in ASN1 DER format, but we need a 64-byte buffer of <r,s>
-                            // DER-encoded signature from Ledger
-                            if (signature != null) {
-                                base64Sig = convertASN1toBase64(signature);
-                                signed = unsigned
-                                    .setSignature(0, chain_jslib_1.utils.Bytes.fromUint8Array(new Uint8Array(base64Sig)))
-                                    .toSigned()
-                                    .getHexEncoded();
+    return (0, deviceAccess_1.withDevice)(deviceId)(function (transport) {
+        return rxjs_1.Observable.create(function (o) {
+            function main() {
+                var _a;
+                return __awaiter(this, void 0, void 0, function () {
+                    var hwApp, address, cointype, publicKey, unsigned, signature, base64Sig, signed, operation;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
                                 o.next({
-                                    type: "device-signature-granted"
+                                    type: "device-signature-requested"
                                 });
-                                operation = buildOptimisticOperation(account, transaction, (_a = transaction.fees) !== null && _a !== void 0 ? _a : new bignumber_js_1.BigNumber(0));
-                                o.next({
-                                    type: "signed",
-                                    signedOperation: {
-                                        operation: operation,
-                                        signature: signed,
-                                        expirationDate: null
-                                    }
-                                });
-                            }
-                            return [3 /*break*/, 7];
-                        case 6:
-                            (0, hw_1.close)(transport, deviceId);
-                            return [7 /*endfinally*/];
-                        case 7: return [2 /*return*/];
-                    }
+                                if (!transaction.fees) {
+                                    throw new errors_1.FeeNotLoaded();
+                                }
+                                hwApp = new hw_app_cosmos_1["default"](transport);
+                                address = account.freshAddresses[0];
+                                cointype = (0, logic_1.isTestNet)(account.currency.id) ? "tcro" : "cro";
+                                return [4 /*yield*/, hwApp.getAddress(address.derivationPath, cointype, false)];
+                            case 1:
+                                publicKey = (_b.sent()).publicKey;
+                                return [4 /*yield*/, (0, js_buildTransaction_1.buildTransaction)(account, transaction, publicKey)];
+                            case 2:
+                                unsigned = _b.sent();
+                                return [4 /*yield*/, hwApp.sign(address.derivationPath, unsigned.toSignDocument(0).toUint8Array())];
+                            case 3:
+                                signature = (_b.sent()).signature;
+                                // Ledger has encoded the sig in ASN1 DER format, but we need a 64-byte buffer of <r,s>
+                                // DER-encoded signature from Ledger
+                                if (signature != null) {
+                                    base64Sig = convertASN1toBase64(signature);
+                                    signed = unsigned
+                                        .setSignature(0, chain_jslib_1.utils.Bytes.fromUint8Array(new Uint8Array(base64Sig)))
+                                        .toSigned()
+                                        .getHexEncoded();
+                                    o.next({
+                                        type: "device-signature-granted"
+                                    });
+                                    operation = buildOptimisticOperation(account, transaction, (_a = transaction.fees) !== null && _a !== void 0 ? _a : new bignumber_js_1.BigNumber(0));
+                                    o.next({
+                                        type: "signed",
+                                        signedOperation: {
+                                            operation: operation,
+                                            signature: signed,
+                                            expirationDate: null
+                                        }
+                                    });
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
                 });
-            });
-        }
-        main().then(function () { return o.complete(); }, function (e) { return o.error(e); });
+            }
+            main().then(function () { return o.complete(); }, function (e) { return o.error(e); });
+        });
     });
 };
 exports["default"] = signOperation;

package/lib/families/crypto_org/js-signOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-signOperation.js","sourceRoot":"","sources":["../../../src/families/crypto_org/js-signOperation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"js-signOperation.js","sourceRoot":"","sources":["../../../src/families/crypto_org/js-signOperation.ts"],"names":[],"mappings":"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"}

package/lib/families/elrond/js-signOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-signOperation.d.ts","sourceRoot":"","sources":["../../../src/families/elrond/js-signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAa,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAkC1E;;GAEG;AACH,QAAA,MAAM,aAAa;aAKR,OAAO;cACN,GAAG;iBACA,WAAW;MACtB,WAAW,kBAAkB,CAmD7B,CAAC;AAEL,eAAe,aAAa,CAAC"}
+{"version":3,"file":"js-signOperation.d.ts","sourceRoot":"","sources":["../../../src/families/elrond/js-signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAa,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAkC1E;;GAEG;AACH,QAAA,MAAM,aAAa;aAKR,OAAO;cACN,GAAG;iBACA,WAAW;MACtB,WAAW,kBAAkB,CA+C9B,CAAC;AAEJ,eAAe,aAAa,CAAC"}

package/lib/families/elrond/js-signOperation.js

@@ -42,7 +42,7 @@ exports.__esModule = true;
 var bignumber_js_1 = require("bignumber.js");
 var rxjs_1 = require("rxjs");
 var errors_1 = require("@ledgerhq/errors");
-var hw_1 = require("../../hw");
+var deviceAccess_1 = require("../../hw/deviceAccess");
 var operation_1 = require("../../operation");
 var hw_app_elrond_1 = __importDefault(require("./hw-app-elrond"));
 var js_buildTransaction_1 = require("./js-buildTransaction");
@@ -74,57 +74,50 @@ var buildOptimisticOperation = function (account, transaction, fee) {
  */
 var signOperation = function (_a) {
     var account = _a.account, deviceId = _a.deviceId, transaction = _a.transaction;
-    return rxjs_1.Observable.create(function (o) {
-        function main() {
-            var _a;
-            return __awaiter(this, void 0, void 0, function () {
-                var transport, elrond, unsigned, r, operation;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, (0, hw_1.open)(deviceId)];
-                        case 1:
-                            transport = _b.sent();
-                            _b.label = 2;
-                        case 2:
-                            _b.trys.push([2, , 6, 7]);
-                            if (!transaction.fees) {
-                                throw new errors_1.FeeNotLoaded();
-                            }
-                            elrond = new hw_app_elrond_1["default"](transport);
-                            return [4 /*yield*/, elrond.setAddress(account.freshAddressPath)];
-                        case 3:
-                            _b.sent();
-                            return [4 /*yield*/, (0, js_buildTransaction_1.buildTransaction)(account, transaction)];
-                        case 4:
-                            unsigned = _b.sent();
-                            o.next({
-                                type: "device-signature-requested"
-                            });
-                            return [4 /*yield*/, elrond.signTransaction(account.freshAddressPath, unsigned, true)];
-                        case 5:
-                            r = _b.sent();
-                            o.next({
-                                type: "device-signature-granted"
-                            });
-                            operation = buildOptimisticOperation(account, transaction, (_a = transaction.fees) !== null && _a !== void 0 ? _a : new bignumber_js_1.BigNumber(0));
-                            o.next({
-                                type: "signed",
-                                signedOperation: {
-                                    operation: operation,
-                                    signature: r,
-                                    expirationDate: null
+    return (0, deviceAccess_1.withDevice)(deviceId)(function (transport) {
+        return rxjs_1.Observable.create(function (o) {
+            function main() {
+                var _a;
+                return __awaiter(this, void 0, void 0, function () {
+                    var elrond, unsigned, r, operation;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                if (!transaction.fees) {
+                                    throw new errors_1.FeeNotLoaded();
                                 }
-                            });
-                            return [3 /*break*/, 7];
-                        case 6:
-                            (0, hw_1.close)(transport, deviceId);
-                            return [7 /*endfinally*/];
-                        case 7: return [2 /*return*/];
-                    }
+                                elrond = new hw_app_elrond_1["default"](transport);
+                                return [4 /*yield*/, elrond.setAddress(account.freshAddressPath)];
+                            case 1:
+                                _b.sent();
+                                return [4 /*yield*/, (0, js_buildTransaction_1.buildTransaction)(account, transaction)];
+                            case 2:
+                                unsigned = _b.sent();
+                                o.next({
+                                    type: "device-signature-requested"
+                                });
+                                return [4 /*yield*/, elrond.signTransaction(account.freshAddressPath, unsigned, true)];
+                            case 3:
+                                r = _b.sent();
+                                o.next({
+                                    type: "device-signature-granted"
+                                });
+                                operation = buildOptimisticOperation(account, transaction, (_a = transaction.fees) !== null && _a !== void 0 ? _a : new bignumber_js_1.BigNumber(0));
+                                o.next({
+                                    type: "signed",
+                                    signedOperation: {
+                                        operation: operation,
+                                        signature: r,
+                                        expirationDate: null
+                                    }
+                                });
+                                return [2 /*return*/];
+                        }
+                    });
                 });
-            });
-        }
-        main().then(function () { return o.complete(); }, function (e) { return o.error(e); });
+            }
+            main().then(function () { return o.complete(); }, function (e) { return o.error(e); });
+        });
     });
 };
 exports["default"] = signOperation;

package/lib/families/elrond/js-signOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-signOperation.js","sourceRoot":"","sources":["../../../src/families/elrond/js-signOperation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"js-signOperation.js","sourceRoot":"","sources":["../../../src/families/elrond/js-signOperation.ts"],"names":[],"mappings":"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"}