@ledgerhq/live-common 21.25.2 → 21.26.3

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

@@ -42,13 +42,13 @@ class Base implements ICrypto {
   }
 
   protected getPubkeyAt(xpub: string, account: number, index: number): Buffer {
-    if (!Base.bech32Cache[xpub]) {
+    if (!Base.bech32Cache[`${this.network.name}-${xpub}`]) {
       const buffer: Buffer = bs58.decode(xpub);
       const depth: number = buffer[4];
       const i: number = buffer.readUInt32BE(9);
       const chainCode: Buffer = buffer.slice(13, 45);
       const publicKey: Buffer = buffer.slice(45, 78);
-      Base.bech32Cache[xpub] = new BIP32(
+      Base.bech32Cache[`${this.network.name}-${xpub}`] = new BIP32(
         publicKey,
         chainCode,
         this.network,
@@ -56,20 +56,30 @@ class Base implements ICrypto {
         i
       );
     }
-    if (Base.publickeyCache[`${xpub}-${account}-${index}`]) {
-      return Base.publickeyCache[`${xpub}-${account}-${index}`];
+    if (
+      Base.publickeyCache[`${this.network.name}-${xpub}-${account}-${index}`]
+    ) {
+      return Base.publickeyCache[
+        `${this.network.name}-${xpub}-${account}-${index}`
+      ];
     }
-    if (Base.publickeyCache[`${xpub}-${account}`]) {
+    if (Base.publickeyCache[`${this.network.name}-${xpub}-${account}`]) {
       const publicKey =
-        Base.publickeyCache[`${xpub}-${account}`].derive(index).publicKey;
-      Base.publickeyCache[`${xpub}-${account}-${index}`] = publicKey;
+        Base.publickeyCache[`${this.network.name}-${xpub}-${account}`].derive(
+          index
+        ).publicKey;
+      Base.publickeyCache[`${this.network.name}-${xpub}-${account}-${index}`] =
+        publicKey;
       return publicKey;
     }
-    Base.publickeyCache[`${xpub}-${account}`] =
-      Base.bech32Cache[xpub].derive(account);
+    Base.publickeyCache[`${this.network.name}-${xpub}-${account}`] =
+      Base.bech32Cache[`${this.network.name}-${xpub}`].derive(account);
     const publicKey =
-      Base.publickeyCache[`${xpub}-${account}`].derive(index).publicKey;
-    Base.publickeyCache[`${xpub}-${account}-${index}`] = publicKey;
+      Base.publickeyCache[`${this.network.name}-${xpub}-${account}`].derive(
+        index
+      ).publicKey;
+    Base.publickeyCache[`${this.network.name}-${xpub}-${account}-${index}`] =
+      publicKey;
     return publicKey;
   }
 
@@ -110,26 +120,37 @@ class Base implements ICrypto {
     account: number,
     index: number
   ): string {
-    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
-      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    if (
+      Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ]
+    ) {
+      return Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ];
     }
     switch (derivationMode) {
       case DerivationModes.LEGACY:
-        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-          this.getLegacyAddress(xpub, account, index);
+        Base.addressCache[
+          `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+        ] = this.getLegacyAddress(xpub, account, index);
         break;
       case DerivationModes.SEGWIT:
-        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-          this.getSegWitAddress(xpub, account, index);
+        Base.addressCache[
+          `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+        ] = this.getSegWitAddress(xpub, account, index);
         break;
       case DerivationModes.NATIVE_SEGWIT:
-        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-          this.getNativeSegWitAddress(xpub, account, index);
+        Base.addressCache[
+          `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+        ] = this.getNativeSegWitAddress(xpub, account, index);
         break;
       default:
         throw new Error(`Invalid derivation Mode: ${derivationMode}`);
     }
-    return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    return Base.addressCache[
+      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+    ];
   }
 
   // infer address type from its syntax

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

@@ -125,15 +125,22 @@ class Bitcoin extends Base {
     account: number,
     index: number
   ): string {
-    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
-      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    if (
+      Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ]
+    ) {
+      return Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ];
     }
     switch (derivationMode) {
       case DerivationModes.TAPROOT:
-        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-          this.getTaprootAddress(xpub, account, index);
+        Base.addressCache[
+          `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+        ] = this.getTaprootAddress(xpub, account, index);
         return Base.addressCache[
-          `${derivationMode}-${xpub}-${account}-${index}`
+          `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
         ];
       default:
         return super.getAddress(derivationMode, xpub, account, index);

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

@@ -47,12 +47,19 @@ class BitcoinCash implements ICrypto {
     account: number,
     index: number
   ): string {
-    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
-      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    if (
+      Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ]
+    ) {
+      return Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ];
     }
     const address = this.getLegacyBitcoinCashAddress(xpub, account, index);
-    Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-      address;
+    Base.addressCache[
+      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+    ] = address;
     return address;
   }
 

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

@@ -74,8 +74,14 @@ class Decred extends Base {
     account: number,
     index: number
   ): string {
-    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
-      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    if (
+      Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ]
+    ) {
+      return Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ];
     }
     let buffer: Buffer;
     try {
@@ -90,8 +96,9 @@ class Decred extends Base {
     const hd = new BIP32(X, chainCode, this.network, depth, i);
     const publicKey = hd.derive(account).derive(index).publicKey;
     const address = Decred.getAddressFromPk(publicKey);
-    Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-      address;
+    Base.addressCache[
+      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+    ] = address;
     return address;
   }
 }

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

@@ -59,8 +59,14 @@ class Litecoin extends Base implements ICrypto {
     account: number,
     index: number
   ): string {
-    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
-      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    if (
+      Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ]
+    ) {
+      return Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ];
     }
     let address: string;
     switch (derivationMode) {
@@ -76,8 +82,9 @@ class Litecoin extends Base implements ICrypto {
       default:
         throw new Error("Should not be reachable");
     }
-    Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-      address;
+    Base.addressCache[
+      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+    ] = address;
     return address;
   }
 

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

@@ -53,12 +53,19 @@ class ZCash implements ICrypto {
     account: number,
     index: number
   ): string {
-    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
-      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    if (
+      Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ]
+    ) {
+      return Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ];
     }
     const address = this.getLegacyAddress(xpub, account, index);
-    Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-      address;
+    Base.addressCache[
+      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+    ] = address;
     return address;
   }
 

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

@@ -73,12 +73,19 @@ class Zen implements ICrypto {
     account: number,
     index: number
   ): string {
-    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
-      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    if (
+      Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ]
+    ) {
+      return Base.addressCache[
+        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+      ];
     }
     const address = this.getLegacyAddress(xpub, account, index);
-    Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
-      address;
+    Base.addressCache[
+      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
+    ] = address;
     return address;
   }
 

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

@@ -67,7 +67,7 @@ class Xpub extends EventEmitter {
     );
 
     this.storage.addAddress(
-      `${this.derivationMode}-${this.xpub}-${account}-${index}`,
+      `${this.crypto.network.name}-${this.derivationMode}-${this.xpub}-${account}-${index}`,
       address
     );
     await this.whenSynced("address", address);

package/src/families/ethereum/modules/send.ts

@@ -189,6 +189,9 @@ const send: ModeModule = {
       ];
     }
   },
+
+  // This is resolution config is necessary for plugins like Lido and stuff cause they use the send mode
+  getResolutionConfig: () => ({ erc20: true, externalPlugins: true }),
 };
 
 function serializeTransactionData(

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

@@ -30,6 +30,7 @@ import { getEnv } from "../../../env";
 import { signOperation } from "../signOperation";
 import { patchOperationWithHash } from "../../../operation";
 import { log } from "@ledgerhq/logs";
+import { InvalidAddressBecauseAlreadyDelegated } from "../../../errors";
 
 const receive = makeAccountBridgeReceive();
 
@@ -70,54 +71,52 @@ const getTransactionStatus = async (
   const { tezosResources } = account;
   if (!tezosResources) throw new Error("tezosResources is missing");
 
-  if (!t.taquitoError) {
-    if (t.mode !== "undelegate") {
-      if (account.freshAddress === t.recipient) {
-        errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
-      } else {
-        const { recipientError, recipientWarning } = await validateRecipient(
-          account.currency,
-          t.recipient
-        );
+  if (t.mode !== "undelegate") {
+    if (account.freshAddress === t.recipient) {
+      errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
+    } else {
+      const { recipientError, recipientWarning } = await validateRecipient(
+        account.currency,
+        t.recipient
+      );
 
-        if (recipientError) {
-          errors.recipient = recipientError;
-        }
+      if (recipientError) {
+        errors.recipient = recipientError;
+      }
 
-        if (recipientWarning) {
-          warnings.recipient = recipientWarning;
-        }
+      if (recipientWarning) {
+        warnings.recipient = recipientWarning;
       }
     }
+  }
 
-    if (t.mode === "send") {
-      if (!errors.amount && t.amount.eq(0)) {
-        errors.amount = new AmountRequired();
-      } else if (!errors.amount && t.amount.lt(0)) {
-        errors.amount = new NotEnoughBalance();
-      } else if (t.amount.gt(0) && estimatedFees.times(10).gt(t.amount)) {
-        warnings.feeTooHigh = new FeeTooHigh();
-      }
+  if (t.mode === "send") {
+    if (!errors.amount && t.amount.eq(0)) {
+      errors.amount = new AmountRequired();
+    } else if (!errors.amount && t.amount.lt(0)) {
+      errors.amount = new NotEnoughBalance();
+    } else if (t.amount.gt(0) && estimatedFees.times(10).gt(t.amount)) {
+      warnings.feeTooHigh = new FeeTooHigh();
+    }
 
-      const thresholdWarning = 0.5 * 10 ** account.currency.units[0].magnitude;
-
-      if (
-        !errors.amount &&
-        account.balance
-          .minus(t.amount)
-          .minus(estimatedFees)
-          .lt(thresholdWarning)
-      ) {
-        if (isAccountDelegating(account)) {
-          if (t.useAllAmount) {
-            errors.amount = new RecommendUndelegation();
-          } else {
-            warnings.amount = new RecommendUndelegation();
-          }
+    const thresholdWarning = 0.5 * 10 ** account.currency.units[0].magnitude;
+
+    if (
+      !errors.amount &&
+      account.balance.minus(t.amount).minus(estimatedFees).lt(thresholdWarning)
+    ) {
+      if (isAccountDelegating(account)) {
+        if (t.useAllAmount) {
+          errors.amount = new RecommendUndelegation();
+        } else {
+          warnings.amount = new RecommendUndelegation();
         }
       }
     }
-  } else {
+  }
+
+  // if we also have taquitoError, we interprete them and they override the previously inferred errors
+  if (t.taquitoError) {
     log("taquitoerror", String(t.taquitoError));
 
     // remap taquito errors
@@ -127,7 +126,9 @@ const getTransactionStatus = async (
       } else {
         errors.amount = new NotEnoughBalanceToDelegate();
       }
-    } else {
+    } else if (t.taquitoError.endsWith("delegate.unchanged")) {
+      errors.recipient = new InvalidAddressBecauseAlreadyDelegated();
+    } else if (!errors.amount) {
       // unidentified error case
       errors.amount = new Error(t.taquitoError);
     }

package/src/families/tezos/hw-getAddress.ts

@@ -3,9 +3,7 @@ import type { Resolver } from "../../hw/getAddress/types";
 
 const resolver: Resolver = async (transport, { path, verify }) => {
   const xtz = new Xtz(transport);
-  const r = await xtz.getAddress(path, {
-    verify,
-  });
+  const r = await xtz.getAddress(path, { verify });
   return { ...r, path };
 };
 

package/src/families/tezos/synchronisation.ts

@@ -48,9 +48,10 @@ export const getAccountShape: GetAccountShape = async (infoInput) => {
     derivationMode,
   });
 
-  const initialStableOperations = initialAccount
-    ? initialAccount.operations
-    : [];
+  const initialStableOperations =
+    initialAccount && initialAccount.id === accountId
+      ? initialAccount.operations
+      : [];
 
   // fetch transactions, incrementally if possible
   const mostRecentStableOperation = initialStableOperations[0];