@ledgerhq/live-common 21.26.2 → 21.29.0

package/src/__tests__/currencies.ts

@@ -66,7 +66,7 @@ test("sort by marketcap", () => {
     "ethereum",
     "ethereum/erc20/0x_project",
     "ethereum/erc20/holotoken",
-    "ethereum/erc20/xstable.protocol",
+    "ethereum/erc20/xstable_protocol",
     "ethereum/erc20/hydro_protocol",
     "ethereum/erc20/xensor",
     "polygon/erc20/holotoken",

package/src/__tests__/families/bitcoin/wallet-btc/xpub.synced.unit.test.ts

@@ -7,21 +7,21 @@ import { zipObject } from "lodash";
 import { DerivationModes } from "../../../../families/bitcoin/wallet-btc/types";
 import BitcoinLikeStorage from "../../../../families/bitcoin/wallet-btc/storage";
 import BitcoinLikeExplorer from "../../../../families/bitcoin/wallet-btc/explorer";
-import Crypto from "../../../../families/bitcoin/wallet-btc/crypto/bitcoin";
+import Crypto from "../../../../families/bitcoin/wallet-btc/crypto/bitcoincash";
 import Xpub from "../../../../families/bitcoin/wallet-btc/xpub";
 
 describe("synced xpub utilites functions", () => {
   const explorer = new BitcoinLikeExplorer({
-    explorerURI: "https://explorers.api.vault.ledger.com/blockchain/v3/btc",
+    explorerURI: "https://explorers.api.vault.ledger.com/blockchain/v3/bch",
     explorerVersion: "v3",
   });
   const crypto = new Crypto({
-    network: coininfo.bitcoin.main.toBitcoinJS(),
+    network: coininfo.bitcoincash.main.toBitcoinJS(),
   });
 
-  describe("xpub xpub6CUGRUonZSQ4TWtTMmzXdrXDtypWKiKrhko4egpiMZbpiaQL2jkwSB1icqYh2cfDfVxdx4df189oLKnC5fSwqPfgyP3hooxujYzAu3fDVmz Legacy", () => {
+  describe("xpub xpub6BvNdfGcyMB9Usq88ibXUt3KhbaEJVLFMbhTSNNfTm8Qf1sX9inTv3xL6pA6KofW4WF9GpdxwGDoYRwRDjHEir3Av23m2wHb7AqhxJ9ohE8 Legacy", () => {
     const xpubraw =
-      "xpub6CUGRUonZSQ4TWtTMmzXdrXDtypWKiKrhko4egpiMZbpiaQL2jkwSB1icqYh2cfDfVxdx4df189oLKnC5fSwqPfgyP3hooxujYzAu3fDVmz";
+      "xpub6BvNdfGcyMB9Usq88ibXUt3KhbaEJVLFMbhTSNNfTm8Qf1sX9inTv3xL6pA6KofW4WF9GpdxwGDoYRwRDjHEir3Av23m2wHb7AqhxJ9ohE8";
     // const truthDump = path.join(__dirname, 'data', 'sync', `${xpubraw}.json`);
     const storage = new BitcoinLikeStorage();
     const xpub = new Xpub({
@@ -34,16 +34,16 @@ describe("synced xpub utilites functions", () => {
 
     beforeAll(async () => {
       await xpub.sync();
-    }, 30000);
+    }, 120000);
 
     it("should compute accounts/addresses/balances correctly", async () => {
       const addresses = await xpub.getXpubAddresses();
-      expect(addresses.length).toEqual(15);
+      expect(addresses.length).toEqual(16);
 
-      expect((await xpub.getAccountAddresses(0)).length).toEqual(15);
+      expect((await xpub.getAccountAddresses(0)).length).toEqual(7);
 
-      expect((await xpub.getXpubBalance()).toNumber()).toEqual(12688908);
-      expect((await xpub.getAccountBalance(0)).toNumber()).toEqual(12688908);
+      expect((await xpub.getXpubBalance()).toNumber()).toEqual(360615);
+      expect((await xpub.getAccountBalance(0)).toNumber()).toEqual(10000);
       const addressesBalances = await Promise.all(
         addresses.map((address) => xpub.getAddressBalance(address))
       );
@@ -53,21 +53,22 @@ describe("synced xpub utilites functions", () => {
           addressesBalances.map((balance) => balance.toNumber())
         )
       ).toEqual({
-        "12iNxzdF6KFZ14UyRTYCRuptxkKSSVHzqF": 0,
-        "15NvG6YpVh2aUc3DroVttEcWa1Z99qhACP": 1000,
-        "15xANZb5vJv5RGL263NFuh8UGgHT7noXeZ": 100000,
-        "1687EJf5YEmeEtcscnuJPiV5b8HkM1o98q": 40160,
-        "16HH35ASv5rL8ZaaqdzvrJKTAKTucdKKNP": 656,
-        "16ZBYSHkLkRFHAuZvyzosXYgU1UDJxRV1R": 100000,
-        "1Ahipz531XtbzGC1bEKbhHZXmyfWKPNy32": 1000,
-        "1CcEugXu9Yf9Qw5cpB8gHUK4X9683WyghM": 8747,
-        "1EHeVKfjjq6FJpix86G2yzFeRbZ6RNg2Zm": 100000,
-        "1EfgV2Hr5CDjXPavHDpDMjmU33BA2veHy6": 10665,
-        "1HqsYkwczwvkMXCobk5WPZmhj2S2TK613Z": 40161,
-        "1KhVznhEQHumfmMQWnkgXLT4BmvtNpwLN9": 12183719,
-        "1LDPJCMZhYZjTvTGYahdhMXLuMfjfi6Kua": 1000,
-        "1MS6eGqD4iUGyJPbEsjqmoNaRhApgtmF8J": 1800,
-        "1PJMBXKBYEBMRDmpAoBRbDff26gHJrawSp": 100000,
+        "bitcoincash:qp2ujnlxjmkwtc299zwat3vt7j0jgltwls3q5avzsj": 0,
+        "bitcoincash:qp62d8j6ng0jhenc97dnnyn6qev24vykev5pea7jd3": 0,
+        "bitcoincash:qp64rlh8jf82kxsvh2rhjr8wnltt3vu5ccna7zygun": 0,
+        "bitcoincash:qpguw9mwet4aamye4texdrvje5wj7twhss5agzwzwa": 0,
+        "bitcoincash:qpvezzthl2075alur9y53tqsqcm3z8t4rgq6vcalun": 0,
+        "bitcoincash:qq3ch5aymjxvlt2q646gxtnrqeq45h269yt7l2yl0k": 350615,
+        "bitcoincash:qq6u57s2nc5zuywmwrw9tnkjvvw5rzs40vk6q5jjaz": 10000,
+        "bitcoincash:qqk8v7daqpl2fe4qezw5uzhueqxrj9eahvnhz2v39e": 0,
+        "bitcoincash:qqu0nek90hahl0sezqz8cf8yc7hmqvgseykqyp3awm": 0,
+        "bitcoincash:qqufmrqunkr3avkswhn378fjhwl3ueawag9e3htc49": 0,
+        "bitcoincash:qrkmvwx8y4lprh8xzz0fhnrmqpqvpssqnqle8lds8k": 0,
+        "bitcoincash:qzadqth7znrc7e5s5p40kadpu4lj9lkahvja522rh2": 0,
+        "bitcoincash:qzgah58nthe50jau20y67s4zq9u0xqvxeyqrv2aewk": 0,
+        "bitcoincash:qzj2q6yrxmxedffsz2rvpy067pcdvwhy9gcyhsne48": 0,
+        "bitcoincash:qzjgtadhd6j96a9mvlt5cj2ewgljyjzrlq4nplva5l": 0,
+        "bitcoincash:qzmwszdjh6h9crvk65zlravhal50rnwtfu6pacsdsn": 0,
       });
     });
   });

package/src/__tests__/families/bitcoin/wallet-btc/xpub.syncing.integration.test.ts

@@ -62,6 +62,7 @@ describe("xpub integration sync", () => {
       coin: "dgb",
       explorerVersion: "v3",
     },
+    /*
     {
       xpub: "xpub6CUGRUonZSQ4TWtTMmzXdrXDtypWKiKrhko4egpiMZbpiaQL2jkwSB1icqYh2cfDfVxdx4df189oLKnC5fSwqPfgyP3hooxujYzAu3fDVmz", // 3000ms
       derivationMode: DerivationModes.LEGACY,
@@ -71,6 +72,7 @@ describe("xpub integration sync", () => {
       coin: "btc",
       explorerVersion: "v3",
     },
+    */
     {
       xpub: "xpub6D4waFVPfPCpRvPkQd9A6n65z3hTp6TvkjnBHG5j2MCKytMuadKgfTUHqwRH77GQqCKTTsUXSZzGYxMGpWpJBdYAYVH75x7yMnwJvra1BUJ", // 5400ms
       derivationMode: DerivationModes.LEGACY,

package/src/apps/support.ts

@@ -31,6 +31,7 @@ const appVersionsRequired = {
   Algorand: ">= 1.2.9",
   Polkadot: ">= 9.9140.0",
   Elrond: ">= 1.0.11",
+  Ethereum: ">= 1.9.17",
 };
 export function mustUpgrade(
   deviceModel: DeviceModelId,

package/src/bridge/jsHelpers.ts

@@ -100,7 +100,7 @@ Operation[] {
   // return existins when there is no real new operations
   if (newOps.length === 0) return existing;
   // edge case, existing can be empty. return the sorted list.
-  if (existing.length === 0) return newOps;
+  if (existing.length === 0) return Object.values(newOpsIds);
   // building up merging the ops
   const all: Operation[] = [];
 

package/src/data/icons/react/index.tsx

@@ -383,6 +383,7 @@ export { default as trig } from "./trig";
 export { default as trtl } from "./trtl";
 export { default as trx } from "./trx";
 export { default as tusd } from "./tusd";
+export { default as tyc } from "./tyc";
 export { default as tzc } from "./tzc";
 export { default as ubq } from "./ubq";
 export { default as uma } from "./uma";

package/src/data/icons/react/sol.tsx

@@ -6,7 +6,7 @@ interface Props {
           };
 
 function sol({size, color = "currentColor"}: Props) {
-  return <svg width={size} height={size} viewBox="0 0 24 24"><path d="M2.41,7.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,7.1A.4.4,0,0,0,2.41,7.77Z" /><path d="M2.41,20.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,20.1A.4.4,0,0,0,2.41,20.77Z" /><path d="M21.59,14.27H5.91a.51.51,0,0,1-.37-.16L2.11,10.44a.4.4,0,0,1,.3-.67H18.09a.51.51,0,0,1,.37.16l3.43,3.67A.4.4,0,0,1,21.59,14.27Z" /></svg>;
+  return <svg width={size} height={size} viewBox="0 0 24 24"><path fill={color} d="M2.41,7.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,7.1A.4.4,0,0,0,2.41,7.77Z" /><path fill={color} d="M2.41,20.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,20.1A.4.4,0,0,0,2.41,20.77Z" /><path fill={color} d="M21.59,14.27H5.91a.51.51,0,0,1-.37-.16L2.11,10.44a.4.4,0,0,1,.3-.67H18.09a.51.51,0,0,1,.37.16l3.43,3.67A.4.4,0,0,1,21.59,14.27Z" /></svg>;
 }
 
 export default sol;

package/src/data/icons/react/tyc.tsx

@@ -0,0 +1,12 @@
+
+      import * as React from "react";
+interface Props {
+            size: number;
+            color?: string;
+          };
+
+function tyc({size, color = "currentColor"}: Props) {
+  return <svg width={size} height={size} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12 12.1L15.7 10.7L15.9 10.6L16.7 9.1L13.9 10.2L12 11L8.7 9.7L7.3 9.1L8.1 10.6L8.2 10.7L12 12.1Z" fill={color} /><path d="M12 9.2L6.1 6.9L6.9 8.3L12 10.3L17.1 8.3L17.9 6.9L12 9.2Z" fill={color} /><path d="M12.3 17.1L13.1 16.8L13.9 12L12.3 12.7V17.1Z" fill={color} /><path d="M10.9 16.8L11.7 17.1V12.7L10.1 12L10.9 16.8Z" fill={color} /></svg>;
+}
+
+export default tyc;

package/src/data/icons/reactNative/index.tsx

@@ -383,6 +383,7 @@ export { default as trig } from "./trig";
 export { default as trtl } from "./trtl";
 export { default as trx } from "./trx";
 export { default as tusd } from "./tusd";
+export { default as tyc } from "./tyc";
 export { default as tzc } from "./tzc";
 export { default as ubq } from "./ubq";
 export { default as uma } from "./uma";

package/src/data/icons/reactNative/sol.tsx

@@ -7,7 +7,7 @@ interface Props {
             };
 
 function sol({ size, color }: Props) {
-  return <Svg width={size} height={size} viewBox="0 0 24 24"><Path d="M2.41,7.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,7.1A.4.4,0,0,0,2.41,7.77Z" /><Path d="M2.41,20.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,20.1A.4.4,0,0,0,2.41,20.77Z" /><Path d="M21.59,14.27H5.91a.51.51,0,0,1-.37-.16L2.11,10.44a.4.4,0,0,1,.3-.67H18.09a.51.51,0,0,1,.37.16l3.43,3.67A.4.4,0,0,1,21.59,14.27Z" /></Svg>;
+  return <Svg width={size} height={size} viewBox="0 0 24 24"><Path fill={color} d="M2.41,7.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,7.1A.4.4,0,0,0,2.41,7.77Z" /><Path fill={color} d="M2.41,20.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,20.1A.4.4,0,0,0,2.41,20.77Z" /><Path fill={color} d="M21.59,14.27H5.91a.51.51,0,0,1-.37-.16L2.11,10.44a.4.4,0,0,1,.3-.67H18.09a.51.51,0,0,1,.37.16l3.43,3.67A.4.4,0,0,1,21.59,14.27Z" /></Svg>;
 }
 
 export default sol;

package/src/data/icons/reactNative/tyc.tsx

@@ -0,0 +1,13 @@
+
+      import * as React from "react";
+import Svg, { Path } from "react-native-svg";
+interface Props {
+              size: number;
+              color: string;
+            };
+
+function tyc({ size, color }: Props) {
+  return <Svg width={size} height={size} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><Path d="M12 12.1L15.7 10.7L15.9 10.6L16.7 9.1L13.9 10.2L12 11L8.7 9.7L7.3 9.1L8.1 10.6L8.2 10.7L12 12.1Z" fill={color} /><Path d="M12 9.2L6.1 6.9L6.9 8.3L12 10.3L17.1 8.3L17.9 6.9L12 9.2Z" fill={color} /><Path d="M12.3 17.1L13.1 16.8L13.9 12L12.3 12.7V17.1Z" fill={color} /><Path d="M10.9 16.8L11.7 17.1V12.7L10.1 12L10.9 16.8Z" fill={color} /></Svg>;
+}
+
+export default tyc;

package/src/data/icons/svg/SOL.svg

@@ -1 +1,8 @@
-<svg width="24" height="24" viewBox="0 0 24 24"><path d="M2.41,7.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,7.1A.4.4,0,0,0,2.41,7.77Z"/><path d="M2.41,20.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,20.1A.4.4,0,0,0,2.41,20.77Z"/><path d="M21.59,14.27H5.91a.51.51,0,0,1-.37-.16L2.11,10.44a.4.4,0,0,1,.3-.67H18.09a.51.51,0,0,1,.37.16l3.43,3.67A.4.4,0,0,1,21.59,14.27Z"/></svg>
+<svg width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#000000"
+    d="M2.41,7.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,7.1A.4.4,0,0,0,2.41,7.77Z" />
+  <path fill="#000000"
+    d="M2.41,20.77H18.09a.51.51,0,0,0,.37-.16l3.43-3.67a.4.4,0,0,0-.3-.67H5.91a.51.51,0,0,0-.37.16L2.11,20.1A.4.4,0,0,0,2.41,20.77Z" />
+  <path fill="#000000"
+    d="M21.59,14.27H5.91a.51.51,0,0,1-.37-.16L2.11,10.44a.4.4,0,0,1,.3-.67H18.09a.51.51,0,0,1,.37.16l3.43,3.67A.4.4,0,0,1,21.59,14.27Z" />
+</svg>

package/src/data/icons/svg/TYC.svg

@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 12.1L15.7 10.7L15.9 10.6L16.7 9.1L13.9 10.2L12 11L8.7 9.7L7.3 9.1L8.1 10.6L8.2 10.7L12 12.1Z" fill="#005B9F"/>
+<path d="M12 9.2L6.1 6.9L6.9 8.3L12 10.3L17.1 8.3L17.9 6.9L12 9.2Z" fill="#005B9F"/>
+<path d="M12.3 17.1L13.1 16.8L13.9 12L12.3 12.7V17.1Z" fill="#005B9F"/>
+<path d="M10.9 16.8L11.7 17.1V12.7L10.1 12L10.9 16.8Z" fill="#005B9F"/>
+</svg>

package/src/env.ts

@@ -371,10 +371,14 @@ const envDefinitions = {
     parser: stringParser,
     desc: "mock the server response for the exchange KYC check, options are 'open', 'pending', 'closed' or 'approved'.",
   },
-  NFT: {
+  /**
+   * Note: the mocked cryptoassets config and test partner are signed with the
+   * Ledger test private key
+   */
+  MOCK_EXCHANGE_TEST_CONFIG: {
     def: false,
     parser: boolParser,
-    desc: "synchronizing nfts",
+    desc: "mock the cryptoassets config and test partner (in the context of app-exchange)",
   },
   NFT_CURRENCIES: {
     def: "ethereum",
@@ -531,6 +535,11 @@ const envDefinitions = {
     parser: intParser,
     desc: "version used for the platform api",
   },
+  MARKET_API_URL: {
+    def: "https://proxycg.api.live.ledger.com/api/v3",
+    parser: stringParser,
+    desc: "Market data api",
+  },
 };
 
 const getDefinition = (name: string): EnvDef<any> | null | undefined =>

package/src/exchange/hw-app-exchange/Exchange.ts

@@ -2,17 +2,18 @@ import Transport from "@ledgerhq/hw-transport";
 import { BigNumber } from "bignumber.js";
 import { TransportStatusError } from "@ledgerhq/errors";
 import invariant from "invariant";
-export const TRANSACTION_RATES = {
-  FIXED: 0x00,
-  FLOATING: 0x01,
-};
-export const TRANSACTION_TYPES = {
-  SWAP: 0x00,
-  SELL: 0x01,
-  FUND: 0x02,
-};
-type TransactionRate = typeof TRANSACTION_RATES[keyof typeof TRANSACTION_RATES];
-type TransactionType = typeof TRANSACTION_TYPES[keyof typeof TRANSACTION_TYPES];
+
+export const enum RateTypes {
+  Fixed = 0x00,
+  Floating = 0x01,
+}
+
+export const enum ExchangeTypes {
+  Swap = 0x00,
+  Sell = 0x01,
+  Fund = 0x02,
+}
+
 const START_NEW_TRANSACTION_COMMAND = 0x03;
 const SET_PARTNER_KEY_COMMAND = 0x04;
 const CHECK_PARTNER_COMMAND = 0x05;
@@ -34,8 +35,8 @@ const maybeThrowProtocolError = (result: Buffer): void => {
 
 export default class Exchange {
   transport: Transport;
-  transactionType: TransactionType;
-  transactionRate: TransactionRate;
+  transactionType: ExchangeTypes;
+  transactionRate: RateTypes;
   allowedStatuses: Array<number> = [
     0x9000, 0x6a80, 0x6a81, 0x6a82, 0x6a83, 0x6a84, 0x6a85, 0x6e00, 0x6d00,
     0x9d1a,
@@ -43,11 +44,11 @@ export default class Exchange {
 
   constructor(
     transport: Transport,
-    transactionType: TransactionType,
-    transactionRate?: TransactionRate
+    transactionType: ExchangeTypes,
+    transactionRate?: RateTypes
   ) {
     this.transactionType = transactionType;
-    this.transactionRate = transactionRate || TRANSACTION_RATES.FIXED;
+    this.transactionRate = transactionRate || RateTypes.Fixed;
     this.transport = transport;
   }
 
@@ -62,7 +63,10 @@ export default class Exchange {
     );
     maybeThrowProtocolError(result);
 
-    if (this.transactionType === TRANSACTION_TYPES.SELL) {
+    if (
+      this.transactionType === ExchangeTypes.Sell ||
+      this.transactionType === ExchangeTypes.Fund
+    ) {
       return result.subarray(0, 32).toString("base64");
     }
 
@@ -147,7 +151,7 @@ export default class Exchange {
     ]);
     const result: Buffer = await this.transport.send(
       0xe0,
-      this.transactionType === TRANSACTION_TYPES.SWAP
+      this.transactionType === ExchangeTypes.Swap
         ? CHECK_PAYOUT_ADDRESS
         : CHECK_ASSET_IN,
       this.transactionRate,

package/src/exchange/index.ts

@@ -1,6 +1,8 @@
 import { valid, gte } from "semver";
 import type { CryptoCurrency, TokenCurrency } from "../types/currencies";
-import { findExchangeCurrencyConfig } from "@ledgerhq/cryptoassets";
+import { findExchangeCurrencyConfig as findProdExchangeCurrencyConfig } from "@ledgerhq/cryptoassets";
+import { getEnv } from "../env";
+import { findTestExchangeCurrencyConfig } from "./testCurrencyConfig";
 // Minimum version of a currency app which has exchange capabilities, meaning it can be used
 // for sell/swap, and do silent signing.
 const exchangeSupportAppVersions = {
@@ -20,6 +22,22 @@ const exchangeSupportAppVersions = {
   zcash: "1.5.0",
   zencash: "1.5.0",
 };
+
+const findExchangeCurrencyConfig = (
+  id: string
+):
+  | {
+      config: string;
+
+      signature: string;
+    }
+  | null
+  | undefined => {
+  return getEnv("MOCK_EXCHANGE_TEST_CONFIG")
+    ? findTestExchangeCurrencyConfig(id)
+    : findProdExchangeCurrencyConfig(id);
+};
+
 export type ExchangeCurrencyNameAndSignature = {
   config: Buffer;
   signature: Buffer;

package/src/exchange/platform/completeExchange.ts

@@ -0,0 +1,42 @@
+import { Observable } from "rxjs";
+
+import type {
+  CompleteExchangeInputFund,
+  CompleteExchangeInputSell,
+  CompleteExchangeInputSwap,
+  CompleteExchangeRequestEvent,
+} from "./types";
+
+import completeExchangeSwap from "../swap/completeExchange";
+import completeExchangeTransfer from "./transfer/completeExchange";
+
+import { ExchangeTypes } from "../hw-app-exchange/Exchange";
+
+type CompleteExchangeInput =
+  | CompleteExchangeInputSell
+  | CompleteExchangeInputSwap
+  | CompleteExchangeInputFund;
+
+const completeExchange = (
+  input: CompleteExchangeInput
+): Observable<CompleteExchangeRequestEvent> => {
+  switch (input.exchangeType) {
+    case ExchangeTypes.Swap:
+      if (!input.exchange.toAccount) {
+        throw new Error("'toAccount' requested for Swap exchange");
+      }
+
+      return completeExchangeSwap(input);
+
+    case ExchangeTypes.Sell:
+      return completeExchangeTransfer(input);
+
+    case ExchangeTypes.Fund:
+      return completeExchangeTransfer(input);
+
+    default:
+      throw new Error("exchangeType not handled");
+  }
+};
+
+export default completeExchange;

package/src/exchange/platform/serialization.ts

@@ -0,0 +1,78 @@
+import type {
+  Exchange,
+  ExchangeRaw,
+  ExchangeSell,
+  ExchangeSellRaw,
+  ExchangeSwap,
+  ExchangeSwapRaw,
+} from "./types";
+import {
+  fromAccountLikeRaw,
+  fromAccountRaw,
+  toAccountLikeRaw,
+  toAccountRaw,
+} from "../../account";
+
+const isExchangeSwapRaw = (
+  exchangeRaw: ExchangeSwapRaw | ExchangeSellRaw
+): exchangeRaw is ExchangeSwapRaw => {
+  return (exchangeRaw as ExchangeSwapRaw).toAccount !== undefined;
+};
+
+const isExchangeSwap = (
+  exchange: ExchangeSwap | ExchangeSell
+): exchange is ExchangeSwap => {
+  return (exchange as ExchangeSwap).toAccount !== undefined;
+};
+
+export const fromExchangeRaw = (exchangeRaw: ExchangeRaw): Exchange => {
+  const fromAccount = fromAccountLikeRaw(exchangeRaw.fromAccount);
+  const fromParentAccount = exchangeRaw.fromParentAccount
+    ? fromAccountRaw(exchangeRaw.fromParentAccount)
+    : null;
+
+  if (!isExchangeSwapRaw(exchangeRaw)) {
+    return {
+      fromAccount,
+      fromParentAccount,
+    };
+  }
+
+  const toAccount = fromAccountLikeRaw(exchangeRaw.toAccount);
+  const toParentAccount = exchangeRaw.toParentAccount
+    ? fromAccountRaw(exchangeRaw.toParentAccount)
+    : null;
+
+  return {
+    fromAccount,
+    fromParentAccount,
+    toAccount,
+    toParentAccount,
+  };
+};
+
+export const toExchangeRaw = (exchange: Exchange): ExchangeRaw => {
+  const fromAccount = toAccountLikeRaw(exchange.fromAccount);
+  const fromParentAccount = exchange.fromParentAccount
+    ? toAccountRaw(exchange.fromParentAccount)
+    : null;
+
+  if (!isExchangeSwap(exchange)) {
+    return {
+      fromAccount,
+      fromParentAccount,
+    };
+  }
+
+  const toAccount = toAccountLikeRaw(exchange.toAccount);
+  const toParentAccount = exchange.toParentAccount
+    ? toAccountRaw(exchange.toParentAccount)
+    : null;
+
+  return {
+    fromAccount,
+    fromParentAccount,
+    toAccount,
+    toParentAccount,
+  };
+};

package/src/exchange/{swap → platform}/startExchange.ts

@@ -23,8 +23,12 @@ const startExchange = (
       await withDevicePromise(deviceId, async (transport) => {
         log("exchange", `attempt to connect to ${deviceId}`);
         if (unsubscribed) return;
-        const swap = new Exchange(transport, exchangeType, 0x00); // TODO Pass fixed/float for UI switch ?
-        const nonce: string = await swap.startNewTransaction();
+        /**
+         * Note: `transactionRate` is not needed at this stage. It is only used
+         * at the `completeExchange` step
+         */
+        const exchange = new Exchange(transport, exchangeType);
+        const nonce: string = await exchange.startNewTransaction();
         o.next({
           type: "start-exchange-result",
           nonce,