@ledgerhq/live-common 25.2.0-next.0 → 25.2.0-next.1

package/src/families/cosmos/bridge/js.ts

@@ -6,15 +6,14 @@ import signOperation from "../js-signOperation";
 import { sync, scanAccounts } from "../js-synchronisation";
 import updateTransaction from "../js-updateTransaction";
 import type { CosmosValidatorItem, Transaction } from "../types";
-import { getValidators, hydrateValidators } from "../validators";
+import cosmosValidatorsManager from "../validators";
 import { makeAccountBridgeReceive } from "../../../bridge/jsHelpers";
-import { broadcast } from "../api/Cosmos";
+import { defaultCosmosAPI } from "../api/Cosmos";
 import {
   asSafeCosmosPreloadData,
   setCosmosPreloadData,
 } from "../preloadedData";
 import type { AccountBridge, CurrencyBridge } from "@ledgerhq/types-live";
-import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 const receive = makeAccountBridgeReceive();
 
@@ -24,8 +23,8 @@ const getPreloadStrategy = (_currency) => ({
 
 const currencyBridge: CurrencyBridge = {
   getPreloadStrategy,
-  preload: async (currency: CryptoCurrency) => {
-    const validators = await getValidators(currency);
+  preload: async () => {
+    const validators = await cosmosValidatorsManager.getValidators();
     setCosmosPreloadData({
       validators,
     });
@@ -42,7 +41,7 @@ const currencyBridge: CurrencyBridge = {
       !Array.isArray(validators)
     )
       return;
-    hydrateValidators(validators);
+    cosmosValidatorsManager.hydrateValidators(validators);
     setCosmosPreloadData(asSafeCosmosPreloadData(data));
   },
   scanAccounts,
@@ -57,7 +56,7 @@ const accountBridge: AccountBridge<Transaction> = {
   sync,
   receive,
   signOperation,
-  broadcast,
+  broadcast: defaultCosmosAPI.broadcast,
 };
 
 export default {

package/src/families/cosmos/bridge/mock.ts

@@ -44,7 +44,7 @@ const createTransaction = (): Transaction => ({
   gas: null,
   memo: null,
   validators: [],
-  cosmosSourceValidator: null,
+  sourceValidator: null,
   networkInfo: null,
   useAllAmount: false,
 });

package/src/families/cosmos/bridge.integration.test.ts

@@ -108,7 +108,7 @@ const cosmos: CurrenciesData<Transaction> = {
             family: "cosmos",
             networkInfo: null,
             validators: [],
-            cosmosSourceValidator: null,
+            sourceValidator: null,
             fees: null,
             gas: null,
             memo: null,
@@ -139,7 +139,7 @@ const cosmos: CurrenciesData<Transaction> = {
             family: "cosmos",
             networkInfo: null,
             validators: [],
-            cosmosSourceValidator: null,
+            sourceValidator: null,
             fees: null,
             gas: null,
             memo: "test",
@@ -187,7 +187,7 @@ const cosmos: CurrenciesData<Transaction> = {
                 amount: new BigNumber(100),
               },
             ],
-            cosmosSourceValidator:
+            sourceValidator:
               "cosmosvaloper1sd4tl9aljmmezzudugs7zlaya7pg2895ws8tfs",
             mode: "redelegate",
           }),
@@ -210,7 +210,7 @@ const cosmos: CurrenciesData<Transaction> = {
                 amount: new BigNumber(0),
               },
             ],
-            cosmosSourceValidator:
+            sourceValidator:
               "cosmosvaloper1sd4tl9aljmmezzudugs7zlaya7pg2895ws8tfs",
           }),
           expectedStatus: {
@@ -231,7 +231,7 @@ const cosmos: CurrenciesData<Transaction> = {
                 amount: new BigNumber(100),
               },
             ],
-            cosmosSourceValidator:
+            sourceValidator:
               "cosmosvaloper1sd4tl9aljmmezzudugs7zlaya7pg2895ws8tfs",
           }),
           expectedStatus: {

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

@@ -4,12 +4,11 @@ import invariant from "invariant";
 import flatMap from "lodash/flatMap";
 import zipWith from "lodash/zipWith";
 import { BigNumber } from "bignumber.js";
-import { getValidators } from "./validators";
-import type { Transaction } from "../../generated/types";
 import { Transaction as CosmosTransaction } from "./types";
 import type { CosmosDelegationInfo } from "./types";
-import { getCryptoCurrencyById } from "../../currencies";
+import cosmosValidatorsManager from "./validators";
 import { AccountLike } from "@ledgerhq/types-live";
+
 const options = [
   {
     name: "mode",
@@ -32,7 +31,7 @@ const options = [
     desc: "add a memo to a transaction",
   },
   {
-    name: "cosmosSourceValidator",
+    name: "sourceValidator",
     type: String,
     desc: "for redelegate, add a source validator",
   },
@@ -53,11 +52,11 @@ const options = [
 function inferTransactions(
   transactions: Array<{
     account: AccountLike;
-    transaction: Transaction;
+    transaction: CosmosTransaction;
   }>,
   opts: Record<string, any>,
   { inferAmount }: any
-): Transaction[] {
+): CosmosTransaction[] {
   return flatMap(transactions, ({ transaction, account }) => {
     invariant(transaction.family === "cosmos", "cosmos family");
     const validatorsAddresses: string[] = opts["cosmosValidator"] || [];
@@ -82,7 +81,7 @@ function inferTransactions(
       fees: opts.fees ? inferAmount(account, opts.fees) : null,
       gas: opts.gasLimit ? new BigNumber(opts.gasLimit) : null,
       validators: validators,
-      cosmosSourceValidator: opts.cosmosSourceValidator,
+      sourceValidator: opts.sourceValidator,
     } as CosmosTransaction;
   });
 }
@@ -110,7 +109,7 @@ const cosmosValidators = {
   }: Partial<{
     format: string;
   }>): Observable<string> =>
-    from(getValidators(getCryptoCurrencyById("cosmos"))).pipe(
+    from(cosmosValidatorsManager.getValidators()).pipe(
       map((validators) => {
         const f =
           (format && cosmosValidatorsFormatters[format]) ||

package/src/families/cosmos/js-buildTransaction.ts

@@ -12,7 +12,7 @@ import {
 import { MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
 import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
-import { getAccount } from "./api/Cosmos";
+import { defaultCosmosAPI } from "./api/Cosmos";
 import BigNumber from "bignumber.js";
 
 export const buildTransaction = async (
@@ -99,7 +99,7 @@ export const buildTransaction = async (
 
     case "redelegate":
       if (
-        !transaction.cosmosSourceValidator ||
+        !transaction.sourceValidator ||
         !transaction.validators ||
         transaction.validators.length < 1 ||
         !transaction.validators[0].address ||
@@ -110,7 +110,7 @@ export const buildTransaction = async (
         msg.push({
           typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate",
           value: {
-            validatorSrcAddress: transaction.cosmosSourceValidator,
+            validatorSrcAddress: transaction.sourceValidator,
             delegatorAddress: account.freshAddress,
             validatorDstAddress: transaction.validators[0].address,
             amount: {
@@ -205,7 +205,7 @@ export const postBuildTransaction = async (
     ],
   ]);
 
-  const { sequence } = await getAccount(account.freshAddress);
+  const { sequence } = await defaultCosmosAPI.getAccount(account.freshAddress);
 
   const txBodyBytes = registry.encode(txBodyFields);
 

package/src/families/cosmos/js-createTransaction.ts

@@ -16,7 +16,7 @@ const createTransaction = (): Transaction => ({
   useAllAmount: false,
   networkInfo: null,
   memo: null,
-  cosmosSourceValidator: null,
+  sourceValidator: null,
   validators: [] as CosmosDelegationInfo[],
 });