address comments for the PR

OpenZeppelin · Jun 7, 2022 · fd72798 · fd72798
1 parent 4fa970e
commit fd72798
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Helper.sol
@@ -114,7 +114,7 @@ contract ERC20PermitNoRevertMock is
         return block.chainid;
     }
 
-    function permitRevert(
+    function permitThatMayRevert(
         address owner,
         address spender,
         uint256 value,
@@ -135,7 +135,7 @@ contract ERC20PermitNoRevertMock is
         bytes32 r,
         bytes32 s
     ) public virtual override {
-        try this.permitRevert(owner, spender, value, deadline, v, r, s) {
+        try this.permitThatMayRevert(owner, spender, value, deadline, v, r, s) {
             // do nothing
         } catch {
             // do nothing
@@ -144,11 +144,11 @@ contract ERC20PermitNoRevertMock is
 }
 
 contract SafeERC20Wrapper is Context {
-    using SafeERC20 for IERC20Permit;
+    using SafeERC20 for IERC20;
 
-    IERC20Permit private _token;
+    IERC20 private _token;
 
-    constructor(IERC20Permit token) {
+    constructor(IERC20 token) {
         _token = token;
     }
 
@@ -181,7 +181,7 @@ contract SafeERC20Wrapper is Context {
         bytes32 r,
         bytes32 s
     ) public {
-        _token.safePermit(owner, spender, value, deadline, v, r, s);
+        SafeERC20.safePermit(IERC20Permit(address(_token)), owner, spender, value, deadline, v, r, s);
     }
 
     function setAllowance(uint256 allowance_) public {

diff --git a/contracts/token/ERC20/extensions/draft-IERC20Permit.sol b/contracts/token/ERC20/extensions/draft-IERC20Permit.sol
@@ -13,7 +13,7 @@ import "../IERC20.sol";
  * presenting a message signed by the account. By not relying on {IERC20-approve}, the token holder account doesn't
  * need to send a transaction, and thus is not required to hold Ether at all.
  */
-interface IERC20Permit is IERC20 {
+interface IERC20Permit {
     /**
      * @dev Sets `value` as the allowance of `spender` over ``owner``'s tokens,
      * given ``owner``'s signed approval.

diff --git a/contracts/token/ERC20/utils/SafeERC20.sol b/contracts/token/ERC20/utils/SafeERC20.sol
@@ -91,10 +91,7 @@ library SafeERC20 {
         bytes32 s
     ) internal {
         uint256 nonceBefore = token.nonces(owner);
-        _callOptionalReturn(
-            token,
-            abi.encodeWithSelector(token.permit.selector, owner, spender, value, deadline, v, r, s)
-        );
+        token.permit(owner, spender, value, deadline, v, r, s);
         uint256 nonceAfter = token.nonces(owner);
         require(nonceAfter == nonceBefore + 1, "SafeERC20: permit did not succeed");
     }