@ledgerhq/live-common 34.2.0 → 34.3.0-next.0

package/src/families/hedera/signOperation.ts

@@ -0,0 +1,60 @@
+import { Observable } from "rxjs";
+import { PublicKey } from "@hashgraph/sdk";
+import { AccountBridge } from "@ledgerhq/types-live";
+import { withDevice } from "../../hw/deviceAccess";
+import { Transaction } from "./types";
+import { buildUnsignedTransaction } from "./api/network";
+import Hedera from "./hw-app-hedera";
+import { buildOptimisticOperation } from "./buildOptimisticOperation";
+
+export const signOperation: AccountBridge<Transaction>["signOperation"] = ({
+  account,
+  transaction,
+  deviceId,
+}) =>
+  withDevice(deviceId)(transport => {
+    return new Observable(o => {
+      void (async function () {
+        try {
+          o.next({
+            type: "device-signature-requested",
+          });
+
+          const hederaTransaction = await buildUnsignedTransaction({
+            account,
+            transaction,
+          });
+
+          const accountPublicKey = PublicKey.fromString(account.seedIdentifier);
+
+          await hederaTransaction.signWith(accountPublicKey, async bodyBytes => {
+            return await new Hedera(transport).signTransaction(bodyBytes);
+          });
+
+          o.next({
+            type: "device-signature-granted",
+          });
+
+          const operation = await buildOptimisticOperation({
+            account,
+            transaction,
+          });
+
+          o.next({
+            type: "signed",
+            signedOperation: {
+              operation,
+              // NOTE: this needs to match the inverse operation in js-broadcast
+              signature: Buffer.from(hederaTransaction.toBytes()).toString("base64"),
+            },
+          });
+
+          o.complete();
+        } catch (err) {
+          o.error(err);
+        }
+      })();
+    });
+  });
+
+export default signOperation;

package/src/families/hedera/speculos-deviceActions.ts

@@ -2,6 +2,7 @@ import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
 import { deviceActionFlow, SpeculosButton } from "../../bot/specs";
+import { getAccountCurrency } from "@ledgerhq/coin-framework/account/index";
 
 export const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
   steps: [
@@ -30,9 +31,9 @@ export const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlo
     {
       title: "Amount",
       button: SpeculosButton.RIGHT,
-      expectedValue: ({ account: { unit }, status: { amount } }) => {
+      expectedValue: ({ account, status: { amount } }) => {
         return (
-          formatCurrencyUnit(unit, amount, {
+          formatCurrencyUnit(getAccountCurrency(account).units[0], amount, {
             disableRounding: true,
             showAllDigits: true,
           }) + " hbar"
@@ -42,8 +43,8 @@ export const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlo
     {
       title: "Fee",
       button: SpeculosButton.RIGHT,
-      expectedValue: ({ account: { unit }, status: { estimatedFees } }) =>
-        formatCurrencyUnit(unit, estimatedFees, {
+      expectedValue: ({ account, status: { estimatedFees } }) =>
+        formatCurrencyUnit(getAccountCurrency(account).units[0], estimatedFees, {
           disableRounding: true,
           showAllDigits: true,
         }) + " hbar",

package/src/families/hedera/tests/js-estimateMaxSpendable.integration.test.ts

@@ -1,6 +1,6 @@
-import type { Account } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
-import estimateMaxSpendable from "../js-estimateMaxSpendable";
+import type { Account } from "@ledgerhq/types-live";
+import { estimateMaxSpendable } from "../estimateMaxSpendable";
 import { getEstimatedFees } from "../utils";
 
 // Balance is 1 Hbar
@@ -12,9 +12,6 @@ const account: Account = {
   index: 0,
   freshAddress: "",
   freshAddressPath: "",
-  freshAddresses: [],
-  name: "",
-  starred: false,
   used: false,
   balance: new BigNumber(100000000),
   spendableBalance: new BigNumber(0),
@@ -43,13 +40,6 @@ const account: Account = {
     WEEK: { latestDate: null, balances: [] },
   },
   swapHistory: [],
-  unit: {
-    name: "",
-    code: "",
-    magnitude: 0,
-    showAllDigits: undefined,
-    prefixCode: undefined,
-  },
 };
 
 describe("js-estimateMaxSpendable", () => {

package/src/families/hedera/tests/js-transaction.test.ts

@@ -1,8 +1,9 @@
 import BigNumber from "bignumber.js";
 import type { Account } from "@ledgerhq/types-live";
-import type { Transaction } from "../../../families/hedera/types";
 import { defaultUpdateTransaction as updateTransaction } from "@ledgerhq/coin-framework/bridge/jsHelpers";
-import { createTransaction, prepareTransaction } from "../js-transaction";
+import type { Transaction } from "../../../families/hedera/types";
+import { createTransaction } from "../createTransaction";
+import { prepareTransaction } from "../prepareTransaction";
 
 const account: Account = {
   type: "Account",
@@ -12,9 +13,6 @@ const account: Account = {
   index: 0,
   freshAddress: "",
   freshAddressPath: "",
-  freshAddresses: [],
-  name: "",
-  starred: false,
   used: false,
   balance: new BigNumber(200000),
   spendableBalance: new BigNumber(0),
@@ -43,13 +41,6 @@ const account: Account = {
     WEEK: { latestDate: null, balances: [] },
   },
   swapHistory: [],
-  unit: {
-    name: "",
-    code: "",
-    magnitude: 0,
-    showAllDigits: undefined,
-    prefixCode: undefined,
-  },
 };
 
 const transaction: Transaction = {

package/src/families/hedera/tests/transaction.test.ts

@@ -11,9 +11,6 @@ const account: Account = {
   index: 0,
   freshAddress: "",
   freshAddressPath: "",
-  freshAddresses: [],
-  name: "",
-  starred: false,
   used: false,
   balance: new BigNumber(200000),
   spendableBalance: new BigNumber(0),
@@ -30,7 +27,13 @@ const account: Account = {
     explorerViews: [],
     name: "",
     ticker: "",
-    units: [],
+    units: [
+      {
+        name: "",
+        code: "",
+        magnitude: 0,
+      },
+    ],
   },
   operationsCount: 0,
   operations: [],
@@ -42,13 +45,6 @@ const account: Account = {
     WEEK: { latestDate: null, balances: [] },
   },
   swapHistory: [],
-  unit: {
-    name: "",
-    code: "",
-    magnitude: 0,
-    showAllDigits: undefined,
-    prefixCode: undefined,
-  },
 };
 
 const transaction: Transaction = {

package/src/families/hedera/tests/utils.integration.test.ts

@@ -12,9 +12,6 @@ const account: Account = {
   index: 0,
   freshAddress: "",
   freshAddressPath: "",
-  freshAddresses: [],
-  name: "",
-  starred: false,
   used: false,
   balance: new BigNumber(100000000),
   spendableBalance: new BigNumber(0),
@@ -43,13 +40,6 @@ const account: Account = {
     WEEK: { latestDate: null, balances: [] },
   },
   swapHistory: [],
-  unit: {
-    name: "",
-    code: "",
-    magnitude: 0,
-    showAllDigits: undefined,
-    prefixCode: undefined,
-  },
 };
 
 const transaction: Transaction = {

package/src/families/hedera/transaction.ts

@@ -1,17 +1,17 @@
 import type { Transaction, TransactionRaw } from "./types";
+import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters";
 import {
-  formatTransactionStatusCommon as formatTransactionStatus,
   fromTransactionCommonRaw,
   fromTransactionStatusRawCommon as fromTransactionStatusRaw,
   toTransactionCommonRaw,
   toTransactionStatusRawCommon as toTransactionStatusRaw,
-} from "@ledgerhq/coin-framework/transaction/common";
+} from "@ledgerhq/coin-framework/serialization";
 import type { Account } from "@ledgerhq/types-live";
-import { getAccountUnit } from "../../account";
+import { getAccountCurrency } from "../../account";
 import { formatCurrencyUnit } from "../../currencies";
 
 export function formatTransaction(transaction: Transaction, account: Account): string {
-  const amount = formatCurrencyUnit(getAccountUnit(account), transaction.amount, {
+  const amount = formatCurrencyUnit(getAccountCurrency(account).units[0], transaction.amount, {
     showCode: true,
     disableRounding: true,
   });

package/src/families/hedera/utils.ts

@@ -1,9 +1,9 @@
-import type { Account } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
-import estimateMaxSpendable from "./js-estimateMaxSpendable";
-import type { Transaction } from "./types";
-import { getFiatCurrencyByTicker } from "../../currencies/index";
+import type { Account } from "@ledgerhq/types-live";
 import cvsApi from "@ledgerhq/live-countervalues/api/index";
+import { getFiatCurrencyByTicker } from "../../currencies/index";
+import { estimateMaxSpendable } from "./estimateMaxSpendable";
+import type { Transaction } from "./types";
 
 export const estimatedFeeSafetyRate = 2;
 

package/src/families/internet_computer/__snapshots__/bridge.integration.test.ts.snap

@@ -8,24 +8,14 @@ exports[`internet_computer currency bridge scanAccounts internet_computer seed 1
     "derivationMode": "internet_computer",
     "freshAddress": "e8a1474afbed438be8b019c4293b9e01b33075d72757ac715183ae7c7ba77e37",
     "freshAddressPath": "44'/223'/0'/0/0",
-    "freshAddresses": [
-      {
-        "address": "e8a1474afbed438be8b019c4293b9e01b33075d72757ac715183ae7c7ba77e37",
-        "derivationPath": "44'/223'/0'/0/0",
-      },
-    ],
     "id": "js:2:internet_computer:046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf:internet_computer",
     "index": 0,
-    "name": "Internet Computer 1",
-    "nfts": undefined,
     "operationsCount": 1,
     "pendingOperations": [],
     "seedIdentifier": "046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf",
     "spendableBalance": "1000000",
-    "starred": false,
     "swapHistory": [],
     "syncHash": undefined,
-    "unitMagnitude": 8,
     "used": true,
     "xpub": "046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf",
   },
@@ -35,24 +25,14 @@ exports[`internet_computer currency bridge scanAccounts internet_computer seed 1
     "derivationMode": "internet_computer",
     "freshAddress": "1723b9a25b7cb1865caa6e633fc727c95cee6a84c52e5ca0f8752ecf66cdea4b",
     "freshAddressPath": "44'/223'/0'/0/1",
-    "freshAddresses": [
-      {
-        "address": "1723b9a25b7cb1865caa6e633fc727c95cee6a84c52e5ca0f8752ecf66cdea4b",
-        "derivationPath": "44'/223'/0'/0/1",
-      },
-    ],
     "id": "js:2:internet_computer:043ad9dda46b25cbcf98b2d91f8aa289d08078fa960d13e7d77a571c625eedcb62b6c26a86408d30a6bbdea5ecad6f7603bc1ba11fbb62caa315789f333ece2c8c:internet_computer",
     "index": 1,
-    "name": "Internet Computer 2",
-    "nfts": undefined,
     "operationsCount": 0,
     "pendingOperations": [],
     "seedIdentifier": "046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf",
     "spendableBalance": "0",
-    "starred": false,
     "swapHistory": [],
     "syncHash": undefined,
-    "unitMagnitude": 8,
     "used": false,
     "xpub": "043ad9dda46b25cbcf98b2d91f8aa289d08078fa960d13e7d77a571c625eedcb62b6c26a86408d30a6bbdea5ecad6f7603bc1ba11fbb62caa315789f333ece2c8c",
   },
@@ -66,22 +46,18 @@ exports[`internet_computer currency bridge scanAccounts internet_computer seed 1
       "accountId": "js:2:internet_computer:046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf:internet_computer",
       "blockHash": null,
       "blockHeight": 5432782,
-      "contract": undefined,
       "extra": {
         "memo": "0",
       },
       "fee": "10000",
       "hash": "c63c65091a4de0b9aec1b8bd242fa97b96dc8a7349577470f788c1f3df6fd7b8",
       "id": "js:2:internet_computer:046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf:internet_computer-c63c65091a4de0b9aec1b8bd242fa97b96dc8a7349577470f788c1f3df6fd7b8-IN",
-      "operator": undefined,
       "recipients": [
         "e8a1474afbed438be8b019c4293b9e01b33075d72757ac715183ae7c7ba77e37",
       ],
       "senders": [
         "fdb7db0d3ae67368cb5010b7de7d98566c072f0a4eda871f45cd6582bf08aeb4",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "1000000",
     },

package/src/families/internet_computer/bridge/account.ts

@@ -1,230 +1,19 @@
-import { makeAccountBridgeReceive, makeSync } from "../../../bridge/jsHelpers";
+import { Account, AccountBridge } from "@ledgerhq/types-live";
 import { defaultUpdateTransaction } from "@ledgerhq/coin-framework/bridge/jsHelpers";
-import {
-  Account,
-  AccountBridge,
-  AccountLike,
-  BroadcastFnSignature,
-  SignOperationFnSignature,
-} from "@ledgerhq/types-live";
-import { InternetComputerOperation, Transaction, TransactionStatus } from "../types";
+import { makeAccountBridgeReceive, makeSync } from "../../../bridge/jsHelpers";
+import { estimateMaxSpendable } from "../estimateMaxSpendable";
+import { getTransactionStatus } from "../getTransactionStatus";
+import { prepareTransaction } from "../prepareTransaction";
+import { Transaction, TransactionStatus } from "../types";
 import { getAccountShape } from "./bridgeHelpers/account";
-import BigNumber from "bignumber.js";
-import { getEstimatedFees } from "./bridgeHelpers/fee";
-import { getAddress, validateAddress, validateMemo } from "./bridgeHelpers/addresses";
-import {
-  AmountRequired,
-  InvalidAddress,
-  InvalidAddressBecauseDestinationIsAlsoSource,
-  NotEnoughBalance,
-  RecipientRequired,
-} from "@ledgerhq/errors";
-import { Observable } from "rxjs";
-import { withDevice } from "../../../hw/deviceAccess";
-import { encodeOperationId } from "../../../operation";
-import {
-  broadcastTxn,
-  getTxnExpirationDate,
-  getTxnMetadata,
-  getUnsignedTransaction,
-  signICPTransaction,
-} from "./bridgeHelpers/icpRosetta";
-import { getPath } from "../utils";
-import { InvalidMemoICP } from "../errors";
+import { createTransaction } from "../createTransaction";
+import { signOperation } from "../signOperation";
+import { broadcast } from "../broadcast";
 
 const sync = makeSync({ getAccountShape });
-
-const createTransaction = (): Transaction => {
-  // log("debug", "[createTransaction] creating base tx");
-  return {
-    family: "internet_computer",
-    amount: new BigNumber(0),
-    fees: getEstimatedFees(),
-    recipient: "",
-    useAllAmount: false,
-  };
-};
-
-const prepareTransaction = async (a: Account, t: Transaction): Promise<Transaction> => {
-  // log("debug", "[prepareTransaction] start fn");
-
-  const { address } = getAddress(a);
-  const { recipient } = t;
-
-  let amount: BigNumber = t.amount;
-  if (recipient && address) {
-    // log("debug", "[prepareTransaction] fetching estimated fees");
-
-    if ((await validateAddress(recipient)).isValid && (await validateAddress(address)).isValid) {
-      if (t.useAllAmount) {
-        amount = a.spendableBalance.minus(t.fees);
-        return { ...t, amount };
-      }
-    }
-  }
-
-  // log("debug", "[prepareTransaction] finish fn");
-  return t;
-};
-
-const getTransactionStatus = async (a: Account, t: Transaction): Promise<TransactionStatus> => {
-  const errors: TransactionStatus["errors"] = {};
-  const warnings: TransactionStatus["warnings"] = {};
-
-  const { balance } = a;
-  const { address } = getAddress(a);
-  const { recipient, useAllAmount } = t;
-  let { amount } = t;
-
-  if (!recipient) {
-    errors.recipient = new RecipientRequired();
-  } else if (!(await validateAddress(recipient)).isValid) {
-    errors.recipient = new InvalidAddress("", {
-      currencyName: a.currency.name,
-    });
-  } else if (recipient.toLowerCase() === address.toLowerCase()) {
-    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
-  }
-
-  if (!(await validateAddress(address)).isValid) {
-    errors.sender = new InvalidAddress("", {
-      currencyName: a.currency.name,
-    });
-  }
-
-  if (!validateMemo(t.memo).isValid) {
-    errors.transaction = new InvalidMemoICP();
-  }
-
-  // This is the worst case scenario (the tx won't cost more than this value)
-  const estimatedFees = t.fees;
-
-  let totalSpent: BigNumber;
-
-  if (useAllAmount) {
-    totalSpent = a.spendableBalance;
-    amount = totalSpent.minus(estimatedFees);
-    if (amount.lte(0) || totalSpent.gt(balance)) {
-      errors.amount = new NotEnoughBalance();
-    }
-  } else {
-    totalSpent = amount.plus(estimatedFees);
-    if (amount.eq(0)) {
-      errors.amount = new AmountRequired();
-    } else if (totalSpent.gt(a.spendableBalance)) {
-      errors.amount = new NotEnoughBalance();
-    }
-  }
-
-  // log("debug", "[getTransactionStatus] finish fn");
-
-  return {
-    errors,
-    warnings,
-    estimatedFees,
-    amount,
-    totalSpent,
-  };
-};
-
-const estimateMaxSpendable = async ({
-  account,
-  transaction,
-}: {
-  account: AccountLike;
-  parentAccount?: Account | null | undefined;
-  transaction?: Transaction | null | undefined;
-}): Promise<BigNumber> => {
-  const balance = account.balance;
-
-  let maxSpendable = balance.minus(transaction?.fees ?? getEstimatedFees());
-
-  if (maxSpendable.isLessThan(0)) {
-    maxSpendable = new BigNumber(0);
-  }
-
-  return maxSpendable;
-};
-
-const signOperation: SignOperationFnSignature<Transaction> = ({ account, deviceId, transaction }) =>
-  withDevice(deviceId)(
-    transport =>
-      new Observable(o => {
-        async function main() {
-          // log("debug", "[signOperation] start fn");
-
-          const { recipient, amount } = transaction;
-          const { id: accountId, xpub } = account;
-          const { address, derivationPath } = getAddress(account);
-          const fee = transaction.fees;
-
-          const { unsignedTxn, payloads } = await getUnsignedTransaction(transaction, account);
-
-          o.next({
-            type: "device-signature-requested",
-          });
-
-          const { signedTxn } = await signICPTransaction({
-            unsignedTxn,
-            transport,
-            path: getPath(derivationPath),
-            payloads,
-            pubkey: xpub ?? "",
-          });
-
-          const { hash } = await getTxnMetadata(signedTxn);
-
-          o.next({
-            type: "device-signature-granted",
-          });
-
-          const operation: InternetComputerOperation = {
-            id: encodeOperationId(accountId, hash, "OUT"),
-            hash,
-            type: "OUT",
-            senders: [address],
-            recipients: [recipient],
-            accountId,
-            value: amount.plus(fee),
-            fee,
-            blockHash: null,
-            blockHeight: null,
-            date: new Date(),
-            extra: {
-              memo: transaction.memo,
-            },
-          };
-
-          o.next({
-            type: "signed",
-            signedOperation: {
-              operation,
-              signature: signedTxn,
-              expirationDate: getTxnExpirationDate(unsignedTxn),
-            },
-          });
-        }
-
-        main().then(
-          () => o.complete(),
-          e => o.error(e),
-        );
-      }),
-  );
-
 const receive = makeAccountBridgeReceive();
 
-const broadcast: BroadcastFnSignature = async ({ signedOperation: { signature, operation } }) => {
-  // log("debug", "[broadcast] start fn");
-
-  await broadcastTxn(signature);
-
-  const result = { ...operation };
-
-  return result;
-};
-
-export const accountBridge: AccountBridge<Transaction> = {
+export const accountBridge: AccountBridge<Transaction, Account, TransactionStatus> = {
   sync,
   updateTransaction: defaultUpdateTransaction,
   createTransaction,

package/src/families/internet_computer/bridge/bridgeHelpers/account.ts

@@ -12,6 +12,52 @@ import { InternetComputerOperation } from "../../types";
 import invariant from "invariant";
 import { deriveAddressFromPubkey } from "./icpRosetta";
 
+export const getAccountShape: GetAccountShape = async info => {
+  const { currency, derivationMode, rest = {}, initialAccount } = info;
+  const publicKey = reconciliatePublicKey(rest.publicKey, initialAccount);
+  invariant(publicKey, "publicKey is required");
+
+  // deriving address from public key
+  const address = await deriveAddressFromPubkey(publicKey);
+  invariant(address, "address is required");
+
+  const accountId = encodeAccountId({
+    type: "js",
+    version: "2",
+    currencyId: currency.id,
+    xpubOrAddress: publicKey,
+    derivationMode,
+  });
+
+  // log("debug", `Generation account shape for ${address}`);
+
+  const blockHeight = await fetchBlockHeight();
+  const balanceResp = await fetchBalances(address);
+  const balance = balanceResp.balances[0];
+
+  const txns = await fetchTxns(address);
+  const result: Partial<Account> = {
+    id: accountId,
+    balance: BigNumber(balance.value),
+    spendableBalance: BigNumber(balance.value),
+    operations: flatMap(txns.transactions.reverse(), mapTxToOps(accountId, address)),
+    blockHeight: blockHeight.current_block_identifier.index,
+    operationsCount: txns.transactions.length,
+    xpub: publicKey,
+  };
+
+  return result;
+};
+
+function reconciliatePublicKey(publicKey?: string, initialAccount?: Account): string {
+  if (publicKey) return publicKey;
+  if (initialAccount) {
+    const { xpubOrAddress } = decodeAccountId(initialAccount.id);
+    return xpubOrAddress;
+  }
+  throw new Error("publicKey wasn't properly restored");
+}
+
 const mapTxToOps = (accountId: string, address: string, fee = ICP_FEES) => {
   return (
     txInfo: ICPRosettaGetTxnsHistoryResponse["transactions"][0],
@@ -86,49 +132,3 @@ const mapTxToOps = (accountId: string, address: string, fee = ICP_FEES) => {
     return ops;
   };
 };
-
-export const getAccountShape: GetAccountShape = async info => {
-  const { currency, derivationMode, rest = {}, initialAccount } = info;
-  const publicKey = reconciliatePublicKey(rest.publicKey, initialAccount);
-  invariant(publicKey, "publicKey is required");
-
-  // deriving address from public key
-  const address = await deriveAddressFromPubkey(publicKey);
-  invariant(address, "address is required");
-
-  const accountId = encodeAccountId({
-    type: "js",
-    version: "2",
-    currencyId: currency.id,
-    xpubOrAddress: publicKey,
-    derivationMode,
-  });
-
-  // log("debug", `Generation account shape for ${address}`);
-
-  const blockHeight = await fetchBlockHeight();
-  const balanceResp = await fetchBalances(address);
-  const balance = balanceResp.balances[0];
-
-  const txns = await fetchTxns(address);
-  const result: Partial<Account> = {
-    id: accountId,
-    balance: BigNumber(balance.value),
-    spendableBalance: BigNumber(balance.value),
-    operations: flatMap(txns.transactions.reverse(), mapTxToOps(accountId, address)),
-    blockHeight: blockHeight.current_block_identifier.index,
-    operationsCount: txns.transactions.length,
-    xpub: publicKey,
-  };
-
-  return result;
-};
-
-function reconciliatePublicKey(publicKey?: string, initialAccount?: Account): string {
-  if (publicKey) return publicKey;
-  if (initialAccount) {
-    const { xpubOrAddress } = decodeAccountId(initialAccount.id);
-    return xpubOrAddress;
-  }
-  throw new Error("publicKey wasn't properly restored");
-}