Skip to content

Commit

Permalink
fix: shorten missing funds error
Browse files Browse the repository at this point in the history
coin cosmos module

cleanup pnpmlock

but back claimrewardsfeeswarning in ledgerjs errors

move types, fix deviceTransactionConfig

remove comment api cosmos

remove NOTE about validators amount

regen pnpmlock

regen pnpmlock #2

lint
  • Loading branch information
hedi-edelbloute authored and Wozacosta committed Aug 30, 2024
1 parent e5c578b commit 55b9685
Show file tree
Hide file tree
Showing 226 changed files with 3,797 additions and 1,372 deletions.
8 changes: 8 additions & 0 deletions .changeset/bright-dots-fetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@ledgerhq/coin-cosmos": patch
"ledger-live-desktop": patch
"live-mobile": patch
"@ledgerhq/live-common": patch
---

more cosmos to its own module
1 change: 1 addition & 0 deletions apps/ledger-live-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"dependencies": {
"@braze/web-sdk": "^4.6.3",
"@ledgerhq/coin-bitcoin": "workspace:^",
"@ledgerhq/coin-cosmos": "workspace:^",
"@ledgerhq/coin-evm": "workspace:^",
"@ledgerhq/coin-framework": "workspace:^",
"@ledgerhq/devices": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Text from "~/renderer/components/Text";
import InfoCircle from "~/renderer/icons/InfoCircle";
import ToolTip from "~/renderer/components/Tooltip";
import { CosmosAccount } from "@ledgerhq/live-common/families/cosmos/types";
import { CosmosAPI } from "@ledgerhq/live-common/families/cosmos/api/Cosmos";
import { CosmosAPI } from "@ledgerhq/coin-cosmos/api/Cosmos";
import { SubAccount } from "@ledgerhq/types-live";
import { useAccountUnit } from "~/renderer/hooks/useAccountUnit";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import StepClaimRewards, { StepClaimRewardsFooter } from "./steps/StepClaimRewar
import GenericStepConnectDevice from "~/renderer/modals/Send/steps/GenericStepConnectDevice";
import StepConfirmation, { StepConfirmationFooter } from "./steps/StepConfirmation";
import logger from "~/renderer/logger";
import { CosmosAccount } from "@ledgerhq/live-common/families/cosmos/types";
import type { CosmosAccount } from "@ledgerhq/coin-cosmos/types/index";

export type Data = {
account: CosmosAccount;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ToggleButton from "~/renderer/components/ToggleButton";
import InfoCircle from "~/renderer/icons/InfoCircle";
import Text from "~/renderer/components/Text";
import Popover from "~/renderer/components/Popover";
import { CosmosLikeTransaction } from "@ledgerhq/live-common/families/cosmos/types";
import type { CosmosLikeTransaction } from "@ledgerhq/coin-cosmos/types/index";
const options = [
{
value: "claimRewardCompound",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import Text from "~/renderer/components/Text";
import DelegationSelectorField from "../fields/DelegationSelectorField";
import ErrorBanner from "~/renderer/components/ErrorBanner";
import AccountFooter from "~/renderer/modals/Send/AccountFooter";
import {
import type {
CosmosLikeTransaction,
CosmosMappedDelegation,
} from "@ledgerhq/live-common/families/cosmos/types";
} from "@ledgerhq/coin-cosmos/types/index";

import { useAccountUnit } from "~/renderer/hooks/useAccountUnit";

export default function StepClaimRewards({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import { TFunction } from "i18next";
import { Device } from "@ledgerhq/live-common/hw/actions/types";
import { Step } from "~/renderer/components/Stepper";
import { Operation } from "@ledgerhq/types-live";
import {
import type {
CosmosAccount,
Transaction,
TransactionStatus,
} from "@ledgerhq/live-common/families/cosmos/types";
} from "@ledgerhq/coin-cosmos/types/index";

import { OpenModal } from "~/renderer/actions/modals";
export type StepId = "claimRewards" | "connectDevice" | "confirmation";
export type StepProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ import LinkWithExternalIcon from "~/renderer/components/LinkWithExternalIcon";
import IconChartLine from "~/renderer/icons/ChartLine";
import { Header, UnbondingHeader } from "./Header";
import { Row, UnbondingRow } from "./Row";
import cosmosBase from "@ledgerhq/live-common/families/cosmos/chain/cosmosBase";
import ToolTip from "~/renderer/components/Tooltip";
import ClaimRewards from "~/renderer/icons/ClaimReward";
import DelegateIcon from "~/renderer/icons/Delegate";
import TableContainer, { TableHeader } from "~/renderer/components/TableContainer";
import { CosmosAccount } from "@ledgerhq/live-common/families/cosmos/types";
import { DelegationActionsModalName } from "../modals";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { useLocalizedUrl } from "~/renderer/hooks/useLocalizedUrls";
import { useAccountUnit } from "~/renderer/hooks/useAccountUnit";
import cosmosBase from "@ledgerhq/coin-cosmos/chain/cosmosBase";

const Wrapper = styled(Box).attrs(() => ({
p: 3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { getCurrentDevice } from "~/renderer/reducers/devices";
import { OpenModal, openModal } from "~/renderer/actions/modals";

import StepAmount, { StepAmountFooter } from "./steps/StepAmount";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { BigNumber } from "bignumber.js";
import Stepper from "~/renderer/components/Stepper";
import StepDelegation, { StepDelegationFooter } from "./steps/StepDelegation";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import EarnRewardsInfoModal from "~/renderer/components/EarnRewardsInfoModal";
import WarnBox from "~/renderer/components/WarnBox";
import { openURL } from "~/renderer/linking";
import LinkWithExternalIcon from "~/renderer/components/LinkWithExternalIcon";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { CosmosAccount } from "@ledgerhq/live-common/families/cosmos/types";

export type Props = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Rewards from "~/renderer/images/rewards.svg";
import Alert from "~/renderer/components/Alert";
import LinkWithExternalIcon from "~/renderer/components/LinkWithExternalIcon";
import { openURL } from "~/renderer/linking";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { urls } from "~/config/urls";
import { useLocalizedUrl } from "~/renderer/hooks/useLocalizedUrls";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import ChevronRight from "~/renderer/icons/ChevronRightSmall";
import CosmosFamilyLedgerValidatorIcon from "~/renderer/families/cosmos/shared/components/CosmosFamilyLedgerValidatorIcon";
import Text from "~/renderer/components/Text";
import AccountFooter from "~/renderer/modals/Send/AccountFooter";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { CosmosMappedDelegation } from "@ledgerhq/live-common/families/cosmos/types";

const SelectButton = styled(Base)`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const CosmosDelegateValidatorsField = ({
const { validators } = transaction;
const currencyId = mainAccount.currency.id;
const { validators: cosmosValidators } = useCosmosFamilyPreloadData(currencyId);
const mappedValidators = mapDelegationInfo(validators || [], cosmosValidators, unit);
const mappedValidators = mapDelegationInfo(validators || [], cosmosValidators, unit, transaction);
return mappedValidators && mappedValidators.length > 0 ? (
<Box justifyContent="space-between" mb={2}>
<TransactionConfirmField label={field.label} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Text from "~/renderer/components/Text";
import Alert from "~/renderer/components/Alert";
import ErrorBanner from "~/renderer/components/ErrorBanner";
import AccountFooter from "~/renderer/modals/Send/AccountFooter";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";

export default function StepAmount({
account,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { getAccountCurrency } from "@ledgerhq/live-common/account/index";
import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
import { getAddressExplorer, getDefaultExplorerView } from "@ledgerhq/live-common/explorers";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { mapDelegationInfo } from "@ledgerhq/live-common/families/cosmos/logic";
import { useCosmosFamilyPreloadData } from "@ledgerhq/live-common/families/cosmos/react";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { CosmosValidatorItem } from "@ledgerhq/live-common/families/cosmos/types";
import React from "react";
import cosmosBase from "@ledgerhq/live-common/families/cosmos/chain/cosmosBase";
import cosmosBase from "@ledgerhq/coin-cosmos/chain/cosmosBase";
import { IconContainer } from "~/renderer/components/Delegation/ValidatorRow";
import LedgerLiveLogo from "~/renderer/components/LedgerLiveLogo";
import Logo from "~/renderer/icons/Logo";
import FirstLetterIcon from "~/renderer/components/FirstLetterIcon";

const CosmosFamilyLedgerValidatorIcon = ({
validator,
}: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
import { getDefaultExplorerView, getAddressExplorer } from "@ledgerhq/live-common/explorers";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { CosmosValidatorItem } from "@ledgerhq/live-common/families/cosmos/types";
import { CryptoCurrency, Unit } from "@ledgerhq/types-cryptoassets";
import { BigNumber } from "bignumber.js";
Expand Down
1 change: 1 addition & 0 deletions apps/ledger-live-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"@formatjs/intl-locale": "^3.0.0",
"@formatjs/intl-pluralrules": "^5.0.0",
"@formatjs/intl-relativetimeformat": "^11.1.8",
"@ledgerhq/coin-cosmos": "workspace:^",
"@ledgerhq/coin-evm": "workspace:^",
"@ledgerhq/coin-framework": "workspace:^",
"@ledgerhq/devices": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { ScrollView } from "react-native";
import { useTranslation } from "react-i18next";
import BigNumber from "bignumber.js";
import { getCryptoCurrencyIcon } from "@ledgerhq/live-common/reactNative";
import { CosmosAccount } from "@ledgerhq/live-common/families/cosmos/types";
import { CosmosAPI } from "@ledgerhq/live-common/families/cosmos/api/Cosmos";
import { CosmosAccount } from "@ledgerhq/coin-cosmos/types/index";
import { CosmosAPI } from "@ledgerhq/coin-cosmos/api/Cosmos";
import { Account } from "@ledgerhq/types-live";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { Unit } from "@ledgerhq/types-cryptoassets";
import invariant from "invariant";
import InfoModal from "~/modals/Info";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getAccountBridge } from "@ledgerhq/live-common/bridge/index";
import { getMainAccount, getAccountCurrency } from "@ledgerhq/live-common/account/index";
import useBridgeTransaction from "@ledgerhq/live-common/bridge/useBridgeTransaction";
import { useTheme } from "@react-navigation/native";
import cosmosBase from "@ledgerhq/live-common/families/cosmos/chain/cosmosBase";
import cosmosBase from "@ledgerhq/coin-cosmos/chain/cosmosBase";
import { accountScreenSelector } from "~/reducers/accounts";
import Button from "~/components/Button";
import LText from "~/components/LText";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import invariant from "invariant";
import { Trans, useTranslation } from "react-i18next";
import { useTheme } from "@react-navigation/native";
import { Alert, Button, Flex, Text } from "@ledgerhq/native-ui";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { getAccountCurrency } from "@ledgerhq/live-common/account/index";
import { getMainAccount } from "@ledgerhq/live-common/account/helpers";
import { ScreenName } from "~/const";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { formatCurrencyUnit, getCurrencyColor } from "@ledgerhq/live-common/curr
import { getMaxDelegationAvailable } from "@ledgerhq/live-common/families/cosmos/logic";
import { useLedgerFirstShuffledValidatorsCosmosFamily } from "@ledgerhq/live-common/families/cosmos/react";
import { CosmosAccount, CosmosValidatorItem } from "@ledgerhq/live-common/families/cosmos/types";
import cosmosBase from "@ledgerhq/live-common/families/cosmos/chain/cosmosBase";
import cosmosBase from "@ledgerhq/coin-cosmos/chain/cosmosBase";
import { AccountLike } from "@ledgerhq/types-live";
import { Text } from "@ledgerhq/native-ui";
import { useTheme } from "@react-navigation/native";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
import { useTheme } from "@react-navigation/native";
import { Text } from "@ledgerhq/native-ui";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import CounterValue from "~/components/CounterValue";
import ArrowRight from "~/icons/ArrowRight";
import LText from "~/components/LText";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
AccountBannerState,
getAccountBannerState as getCosmosBannerState,
} from "@ledgerhq/live-common/families/cosmos/banner";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import useBridgeTransaction from "@ledgerhq/live-common/bridge/useBridgeTransaction";
import { getAccountBridge } from "@ledgerhq/live-common/bridge/index";
import { AccountLike } from "@ledgerhq/types-live";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useTheme } from "@react-navigation/native";
import LText from "~/components/LText";
import { DataRow, TextValueField } from "~/components/ValidateOnDeviceDataRow";
import Info from "~/icons/Info";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import { useAccountUnit } from "~/hooks/useAccountUnit";

type FieldProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
import { BigNumber } from "bignumber.js";
import type { CosmosAccount, CosmosOperation } from "@ledgerhq/live-common/families/cosmos/types";
import { useSelector } from "react-redux";
import cryptoFactory from "@ledgerhq/live-common/families/cosmos/chain/chain";
import cryptoFactory from "@ledgerhq/coin-cosmos/chain/chain";
import Section from "~/screens/OperationDetails/Section";
import { discreetModeSelector } from "~/reducers/settings";
import { useSettings } from "~/hooks";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
} from "@ledgerhq/live-common/families/cosmos/types";
import type { Unit } from "@ledgerhq/types-cryptoassets";
import { useTheme } from "@react-navigation/native";
import cosmosBase from "@ledgerhq/live-common/families/cosmos/chain/cosmosBase";
import cosmosBase from "@ledgerhq/coin-cosmos/chain/cosmosBase";
import LText from "~/components/LText";
import CurrencyUnitValue from "~/components/CurrencyUnitValue";
import ArrowRight from "~/icons/ArrowRight";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CosmosValidatorItem } from "@ledgerhq/live-common/families/cosmos/types";
import cosmosBase from "@ledgerhq/live-common/families/cosmos/chain/cosmosBase";
import cosmosBase from "@ledgerhq/coin-cosmos/chain/cosmosBase";
import { AccountLike } from "@ledgerhq/types-live";
import { Text } from "@ledgerhq/native-ui";
import React, { useCallback } from "react";
Expand Down
41 changes: 41 additions & 0 deletions libs/coin-modules/coin-cosmos/.unimportedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"entry": [
"src/account.ts",
"src/bridge/js.ts",
"src/cli.ts",
"src/deviceTransactionConfig.ts",
"src/CosmosValidatorsManager.ts",
"src/errors.ts",
"src/formatters.ts",
"src/hw-getAddress.ts",
"src/initAccount.ts",
"src/mock.ts",
"src/preloadedData.ts",
"src/preloadedData.mock.ts",
"src/serialization.ts",
"src/specs.ts",
"src/transaction.ts"
],
"ignorePatterns": [
"**/node_modules/**",
"**/*.fixture.ts",
"**/*.mock.ts",
"**/*.test.{js,jsx,ts,tsx}"
],
"ignoreUnresolved": [],
"ignoreUnimported": [
"src/bridge/index.ts",
"src/broadcast.ts",
"src/buildOptimisticOperation.ts",
"src/buildTransaction.ts",
"src/cli.ts",
"src/config.ts",
"src/createTransaction.ts",
"src/estimateMaxSpendable.ts",
"src/getTransactionStatus.ts",
"src/prepareTransaction.ts",
"src/signOperation.ts",
"src/synchronisation.ts"
],
"ignoreUnused": ["rxjs"]
}
9 changes: 9 additions & 0 deletions libs/coin-modules/coin-cosmos/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
module.exports = {
collectCoverageFrom: ["src/**/*.ts"],
coverageDirectory: "coverage",
preset: "ts-jest",
testEnvironment: "node",
testPathIgnorePatterns: ["lib/", "lib-es/", ".integration.test.ts"],
modulePathIgnorePatterns: ["__tests__/fixtures"],
};
Loading

0 comments on commit 55b9685

Please sign in to comment.