@ledgerhq/live-common 21.28.0 → 21.31.0

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

@@ -34,7 +34,7 @@ describe("synced xpub utilites functions", () => {
 
     beforeAll(async () => {
       await xpub.sync();
-    }, 60000);
+    }, 120000);
 
     it("should compute accounts/addresses/balances correctly", async () => {
       const addresses = await xpub.getXpubAddresses();

package/src/__tests__/test-helpers/bridge.ts

@@ -478,7 +478,7 @@ export function testBridge<T extends Transaction>(
 
               // existing ops are keeping refs
               synced.operations.slice(count).forEach((op, i) => {
-                expect(op).toBe(operations[i]);
+                expect(op).toStrictEqual(operations[i]);
               });
             }
           );

package/src/__tests__/test-helpers/setup.ts

@@ -56,4 +56,5 @@ setSupportedCurrencies([
   "crypto_org",
   "filecoin",
   "solana",
+  "celo",
 ]);

package/src/account/support.ts

@@ -21,6 +21,7 @@ import { getAccountBridge } from "../bridge";
 import jsBridges from "../generated/bridge/js";
 
 const experimentalIntegrations = ["algorand", "tezos"];
+
 export function shouldUseJS(currency: CryptoCurrency) {
   const jsBridge = jsBridges[currency.family];
   if (!jsBridge) return false;

package/src/apps/hw.ts

@@ -5,6 +5,7 @@ import { concat, of, EMPTY, from, Observable, throwError, defer } from "rxjs";
 import { mergeMap, map } from "rxjs/operators";
 import type { Exec, AppOp, ListAppsEvent, ListAppsResult } from "./types";
 import type { App, DeviceInfo } from "../types/manager";
+import { AppType } from "../types/manager";
 import manager, { getProviderId } from "../manager";
 import installApp from "../hw/installApp";
 import uninstallApp from "../hw/uninstallApp";
@@ -313,6 +314,11 @@ export const listApps = (
             }
           }
 
+          const type =
+            application.description === AppType.PLUGIN
+              ? AppType.PLUGIN
+              : AppType.APP;
+
           const app: App = polyfillApp({
             id: version.id,
             name: version.name,
@@ -320,6 +326,7 @@ export const listApps = (
             version: version.version,
             currencyId,
             description: version.description,
+            type,
             dateModified: version.date_last_modified,
             icon: version.icon,
             authorName: application.authorName,

package/src/bot/engine.ts

@@ -401,7 +401,7 @@ export async function runOnAccount<T extends Transaction>({
       }
     }
 
-    // without recovering mecanism, we simply assume an error is a failure
+    // without recovering mechanism, we simply assume an error is a failure
     if (errors.length) {
       throw errors[0];
     }

package/src/bridge/jsHelpers.ts

@@ -97,7 +97,7 @@ Operation[] {
   newOps.forEach((op) => {
     newOpsIds[op.id] = op;
   });
-  // return existins when there is no real new operations
+  // return existing 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 Object.values(newOpsIds);

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

@@ -0,0 +1,12 @@
+
+      import * as React from "react";
+interface Props {
+            size: number;
+            color?: string;
+          };
+
+function celo({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="M10.1053 19.1053C12.9834 19.1053 15.3158 16.7728 15.3158 13.8947C15.3158 11.0166 12.9834 8.68421 10.1053 8.68421C7.22716 8.68421 4.89474 11.0166 4.89474 13.8947C4.89474 16.7728 7.22716 19.1053 10.1053 19.1053ZM10.1053 21C6.18126 21 3 17.8187 3 13.8947C3 9.97074 6.18126 6.78947 10.1053 6.78947C14.0293 6.78947 17.2105 9.97074 17.2105 13.8947C17.2105 17.8187 14.0293 21 10.1053 21Z" fill={color} /><path d="M13.8947 15.3158C16.7728 15.3158 19.1053 12.9834 19.1053 10.1053C19.1053 7.22716 16.7728 4.89474 13.8947 4.89474C11.0166 4.89474 8.68421 7.22716 8.68421 10.1053C8.68421 12.9834 11.0166 15.3158 13.8947 15.3158ZM13.8947 17.2105C9.97074 17.2105 6.78947 14.0293 6.78947 10.1053C6.78947 6.18126 9.97074 3 13.8947 3C17.8187 3 21 6.18126 21 10.1053C21 14.0293 17.8187 17.2105 13.8947 17.2105Z" fill={color} /><path d="M14.1297 17.2105C14.6223 16.6137 14.9747 15.9145 15.1623 15.1623C15.9126 14.9747 16.6118 14.6223 17.2105 14.1297C17.184 14.9994 16.9964 15.8558 16.6573 16.6592C15.8558 16.9964 14.9994 17.184 14.1297 17.2105ZM8.83768 8.83768C8.08737 9.02526 7.38821 9.37768 6.78947 9.87032C6.816 9.00063 7.00358 8.14421 7.34274 7.34274C8.14421 7.00547 9.00253 6.81789 9.87032 6.78947C9.37768 7.38632 9.02526 8.08547 8.83768 8.83768Z" fill={color} /></svg>;
+}
+
+export default celo;

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

@@ -78,6 +78,7 @@ export { default as call } from "./call";
 export { default as cc } from "./cc";
 export { default as cdn } from "./cdn";
 export { default as cdt } from "./cdt";
+export { default as celo } from "./celo";
 export { default as cenz } from "./cenz";
 export { default as chain } from "./chain";
 export { default as chat } from "./chat";

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

@@ -0,0 +1,13 @@
+
+      import * as React from "react";
+import Svg, { Path } from "react-native-svg";
+interface Props {
+              size: number;
+              color: string;
+            };
+
+function celo({ 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="M10.1053 19.1053C12.9834 19.1053 15.3158 16.7728 15.3158 13.8947C15.3158 11.0166 12.9834 8.68421 10.1053 8.68421C7.22716 8.68421 4.89474 11.0166 4.89474 13.8947C4.89474 16.7728 7.22716 19.1053 10.1053 19.1053ZM10.1053 21C6.18126 21 3 17.8187 3 13.8947C3 9.97074 6.18126 6.78947 10.1053 6.78947C14.0293 6.78947 17.2105 9.97074 17.2105 13.8947C17.2105 17.8187 14.0293 21 10.1053 21Z" fill={color} /><Path d="M13.8947 15.3158C16.7728 15.3158 19.1053 12.9834 19.1053 10.1053C19.1053 7.22716 16.7728 4.89474 13.8947 4.89474C11.0166 4.89474 8.68421 7.22716 8.68421 10.1053C8.68421 12.9834 11.0166 15.3158 13.8947 15.3158ZM13.8947 17.2105C9.97074 17.2105 6.78947 14.0293 6.78947 10.1053C6.78947 6.18126 9.97074 3 13.8947 3C17.8187 3 21 6.18126 21 10.1053C21 14.0293 17.8187 17.2105 13.8947 17.2105Z" fill={color} /><Path d="M14.1297 17.2105C14.6223 16.6137 14.9747 15.9145 15.1623 15.1623C15.9126 14.9747 16.6118 14.6223 17.2105 14.1297C17.184 14.9994 16.9964 15.8558 16.6573 16.6592C15.8558 16.9964 14.9994 17.184 14.1297 17.2105ZM8.83768 8.83768C8.08737 9.02526 7.38821 9.37768 6.78947 9.87032C6.816 9.00063 7.00358 8.14421 7.34274 7.34274C8.14421 7.00547 9.00253 6.81789 9.87032 6.78947C9.37768 7.38632 9.02526 8.08547 8.83768 8.83768Z" fill={color} /></Svg>;
+}
+
+export default celo;

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

@@ -78,6 +78,7 @@ export { default as call } from "./call";
 export { default as cc } from "./cc";
 export { default as cdn } from "./cdn";
 export { default as cdt } from "./cdt";
+export { default as celo } from "./celo";
 export { default as cenz } from "./cenz";
 export { default as chain } from "./chain";
 export { default as chat } from "./chat";

package/src/data/icons/svg/CELO.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.1053 19.1053C12.9834 19.1053 15.3158 16.7728 15.3158 13.8947C15.3158 11.0166 12.9834 8.68421 10.1053 8.68421C7.22716 8.68421 4.89474 11.0166 4.89474 13.8947C4.89474 16.7728 7.22716 19.1053 10.1053 19.1053ZM10.1053 21C6.18126 21 3 17.8187 3 13.8947C3 9.97074 6.18126 6.78947 10.1053 6.78947C14.0293 6.78947 17.2105 9.97074 17.2105 13.8947C17.2105 17.8187 14.0293 21 10.1053 21Z" fill="#42D689"/>
+<path d="M13.8947 15.3158C16.7728 15.3158 19.1053 12.9834 19.1053 10.1053C19.1053 7.22716 16.7728 4.89474 13.8947 4.89474C11.0166 4.89474 8.68421 7.22716 8.68421 10.1053C8.68421 12.9834 11.0166 15.3158 13.8947 15.3158ZM13.8947 17.2105C9.97074 17.2105 6.78947 14.0293 6.78947 10.1053C6.78947 6.18126 9.97074 3 13.8947 3C17.8187 3 21 6.18126 21 10.1053C21 14.0293 17.8187 17.2105 13.8947 17.2105Z" fill="#42D689"/>
+<path d="M14.1297 17.2105C14.6223 16.6137 14.9747 15.9145 15.1623 15.1623C15.9126 14.9747 16.6118 14.6223 17.2105 14.1297C17.184 14.9994 16.9964 15.8558 16.6573 16.6592C15.8558 16.9964 14.9994 17.184 14.1297 17.2105ZM8.83768 8.83768C8.08737 9.02526 7.38821 9.37768 6.78947 9.87032C6.816 9.00063 7.00358 8.14421 7.34274 7.34274C8.14421 7.00547 9.00253 6.81789 9.87032 6.78947C9.37768 7.38632 9.02526 8.08547 8.83768 8.83768Z" fill="#42D689"/>
+</svg>

package/src/env.ts

@@ -40,6 +40,16 @@ const envDefinitions = {
     parser: stringParser,
     desc: "Node API endpoint for algorand",
   },
+  API_CELO_INDEXER: {
+    def: "https://celo.coin.ledger.com/indexer/",
+    parser: stringParser,
+    desc: "Explorer API for celo",
+  },
+  API_CELO_NODE: {
+    def: "https://celo.coin.ledger.com/archive/",
+    parser: stringParser,
+    desc: "Node endpoint for celo",
+  },
   API_COSMOS_BLOCKCHAIN_EXPLORER_API_ENDPOINT: {
     def: "https://cosmoshub4.coin.ledger.com/",
     parser: stringParser,
@@ -120,6 +130,11 @@ const envDefinitions = {
     def: "https://tron.coin.ledger.com",
     desc: "proxy url for trongrid API",
   },
+  API_SOLANA_PROXY: {
+    parser: stringParser,
+    def: "https://solana.coin.ledger.com",
+    desc: "proxy url for solana API",
+  },
   BASE_SOCKET_URL: {
     def: "wss://scriptrunner.api.live.ledger.com/update",
     parser: stringParser,

package/src/exchange/swap/hooks/usePickDefaultAccount.ts

@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import { Account, TokenAccount } from "../../../types";
 import { useCurrenciesByMarketcap } from "../../../currencies/sortByMarketcap";
 import { listCryptoCurrencies, listTokens } from "../../../currencies";
-import { getAccountCurrency } from "../../../account";
+import { getAvailableAccountsById } from "../utils";
 
 // Pick a default source account if none are selected.
 export const usePickDefaultAccount = (
@@ -17,14 +17,9 @@ export const usePickDefaultAccount = (
     if (!fromAccount && allCurrencies.length > 0) {
       const defaultAccount: Account | TokenAccount | undefined = allCurrencies
         .map(({ id }) =>
-          accounts
-            .filter(
-              (acc) =>
-                getAccountCurrency(acc)?.id === id &&
-                acc.balance.gt(0) &&
-                !acc.disabled
-            )
-            .sort((a, b) => b.balance.minus(a.balance).toNumber())
+          getAvailableAccountsById(id, accounts).filter((account) =>
+            account.balance.gt(0)
+          )
         )
         .flat(1)
         .find(Boolean);

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

@@ -1,6 +1,10 @@
 import BigNumber from "bignumber.js";
 
-import { pickExchangeRate, getAccountTuplesForCurrency } from "./index";
+import {
+  pickExchangeRate,
+  getAccountTuplesForCurrency,
+  getAvailableAccountsById,
+} from "./index";
 import { getMockExchangeRate } from "../mock";
 import { genAccount } from "../../../mock/account";
 import type {
@@ -222,3 +226,42 @@ describe("swap/utils/getAccountTuplesForCurrency", () => {
     });
   });
 });
+
+describe("swap/utils/getAvailableAccountsById", () => {
+  const getEthAccount = getAccountCreator("ethereum");
+  const getBtcAccount = getAccountCreator("bitcoin");
+  const getPolkadotAccount = getAccountCreator("polkadot");
+  const getCosmosAccount = getAccountCreator("cosmos");
+
+  test("return the correct accounts after sorting/filtering them", () => {
+    const [
+      disabledAccount,
+      higherBalanceAccount,
+      lowerBalanceAccount,
+      ...accounts
+    ] = new Array(6).fill(null).map(getEthAccount);
+
+    // mutate some accounts to test sorting/filtering
+    disabledAccount.disabled = true;
+    higherBalanceAccount.balance = new BigNumber(10);
+    lowerBalanceAccount.balance = new BigNumber(2);
+
+    const allAccounts: Account[] = [
+      getCosmosAccount(),
+      disabledAccount,
+      higherBalanceAccount,
+      lowerBalanceAccount,
+      ...accounts,
+      getBtcAccount(),
+      getPolkadotAccount(),
+    ];
+
+    const results = getAvailableAccountsById("ethereum", allAccounts);
+    expect(results).toHaveLength(5);
+    expect(results[0].balance.toNumber()).toBeGreaterThan(0);
+    expect(results[1].balance.toNumber()).toBeGreaterThan(0);
+    expect(results[0].balance.toNumber()).toBeGreaterThan(
+      results[1].balance.toNumber()
+    );
+  });
+});

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/bitcoin/wallet-btc/crypto/base.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/src/families/celo/api/hubble.ts

@@ -0,0 +1,93 @@
+import { BigNumber } from "bignumber.js";
+import network from "../../../network";
+import { getEnv } from "../../../env";
+import { Operation, OperationType } from "../../../types";
+import { encodeOperationId } from "../../../operation";
+
+const DEFAULT_TRANSACTIONS_LIMIT = 200;
+const getUrl = (route): string => `${getEnv("API_CELO_INDEXER")}${route || ""}`;
+
+// Indexer returns both account data and transactions in one call.
+// Transactions are just limited, there's no block height offset
+const fetchAccountDetails = async (
+  address: string,
+  transactionsLimit: number = DEFAULT_TRANSACTIONS_LIMIT
+) => {
+  const { data } = await network({
+    method: "GET",
+    url: getUrl(`/account_details/${address}?limit=${transactionsLimit}`),
+  });
+  return data;
+};
+
+const fetchStatus = async () => {
+  const { data } = await network({
+    method: "GET",
+    url: getUrl(`/status`),
+  });
+  return data;
+};
+
+const getOperationType = (type: string): OperationType => {
+  switch (type) {
+    case "InternalTransferSent":
+      return "OUT";
+    case "InternalTransferReceived":
+      return "IN";
+    case "AccountSlashed":
+      return "SLASH";
+    default:
+      return "NONE";
+  }
+};
+
+const transactionToOperation = (
+  address: string,
+  accountId: string,
+  transaction
+): Operation => {
+  const type: OperationType = getOperationType(transaction.kind);
+  const hasFailed = transaction.data.success
+    ? !transaction.data.success
+    : false;
+  const senders = transaction.data.from ? [transaction.data.from] : [];
+  const recipients = transaction.data.to ? [transaction.data.to] : [];
+
+  return {
+    id: encodeOperationId(accountId, transaction.transaction_hash, type),
+    hash: transaction.transaction_hash,
+    accountId,
+    fee: new BigNumber(0),
+    value: new BigNumber(transaction.amount),
+    type,
+    blockHeight: transaction.height,
+    date: new Date(transaction.time),
+    senders,
+    recipients,
+    hasFailed,
+    blockHash: null,
+    extra: {},
+  };
+};
+
+export const getAccountDetails = async (address: string, accountId: string) => {
+  const accountDetails = await fetchAccountDetails(address);
+  const spendableBalance = new BigNumber(accountDetails.gold_balance);
+  const lockedBalance = new BigNumber(accountDetails.total_locked_gold);
+  const balance = spendableBalance.plus(lockedBalance);
+  const indexerStatus = await fetchStatus();
+
+  const allTransactions = accountDetails.internal_transfers.concat(
+    accountDetails.transactions
+  );
+  const operations = allTransactions.map((transaction) =>
+    transactionToOperation(address, accountId, transaction)
+  );
+
+  return {
+    blockHeight: indexerStatus.last_indexed_height,
+    balance,
+    spendableBalance,
+    operations,
+  };
+};

package/src/families/celo/api/index.ts

@@ -0,0 +1 @@
+export { getAccountDetails } from "./hubble";

package/src/families/celo/api/sdk.ts

@@ -0,0 +1,8 @@
+import { ContractKit, newKit } from "@celo/contractkit";
+import { getEnv } from "../../../env";
+
+let kit: ContractKit;
+export const celoKit = () => {
+  if (!kit) kit = newKit(getEnv("API_CELO_NODE"));
+  return kit;
+};