feat: allow custom strategies in basic validation

snapshot-labs · Oct 2, 2024 · b3de73a · b3de73a
1 parent de1436d
commit b3de73a
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 7 deletions.
diff --git a/apps/ui/src/components/FormSpaceProposal.vue b/apps/ui/src/components/FormSpaceProposal.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { VALIDATION_TYPES_INFO } from '@/helpers/constants';
 import { getValidator } from '@/helpers/validation';
-import { Validation } from '@/types';
+import { NetworkID, Space, Validation } from '@/types';
 
 const GUIDELINES_DEFINITION = {
   type: 'string',
@@ -36,6 +36,9 @@ const template = defineModel<string>('template', {
 });
 
 defineProps<{
+  networkId: NetworkID;
+  space: Space;
+  snapshotChainId: string;
   isProposalValidationValid: boolean;
 }>();
 
@@ -130,6 +133,9 @@ watchEffect(() => {
     <ModalSelectValidation
       type="proposal"
       :open="isSelectValidationModalOpen"
+      :network-id="networkId"
+      :default-chain-id="snapshotChainId"
+      :space="space"
       :current="proposalValidation"
       @close="isSelectValidationModalOpen = false"
       @save="value => (proposalValidation = value)"

diff --git a/apps/ui/src/components/FormSpaceVoting.vue b/apps/ui/src/components/FormSpaceVoting.vue
@@ -39,6 +39,7 @@ const ignoreAbstainVotes = defineModel<boolean>('ignoreAbstainVotes', {
 });
 
 const props = defineProps<{
+  snapshotChainId: string;
   space: Space;
 }>();
 
@@ -308,6 +309,9 @@ watchEffect(() => {
     <ModalSelectValidation
       type="voting"
       :open="isSelectValidationModalOpen"
+      :network-id="space.network"
+      :default-chain-id="snapshotChainId"
+      :space="space"
       :current="voteValidation"
       @close="isSelectValidationModalOpen = false"
       @save="value => (voteValidation = value)"

diff --git a/apps/ui/src/components/Modal/SelectValidation.vue b/apps/ui/src/components/Modal/SelectValidation.vue
@@ -18,10 +18,14 @@ const validations = ref([] as ValidationDetails[]);
 import { VALIDATION_TYPES_INFO } from '@/helpers/constants';
 import { clone } from '@/helpers/utils';
 import { getValidator } from '@/helpers/validation';
-import { Validation } from '@/types';
+import { StrategyConfig } from '@/networks/types';
+import { NetworkID, Space, Validation } from '@/types';
 
 const props = defineProps<{
   open: boolean;
+  networkId: NetworkID;
+  defaultChainId: string;
+  space: Space;
   type: 'voting' | 'proposal';
   current?: Validation;
 }>();
@@ -36,6 +40,8 @@ const hasError = ref(false);
 const selectedValidation = ref(null as ValidationDetails | null);
 const form = ref({} as Record<string, any>);
 const rawParams = ref('{}');
+const useCustomStrategies = ref(false);
+const customStrategies = ref([] as StrategyConfig[]);
 
 async function fetchValidations() {
   if (isLoading.value || validations.value.length) return;
@@ -56,9 +62,6 @@ async function fetchValidations() {
 
 const filteredValidations = computed(() => {
   const apiValidations = validations.value.filter(validation => {
-    // TODO: add support for basic
-    if (validation.key === 'basic') return false;
-
     if (props.type === 'proposal') return true;
 
     return !validation.proposalValidationOnly;
@@ -155,7 +158,27 @@ function handleSelect(validationDetails: ValidationDetails) {
   }
 
   selectedValidation.value = validationDetails;
-  if (selectedValidation.value.key === 'passport-gated') {
+  if (selectedValidation.value.key !== props.current?.name) {
+    form.value = {};
+    rawParams.value = '{}';
+  }
+
+  if (selectedValidation.value.key === 'basic') {
+    if (form.value.strategies) {
+      useCustomStrategies.value = true;
+
+      customStrategies.value = form.value.strategies.map(strategy => ({
+        id: crypto.randomUUID(),
+        chainId: strategy.network,
+        address: strategy.name,
+        name: strategy.name,
+        paramsDefinition: null,
+        params: clone(strategy.params)
+      }));
+    }
+
+    form.value.strategies ??= [];
+  } else if (selectedValidation.value.key === 'passport-gated') {
     form.value.scoreThreshold ??= 0;
     form.value.operator ??= 'NONE';
     form.value.stamps ??= [];
@@ -166,6 +189,19 @@ function handleApply() {
   if (!selectedValidation.value) return;
 
   const params = definition.value ? form.value : JSON.parse(rawParams.value);
+
+  if (selectedValidation.value.key === 'basic') {
+    if (useCustomStrategies.value) {
+      params.strategies = customStrategies.value.map(strategy => ({
+        name: strategy.name,
+        network: strategy.chainId,
+        params: strategy.params
+      }));
+    } else {
+      delete params.strategies;
+    }
+  }
+
   emit('save', { name: selectedValidation.value.key, params });
   emit('close');
 }
@@ -220,6 +256,22 @@ watch(
           }"
           :error="formErrors.rawParams"
         />
+        <template v-if="selectedValidation.key === 'basic'">
+          <UiSwitch
+            v-model="useCustomStrategies"
+            title="Use custom strategies"
+            tooltip="Calculate the score with a different configuration of Voting Strategies"
+          />
+          <UiStrategiesConfiguratorOffchain
+            v-if="useCustomStrategies"
+            v-model="customStrategies"
+            class="mt-3"
+            allow-duplicates
+            hide-empty-message
+            :network-id="networkId"
+            :default-chain-id="defaultChainId"
+          />
+        </template>
       </div>
       <UiSelector
         v-for="validation in filteredValidations"

diff --git a/apps/ui/src/components/Ui/Switch.vue b/apps/ui/src/components/Ui/Switch.vue
@@ -5,6 +5,7 @@ const enabled = defineModel<boolean>({ required: true });
 
 defineProps<{
   title: string;
+  tooltip?: string;
 }>();
 </script>
 
@@ -24,8 +25,11 @@ defineProps<{
           <IC-switch-disabled v-else class="text-skin-text" />
         </span>
       </Switch>
-      <SwitchLabel class="text-skin-link">
+      <SwitchLabel class="text-skin-link truncate flex items-center gap-1">
         {{ title }}
+        <UiTooltip v-if="tooltip" :title="tooltip">
+          <IH-question-mark-circle class="shrink-0" />
+        </UiTooltip>
       </SwitchLabel>
     </div>
   </SwitchGroup>

diff --git a/apps/ui/src/views/Space/Settings.vue b/apps/ui/src/views/Space/Settings.vue
@@ -395,6 +395,9 @@ watchEffect(() => setTitle(`Edit settings - ${props.space.name}`));
         v-model:only-members="onlyMembers"
         v-model:guidelines="guidelines"
         v-model:template="template"
+        :network-id="space.network"
+        :snapshot-chain-id="snapshotChainId"
+        :space="space"
         :is-proposal-validation-valid="isProposalValidationValid"
         @update-validity="v => (hasProposalErrors = !v)"
       />
@@ -414,6 +417,7 @@ watchEffect(() => setTitle(`Edit settings - ${props.space.name}`));
         v-model:privacy="privacy"
         v-model:vote-validation="voteValidation"
         v-model:ignore-abstain-votes="ignoreAbstainVotes"
+        :snapshot-chain-id="snapshotChainId"
         :space="space"
         @update-validity="v => (hasVotingErrors = !v)"
       />