@ledgerhq/live-common 27.3.2 → 27.4.0-next.1

package/src/families/bitcoin/wallet-btc/storage/index.ts

@@ -23,15 +23,17 @@ class BitcoinLikeStorage implements IStorage {
   // returning unordered tx within the same block)
   spentUtxos: { [key: string]: Input[] } = {};
 
-  getLastTx(txFilter: { account: number; index: number; confirmed?: boolean }) {
+  getLastTx(txFilter: {
+    account: number;
+    index: number;
+    confirmed?: boolean;
+  }): TX | undefined {
     if (
       typeof this.accountIndex[`${txFilter.account}-${txFilter.index}`] ===
       "undefined"
     ) {
       return undefined;
     }
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
     const tx: TX | undefined = findLast(
       this.accountIndex[`${txFilter.account}-${txFilter.index}`].map(
         (i) => this.txs[i]
@@ -39,7 +41,7 @@ class BitcoinLikeStorage implements IStorage {
       (t) => {
         return (
           typeof txFilter.confirmed === "undefined" ||
-          (txFilter.confirmed && t.block) ||
+          (txFilter.confirmed && !!t.block) ||
           (!txFilter.confirmed && !t.block)
         );
       }
@@ -47,27 +49,25 @@ class BitcoinLikeStorage implements IStorage {
     return tx;
   }
 
-  getLastUnconfirmedTx() {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
+  getLastUnconfirmedTx(): TX | undefined {
     const tx: TX | undefined = findLast(this.txs, (t) => {
       return !t.block;
     });
     return tx;
   }
 
-  getTx(address: string, txId: string) {
+  getTx(address: string, txId: string): TX {
     const index = `${address}-${txId}`;
     return this.txs[this.primaryIndex[index]];
   }
 
   // TODO: only expose unspentUtxos
-  getAddressUnspentUtxos(address: Address) {
+  getAddressUnspentUtxos(address: Address): Output[] {
     const indexAddress = address.address;
     return this.unspentUtxos[indexAddress];
   }
 
-  appendTxs(txs: TX[]) {
+  appendTxs(txs: TX[]): number {
     const lastLength = this.txs.length;
 
     txs.forEach((tx) => {
@@ -118,12 +118,20 @@ class BitcoinLikeStorage implements IStorage {
     return this.txs.length - lastLength;
   }
 
-  getUniquesAddresses(addressesFilter: { account?: number; index?: number }) {
+  getUniquesAddresses(addressesFilter: {
+    account?: number;
+    index?: number;
+  }): Address[] {
     // TODO: to speed up, create more useful indexes in appendTxs
     return uniqBy(
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      filter(this.txs, addressesFilter).map((tx: TX) => ({
+      filter(
+        this.txs,
+        (t) =>
+          (typeof addressesFilter.account === "undefined" ||
+            addressesFilter.account === t.account) &&
+          (typeof addressesFilter.index === "undefined" ||
+            addressesFilter.index === t.index)
+      ).map((tx: TX) => ({
         address: tx.address,
         account: tx.account,
         index: tx.index,
@@ -132,7 +140,7 @@ class BitcoinLikeStorage implements IStorage {
     );
   }
 
-  removeTxs(txsFilter: { account: number; index: number }) {
+  removeTxs(txsFilter: { account: number; index: number }): void {
     const newTxs: TX[] = [];
     this.primaryIndex = {};
     this.accountIndex = {};
@@ -155,7 +163,7 @@ class BitcoinLikeStorage implements IStorage {
 
   // We are a bit ugly because we can't rely undo unspentUTXO
   // So we clean the address and rebuild without the pendings
-  removePendingTxs(txsFilter: { account: number; index: number }) {
+  removePendingTxs(txsFilter: { account: number; index: number }): void {
     const newTxs: TX[] = [];
     const txsToReAdd: TX[] = [];
     this.primaryIndex = {};
@@ -190,14 +198,14 @@ class BitcoinLikeStorage implements IStorage {
     this.addressCache[key] = address;
   }
 
-  exportSync() {
+  exportSync(): { txs: TX[]; addressCache: { [key: string]: string } } {
     return {
       txs: this.txs,
       addressCache: this.addressCache,
     };
   }
 
-  loadSync(data: { txs: TX[]; addressCache: { [key: string]: string } }) {
+  loadSync(data: { txs: TX[]; addressCache: { [key: string]: string } }): void {
     this.txs = [];
     this.primaryIndex = {};
     this.accountIndex = {};
@@ -214,11 +222,17 @@ class BitcoinLikeStorage implements IStorage {
     Base.addressCache = { ...Base.addressCache, ...this.addressCache };
   }
 
-  async export() {
+  async export(): Promise<{
+    txs: TX[];
+    addressCache: { [key: string]: string };
+  }> {
     return this.exportSync();
   }
 
-  async load(data: { txs: TX[]; addressCache: { [key: string]: string } }) {
+  async load(data: {
+    txs: TX[];
+    addressCache: { [key: string]: string };
+  }): Promise<void> {
     return this.loadSync(data);
   }
 

package/src/families/bitcoin/wallet-btc/utils.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import * as bitcoin from "bitcoinjs-lib";
 import bs58 from "bs58";
 import { padStart } from "lodash";
@@ -9,18 +9,16 @@ import { fallbackValidateAddress } from "./crypto/base";
 import { UnsupportedDerivation } from "../../../errors";
 import varuint from "varuint-bitcoin";
 
-export function parseHexString(str: any) {
+export function parseHexString(str: any): number[] {
   const result: Array<number> = [];
   while (str.length >= 2) {
     result.push(parseInt(str.substring(0, 2), 16));
-    // eslint-disable-next-line no-param-reassign
     str = str.substring(2, str.length);
   }
   return result;
 }
 
-export function encodeBase58Check(vchIn: any) {
-  // eslint-disable-next-line no-param-reassign
+export function encodeBase58Check(vchIn: any): string {
   vchIn = parseHexString(vchIn);
   let chksum = bitcoin.crypto.sha256(Buffer.from(vchIn));
   chksum = bitcoin.crypto.sha256(chksum);
@@ -29,29 +27,23 @@ export function encodeBase58Check(vchIn: any) {
   return bs58.encode(hash);
 }
 
-export function toHexDigit(number: any) {
+export function toHexDigit(number: any): string {
   const digits = "0123456789abcdef";
-  // eslint-disable-next-line no-bitwise
   return digits.charAt(number >> 4) + digits.charAt(number & 0x0f);
 }
 
-export function toHexInt(number: any) {
+export function toHexInt(number: any): string {
   return (
-    // eslint-disable-next-line no-bitwise
     toHexDigit((number >> 24) & 0xff) +
-    // eslint-disable-next-line no-bitwise
     toHexDigit((number >> 16) & 0xff) +
-    // eslint-disable-next-line no-bitwise
     toHexDigit((number >> 8) & 0xff) +
-    // eslint-disable-next-line no-bitwise
     toHexDigit(number & 0xff)
   );
 }
 
-export function compressPublicKey(publicKey: any) {
-  let compressedKeyIndex;
+export function compressPublicKey(publicKey: any): string {
+  let compressedKeyIndex: string;
   if (publicKey.substring(0, 2) !== "04") {
-    // eslint-disable-next-line no-throw-literal
     throw new Error("Invalid public key format");
   }
   if (parseInt(publicKey.substring(128, 130), 16) % 2 !== 0) {
@@ -70,7 +62,7 @@ export function createXPUB(
   chaincode: any,
   publicKey: any,
   network: any
-) {
+): string {
   let xpub = toHexInt(network);
   xpub += padStart(depth.toString(16), 2, "0");
   xpub += padStart(fingerprint.toString(16), 8, "0");
@@ -80,7 +72,7 @@ export function createXPUB(
   return xpub;
 }
 
-export function byteSize(count: number) {
+export function byteSize(count: number): number {
   if (count < 0xfd) {
     return 1;
   }
@@ -227,7 +219,7 @@ export function maxTxSizeCeil(
 }
 
 // refer to https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/api_impl/BitcoinLikeTransactionApi.cpp#L253
-export function computeDustAmount(currency: ICrypto, txSize: number) {
+export function computeDustAmount(currency: ICrypto, txSize: number): number {
   let dustAmount = currency.network.dustThreshold;
   switch (currency.network.dustPolicy) {
     case "PER_KBYTE":
@@ -242,7 +234,7 @@ export function computeDustAmount(currency: ICrypto, txSize: number) {
   return dustAmount;
 }
 
-export function isValidAddress(address: string, currency?: Currency) {
+export function isValidAddress(address: string, currency?: Currency): boolean {
   if (!currency) {
     // If the caller doesn't provide the currency, we'll
     // fallback to a pre-taproot basic validation that doesn't
@@ -253,7 +245,10 @@ export function isValidAddress(address: string, currency?: Currency) {
   return crypto.validateAddress(address);
 }
 
-export function isTaprootAddress(address: string, currency?: Currency) {
+export function isTaprootAddress(
+  address: string,
+  currency?: Currency
+): boolean {
   if (currency === "bitcoin") {
     return cryptoFactory("bitcoin").isTaprootAddress(address);
   } else if (currency === "bitcoin_testnet") {
@@ -263,7 +258,7 @@ export function isTaprootAddress(address: string, currency?: Currency) {
   }
 }
 
-export function writeVarInt(buffer: Buffer, i: number, offset: number) {
+export function writeVarInt(buffer: Buffer, i: number, offset: number): number {
   // refer to https://github.com/bitcoinjs/bitcoinjs-lib/blob/1f44f722d30cd14a1861c8546e6b455f73862c1e/src/bufferutils.js#L78
   varuint.encode(i, buffer, offset);
   offset += varuint.encode.bytes;

package/src/families/bitcoin/wallet-btc/wallet.ts

@@ -1,5 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 import { flatten } from "lodash";
 import BigNumber from "bignumber.js";
 import Btc from "@ledgerhq/hw-app-btc";
@@ -11,16 +9,16 @@ import { Account, SerializedAccount } from "./account";
 import Xpub from "./xpub";
 import { IExplorer } from "./explorer/types";
 import BitcoinLikeExplorer from "./explorer";
-import { IStorage } from "./storage/types";
+import { IStorage, Output } from "./storage/types";
 import BitcoinLikeStorage from "./storage";
 import { PickingStrategy } from "./pickingstrategies/types";
 import * as utils from "./utils";
 import cryptoFactory from "./crypto/factory";
+import { TX, Address } from "./storage/types";
 
 class BitcoinLikeWallet {
   explorerInstances: { [key: string]: IExplorer } = {};
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   explorers: { [key: string]: (explorerURI: string) => IExplorer } = {
     ledgerv3: (explorerURI) =>
       new BitcoinLikeExplorer({
@@ -34,12 +32,14 @@ class BitcoinLikeWallet {
       }),
   };
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   accountStorages: { [key: string]: (...args: any[]) => IStorage } = {
     mock: () => new BitcoinLikeStorage(),
   };
 
-  getExplorer(explorer: "ledgerv3" | "ledgerv2", explorerURI: string) {
+  getExplorer(
+    explorer: "ledgerv3" | "ledgerv2",
+    explorerURI: string
+  ): IExplorer {
     const id = `explorer-${explorer}-uri-${explorerURI}`;
     this.explorerInstances[id] =
       this.explorerInstances[id] || this.explorers[explorer](explorerURI);
@@ -56,7 +56,6 @@ class BitcoinLikeWallet {
     explorer: "ledgerv3" | "ledgerv2";
     explorerURI: string;
     storage: "mock";
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     storageParams: any[];
   }): Promise<Account> {
     const crypto = cryptoFactory(params.currency);
@@ -77,31 +76,26 @@ class BitcoinLikeWallet {
     };
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async syncAccount(account: Account) {
+  async syncAccount(account: Account): Promise<number> {
     return account.xpub.sync();
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async getAccountNewReceiveAddress(account: Account) {
+  async getAccountNewReceiveAddress(account: Account): Promise<Address> {
     const address = await account.xpub.getNewAddress(0, 1);
     return address;
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async getAccountNewChangeAddress(account: Account) {
+  async getAccountNewChangeAddress(account: Account): Promise<Address> {
     const address = await account.xpub.getNewAddress(1, 1);
     return address;
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async getAccountTransactions(account: Account) {
-    const txs = await account.xpub.storage.export();
+  async getAccountTransactions(account: Account): Promise<{ txs: TX[] }> {
+    const txs = (await account.xpub.storage.export()) as { txs: TX[] };
     return txs;
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async getAccountUnspentUtxos(account: Account) {
+  async getAccountUnspentUtxos(account: Account): Promise<Output[]> {
     const addresses = await account.xpub.getXpubAddresses();
     return flatten(
       await Promise.all(
@@ -112,13 +106,12 @@ class BitcoinLikeWallet {
     );
   }
 
-  // eslint-disable-next-line class-methods-use-this
   async estimateAccountMaxSpendable(
     account: Account,
     feePerByte: number,
     excludeUTXOs: Array<{ hash: string; outputIndex: number }>,
     outputAddresses: string[] = []
-  ) {
+  ): Promise<BigNumber> {
     const addresses = await account.xpub.getXpubAddresses();
     const changeAddresses = (await account.xpub.getAccountAddresses(1)).map(
       (item) => item.address
@@ -168,14 +161,12 @@ class BitcoinLikeWallet {
     return maxSpendable.lt(0) ? new BigNumber(0) : maxSpendable;
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async getAccountBalance(account: Account) {
+  async getAccountBalance(account: Account): Promise<BigNumber> {
     const balance = await account.xpub.getXpubBalance();
     return balance;
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async getAccountPendings(account: Account) {
+  async getAccountPendings(account: Account): Promise<TX[]> {
     const addresses = await account.xpub.getXpubAddresses();
     return flatten(
       await Promise.all(
@@ -184,7 +175,6 @@ class BitcoinLikeWallet {
     );
   }
 
-  // eslint-disable-next-line class-methods-use-this
   async buildAccountTx(params: {
     fromAccount: Account;
     dest: string;
@@ -205,7 +195,6 @@ class BitcoinLikeWallet {
     return txInfo;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   async signAccountTx(params: {
     btc: Btc;
     fromAccount: Account;
@@ -225,7 +214,7 @@ class BitcoinLikeWallet {
       total: number;
       index: number;
     }) => void;
-  }) {
+  }): Promise<string> {
     const {
       btc,
       fromAccount,
@@ -351,8 +340,7 @@ class BitcoinLikeWallet {
     return tx;
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async broadcastTx(fromAccount: Account, tx: string) {
+  async broadcastTx(fromAccount: Account, tx: string): Promise<string> {
     const res = await fromAccount.xpub.broadcastTx(tx);
     return res.data.result;
   }
@@ -400,7 +388,6 @@ class BitcoinLikeWallet {
     };
   }
 
-  // eslint-disable-next-line class-methods-use-this
   async exportToSerializedAccount(
     account: Account
   ): Promise<SerializedAccount> {
@@ -415,7 +402,6 @@ class BitcoinLikeWallet {
     };
   }
 
-  // eslint-disable-next-line class-methods-use-this
   exportToSerializedAccountSync(account: Account): SerializedAccount {
     const data = account.xpub.storage.exportSync();