From 1ff3fe95cd3eef77b6b44ec680b203523ae6e98c Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Thu, 2 Oct 2025 16:06:50 +0530 Subject: [PATCH] fix: revert temp changes from surge --- contracts/evmx/watcher/PromiseResolver.sol | 2 +- contracts/evmx/watcher/RequestHandler.sol | 4 ++-- contracts/evmx/watcher/Trigger.sol | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/contracts/evmx/watcher/PromiseResolver.sol b/contracts/evmx/watcher/PromiseResolver.sol index 7f014671..796054ea 100644 --- a/contracts/evmx/watcher/PromiseResolver.sol +++ b/contracts/evmx/watcher/PromiseResolver.sol @@ -90,7 +90,7 @@ contract PromiseResolver is IPromiseResolver, WatcherBase, Initializable { // Get payload params from Watcher bytes32 payloadId = resolvedPromise_.payloadId; PayloadParams memory payloadParams = watcher__.getPayloadParams(payloadId); - // if (payloadParams.deadline > block.timestamp) revert DeadlineNotPassedForOnChainRevert(); + if (payloadParams.deadline > block.timestamp) revert DeadlineNotPassedForOnChainRevert(); // marks the request as cancelled and settles the fees requestHandler__().cancelRequestForReverts(uint40(payloadParams.payloadPointer >> 120)); diff --git a/contracts/evmx/watcher/RequestHandler.sol b/contracts/evmx/watcher/RequestHandler.sol index a5d793e0..bde650c7 100644 --- a/contracts/evmx/watcher/RequestHandler.sol +++ b/contracts/evmx/watcher/RequestHandler.sol @@ -197,8 +197,8 @@ contract RequestHandler is RequestHandlerStorage, Initializable, Ownable, Addres // todo: remove after game // also this overrides a payload deadline hence an unexecuted payload can // be executed by new added transmitters. need to fix this by marking req deadline or something. - // if (r.requestFeesDetails.winningBid.transmitter == bid_.transmitter) - // revert AlreadyAssigned(); + if (r.requestFeesDetails.winningBid.transmitter == bid_.transmitter) + revert AlreadyAssigned(); // If a transmitter was already assigned previously, unblock the credits if (r.requestFeesDetails.winningBid.transmitter != address(0)) { diff --git a/contracts/evmx/watcher/Trigger.sol b/contracts/evmx/watcher/Trigger.sol index 181c2367..55d92cc6 100644 --- a/contracts/evmx/watcher/Trigger.sol +++ b/contracts/evmx/watcher/Trigger.sol @@ -55,9 +55,4 @@ abstract contract Trigger is WatcherStorage, AddressResolverUtil { triggerFromChainSlug = 0; triggerFromPlug = bytes32(0); } - - // todo: add onlyWatcher modifier - function resetIsAppGatewayCalled(bytes32 triggerId_) external { - isAppGatewayCalled[triggerId_] = false; - } }