Skip to content

Revert commented changes #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Fees manager revert
merged 1 commit into from
Oct 7, 2025
Merged

Revert commented changes #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/evmx/watcher/PromiseResolver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions contracts/evmx/watcher/RequestHandler.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
5 changes: 0 additions & 5 deletions contracts/evmx/watcher/Trigger.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}