fix: correctly filter empty delegations

subsquid · Jun 11, 2024 · 07cd537 · 07cd537
1 parent a62be27
commit 07cd537
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 65 deletions.
diff --git a/src/api/subsquid-network-squid/api.graphql b/src/api/subsquid-network-squid/api.graphql
@@ -171,7 +171,7 @@ query workerOwner($workerId: String!) {
 
 query myWorkerDelegations($address: String!, $workerId: String!) {
  workerById(id: $workerId) {
- delegations(where: { realOwner: { id_eq: $address }, deposit_gt: 0  }) {
+ delegations(where: { realOwner: { id_eq: $address }, deposit_gt: 0 }) {
  claimableReward
  claimedReward
  deposit
@@ -209,17 +209,19 @@ query myAssets($address: String!) {
 }
 
 query myDelegations($address: String!) {
- workers(where: { delegations_some: { realOwner: { id_eq: $address } } }) {
- ...WorkerFragment
- delegations(where: { realOwner: { id_eq: $address } }) {
- claimableReward
- claimedReward
- deposit
- locked
- owner {
- id
- type
- }
+ delegations(where: { realOwner: { id_eq: $address }, deposit_gt: 0 }) {
+ claimableReward
+ claimedReward
+ deposit
+ locked
+ owner {
+ id
+ type
+ }
+ worker {
+ ...WorkerFragment
+ totalDelegation
+ capedDelegation
  }
  }
 }

diff --git a/src/api/subsquid-network-squid/graphql.tsx b/src/api/subsquid-network-squid/graphql.tsx
@@ -5743,31 +5743,31 @@ export type MyDelegationsQueryVariables = Exact<{
 
 export type MyDelegationsQuery = {
  __typename?: 'Query';
- workers: Array<{
- __typename?: 'Worker';
- version?: string;
- createdAt: string;
- uptime90Days?: number;
- apr?: number;
- stakerApr?: number;
- totalDelegation: string;
- capedDelegation: string;
- id: string;
- name?: string;
- peerId: string;
- status: WorkerStatus;
- online?: boolean;
- jailed?: boolean;
- dialOk?: boolean;
- jailReason?: string;
- delegations: Array<{
- __typename?: 'Delegation';
- claimableReward: string;
- claimedReward: string;
- deposit: string;
- locked?: boolean;
- owner: { __typename?: 'Account'; id: string; type: AccountType };
- }>;
+ delegations: Array<{
+ __typename?: 'Delegation';
+ claimableReward: string;
+ claimedReward: string;
+ deposit: string;
+ locked?: boolean;
+ owner: { __typename?: 'Account'; id: string; type: AccountType };
+ worker: {
+  __typename?: 'Worker';
+  totalDelegation: string;
+  capedDelegation: string;
+  version?: string;
+  createdAt: string;
+  uptime90Days?: number;
+  apr?: number;
+  stakerApr?: number;
+  id: string;
+  name?: string;
+ peerId: string;
+ status: WorkerStatus;
+ online?: boolean;
+ jailed?: boolean;
+ dialOk?: boolean;
+ jailReason?: string;
+ };
  }>;
 };
 
@@ -6441,17 +6441,19 @@ export const useMyAssetsQuery = <TData = MyAssetsQuery, TError = unknown>(
 
 export const MyDelegationsDocument = `
  query myDelegations($address: String!) {
- workers(where: {delegations_some: {realOwner: {id_eq: $address}}}) {
- ...WorkerFragment
- delegations(where: {realOwner: {id_eq: $address}}) {
- claimableReward
- claimedReward
- deposit
- locked
- owner {
- id
- type
- }
+ delegations(where: {realOwner: {id_eq: $address}, deposit_gt: 0}) {
+ claimableReward
+ claimedReward
+ deposit
+ locked
+ owner {
+ id
+ type
+ }
+ worker {
+ ...WorkerFragment
+ totalDelegation
+ capedDelegation
  }
  }
 }

diff --git a/src/api/subsquid-network-squid/workers-graphql.ts b/src/api/subsquid-network-squid/workers-graphql.ts
@@ -9,6 +9,7 @@ import { useAccount } from '@network/useAccount.ts';
 import { useSquidDataSource } from './datasource';
 import {
  ClaimType,
+ MyDelegationsQuery,
  useAllWorkersQuery,
  useMyClaimsQuery,
  useMyDelegationsQuery,
@@ -19,6 +20,7 @@ import {
  useWorkerDelegationInfoQuery,
  useWorkerOwnerQuery,
  Worker,
+ WorkerFragmentFragment,
 } from './graphql';
 import { useNetworkSettings } from './settings-graphql';
 
@@ -332,15 +334,6 @@ export function useMyClaimsAvailable({ source }: { source?: string } = {}) {
  };
 }
 
-// type ArrayElement<ArrayType extends readonly unknown[]> =
-// ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
-
-// type Delegation = {
-// worker: BlockchainApiWorker;
-// totalReward: any;
-// delegations: Omit<ArrayElement<MyDelegationsQuery['delegations']>, 'worker'>[];
-// };
-
 export function useMyDelegations() {
  const { address } = useAccount();
  const { isPending: isSettingsLoading } = useNetworkSettings();
@@ -351,17 +344,34 @@ export function useMyDelegations() {
  });
 
  const workers = useMemo(() => {
- return (
- data?.workers.map(w => {
- return {
- ...w,
+ type W = WorkerFragmentFragment &
+ Pick<WorkerExtended, 'delegationCapacity'> & {
+ delegations: Omit<MyDelegationsQuery['delegations'][number], 'worker'>[];
+ };
+
+ const workers: Map<string, W> = new Map();
+ data?.delegations.map(d => {
+ let worker = workers.get(d.worker.id);
+ if (!worker) {
+ worker = {
+ ...d.worker,
+ delegations: [],
  delegationCapacity: calculateDelegationCapacity({
- totalDelegation: w.totalDelegation,
- capedDelegation: w.capedDelegation,
+ totalDelegation: d.worker.totalDelegation,
+ capedDelegation: d.worker.capedDelegation,
  }),
  };
- }) || []
- );
+ workers.set(worker.id, worker);
+ }
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const delegation = {
+ ...d,
+ worker: undefined,
+ };
+ delete delegation['worker'];
+ worker.delegations.push(delegation);
+ });
+ return [...workers.values()];
  }, [data]);
 
  return {