added formula to get all voters like other voting modules

src/formulas/formulas/contract/daoCore/members.ts

@@ -9,11 +9,7 @@ import { groupContract } from '../voting/daoVotingCw4'
 import { topStakers as topCw721Stakers } from '../voting/daoVotingCw721Staked'
 import { topStakers as topNativeStakers } from '../voting/daoVotingNativeStaked'
 import { topStakers as topOnftStakers } from '../voting/daoVotingOnftStaked'
-import {
- listVoters as listSgCommunityNftVoters,
- totalPowerAtHeight as sgCommunityNftTotalPower,
- votingPowerAtHeight as sgCommunityNftVotingPower,
-} from '../voting/daoVotingSgCommunityNft'
+import { allVotersWithVotingPower as sgCommunityAllVoters } from '../voting/daoVotingSgCommunityNft'
 import { topStakers as topTokenStakers } from '../voting/daoVotingTokenStaked'
 import { config, votingModule } from './base'
 import { getUniqueSubDaosInTree } from './utils'
@@ -217,40 +213,15 @@ export const listMembers: ContractFormula<DaoMember[]> = {
  'dao-voting-sg-community-nft'
  )
  ) {
- const [{ voters }, { power: totalPower }] = await Promise.all([
- listSgCommunityNftVoters.compute({
- ...env,
- contractAddress: votingModuleAddress,
- }),
- sgCommunityNftTotalPower.compute({
- ...env,
- contractAddress: votingModuleAddress,
- }),
- ])
-
- const totalPowerNum = Number(totalPower)
+ const voters = await sgCommunityAllVoters.compute({
+ ...env,
+ contractAddress: votingModuleAddress,
+ })
 
- return await Promise.all(
- voters.map(async (address) => ({
- address,
- votingPowerPercent:
- totalPowerNum === 0
- ? 0
- : (Number(
- (
- await sgCommunityNftVotingPower.compute({
- ...env,
- contractAddress: votingModuleAddress,
- args: {
- address,
- },
- })
- ).power
- ) /
- totalPowerNum) *
- 100,
- }))
- )
+ return voters.map(({ address, votingPowerPercent }) => ({
+ address,
+ votingPowerPercent,
+ }))
  }
 
  throw new Error('voting module passthrough not supported for this DAO')

src/formulas/formulas/contract/voting/daoVotingSgCommunityNft.ts

@@ -131,3 +131,54 @@ export const listVoters: ContractFormula<
  }
  },
 }
+
+type Voter = {
+ address: string
+ weight: number
+ votingPowerPercent: number
+}
+
+export const allVotersWithVotingPower: ContractFormula<
+ Voter[],
+ {
+ limit?: string
+ }
+> = {
+ filter: {
+ codeIdsKeys: CODE_IDS_KEYS,
+ },
+ compute: async (env) => {
+ const {
+ contractAddress,
+ getTransformationMap,
+ args: { limit },
+ } = env
+ const limitNum = limit ? Math.max(0, Number(limit)) : Infinity
+
+ const voterMap =
+ (await getTransformationMap<string, string>(contractAddress, 'vp')) ?? {}
+ const voterEntries = Object.entries(voterMap)
+ // Ascending by voter address.
+ .sort(([a], [b]) => a.localeCompare(b))
+ .slice(0, limitNum)
+
+ // Get total power.
+ const totalVotingPower = Number(
+ (await totalPowerAtHeight.compute(env)).power
+ )
+
+ // Compute voting power percent for each voter.
+ const voters = voterEntries.map(
+ ([address, weight]): Voter => ({
+ address,
+ weight: Number(weight),
+ votingPowerPercent:
+ totalVotingPower === 0
+ ? 0
+ : (Number(weight) / totalVotingPower) * 100,
+ })
+ )
+
+ return voters
+ },
+}