eip1363 implementation

contracts/interfaces/IERC1363.sol

@@ -3,93 +3,4 @@
 
 pragma solidity ^0.8.0;
 
-import "./IERC20.sol";
-import "./IERC165.sol";
-
-interface IERC1363 is IERC165, IERC20 {
-    /*
-     * Note: the ERC-165 identifier for this interface is 0x4bbee2df.
-     * 0x4bbee2df ===
-     *   bytes4(keccak256('transferAndCall(address,uint256)')) ^
-     *   bytes4(keccak256('transferAndCall(address,uint256,bytes)')) ^
-     *   bytes4(keccak256('transferFromAndCall(address,address,uint256)')) ^
-     *   bytes4(keccak256('transferFromAndCall(address,address,uint256,bytes)'))
-     */
-
-    /*
-     * Note: the ERC-165 identifier for this interface is 0xfb9ec8ce.
-     * 0xfb9ec8ce ===
-     *   bytes4(keccak256('approveAndCall(address,uint256)')) ^
-     *   bytes4(keccak256('approveAndCall(address,uint256,bytes)'))
-     */
-
-    /**
-     * @dev Transfer tokens from `msg.sender` to another address and then call `onTransferReceived` on receiver
-     * @param to address The address which you want to transfer to
-     * @param value uint256 The amount of tokens to be transferred
-     * @return true unless throwing
-     */
-    function transferAndCall(address to, uint256 value) external returns (bool);
-
-    /**
-     * @dev Transfer tokens from `msg.sender` to another address and then call `onTransferReceived` on receiver
-     * @param to address The address which you want to transfer to
-     * @param value uint256 The amount of tokens to be transferred
-     * @param data bytes Additional data with no specified format, sent in call to `to`
-     * @return true unless throwing
-     */
-    function transferAndCall(
-        address to,
-        uint256 value,
-        bytes memory data
-    ) external returns (bool);
-
-    /**
-     * @dev Transfer tokens from one address to another and then call `onTransferReceived` on receiver
-     * @param from address The address which you want to send tokens from
-     * @param to address The address which you want to transfer to
-     * @param value uint256 The amount of tokens to be transferred
-     * @return true unless throwing
-     */
-    function transferFromAndCall(
-        address from,
-        address to,
-        uint256 value
-    ) external returns (bool);
-
-    /**
-     * @dev Transfer tokens from one address to another and then call `onTransferReceived` on receiver
-     * @param from address The address which you want to send tokens from
-     * @param to address The address which you want to transfer to
-     * @param value uint256 The amount of tokens to be transferred
-     * @param data bytes Additional data with no specified format, sent in call to `to`
-     * @return true unless throwing
-     */
-    function transferFromAndCall(
-        address from,
-        address to,
-        uint256 value,
-        bytes memory data
-    ) external returns (bool);
-
-    /**
-     * @dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender
-     * and then call `onApprovalReceived` on spender.
-     * @param spender address The address which will spend the funds
-     * @param value uint256 The amount of tokens to be spent
-     */
-    function approveAndCall(address spender, uint256 value) external returns (bool);
-
-    /**
-     * @dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender
-     * and then call `onApprovalReceived` on spender.
-     * @param spender address The address which will spend the funds
-     * @param value uint256 The amount of tokens to be spent
-     * @param data bytes Additional data with no specified format, sent in call to `spender`
-     */
-    function approveAndCall(
-        address spender,
-        uint256 value,
-        bytes memory data
-    ) external returns (bool);
-}
+import "../token/ERC1363/IERC1363.sol";

contracts/interfaces/IERC1363Receiver.sol

@@ -3,30 +3,4 @@
 
 pragma solidity ^0.8.0;
 
-interface IERC1363Receiver {
-    /*
-     * Note: the ERC-165 identifier for this interface is 0x88a7ca5c.
-     * 0x88a7ca5c === bytes4(keccak256("onTransferReceived(address,address,uint256,bytes)"))
-     */
-
-    /**
-     * @notice Handle the receipt of ERC1363 tokens
-     * @dev Any ERC1363 smart contract calls this function on the recipient
-     * after a `transfer` or a `transferFrom`. This function MAY throw to revert and reject the
-     * transfer. Return of other than the magic value MUST result in the
-     * transaction being reverted.
-     * Note: the token contract address is always the message sender.
-     * @param operator address The address which called `transferAndCall` or `transferFromAndCall` function
-     * @param from address The address which are token transferred from
-     * @param value uint256 The amount of tokens transferred
-     * @param data bytes Additional data with no specified format
-     * @return `bytes4(keccak256("onTransferReceived(address,address,uint256,bytes)"))`
-     *  unless throwing
-     */
-    function onTransferReceived(
-        address operator,
-        address from,
-        uint256 value,
-        bytes memory data
-    ) external returns (bytes4);
-}
+import "../token/ERC1363/IERC1363Receiver.sol";

contracts/interfaces/IERC1363Spender.sol

@@ -3,28 +3,4 @@
 
 pragma solidity ^0.8.0;
 
-interface IERC1363Spender {
-    /*
-     * Note: the ERC-165 identifier for this interface is 0x7b04a2d0.
-     * 0x7b04a2d0 === bytes4(keccak256("onApprovalReceived(address,uint256,bytes)"))
-     */
-
-    /**
-     * @notice Handle the approval of ERC1363 tokens
-     * @dev Any ERC1363 smart contract calls this function on the recipient
-     * after an `approve`. This function MAY throw to revert and reject the
-     * approval. Return of other than the magic value MUST result in the
-     * transaction being reverted.
-     * Note: the token contract address is always the message sender.
-     * @param owner address The address which called `approveAndCall` function
-     * @param value uint256 The amount of tokens to be spent
-     * @param data bytes Additional data with no specified format
-     * @return `bytes4(keccak256("onApprovalReceived(address,uint256,bytes)"))`
-     *  unless throwing
-     */
-    function onApprovalReceived(
-        address owner,
-        uint256 value,
-        bytes memory data
-    ) external returns (bytes4);
-}
+import "../token/ERC1363/IERC1363Spender.sol";

contracts/interfaces/README.adoc

@@ -22,6 +22,8 @@ are useful to interact with third party contracts that implement them.
 - {IERC1155MetadataURI}
 - {IERC1271}
 - {IERC1363}
+- {IERC1363Receiver}
+- {IERC1363Spender}
 - {IERC1820Implementer}
 - {IERC1820Registry}
 - {IERC1822Proxiable}
@@ -39,6 +41,8 @@ are useful to interact with third party contracts that implement them.
 
 {{IERC1363Receiver}}
 
+{{IERC1363Spender}}
+
 {{IERC1820Implementer}}
 
 {{IERC1820Registry}}

contracts/mocks/ERC1363Mock.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "../token/ERC1363/ERC1363.sol";
+
+contract ERC1363Mock is ERC1363 {
+    constructor(
+        string memory name,
+        string memory symbol,
+        address initialAccount,
+        uint256 initialBalance
+    ) ERC20(name, symbol) {
+        _mint(initialAccount, initialBalance);
+    }
+}

contracts/mocks/ERC1363ReceiverMock.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "../token/ERC1363/IERC1363Receiver.sol";
+
+contract ERC1363ReceiverMock is IERC1363Receiver {
+    bytes4 private _retval;
+    bool private _reverts;
+
+    event Received(address operator, address sender, uint256 amount, bytes data, uint256 gas);
+
+    constructor(bytes4 retval, bool reverts) {
+        _retval = retval;
+        _reverts = reverts;
+    }
+
+    function onTransferReceived(
+        address spender,
+        address sender,
+        uint256 amount,
+        bytes memory data
+    ) public override returns (bytes4) {
+        require(!_reverts, "ERC1363ReceiverMock: throwing");
+        emit Received(spender, sender, amount, data, gasleft());
+        return _retval;
+    }
+}

contracts/mocks/ERC1363SpenderMock.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "../token/ERC1363/IERC1363Spender.sol";
+
+contract ERC1363SpenderMock is IERC1363Spender {
+    bytes4 private _retval;
+    bool private _reverts;
+
+    event Approved(address sender, uint256 amount, bytes data, uint256 gas);
+
+    constructor(bytes4 retval, bool reverts) {
+        _retval = retval;
+        _reverts = reverts;
+    }
+
+    function onApprovalReceived(
+        address sender,
+        uint256 amount,
+        bytes memory data
+    ) public override returns (bytes4) {
+        require(!_reverts, "ERC1363SpenderMock: throwing");
+        emit Approved(sender, amount, data, gasleft());
+        return _retval;
+    }
+}