@ledgerhq/live-common 21.8.2 → 21.10.0-btcjs.2

package/src/families/tezos/bakers.whitelist-default.ts

@@ -16,7 +16,6 @@ tz1Kf25fX1VdmYGSEzwFy1wNmkbSEZ2V83sY
 tz1RCFbB9GpALpsZtu6J58sb74dm8qe6XBzv
 tz1LLNkQK4UQV6QcFShiXJ2vT2ELw449MzAA
 tz1dbfppLAAxXZNtf2SDps7rch3qfUznKSoK
-tz1b9MYGrbN1NAxphLEsPPNT9JC7aNFc5nA4
 tz1Q8QkSBS63ZQnH3fBTiAMPes9R666Rn6Sc
 tz2FCNBrERXtaTtNX6iimR1UJ5JSDxvdHM93
 tz1Vyuu4EJ5Nym4JcrfRLnp3hpaq1DSEp1Ke

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

@@ -41,6 +41,7 @@ import {
   getMainAccount,
   encodeTokenAccountId,
   emptyHistoryCache,
+  encodeAccountId,
 } from "../../../account";
 import { getOperationsPageSize } from "../../../pagination";
 import {
@@ -85,6 +86,7 @@ import {
 } from "../../../api/Tron";
 import { activationFees, oneTrx } from "../constants";
 import { makeAccountBridgeReceive } from "../../../bridge/jsHelpers";
+import type { GetAccountShapeArg0 } from "../../../bridge/jsHelpers";
 
 const receive = makeAccountBridgeReceive();
 
@@ -303,14 +305,23 @@ const broadcast = async ({
   return operation;
 };
 
-const getAccountShape = async (info, syncConfig) => {
+const getAccountShape = async (info: GetAccountShapeArg0, syncConfig) => {
   const blockHeight = await fetchCurrentBlockHeight();
   const tronAcc = await fetchTronAccount(info.address);
 
+  const accountId = encodeAccountId({
+    type: "js",
+    version: "2",
+    currencyId: info.currency.id,
+    xpubOrAddress: info.address,
+    derivationMode: info.derivationMode,
+  });
+
   if (tronAcc.length === 0) {
     const defaultTronResources = await getTronResources();
 
     return {
+      id: accountId,
       blockHeight,
       balance: new BigNumber(0),
       tronResources: defaultTronResources,
@@ -368,7 +379,7 @@ const getAccountShape = async (info, syncConfig) => {
     );
   const parentTxs = txs.filter(isParentTx);
   const parentOperations: Operation[] = compact(
-    parentTxs.map((tx) => txInfoToOperation(info.id, info.address, tx))
+    parentTxs.map((tx) => txInfoToOperation(accountId, info.address, tx))
   );
   const trc10Tokens = get(acc, "assetV2", []).map(({ key, value }) => ({
     type: "trc10",
@@ -392,7 +403,7 @@ const getAccountShape = async (info, syncConfig) => {
       const tokenId = `tron/${type}/${key}`;
       const token = findTokenById(tokenId);
       if (!token || blacklistedTokenIds.includes(tokenId)) return;
-      const id = encodeTokenAccountId(info.id, token);
+      const id = encodeTokenAccountId(accountId, token);
       const tokenTxs = txs.filter((tx) => tx.tokenId === key);
       const operations = compact(
         tokenTxs.map((tx) => txInfoToOperation(id, info.address, tx))
@@ -406,7 +417,7 @@ const getAccountShape = async (info, syncConfig) => {
         type: "TokenAccount",
         id,
         starred: false,
-        parentId: info.id,
+        parentId: accountId,
         token,
         balance,
         spendableBalance: balance,
@@ -434,9 +445,9 @@ const getAccountShape = async (info, syncConfig) => {
     .filter((o) => o.type === "OUT" && o.fee.isGreaterThan(0))
     .map((o) => ({
       ...o,
-      accountId: info.id,
+      accountId,
       value: o.fee,
-      id: `${info.id}-${o.hash}-OUT`,
+      id: `${accountId}-${o.hash}-OUT`,
     }));
   // add them to the parent operations and sort by date desc
   const parentOpsAndSubOutOpsWithFee = parentOperations
@@ -444,6 +455,7 @@ const getAccountShape = async (info, syncConfig) => {
     .sort((a, b) => b.date.valueOf() - a.date.valueOf());
 
   return {
+    id: accountId,
     balance,
     spendableBalance,
     operationsCount: parentOpsAndSubOutOpsWithFee.length,

package/src/hw/getAddress/types.ts

@@ -15,18 +15,10 @@ export type GetAddressOptions = {
   skipAppFailSafeCheck?: boolean;
   askChainCode?: boolean;
   forceFormat?: string;
+  devicePath?: string;
+  segwit?: boolean;
 };
 export type Resolver = (
   arg0: Transport,
-  arg1: {
-    currency: CryptoCurrency;
-    path: string;
-    derivationMode: DerivationMode;
-    verify?: boolean;
-    skipAppFailSafeCheck?: boolean;
-    askChainCode?: boolean;
-    forceFormat?: string;
-    devicePath?: string;
-    segwit?: boolean;
-  }
+  arg1: GetAddressOptions
 ) => Promise<Result>;

package/src/libcore/createAccountFromDevice.ts

@@ -1,9 +1,8 @@
 import { log } from "@ledgerhq/logs";
-import Transport from "@ledgerhq/hw-transport";
 import type { Core, CoreWallet, CoreAccount } from "./types";
 import type { CryptoCurrency } from "../types";
 import type { DerivationMode } from "../derivation";
-import getAddress from "../hw/getAddress";
+import { GetAddressOptions, Result } from "../hw/getAddress/types";
 
 // In order to not re-query the same path, we use a temporary cache
 export class DerivationsCache {
@@ -19,22 +18,22 @@ export class DerivationsCache {
 type F = (arg0: {
   core: Core;
   wallet: CoreWallet;
-  transport: Transport;
   currency: CryptoCurrency;
   index: number;
   derivationMode: DerivationMode;
   isUnsubscribed: () => boolean;
   derivationsCache: DerivationsCache;
+  getAddress: (opts: GetAddressOptions) => Promise<Result>;
 }) => Promise<CoreAccount | null | undefined>;
 
 export const createAccountFromDevice: F = async ({
   core,
   wallet,
-  transport,
   currency,
   derivationMode,
   isUnsubscribed,
   derivationsCache,
+  getAddress,
 }) => {
   log(
     "libcore",
@@ -66,7 +65,7 @@ export const createAccountFromDevice: F = async ({
         let cache = derivationsCache.store[derivation];
 
         if (!cache) {
-          cache = await getAddress(transport, {
+          cache = await getAddress({
             currency,
             path: derivation,
             derivationMode,

package/src/libcore/scanAccounts.ts

@@ -33,11 +33,11 @@ import { remapLibcoreErrors, isNonExistingAccountError } from "./errors";
 import { GetAppAndVersionUnsupportedFormat } from "../errors";
 import nativeSegwitAppsVersionsMap from "./nativeSegwitAppsVersionsMap";
 import type { Core, CoreWallet } from "./types";
+import { GetAddressOptions, Result } from "../hw/getAddress/types";
 
 async function scanNextAccount(props: {
   core: Core;
   wallet: CoreWallet;
-  transport: Transport;
   currency: CryptoCurrency;
   accountIndex: number;
   onAccountScanned: (arg0: Account) => any;
@@ -48,12 +48,12 @@ async function scanNextAccount(props: {
   emptyCount?: number;
   syncConfig: SyncConfig;
   derivationsCache: DerivationsCache;
+  getAddr: (opts: GetAddressOptions) => Promise<Result>;
 }) {
   const logId = newSyncLogId();
   const {
     core,
     wallet,
-    transport,
     currency,
     accountIndex,
     onAccountScanned,
@@ -63,6 +63,7 @@ async function scanNextAccount(props: {
     isUnsubscribed,
     syncConfig,
     derivationsCache,
+    getAddr,
   } = props;
   log(
     "libcore",
@@ -81,12 +82,12 @@ async function scanNextAccount(props: {
     coreAccount = await createAccountFromDevice({
       core,
       wallet,
-      transport,
       currency,
       index: accountIndex,
       derivationMode,
       isUnsubscribed,
       derivationsCache,
+      getAddress: getAddr,
     });
   }
 
@@ -138,16 +139,22 @@ async function scanNextAccount(props: {
   }
 }
 
+const libcoreBlacklist = ["taproot"];
+
 export const scanAccounts = ({
   currency,
   deviceId,
   scheme,
   syncConfig,
+  getAddressFn,
 }: {
   currency: CryptoCurrency;
   deviceId: string;
   scheme?: DerivationMode | null | undefined;
   syncConfig: SyncConfig;
+  getAddressFn?: (
+    transport: Transport
+  ) => (opts: GetAddressOptions) => Promise<Result>;
 }): Observable<ScanAccountEvent> =>
   withDevice(deviceId)((transport) =>
     Observable.create((o) => {
@@ -167,6 +174,10 @@ export const scanAccounts = ({
             derivationModes = derivationModes.filter((mode) => mode === scheme);
           }
 
+          derivationModes = derivationModes.filter(
+            (m) => !libcoreBlacklist.includes(m)
+          );
+
           for (let i = 0; i < derivationModes.length; i++) {
             const derivationMode = derivationModes[i];
             const path = getSeedIdentifierDerivation(currency, derivationMode);
@@ -201,12 +212,12 @@ export const scanAccounts = ({
               }
             }
 
+            const getAddr = getAddressFn
+              ? getAddressFn(transport)
+              : (opts) => getAddress(transport, opts);
+
             try {
-              result = await getAddress(transport, {
-                currency,
-                path,
-                derivationMode,
-              });
+              result = await getAddr({ currency, path, derivationMode });
             } catch (e) {
               // feature detection: some old app will specifically returns this code for segwit case and we ignore it
               // we also feature detect any denying case that could happen
@@ -245,7 +256,6 @@ export const scanAccounts = ({
             await scanNextAccount({
               core,
               wallet,
-              transport,
               currency,
               accountIndex: 0,
               onAccountScanned,
@@ -255,6 +265,7 @@ export const scanAccounts = ({
               isUnsubscribed,
               syncConfig,
               derivationsCache: new DerivationsCache(),
+              getAddr,
             });
           }
 

package/src/network.ts

@@ -12,8 +12,8 @@ type ExtendedXHRConfig = AxiosRequestConfig & { metadata?: Metadata };
 export const requestInterceptor = (
   request: AxiosRequestConfig
 ): ExtendedXHRConfig => {
-  const { url, method = "", data } = request;
-  log("network", `${method} ${url}`, { data });
+  const { baseURL, url, method = "", data } = request;
+  log("network", `${method} ${baseURL || ""}${url}`, { data });
 
   // $FlowFixMe (LLD side)
   const req: ExtendedXHRConfig = request;
@@ -30,14 +30,14 @@ export const responseInterceptor = (
     config: ExtendedXHRConfig;
   } & AxiosResponse<any>
 ) => {
-  const { url, method = "", metadata } = response.config;
+  const { baseURL, url, method = "", metadata } = response.config;
   const { startTime = 0 } = metadata || {};
 
   log(
     "network-success",
-    `${response.status} ${method} ${url} (${(Date.now() - startTime).toFixed(
-      0
-    )}ms)`,
+    `${response.status} ${method} ${baseURL || ""}${url} (${(
+      Date.now() - startTime
+    ).toFixed(0)}ms)`,
     getEnv("DEBUG_HTTP_RESPONSE") ? { data: response.data } : undefined
   );
 
@@ -47,7 +47,7 @@ export const responseInterceptor = (
 export const errorInterceptor = (error: AxiosError<any>) => {
   const config = error?.response?.config as ExtendedXHRConfig | null;
   if (!config) throw error;
-  const { url, method = "", metadata } = config;
+  const { baseURL, url, method = "", metadata } = config;
   const { startTime = 0 } = metadata || {};
 
   let errorToThrow;
@@ -73,16 +73,18 @@ export const errorInterceptor = (error: AxiosError<any>) => {
     }
     log(
       "network-error",
-      `${status} ${method} ${url} (${(Date.now() - startTime).toFixed(0)}ms): ${
-        errorToThrow.message
-      }`,
+      `${status} ${method} ${baseURL || ""}${url} (${(
+        Date.now() - startTime
+      ).toFixed(0)}ms): ${errorToThrow.message}`,
       getEnv("DEBUG_HTTP_RESPONSE") ? { data: data } : {}
     );
     throw errorToThrow;
   } else if (error.request) {
     log(
       "network-down",
-      `DOWN ${method} ${url} (${(Date.now() - startTime).toFixed(0)}ms)`
+      `DOWN ${method} ${baseURL || ""}${url} (${(
+        Date.now() - startTime
+      ).toFixed(0)}ms)`
     );
     throw new NetworkDown();
   }

package/lib/families/bitcoin/datasets/stratis.d.ts

@@ -1,5 +0,0 @@
-import type { CurrenciesData } from "../../../types";
-import type { Transaction } from "../types";
-declare const dataset: CurrenciesData<Transaction>;
-export default dataset;
-//# sourceMappingURL=stratis.d.ts.map

package/lib/families/bitcoin/datasets/stratis.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"stratis.d.ts","sourceRoot":"","sources":["../../../../src/families/bitcoin/datasets/stratis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,QAAA,MAAM,OAAO,EAAE,cAAc,CAAC,WAAW,CAoBxC,CAAC;AACF,eAAe,OAAO,CAAC"}

package/lib/families/bitcoin/datasets/stratis.js

@@ -1,12 +0,0 @@
-"use strict";
-exports.__esModule = true;
-var dataset = {
-    scanAccounts: [
-        {
-            name: "stratis seed 1",
-            apdus: "\n      => e040000009028000002c80000069\n      <= 4104ec740bb3e8df6956d38085a77b60193a968a981aeb1cebf578835ad3cf04102c3e4ec2ef80ba7423ab72d92705f739d2371e2bae433479a658c9d573821661d4225356686e53443479344e6d37374b324b7771613241325846453947725a41446d6f4a45e9a215bda256e6ebe9379a3d274b781c213f6d9d41121ab6b25e5db1341cb09000\n      => e016000000\n      <= 003f007d0207537472617469730553545241549000\n      => e040000009028000002c80000069\n      <= 4104ec740bb3e8df6956d38085a77b60193a968a981aeb1cebf578835ad3cf04102c3e4ec2ef80ba7423ab72d92705f739d2371e2bae433479a658c9d573821661d4225356686e53443479344e6d37374b324b7771613241325846453947725a41446d6f4a45e9a215bda256e6ebe9379a3d274b781c213f6d9d41121ab6b25e5db1341cb09000\n      => e04000000d038000002c8000006980000000\n      <= 41049414d3c0312bef669efe694dd8dc11b24714d8574eb87efc8c4db8dbf05e9d8a8f94465b26bf61699ee2e4c640a5a468aba7e074c4690daaa024d796a38c439a22536a7967717a3578777768485331394371364d31617339326e79583650334177546d6387cb8590fb4ea78c8576f6231b697cb98546383e26a6ae8427474328ee95499000\n      => e04000000d038000002c8000006980000001\n      <= 410472db38e16dbdc67dbb5929334974769f1b94b424a0aad70f7708bc00f9801eae8ed9b012b24a18116570bbe1c33756bc3efec5d267850536ce006f8b7a5d9d8a22535374686537796753393975457456626d786254586e5454776d5555677741774e6b42baab87d0d12ff3fb0df1af252b3ec69e9209f10bbf9c3e7069d24ce29a8baf9000\n      => e04000000d038000002c8000006980000002\n      <= 4104361b0f2f93418096078a83325c0f7ba2e4e702b5894e2d5c0f2a61015a5f73e8c9080d3754c9a282a5ba07d36fe06e9995a256ed541af35f04184468983a9722225361744a6664676d36394c345858695272695777565a396654454c47487672716a442a392f567d893677aeb458bf84855e15087ac9cb6ecb3eeefa4c601d53a310f49000\n      "
-        },
-    ]
-};
-exports["default"] = dataset;
-//# sourceMappingURL=stratis.js.map

package/lib/families/bitcoin/datasets/stratis.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"stratis.js","sourceRoot":"","sources":["../../../../src/families/bitcoin/datasets/stratis.ts"],"names":[],"mappings":";;AAEA,IAAM,OAAO,GAAgC;IAC3C,YAAY,EAAE;QACZ;YACE,IAAI,EAAE,gBAAgB;YACtB,KAAK,EAAE,4qDAaN;SACF;KACF;CACF,CAAC;AACF,qBAAe,OAAO,CAAC"}

package/src/families/bitcoin/datasets/stratis.ts

@@ -1,24 +0,0 @@
-import type { CurrenciesData } from "../../../types";
-import type { Transaction } from "../types";
-const dataset: CurrenciesData<Transaction> = {
-  scanAccounts: [
-    {
-      name: "stratis seed 1",
-      apdus: `
-      => e040000009028000002c80000069
-      <= 4104ec740bb3e8df6956d38085a77b60193a968a981aeb1cebf578835ad3cf04102c3e4ec2ef80ba7423ab72d92705f739d2371e2bae433479a658c9d573821661d4225356686e53443479344e6d37374b324b7771613241325846453947725a41446d6f4a45e9a215bda256e6ebe9379a3d274b781c213f6d9d41121ab6b25e5db1341cb09000
-      => e016000000
-      <= 003f007d0207537472617469730553545241549000
-      => e040000009028000002c80000069
-      <= 4104ec740bb3e8df6956d38085a77b60193a968a981aeb1cebf578835ad3cf04102c3e4ec2ef80ba7423ab72d92705f739d2371e2bae433479a658c9d573821661d4225356686e53443479344e6d37374b324b7771613241325846453947725a41446d6f4a45e9a215bda256e6ebe9379a3d274b781c213f6d9d41121ab6b25e5db1341cb09000
-      => e04000000d038000002c8000006980000000
-      <= 41049414d3c0312bef669efe694dd8dc11b24714d8574eb87efc8c4db8dbf05e9d8a8f94465b26bf61699ee2e4c640a5a468aba7e074c4690daaa024d796a38c439a22536a7967717a3578777768485331394371364d31617339326e79583650334177546d6387cb8590fb4ea78c8576f6231b697cb98546383e26a6ae8427474328ee95499000
-      => e04000000d038000002c8000006980000001
-      <= 410472db38e16dbdc67dbb5929334974769f1b94b424a0aad70f7708bc00f9801eae8ed9b012b24a18116570bbe1c33756bc3efec5d267850536ce006f8b7a5d9d8a22535374686537796753393975457456626d786254586e5454776d5555677741774e6b42baab87d0d12ff3fb0df1af252b3ec69e9209f10bbf9c3e7069d24ce29a8baf9000
-      => e04000000d038000002c8000006980000002
-      <= 4104361b0f2f93418096078a83325c0f7ba2e4e702b5894e2d5c0f2a61015a5f73e8c9080d3754c9a282a5ba07d36fe06e9995a256ed541af35f04184468983a9722225361744a6664676d36394c345858695272695777565a396654454c47487672716a442a392f567d893677aeb458bf84855e15087ac9cb6ecb3eeefa4c601d53a310f49000
-      `,
-    },
-  ],
-};
-export default dataset;