Maker show only active triggers

OasisDEX · Sep 25, 2024 · fdbc64a · fdbc64a
1 parent 760c500
commit fdbc64a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/features/automation/api/automationTriggersData.ts b/features/automation/api/automationTriggersData.ts
@@ -30,7 +30,10 @@ async function loadTriggerDataFromSubgraph({
     },
   })) as SubgraphsResponses['Discover']['getMakerTriggersOld']
 
-  const triggers = response.cdps[0].triggers
+  // get only active triggers
+  const triggers = response.cdps[0].triggers.filter(
+    (trigger) => !trigger.removedBlock && !trigger.executedBlock,
+  )
 
   return {
     isAutomationDataLoaded: true,

diff --git a/features/subgraphLoader/consts.ts b/features/subgraphLoader/consts.ts
@@ -965,6 +965,8 @@ export const subgraphMethodsRecord: SubgraphMethodsRecord = {
           id
           commandAddress
           triggerData
+          removedBlock
+          executedBlock
         }
       }
     }

diff --git a/handlers/portfolio/positions/handlers/maker/types.ts b/handlers/portfolio/positions/handlers/maker/types.ts
@@ -111,6 +111,8 @@ export interface MakerTriggersOldResponse {
       id: number
       commandAddress: string
       triggerData: string
+      removedBlock: string
+      executedBlock: string
     }[]
   }[]
 }