test-isol-01 0.0.17 → 0.0.18

package/contracts/kit/{WrapERC20xTransferWithAuthorize.sol → ERC20TransferWithAuthorize.sol}

@@ -2,38 +2,44 @@
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Wrapper.sol";
 import "../adapter/TransferAuthorize.sol";
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 
-/**
- * @title ERC20WrappedWithAuthorize
- * @notice ERC20 wrapper that allows wrapping any existing ERC20 token
- *         and adds EIP-712 off-chain authorization functions.
- * @dev Inherits ERC20, ERC20Wrapper, and ERC20TransferWithAuthorize:
- *      - ERC20: standard token functionality
- *      - ERC20Wrapper: depositFor/withdrawTo underlying tokens
- *      - ERC20TransferWithAuthorize: transferWithAuthorize and receiveWithAuthorize
- */
-abstract contract WrapERC20xTransferWithAuthorize is ERC20, ERC20Wrapper, TransferAuthorize, ReentrancyGuard {
-
-    /**
-     * @notice Construct a wrapped ERC20 with authorization support
-     * @param _underlyingToken Address of the ERC20 token to wrap. Users deposit this token to receive the wrapped token.
-     * @param _name Name of the wrapped token (ERC20 metadata and EIP-712 domain name)
-     * @param _symbol Symbol of the wrapped token (ERC20 metadata)
-     * @param _version Version string for EIP-712 domain (e.g. "1")
-     */
-    constructor(
-        address _underlyingToken,
-        string memory _name,
-        string memory _symbol,
-        string memory _version
-    )
-        ERC20(_name, _symbol)
-        ERC20Wrapper(IERC20(_underlyingToken))
-        TransferAuthorize(_name, _version)
+/// @title ERC20TransferWithAuthorize
+/// @notice ERC20 extension that supports EIP-712 based `transferWithAuthorize` and `receiveWithAuthorize` flows
+/// @dev `receiveWithAuthorize` restricts the caller to the `to` address (recipient submits the proof). `transferWithAuthorize` is open to relayers.
+abstract contract ERC20TransferWithAuthorize is ERC20, TransferAuthorize, ReentrancyGuard {
+    /// @param name EIP-712 domain name
+    /// @param version EIP-712 domain version
+    constructor(string memory name, string memory version)
+        TransferAuthorize(name, version)
     {}
+    
+    /// @notice Recipient-triggered transfer using an off-chain signature by `from`.
+    /// @dev The caller must be the recipient `to` to match the semantics of "receive with authorization".
+    function receiveWithAuthorize(
+        address from,
+        address to,
+        uint256 value,
+        uint256 validAfter,
+        uint256 validBefore,
+        bytes32 nonce,
+        bytes calldata signature
+    ) external override nonReentrant {
+        require(msg.sender == to, "ERC20TransferAuthorize: caller must sender");
+        address signer = _verifyReceive(
+            from,
+            to,
+            value,
+            validAfter,
+            validBefore,
+            nonce,
+            signature
+        );
+        require(signer == from, "ERC20TransferAuthorize: invalid signature");
+        _useAuthorize(from, nonce);
+        _transfer(from, to, value);
+    }
 
     /// @notice Relayer-triggered transfer using an off-chain signature by `from`.
     /// @dev This allows anyone (a relayer) to submit the signed authorization on-chain.
@@ -86,6 +92,31 @@ abstract contract WrapERC20xTransferWithAuthorize is ERC20, ERC20Wrapper, Transf
         _transfer(from, to, value);
     }
 
+    /// @notice Relayer-triggered transfer using an off-chain signature by `from`.
+    /// @dev This allows anyone (a relayer) to submit the signed authorization on-chain.
+    function approveWithAuthorize(
+        address from,
+        address to,
+        uint256 value,
+        uint256 validAfter,
+        uint256 validBefore,
+        bytes32 nonce,
+        bytes calldata signature
+    ) external override nonReentrant {
+        address signer = _verifyApprove(
+            from,
+            to,
+            value,
+            validAfter,
+            validBefore,
+            nonce,
+            signature
+        );
+        require(signer == from, "ERC20TransferAuthorize: invalid signature");
+        _useAuthorize(from, nonce);
+        _approve(from, to, value);
+    }
+
     /// @notice Relayer-triggered transfer using an off-chain signature by `from`.
     /// @dev This allows anyone (a relayer) to submit the signed authorization on-chain.
     function burnWithAuthorize(
@@ -110,19 +141,4 @@ abstract contract WrapERC20xTransferWithAuthorize is ERC20, ERC20Wrapper, Transf
         _useAuthorize(from, nonce);
         _burn(from, value);
     }
-
-    /**
-     * @notice Returns the token decimals
-     * @dev Overrides both ERC20 and ERC20Wrapper decimals function
-     * @return uint8 decimals of the token (usually matches underlying token)
-     */
-    function decimals()
-        public
-        view
-        virtual
-        override(ERC20, ERC20Wrapper)
-        returns (uint8)
-    {
-        return super.decimals();
-    }
 }

package/contracts/kit/ERC20WrappedWithAuthorize.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { IERC20, ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { ERC20Wrapper } from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Wrapper.sol";
+import { ERC20TransferWithAuthorize } from "./ERC20TransferWithAuthorize.sol";
+
+/**
+ * @title ERC20WrappedWithAuthorize
+ * @notice ERC20 wrapper that allows wrapping any existing ERC20 token
+ *         and adds EIP-712 off-chain authorization functions.
+ * @dev Inherits ERC20, ERC20Wrapper, and ERC20TransferWithAuthorize:
+ *      - ERC20: standard token functionality
+ *      - ERC20Wrapper: depositFor/withdrawTo underlying tokens
+ *      - ERC20TransferWithAuthorize: transferWithAuthorize and receiveWithAuthorize
+ */
+abstract contract ERC20WrappedWithAuthorize is ERC20, ERC20Wrapper, ERC20TransferWithAuthorize {
+
+    /**
+     * @notice Construct a wrapped ERC20 with authorization support
+     * @param _underlyingToken Address of the ERC20 token to wrap. Users deposit this token to receive the wrapped token.
+     * @param _name Name of the wrapped token (ERC20 metadata and EIP-712 domain name)
+     * @param _symbol Symbol of the wrapped token (ERC20 metadata)
+     * @param _version Version string for EIP-712 domain (e.g. "1")
+     */
+    constructor(
+        address _underlyingToken,
+        string memory _name,
+        string memory _symbol,
+        string memory _version
+    )
+        ERC20(_name, _symbol)
+        ERC20Wrapper(IERC20(_underlyingToken))
+        ERC20TransferWithAuthorize(_name, _version)
+    {}
+
+    /**
+     * @notice Returns the token decimals
+     * @dev Overrides both ERC20 and ERC20Wrapper decimals function
+     * @return uint8 decimals of the token (usually matches underlying token)
+     */
+    function decimals()
+        public
+        view
+        virtual
+        override(ERC20, ERC20Wrapper)
+        returns (uint8)
+    {
+        return super.decimals();
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "test-isol-01",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "module": "index.ts",
   "type": "module",
   "devDependencies": {