Fixed vetoable proposals only returning the latest vetoable proposal.

DA0-DA0 · Dec 13, 2023 · da8dd05 · da8dd05
1 parent 5beaa90
commit da8dd05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/data/formulas/contract/daoCore/veto.ts b/src/data/formulas/contract/daoCore/veto.ts
@@ -35,7 +35,7 @@ export const vetoableProposals: ContractFormula<VetoableProposalDaos[]> = {
       (
         await getTransformationMatches(
           undefined,
-          `proposalVetoer:${contractAddress}`
+          `proposalVetoer:${contractAddress}:*`
         )
       )?.map(({ contractAddress, value }) => ({
         proposalModuleAddress: contractAddress,

diff --git a/src/data/transformers/proposal/common.ts b/src/data/transformers/proposal/common.ts
@@ -86,7 +86,7 @@ const vetoer: Transformer = {
   getValue: () => '',
 }
 
-// Map `proposalVetoer:<VETOER>` to proposal ID.
+// Create map from `proposalVetoer:<VETOER>:<PROPOSAL ID>` to proposal ID.
 const proposalVetoer: Transformer = {
   filter: {
     codeIdsKeys: CODE_IDS_KEYS,
@@ -96,7 +96,11 @@ const proposalVetoer: Transformer = {
         event.key.startsWith(KEY_PREFIX_PROPOSALS_V2)) &&
       !!event.valueJson.veto,
   },
-  name: (event) => `proposalVetoer:${event.valueJson.veto.vetoer}`,
+  name: (event) => {
+    // "proposals"|"proposals_v2", proposalId
+    const [, proposalId] = dbKeyToKeys(event.key, [false, true])
+    return `proposalVetoer:${event.valueJson.veto.vetoer}:${proposalId}`
+  },
   getValue: (event) => {
     // "proposals"|"proposals_v2", proposalId
     const [, proposalId] = dbKeyToKeys(event.key, [false, true])