Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix voting power to dev #1168

Merged
merged 2 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
formatMMMDD,
formatUTC,
formatUTokenWithPrecision,
getStakingAssetInfo,
getTokenLabel,
} from "lib/utils";

Expand Down Expand Up @@ -41,9 +42,7 @@ export const VotingPowerChart = ({
if (isLoading) return <Loading />;
if (!historicalPowers) return <ErrorFetching dataName="historical powers" />;

const assetInfo = singleStakingDenom
? assetInfos?.[singleStakingDenom]
: undefined;
const assetInfo = getStakingAssetInfo(singleStakingDenom, assetInfos);

const currency = singleStakingDenom
? `${getTokenLabel(singleStakingDenom, assetInfo?.symbol)}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Flex, Heading, Text } from "@chakra-ui/react";
import type Big from "big.js";
import { useMemo } from "react";

import type { HistoricalPowersResponse } from "lib/services/types";
import { big } from "lib/types";
Expand Down Expand Up @@ -36,7 +37,7 @@ export const VotingPowerChartDetails = ({
const isHistoricalPowersContainsData =
historicalPowers && historicalPowers.items.length > 0;

const currentPrice = isHistoricalPowersContainsData
const currentVotingPower = isHistoricalPowersContainsData
? formatUTokenWithPrecision(
historicalPowers.items[historicalPowers.items.length - 1]
.votingPower as U<Token<Big>>,
Expand All @@ -46,11 +47,18 @@ export const VotingPowerChartDetails = ({
)
: "";

const compareVotingPower = isHistoricalPowersContainsData
? historicalPowers.items[
historicalPowers.items.length - 1
].votingPower.minus(historicalPowers.items[0].votingPower)
: big(0);
// NOTE: compute 24 hrs voting power change
const compareVotingPower = useMemo(() => {
if (isHistoricalPowersContainsData) {
const presentVotingPower =
historicalPowers.items[historicalPowers.items.length - 1].votingPower;
const yesterdayVotingPower =
historicalPowers.items[historicalPowers.items.length - 25]
?.votingPower ?? big(0);
return presentVotingPower.minus(yesterdayVotingPower);
}
return big(0);
}, [historicalPowers.items, isHistoricalPowersContainsData]);

const formattedVotingPower = `${formatArithmetic(compareVotingPower)}${formatUTokenWithPrecision(
compareVotingPower.abs() as U<Token<Big>>,
Expand All @@ -65,7 +73,7 @@ export const VotingPowerChartDetails = ({
{singleStakingDenom ? "Current Bonded Token" : "Current Voting Powers"}
</Heading>
<Heading variant="h5" fontWeight={600}>
{currentPrice} {currency}
{currentVotingPower} {currency}
</Heading>
<Text variant="body1">
<Text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
formatPrettyPercent,
formatPrice,
formatUTokenWithPrecision,
getStakingAssetInfo,
getTokenLabel,
toToken,
} from "lib/utils";
Expand Down Expand Up @@ -98,9 +99,7 @@ export const VotingPowerOverview = ({
}: VotingPowerOverviewProps) => {
const { isFullTier } = useTierConfig();
const isMobile = useMobile();
const assetInfo = singleStakingDenom
? assetInfos?.[singleStakingDenom]
: undefined;
const assetInfo = getStakingAssetInfo(singleStakingDenom, assetInfos);

const votingPowerPercent = formatPrettyPercent(
divWithDefault(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { useInternalNavigate } from "lib/app-provider";
import { MobileCardTemplate, MobileLabel } from "lib/components/table";
import { ValidatorBadge } from "lib/components/ValidatorBadge";
import type {
AssetInfo,
Option,
Ratio,
Token,
TokenWithValue,
U,
ValidatorData,
} from "lib/types";
Expand All @@ -24,15 +24,15 @@ interface ValidatorsTableMobileCardProps {
isActive: boolean;
totalVotingPower: Big;
minCommissionRate: number;
denomToken: Option<TokenWithValue>;
assetInfo: Option<AssetInfo>;
showUptime: boolean;
}
export const ValidatorsTableMobileCard = ({
validator,
isActive,
totalVotingPower,
minCommissionRate,
denomToken,
assetInfo,
showUptime,
}: ValidatorsTableMobileCardProps) => {
const navigate = useInternalNavigate();
Expand Down Expand Up @@ -92,12 +92,12 @@ export const ValidatorsTableMobileCard = ({
(
{formatUTokenWithPrecision(
validator.votingPower as U<Token<Big>>,
denomToken?.precision ?? 0,
assetInfo?.precision ?? 0,
false,
2
)}
{denomToken
? ` ${getTokenLabel(denomToken.denom, denomToken.symbol)}`
{assetInfo?.id
? ` ${getTokenLabel(assetInfo.id, assetInfo.symbol)}`
: undefined}
)
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { useInternalNavigate } from "lib/app-provider";
import { TableRow } from "lib/components/table";
import { ValidatorBadge } from "lib/components/ValidatorBadge";
import type {
AssetInfo,
Option,
Ratio,
Token,
TokenWithValue,
U,
ValidatorAddr,
ValidatorData,
Expand All @@ -27,7 +27,7 @@ interface ValidatorsTableRowProps {
validator: ValidatorData;
totalVotingPower: Big;
minCommissionRate: number;
denomToken: Option<TokenWithValue>;
assetInfo: Option<AssetInfo>;
showUptime: boolean;
}

Expand All @@ -37,7 +37,7 @@ export const ValidatorsTableRow = ({
validator,
totalVotingPower,
minCommissionRate,
denomToken,
assetInfo,
showUptime,
}: ValidatorsTableRowProps) => {
const navigate = useInternalNavigate();
Expand Down Expand Up @@ -93,12 +93,12 @@ export const ValidatorsTableRow = ({
(
{formatUTokenWithPrecision(
validator.votingPower as U<Token<Big>>,
denomToken?.precision ?? 0,
assetInfo?.precision ?? 0,
false,
2
)}
{denomToken
? ` ${getTokenLabel(denomToken.denom, denomToken.symbol)}`
{assetInfo?.id
? ` ${getTokenLabel(assetInfo.id, assetInfo.symbol)}`
: undefined}
)
</Text>
Expand Down
10 changes: 4 additions & 6 deletions src/lib/pages/validators/components/validators-table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useAssetInfos } from "lib/services/assetService";
import { useStakingParamsLcd } from "lib/services/staking";
import type { ValidatorsResponse } from "lib/services/types";
import type { Option } from "lib/types";
import { coinToTokenWithValue } from "lib/utils";
import { getStakingAssetInfo } from "lib/utils";

import { ValidatorsPercentDivider } from "./ValidatorsPercentDivider";
import { ValidatorsTableHeader } from "./ValidatorsTableHeader";
Expand Down Expand Up @@ -66,9 +66,7 @@ export const ValidatorsTable = ({
);

const displayDividers = order === ValidatorOrder.VotingPower && isDesc;
const denomToken = stakingParams?.bondDenom
? coinToTokenWithValue(stakingParams.bondDenom, "0", assetInfos)
: undefined;
const assetInfo = getStakingAssetInfo(stakingParams?.bondDenom, assetInfos);

const templateColumns = `${isActive ? "64px " : ""}3fr 2fr ${showUptime ? "110px" : ""} 110px`;
return (
Expand All @@ -82,7 +80,7 @@ export const ValidatorsTable = ({
validator={validator}
totalVotingPower={data.metadata.totalVotingPower}
minCommissionRate={data.metadata.minCommissionRate}
denomToken={denomToken}
assetInfo={assetInfo}
showUptime={showUptime}
/>
))}
Expand All @@ -107,7 +105,7 @@ export const ValidatorsTable = ({
validator={validator}
totalVotingPower={data.metadata.totalVotingPower}
minCommissionRate={data.metadata.minCommissionRate}
denomToken={denomToken}
assetInfo={assetInfo}
showUptime={showUptime}
/>
{displayDividers &&
Expand Down
22 changes: 21 additions & 1 deletion src/lib/utils/validator.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Ripemd160, sha256 } from "@cosmjs/crypto";
import { fromBase64, fromHex, toBech32, toHex } from "@cosmjs/encoding";

import type { ConsensusPubkey } from "lib/types";
import type { AssetInfo, AssetInfos, ConsensusPubkey, Option } from "lib/types";
import { zConsensusAddr } from "lib/types";

export const convertRawConsensusAddrToConsensusAddr = (
Expand Down Expand Up @@ -30,3 +30,23 @@ export const convertConsensusPubkeyToConsensusAddr = (

return zConsensusAddr.parse("");
};

export const getStakingAssetInfo = (
singleStakingDenom: Option<string>,
assetInfos: Option<AssetInfos>
): Option<AssetInfo> => {
if (singleStakingDenom) return assetInfos?.[singleStakingDenom];
// NOTE: divided by 1e6 for initia case
return {
coingecko: "",
description: "",
id: "",
logo: "",
name: "",
precision: 6,
price: 0,
slugs: [],
symbol: "",
type: "",
};
};
Loading