Skip to content
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

Remove Wrap__ notation from permit2 revert reason #336

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Remove Wrap__ notation from permit2 revert reason #336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df1b23
remove Wrap notation from permit2 reverts
saucepoint Sep 4, 2024
a08a5f1
lint gang
saucepoint Sep 4, 2024
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
6 changes: 2 additions & 4 deletions src/base/Permit2Forwarder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ contract Permit2Forwarder {
/// @notice the Permit2 contract to forward approvals
IAllowanceTransfer public immutable permit2;

error Wrap__Permit2Reverted(address _permit2, bytes reason);

constructor(IAllowanceTransfer _permit2) {
permit2 = _permit2;
}
Expand All @@ -28,7 +26,7 @@ contract Permit2Forwarder {
// use try/catch in case an actor front-runs the permit, which would DOS multicalls
try permit2.permit(owner, permitSingle, signature) {}
catch (bytes memory reason) {
err = abi.encodeWithSelector(Wrap__Permit2Reverted.selector, address(permit2), reason);
err = reason;
}
}

Expand All @@ -45,7 +43,7 @@ contract Permit2Forwarder {
// use try/catch in case an actor front-runs the permit, which would DOS multicalls
try permit2.permit(owner, _permitBatch, signature) {}
catch (bytes memory reason) {
err = abi.encodeWithSelector(Wrap__Permit2Reverted.selector, address(permit2), reason);
err = reason;
}
}
}
24 changes: 3 additions & 21 deletions test/position-managers/PositionManager.multicall.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,23 +424,11 @@ contract PositionManagerMulticallTest is Test, Permit2SignatureHelpers, PosmTest
bytes[] memory results = lpm.multicall(calls);
assertEq(
results[0],
abi.encode(
abi.encodeWithSelector(
Permit2Forwarder.Wrap__Permit2Reverted.selector,
address(permit2),
abi.encodeWithSelector(InvalidNonce.selector)
)
)
abi.encode(abi.encodeWithSelector(InvalidNonce.selector))
);
assertEq(
results[1],
abi.encode(
abi.encodeWithSelector(
Permit2Forwarder.Wrap__Permit2Reverted.selector,
address(permit2),
abi.encodeWithSelector(InvalidNonce.selector)
)
)
abi.encode(abi.encodeWithSelector(InvalidNonce.selector))
);

assertEq(lpm.ownerOf(tokenId), charlie);
Expand Down Expand Up @@ -493,13 +481,7 @@ contract PositionManagerMulticallTest is Test, Permit2SignatureHelpers, PosmTest
bytes[] memory results = lpm.multicall(calls);
assertEq(
results[0],
abi.encode(
abi.encodeWithSelector(
Permit2Forwarder.Wrap__Permit2Reverted.selector,
address(permit2),
abi.encodeWithSelector(InvalidNonce.selector)
)
)
abi.encode(abi.encodeWithSelector(InvalidNonce.selector))
);

assertEq(lpm.ownerOf(tokenId), charlie);
Expand Down
Loading