fix(monitor-v2): ignore disputed requests for alerts (#4813)

Signed-off-by: david <david@umaproject.org>

Author: daywiss

packages/monitor-v2/src/monitor-polymarket/common.ts

@@ -9,7 +9,10 @@ import { GraphQLClient } from "graphql-request";
 import { BigNumber, Event, ethers } from "ethers";
 
 import { OptimisticOracleEthers, OptimisticOracleV2Ethers } from "@uma/contracts-node";
-import { ProposePriceEvent } from "@uma/contracts-node/dist/packages/contracts-node/typechain/core/ethers/OptimisticOracleV2";
+import {
+  ProposePriceEvent,
+  DisputePriceEvent,
+} from "@uma/contracts-node/dist/packages/contracts-node/typechain/core/ethers/OptimisticOracleV2";
 import { getContractInstanceWithProvider } from "../utils/contracts";
 
 import { Logger } from "@uma/financial-templates-lib";
@@ -146,24 +149,50 @@ export const getPolymarketProposedPriceRequestsOO = async (
     params.provider
   );
 
-  const events = await paginatedEventQuery<ProposePriceEvent>(
+  const proposeEvents = await paginatedEventQuery<ProposePriceEvent>(
     oo,
     oo.filters.ProposePrice(null, null, null, null, null, null, null, null),
     searchConfig
   );
 
+  const disputeEvents = await paginatedEventQuery<DisputePriceEvent>(
+    oo,
+    oo.filters.DisputePrice(null, null, null, null, null, null, null),
+    searchConfig
+  );
+
+  const disputedRequestIds = new Set(
+    disputeEvents.map((event) =>
+      ethers.utils.keccak256(
+        ethers.utils.defaultAbiCoder.encode(
+          ["address", "bytes32", "uint256", "bytes"],
+          [event.args.requester, event.args.identifier, event.args.timestamp, event.args.ancillaryData]
+        )
+      )
+    )
+  );
+
   const currentTime = Math.floor(Date.now() / 1000);
   const currentTimeBN = BigNumber.from(currentTime);
   const threshold = BigNumber.from(params.checkBeforeExpirationSeconds);
 
-  return events
+  return proposeEvents
     .filter((event) => requesterAddresses.map((r) => r.toLowerCase()).includes(event.args.requester.toLowerCase()))
     .filter((event) => {
       const expirationTime = event.args.expirationTimestamp;
       const thresholdTime = expirationTime.sub(threshold);
       // Only keep if current time is greater than (expiration - threshold) but less than expiration.
       return currentTimeBN.gt(thresholdTime) && currentTimeBN.lt(expirationTime);
     })
+    .filter((event) => {
+      const requestId = ethers.utils.keccak256(
+        ethers.utils.defaultAbiCoder.encode(
+          ["address", "bytes32", "uint256", "bytes"],
+          [event.args.requester, event.args.identifier, event.args.timestamp, event.args.ancillaryData]
+        )
+      );
+      return !disputedRequestIds.has(requestId);
+    })
     .map((event) => {
       return {
         requestHash: event.transactionHash,

packages/monitor-v2/test/PolymarketMonitor.ts

@@ -660,12 +660,15 @@ describe("PolymarketNotifier", function () {
 
   describe("getPolymarketProposedPriceRequestsOO Filtering", function () {
     it("should return only events that are close enough to expiration (current time > expirationTimestamp - checkBeforeExpirationSeconds)", async function () {
-      const fakeRequester = "0xFAKE_REQUESTER";
+      const fakeRequester = "0x0000000000000000000000000000000000000000"; // Address 0
       // Set a fixed current time (in seconds)
       const fakeTime = 1600000000;
       // Stub Date.now() to return fakeTime * 1000
       const dateNowStub = sandbox.stub(Date, "now").returns(fakeTime * 1000);
 
+      const identifier = formatBytes32String("TEST_IDENTIFIER");
+      const ancillaryData = formatBytes32String("data");
+
       // Create two fake events:
       // Event 1: expires at fakeTime + 100 seconds.
       // Calculation: (fakeTime + 100) - 120 = fakeTime - 20, so current time (fakeTime) > fakeTime - 20 => condition satisfied.
@@ -677,8 +680,9 @@ describe("PolymarketNotifier", function () {
           requester: fakeRequester,
           expirationTimestamp: ethers.BigNumber.from(fakeTime + 100),
           timestamp: ethers.BigNumber.from(fakeTime - 50),
-          ancillaryData: "data",
+          ancillaryData,
           proposedPrice: ethers.BigNumber.from(123),
+          identifier,
         },
       };
       // Event 2: expires at fakeTime + 200 seconds.
@@ -691,15 +695,21 @@ describe("PolymarketNotifier", function () {
           requester: fakeRequester,
           expirationTimestamp: ethers.BigNumber.from(fakeTime + 200),
           timestamp: ethers.BigNumber.from(fakeTime - 50),
-          ancillaryData: "data",
+          ancillaryData,
           proposedPrice: ethers.BigNumber.from(456),
+          identifier,
         },
       };
 
-      // Stub paginatedEventQuery to return both fake events.
+      // Stub paginatedEventQuery to return different results based on the filter type.
       const paginatedEventQueryStub = sandbox
         .stub(commonModule, "paginatedEventQuery")
-        .callsFake(async () => [fakeEventBelow as any, fakeEventAbove as any]);
+        .callsFake(async (oo, filter) => {
+          if (filter.topics?.[0] === oo.filters.DisputePrice(null, null, null, null, null, null, null).topics?.[0]) {
+            return []; // Return an empty array for DisputePrice filter
+          }
+          return [fakeEventBelow as any, fakeEventAbove as any]; // Return existing data for ProposePrice filter
+        });
 
       const params = await createMonitoringParams();
       // Set the parameter to 120 seconds.