moved active threshold formula to common voting route and added activ…

…e threshold transformers
DA0-DA0 · Jun 2, 2024 · c38f122 · c38f122
1 parent 14052db
commit c38f122
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/src/data/formulas/contract/voting/common.ts b/src/data/formulas/contract/voting/common.ts
@@ -0,0 +1,7 @@
+import { ContractFormula } from '@/core/types'
+
+export const activeThreshold: ContractFormula = {
+  compute: async ({ contractAddress, get, getTransformationMatch }) =>
+    (await getTransformationMatch(contractAddress, 'activeThreshold'))?.value ||
+    (await get(contractAddress, 'active_threshold')),
+}
diff --git a/src/data/formulas/contract/voting/daoVotingCw20Staked.ts b/src/data/formulas/contract/voting/daoVotingCw20Staked.ts
@@ -7,6 +7,8 @@ import {
   totalStaked,
 } from '../staking/cw20Stake'
 
+export { activeThreshold } from './common'
+
 export const tokenContract: ContractFormula<string | undefined> = {
   compute: async ({ contractAddress, get, getTransformationMatch }) =>
     (await getTransformationMatch<string>(contractAddress, 'token'))?.value ??
@@ -74,11 +76,6 @@ export const dao: ContractFormula<string | undefined> = {
     (await get<string>(contractAddress, 'dao')),
 }
 
-export const activeThreshold: ContractFormula = {
-  compute: async ({ contractAddress, get }) =>
-    await get(contractAddress, 'active_threshold'),
-}
-
 type Staker = StakerBalance & {
   votingPowerPercent: number
 }

diff --git a/src/data/formulas/contract/voting/index.ts b/src/data/formulas/contract/voting/index.ts
@@ -1,3 +1,4 @@
+export * as daoVoting from './common'
 export * as daoVotingCw20Staked from './daoVotingCw20Staked'
 export * as daoVotingCw4 from './daoVotingCw4'
 export * as daoVotingCw721Staked from './daoVotingCw721Staked'

diff --git a/src/data/transformers/voting/daoVotingCw20Staked.ts b/src/data/transformers/voting/daoVotingCw20Staked.ts
@@ -9,5 +9,10 @@ const stakingContract = makeTransformer(
 )
 const dao = makeTransformer(CODE_IDS_KEYS, 'dao')
 const token = makeTransformer(CODE_IDS_KEYS, 'token')
+const activeThreshold = makeTransformer(
+  CODE_IDS_KEYS,
+  'activeThreshold',
+  'active_threshold'
+)
 
-export default [stakingContract, dao, token]
+export default [stakingContract, dao, token, activeThreshold]
diff --git a/src/data/transformers/voting/daoVotingCw721Staked.ts b/src/data/transformers/voting/daoVotingCw721Staked.ts
@@ -11,6 +11,11 @@ const KEY_PREFIX_NB = dbKeyForKeys('nb', '')
 const config = makeTransformer(CODE_IDS_KEYS, 'config')
 const dao = makeTransformer(CODE_IDS_KEYS, 'dao')
 const totalStakedNfts = makeTransformer(CODE_IDS_KEYS, 'tsn')
+const activeThreshold = makeTransformer(
+  CODE_IDS_KEYS,
+  'activeThreshold',
+  'active_threshold'
+)
 
 const stakedNftPerOwner: Transformer = {
   filter: {
@@ -63,4 +68,5 @@ export default [
   stakedNftPerOwner,
   stakedNftOwner,
   stakedCount,
+  activeThreshold,
 ]
diff --git a/src/data/transformers/voting/daoVotingNativeStaked.ts b/src/data/transformers/voting/daoVotingNativeStaked.ts
@@ -14,5 +14,10 @@ const totalStaked = makeTransformer(
   'totalStaked',
   'total_staked'
 )
+const activeThreshold = makeTransformer(
+  CODE_IDS_KEYS,
+  'activeThreshold',
+  'active_threshold'
+)
 
-export default [config, dao, stakedBalance, totalStaked]
+export default [config, dao, stakedBalance, totalStaked, activeThreshold]
diff --git a/src/data/transformers/voting/daoVotingTokenStaked.ts b/src/data/transformers/voting/daoVotingTokenStaked.ts
@@ -20,6 +20,11 @@ const totalStaked = makeTransformer(
   'totalStaked',
   'total_staked'
 )
+const activeThreshold = makeTransformer(
+  CODE_IDS_KEYS,
+  'activeThreshold',
+  'active_threshold'
+)
 
 export default [
   config,
@@ -28,4 +33,5 @@ export default [
   tokenIssuerContract,
   stakedBalance,
   totalStaked,
+  activeThreshold,
 ]