From f220217d0807f9c17d00fa64ef2c395c576e1686 Mon Sep 17 00:00:00 2001
From: Youssef <yussdev@gmail.com>
Date: Mon, 11 Sep 2023 14:03:16 +0330
Subject: [PATCH 1/4] chore(attest): dynamic import the package

---
 src/helpers/attest.ts | 64 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/helpers/attest.ts b/src/helpers/attest.ts
index 52f7fc8d674..b6614ad5b44 100644
--- a/src/helpers/attest.ts
+++ b/src/helpers/attest.ts
@@ -1,9 +1,9 @@
-import {
-  SchemaRegistry,
-  EAS,
-  SchemaEncoder,
-  AttestationRequestData
-} from '@ethereum-attestation-service/eas-sdk';
+// import {
+//   SchemaRegistry,
+//   EAS,
+//   SchemaEncoder,
+//   AttestationRequestData
+// } from '@ethereum-attestation-service/eas-sdk';
 import type { Web3Provider } from '@ethersproject/providers';
 import type { Wallet } from '@ethersproject/wallet';
 import { EASNetworks } from './constants';
@@ -12,47 +12,47 @@ import { calcPercentageOfSum } from '@snapshot-labs/snapshot.js/src/voting/quadr
 export const WEIGHTED_VOTING_PROPOSAL_SCHEMA_UID =
   '0x30457fc9ddd2ce5cc0c8ae9ca5e327db7ec51ea2f766eb7067bbc2e16fbfb783';
 
-export async function createWeightedVotingProposalSchema(
-  web3: Web3Provider | Wallet
-) {
-  const signer = 'getSigner' in web3 ? web3.getSigner() : web3;
-  const network = await signer.getChainId();
-  const easConfig = EASNetworks[network];
-  console.log({ easConfig, network });
-  const schemaRegistryContractAddress = easConfig.SchemaRegistry;
-  const schemaRegistry = new SchemaRegistry(schemaRegistryContractAddress);
+// export async function createWeightedVotingProposalSchema(
+//   web3: Web3Provider | Wallet
+// ) {
+//   const signer = 'getSigner' in web3 ? web3.getSigner() : web3;
+//   const network = await signer.getChainId();
+//   const easConfig = EASNetworks[network];
+//   console.log({ easConfig, network });
+//   const schemaRegistryContractAddress = easConfig.SchemaRegistry;
+//   const schemaRegistry = new SchemaRegistry(schemaRegistryContractAddress);
 
-  schemaRegistry.connect(signer as any);
+//   schemaRegistry.connect(signer as any);
 
-  const schema = 'string choice, uint16 percent, bytes32 proposalId';
-  // const resolverAddress: string = ZERO_ADDRESS;
+//   const schema = 'string choice, uint16 percent, bytes32 proposalId';
+//   // const resolverAddress: string = ZERO_ADDRESS;
 
-  const revocable = true;
+//   const revocable = true;
 
-  const transaction = await schemaRegistry.register({
-    schema,
-    // resolverAddress,
-    revocable
-  });
+//   const transaction = await schemaRegistry.register({
+//     schema,
+//     // resolverAddress,
+//     revocable
+//   });
 
-  // Optional: Wait for transaction to be validated
-  await transaction.wait();
-}
+//   // Optional: Wait for transaction to be validated
+//   await transaction.wait();
+// }
 export async function weightedVotingProposalAttest(
   proposalId: string,
   web3: Web3Provider | Wallet,
   data: Record<number, number>
 ) {
+  const module = await import('@ethereum-attestation-service/eas-sdk');
   console.log('proposalId: ', proposalId);
-  console.log({ data });
 
   const signer = 'getSigner' in web3 ? web3.getSigner() : web3;
   // const signer = 'getSigner' in web3 ? web3.getSigner() : web3;
   // console.log({ signer });
   const network = await signer.getChainId();
   const easConfig = EASNetworks[network];
-  const eas = new EAS(easConfig.EASDeployment);
-  const schemaRegistry = new SchemaRegistry(easConfig.SchemaRegistry);
+  const eas = new module.EAS(easConfig.EASDeployment);
+  const schemaRegistry = new module.SchemaRegistry(easConfig.SchemaRegistry);
 
   // const _signer = {
   //   ...signer,
@@ -65,7 +65,7 @@ export async function weightedVotingProposalAttest(
   const schema = await schemaRegistry.getSchema({
     uid: WEIGHTED_VOTING_PROPOSAL_SCHEMA_UID
   });
-  const schemaEncoder = new SchemaEncoder(schema.schema);
+  const schemaEncoder = new module.SchemaEncoder(schema.schema);
   const selectedChoices: number[] = [];
   const weights: number[] = [];
   Object.entries(data).forEach(([choiceId, value]) => {
@@ -77,7 +77,7 @@ export async function weightedVotingProposalAttest(
   );
 
   try {
-    const multiAttestData = [true].map((): AttestationRequestData => {
+    const multiAttestData = [true].map((): any => {
       const encodedData = schemaEncoder.encodeData([
         {
           name: 'proposalId',

From 95c51f7a6d590fedd5c1b8644d43371dbfd3448a Mon Sep 17 00:00:00 2001
From: Youssef <yussdev@gmail.com>
Date: Tue, 12 Sep 2023 16:57:25 +0330
Subject: [PATCH 2/4] feat(attestaions): assign VP

---
 src/components/SpaceProposalPage.vue       |  1 +
 src/components/SpaceProposalResults.vue    |  1 -
 src/components/SpaceProposalVote.vue       |  9 +++-
 src/components/SpaceProposalVotesList.vue  |  2 +-
 src/components/SpaceProposalVotesModal.vue |  2 +-
 src/composables/useProposalVotes.ts        | 57 +++++++++++++++++-----
 src/helpers/queries.ts                     | 11 ++++-
 7 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/src/components/SpaceProposalPage.vue b/src/components/SpaceProposalPage.vue
index 4af1571f0fc..4337a5f2f9d 100644
--- a/src/components/SpaceProposalPage.vue
+++ b/src/components/SpaceProposalPage.vue
@@ -183,6 +183,7 @@ onMounted(() => setMessageVisibility(props.proposal.flagged));
             v-if="proposal?.state === 'active'"
             v-model="selectedChoices"
             :proposal="proposal"
+            :space="space"
             @open="modalOpen = true"
             @clickVote="clickVote"
           />
diff --git a/src/components/SpaceProposalResults.vue b/src/components/SpaceProposalResults.vue
index 65a35aa6df3..bf5e6d81e20 100644
--- a/src/components/SpaceProposalResults.vue
+++ b/src/components/SpaceProposalResults.vue
@@ -16,7 +16,6 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits(['reload']);
-
 const ts = Number((Date.now() / 1e3).toFixed());
 
 const isInvalidScore = computed(
diff --git a/src/components/SpaceProposalVote.vue b/src/components/SpaceProposalVote.vue
index 25b1d11f3dd..a1fa12e1b68 100644
--- a/src/components/SpaceProposalVote.vue
+++ b/src/components/SpaceProposalVote.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import { Proposal, Choice } from '@/helpers/interfaces';
+import { Proposal, Choice, ExtendedSpace } from '@/helpers/interfaces';
 import voting from '@snapshot-labs/snapshot.js/src/voting';
 
 const props = defineProps<{
+  space: ExtendedSpace;
   proposal: Proposal;
   modelValue: Choice;
 }>();
@@ -10,7 +11,11 @@ const props = defineProps<{
 const emit = defineEmits(['update:modelValue', 'clickVote']);
 
 const { web3, web3Account } = useWeb3();
-const { userVote, loadUserVote } = useProposalVotes(props.proposal);
+const { userVote, loadUserVote } = useProposalVotes(
+  props.proposal,
+  undefined,
+  props.space
+);
 
 const key = ref(0);
 
diff --git a/src/components/SpaceProposalVotesList.vue b/src/components/SpaceProposalVotesList.vue
index d5f89ed88bd..d4c076eee66 100644
--- a/src/components/SpaceProposalVotesList.vue
+++ b/src/components/SpaceProposalVotesList.vue
@@ -15,7 +15,7 @@ const {
   loadingVotes,
   loadVotes,
   loadUserVote
-} = useProposalVotes(props.proposal, 6);
+} = useProposalVotes(props.proposal, 6, props.space);
 
 const modalVotesmOpen = ref(false);
 
diff --git a/src/components/SpaceProposalVotesModal.vue b/src/components/SpaceProposalVotesModal.vue
index 221a13dd7a5..0b09e7e50e9 100644
--- a/src/components/SpaceProposalVotesModal.vue
+++ b/src/components/SpaceProposalVotesModal.vue
@@ -25,7 +25,7 @@ const {
   loadVotes,
   loadMoreVotes,
   loadSingleVote
-} = useProposalVotes(props.proposal, 20);
+} = useProposalVotes(props.proposal, 20, props.space);
 
 const votesEndEl = ref<HTMLElement | null>(null);
 const filterOptions = ref<VoteFilters>(clone(VOTES_FILTERS_DEFAULT));
diff --git a/src/composables/useProposalVotes.ts b/src/composables/useProposalVotes.ts
index 825de987171..6bb81445f07 100644
--- a/src/composables/useProposalVotes.ts
+++ b/src/composables/useProposalVotes.ts
@@ -1,6 +1,7 @@
 import {
   Attestation,
   Attestations,
+  ExtendedSpace,
   Proposal,
   Vote,
   VoteFilters
@@ -8,7 +9,8 @@ import {
 import {
   ATTESTAIONS_QUERY,
   SINGLE_ATTESTAION_QUERY,
-  VOTES_QUERY
+  VOTES_QUERY,
+  VP_QUERY
 } from '@/helpers/queries';
 import { clone } from '@snapshot-labs/snapshot.js/src/utils';
 import { WEIGHTED_VOTING_PROPOSAL_SCHEMA_UID } from '@/helpers/attest';
@@ -17,8 +19,15 @@ import { getAddress } from '@ethersproject/address';
 type QueryParams = {
   voter?: string;
 } & Partial<VoteFilters>;
-
-export function useProposalVotes(proposal: Proposal, loadBy = 6) {
+interface VP {
+  vp: number;
+  vp_by_strategy: number[];
+}
+export function useProposalVotes(
+  proposal: Proposal,
+  loadBy = 6,
+  space: ExtendedSpace
+) {
   const { profiles, loadProfiles } = useProfiles();
   const { apolloQuery } = useApolloQuery();
   const { resolveName } = useResolveName();
@@ -107,6 +116,19 @@ export function useProposalVotes(proposal: Proposal, loadBy = 6) {
       'attestations'
     );
   }
+  async function _fetchVP(queryParams: QueryParams) {
+    return apolloQuery(
+      {
+        query: VP_QUERY,
+        variables: {
+          space: space.id,
+          proposal: proposal.id,
+          voter: queryParams.voter
+        }
+      },
+      'vp'
+    );
+  }
 
   function formatProposalVotes(votes: Vote[]) {
     if (!votes?.length) return [];
@@ -117,15 +139,17 @@ export function useProposalVotes(proposal: Proposal, loadBy = 6) {
     });
   }
 
-  function formatAttestations(attestations: Attestations): Vote[] {
+  async function formatAttestations(
+    attestations: Attestations
+  ): Promise<Vote[]> {
     if (!attestations?.length) return [];
 
     const VisitedAttester = new Set<string>();
 
     const result: Vote[] = [];
 
-    attestations.forEach(attestation => {
-      if (VisitedAttester.has(attestation.attester)) return;
+    for (const attestation of attestations) {
+      if (VisitedAttester.has(attestation.attester)) break;
       VisitedAttester.add(attestation.attester);
 
       const data = JSON.parse(
@@ -138,19 +162,22 @@ export function useProposalVotes(proposal: Proposal, loadBy = 6) {
       choices.forEach((choiceId, index) => {
         choice[choiceId] = percentages[index];
       });
+      const { vp, vp_by_strategy } = ((await _fetchVP({
+        voter: attestation.attester
+      })) as VP) || { vp: 1, vp_by_strategy: 1 };
       result.push({
         ipfs: attestation.id,
         voter: attestation.attester,
         choice: choice,
         reason: '',
-        scores: [1],
-        balance: 1,
-        vp: 1,
-        vp_by_strategy: [1],
+        scores: vp_by_strategy,
+        balance: vp,
+        vp,
+        vp_by_strategy,
         created: attestation.time,
         isAttestation: true
       });
-    });
+    }
 
     return result;
   }
@@ -164,7 +191,9 @@ export function useProposalVotes(proposal: Proposal, loadBy = 6) {
         _fetchAttestations()
       ]);
 
-      const formattedAttestations = formatAttestations(attestationsResponse);
+      const formattedAttestations = await formatAttestations(
+        attestationsResponse
+      );
       attestations.value = formattedAttestations;
       votes.value = [
         ...formattedAttestations
@@ -184,7 +213,9 @@ export function useProposalVotes(proposal: Proposal, loadBy = 6) {
     const voter = response || search;
     try {
       const attestationsResponse = await _fetchSingleAttestation(voter);
-      const formattedAttestations = formatAttestations(attestationsResponse);
+      const formattedAttestations = await formatAttestations(
+        attestationsResponse
+      );
       return formattedAttestations;
     } catch (e) {
       console.log(e);
diff --git a/src/helpers/queries.ts b/src/helpers/queries.ts
index 70d09c9fb9b..ebc23ce587d 100644
--- a/src/helpers/queries.ts
+++ b/src/helpers/queries.ts
@@ -553,7 +553,7 @@ export const SINGLE_ATTESTAION_QUERY = gql`
         attester: { equals: $attester }
         schemaId: { equals: $schemaID }
         data: { startsWith: $proposalID }
-      },
+      }
       orderBy: { time: desc }
       take: 1
     ) {
@@ -564,3 +564,12 @@ export const SINGLE_ATTESTAION_QUERY = gql`
     }
   }
 `;
+
+export const VP_QUERY = gql`
+  query VPQuery($proposal: String, $space: String!, $voter: String!) {
+    vp(proposal: $proposal, space: $space, voter: $voter) {
+      vp
+      vp_by_strategy
+    }
+  }
+`;

From f35a8d22315a7b81e9455b5f78baebddbde2ca17 Mon Sep 17 00:00:00 2001
From: Youssef <yussdev@gmail.com>
Date: Tue, 12 Sep 2023 17:58:17 +0330
Subject: [PATCH 3/4] refactor(attestions): refactor

---
 src/components/SpaceProposalVotesList.vue |  7 ++-
 src/composables/useProposalVotes.ts       | 70 +++++++++++++----------
 src/helpers/attest.ts                     | 43 +-------------
 3 files changed, 45 insertions(+), 75 deletions(-)

diff --git a/src/components/SpaceProposalVotesList.vue b/src/components/SpaceProposalVotesList.vue
index d4c076eee66..9045cc9a38d 100644
--- a/src/components/SpaceProposalVotesList.vue
+++ b/src/components/SpaceProposalVotesList.vue
@@ -11,7 +11,6 @@ const { web3Account } = useWeb3();
 const {
   profiles,
   userPrioritizedVotes,
-  attestations,
   loadingVotes,
   loadVotes,
   loadUserVote
@@ -19,8 +18,10 @@ const {
 
 const modalVotesmOpen = ref(false);
 
-const voteCount = computed(
-  () => props.proposal.votes + (attestations.value.length ? 1 : 0)
+const voteCount = computed(() =>
+  props.proposal.type === 'weighted'
+    ? userPrioritizedVotes.value.length
+    : props.proposal.votes
 );
 
 const showModalDownloadMessage = ref(false);
diff --git a/src/composables/useProposalVotes.ts b/src/composables/useProposalVotes.ts
index 6bb81445f07..ced586aa7f2 100644
--- a/src/composables/useProposalVotes.ts
+++ b/src/composables/useProposalVotes.ts
@@ -37,7 +37,7 @@ export function useProposalVotes(
   const loadingMoreVotes = ref(false);
   const votes = ref<Vote[]>([]);
   const userVote = ref<Vote | null>(null);
-  const attestations = ref<Vote[]>([]);
+  const isWeighted = proposal.type === 'weighted';
 
   const userPrioritizedVotes = computed(() => {
     const votesClone = clone(votes.value);
@@ -149,7 +149,7 @@ export function useProposalVotes(
     const result: Vote[] = [];
 
     for (const attestation of attestations) {
-      if (VisitedAttester.has(attestation.attester)) break;
+      if (VisitedAttester.has(attestation.attester)) continue;
       VisitedAttester.add(attestation.attester);
 
       const data = JSON.parse(
@@ -183,22 +183,16 @@ export function useProposalVotes(
   }
   async function loadVotes(filter: Partial<VoteFilters> = {}) {
     if (loadingVotes.value) return;
-
     loadingVotes.value = true;
     try {
-      const [response, attestationsResponse] = await Promise.all([
-        _fetchVotes(filter),
-        _fetchAttestations()
-      ]);
+      const response = await (isWeighted
+        ? _fetchAttestations()
+        : _fetchVotes(filter));
 
-      const formattedAttestations = await formatAttestations(
-        attestationsResponse
-      );
-      attestations.value = formattedAttestations;
-      votes.value = [
-        ...formattedAttestations
-        // ...formatProposalVotes(response)
-      ];
+      const formattedVotes = isWeighted
+        ? await formatAttestations(response)
+        : formatProposalVotes(response);
+      votes.value = formattedVotes;
     } catch (e) {
       console.log(e);
     } finally {
@@ -224,26 +218,41 @@ export function useProposalVotes(
     }
     return [];
   }
+  async function loadSingleVote(search: string) {
+    loadingVotes.value = true;
+
+    const response = await resolveName(search);
+    const voter = response || search;
+    try {
+      const response = await _fetchVote({ voter });
+      votes.value = formatProposalVotes(response);
+    } catch (e) {
+      console.log(e);
+    } finally {
+      loadingVotes.value = false;
+    }
+  }
 
   async function loadMoreVotes(filter: Partial<VoteFilters> = {}) {
-    // if (loadingMoreVotes.value || loadingVotes.value) return;
-    //
-    // loadingMoreVotes.value = true;
-    // try {
-    //   const response = await _fetchVotes(filter, votes.value.length);
-    //
-    //   votes.value = votes.value.concat(formatProposalVotes(response));
-    // } catch (e) {
-    //   console.log(e);
-    // } finally {
-    //   loadingMoreVotes.value = false;
-    // }
+    if (loadingMoreVotes.value || loadingVotes.value) return;
+
+    loadingMoreVotes.value = true;
+    try {
+      const response = await _fetchVotes(filter, votes.value.length);
+
+      votes.value = votes.value.concat(formatProposalVotes(response));
+    } catch (e) {
+      console.log(e);
+    } finally {
+      loadingMoreVotes.value = false;
+    }
   }
 
   async function loadUserVote(voter: string) {
     try {
-      // const response = await _fetchVote({ voter });
-      const response = await _loadUserAttestation(voter);
+      const response = await (isWeighted
+        ? _loadUserAttestation(voter)
+        : _fetchVote({ voter }));
       userVote.value =
         response.length > 0 ? formatProposalVotes(response)[0] : null;
     } catch (e) {
@@ -257,7 +266,6 @@ export function useProposalVotes(
 
   return {
     votes,
-    attestations,
     userPrioritizedVotes,
     profiles,
     loadingVotes,
@@ -266,7 +274,7 @@ export function useProposalVotes(
     formatProposalVotes,
     loadVotes,
     loadMoreVotes,
-    loadSingleVote: _loadUserAttestation,
+    loadSingleVote: isWeighted ? _loadUserAttestation : loadSingleVote,
     loadUserVote
   };
 }
diff --git a/src/helpers/attest.ts b/src/helpers/attest.ts
index b6614ad5b44..151dfdf9145 100644
--- a/src/helpers/attest.ts
+++ b/src/helpers/attest.ts
@@ -1,9 +1,3 @@
-// import {
-//   SchemaRegistry,
-//   EAS,
-//   SchemaEncoder,
-//   AttestationRequestData
-// } from '@ethereum-attestation-service/eas-sdk';
 import type { Web3Provider } from '@ethersproject/providers';
 import type { Wallet } from '@ethersproject/wallet';
 import { EASNetworks } from './constants';
@@ -12,53 +6,20 @@ import { calcPercentageOfSum } from '@snapshot-labs/snapshot.js/src/voting/quadr
 export const WEIGHTED_VOTING_PROPOSAL_SCHEMA_UID =
   '0x30457fc9ddd2ce5cc0c8ae9ca5e327db7ec51ea2f766eb7067bbc2e16fbfb783';
 
-// export async function createWeightedVotingProposalSchema(
-//   web3: Web3Provider | Wallet
-// ) {
-//   const signer = 'getSigner' in web3 ? web3.getSigner() : web3;
-//   const network = await signer.getChainId();
-//   const easConfig = EASNetworks[network];
-//   console.log({ easConfig, network });
-//   const schemaRegistryContractAddress = easConfig.SchemaRegistry;
-//   const schemaRegistry = new SchemaRegistry(schemaRegistryContractAddress);
-
-//   schemaRegistry.connect(signer as any);
-
-//   const schema = 'string choice, uint16 percent, bytes32 proposalId';
-//   // const resolverAddress: string = ZERO_ADDRESS;
-
-//   const revocable = true;
-
-//   const transaction = await schemaRegistry.register({
-//     schema,
-//     // resolverAddress,
-//     revocable
-//   });
-
-//   // Optional: Wait for transaction to be validated
-//   await transaction.wait();
-// }
 export async function weightedVotingProposalAttest(
   proposalId: string,
   web3: Web3Provider | Wallet,
   data: Record<number, number>
 ) {
   const module = await import('@ethereum-attestation-service/eas-sdk');
-  console.log('proposalId: ', proposalId);
 
   const signer = 'getSigner' in web3 ? web3.getSigner() : web3;
-  // const signer = 'getSigner' in web3 ? web3.getSigner() : web3;
-  // console.log({ signer });
+
   const network = await signer.getChainId();
   const easConfig = EASNetworks[network];
   const eas = new module.EAS(easConfig.EASDeployment);
   const schemaRegistry = new module.SchemaRegistry(easConfig.SchemaRegistry);
 
-  // const _signer = {
-  //   ...signer,
-  //   signTypedData: signer._signTypedData
-  // };
-  //
   eas.connect(signer as any);
   schemaRegistry.connect(signer as any);
 
@@ -103,7 +64,7 @@ export async function weightedVotingProposalAttest(
         data: multiAttestData
       }
     ]);
-    console.log({ tx });
+
     const newAttestationUID = await tx.wait();
     return { id: newAttestationUID, ipfs: newAttestationUID };
   } catch (e) {

From 33c1f094180d3eeae340b0e7cc62cd80f3a7522c Mon Sep 17 00:00:00 2001
From: Youssef <yussdev@gmail.com>
Date: Thu, 14 Sep 2023 13:32:33 +0330
Subject: [PATCH 4/4] fix(attestations): fix votes list

---
 src/components/SpaceProposalVotesList.vue | 2 +-
 src/composables/useProposalVotes.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SpaceProposalVotesList.vue b/src/components/SpaceProposalVotesList.vue
index 9045cc9a38d..aba1b9452f5 100644
--- a/src/components/SpaceProposalVotesList.vue
+++ b/src/components/SpaceProposalVotesList.vue
@@ -54,7 +54,7 @@ watch(web3Account, loadUserVote, { immediate: true });
 
 <template>
   <BaseBlock
-    v-if="proposal.votes > 0"
+    v-if="voteCount"
     :title="$t('votes')"
     :counter="voteCount"
     :loading="loadingVotes"
diff --git a/src/composables/useProposalVotes.ts b/src/composables/useProposalVotes.ts
index ced586aa7f2..be25525828e 100644
--- a/src/composables/useProposalVotes.ts
+++ b/src/composables/useProposalVotes.ts
@@ -50,7 +50,6 @@ export function useProposalVotes(
       }
       votesClone.unshift(userVote.value);
     }
-
     return votesClone;
   });
 
@@ -184,6 +183,7 @@ export function useProposalVotes(
   async function loadVotes(filter: Partial<VoteFilters> = {}) {
     if (loadingVotes.value) return;
     loadingVotes.value = true;
+
     try {
       const response = await (isWeighted
         ? _fetchAttestations()