diff --git a/src/components/validators/ValidatorPortfolio.tsx b/src/components/validators/ValidatorPortfolio.tsx index a12955c5..39c1c9a7 100644 --- a/src/components/validators/ValidatorPortfolio.tsx +++ b/src/components/validators/ValidatorPortfolio.tsx @@ -37,7 +37,7 @@ export type ValidatorPortfolioProps = { export const ValidatorPortfolio = (props: ValidatorPortfolioProps) => { const { hotkey } = props; - const balance = useValidatorBalance({ delegate: { equalTo: hotkey } }); + const balance = useValidatorBalance({ address: { equalTo: hotkey } }); const coldKey = useColdKey(hotkey); const validatorStaked = useValidatorStaked(hotkey, coldKey); const loading = balance.loading || validatorStaked === undefined; diff --git a/src/hooks/useValidatorBalance.ts b/src/hooks/useValidatorBalance.ts index 98cb9ae3..f0289cf2 100644 --- a/src/hooks/useValidatorBalance.ts +++ b/src/hooks/useValidatorBalance.ts @@ -1,9 +1,9 @@ import { FetchOptions } from "../model/fetchOptions"; -import { DelegateBalanceFilter, getValidatorBalances } from "../services/delegateService"; +import { ValidatorFilter, getValidatorBalances } from "../services/delegateService"; import { useResource } from "./useResource"; export function useValidatorBalance( - filter: DelegateBalanceFilter | undefined, + filter: ValidatorFilter | undefined, options?: FetchOptions ) { return useResource(getValidatorBalances, [filter], options); diff --git a/src/model/delegate.ts b/src/model/delegate.ts index 670f0cc1..b2ad9e64 100644 --- a/src/model/delegate.ts +++ b/src/model/delegate.ts @@ -22,7 +22,7 @@ export type DelegateBalance = { }; export type ValidatorBalance = { - aggregates: any; + nodes: any; }; export type DelegateInfo = { diff --git a/src/screens/validators.tsx b/src/screens/validators.tsx index 8b40d235..70badcbc 100644 --- a/src/screens/validators.tsx +++ b/src/screens/validators.tsx @@ -104,7 +104,7 @@ export const ValidatorPage = () => { const info = verifiedDelegates[address]; - const balance = useValidatorBalance({ delegate: { equalTo: address } }); + const balance = useValidatorBalance({ address: { equalTo: address } }); const validatorStakeHistory = useValidatorStakeHistory(address); const nominatorsInitialOrder: DelegateBalancesOrder = "AMOUNT_DESC"; diff --git a/src/services/delegateService.ts b/src/services/delegateService.ts index 7fe932eb..ff13f0da 100644 --- a/src/services/delegateService.ts +++ b/src/services/delegateService.ts @@ -21,6 +21,7 @@ export type DelegatesOrder = | "BLOCK_NUMBER_ASC" | "BLOCK_NUMBER_DESC"; +export type ValidatorFilter = object; export type DelegateBalanceFilter = object; export type DelegateBalancesOrder = | "ID_ASC" @@ -160,15 +161,13 @@ async function fetchDelegateBalances( } async function fetchValidatorBalances( - filter: DelegateBalanceFilter | undefined + filter: ValidatorFilter | undefined ) { - const response = await fetchIndexer<{ delegateBalances: ValidatorBalance }>( - `query ($filter: DelegateBalanceFilter) { - delegateBalances(filter: $filter) { - aggregates { - sum { - amount - } + const response = await fetchIndexer<{ validators: ValidatorBalance }>( + `query ($filter: ValidatorFilter) { + validators(filter: $filter) { + nodes { + amount } } }`, @@ -177,7 +176,7 @@ async function fetchValidatorBalances( } ); - const data = response.delegateBalances?.aggregates?.sum?.amount ?? 0; + const data = response.validators?.nodes[0]?.amount ?? 0; return data; }