Merge branch 'master' into show-pending-results-message

snapshot-labs · Dec 17, 2024 · 5ab0d42 · 5ab0d42
2 parents 816e89e + b63c672
commit 5ab0d42
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 56 deletions.
diff --git a/apps/ui/src/components/Breadcrumb.vue b/apps/ui/src/components/Breadcrumb.vue
@@ -38,11 +38,13 @@ const space = computed(() => {
     class="flex item-center space-x-2.5 truncate text-[24px]"
     v-bind="$attrs"
   >
-    <SpaceAvatar
-      :space="{ ...space, network: networkId as NetworkID }"
-      :size="36"
-      class="!rounded-[4px] shrink-0"
-    />
+    <div class="shrink-0">
+      <SpaceAvatar
+        :space="{ ...space, network: networkId as NetworkID }"
+        :size="36"
+        class="!rounded-[4px]"
+      />
+    </div>
     <span class="truncate" v-text="space.name" />
   </AppLink>
 </template>
diff --git a/apps/ui/src/components/Modal/DateTime.vue b/apps/ui/src/components/Modal/DateTime.vue
@@ -106,25 +106,28 @@ watch(
     <template #header>
       <h3 v-text="current.title" />
     </template>
-    <div :class="['!m-4 text-center', { 's-error': formError }]">
+    <div :class="['s-box !m-4 text-center', { 's-error': formError }]">
       <UiCalendar
         v-if="isCurrent('date')"
         :min="min"
         :selected="date"
         @pick="handleDateUpdate"
       />
-      <template v-else-if="isCurrent('time')">
-        <input
-          v-model="time"
-          type="time"
-          class="s-input mx-auto max-w-[140px] text-center text-lg"
-        />
+      <div v-else-if="isCurrent('time')" class="s-base">
+        <div class="relative mx-auto max-w-[140px]">
+          <label class="s-label w-full">Time</label>
+          <input
+            v-model="time"
+            type="time"
+            class="s-input text-center text-lg"
+          />
+        </div>
         <span
           v-if="formError"
           class="s-input-error-message"
           v-text="formError"
         />
-      </template>
+      </div>
     </div>
     <template #footer>
       <div class="flex space-x-3">

diff --git a/apps/ui/src/components/Modal/VotingPower.vue b/apps/ui/src/components/Modal/VotingPower.vue
@@ -59,7 +59,7 @@ const loading = computed(
           <div class="text-skin-link shrink-0">
             {{
               _n(
-                Number(strategy.value) / 10 ** votingPower.decimals,
+                Number(strategy.value) / 10 ** strategy.cumulativeDecimals,
                 'compact',
                 {
                   maximumFractionDigits: 2,
@@ -109,7 +109,7 @@ const loading = computed(
           </div>
           <div v-else />
           <div>
-            {{ _n(Number(strategy.value) / 10 ** strategy.decimals) }}
+            {{ _n(Number(strategy.value) / 10 ** strategy.displayDecimals) }}
             {{ strategy.symbol || 'units' }}
           </div>
         </div>

diff --git a/apps/ui/src/helpers/utils.ts b/apps/ui/src/helpers/utils.ts
@@ -610,8 +610,13 @@ export function getSocialNetworksLink(data: any) {
 export function getFormattedVotingPower(votingPower?: VotingPowerItem) {
   if (!votingPower) return;
 
-  const { totalVotingPower, decimals, symbol } = votingPower;
-  const value = _vp(Number(totalVotingPower) / 10 ** decimals);
+  const { votingPowers, symbol } = votingPower;
+  const value = _vp(
+    votingPowers.reduce(
+      (acc, b) => acc + Number(b.value) / 10 ** b.cumulativeDecimals,
+      0
+    )
+  );
 
   return symbol ? `${value} ${symbol}` : value;
 }

diff --git a/apps/ui/src/networks/evm/actions.ts b/apps/ui/src/networks/evm/actions.ts
@@ -660,11 +660,22 @@ export function createActions(
       if (snapshotInfo.at === null)
         throw new Error('EVM requires block number to be defined');
 
+      const cumulativeDecimals = Math.max(
+        ...strategiesMetadata.map(metadata => metadata.decimals ?? 0)
+      );
+
       return Promise.all(
         strategiesAddresses.map(async (address, i) => {
           const strategy = getEvmStrategy(address, networkConfig);
           if (!strategy)
-            return { address, value: 0n, decimals: 0, token: null, symbol: '' };
+            return {
+              address,
+              value: 0n,
+              displayDecimals: 0,
+              cumulativeDecimals: 0,
+              token: null,
+              symbol: ''
+            };
 
           const strategyMetadata = await parseStrategyMetadata(
             strategiesMetadata[i].payload
@@ -685,7 +696,8 @@ export function createActions(
           return {
             address,
             value,
-            decimals: strategiesMetadata[i]?.decimals ?? 0,
+            cumulativeDecimals,
+            displayDecimals: strategiesMetadata[i]?.decimals ?? 0,
             symbol: strategiesMetadata[i]?.symbol ?? '',
             token,
             swapLink: getSwapLink(strategy.type, address, chainId)

diff --git a/apps/ui/src/networks/evm/index.ts b/apps/ui/src/networks/evm/index.ts
@@ -27,7 +27,7 @@ export const METADATA: Record<string, Metadata> = {
     ticker: 'MATIC',
     chainId: 137,
     apiUrl:
-      'https://api.studio.thegraph.com/query/23545/sx-polygon/version/latest',
+      'https://subgrapher.snapshot.org/subgraph/arbitrum/5DzKWssJUVKA1imXGyExrycUjdz7t5t7gzTsE9GQhBUn',
     avatar:
       'ipfs://bafkreihcx4zkpfjfcs6fazjp6lcyes4pdhqx3uvnjuo5uj2dlsjopxv5am',
     blockTime: 2.15812
@@ -37,7 +37,7 @@ export const METADATA: Record<string, Metadata> = {
     chainId: 42161,
     currentChainId: 1,
     apiUrl:
-      'https://api.studio.thegraph.com/query/23545/sx-arbitrum/version/latest',
+      'https://subgrapher.snapshot.org/subgraph/arbitrum/4QovVxoK3TBLwZKPD1YPHHko5Zz87HvdjpEDBvitCWcH',
     avatar:
       'ipfs://bafkreic2p3zzafvz34y4tnx2kaoj6osqo66fpdo3xnagocil452y766gdq',
     blockTime: ETH_MAINNET_BLOCK_TIME
@@ -46,22 +46,23 @@ export const METADATA: Record<string, Metadata> = {
     name: 'Optimism',
     chainId: 10,
     apiUrl:
-      'https://api.studio.thegraph.com/query/23545/sx-optimism/version/latest',
+      'https://subgrapher.snapshot.org/subgraph/arbitrum/4zXNNp5B34DUNACzonVsHivNJRUHnFBqhvBPYJVaNyks',
     avatar: 'ipfs://QmfF4kwhGL8QosUXvgq2KWCmavhKBvwD6kbhs7L4p5ZAWb',
     blockTime: 2
   },
   base: {
     name: 'Base',
     chainId: 8453,
     apiUrl:
-      'https://api.studio.thegraph.com/query/23545/sx-base/version/latest',
+      'https://subgrapher.snapshot.org/subgraph/arbitrum/BmcnmDYyCcN7NmQuWXyx3p1xLEiq3sYmvFct8uvBQfum',
     avatar: 'ipfs://QmaxRoHpxZd8PqccAynherrMznMufG6sdmHZLihkECXmZv',
     blockTime: 2
   },
   eth: {
     name: 'Ethereum',
     chainId: 1,
-    apiUrl: 'https://api.studio.thegraph.com/query/23545/sx/version/latest',
+    apiUrl:
+      'https://subgrapher.snapshot.org/subgraph/arbitrum/GerdwbJnTbEz45K7S3D2MLET6VFiY8VqwrqWZg52x2vx',
     avatar:
       'ipfs://bafkreid7ndxh6y2ljw2jhbisodiyrhcy2udvnwqgon5wgells3kh4si5z4',
     blockTime: ETH_MAINNET_BLOCK_TIME
@@ -71,7 +72,7 @@ export const METADATA: Record<string, Metadata> = {
     chainId: 11155111,
     apiUrl:
       import.meta.env.VITE_EVM_SEPOLIA_API ??
-      'https://api.studio.thegraph.com/query/23545/sx-sepolia/version/latest',
+      'https://subgrapher.snapshot.org/subgraph/arbitrum/3682UpSJVQ89v6BMSzxDSiQWZKa3Hbn6RKucpT8jZ5nT',
     avatar:
       'ipfs://bafkreid7ndxh6y2ljw2jhbisodiyrhcy2udvnwqgon5wgells3kh4si5z4',
     blockTime: 13.2816

diff --git a/apps/ui/src/networks/offchain/actions.ts b/apps/ui/src/networks/offchain/actions.ts
@@ -242,7 +242,14 @@ export function createActions(
 
       if (!strategy || !isAddress(voterAddress)) {
         return [
-          { address: name, value: 0n, decimals: 0, token: null, symbol: '' }
+          {
+            address: name,
+            value: 0n,
+            cumulativeDecimals: 0,
+            displayDecimals: 0,
+            token: null,
+            symbol: ''
+          }
         ];
       }
 
@@ -257,7 +264,8 @@ export function createActions(
         return [
           {
             address: strategiesNames[0],
-            decimals: 0,
+            cumulativeDecimals: 0,
+            displayDecimals: 0,
             symbol: '',
             token: '',
             chainId: snapshotInfo.chainId,
@@ -273,7 +281,8 @@ export function createActions(
         return {
           address: strategy.name,
           value,
-          decimals,
+          cumulativeDecimals: decimals,
+          displayDecimals: decimals,
           symbol: strategy.params.symbol,
           token: strategy.params.address,
           chainId: strategy.network ? parseInt(strategy.network) : undefined,

diff --git a/apps/ui/src/networks/offchain/index.test.ts b/apps/ui/src/networks/offchain/index.test.ts
@@ -34,7 +34,8 @@ describe('offchain network', () => {
           ).resolves.toEqual([
             {
               address: 'ticket',
-              decimals: 0,
+              cumulativeDecimals: 0,
+              displayDecimals: 0,
               symbol: '',
               token: null,
               value: 0n
@@ -88,7 +89,8 @@ describe('offchain network', () => {
       ).resolves.toEqual([
         {
           address: 'ticket',
-          decimals: 9,
+          cumulativeDecimals: 9,
+          displayDecimals: 9,
           symbol: 'SYM',
           token: 'TOKEN',
           value: result[0],
@@ -97,7 +99,8 @@ describe('offchain network', () => {
         },
         {
           address: 'math',
-          decimals: 18,
+          cumulativeDecimals: 18,
+          displayDecimals: 18,
           symbol: undefined,
           token: undefined,
           value: result[1],
@@ -106,7 +109,8 @@ describe('offchain network', () => {
         },
         {
           address: 'api',
-          decimals: 18,
+          cumulativeDecimals: 18,
+          displayDecimals: 18,
           symbol: undefined,
           token: undefined,
           value: result[2],
@@ -141,7 +145,8 @@ describe('offchain network', () => {
           ).resolves.toEqual([
             {
               address: 'basic',
-              decimals: 0,
+              cumulativeDecimals: 0,
+              displayDecimals: 0,
               symbol: '',
               token: null,
               value: 0n
@@ -167,7 +172,8 @@ describe('offchain network', () => {
             {
               address: 'only-members',
               value: 1n,
-              decimals: 0,
+              cumulativeDecimals: 0,
+              displayDecimals: 0,
               symbol: '',
               token: '',
               chainId: undefined
@@ -191,7 +197,8 @@ describe('offchain network', () => {
             {
               address: 'only-members',
               value: 0n,
-              decimals: 0,
+              cumulativeDecimals: 0,
+              displayDecimals: 0,
               symbol: '',
               token: '',
               chainId: undefined

diff --git a/apps/ui/src/networks/starknet/actions.ts b/apps/ui/src/networks/starknet/actions.ts
@@ -679,11 +679,22 @@ export function createActions(
       voterAddress: string,
       snapshotInfo: SnapshotInfo
     ): Promise<VotingPower[]> => {
+      const cumulativeDecimals = Math.max(
+        ...strategiesMetadata.map(metadata => metadata.decimals ?? 0)
+      );
+
       return Promise.all(
         strategiesAddresses.map(async (address, i) => {
           const strategy = getStarknetStrategy(address, networkConfig);
           if (!strategy)
-            return { address, value: 0n, decimals: 0, token: null, symbol: '' };
+            return {
+              address,
+              value: 0n,
+              cumulativeDecimals: 0,
+              displayDecimals: 0,
+              token: null,
+              symbol: ''
+            };
 
           const strategyMetadata = await parseStrategyMetadata(
             strategiesMetadata[i].payload
@@ -704,7 +715,8 @@ export function createActions(
           return {
             address,
             value,
-            decimals: strategiesMetadata[i]?.decimals ?? 0,
+            cumulativeDecimals,
+            displayDecimals: strategiesMetadata[i]?.decimals ?? 0,
             symbol: strategiesMetadata[i]?.symbol ?? '',
             token: strategiesMetadata[i]?.token ?? null
           };

diff --git a/apps/ui/src/networks/types.ts b/apps/ui/src/networks/types.ts
@@ -110,7 +110,14 @@ export type SnapshotInfo = {
 export type VotingPower = {
   address: string;
   value: bigint;
-  decimals: number;
+  /**
+   * Decimals used to interpret value in context of final (total) VP.
+   */
+  cumulativeDecimals: number;
+  /**
+   * Decimals used to display this strategy value.
+   */
+  displayDecimals: number;
   token: string | null;
   symbol: string;
   chainId?: number;

diff --git a/apps/ui/src/stores/votingPowers.ts b/apps/ui/src/stores/votingPowers.ts
@@ -10,10 +10,8 @@ const LATEST_BLOCK_NAME = 'latest';
 type SpaceDetails = Proposal['space'];
 export type VotingPowerItem = {
   votingPowers: VotingPower[];
-  totalVotingPower: bigint;
   status: VotingPowerStatus;
   symbol: string;
-  decimals: number;
   error: utils.errors.VotingPowerDetailsError | null;
   canPropose: boolean;
   canVote: boolean;
@@ -63,8 +61,6 @@ export const useVotingPowersStore = defineStore('votingPowers', () => {
     let vpItem: VotingPowerItem = {
       status: 'loading',
       votingPowers: [],
-      totalVotingPower: 0n,
-      decimals: 18,
       symbol: space.voting_power_symbol,
       error: null,
       canPropose: false,
@@ -106,19 +102,20 @@ export const useVotingPowersStore = defineStore('votingPowers', () => {
       vpItem = {
         ...vpItem,
         votingPowers: vp,
-        totalVotingPower: vp.reduce((acc, b) => acc + b.value, 0n),
-        status: 'success',
-        decimals: Math.max(...vp.map(votingPower => votingPower.decimals), 0)
+        status: 'success'
       };
 
       if (isSpace(item) && proposeVp) {
-        const totalProposeVp = proposeVp.reduce((acc, b) => acc + b.value, 0n);
+        const totalProposeVp = proposeVp.reduce(
+          (acc, b) => acc + Number(b.value) / 10 ** b.cumulativeDecimals,
+          0
+        );
 
         vpItem.canPropose =
           totalProposeVp >= BigInt(item.proposal_threshold) ||
           isSpaceMember(space as Space, account);
       } else {
-        vpItem.canVote = vpItem.totalVotingPower > 0n;
+        vpItem.canVote = vp.some(vp => vp.value > 0n);
       }
     } catch (e: unknown) {
       if (e instanceof utils.errors.VotingPowerDetailsError) {

diff --git a/apps/ui/src/style.scss b/apps/ui/src/style.scss
@@ -219,6 +219,10 @@ input[type='number'] {
   appearance: textfield;
 }
 
+input[type="time"]::-webkit-calendar-picker-indicator {
+  display: none;
+}
+
 input:placeholder-shown {
   @apply text-ellipsis;
 }

diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
@@ -316,7 +316,7 @@ watchEffect(() => {
                   <a
                     v-if="
                       votingPower?.status === 'success' &&
-                      votingPower.totalVotingPower === BigInt(0)
+                      votingPower.votingPowers.every(v => v.value === 0n)
                     "
                     :href="`${HELPDESK_URL}/en/articles/9566904-why-do-i-have-0-voting-power`"
                     target="_blank"