@ledgerhq/live-common 21.32.1 → 21.32.5

package/lib/families/bitcoin/wallet-btc/crypto/zec.js

@@ -1,27 +1,61 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-var address_1 = require("bitcoinjs-lib/src/address");
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 var zcash_bitcore_lib_1 = __importDefault(require("zcash-bitcore-lib"));
 var bs58check_1 = __importDefault(require("bs58check"));
-var coininfo_1 = __importDefault(require("coininfo"));
+var bjs = __importStar(require("bitcoinjs-lib"));
 var errors_1 = require("@ledgerhq/errors");
 var types_1 = require("../types");
 var base_1 = __importDefault(require("./base"));
-var ZCash = /** @class */ (function () {
+var ZCash = /** @class */ (function (_super) {
+    __extends(ZCash, _super);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     function ZCash(_a) {
         var network = _a.network;
-        this.network = network;
-        this.network.dustThreshold = 10000;
-        this.network.dustPolicy = "FIXED";
-        this.network.usesTimestampedTransaction = false;
+        var _this = _super.call(this, { network: network }) || this;
+        _this.network = network;
+        _this.network.dustThreshold = 10000;
+        _this.network.dustPolicy = "FIXED";
+        _this.network.usesTimestampedTransaction = false;
+        return _this;
     }
     // eslint-disable-next-line
     ZCash.prototype.baddrToTaddr = function (baddrStr) {
@@ -31,26 +65,16 @@ var ZCash = /** @class */ (function () {
         taddr.set([0x1c, 0xb8], 0);
         return bs58check_1["default"].encode(Buffer.from(taddr));
     };
-    ZCash.toBitcoinAddr = function (taddr) {
-        // refer to https://runkitcdn.com/gojomo/baddr2taddr/1.0.2
-        var baddr = new Uint8Array(21);
-        baddr.set(bs58check_1["default"].decode(taddr).slice(2), 1);
-        return bs58check_1["default"].encode(Buffer.from(baddr));
-    };
     // eslint-disable-next-line
     ZCash.prototype.getLegacyAddress = function (xpub, account, index) {
-        var pubkey = new zcash_bitcore_lib_1["default"].HDPublicKey(xpub);
-        var child = pubkey.derive(account).derive(index);
-        var address = new zcash_bitcore_lib_1["default"].Address(child.publicKey, zcash_bitcore_lib_1["default"].Networks.livenet);
-        return address.toString();
+        var pk = bjs.crypto.hash160(this.getPubkeyAt(xpub, account, index));
+        var payload = Buffer.allocUnsafe(22);
+        payload.writeUInt16BE(this.network.pubKeyHash, 0);
+        pk.copy(payload, 2);
+        return bs58check_1["default"].encode(payload);
     };
-    ZCash.prototype.getAddress = function (derivationMode, xpub, account, index) {
-        if (base_1["default"].addressCache["".concat(this.network.name, "-").concat(derivationMode, "-").concat(xpub, "-").concat(account, "-").concat(index)]) {
-            return base_1["default"].addressCache["".concat(this.network.name, "-").concat(derivationMode, "-").concat(xpub, "-").concat(account, "-").concat(index)];
-        }
-        var address = this.getLegacyAddress(xpub, account, index);
-        base_1["default"].addressCache["".concat(this.network.name, "-").concat(derivationMode, "-").concat(xpub, "-").concat(account, "-").concat(index)] = address;
-        return address;
+    ZCash.prototype.customGetAddress = function (derivationMode, xpub, account, index) {
+        return this.getLegacyAddress(xpub, account, index);
     };
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ZCash.prototype.getDerivationMode = function (address) {
@@ -60,18 +84,24 @@ var ZCash = /** @class */ (function () {
         if (!this.validateAddress(address)) {
             throw new errors_1.InvalidAddress();
         }
-        // TODO find a better way to calculate the script from zec address instead of converting to bitcoin address
-        return (0, address_1.toOutputScript)(ZCash.toBitcoinAddr(address), coininfo_1["default"].bitcoin.main.toBitcoinJS());
+        var version = Number("0x" + bs58check_1["default"].decode(address).slice(0, 2).toString("hex"));
+        if (version === this.network.pubKeyHash) {
+            //Pay-to-PubkeyHash
+            return bjs.payments.p2pkh({ hash: bs58check_1["default"].decode(address).slice(2) })
+                .output;
+        }
+        if (version === this.network.scriptHash) {
+            //Pay-to-Script-Hash
+            return bjs.payments.p2sh({ hash: bs58check_1["default"].decode(address).slice(2) })
+                .output;
+        }
+        throw new errors_1.InvalidAddress();
     };
     // eslint-disable-next-line class-methods-use-this
     ZCash.prototype.validateAddress = function (address) {
         return zcash_bitcore_lib_1["default"].Address.isValid(address, "livenet");
     };
-    // eslint-disable-next-line
-    ZCash.prototype.isTaprootAddress = function (address) {
-        return false;
-    };
     return ZCash;
-}());
+}(base_1["default"]));
 exports["default"] = ZCash;
 //# sourceMappingURL=zec.js.map

package/lib/families/bitcoin/wallet-btc/crypto/zec.js.map

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

package/lib/families/bitcoin/wallet-btc/crypto/zen.d.ts

@@ -1,19 +1,17 @@
 /// <reference types="node" />
 import { DerivationModes } from "../types";
-import { ICrypto } from "./types";
-declare class Zen implements ICrypto {
+import Base from "./base";
+declare class Zen extends Base {
     network: any;
     constructor({ network }: {
         network: any;
     });
     baddrToTaddr(baddrStr: string): string;
-    private static toBitcoinAddr;
     getLegacyAddress(xpub: string, account: number, index: number): string;
-    getAddress(derivationMode: string, xpub: string, account: number, index: number): string;
+    customGetAddress(derivationMode: string, xpub: string, account: number, index: number): string;
     getDerivationMode(address: string): DerivationModes;
     toOutputScript(address: string): Buffer;
     validateAddress(address: string): boolean;
-    isTaprootAddress(address: string): boolean;
 }
 export default Zen;
 //# sourceMappingURL=zen.d.ts.map

package/lib/families/bitcoin/wallet-btc/crypto/zen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zen.d.ts","sourceRoot":"","sources":["../../../../../src/families/bitcoin/wallet-btc/crypto/zen.ts"],"names":[],"mappings":";AASA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,cAAM,GAAI,YAAW,OAAO;IAE1B,OAAO,EAAE,GAAG,CAAC;gBAGD,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE;IAyBzC,YAAY,CAAC,QAAQ,EAAE,MAAM;IAS7B,OAAO,CAAC,MAAM,CAAC,aAAa;IAQ5B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAStE,UAAU,CACR,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,MAAM;IAkBT,iBAAiB,CAAC,OAAO,EAAE,MAAM;IAIjC,cAAc,CAAC,OAAO,EAAE,MAAM;IAiB9B,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAazC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAG3C;AAED,eAAe,GAAG,CAAC"}
+{"version":3,"file":"zen.d.ts","sourceRoot":"","sources":["../../../../../src/families/bitcoin/wallet-btc/crypto/zen.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAG1B,cAAM,GAAI,SAAQ,IAAI;IAEpB,OAAO,EAAE,GAAG,CAAC;gBAGD,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE;IA0BzC,YAAY,CAAC,QAAQ,EAAE,MAAM;IAU7B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQtE,gBAAgB,CACd,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,MAAM;IAKT,iBAAiB,CAAC,OAAO,EAAE,MAAM;IAIjC,cAAc,CAAC,OAAO,EAAE,MAAM;IA8B9B,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAW1C;AAED,eAAe,GAAG,CAAC"}

package/lib/families/bitcoin/wallet-btc/crypto/zen.js

@@ -1,44 +1,75 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-var address_1 = require("bitcoinjs-lib/src/address");
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-var zcash_bitcore_lib_1 = __importDefault(require("zcash-bitcore-lib"));
 var bs58check_1 = __importDefault(require("bs58check"));
-var coininfo_1 = __importDefault(require("coininfo"));
 var errors_1 = require("@ledgerhq/errors");
 var types_1 = require("../types");
 var base_1 = __importDefault(require("./base"));
-var Zen = /** @class */ (function () {
+var bjs = __importStar(require("bitcoinjs-lib"));
+var Zen = /** @class */ (function (_super) {
+    __extends(Zen, _super);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     function Zen(_a) {
         var network = _a.network;
+        var _this = _super.call(this, { network: network }) || this;
         // refer to https://github.com/HorizenOfficial/zen/blob/master/src/chainparams.cpp for the blockchain params
-        this.network = network;
-        this.network.versions = {
+        _this.network = network;
+        _this.network.versions = {
             bip32: {
                 public: 0x043587cf,
                 private: 0x04358394
             },
             bip44: 121,
             private: 0x80,
-            public: 0x2096,
-            scripthash: 0x2089
+            public: 0x2089,
+            scripthash: 0x2096
         };
-        this.network.name = "Zencash";
-        this.network.unit = "ZEN";
-        this.network.messagePrefix = "Zencash Signed Message:\n";
-        this.network.wif = 0x80;
-        this.network.pubKeyHash = 0x2096;
-        this.network.scriptHash = 0x2089;
-        this.network.dustThreshold = 10000;
-        this.network.dustPolicy = "FIXED";
-        this.network.usesTimestampedTransaction = false;
+        _this.network.name = "Zencash";
+        _this.network.unit = "ZEN";
+        _this.network.messagePrefix = "Zencash Signed Message:\n";
+        _this.network.wif = 0x80;
+        _this.network.pubKeyHash = 0x2089;
+        _this.network.scriptHash = 0x2096;
+        _this.network.dustThreshold = 10000;
+        _this.network.dustPolicy = "FIXED";
+        _this.network.usesTimestampedTransaction = false;
+        return _this;
     }
     // eslint-disable-next-line
     Zen.prototype.baddrToTaddr = function (baddrStr) {
@@ -49,28 +80,16 @@ var Zen = /** @class */ (function () {
         taddr.set([0x20, 0x89], 0);
         return bs58check_1["default"].encode(Buffer.from(taddr));
     };
-    Zen.toBitcoinAddr = function (taddr) {
-        // refer to https://runkitcdn.com/gojomo/baddr2taddr/1.0.2
-        var baddr = new Uint8Array(21);
-        baddr.set(bs58check_1["default"].decode(taddr).slice(2), 1);
-        return bs58check_1["default"].encode(Buffer.from(baddr));
-    };
     // eslint-disable-next-line
     Zen.prototype.getLegacyAddress = function (xpub, account, index) {
-        var pubkey = new zcash_bitcore_lib_1["default"].HDPublicKey(xpub);
-        var child = pubkey.derive(account).derive(index);
-        var address = new zcash_bitcore_lib_1["default"].Address(child.publicKey, zcash_bitcore_lib_1["default"].Networks.livenet);
-        var baddr = new Uint8Array(21);
-        baddr.set(bs58check_1["default"].decode(address.toString()).slice(2), 1);
-        return this.baddrToTaddr(bs58check_1["default"].encode(Buffer.from(baddr)));
+        var pk = bjs.crypto.hash160(this.getPubkeyAt(xpub, account, index));
+        var payload = Buffer.allocUnsafe(22);
+        payload.writeUInt16BE(this.network.pubKeyHash, 0);
+        pk.copy(payload, 2);
+        return bs58check_1["default"].encode(payload);
     };
-    Zen.prototype.getAddress = function (derivationMode, xpub, account, index) {
-        if (base_1["default"].addressCache["".concat(this.network.name, "-").concat(derivationMode, "-").concat(xpub, "-").concat(account, "-").concat(index)]) {
-            return base_1["default"].addressCache["".concat(this.network.name, "-").concat(derivationMode, "-").concat(xpub, "-").concat(account, "-").concat(index)];
-        }
-        var address = this.getLegacyAddress(xpub, account, index);
-        base_1["default"].addressCache["".concat(this.network.name, "-").concat(derivationMode, "-").concat(xpub, "-").concat(account, "-").concat(index)] = address;
-        return address;
+    Zen.prototype.customGetAddress = function (derivationMode, xpub, account, index) {
+        return this.getLegacyAddress(xpub, account, index);
     };
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     Zen.prototype.getDerivationMode = function (address) {
@@ -80,7 +99,23 @@ var Zen = /** @class */ (function () {
         if (!this.validateAddress(address)) {
             throw new errors_1.InvalidAddress();
         }
-        var outputScript = (0, address_1.toOutputScript)(Zen.toBitcoinAddr(address), coininfo_1["default"].bitcoin.main.toBitcoinJS());
+        var outputScript;
+        var version = Number("0x" + bs58check_1["default"].decode(address).slice(0, 2).toString("hex"));
+        if (version === this.network.pubKeyHash) {
+            //Pay-to-PubkeyHash
+            outputScript = bjs.payments.p2pkh({
+                hash: bs58check_1["default"].decode(address).slice(2)
+            }).output;
+        }
+        else if (version === this.network.scriptHash) {
+            //Pay-to-Script-Hash
+            outputScript = bjs.payments.p2sh({
+                hash: bs58check_1["default"].decode(address).slice(2)
+            }).output;
+        }
+        else {
+            throw new errors_1.InvalidAddress();
+        }
         // refer to https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/scripts/BitcoinLikeScript.cpp#L139 and https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/networks.cpp#L39 for bip115 Script and its network parameters
         var bip115Script = Buffer.from("209ec9845acb02fab24e1c0368b3b517c1a4488fba97f0e3459ac053ea0100000003c01f02b4", "hex");
         return Buffer.concat([outputScript, bip115Script]);
@@ -96,11 +131,7 @@ var Zen = /** @class */ (function () {
             res[0] === 0x20 &&
             (res[1] === 0x89 || res[1] === 0x96));
     };
-    // eslint-disable-next-line
-    Zen.prototype.isTaprootAddress = function (address) {
-        return false;
-    };
     return Zen;
-}());
+}(base_1["default"]));
 exports["default"] = Zen;
 //# sourceMappingURL=zen.js.map

package/lib/families/bitcoin/wallet-btc/crypto/zen.js.map

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

package/lib/families/celo/speculos-deviceActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"speculos-deviceActions.d.ts","sourceRoot":"","sources":["../../../src/families/celo/speculos-deviceActions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;;;;AA+C3C,wBAEE"}
+{"version":3,"file":"speculos-deviceActions.d.ts","sourceRoot":"","sources":["../../../src/families/celo/speculos-deviceActions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;;;;AA8C3C,wBAEE"}

package/lib/families/celo/speculos-deviceActions.js

@@ -34,8 +34,7 @@ var acceptTransaction = (0, specs_1.deviceActionFlow)({
         },
         {
             title: "Max Fees",
-            button: "Rr",
-            expectedValue: function () { return "CELO"; }
+            button: "Rr"
         },
         {
             title: "No Gateway Fee",

package/lib/families/celo/speculos-deviceActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"speculos-deviceActions.js","sourceRoot":"","sources":["../../../src/families/celo/speculos-deviceActions.ts"],"names":[],"mappings":";;AAEA,yCAAmD;AACnD,+CAAsD;AACtD,IAAM,iBAAiB,GAAmC,IAAA,wBAAgB,EAAC;IACzE,KAAK,EAAE;QACL;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,IAAI;SACb;QACD;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,UAAC,EAAmB;oBAAjB,OAAO,aAAA,EAAE,MAAM,YAAA;gBAC/B,IAAM,cAAc,GAClB,OAAO;oBACP,IAAA,+BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE;wBAC9C,eAAe,EAAE,IAAI;qBACtB,CAAC,CAAC;gBAEL,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACjC,2EAA2E;oBAC3E,OAAO,cAAc,GAAG,IAAI,CAAC;iBAC9B;gBAED,OAAO,cAAc,CAAC;YACxB,CAAC;SACF;QACD;YACE,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,UAAC,EAAe;oBAAb,WAAW,iBAAA;gBAAO,OAAA,WAAW,CAAC,SAAS;YAArB,CAAqB;SAC1D;QACD;YACE,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,cAAM,OAAA,MAAM,EAAN,CAAM;SAC5B;QACD;YACE,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE,IAAI;SACb;QACD;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,MAAM;SACf;KACF;CACF,CAAC,CAAC;AACH,qBAAe;IACb,iBAAiB,mBAAA;CAClB,CAAC"}
+{"version":3,"file":"speculos-deviceActions.js","sourceRoot":"","sources":["../../../src/families/celo/speculos-deviceActions.ts"],"names":[],"mappings":";;AAEA,yCAAmD;AACnD,+CAAsD;AACtD,IAAM,iBAAiB,GAAmC,IAAA,wBAAgB,EAAC;IACzE,KAAK,EAAE;QACL;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,IAAI;SACb;QACD;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,UAAC,EAAmB;oBAAjB,OAAO,aAAA,EAAE,MAAM,YAAA;gBAC/B,IAAM,cAAc,GAClB,OAAO;oBACP,IAAA,+BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE;wBAC9C,eAAe,EAAE,IAAI;qBACtB,CAAC,CAAC;gBAEL,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACjC,2EAA2E;oBAC3E,OAAO,cAAc,GAAG,IAAI,CAAC;iBAC9B;gBAED,OAAO,cAAc,CAAC;YACxB,CAAC;SACF;QACD;YACE,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,UAAC,EAAe;oBAAb,WAAW,iBAAA;gBAAO,OAAA,WAAW,CAAC,SAAS;YAArB,CAAqB;SAC1D;QACD;YACE,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE,IAAI;SACb;QACD;YACE,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE,IAAI;SACb;QACD;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,MAAM;SACf;KACF;CACF,CAAC,CAAC;AACH,qBAAe;IACb,iBAAiB,mBAAA;CAClB,CAAC"}

package/lib/families/ethereum/signOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../../src/families/ethereum/signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAY,MAAM,MAAM,CAAC;AAS5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAa,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAQ1E,eAAO,MAAM,aAAa;aAKf,OAAO;cACN,GAAG;iBACA,WAAW;MACtB,WAAW,kBAAkB,CAoJ9B,CAAC"}
+{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../../src/families/ethereum/signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAY,MAAM,MAAM,CAAC;AAU5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAa,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAS1E,eAAO,MAAM,aAAa;aAKf,OAAO;cACN,GAAG;iBACA,WAAW;MACtB,WAAW,kBAAkB,CAmJ9B,CAAC"}

package/lib/families/ethereum/signOperation.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -55,6 +66,7 @@ var invariant_1 = __importDefault(require("invariant"));
 var rxjs_1 = require("rxjs");
 var operators_1 = require("rxjs/operators");
 var eip55_1 = __importDefault(require("eip55"));
+var rlp_1 = require("rlp");
 var bignumber_js_1 = require("bignumber.js");
 var logs_1 = require("@ledgerhq/logs");
 var errors_1 = require("@ledgerhq/errors");
@@ -67,6 +79,7 @@ var deviceAccess_1 = require("../../hw/deviceAccess");
 var modules_1 = require("./modules");
 var nft_1 = require("../../nft");
 var env_1 = require("../../env");
+var tx_1 = require("@ethereumjs/tx");
 var signOperation = function (_a) {
     var account = _a.account, deviceId = _a.deviceId, transaction = _a.transaction;
     return (0, rxjs_1.from)(transaction.nonce !== undefined
@@ -78,7 +91,7 @@ var signOperation = function (_a) {
                 function main() {
                     var _a;
                     return __awaiter(this, void 0, void 0, function () {
-                        var freshAddressPath, freshAddress, gasPrice, gasLimit, _b, tx, fillTransactionDataResult, to, value, txHex, loadConfig, m, resolutionConfig, resolution, eth, addrs, addrs_1, addrs_1_1, addr, tokenInfo, e_1_1, result, v, signature, txHash, senders, recipients, fee, transactionSequenceNumber, accountId, operation;
+                        var freshAddressPath, freshAddress, gasPrice, gasLimit, _b, ethTxObject, tx, common, fillTransactionDataResult, to, value, rawData, txHex, loadConfig, m, resolutionConfig, resolution, eth, addrs, addrs_1, addrs_1_1, addr, tokenInfo, e_1_1, result, v, r, s, signedTx, signature, txHash, senders, recipients, fee, transactionSequenceNumber, accountId, operation;
                         var e_1, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
@@ -93,10 +106,12 @@ var signOperation = function (_a) {
                                             String(gasLimit));
                                         throw new errors_1.FeeNotLoaded();
                                     }
-                                    _b = (0, transaction_1.buildEthereumTx)(account, transaction, nonce), tx = _b.tx, fillTransactionDataResult = _b.fillTransactionDataResult;
-                                    to = eip55_1["default"].encode("0x" + tx.to.toString("hex"));
+                                    _b = (0, transaction_1.buildEthereumTx)(account, transaction, nonce), ethTxObject = _b.ethTxObject, tx = _b.tx, common = _b.common, fillTransactionDataResult = _b.fillTransactionDataResult;
+                                    to = eip55_1["default"].encode((tx.to || "").toString());
                                     value = new bignumber_js_1.BigNumber("0x" + (tx.value.toString("hex") || "0"));
-                                    txHex = tx.serialize().toString("hex");
+                                    rawData = tx.raw();
+                                    rawData[6] = Buffer.from([common.chainIdBN().toNumber()]);
+                                    txHex = Buffer.from((0, rlp_1.encode)(rawData)).toString("hex");
                                     loadConfig = {};
                                     if ((0, nft_1.isNFTActive)(account.currency)) {
                                         loadConfig.nftExplorerBaseURL =
@@ -146,22 +161,18 @@ var signOperation = function (_a) {
                                     finally { if (e_1) throw e_1.error; }
                                     return [7 /*endfinally*/];
                                 case 9:
-                                    o.next({
-                                        type: "device-signature-requested"
-                                    });
+                                    o.next({ type: "device-signature-requested" });
                                     return [4 /*yield*/, eth.signTransaction(freshAddressPath, txHex, resolution)];
                                 case 10:
                                     result = _d.sent();
                                     if (cancelled)
                                         return [2 /*return*/];
-                                    o.next({
-                                        type: "device-signature-granted"
-                                    });
-                                    v = result.v;
-                                    tx.v = Buffer.from(v, "hex");
-                                    tx.r = Buffer.from(result.r, "hex");
-                                    tx.s = Buffer.from(result.s, "hex");
-                                    signature = "0x".concat(tx.serialize().toString("hex"));
+                                    o.next({ type: "device-signature-granted" });
+                                    v = "0x".concat(result.v);
+                                    r = "0x".concat(result.r);
+                                    s = "0x".concat(result.s);
+                                    signedTx = new tx_1.Transaction(__assign(__assign({}, ethTxObject), { v: v, r: r, s: s }), { common: common });
+                                    signature = "0x".concat(signedTx.serialize().toString("hex"));
                                     txHash = "";
                                     senders = [freshAddress];
                                     recipients = [to];

package/lib/families/ethereum/signOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/families/ethereum/signOperation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/families/ethereum/signOperation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAkC;AAClC,6BAA4C;AAC5C,4CAA0C;AAC1C,gDAA0B;AAC1B,2BAA6B;AAC7B,6CAAyC;AACzC,uCAAqC;AACrC,2CAAgD;AAChD,oEAAuC;AACvC,oDAAyE;AACzE,oFAAyE;AAGzE,6CAA6D;AAC7D,+CAAoD;AACpD,sDAAmD;AACnD,qCAAkC;AAClC,iCAAwC;AACxC,iCAAmC;AAEnC,qCAA2D;AACpD,IAAM,aAAa,GAAG,UAAC,EAQ7B;QAPC,OAAO,aAAA,EACP,QAAQ,cAAA,EACR,WAAW,iBAAA;IAMX,OAAA,IAAA,WAAI,EACF,WAAW,CAAC,KAAK,KAAK,SAAS;QAC7B,CAAC,CAAC,IAAA,SAAE,EAAC,WAAW,CAAC,KAAK,CAAC;QACvB,CAAC,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC,CAC3E,CAAC,IAAI,CACJ,IAAA,oBAAQ,EAAC,UAAC,KAAK;QACb,OAAA,IAAA,yBAAU,EAAC,QAAQ,CAAC,CAClB,UAAC,SAAS;YACR,OAAA,IAAI,iBAAU,CAAqB,UAAC,CAAC;gBACnC,IAAI,SAAS,CAAC;gBAEd,SAAe,IAAI;;;;;;;;oCAET,gBAAgB,GAAmB,OAAO,iBAA1B,EAAE,YAAY,GAAK,OAAO,aAAZ,CAAa;oCAC3C,QAAQ,GAAK,WAAW,SAAhB,CAAiB;oCAC3B,QAAQ,GAAG,IAAA,yBAAW,EAAC,WAAW,CAAC,CAAC;oCAE1C,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,wBAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;wCAC/C,IAAA,UAAG,EACD,gBAAgB,EAChB,yCAAyC;4CACvC,MAAM,CAAC,QAAQ,CAAC;4CAChB,YAAY;4CACZ,MAAM,CAAC,QAAQ,CAAC,CACnB,CAAC;wCACF,MAAM,IAAI,qBAAY,EAAE,CAAC;qCAC1B;oCAEK,KACJ,IAAA,6BAAe,EAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,EADtC,WAAW,iBAAA,EAAE,EAAE,QAAA,EAAE,MAAM,YAAA,EAAE,yBAAyB,+BAAA,CACX;oCACzC,EAAE,GAAG,kBAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;oCAC5C,KAAK,GAAG,IAAI,wBAAS,CACzB,IAAI,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CACzC,CAAC;oCAEI,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;oCACzB,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oCACpD,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAA,YAAM,EAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oCACrD,UAAU,GAAe,EAAE,CAAC;oCAClC,IAAI,IAAA,iBAAW,EAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;wCACjC,UAAU,CAAC,kBAAkB;4CAC3B,IAAA,YAAM,EAAC,0BAA0B,CAAC,GAAG,cAAc,CAAC;qCACvD;oCAEK,CAAC,GAAG,eAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oCAClC,IAAA,sBAAS,EAAC,CAAC,EAAE,0BAA0B,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;oCAEtD,gBAAgB,GAAG,CAAC,CAAC,mBAAmB;wCAC5C,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC;wCAC7C,CAAC,CAAC,EAAE,CAAC;oCAEY,qBAAM,mBAAiB,CAAC,kBAAkB,CAC3D,KAAK,EACL,UAAU,EACV,gBAAgB,CACjB,EAAA;;oCAJK,UAAU,GAAG,SAIlB;oCAEK,GAAG,GAAG,IAAI,uBAAG,CAAC,SAAS,CAAC,CAAC;oCAC/B,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;oCAGxB,KAAK,GACT,CAAC,yBAAyB;wCACxB,yBAAyB,CAAC,cAAc,CAAC;wCAC3C,EAAE,CAAC;;;;oCAEc,UAAA,SAAA,KAAK,CAAA;;;;oCAAb,IAAI;oCACP,SAAS,GAAG,IAAA,mCAA2B,EAC3C,IAAI,EACJ,CAAA,MAAA,OAAO,CAAC,QAAQ,CAAC,gBAAgB,0CAAE,OAAO,KAAI,CAAC,CAChD,CAAC;yCAEE,SAAS,EAAT,wBAAS;oCACX,qBAAM,GAAG,CAAC,4BAA4B,CAAC,SAAS,CAAC,EAAA;;oCAAjD,SAAiD,CAAC;oCAClD,IAAI,SAAS;wCAAE,sBAAO;;;;;;;;;;;;;;;;;oCAI1B,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;oCAChC,qBAAM,GAAG,CAAC,eAAe,CACtC,gBAAgB,EAChB,KAAK,EACL,UAAU,CACX,EAAA;;oCAJK,MAAM,GAAG,SAId;oCACD,IAAI,SAAS;wCAAE,sBAAO;oCACtB,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,CAAC;oCAEvC,CAAC,GAAG,YAAK,MAAM,CAAC,CAAC,CAAE,CAAC;oCACpB,CAAC,GAAG,YAAK,MAAM,CAAC,CAAC,CAAE,CAAC;oCACpB,CAAC,GAAG,YAAK,MAAM,CAAC,CAAC,CAAE,CAAC;oCAEpB,QAAQ,GAAG,IAAI,gBAAU,uBACxB,WAAW,KAAE,CAAC,GAAA,EAAE,CAAC,GAAA,EAAE,CAAC,GAAA,KACzB,EAAE,MAAM,QAAA,EAAE,CACX,CAAC;oCAGI,SAAS,GAAG,YAAK,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAE,CAAC;oCAGxD,MAAM,GAAG,EAAE,CAAC;oCAEZ,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;oCACzB,UAAU,GAAG,CAAC,EAAE,CAAC,CAAC;oCAClB,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oCAC/B,yBAAyB,GAAG,KAAK,CAAC;oCAClC,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC;oCAEvB,SAAS,GAAc;wCAC3B,EAAE,EAAE,UAAG,SAAS,cAAI,MAAM,SAAM;wCAChC,IAAI,EAAE,MAAM;wCACZ,yBAAyB,EAAE,yBAEd;wCACb,IAAI,EAAE,KAAK;wCACX,KAAK,EAAE,IAAI,wBAAS,CAAC,KAAK,CAAC;wCAC3B,GAAG,KAAA;wCACH,SAAS,EAAE,IAAI;wCACf,WAAW,EAAE,IAAI;wCACjB,OAAO,SAAA;wCACP,UAAU,YAAA;wCACV,SAAS,WAAA;wCACT,IAAI,EAAE,IAAI,IAAI,EAAE;wCAChB,KAAK,EAAE,EAAE;qCACV,CAAC;oCACF,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;oCAC3D,CAAC,CAAC,IAAI,CAAC;wCACL,IAAI,EAAE,QAAQ;wCACd,eAAe,EAAE;4CACf,SAAS,WAAA;4CACT,SAAS,WAAA;4CACT,cAAc,EAAE,IAAI;yCACrB;qCACF,CAAC,CAAC;;;;;iBACJ;gBAED,IAAI,EAAE,CAAC,IAAI,CACT,cAAM,OAAA,CAAC,CAAC,QAAQ,EAAE,EAAZ,CAAY,EAClB,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAV,CAAU,CAClB,CAAC;gBACF,OAAO;oBACL,SAAS,GAAG,IAAI,CAAC;gBACnB,CAAC,CAAC;YACJ,CAAC,CAAC;QAvIF,CAuIE,CACL;IA1ID,CA0IC,CACF,CACF;AAlJD,CAkJC,CAAC;AA3JS,QAAA,aAAa,iBA2JtB"}

package/lib/families/ethereum/specs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specs.d.ts","sourceRoot":"","sources":["../../../src/families/ethereum/specs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAY3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;;;;;;;;AA+d/C,wBAME"}
+{"version":3,"file":"specs.d.ts","sourceRoot":"","sources":["../../../src/families/ethereum/specs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAY3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;;;;;;;;AA6d/C,wBAME"}

package/lib/families/ethereum/specs.js

@@ -83,8 +83,7 @@ var ethereum = {
     currency: (0, currencies_1.getCryptoCurrencyById)("ethereum"),
     appQuery: {
         model: devices_1.DeviceModelId.nanoS,
-        appName: "Ethereum",
-        appVersion: "1.5.0-rc3"
+        appName: "Ethereum"
     },
     testTimeout: 4 * 60 * 1000,
     transactionCheck: function (_a) {
@@ -303,8 +302,7 @@ var ethereumRopsten = {
     currency: (0, currencies_1.getCryptoCurrencyById)("ethereum_ropsten"),
     appQuery: {
         model: devices_1.DeviceModelId.nanoS,
-        appName: "Ethereum",
-        appVersion: "1.5.0-rc3"
+        appName: "Ethereum"
     },
     testTimeout: 2 * 60 * 1000,
     transactionCheck: function (_a) {