feat(tally-fetch): Added fetch from subgraph

packages/interface/src/pages/rounds/[pollId]/stats/index.tsx

@@ -12,6 +12,7 @@ import { useRound } from "~/contexts/Round";
 import { useProjectCount } from "~/features/projects/hooks/useProjects";
 import { useProjectsResults, useResults } from "~/hooks/useResults";
 import { Layout } from "~/layouts/DefaultLayout";
+import { api } from "~/utils/api";
 import { formatNumber } from "~/utils/formatNumber";
 import { useRoundState } from "~/utils/state";
 import { ERoundState } from "~/utils/types";
@@ -35,31 +36,34 @@ interface IStatsProps {
 }
 
 const Stats = ({ pollId }: IStatsProps) => {
+  const tally = api.maci.tally.useQuery({ id: pollId });
+
   const { isLoading } = useMaci();
   const { chain, isConnected } = useAccount();
   const { getRoundByPollId } = useRound();
 
   const round = useMemo(() => getRoundByPollId(pollId), [pollId, getRoundByPollId]);
-  const results = useResults(pollId, (round?.registryAddress ?? zeroAddress) as Hex, round?.tallyFile);
+  const results = tally.data ?? {};
   const count = useProjectCount({
     chain: chain!,
     registryAddress: (round?.registryAddress ?? zeroAddress) as Hex,
   });
 
   const { data: projectsResults } = useProjectsResults((round?.registryAddress ?? zeroAddress) as Hex);
 
-  const { averageVotes, projects = {} } = results.data ?? {};
+// TODO: this needs to be updated to use the new results API
+//   const { averageVotes, projects = {} } = results.data ?? {};
 
-  const chartData = useMemo(() => {
-    const data = (projectsResults?.pages[0] ?? [])
-      .map((project) => ({
-        x: project.index,
-        y: projects[project.id]?.votes,
-      }))
-      .slice(0, 15);
+//   const chartData = useMemo(() => {
+//     const data = (projectsResults?.pages[0] ?? [])
+//       .map((project) => ({
+//         x: project.index,
+//         y: projects[project.id]?.votes,
+//       }))
+//       .slice(0, 15);
 
-    return [{ id: "awarded", data }];
-  }, [projects, projectsResults]);
+//     return [{ id: "awarded", data }];
+//   }, [projects, projectsResults]);
 
   if (isLoading) {
     return <div>Loading...</div>;

packages/interface/src/server/api/routers/maci.ts

@@ -4,6 +4,7 @@ import { z, ZodType } from "zod";
 import { createTRPCRouter, publicProcedure } from "~/server/api/trpc";
 import { fetchMetadata } from "~/utils/fetchMetadata";
 import { fetchPolls } from "~/utils/fetchPoll";
+import { fetchTally } from "~/utils/fetchTally";
 import { fetchUser } from "~/utils/fetchUser";
 
 import type { IPollData, IRoundMetadata, IRoundData } from "~/utils/types";
@@ -26,6 +27,7 @@ export const maciRouter = createTRPCRouter({
     .input(z.object({ publicKey: z.string() }))
     .query(async ({ input }) => fetchUser(PubKey.deserialize(input.publicKey).rawPubKey)),
   poll: publicProcedure.query(async () => fetchPolls()),
+  tally: publicProcedure.input(z.object({ id: z.string() })).query(async ({ input }) => fetchTally(input.id)),
   round: publicProcedure.input(z.object({ polls: z.array(PollSchema) })).query(async ({ input }) =>
     Promise.all(
       input.polls.map((poll) =>
@@ -52,7 +54,6 @@ export const maciRouter = createTRPCRouter({
             registrationEndsAt: new Date(data.registrationEndsAt),
             votingStartsAt,
             votingEndsAt,
-            tallyFile: data.tallyFile,
           } as IRoundData;
         }),
       ),

packages/interface/src/utils/fetchTally.ts

@@ -0,0 +1,55 @@
+import { config } from "~/config";
+
+import type { Tally } from "./types";
+
+import { createCachedFetch } from "./fetch";
+
+const cachedFetch = createCachedFetch({ ttl: 1000 * 60 * 10 });
+
+export interface GraphQLResponse {
+  data?: {
+    tally: Tally;
+  };
+}
+
+const tallyQuery = `
+  query Tally {
+    tally(id: $id) {
+      id
+      results{
+        id
+        result
+      }
+    }
+  }
+`;
+
+/**
+ * Maps the tally data to the ITallyData interface
+ *
+ * @param tally - The tally data
+ * @returns The mapped tally data
+ */
+function mappedTallyData(tally: Tally): Tally {
+  return {
+    id: tally.id,
+    results: tally.results,
+  };
+}
+
+/**
+ * Fetches the tally data from the subgraph
+ *
+ * @returns The tally data
+ */
+export async function fetchTally(id: string): Promise<Tally | undefined> {
+  const tally = await cachedFetch<{ tally: Tally }>(config.maciSubgraphUrl, {
+    method: "POST",
+    body: JSON.stringify({
+      query: tallyQuery.replace("id: $id", `id: "${id}"`),
+    }),
+  }).then((response: GraphQLResponse) => response.data?.tally);
+
+  // cast this to a TallyData array so that we can deal with one object only in MACIContext
+  return tally ? mappedTallyData(tally) : undefined;
+}

packages/interface/src/utils/types.ts

@@ -75,6 +75,11 @@ export interface Metadata {
   type: string;
 }
 
+export interface TallyResult {
+  id: string;
+  result: string;
+}
+
 export const AttestationsQuery = `
   query Attestations($where: AttestationWhereInput, $orderBy: [AttestationOrderByWithRelationInput!], $take: Int, $skip: Int) {
     attestations(take: $take, skip: $skip, orderBy: $orderBy, where: $where) {
@@ -146,6 +151,20 @@ export interface Poll {
   };
 }
 
+/**
+ * The tally data
+ */
+export interface Tally {
+  /**
+   * The tally address
+   */
+  id: string;
+  /**
+   * an array with the results
+   */
+  results: TallyResult[];
+}
+
 /**
  * The request type
  */
@@ -386,8 +405,4 @@ export interface IRoundData {
    * The round voting ends at
    */
   votingEndsAt: Date;
-  /**
-   * The round tally file
-   */
-  tallyFile: string;
 }