@ledgerhq/live-common 21.4.1-btcjs.4 → 21.5.0

package/src/families/bitcoin/types.ts

@@ -1,6 +1,4 @@
 import type { BigNumber } from "bignumber.js";
-import type { SerializedAccount as WalletSerializedAccount } from "@ledgerhq/wallet-btc";
-
 import type {
   TransactionCommon,
   TransactionCommonRaw,
@@ -11,8 +9,43 @@ import type {
   CoreDerivationPath,
   Spec,
 } from "../../libcore/types";
+export type BitcoinInput = {
+  address: string | null | undefined;
+  value: BigNumber | null | undefined;
+  previousTxHash: string | null | undefined;
+  previousOutputIndex: number;
+};
+export type BitcoinInputRaw = [
+  string | null | undefined,
+  string | null | undefined,
+  string | null | undefined,
+  number
+];
+export type BitcoinOutput = {
+  hash: string;
+  outputIndex: number;
+  blockHeight: number | null | undefined;
+  address: string | null | undefined;
+  path: string | null | undefined;
+  value: BigNumber;
+  rbf: boolean;
+};
+export type BitcoinOutputRaw = [
+  string,
+  number,
+  number | null | undefined,
+  string | null | undefined,
+  string | null | undefined,
+  string,
+  number // rbf 0/1 for compression
+];
+export type BitcoinResources = {
+  utxos: BitcoinOutput[];
+};
+export type BitcoinResourcesRaw = {
+  utxos: BitcoinOutputRaw[];
+};
 
-//* TODO REPLACE <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 declare class CoreBitcoinLikeInput {
   getPreviousTransaction(): Promise<string>;
   getPreviousTxHash(): Promise<string | null | undefined>;
@@ -97,93 +130,6 @@ export type CoreOperationSpecifics = {
 export type CoreCurrencySpecifics = {
   getBitcoinLikeNetworkParameters(): Promise<CoreBitcoinLikeNetworkParameters>;
 };
-/*/ WITH >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-export type CoreStatics = Record<string, never>;
-export type CoreAccountSpecifics = Record<string, never>;
-export type CoreOperationSpecifics = Record<string, never>;
-export type CoreCurrencySpecifics = Record<string, never>;
-//*/ // ====================================================
-
-export type BitcoinInput = {
-  address: string | null | undefined;
-  value: BigNumber | null | undefined;
-  previousTxHash: string | null | undefined;
-  previousOutputIndex: number;
-};
-export type BitcoinInputRaw = [
-  string | null | undefined,
-  string | null | undefined,
-  string | null | undefined,
-  number
-];
-export type BitcoinOutput = {
-  hash: string;
-  outputIndex: number;
-  blockHeight: number | null | undefined;
-  address: string | null | undefined;
-  isChange: boolean;
-  path: string | null | undefined; // TODO DEPRECATED, TO BE REMOVED
-  value: BigNumber;
-  rbf: boolean;
-};
-export type BitcoinOutputRaw = [
-  string,
-  number,
-  number | null | undefined,
-  string | null | undefined,
-  number,
-  string | null | undefined, // TODO DEPRECATED, TO BE REMOVED
-  string,
-  number // rbf 0/1 for compression
-];
-export type BitcoinResources = {
-  utxos: BitcoinOutput[];
-  serializedData?: WalletSerializedAccount; // TODO '?' TO BE REMOVED
-};
-export type BitcoinResourcesRaw = {
-  utxos: BitcoinOutputRaw[];
-  serializedData?: WalletSerializedAccount; // TODO '?' TO BE REMOVED
-};
-
-export const BitcoinLikeFeePolicy = Object.freeze({
-  PER_BYTE: "PER_BYTE",
-  PER_KBYTE: "PER_KBYTE",
-});
-
-export const BitcoinLikeSigHashType = Object.freeze({
-  SIGHASH_ALL: 0x01,
-  SIGHASH_NONE: 0x02,
-  SIGHASH_SINGLE: 0x03,
-  SIGHASH_FORKID: 0x40,
-  SIGHASH_ANYONECANPAY: 0x80,
-});
-
-// TODO maybe not all fields are useful
-export type BitcoinLikeNetworkParameters = {
-  // Name of the network.
-  identifier: string;
-  // Version of the Pay To Public Hash standard.
-  P2PKHVersion: Buffer;
-  // Version of the Pay To Script Hash standard.
-  P2SHVersion: Buffer;
-  // Version of the Extended Public Key standard.
-  xpubVersion: Buffer;
-  // Policy to use when expressing fee amount, values in BitcoinLikeFeePolicy
-  feePolicy: string;
-  // Minimal amount a UTXO should have before being considered BTC dust.
-  dustAmount: BigNumber;
-  // Constant prefix to prepend all signature messages.
-  messagePrefix: string;
-  // Are transactions encoded with timestamp?
-  usesTimestampedTransaction: boolean;
-  // Delay applied to all timestamps. Used to debounce transactions.
-  timestampDelay: BigNumber;
-  // Bitcoin signature flag indicating what part of a transaction a signature signs, values in BitcoinLikeSigHashType
-  sigHash: number;
-  // Addition BIPs enabled for this network.
-  additionalBIPs: string[];
-};
-
 export type FeeItem = {
   key: string;
   speed: string;
@@ -217,6 +163,7 @@ export const bitcoinPickingStrategy = {
 };
 export type BitcoinPickingStrategy =
   typeof bitcoinPickingStrategy[keyof typeof bitcoinPickingStrategy];
+// FIXME the UtxoStrategy level should be flattened back in Transaction
 export type UtxoStrategy = {
   strategy: BitcoinPickingStrategy;
   pickUnconfirmedRBF: boolean;
@@ -239,8 +186,6 @@ export type TransactionRaw = TransactionCommonRaw & {
   feePerByte: string | null | undefined;
   networkInfo: NetworkInfoRaw | null | undefined;
 };
-
-//* TODO REPLACE <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 export const reflect = (
   declare: (arg0: string, arg1: Spec) => void
 ): {
@@ -370,6 +315,3 @@ export const reflect = (
     },
   };
 };
-/*/ WITH >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-export const reflect = (_declare: any): void => {};
-//*/ // ====================================================

package/src/families/crypto_org/logic.ts

@@ -2,9 +2,9 @@ import { CroNetwork, CroSDK, utils } from "@crypto-com/chain-jslib";
 export const TESTNET_CURRENCY_ID = "crypto_org_croeseid";
 export const FIXED_GAS_PRICE = 0.025;
 export const FIXED_DEFAULT_GAS_LIMIT = 200000;
-export const TestnetCroeseid3 = {
-  defaultNodeUrl: "https://testnet-croeseid-3.crypto.org",
-  chainId: "testnet-croeseid-3",
+export const TestnetCroeseid4 = {
+  defaultNodeUrl: "https://testnet-croeseid-4.crypto.org",
+  chainId: "testnet-croeseid-4",
   addressPrefix: "tcro",
   validatorAddressPrefix: "tcrocncl",
   validatorPubKeyPrefix: "tcrocnclconspub",
@@ -16,7 +16,7 @@ export const TestnetCroeseid3 = {
     coinType: 1,
     account: 0,
   },
-  rpcUrl: "https://testnet-croeseid-3.crypto.org:26657",
+  rpcUrl: "https://testnet-croeseid-4.crypto.org:26657",
 };
 const croSdks = {};
 
@@ -37,7 +37,7 @@ export function getCroSdk(currencyId: string) {
   if (!croSdks[currencyId]) {
     croSdks[currencyId] = isTestNet(currencyId)
       ? CroSDK({
-          network: TestnetCroeseid3,
+          network: TestnetCroeseid4,
         })
       : CroSDK({
           network: CroNetwork.Mainnet,
@@ -58,7 +58,7 @@ export const isValidAddress = (
   currencyId: string
 ): boolean => {
   if (!address) return false;
-  const network = isTestNet(currencyId) ? TestnetCroeseid3 : CroNetwork.Mainnet;
+  const network = isTestNet(currencyId) ? TestnetCroeseid4 : CroNetwork.Mainnet;
   const addressProps = {
     address: address,
     network: network,

package/src/families/elrond/js-getTransactionStatus.ts

@@ -5,6 +5,7 @@ import {
   InvalidAddress,
   FeeNotLoaded,
   InvalidAddressBecauseDestinationIsAlsoSource,
+  FeeTooHigh,
 } from "@ledgerhq/errors";
 import type { Account, TransactionStatus } from "../../types";
 import type { Transaction } from "./types";
@@ -42,6 +43,10 @@ const getTransactionStatus = async (
     errors.amount = new NotEnoughBalance();
   }
 
+  if (amount.div(10).lt(estimatedFees)) {
+    warnings.feeTooHigh = new FeeTooHigh();
+  }
+
   return Promise.resolve({
     errors,
     warnings,

package/src/families/elrond/js-signOperation.ts

@@ -59,6 +59,7 @@ const signOperation = ({
         }
 
         const elrond = new Elrond(transport);
+        await elrond.setAddress(account.freshAddressPath);
         const { version } = await elrond.getAppConfiguration();
         const signUsingHash = compareVersions(version, "1.0.11") >= 0;
         const unsigned = await buildTransaction(

package/src/generated/bridge/js.ts

@@ -1,5 +1,3 @@
-import bitcoin from "../../families/bitcoin/bridge/js";
-
 import crypto_org from "../../families/crypto_org/bridge/js";
 
 import elrond from "../../families/elrond/bridge/js";
@@ -20,7 +18,6 @@ import tron from "../../families/tron/bridge/js";
 
 
 export default {
-  bitcoin,
   crypto_org,
   elrond,
   ethereum,

package/src/hw/actions/initSwap.ts

@@ -149,7 +149,7 @@ export const createAction = (
     const hasError = error || state.error;
     useEffect(() => {
       if (!opened || !device) {
-        setState({ ...initialState, isLoading: !hasError });
+        setState({ ...initialState, isLoading: !!device });
         return;
       }
 
@@ -175,7 +175,7 @@ export const createAction = (
               error,
             })
           ),
-          scan(reducer, initialState)
+          scan(reducer, { ...initialState, isLoading: !hasError })
         )
         .subscribe(setState);
       return () => {

package/src/migrations/accounts-dataset.ts

@@ -1,4 +1,3 @@
-import type { SerializedAccount as WalletSerializedAccount } from "@ledgerhq/wallet-btc";
 import { fromAccountRaw } from "../account";
 import type { Account, AccountRaw } from "../types";
 
@@ -27,7 +26,6 @@ const accounts: Account[] = [
     xpub: "xpub6DACJs4ZgE67HEu53j2osRtw51wfJybJ88ccVQnHpmjqr9XJfMYXn6Fxt3u772FonuWfqYUrb9Z9wxe2S9pTzxGDiQZDk1cMPiDH2S5HjYa",
     bitcoinResources: {
       utxos: [],
-      serializedData: {} as WalletSerializedAccount,
     },
     swapHistory: [
       {
@@ -90,7 +88,6 @@ const accounts: Account[] = [
     xpub: "Ltub2Zx1tbqWB7AbC4fb7aWgsuyXBm2qt97gzG5av4PHAjdAhvdZQFHS7nmcScgtAvpgcGAkVQQvR9BXwu54ny6Yqwst4KQAnyD1Yx6VezNf1S8",
     bitcoinResources: {
       utxos: [],
-      serializedData: {} as WalletSerializedAccount,
     },
     swapHistory: [
       {

package/src/migrations/accounts.ts

@@ -16,24 +16,6 @@ function sameSwap(a: SwapOperation, b: SwapOperation) {
 }
 
 export const implicitMigration = (accounts: Account[]): Account[] => {
-  // TODO Need this for BTC-JS?
-  /*
-  // this infer the next account id following ongoing libcore->js migration
-  function targetBitcoinJSaccountId(a: AccountLike) {
-    if (a.type === "Account") {
-      const decoded = decodeAccountId(a.id);
-      if (decoded.type !== "libcore") {
-        return a.id;
-      }
-      if (decoded.currencyId !== "bitcoin") {
-        return a.id;
-      }
-      return `js:2:${decoded.currencyId}:${a.freshAddress}:${decoded.derivationMode}`;
-    }
-    return a.id;
-  }
-  */
-
   // this infer the next account id following ongoing libcore->js migration
   function targetEthereumJSaccountId(a: AccountLike) {
     if (a.type === "Account") {

package/src/mock/account.ts

@@ -1,6 +1,5 @@
 import Prando from "prando";
 import { BigNumber } from "bignumber.js";
-import type { SerializedAccount as WalletSerializedAccount } from "@ledgerhq/wallet-btc";
 import {
   listCryptoCurrencies,
   listTokensForCryptoCurrency,
@@ -413,7 +412,6 @@ export function genAccount(
   if (currency.family === "bitcoin") {
     account.bitcoinResources = {
       utxos: [],
-      serializedData: {} as WalletSerializedAccount,
     };
   }
 

package/lib/families/bitcoin/bridge/js.d.ts

@@ -1,8 +0,0 @@
-import type { AccountBridge, CurrencyBridge } from "../../../types/bridge";
-import type { Transaction } from "../types";
-declare const _default: {
-    currencyBridge: CurrencyBridge;
-    accountBridge: AccountBridge<Transaction>;
-};
-export default _default;
-//# sourceMappingURL=js.d.ts.map

package/lib/families/bitcoin/bridge/js.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"js.d.ts","sourceRoot":"","sources":["../../../../src/families/bitcoin/bridge/js.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;;;;;AAuE5C,wBAGE"}

package/lib/families/bitcoin/bridge/js.js

@@ -1,149 +0,0 @@
-"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 __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 __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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-exports.__esModule = true;
-var js_synchronisation_1 = require("../js-synchronisation");
-var js_createTransaction_1 = __importDefault(require("../js-createTransaction"));
-var js_prepareTransaction_1 = __importDefault(require("../js-prepareTransaction"));
-var js_getTransactionStatus_1 = __importDefault(require("../js-getTransactionStatus"));
-var js_estimateMaxSpendable_1 = __importDefault(require("../js-estimateMaxSpendable"));
-var js_signOperation_1 = __importDefault(require("../js-signOperation"));
-var js_broadcast_1 = __importDefault(require("../js-broadcast"));
-var cache_1 = require("./../cache");
-var logic_1 = require("../logic");
-var jsHelpers_1 = require("../../../bridge/jsHelpers");
-var explorerConfigAPI = __importStar(require("../../../api/explorerConfig"));
-var receive = (0, jsHelpers_1.makeAccountBridgeReceive)({
-    injectGetAddressParams: function (account) {
-        var perCoin = logic_1.perCoinLogic[account.currency.id];
-        if (perCoin && perCoin.injectGetAddressParams) {
-            return perCoin.injectGetAddressParams(account);
-        }
-    }
-});
-var updateTransaction = function (t, patch) {
-    var updatedT = __assign(__assign({}, t), patch);
-    if (updatedT.recipient.toLowerCase().indexOf("bc1") === 0) {
-        updatedT.recipient = updatedT.recipient.toLowerCase();
-    }
-    return updatedT;
-};
-var preload = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var explorerConfig;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, explorerConfigAPI.preload()];
-            case 1:
-                explorerConfig = _a.sent();
-                return [2 /*return*/, {
-                        explorerConfig: explorerConfig
-                    }];
-        }
-    });
-}); };
-var hydrate = function (maybeConfig) {
-    if (typeof maybeConfig === "object" &&
-        maybeConfig &&
-        maybeConfig.explorerConfig) {
-        explorerConfigAPI.hydrate(maybeConfig.explorerConfig);
-    }
-};
-var currencyBridge = {
-    scanAccounts: js_synchronisation_1.scanAccounts,
-    preload: preload,
-    hydrate: hydrate
-};
-var accountBridge = {
-    estimateMaxSpendable: js_estimateMaxSpendable_1["default"],
-    createTransaction: js_createTransaction_1["default"],
-    prepareTransaction: js_prepareTransaction_1["default"],
-    updateTransaction: updateTransaction,
-    getTransactionStatus: js_getTransactionStatus_1["default"],
-    receive: receive,
-    sync: js_synchronisation_1.sync,
-    signOperation: js_signOperation_1["default"],
-    broadcast: function (_a) {
-        var account = _a.account, signedOperation = _a.signedOperation;
-        return __awaiter(void 0, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                cache_1.calculateFees.reset();
-                return [2 /*return*/, (0, js_broadcast_1["default"])({
-                        account: account,
-                        signedOperation: signedOperation
-                    })];
-            });
-        });
-    }
-};
-exports["default"] = {
-    currencyBridge: currencyBridge,
-    accountBridge: accountBridge
-};
-//# sourceMappingURL=js.js.map