feat: add support for ranked choice voting for offchain spaces

snapshot-labs · Mar 13, 2024 · 78bb40f · 78bb40f
1 parent e456b85
commit 78bb40f
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 3 deletions.
diff --git a/apps/ui/src/components/EditorVotingType.vue b/apps/ui/src/components/EditorVotingType.vue
@@ -20,6 +20,11 @@ const VOTING_TYPES_INFO = computed(() => ({
   approval: {
     label: 'Approval voting',
     description: 'Voters can select multiple choices, each choice receiving full voting power.'
+  },
+  'ranked-choice': {
+    label: 'Ranked choice voting',
+    description:
+      'Each voter may select and rank any number of choices. Results are calculated by instant-runoff counting method.'
   }
 }));
 

diff --git a/apps/ui/src/components/ProposalVoteRankedChoice.vue b/apps/ui/src/components/ProposalVoteRankedChoice.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import Draggable from 'vuedraggable';
+import { Choice, Proposal } from '@/types';
+
+const props = defineProps<{
+  sendingType: Choice | null;
+  proposal: Proposal;
+}>();
+
+const emit = defineEmits<{
+  (e: 'vote', value: Choice);
+}>();
+
+const selectedChoices = ref<number[]>(props.proposal.choices.map((_, i) => i + 1));
+</script>
+
+<template>
+  <div class="flex flex-col space-y-3">
+    <div class="flex flex-col space-y-2">
+      <Draggable
+        v-model="selectedChoices"
+        v-bind="{ animation: 200 }"
+        handle=".handle"
+        class="flex flex-col gap-2 mb-3"
+        item-key="id"
+      >
+        <template #item="{ element, index }">
+          <UiButton class="!h-[48px] text-left w-full flex items-center handle cursor-grab gap-2">
+            <div class="truncate">#{{ index + 1 }}</div>
+            <div class="grow truncate">
+              {{ proposal.choices[element - 1] }}
+            </div>
+            <div class="text-skin-text">
+              <IC-drag />
+            </div>
+          </UiButton>
+        </template>
+      </Draggable>
+    </div>
+    <UiButton
+      primary
+      class="!h-[48px] w-full"
+      :loading="!!sendingType"
+      @click="emit('vote', selectedChoices)"
+    >
+      Vote
+    </UiButton>
+  </div>
+</template>
diff --git a/apps/ui/src/helpers/constants.ts b/apps/ui/src/helpers/constants.ts
@@ -25,4 +25,9 @@ export const COINGECKO_BASE_ASSETS = {
 
 export const MAX_SYMBOL_LENGTH = 12;
 export const BASIC_CHOICES = ['For', 'Against', 'Abstain'];
-export const SUPPORTED_VOTING_TYPES: VoteType[] = ['basic', 'single-choice', 'approval'] as const;
+export const SUPPORTED_VOTING_TYPES: VoteType[] = [
+  'basic',
+  'single-choice',
+  'approval',
+  'ranked-choice'
+] as const;
diff --git a/apps/ui/src/networks/offchain/constants.ts b/apps/ui/src/networks/offchain/constants.ts
@@ -19,6 +19,6 @@ export const EDITOR_PROPOSAL_VALIDATION_VOTING_STRATEGIES = [];
 export const EDITOR_EXECUTION_STRATEGIES = [];
 export const EDITOR_SNAPSHOT_OFFSET = 4;
 export const EDITOR_APP_NAME = 'snapshot-v2';
-export const EDITOR_VOTING_TYPES = ['basic', 'single-choice', 'approval'];
+export const EDITOR_VOTING_TYPES = ['basic', 'single-choice', 'approval', 'ranked-choice'];
 
 export const DEFAULT_VOTING_DELAY = 60 * 60 * 24 * 7;
diff --git a/apps/ui/src/networks/offchain/helpers.ts b/apps/ui/src/networks/offchain/helpers.ts
@@ -11,7 +11,7 @@ export function getSdkChoice(type: string, choice: Choice): number | number[] {
     return choice as number;
   }
 
-  if (type === 'approval') {
+  if (type === 'approval' || type === 'ranked-choice') {
     return choice as number[];
   }
 

diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
@@ -190,6 +190,12 @@ watchEffect(() => {
               :sending-type="sendingType"
               @vote="handleVoteClick"
             />
+            <ProposalVoteRankedChoice
+              v-else-if="proposal.type === 'ranked-choice'"
+              :proposal="proposal"
+              :sending-type="sendingType"
+              @vote="handleVoteClick"
+            />
           </ProposalVote>
         </template>
 

diff --git a/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts b/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts
@@ -5,6 +5,7 @@ import {
   basicVoteTypes,
   singleChoiceVoteTypes,
   approvalVoteTypes,
+  rankedChoiceVoteTypes,
   updateProposalTypes,
   cancelProposalTypes
 } from './types';
@@ -169,6 +170,7 @@ export class EthereumSig {
     let voteType = basicVoteTypes;
     if (data.type === 'single-choice') voteType = singleChoiceVoteTypes;
     if (data.type === 'approval') voteType = approvalVoteTypes;
+    if (data.type === 'ranked-choice') voteType = rankedChoiceVoteTypes;
 
     const signatureData = await this.sign(signer, message, voteType);
 

diff --git a/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts b/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
@@ -31,6 +31,8 @@ export const approvalVoteTypes = {
   ]
 };
 
+export const rankedChoiceVoteTypes = approvalVoteTypes;
+
 export const proposeTypes = {
   Proposal: [
     { name: 'from', type: 'address' },