Merge pull request #198 from SocketDotTech/revert-commented-changes

Revert commented changes

Author: ameeshaagrawal

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));

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)) {

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;
-    }
 }