@ledgerhq/live-common 21.17.1 → 21.19.0

package/lib/nft/helpers.js

@@ -25,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.getNftKey = exports.nftsByCollections = exports.nftsFromOperations = void 0;
+exports.isNftTransaction = exports.getNftKey = exports.nftsByCollections = exports.nftsFromOperations = void 0;
 var eip55_1 = __importDefault(require("eip55"));
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var nftsFromOperations = function (ops) {
@@ -82,4 +82,11 @@ var getNftKey = function (contract, tokenId) {
     return contract + "-" + tokenId;
 };
 exports.getNftKey = getNftKey;
+var isNftTransaction = function (transaction) {
+    if (transaction.family === "ethereum") {
+        return ["erc721.transfer", "erc1155.transfer"].includes(transaction.mode);
+    }
+    return false;
+};
+exports.isNftTransaction = isNftTransaction;
 //# sourceMappingURL=helpers.js.map

package/lib/nft/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/nft/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,8DAAqC;AAW9B,IAAM,kBAAkB,GAAG,UAAC,GAAgB;IACjD,IAAM,OAAO,GAAG,GAAG;QACjB,kGAAkG;SACjG,OAAO,CAAC,UAAC,EAAE,YAAK,OAAA,CAAC,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,0CAAE,MAAM,EAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA,EAAA,CAAC;SACpE,MAAM,CAAC,UAAC,GAAwB,EAAE,KAAgB;;QACjD,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAA,EAAE;YACpB,OAAO,GAAG,CAAC;SACZ;QAED,+CAA+C;QAC/C,IAAM,QAAQ,GAAG,kBAAK,CAAC,MAAM,CAAC,KAAK,CAAC,QAAS,CAAC,CAAC;QAC/C,IAAM,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC,OAAQ,CAAC;QACjC,IAAA,OAAO,GAAmB,KAAK,QAAxB,EAAE,QAAQ,GAAS,KAAK,SAAd,EAAE,EAAE,GAAK,KAAK,GAAV,CAAW;QAExC,IAAM,GAAG,GAAG,CAAC,MAAA,GAAG,CAAC,MAAM,CAAC,mCAAI;YAC1B,EAAE,IAAA;YACF,OAAO,EAAE,OAAQ;YACjB,MAAM,EAAE,IAAI,yBAAS,CAAC,CAAC,CAAC;YACxB,UAAU,EAAE;gBACV,QAAQ,UAAA;gBACR,QAAQ,EAAE,QAAS;aACpB;SACF,CAAQ,CAAC;QAEV,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3C;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YACnC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC5C;QAED,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;QAElB,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAET,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC,CAAC;AApCW,QAAA,kBAAkB,sBAoC7B;AAEK,IAAM,iBAAiB,GAAG,UAC/B,IAAgB,EAChB,iBAA0B;IAD1B,qBAAA,EAAA,SAAgB;IAGhB,IAAM,YAAY,GAAG,iBAAiB;QACpC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,QAAQ,KAAK,iBAAiB,EAA3C,CAA2C,CAAC;QACjE,CAAC,CAAC,IAAI,CAAC;IAET,IAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CACvC,UAAC,GAAqC,EAAE,GAAQ;QACtC,IAAA,UAAU,GAA8B,GAAG,WAAjC,EAAK,oBAAoB,UAAK,GAAG,EAA7C,cAAuC,CAAF,CAAS;QAEpD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC7B,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,yBAAQ,UAAU,KAAE,IAAI,EAAE,EAAE,GAAE,CAAC;SACxD;QACD,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEzD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAsC,CACvC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AACtC,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B;AAEK,IAAM,SAAS,GAAG,UAAC,QAAgB,EAAE,OAAe;IACzD,OAAU,QAAQ,SAAI,OAAS,CAAC;AAClC,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/nft/helpers.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live-common"
   },
-  "version": "21.17.1",
+  "version": "21.19.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "Apache-2.0",
@@ -44,13 +44,13 @@
   "dependencies": {
     "@crypto-com/chain-jslib": "0.0.19",
     "@ledgerhq/compressjs": "1.3.2",
-    "@ledgerhq/cryptoassets": "6.16.0",
+    "@ledgerhq/cryptoassets": "6.18.0",
     "@ledgerhq/devices": "6.11.2",
     "@ledgerhq/errors": "6.10.0",
     "@ledgerhq/hw-app-algorand": "6.11.2",
-    "@ledgerhq/hw-app-btc": "6.15.1",
+    "@ledgerhq/hw-app-btc": "6.17.1",
     "@ledgerhq/hw-app-cosmos": "6.11.2",
-    "@ledgerhq/hw-app-eth": "6.16.2",
+    "@ledgerhq/hw-app-eth": "6.18.0",
     "@ledgerhq/hw-app-polkadot": "6.11.2",
     "@ledgerhq/hw-app-str": "6.11.2",
     "@ledgerhq/hw-app-tezos": "6.11.2",
@@ -62,8 +62,8 @@
     "@ledgerhq/json-bignumber": "^1.1.0",
     "@ledgerhq/live-app-sdk": "^0.2.0",
     "@ledgerhq/logs": "6.10.0",
-    "@polkadot/types": "6.9.2",
-    "@polkadot/types-known": "6.9.2",
+    "@polkadot/types": "6.8.1",
+    "@polkadot/types-known": "6.8.1",
     "@taquito/ledger-signer": "^10.2.1",
     "@taquito/taquito": "10.2.1",
     "@types/bchaddrjs": "^0.4.0",

package/src/account/addAccounts.ts

@@ -74,7 +74,7 @@ export function groupAddAccounts(
     );
 
     if (existingAccount) {
-      if (!acc.used) {
+      if (!acc.used && !alreadyEmptyAccount) {
         alreadyEmptyAccount = existingAccount;
       }
 
@@ -122,7 +122,8 @@ export function groupAddAccounts(
           ? creatableAccounts.filter(
               (a) =>
                 context.preferredNewAccountSchemes &&
-                context.preferredNewAccountSchemes.includes(a.derivationMode)
+                // Note: we could use a simple preferredNewAccountScheme param
+                a.derivationMode === context.preferredNewAccountSchemes[0]
             )
           : creatableAccounts,
     });

package/src/bridge/jsHelpers.ts

@@ -147,8 +147,8 @@ export const mergeNfts = (
     delete newNftsPerId[nft.id];
   }
 
-  // Adding the rest of newNfts that was not already in oldNfts
-  return nfts.concat(Object.values(newNftsPerId));
+  // Prepending newNfts to respect nfts's newest to oldest order
+  return Object.values(newNftsPerId).concat(nfts);
 };
 
 export const makeSync =

package/src/currencies/__snapshots__/sortByMarketcap.test.ts.snap

@@ -1331,11 +1331,13 @@ Array [
   "near",
   "avalanche",
   "banano",
+  "celo",
   "dexon",
   "elrond",
   "fic",
   "flow",
   "LBRY",
+  "moonriver",
   "musicoin",
   "songbird",
   "reosc",

package/src/families/bitcoin/getAccountNetworkInfo.ts

@@ -20,6 +20,7 @@ export async function getAccountNetworkInfo(
 ): Promise<NetworkInfo> {
   const walletAccount = getWalletAccount(account);
   const rawFees = await walletAccount.xpub.explorer.getFees();
+  const relayFee = await walletAccount.xpub.explorer.getRelayFee();
   // Convoluted logic to convert from:
   // { "2": 2435, "3": 1241, "6": 1009, "last_updated": 1627973170 }
   // to:
@@ -44,7 +45,12 @@ export async function getAccountNetworkInfo(
   if (feesPerByte.length !== 3) {
     throw new Error("cardinality of feesPerByte should be exactly 3");
   }
-
+  // Fix fees if suggested fee is too low
+  if (feesPerByte[2].toNumber() < Math.ceil(relayFee * 100000)) {
+    feesPerByte[2] = new BigNumber(Math.ceil(relayFee * 100000)).plus(1);
+    feesPerByte[1] = feesPerByte[2].plus(1);
+    feesPerByte[0] = feesPerByte[1].plus(1);
+  }
   const feeItems = {
     items: feesPerByte.map((feePerByte, i) => ({
       key: String(i),
@@ -53,6 +59,7 @@ export async function getAccountNetworkInfo(
     })),
     defaultFeePerByte:
       feesPerByte[Math.floor(feesPerByte.length / 2)] || new BigNumber(0),
+    relayFee,
   };
   return {
     family: "bitcoin",

package/src/families/bitcoin/types.ts

@@ -106,6 +106,7 @@ export type FeeItem = {
 export type FeeItems = {
   items: FeeItem[];
   defaultFeePerByte: BigNumber;
+  relayFee?: number;
 };
 export type FeeItemRaw = {
   key: string;

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

@@ -168,6 +168,13 @@ class BitcoinLikeExplorer extends EventEmitter implements IExplorer {
     return fees;
   }
 
+  async getRelayFee() {
+    const client = await this.client.acquire();
+    const fees = (await client.client.get(`/network`)).data;
+    await this.client.release(client);
+    return parseFloat(fees["relay_fee"]);
+  }
+
   async getPendings(address: Address, nbMax?: number) {
     const params: {
       no_token?: string;

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

@@ -9,6 +9,7 @@ export interface IExplorer {
   getTxHex(txId: string): Promise<string>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getFees(): Promise<any>;
+  getRelayFee(): Promise<number>;
   getCurrentBlock(): Promise<Block | null>;
   getBlockByHeight(height: number): Promise<Block | null>;
   getPendings(address: Address, nbMax?: number): Promise<TX[]>;

package/src/families/ethereum/cli-transaction.ts

@@ -23,6 +23,16 @@ const options = [
     desc: "use an token account children of the account",
     multiple: true,
   },
+  {
+    name: "collection",
+    type: String,
+    desc: "determine the collection of an NFT (related to the --tokenId)",
+  },
+  {
+    name: "tokenId",
+    type: String,
+    desc: "determine the tokenId of an NFT (related to the --colection)",
+  },
   {
     name: "gasPrice",
     type: String,

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

@@ -0,0 +1,142 @@
+import eip55 from "eip55";
+import abi from "ethereumjs-abi";
+import invariant from "invariant";
+import BigNumber from "bignumber.js";
+import {
+  createCustomErrorClass,
+  NotEnoughBalanceInParentAccount,
+} from "@ledgerhq/errors";
+import { validateRecipient } from "../transaction";
+import type { ModeModule, Transaction } from "../types";
+import type { Account } from "../../../types";
+
+const notOwnedNft = createCustomErrorClass("NotOwnedNft");
+const notEnoughNftOwned = createCustomErrorClass("NotEnoughNftOwned");
+const notTokenIdsProvided = createCustomErrorClass("NotTokenIdsProvided");
+
+export type Modes = "erc1155.transfer";
+
+const erc1155Transfer: ModeModule = {
+  /**
+   * Tx data is filled during the buildEthereumTx
+   */
+  fillTransactionData(a, t, tx) {
+    const data = serializeTransactionData(a, t);
+    invariant(data, "serializeTransactionData provided no data");
+    tx.data = "0x" + (data as Buffer).toString("hex");
+    tx.to = t.collection;
+    tx.value = "0x00";
+  },
+
+  /**
+   * Tx status is filled after the buildEthereumTx
+   */
+  fillTransactionStatus: (a, t, result) => {
+    validateRecipient(a.currency, t.recipient, result);
+
+    if (!result.errors.recipient) {
+      result.totalSpent = result.estimatedFees;
+      result.amount = new BigNumber(t.amount);
+
+      if (result.estimatedFees.gt(a.spendableBalance)) {
+        result.errors.amount = new NotEnoughBalanceInParentAccount();
+      }
+
+      const enoughTokensOwned: true | Error =
+        t.tokenIds?.reduce((acc, tokenId, index) => {
+          if (acc instanceof Error) {
+            return acc;
+          }
+
+          const nft = a.nfts?.find((n) => n.tokenId === tokenId);
+          const transferQuantity = Number(t.quantities?.[index]);
+
+          if (!nft) {
+            return new notOwnedNft();
+          }
+
+          if (transferQuantity && !nft.amount.gte(transferQuantity)) {
+            return new notEnoughNftOwned();
+          }
+
+          return true;
+        }, true as true | Error) || new notTokenIdsProvided();
+
+      if (!enoughTokensOwned || enoughTokensOwned instanceof Error) {
+        result.errors.amount = enoughTokensOwned;
+      }
+    }
+  },
+
+  /**
+   * This will only be used by LLM & LLD, not the HW.
+   */
+  fillDeviceTransactionConfig(input, fields) {
+    fields.push({
+      type: "text",
+      label: "Type",
+      value: `ERC721.transfer`,
+    });
+
+    fields.push({
+      type: "text",
+      label: "Collection",
+      value: input.transaction.collection ?? "",
+    });
+
+    fields.push({
+      type: "text",
+      label: "Token IDs",
+      value: input.transaction.tokenIds?.join(",") ?? "",
+    });
+
+    fields.push({
+      type: "text",
+      label: "Quantities",
+      value: input.transaction.quantities?.join(",") ?? "",
+    });
+  },
+
+  /**
+   * Optimistic Operation is filled post signing
+   */
+  fillOptimisticOperation(a, t, op) {
+    op.type = "FEES";
+    op.extra = {
+      ...op.extra,
+      approving: true, // workaround to track the status ENABLING
+    };
+  },
+};
+
+function serializeTransactionData(
+  account: Account,
+  transaction: Transaction
+): Buffer | null | undefined {
+  const from = eip55.encode(account.freshAddress);
+  const to = eip55.encode(transaction.recipient);
+  const tokenIds = transaction.tokenIds || [];
+  const quantities = transaction.quantities?.map((q) => q.toFixed()) || [];
+
+  return tokenIds?.length > 1
+    ? abi.simpleEncode(
+        "safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)",
+        from,
+        to,
+        tokenIds,
+        quantities,
+        "0x00"
+      )
+    : abi.simpleEncode(
+        "safeTransferFrom(address,address,uint256,uint256,bytes)",
+        from,
+        to,
+        tokenIds[0],
+        quantities[0],
+        "0x00"
+      );
+}
+
+export const modes: Record<Modes, ModeModule> = {
+  "erc1155.transfer": erc1155Transfer,
+};

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

@@ -0,0 +1,108 @@
+import eip55 from "eip55";
+import abi from "ethereumjs-abi";
+import invariant from "invariant";
+import BigNumber from "bignumber.js";
+import {
+  createCustomErrorClass,
+  NotEnoughBalanceInParentAccount,
+} from "@ledgerhq/errors";
+import { validateRecipient } from "../transaction";
+import type { ModeModule, Transaction } from "../types";
+import type { Account } from "../../../types";
+
+const notOwnedNft = createCustomErrorClass("NotOwnedNft");
+
+export type Modes = "erc721.transfer";
+
+const erc721Transfer: ModeModule = {
+  /**
+   * Tx data is filled during the buildEthereumTx
+   */
+  fillTransactionData(a, t, tx) {
+    const data = serializeTransactionData(a, t);
+    invariant(data, "serializeTransactionData provided no data");
+    tx.data = "0x" + (data as Buffer).toString("hex");
+    tx.to = t.collection;
+    tx.value = "0x00";
+  },
+
+  /**
+   * Tx status is filled after the buildEthereumTx
+   */
+  fillTransactionStatus: (a, t, result) => {
+    validateRecipient(a.currency, t.recipient, result);
+
+    if (!result.errors.recipient) {
+      result.totalSpent = result.estimatedFees;
+      result.amount = new BigNumber(t.amount);
+
+      if (result.estimatedFees.gt(a.spendableBalance)) {
+        result.errors.amount = new NotEnoughBalanceInParentAccount();
+      }
+
+      if (
+        !a.nfts?.find?.(
+          (n) =>
+            n.tokenId === t.tokenIds?.[0] &&
+            n.collection.contract === t.collection
+        )
+      ) {
+        result.errors.amount = new notOwnedNft();
+      }
+    }
+  },
+
+  /**
+   * This will only be used by LLM & LLD, not the HW.
+   */
+  fillDeviceTransactionConfig(input, fields) {
+    fields.push({
+      type: "text",
+      label: "Type",
+      value: `ERC721.transfer`,
+    });
+
+    fields.push({
+      type: "text",
+      label: "Collection",
+      value: input.transaction.collection ?? "",
+    });
+
+    fields.push({
+      type: "text",
+      label: "Token ID",
+      value: input.transaction.tokenIds?.[0] ?? "",
+    });
+  },
+
+  /**
+   * Optimistic Operation is filled post signing
+   */
+  fillOptimisticOperation(a, t, op) {
+    op.type = "FEES";
+    op.extra = {
+      ...op.extra,
+      approving: true, // workaround to track the status ENABLING
+    };
+  },
+};
+
+function serializeTransactionData(
+  account: Account,
+  transaction: Transaction
+): Buffer | null | undefined {
+  const from = eip55.encode(account.freshAddress);
+  const to = eip55.encode(transaction.recipient);
+
+  return abi.simpleEncode(
+    "safeTransferFrom(address,address,uint256,bytes)",
+    from,
+    to,
+    transaction.tokenIds?.[0],
+    "0x00"
+  );
+}
+
+export const modes: Record<Modes, ModeModule> = {
+  "erc721.transfer": erc721Transfer,
+};

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

@@ -13,15 +13,26 @@ import type { DeviceTransactionField } from "../../../transaction";
 import * as compound from "./compound";
 import * as erc20 from "./erc20";
 import * as send from "./send";
+import * as erc721 from "./erc721";
+import * as erc1155 from "./erc1155";
 import type { Modes as CompoundModes } from "./compound";
 import type { Modes as ERC20Modes } from "./erc20";
 import type { Modes as SendModes } from "./send";
+import type { Modes as ERC721Modes } from "./erc721";
+import type { Modes as ERC1155Modes } from "./erc1155";
 const modules = {
   erc20,
   compound,
   send,
+  erc721,
+  erc1155,
 };
-export type TransactionMode = CompoundModes | ERC20Modes | SendModes;
+export type TransactionMode =
+  | CompoundModes
+  | ERC20Modes
+  | SendModes
+  | ERC721Modes
+  | ERC1155Modes;
 
 /**
  * A ModeModule enable a new transaction mode in Ethereum family

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

@@ -0,0 +1,90 @@
+import "../../__tests__/test-helpers/setup";
+import { reduce } from "rxjs/operators";
+import { fromAccountRaw, toAccountRaw } from "../../account";
+import type { Account, AccountRaw } from "../../types";
+import { getAccountBridge } from "../../bridge";
+import { makeBridgeCacheSystem } from "../../bridge/cache";
+import { patchAccount } from "../../reconciliation";
+import { setEnv } from "../../env";
+
+const gaspardAccount: AccountRaw = {
+  id: "js:1:ethereum:0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a:",
+  seedIdentifier: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+  name: "G4sp4rd",
+  derivationMode: "",
+  index: 0,
+  freshAddress: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+  freshAddressPath: "44'/60'/0'/0/0",
+  freshAddresses: [],
+  pendingOperations: [],
+  operations: [],
+  currencyId: "ethereum",
+  unitMagnitude: 18,
+  balance: "",
+  blockHeight: 0,
+  lastSyncDate: "",
+  xpub: "",
+};
+
+describe("nft reconciliation", () => {
+  let account = fromAccountRaw(gaspardAccount);
+  const localCache = {};
+  const cache = makeBridgeCacheSystem({
+    saveData(c, d) {
+      localCache[c.id] = d;
+      return Promise.resolve();
+    },
+    getData(c) {
+      return Promise.resolve(localCache[c.id]);
+    },
+  });
+  const bridge = getAccountBridge(account);
+  async function sync(account) {
+    const blacklistedTokenIds = [];
+    setEnv("NFT", true);
+    const r = await bridge
+      .sync(account, {
+        paginationConfig: {},
+        blacklistedTokenIds,
+      })
+      .pipe(reduce((a, f: (arg0: Account) => Account) => f(a), account))
+      .toPromise();
+    setEnv("NFT", false);
+    return r;
+  }
+
+  test("first sync & have nfts", async () => {
+    await cache.prepareCurrency(account.currency);
+    account = await sync(account);
+    expect(account.nfts?.length || 0).not.toBe(0);
+  });
+
+  test("remove half NFTs will restore them with operations still here", async () => {
+    const copy = {
+      ...account,
+      nfts: account.nfts?.slice(Math.ceil((account.nfts?.length || 0) / 2)),
+    };
+    const resync = await sync(copy);
+    expect(resync.nfts).toEqual(account.nfts);
+  });
+
+  test("remove half NFTs will restore them with missing operations too", async () => {
+    const copy = {
+      ...account,
+      operations: [],
+      nfts: account.nfts?.slice(Math.ceil((account.nfts?.length || 0) / 2)),
+    };
+    const resync = await sync(copy);
+    expect(resync.nfts).toEqual(account.nfts);
+  });
+
+  test("patchAccount restore new NFTs correctly", async () => {
+    const copy = {
+      ...account,
+      operations: [],
+      nfts: account.nfts?.slice(Math.ceil((account.nfts?.length || 0) / 2)),
+    };
+    const newAccount = patchAccount(copy, toAccountRaw(account));
+    expect(newAccount.nfts).toEqual(account.nfts);
+  });
+});

package/src/families/ethereum/signOperation.ts

@@ -99,19 +99,7 @@ export const signOperation = ({
                 type: "device-signature-granted",
               });
               // Second, we re-set some tx fields from the device signature
-              let v = result.v;
-
-              if (chainId > 0) {
-                // EIP155 support. check/recalc signature v value.
-                const rv = parseInt(v, 16);
-                let cv = chainId * 2 + 35;
-
-                if (rv !== cv && (rv & cv) !== rv) {
-                  cv += 1; // add signature v bit.
-                }
-
-                v = cv.toString(16);
-              }
+              const v = result.v;
 
               tx.v = Buffer.from(v, "hex");
               tx.r = Buffer.from(result.r, "hex");

package/src/families/ethereum/synchronisation.test.ts

@@ -6,6 +6,7 @@ import type { Account, SubAccount } from "../../types";
 import { getAccountBridge } from "../../bridge";
 import { makeBridgeCacheSystem } from "../../bridge/cache";
 import { ethereum1 } from "./test-dataset";
+
 describe("blacklistedTokenIds functionality", () => {
   const account = fromAccountRaw(ethereum1);
   const localCache = {};

package/src/families/ethereum/transaction.ts

@@ -86,15 +86,38 @@ export const formatTransaction = (
     (t.subAccountId &&
       (mainAccount.subAccounts || []).find((a) => a.id === t.subAccountId)) ||
     mainAccount;
+
+  const header = (() => {
+    switch (t.mode) {
+      case "erc721.transfer":
+        return `${t.mode.toUpperCase()} Collection: ${t.collection} TokenId: ${
+          t.tokenIds?.[0]
+        }`;
+      case "erc1155.transfer":
+        return (
+          `${t.mode.toUpperCase()} Collection: ${t.collection}` +
+          t.tokenIds
+            ?.map((tokenId, index) => {
+              return `\n  - TokenId: ${tokenId} Quantity: ${
+                t.quantities?.[index]?.toFixed() ?? 0
+              }`;
+            })
+            .join(",")
+        );
+      default:
+        return `${t.mode.toUpperCase()} ${
+          t.useAllAmount
+            ? "MAX"
+            : formatCurrencyUnit(getAccountUnit(account), t.amount, {
+                showCode: true,
+                disableRounding: true,
+              })
+        }`;
+    }
+  })();
+
   return `
-${t.mode.toUpperCase()} ${
-    t.useAllAmount
-      ? "MAX"
-      : formatCurrencyUnit(getAccountUnit(account), t.amount, {
-          showCode: true,
-          disableRounding: true,
-        })
-  }
+${header}
 TO ${t.recipient}
 with gasPrice=${formatCurrencyUnit(
     mainAccount.currency.units[1] || mainAccount.currency.units[0],
@@ -102,6 +125,7 @@ with gasPrice=${formatCurrencyUnit(
   )}
 with gasLimit=${gasLimit.toString()}`;
 };
+
 const defaultGasLimit = new BigNumber(0x5208);
 export const getGasLimit = (t: Transaction): BigNumber =>
   t.userGasLimit || t.estimatedGasLimit || defaultGasLimit;
@@ -127,6 +151,9 @@ export const fromTransactionRaw = (tr: TransactionRaw): Transaction => {
     },
     allowZeroAmount: tr.allowZeroAmount,
     feesStrategy: tr.feesStrategy,
+    tokenIds: tr.tokenIds,
+    collection: tr.collection,
+    quantities: tr.quantities?.map((q) => new BigNumber(q)),
   };
 };
 export const toTransactionRaw = (t: Transaction): TransactionRaw => {
@@ -151,6 +178,9 @@ export const toTransactionRaw = (t: Transaction): TransactionRaw => {
     },
     allowZeroAmount: t.allowZeroAmount,
     feesStrategy: t.feesStrategy,
+    tokenIds: t.tokenIds,
+    collection: t.collection,
+    quantities: t.quantities?.map((q) => q.toString()),
   };
 };