coin config refacto

libs/coin-framework/src/config.ts

@@ -1,3 +1,4 @@
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { MissingCoinConfig } from "./errors";
 
 type ConfigStatus =
@@ -21,7 +22,8 @@ export type CurrencyConfig = {
   [key: string]: unknown;
 };
 
-export type CoinConfig<T extends CurrencyConfig> = () => T;
+// export type CoinConfig<T extends CurrencyConfig> = () => T;
+export type CoinConfig<T extends CurrencyConfig> = (currency?: CryptoCurrency) => T;
 
 function buildCoinConfig<T extends CurrencyConfig>() {
   let coinConfig: CoinConfig<T> | undefined;
@@ -30,12 +32,12 @@ function buildCoinConfig<T extends CurrencyConfig>() {
     coinConfig = config;
   };
 
-  const getCoinConfig = (): T => {
+  const getCoinConfig = (currency?: CryptoCurrency): T => {
     if (!coinConfig) {
       throw new MissingCoinConfig();
     }
 
-    return coinConfig();
+    return coinConfig(currency);
   };
 
   return {

libs/coin-modules/coin-cosmos/src/bridge/index.ts

@@ -7,8 +7,9 @@ import {
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
 import type { AccountBridge, CurrencyBridge } from "@ledgerhq/types-live";
 
+import { CoinConfig } from "@ledgerhq/coin-framework/lib/config";
 import { CosmosAPI } from "../api/Cosmos";
-import { CoinConfig, setCoinConfig } from "../config";
+import cosmosCoinConfig, { CosmosCoinConfig } from "../config";
 import { createTransaction } from "../createTransaction";
 import { estimateMaxSpendable } from "../estimateMaxSpendable";
 import getTransactionStatus from "../getTransactionStatus";
@@ -22,11 +23,7 @@ import {
 } from "../serialization";
 import { buildSignOperation } from "../signOperation";
 import { getAccountShape } from "../synchronisation";
-import type {
-  CosmosAccount,
-  Transaction,
-  TransactionStatus,
-} from "../types";
+import type { CosmosAccount, Transaction, TransactionStatus } from "../types";
 import { CosmosSigner } from "../types/signer";
 import { updateTransaction } from "../updateTransaction";
 import { getPreloadStrategy, hydrate, preload } from "./preload";
@@ -78,8 +75,11 @@ function buildAccountBridge(
   };
 }
 
-export function createBridges(signerContext: SignerContext<CosmosSigner>, coinConfig: CoinConfig) {
-  setCoinConfig(coinConfig);
+export function createBridges(
+  signerContext: SignerContext<CosmosSigner>,
+  coinConfig: CoinConfig<CosmosCoinConfig>,
+) {
+  cosmosCoinConfig.setCoinConfig(coinConfig);
   return {
     currencyBridge: buildCurrencyBridge(signerContext),
     accountBridge: buildAccountBridge(signerContext),

libs/coin-modules/coin-cosmos/src/bridge/preload.ts

@@ -3,7 +3,7 @@ import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 import { CosmosValidatorsManager } from "../CosmosValidatorsManager";
 import cryptoFactory from "../chain/chain";
-import { getCoinConfig } from "../config";
+import cosmosCoinConfig from "../config";
 import { asSafeCosmosPreloadData, setCosmosPreloadData } from "../preloadedData";
 import type { CosmosCurrencyConfig, CosmosValidatorItem } from "../types";
 
@@ -12,7 +12,7 @@ export const getPreloadStrategy = () => ({
 });
 
 export const preload = async (currency: CryptoCurrency) => {
-  const config = getCoinConfig(currency);
+  const config = cosmosCoinConfig.getCoinConfig(currency);
   const cosmosValidatorsManager = new CosmosValidatorsManager(getCryptoCurrencyById(currency.id), {
     endPoint: (config as unknown as CosmosCurrencyConfig).lcd,
   });
@@ -27,13 +27,6 @@ export const preload = async (currency: CryptoCurrency) => {
   });
 };
 
-// export const preload = async () => {
-//   const superRepresentatives = await getTronSuperRepresentatives();
-//   return {
-//     superRepresentatives,
-//   };
-// };
-
 export const hydrate = (
   data: { validators?: CosmosValidatorItem[]; config: CosmosCurrencyConfig },
   currency: CryptoCurrency,
@@ -49,20 +42,3 @@ export const hydrate = (
   cosmosValidatorsManager.hydrateValidators(validators);
   setCosmosPreloadData(currency.id, asSafeCosmosPreloadData(data));
 };
-
-// export const hydrate = (data?: { superRepresentatives?: SuperRepresentative[] }) => {
-//   if (!data || !data.superRepresentatives) return;
-
-//   const { superRepresentatives } = data;
-
-//   if (
-//     !superRepresentatives ||
-//     typeof superRepresentatives !== "object" ||
-//     !Array.isArray(superRepresentatives)
-//   )
-//     return;
-
-//   hydrateSuperRepresentatives(superRepresentatives);
-// };
-
-// export c

libs/coin-modules/coin-cosmos/src/cli.ts

@@ -1,14 +1,14 @@
-import { from, Observable } from "rxjs";
-import { map } from "rxjs/operators";
+import { BigNumber } from "bignumber.js";
 import invariant from "invariant";
 import flatMap from "lodash/flatMap";
 import zipWith from "lodash/zipWith";
-import { BigNumber } from "bignumber.js";
-import { Transaction as CosmosTransaction } from "./types";
-import type { CosmosDelegationInfo } from "./types";
-import { AccountLike } from "@ledgerhq/types-live";
+import { from, Observable } from "rxjs";
+import { map } from "rxjs/operators";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/index";
+import { AccountLike } from "@ledgerhq/types-live";
 import { CosmosValidatorsManager } from "./CosmosValidatorsManager";
+import type { CosmosDelegationInfo } from "./types";
+import { Transaction as CosmosTransaction } from "./types";
 
 const options = [
   {

libs/coin-modules/coin-cosmos/src/config.ts

@@ -2,7 +2,7 @@ import { ConfigInfo } from "@ledgerhq/live-config/LiveConfig";
 
 type CosmosConfig = Record<string, ConfigInfo>;
 
-const cosmosConfig: CosmosConfig = {
+export const cosmosConfig: CosmosConfig = {
   config_currency_axelar: {
     type: "object",
     default: {
@@ -160,26 +160,8 @@ const cosmosConfig: CosmosConfig = {
   },
 };
 
-import { CurrencyConfig } from "@ledgerhq/coin-framework/config";
-import { MissingCoinConfig } from "@ledgerhq/coin-framework/errors";
-import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+import buildCoinConfig, { type CurrencyConfig } from "@ledgerhq/coin-framework/config";
 
 export type CosmosCoinConfig = CurrencyConfig & CosmosConfig;
-
-export type CoinConfig = (currency: CryptoCurrency) => CosmosCoinConfig;
-
-let coinConfig: CoinConfig | undefined;
-
-export const setCoinConfig = (config: CoinConfig): void => {
-  coinConfig = config;
-};
-
-export const getCoinConfig = (currency: CryptoCurrency): CosmosCoinConfig => {
-  if (!coinConfig) {
-    throw new MissingCoinConfig();
-  }
-
-  return coinConfig(currency);
-};
-
-export { cosmosConfig };
+const coinConfig = buildCoinConfig<CosmosCoinConfig>();
+export default coinConfig;

libs/ledger-live-common/src/families/cosmos/setup.ts

@@ -1,6 +1,6 @@
 // Goal of this file is to inject all necessary device/signer dependency to coin-modules
 
-import { createBridges } from "@ledgerhq/coin-cosmos/bridge/js";
+import { createBridges } from "@ledgerhq/coin-cosmos/bridge/index";
 import makeCliTools from "@ledgerhq/coin-cosmos/cli";
 import { CosmosCoinConfig } from "@ledgerhq/coin-cosmos/config";
 import cosmosResolver from "@ledgerhq/coin-cosmos/hw-getAddress";
@@ -24,10 +24,13 @@ const createSigner: CreateSigner<CosmosSigner> = (transport: Transport) => {
     getAddress: hwCosmos.getAddress.bind(hwCosmos),
   };
 };
-const getCurrencyConfig = (currency: CryptoCurrency): CosmosCoinConfig => {
-  return getCurrencyConfiguration(currency);
-};
 
+const getCurrencyConfig = (currency?: CryptoCurrency) => {
+  if (!currency) {
+    throw new Error("No currency provided");
+  }
+  return getCurrencyConfiguration<CosmosCoinConfig>(currency);
+};
 const bridge: Bridge<Transaction, CosmosAccount, TransactionStatus> = createBridges(
   executeWithSigner(createSigner),
   getCurrencyConfig,