@ledgerhq/live-common 21.27.0 → 21.30.1

package/src/exchange/swap/utils/index.ts

@@ -1,7 +1,8 @@
 import { CryptoCurrency, TokenCurrency } from "@ledgerhq/cryptoassets";
 import { makeEmptyTokenAccount } from "../../../account";
-import { Account, SubAccount } from "../../../types";
+import { Account, SubAccount, TokenAccount } from "../../../types";
 import type { ExchangeRate } from "../types";
+import { getAccountCurrency } from "../../../account";
 
 export const KYC_STATUS = {
   pending: "pending",
@@ -65,3 +66,13 @@ export function getAccountTuplesForCurrency(
     }))
     .filter((a) => (hideEmpty ? a.account?.balance.gt(0) : true));
 }
+
+export const getAvailableAccountsById = (
+  id: string,
+  accounts: ((Account | TokenAccount) & { disabled?: boolean })[]
+): ((Account | TokenAccount) & {
+  disabled?: boolean | undefined;
+})[] =>
+  accounts
+    .filter((acc) => getAccountCurrency(acc)?.id === id && !acc.disabled)
+    .sort((a, b) => b.balance.minus(a.balance).toNumber());

package/src/families/algorand/api/algodv2.ts

@@ -37,7 +37,6 @@ export const getAccount = async (address: string): Promise<AlgoAccount> => {
   };
 };
 
-// TODO Cache
 export const getTransactionParams =
   async (): Promise<AlgoTransactionParams> => {
     const { data } = await network({
@@ -56,12 +55,13 @@ export const getTransactionParams =
   };
 
 export const broadcastTransaction = async (
-  payload: string
+  payload: Buffer
 ): Promise<string> => {
   const { data }: { data: AlgoTransactionBroadcastResponse } = await network({
     method: "POST",
     url: fullUrl(`/transactions`),
     data: payload,
+    headers: { "Content-Type": "application/x-binary" },
   });
 
   return data.txId;

package/src/families/algorand/js-broadcast.ts

@@ -12,6 +12,6 @@ export const broadcast = async ({
   signedOperation: SignedOperation;
 }): Promise<Operation> => {
   const { signature, operation } = signedOperation;
-  const hash = await apiBroadcast(signature);
+  const hash = await apiBroadcast(Buffer.from(signature, "hex"));
   return patchOperationWithHash(operation, hash);
 };

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

@@ -2,7 +2,12 @@ import { BigNumber } from "bignumber.js";
 import { Observable } from "rxjs";
 import { FeeNotLoaded } from "@ledgerhq/errors";
 import Algorand from "@ledgerhq/hw-app-algorand";
-import type { Account, Operation, SignOperationEvent } from "../../types";
+import type {
+  Account,
+  Operation,
+  SignedOperation,
+  SignOperationEvent,
+} from "../../types";
 import { withDevice } from "../../hw/deviceAccess";
 import type { Transaction } from "./types";
 import {
@@ -56,9 +61,9 @@ export const signOperation = ({
           type: "signed",
           signedOperation: {
             operation,
-            signature: toBroadcast,
+            signature: toBroadcast.toString("hex"),
             expirationDate: null,
-          },
+          } as SignedOperation,
         });
       }
 

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/wallet.ts

@@ -272,9 +272,7 @@ class BitcoinLikeWallet {
       if (additionals && additionals.includes("peercoin")) {
         // remove timestamp for new version of peercoin input, refer to https://github.com/peercoin/rfcs/issues/5 and https://github.com/LedgerHQ/ledgerjs/issues/701
         const version = i.txHex.substring(0, 8);
-        if (version !== "01000000" && version !== "02000000") {
-          hasTimestamp = false;
-        }
+        hasTimestamp = version === "01000000" || version === "02000000";
       }
       log("hw", `splitTransaction`, {
         transactionHex: i.txHex,

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/datasets/ethereum.scanAccounts.1.ts

@@ -1,47 +1,47 @@
 export default {
   name: "ethereum seed 1",
   apdus: `
-  => e00200000d038000002c8000003c80000000
-  <= 410434ab5fd7ee8bd794b8a41875aa9a78a296d7c4246531dfd36d47fa6bb42c8eb02720c6d9802b8590c4a461f08c2a7696557a9ec1d4fd0ca340c63b33ad359f4228323031653833363838324636384541456433346338323545423463333036446537303830323663629000
-  => e002000011048000002c8000003c8000000000000000
-  <= 4104b7577f404537d1e934a8d2a1fd2552a7f399928b5af0aad714acc17b36865b3f5d1843d6a580c737c051656ac35978283a388a759911d289e9994071247d167528356466304333363936343142384166336337653961653037364535343636654636373833313943649000
-  => e002000011048000002c8000003c8000000000000001
-  <= 4104bee21a16156c645d0150e262c40648b9fd938c6462efe3adf9051efe077d30b356c86b8bc8a182e58cdc514e6d0c2670f6626d34f78220187e2d279d661d23f628446336313732383838343733383239324134373236353042624133653936433261344638383739369000
-  => e002000011048000002c8000003c8000000000000002
-  <= 410467f77bf213f0de5fd7ae7ac2ca2b6f7ad6cacecbb8688acd0bcf0fcc5b7b58512fe786639619b9f4a513061dd0355590ec5b7d2c4d934c43a37778920bf07e1a28623262344230413836384543326530613162326533314131304142414130393365463032386544389000
-  => e002000011048000002c8000003c8000000000000003
-  <= 4104dcce479cd733a7972cea67f0b5bf92d786a1e62a9afe5e50ddd2f7f7c8c1aaff89e28b236f5f1e75c702c3c0116de49dde6b32f06f66937f0b190bdd730bd84e28613563334139333430364465323733666639386244443343653935314232653431423137436443469000
-  => e002000011048000002c8000003c8000000000000004
-  <= 4104b60582b8ea13540e5292396949f9d2ed23d9ec4344e2463e9fe7fa36c12372da03a0427c48d653dd59abfcbb7628b323076415f1fd53bc601b8071d82ddd635528393945363561463136626644393139303246623638394163373938343338633042464334373439359000
-  => e002000011048000002c8000003c8000000000000005
-  <= 4104126bf90b475158cb8c947dbe47d9ecdff88c34c96c7b7f4fc17a05257dff1024c089fd51f657fa7f5b1041d23bc67d46cd0dd4df86c5318f653486199313e18f28663736394533463933663831313733653836333365354461653646433031426262443163634230389000
-  => e002000011048000002c8000003c8000000000000006
-  <= 4104dc7934183510e92e07136e9192da7d5bbd4c3a757b4d9bdf8dcca9baabdf8efddfad24ef74e8a0db52d9e4171516665ff6e4cd152273f460627933df3ced177828463439386638653139323342653437633335343932376445334332313661633341453734666535619000
-  => e002000011048000002c8000003c8000000000000007
-  <= 4104b7664a7012f69cee691362377df6d8558b0acfe1541dbf95af90e919d6867ac9d46b3b0b42e98fe8543c15ae501fed3d85869fd0310d9804faed0d07ae3b871628353932393338336336626631624439666533383462423665363162394232413230416637434361429000
-  => e002000011048000002c8000003c8000000000000008
-  <= 41045cdb8bc99d890837444698a53d9c18d22c6159e0727e051fee54e7299318282d3fe882b4aa133e7e15529e90b824b4f83ea5242b3ad4651c7d9cca12c796e45428634339303838363541443934303634623733433739663235393861373966393843654544364446619000
-  => e002000011048000002c8000003c8000000000000009
-  <= 4104720ec99d2297e627e239764e519be6900d06fc3d9145e306daeace60944c3c6dc14e74f24d27fc98278c0c07de821bae71ed5c95e9a7b95538637e817763609128373731663039424535353143386346393734426141426336373365324232323132643637383236469000
-  => e002000011048000002c8000003c800000000000000a
-  <= 41043a98496a4115f61e264bd74ba1ea661729ccfa239e72318ecbd307fb747d2032be5e308e435b24417320a95b719d60b7740b0bf297f926b414b4d3b44d903a9f28384138383238373537353662333831336262613844644631376634304232363064423232466334379000
-  => e002000011048000002c8000003c800000000000000b
-  <= 41040f3a6497cdef24c68b895a0d8a9f8b54e16ee84e4905a24236a242a82a900e068cb72ad71f52b57dfa41e00090cd035d1a4205dbe3982ac88189c743edb856a828646431344537456135384533384343316134653737386265663338323831664139413134353232419000
-  => e002000015058000002c8000003c800000000000000000000001
-  <= 41040374fb34926a57e184cdd3438109021b3169a9c74ffe726d1abc7a187fa9440a11f071b96f72c8e9e0ea1f82dc2180166bd8c7bae9401cdd3d2466a40e1755ca28304536613732456439323243323338394466303365383666354537394261374336344535343933379000
-  => e002000015058000002c8000003c800000000000000000000000
-  <= 410478f6d00bc3be349f69a8b88b3957d569d7ed44d27d0824988107ba1a6117cfcefc22b03b9be870ddadb643eeda4357761d44419cfbdccb19701be086780ff71128304533463062623935313646303166324333346332354530393537353138623861433934313463359000
-  => e002000015058000002c8000003c800000010000000000000000
-  <= 4104c20d717f7652a279588b267457c051e387fbeb8648b730cd3daeaa8fa3774f37ab535ab9bd024b87776b77b3409546a0b64e1b14828ea43891b4200318fc90fd28363637463942453934613432343538636235334133413636353131446361313962333937373338649000
-  => e002000015058000002c8000003c800000020000000000000000
-  <= 4104e788111a6c0254ec8184453383d2d8b18c8e0b86d1fea93c2691a9bc6240572f24129a634155d1291228a1721fc88737f75e51bb7575ccc69937d649c1422ea028386639353530323931314338316135454332626134623831356564326432433565316338383932359000
-  => e002000015058000002c8000003c800000030000000000000000
-  <= 4104ffd79641446518c675ad32e6434a2aba9e7c426200bc336d78222cbec00d2c8aa7a8c685084f450870e2a801049795ba051f8b3a878a586158697d6bd4ce0b6d28386261343131303566464135343531306362394436376362334137323632344434303532634130389000
-  => e002000015058000002c8000003c800000040000000000000000
-  <= 4104602f7c0f3f73a914b3dd83e8bb6f11f3dc8ea1d2c7308fa4f8d9d2000a4419eec324393f4cf191e83f3adc64de9388f5979664c6d6dac4c23c0566d7aabbddfa28366233343933464531383145413238336530333335653544384437363865323132326243366331389000
-  => e002000015058000002c8000003c800000050000000000000000
-  <= 410484f94dfa2c52fee4f8b37b578b0087de88ee282cb788a56af1eabd7711ddd37e6da1c9eada59926b7828d7e12db21c443ed0a2ca4521561806d3175407a557c128323546456139343435344664334137413138443935383131463565346562353733633163434334329000
-  => e002000015058000002c8000003c800000060000000000000000
-  <= 4104e7c7f373d0a568554b5372b68f6e697aee3947c053ee5d882afba2f2c9a44273768b2e61b01de519b0c1f365e23aea5e3d041a40a347a125e202a2d7d7ef596828624636373337664138373538463134443838376531646633323442423431363136334533366436319000
-  `,
+    => e00200000d038000002c8000003c80000000
+    <= 410469877df9567b58e6ef8f6cf1fb8a8e1bf28a327dee31b183a6b9cd1f3da063af0924506a9912793ef31e41df19f8653fa31bb1fecc32d2e41abdddb22ccb621028373561453661383832363036353137343345356546433033373937313136413335363539663638359000
+    => e002000011048000002c8000003c8000000000000000
+    <= 4104b7577f404537d1e934a8d2a1fd2552a7f399928b5af0aad714acc17b36865b3f5d1843d6a580c737c051656ac35978283a388a759911d289e9994071247d167528356466304333363936343142384166336337653961653037364535343636654636373833313943649000
+    => e002000011048000002c8000003c8000000000000001
+    <= 4104bee21a16156c645d0150e262c40648b9fd938c6462efe3adf9051efe077d30b356c86b8bc8a182e58cdc514e6d0c2670f6626d34f78220187e2d279d661d23f628446336313732383838343733383239324134373236353042624133653936433261344638383739369000
+    => e002000011048000002c8000003c8000000000000002
+    <= 410467f77bf213f0de5fd7ae7ac2ca2b6f7ad6cacecbb8688acd0bcf0fcc5b7b58512fe786639619b9f4a513061dd0355590ec5b7d2c4d934c43a37778920bf07e1a28623262344230413836384543326530613162326533314131304142414130393365463032386544389000
+    => e002000011048000002c8000003c8000000000000003
+    <= 4104dcce479cd733a7972cea67f0b5bf92d786a1e62a9afe5e50ddd2f7f7c8c1aaff89e28b236f5f1e75c702c3c0116de49dde6b32f06f66937f0b190bdd730bd84e28613563334139333430364465323733666639386244443343653935314232653431423137436443469000
+    => e002000011048000002c8000003c8000000000000004
+    <= 4104b60582b8ea13540e5292396949f9d2ed23d9ec4344e2463e9fe7fa36c12372da03a0427c48d653dd59abfcbb7628b323076415f1fd53bc601b8071d82ddd635528393945363561463136626644393139303246623638394163373938343338633042464334373439359000
+    => e002000011048000002c8000003c8000000000000005
+    <= 4104126bf90b475158cb8c947dbe47d9ecdff88c34c96c7b7f4fc17a05257dff1024c089fd51f657fa7f5b1041d23bc67d46cd0dd4df86c5318f653486199313e18f28663736394533463933663831313733653836333365354461653646433031426262443163634230389000
+    => e002000011048000002c8000003c8000000000000006
+    <= 4104dc7934183510e92e07136e9192da7d5bbd4c3a757b4d9bdf8dcca9baabdf8efddfad24ef74e8a0db52d9e4171516665ff6e4cd152273f460627933df3ced177828463439386638653139323342653437633335343932376445334332313661633341453734666535619000
+    => e002000011048000002c8000003c8000000000000007
+    <= 4104b7664a7012f69cee691362377df6d8558b0acfe1541dbf95af90e919d6867ac9d46b3b0b42e98fe8543c15ae501fed3d85869fd0310d9804faed0d07ae3b871628353932393338336336626631624439666533383462423665363162394232413230416637434361429000
+    => e002000011048000002c8000003c8000000000000008
+    <= 41045cdb8bc99d890837444698a53d9c18d22c6159e0727e051fee54e7299318282d3fe882b4aa133e7e15529e90b824b4f83ea5242b3ad4651c7d9cca12c796e45428634339303838363541443934303634623733433739663235393861373966393843654544364446619000
+    => e002000011048000002c8000003c8000000000000009
+    <= 4104720ec99d2297e627e239764e519be6900d06fc3d9145e306daeace60944c3c6dc14e74f24d27fc98278c0c07de821bae71ed5c95e9a7b95538637e817763609128373731663039424535353143386346393734426141426336373365324232323132643637383236469000
+    => e002000011048000002c8000003c800000000000000a
+    <= 41043a98496a4115f61e264bd74ba1ea661729ccfa239e72318ecbd307fb747d2032be5e308e435b24417320a95b719d60b7740b0bf297f926b414b4d3b44d903a9f28384138383238373537353662333831336262613844644631376634304232363064423232466334379000
+    => e002000011048000002c8000003c800000000000000b
+    <= 41040f3a6497cdef24c68b895a0d8a9f8b54e16ee84e4905a24236a242a82a900e068cb72ad71f52b57dfa41e00090cd035d1a4205dbe3982ac88189c743edb856a828646431344537456135384533384343316134653737386265663338323831664139413134353232419000
+    => e002000015058000002c8000003c800000000000000000000001
+    <= 41040374fb34926a57e184cdd3438109021b3169a9c74ffe726d1abc7a187fa9440a11f071b96f72c8e9e0ea1f82dc2180166bd8c7bae9401cdd3d2466a40e1755ca28304536613732456439323243323338394466303365383666354537394261374336344535343933379000
+    => e002000015058000002c8000003c800000000000000000000000
+    <= 410478f6d00bc3be349f69a8b88b3957d569d7ed44d27d0824988107ba1a6117cfcefc22b03b9be870ddadb643eeda4357761d44419cfbdccb19701be086780ff71128304533463062623935313646303166324333346332354530393537353138623861433934313463359000
+    => e002000015058000002c8000003c800000010000000000000000
+    <= 4104c20d717f7652a279588b267457c051e387fbeb8648b730cd3daeaa8fa3774f37ab535ab9bd024b87776b77b3409546a0b64e1b14828ea43891b4200318fc90fd28363637463942453934613432343538636235334133413636353131446361313962333937373338649000
+    => e002000015058000002c8000003c800000020000000000000000
+    <= 4104e788111a6c0254ec8184453383d2d8b18c8e0b86d1fea93c2691a9bc6240572f24129a634155d1291228a1721fc88737f75e51bb7575ccc69937d649c1422ea028386639353530323931314338316135454332626134623831356564326432433565316338383932359000
+    => e002000015058000002c8000003c800000030000000000000000
+    <= 4104ffd79641446518c675ad32e6434a2aba9e7c426200bc336d78222cbec00d2c8aa7a8c685084f450870e2a801049795ba051f8b3a878a586158697d6bd4ce0b6d28386261343131303566464135343531306362394436376362334137323632344434303532634130389000
+    => e002000015058000002c8000003c800000040000000000000000
+    <= 4104602f7c0f3f73a914b3dd83e8bb6f11f3dc8ea1d2c7308fa4f8d9d2000a4419eec324393f4cf191e83f3adc64de9388f5979664c6d6dac4c23c0566d7aabbddfa28366233343933464531383145413238336530333335653544384437363865323132326243366331389000
+    => e002000015058000002c8000003c800000050000000000000000
+    <= 410484f94dfa2c52fee4f8b37b578b0087de88ee282cb788a56af1eabd7711ddd37e6da1c9eada59926b7828d7e12db21c443ed0a2ca4521561806d3175407a557c128323546456139343435344664334137413138443935383131463565346562353733633163434334329000
+    => e002000015058000002c8000003c800000060000000000000000
+    <= 4104e7c7f373d0a568554b5372b68f6e697aee3947c053ee5d882afba2f2c9a44273768b2e61b01de519b0c1f365e23aea5e3d041a40a347a125e202a2d7d7ef596828624636373337664138373538463134443838376531646633323442423431363136334533366436319000
+    `,
 };

package/src/families/ethereum/nft.integration.test.ts

@@ -5,7 +5,6 @@ import type { Account, AccountRaw } from "../../types";
 import { getAccountBridge } from "../../bridge";
 import { makeBridgeCacheSystem } from "../../bridge/cache";
 import { patchAccount } from "../../reconciliation";
-import { setEnv } from "../../env";
 
 jest.setTimeout(200000);
 
@@ -68,10 +67,9 @@ const gaspardBscAccount: AccountRaw = {
   xpub: "",
 };
 
-async function sync(account, withNFT = true) {
+async function sync(account) {
   const bridge = getAccountBridge(account);
   const blacklistedTokenIds = [];
-  setEnv("NFT", withNFT);
   const r = await bridge
     .sync(account, {
       paginationConfig: {},
@@ -79,7 +77,6 @@ async function sync(account, withNFT = true) {
     })
     .pipe(reduce((a, f: (arg0: Account) => Account) => f(a), account))
     .toPromise();
-  setEnv("NFT", false);
   return r;
 }
 
@@ -128,20 +125,6 @@ ethTestingAccounts.forEach((a) => {
       const resync = await sync(copy);
       expect(resync.nfts).toEqual(account.nfts);
     });
-
-    test("start account with .nfts and disable the NFT flag should make it disappear", async () => {
-      expect(account.nfts).not.toBeFalsy();
-      const resync = await sync(account, false);
-      expect(resync.nfts).toBeFalsy();
-    });
-
-    test("start account without .nfts and enable the NFT flag should make it appear", async () => {
-      const first = await sync(account, false);
-      expect(first.nfts).toBeFalsy();
-      const second = await sync(first, true);
-      expect(second.nfts).not.toBeFalsy();
-      expect(second.nfts).toEqual(account.nfts);
-    });
   });
 });
 

package/src/families/ethereum/synchronisation.ts

@@ -20,7 +20,6 @@ import { API, apiForCurrency, Tx } from "../../api/Ethereum";
 import { digestTokenAccounts, prepareTokenAccounts } from "./modules";
 import { findTokenByAddressInCurrency } from "@ledgerhq/cryptoassets";
 import { encodeNftId, isNFTActive, nftsFromOperations } from "../../nft";
-import { NFT_VERSION } from "./versions";
 
 export const getAccountShape: GetAccountShape = async (
   infoInput,
@@ -40,15 +39,12 @@ export const getAccountShape: GetAccountShape = async (
   const initialStableOperations = initialAccount
     ? stableOperations(initialAccount)
     : [];
-  const shouldNFTBeActive = isNFTActive(currency);
   // fetch transactions, incrementally if possible
   const mostRecentStableOperation = initialStableOperations[0];
   // when new tokens are added / blacklist changes, we need to sync again because we need to go through all operations again
   const syncHash =
     JSON.stringify(blacklistedTokenIds || []) +
     "_" +
-    shouldNFTBeActive +
-    "_" +
     listTokensForCryptoCurrency(currency, {
       withDelisted: true,
     }).length;
@@ -57,8 +53,7 @@ export const getAccountShape: GetAccountShape = async (
     initialAccount &&
     areAllOperationsLoaded(initialAccount) &&
     mostRecentStableOperation &&
-    !outdatedSyncHash &&
-    NFT_VERSION
+    !outdatedSyncHash
       ? mostRecentStableOperation.blockHash
       : undefined;
   const txsP = fetchAllTransactions(api, address, pullFromBlockHash);

package/src/families/solana/api/chain/index.ts

@@ -4,17 +4,16 @@ import {
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
 import {
-  Cluster,
-  clusterApiUrl,
   Connection,
   FeeCalculator,
   PublicKey,
+  sendAndConfirmRawTransaction,
   SignaturesForAddressOptions,
 } from "@solana/web3.js";
 import { Awaited } from "../../logic";
 
 export type Config = {
-  readonly cluster: Cluster;
+  readonly endpoint: string;
 };
 
 export type ChainAPI = Readonly<{
@@ -59,8 +58,7 @@ export type ChainAPI = Readonly<{
 }>;
 
 export function getChainAPI(config: Config): ChainAPI {
-  const connection = () =>
-    new Connection(clusterApiUrl(config.cluster), "finalized");
+  const connection = () => new Connection(config.endpoint, "finalized");
 
   return {
     getBalance: (address: string) =>
@@ -96,8 +94,11 @@ export function getChainAPI(config: Config): ChainAPI {
         .getParsedAccountInfo(new PublicKey(address))
         .then((r) => r.value),
 
-    sendRawTransaction: (buffer: Buffer) =>
-      connection().sendRawTransaction(buffer),
+    sendRawTransaction: (buffer: Buffer) => {
+      return sendAndConfirmRawTransaction(connection(), buffer, {
+        commitment: "confirmed",
+      });
+    },
 
     findAssocTokenAccAddress: (owner: string, mint: string) =>
       Token.getAssociatedTokenAddress(