Merge pull request #743 from subquery/feat/add-query-rewards

feat: add query rewards and total rewards
subquery · Jul 16, 2024 · f903e39 · f903e39
2 parents ef9183d + c700566
commit f903e39
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 3 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -44,7 +44,7 @@ const makeDebugInfo = (debugInfo: object) => {
 };
 
 const RenderRouter: React.FC = () => {
-  const { address, connector } = useAccount();
+  const { address, connector, isConnected } = useAccount();
   const { signer } = useEthersSigner();
   const provider = useEthersProviderWithPublic();
 
@@ -56,6 +56,7 @@ const RenderRouter: React.FC = () => {
         signerAddress: 'not collected',
         signerChainId: 'not collected',
         providerNetwork: provider._network.name,
+        isConnected: isConnected,
       });
 
       const signerAddress = await signer?.getAddress();
@@ -66,6 +67,7 @@ const RenderRouter: React.FC = () => {
         signerAddress,
         signerChainId,
         providerNetwork: provider._network.name,
+        isConnected: isConnected,
       });
     })();
   }, [address, connector, signer, provider]);

diff --git a/src/hooks/useSortedIndexerDeployments.tsx b/src/hooks/useSortedIndexerDeployments.tsx
@@ -31,6 +31,8 @@ export interface UseSortedIndexerDeploymentsReturn extends Pick<DeploymentIndexe
   allocatedAmount?: string;
   lastEraAllocatedRewards?: string;
   lastEraBurnt?: string;
+  lastEraQueryRewards?: string;
+  totalRewards?: string;
 }
 
 // TODO: apply with query hook
@@ -49,6 +51,7 @@ export function useSortedIndexerDeployments(indexer: string): AsyncData<Array<Us
     fetchPolicy: 'network-only',
   });
 
+  // TODO: migrate to network-query
   const lastEraAllocatedRewardsAndBurned = useQuery<{
     indexerAllocationRewards: {
       groupedAggregates: Array<{
@@ -81,6 +84,63 @@ export function useSortedIndexerDeployments(indexer: string): AsyncData<Array<Us
     },
   );
 
+  const queryAndTotalRewardsSortByDeploymentIdAndEra = useQuery<{
+    indexerEraDeploymentRewards: {
+      nodes: Array<{
+        deploymentId: string;
+        totalRewards: string;
+        queryRewards: string;
+      }>;
+    };
+    totalRewardsOfDeployment: {
+      groupedAggregates: {
+        keys: string[];
+        sum: {
+          totalRewards: string;
+        };
+      }[];
+    };
+  }>(
+    gql`
+      query GetAllocationRewardsByDeploymentIdAndIndexerId(
+        $indexerId: String!
+        $deploymentId: [String!]
+        $eraIdx: Int!
+      ) {
+        indexerEraDeploymentRewards(
+          filter: {
+            indexerId: { equalTo: $indexerId }
+            deploymentId: { in: $deploymentId }
+            eraIdx: { equalTo: $eraIdx }
+          }
+        ) {
+          nodes {
+            deploymentId
+            queryRewards
+          }
+        }
+
+        totalRewardsOfDeployment: indexerEraDeploymentRewards(
+          filter: { indexerId: { equalTo: $indexerId }, deploymentId: { in: $deploymentId } }
+        ) {
+          groupedAggregates(groupBy: DEPLOYMENT_ID) {
+            keys
+            sum {
+              totalRewards
+            }
+          }
+        }
+      }
+    `,
+    {
+      variables: {
+        indexerId: indexer || '',
+        eraIdx: (currentEra.data?.index || 0) - 1,
+        deploymentId: indexerDeployments.data?.indexerDeployments?.nodes.map((i) => i?.deploymentId),
+      },
+    },
+  );
+
   const { indexerMetadata } = useIndexerMetadata(indexer);
   const proxyEndpoint = indexerMetadata?.url;
 
@@ -140,6 +200,15 @@ export function useSortedIndexerDeployments(indexer: string): AsyncData<Array<Us
             return i?.keys?.[0] === deploymentId;
           },
         );
+        const queryRewards =
+          queryAndTotalRewardsSortByDeploymentIdAndEra.data?.indexerEraDeploymentRewards?.nodes?.find(
+            (i) => i.deploymentId === deploymentId,
+          );
+        const totalRewards =
+          queryAndTotalRewardsSortByDeploymentIdAndEra.data?.totalRewardsOfDeployment?.groupedAggregates?.find(
+            (i) => i?.keys?.[0] === deploymentId,
+          );
+
         const lastEraAllocatedRewards = allocationInfo?.sum?.reward?.toString();
         const lastEraBurnt = allocationInfo?.sum?.burnt?.toString();
 
@@ -162,10 +231,18 @@ export function useSortedIndexerDeployments(indexer: string): AsyncData<Array<Us
           lastEraBurnt,
           id: indexerDeployment?.id,
           deployment: indexerDeployment?.deployment || null,
+          lastEraQueryRewards: queryRewards?.queryRewards,
+          totalRewards: totalRewards?.sum.totalRewards,
         };
       }),
     );
-  }, [indexerDeployments.loading, proxyEndpoint, allocatedProjects.data, lastEraAllocatedRewardsAndBurned.data]);
+  }, [
+    indexerDeployments.loading,
+    proxyEndpoint,
+    allocatedProjects.data,
+    lastEraAllocatedRewardsAndBurned.data,
+    queryAndTotalRewardsSortByDeploymentIdAndEra.data,
+  ]);
 
   return {
     ...sortedIndexerDeployments,

diff --git a/src/pages/indexer/MyProjects/OwnDeployments/OwnDeployments.tsx b/src/pages/indexer/MyProjects/OwnDeployments/OwnDeployments.tsx
@@ -196,6 +196,21 @@ export const OwnDeployments: React.FC<Props> = ({ indexer, emptyList, desc }) =>
         return BigNumberJs(a.deploymentApy || '0').comparedTo(b.deploymentApy || '0');
       },
     },
+    {
+      width: 230,
+      title: <TableTitle title="Total Rewards" />,
+      dataIndex: 'totalRewards',
+      render: (totalRewards) => {
+        return (
+          <Typography>
+            {formatNumber(formatSQT(totalRewards || '0'))} {TOKEN}
+          </Typography>
+        );
+      },
+      sorter: (a, b) => {
+        return BigNumberJs(a.totalRewards || '0').comparedTo(b.totalRewards || '0');
+      },
+    },
     {
       width: 230,
       title: <TableTitle title="Allocated amount" />,
@@ -226,6 +241,22 @@ export const OwnDeployments: React.FC<Props> = ({ indexer, emptyList, desc }) =>
         return BigNumberJs(a.lastEraAllocatedRewards || '0').comparedTo(b.lastEraAllocatedRewards || '0');
       },
     },
+    {
+      width: 230,
+      title: <TableTitle title="LAST ERA QUERY REWARDS" />,
+      dataIndex: 'lastEraQueryRewards',
+      render: (lastEraQueryRewards) => {
+        return (
+          <Typography>
+            {formatNumber(formatSQT(lastEraQueryRewards || '0'))} {TOKEN}
+          </Typography>
+        );
+      },
+      sorter: (a, b) => {
+        return BigNumberJs(a.lastEraQueryRewards || '0').comparedTo(b.lastEraQueryRewards || '0');
+      },
+    },
+
     {
       width: 230,
       title: <TableTitle title="LAST ERA BURNED REWARDS" />,
@@ -683,7 +714,7 @@ export const OwnDeployments: React.FC<Props> = ({ indexer, emptyList, desc }) =>
                     dataSource={indexerDeployments.loading ? previousSortedData : sortedData}
                     rowKey={'deploymentId'}
                     pagination={false}
-                    scroll={width <= 1800 ? { x: 1800 } : undefined}
+                    scroll={width <= 2260 ? { x: 2260 } : undefined}
                     loading={indexerDeployments.loading}
                   />
                 )}

diff --git a/src/utils/parseError.ts b/src/utils/parseError.ts
@@ -157,6 +157,10 @@ export const isNeedSignerToDoTransaction = (msg: Error | string | undefined): bo
     return false;
   }
 
+  if (msg.toString().includes('sending a transaction requires a signer')) {
+    return true;
+  }
+
   return false;
 };