Update Prod - 31.10.24 (#242)

Co-authored-by: baroooo <[email protected]> Co-authored-by: philbow61 <[email protected]> Co-authored-by: Denvil J Clarke <[email protected]>
mento-protocol · Nov 1, 2024 · 78a55f9 · 78a55f9
1 parent 835111e
commit 78a55f9
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 58 deletions.
diff --git a/src/components/votes-list/votes-list.component.tsx b/src/components/votes-list/votes-list.component.tsx
@@ -61,7 +61,6 @@ const getParticipantPercentage = (
   if (totalVotes > 0n) {
     const decimals = 8;
     const accuracy = 10n ** BigInt(decimals);
-
     const weightScaled = participant.weight * 100n;
 
     const valueInRawBN = (weightScaled * accuracy) / totalVotes;
@@ -70,7 +69,7 @@ const getParticipantPercentage = (
 
     if (formatted.includes(".")) {
       const [integers, remainingDecimals] = formatted.split(".");
-      return `${integers}.${remainingDecimals.substring(0, 2)}%`;
+      return `${integers}.${remainingDecimals.substring(0, 5)}%`;
     } else {
       return `${formatted}%`;
     }

diff --git a/src/lib/graphql/subgraph/fragments/proposalFields.graphql b/src/lib/graphql/subgraph/fragments/proposalFields.graphql
@@ -21,16 +21,22 @@ fragment ProposalFields on Proposal {
 
   # Votes
   votecast {
-    timestamp
-    voter {
-      id
+    id
+    support{
+      weight
     }
-    support {
-      support
+    receipt {
+      id
+      voter {
+        id
+      }
       weight
+      support {
+        id
+        support
+      }
     }
   }
-
   # Start & End Time
   startBlock
   endBlock

diff --git a/src/lib/graphql/subgraph/generated/subgraph.tsx b/src/lib/graphql/subgraph/generated/subgraph.tsx
@@ -7286,7 +7286,7 @@ export enum _SubgraphErrorPolicy_ {
   Deny = 'deny'
 }
 
-export type ProposalFieldsFragment = { __typename?: 'Proposal', proposalId: any, description: string, startBlock: any, endBlock: any, queued: boolean, canceled: boolean, executed: boolean, state: ProposalState, proposer: { __typename?: 'Account', id: any }, proposalCreated: Array<{ __typename?: 'ProposalCreated', timestamp: any }>, proposalQueued: Array<{ __typename?: 'ProposalQueued', eta: any }>, proposalExecuted: Array<{ __typename?: 'ProposalExecuted', transaction: { __typename?: 'Transaction', id: string, timestamp: any } }>, votecast: Array<{ __typename?: 'VoteCast', timestamp: any, voter: { __typename?: 'Account', id: any }, support: { __typename?: 'ProposalSupport', support: number, weight: any } }>, metadata: { __typename?: 'ProposalMetadata', title: string, description: string }, votes: { __typename?: 'ProposalVotes', total: any, for: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, against: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, abstain: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', proposalId: any, description: string, startBlock: any, endBlock: any, queued: boolean, canceled: boolean, executed: boolean, state: ProposalState, proposer: { __typename?: 'Account', id: any }, proposalCreated: Array<{ __typename?: 'ProposalCreated', timestamp: any }>, proposalQueued: Array<{ __typename?: 'ProposalQueued', eta: any }>, proposalExecuted: Array<{ __typename?: 'ProposalExecuted', transaction: { __typename?: 'Transaction', id: string, timestamp: any } }>, votecast: Array<{ __typename?: 'VoteCast', id: string, support: { __typename?: 'ProposalSupport', weight: any }, receipt: { __typename?: 'VoteReceipt', id: string, weight: any, voter: { __typename?: 'Account', id: any }, support: { __typename?: 'ProposalSupport', id: string, support: number } } }>, metadata: { __typename?: 'ProposalMetadata', title: string, description: string }, votes: { __typename?: 'ProposalVotes', total: any, for: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, against: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, abstain: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> } } };
 
 export type GetAllLocksQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -7313,12 +7313,12 @@ export type GetProposalQueryVariables = Exact<{
 }>;
 
 
-export type GetProposalQuery = { __typename?: 'Query', proposals: Array<{ __typename?: 'Proposal', proposalId: any, description: string, startBlock: any, endBlock: any, queued: boolean, canceled: boolean, executed: boolean, state: ProposalState, calls: Array<{ __typename?: 'ProposalCall', index: number, value: any, signature: string, calldata: any, target: { __typename?: 'Account', id: any } }>, proposer: { __typename?: 'Account', id: any }, proposalCreated: Array<{ __typename?: 'ProposalCreated', timestamp: any }>, proposalQueued: Array<{ __typename?: 'ProposalQueued', eta: any }>, proposalExecuted: Array<{ __typename?: 'ProposalExecuted', transaction: { __typename?: 'Transaction', id: string, timestamp: any } }>, votecast: Array<{ __typename?: 'VoteCast', timestamp: any, voter: { __typename?: 'Account', id: any }, support: { __typename?: 'ProposalSupport', support: number, weight: any } }>, metadata: { __typename?: 'ProposalMetadata', title: string, description: string }, votes: { __typename?: 'ProposalVotes', total: any, for: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, against: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, abstain: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> } } }> };
+export type GetProposalQuery = { __typename?: 'Query', proposals: Array<{ __typename?: 'Proposal', proposalId: any, description: string, startBlock: any, endBlock: any, queued: boolean, canceled: boolean, executed: boolean, state: ProposalState, calls: Array<{ __typename?: 'ProposalCall', index: number, value: any, signature: string, calldata: any, target: { __typename?: 'Account', id: any } }>, proposer: { __typename?: 'Account', id: any }, proposalCreated: Array<{ __typename?: 'ProposalCreated', timestamp: any }>, proposalQueued: Array<{ __typename?: 'ProposalQueued', eta: any }>, proposalExecuted: Array<{ __typename?: 'ProposalExecuted', transaction: { __typename?: 'Transaction', id: string, timestamp: any } }>, votecast: Array<{ __typename?: 'VoteCast', id: string, support: { __typename?: 'ProposalSupport', weight: any }, receipt: { __typename?: 'VoteReceipt', id: string, weight: any, voter: { __typename?: 'Account', id: any }, support: { __typename?: 'ProposalSupport', id: string, support: number } } }>, metadata: { __typename?: 'ProposalMetadata', title: string, description: string }, votes: { __typename?: 'ProposalVotes', total: any, for: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, against: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, abstain: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> } } }> };
 
 export type GetProposalsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetProposalsQuery = { __typename?: 'Query', proposals: Array<{ __typename?: 'Proposal', proposalId: any, description: string, startBlock: any, endBlock: any, queued: boolean, canceled: boolean, executed: boolean, state: ProposalState, proposer: { __typename?: 'Account', id: any }, proposalCreated: Array<{ __typename?: 'ProposalCreated', timestamp: any }>, proposalQueued: Array<{ __typename?: 'ProposalQueued', eta: any }>, proposalExecuted: Array<{ __typename?: 'ProposalExecuted', transaction: { __typename?: 'Transaction', id: string, timestamp: any } }>, votecast: Array<{ __typename?: 'VoteCast', timestamp: any, voter: { __typename?: 'Account', id: any }, support: { __typename?: 'ProposalSupport', support: number, weight: any } }>, metadata: { __typename?: 'ProposalMetadata', title: string, description: string }, votes: { __typename?: 'ProposalVotes', total: any, for: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, against: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, abstain: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> } } }> };
+export type GetProposalsQuery = { __typename?: 'Query', proposals: Array<{ __typename?: 'Proposal', proposalId: any, description: string, startBlock: any, endBlock: any, queued: boolean, canceled: boolean, executed: boolean, state: ProposalState, proposer: { __typename?: 'Account', id: any }, proposalCreated: Array<{ __typename?: 'ProposalCreated', timestamp: any }>, proposalQueued: Array<{ __typename?: 'ProposalQueued', eta: any }>, proposalExecuted: Array<{ __typename?: 'ProposalExecuted', transaction: { __typename?: 'Transaction', id: string, timestamp: any } }>, votecast: Array<{ __typename?: 'VoteCast', id: string, support: { __typename?: 'ProposalSupport', weight: any }, receipt: { __typename?: 'VoteReceipt', id: string, weight: any, voter: { __typename?: 'Account', id: any }, support: { __typename?: 'ProposalSupport', id: string, support: number } } }>, metadata: { __typename?: 'ProposalMetadata', title: string, description: string }, votes: { __typename?: 'ProposalVotes', total: any, for: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, against: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> }, abstain: { __typename?: 'VoteType', total: any, participants: Array<{ __typename?: 'Participant', address: string, weight: any }> } } }> };
 
 export const ProposalFieldsFragmentDoc = gql`
     fragment ProposalFields on Proposal {
@@ -7340,14 +7340,21 @@ export const ProposalFieldsFragmentDoc = gql`
     }
   }
   votecast {
-    timestamp
-    voter {
-      id
-    }
+    id
     support {
-      support
       weight
     }
+    receipt {
+      id
+      voter {
+        id
+      }
+      weight
+      support {
+        id
+        support
+      }
+    }
   }
   startBlock
   endBlock

diff --git a/src/lib/graphql/subgraph/policies/Proposal.ts b/src/lib/graphql/subgraph/policies/Proposal.ts
@@ -6,6 +6,7 @@ import {
   ProposalVotes,
   Scalars,
   VoteCast,
+  VoteReceipt,
 } from "@/lib/graphql/subgraph/generated/subgraph";
 
 type ProposalID = Scalars["ID"]["output"];
@@ -46,46 +47,28 @@ export const ProposalPolicy: TypePolicy = {
 
         return votecastRefs.reduce(
           (acc: ProposalVotes, votecastRef) => {
-            const voterRef = readField<Account>("voter", votecastRef);
-            const supportRef = readField<ProposalSupport>(
-              "support",
-              votecastRef,
-            );
-            const rawWeight = readField<string>("weight", supportRef) || "";
-            const weight = BigInt(rawWeight);
+            const receipt = readField<VoteReceipt>("receipt", votecastRef);
+            if (!receipt) return acc;
 
+            const voterRef = readField<Account>("voter", receipt);
+            const supportRef = readField<ProposalSupport>("support", receipt);
+            const weight = BigInt(readField<string>("weight", receipt) || "0");
             const address = readField<string>("id", voterRef) as Address;
-            const support = readField<ProposalSupport["support"]>(
-              "support",
-              supportRef,
-            );
-
+            const support = readField<number>("support", supportRef);
             switch (support) {
-              // AGAINST
-              case 0:
+              case 0: // AGAINST
                 acc.against.total += weight;
-                acc.against.participants.push({
-                  address,
-                  weight,
-                });
+                acc.against.participants.push({ address, weight });
                 break;
 
-              // FOR
-              case 1:
+              case 1: // FOR
                 acc.for.total += weight;
-                acc.for.participants.push({
-                  address,
-                  weight,
-                });
+                acc.for.participants.push({ address, weight });
                 break;
 
-              // ABSTAIN
-              case 2:
+              case 2: // ABSTAIN
                 acc.abstain.total += weight;
-                acc.abstain.participants.push({
-                  address,
-                  weight,
-                });
+                acc.abstain.participants.push({ address, weight });
                 break;
 
               default:
@@ -96,18 +79,9 @@ export const ProposalPolicy: TypePolicy = {
             return acc;
           },
           {
-            for: {
-              participants: [],
-              total: 0n,
-            },
-            against: {
-              participants: [],
-              total: 0n,
-            },
-            abstain: {
-              participants: [],
-              total: 0n,
-            },
+            for: { participants: [], total: 0n },
+            against: { participants: [], total: 0n },
+            abstain: { participants: [], total: 0n },
             total: 0n,
           },
         );