feat: check transfer or approval reverts instead of returning boolean

analysis/description-table/ERC1363.md

@@ -5,7 +5,7 @@
 
 |  File Name  |  SHA-1 Hash  |
 |-------------|--------------|
-| flat/ERC1363.flat.sol | 9cbaa5967d433176696921607014870e19a253d0 |
+| flat/ERC1363.flat.sol | ca8de52513b8ac954c3a7d0cd4a4aafb6bf4331e |
 
 
 ### Contracts Description Table
@@ -81,8 +81,8 @@
 | └ | transferFromAndCall | Public ❗️ | 🛑  |NO❗️ |
 | └ | approveAndCall | Public ❗️ | 🛑  |NO❗️ |
 | └ | approveAndCall | Public ❗️ | 🛑  |NO❗️ |
-| └ | _checkOnTransferReceived | Internal 🔒 | 🛑  | |
-| └ | _checkOnApprovalReceived | Internal 🔒 | 🛑  | |
+| └ | _checkOnTransferReceived | Private 🔐 | 🛑  | |
+| └ | _checkOnApprovalReceived | Private 🔐 | 🛑  | |
 
 
 ### Legend

contracts/token/ERC1363/ERC1363.sol

@@ -41,7 +41,7 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
      */
     function transferAndCall(address to, uint256 amount, bytes memory data) public virtual override returns (bool) {
         transfer(to, amount);
-        require(_checkOnTransferReceived(_msgSender(), to, amount, data), "ERC1363: receiver returned wrong data");
+        _checkOnTransferReceived(_msgSender(), to, amount, data);
         return true;
     }
 
@@ -71,7 +71,7 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
         bytes memory data
     ) public virtual override returns (bool) {
         transferFrom(from, to, amount);
-        require(_checkOnTransferReceived(from, to, amount, data), "ERC1363: receiver returned wrong data");
+        _checkOnTransferReceived(from, to, amount, data);
         return true;
     }
 
@@ -94,31 +94,25 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
      */
     function approveAndCall(address spender, uint256 amount, bytes memory data) public virtual override returns (bool) {
         approve(spender, amount);
-        require(_checkOnApprovalReceived(spender, amount, data), "ERC1363: spender returned wrong data");
+        _checkOnApprovalReceived(spender, amount, data);
         return true;
     }
 
     /**
-     * @dev Internal function to invoke {IERC1363Receiver-onTransferReceived} on a target address.
-     *  The call is not executed if the target address is not a contract.
+     * @dev Private function to invoke {IERC1363Receiver-onTransferReceived} on a target address.
+     * This will revert if the recipient doesn't accept the token transfer or if the target address is not a contract.
      * @param sender address Representing the previous owner of the given token amount
      * @param recipient address Target address that will receive the tokens
      * @param amount uint256 The amount mount of tokens to be transferred
      * @param data bytes Optional data to send along with the call
-     * @return whether the call correctly returned the expected magic value
      */
-    function _checkOnTransferReceived(
-        address sender,
-        address recipient,
-        uint256 amount,
-        bytes memory data
-    ) internal virtual returns (bool) {
+    function _checkOnTransferReceived(address sender, address recipient, uint256 amount, bytes memory data) private {
         if (recipient.code.length == 0) {
             revert("ERC1363: transfer to non contract address");
         }
 
         try IERC1363Receiver(recipient).onTransferReceived(_msgSender(), sender, amount, data) returns (bytes4 retval) {
-            return retval == IERC1363Receiver.onTransferReceived.selector;
+            require(retval == IERC1363Receiver.onTransferReceived.selector, "ERC1363: receiver returned wrong data");
         } catch (bytes memory reason) {
             if (reason.length == 0) {
                 revert("ERC1363: transfer to non ERC1363Receiver implementer");
@@ -132,24 +126,19 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
     }
 
     /**
-     * @dev Internal function to invoke {IERC1363Receiver-onApprovalReceived} on a target address.
-     *  The call is not executed if the target address is not a contract.
+     * @dev Private function to invoke {IERC1363Receiver-onApprovalReceived} on a target address.
+     * This will revert if the recipient doesn't accept the token approval or if the target address is not a contract.
      * @param spender address The address which will spend the funds
      * @param amount uint256 The amount of tokens to be spent
      * @param data bytes Optional data to send along with the call
-     * @return whether the call correctly returned the expected magic value
      */
-    function _checkOnApprovalReceived(
-        address spender,
-        uint256 amount,
-        bytes memory data
-    ) internal virtual returns (bool) {
+    function _checkOnApprovalReceived(address spender, uint256 amount, bytes memory data) private {
         if (spender.code.length == 0) {
             revert("ERC1363: approve a non contract address");
         }
 
         try IERC1363Spender(spender).onApprovalReceived(_msgSender(), amount, data) returns (bytes4 retval) {
-            return retval == IERC1363Spender.onApprovalReceived.selector;
+            require(retval == IERC1363Spender.onApprovalReceived.selector, "ERC1363: spender returned wrong data");
         } catch (bytes memory reason) {
             if (reason.length == 0) {
                 revert("ERC1363: approve a non ERC1363Spender implementer");

flat/ERC1363.flat.sol

@@ -755,7 +755,7 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
      */
     function transferAndCall(address to, uint256 amount, bytes memory data) public virtual override returns (bool) {
         transfer(to, amount);
-        require(_checkOnTransferReceived(_msgSender(), to, amount, data), "ERC1363: receiver returned wrong data");
+        _checkOnTransferReceived(_msgSender(), to, amount, data);
         return true;
     }
 
@@ -785,7 +785,7 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
         bytes memory data
     ) public virtual override returns (bool) {
         transferFrom(from, to, amount);
-        require(_checkOnTransferReceived(from, to, amount, data), "ERC1363: receiver returned wrong data");
+        _checkOnTransferReceived(from, to, amount, data);
         return true;
     }
 
@@ -808,31 +808,25 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
      */
     function approveAndCall(address spender, uint256 amount, bytes memory data) public virtual override returns (bool) {
         approve(spender, amount);
-        require(_checkOnApprovalReceived(spender, amount, data), "ERC1363: spender returned wrong data");
+        _checkOnApprovalReceived(spender, amount, data);
         return true;
     }
 
     /**
-     * @dev Internal function to invoke {IERC1363Receiver-onTransferReceived} on a target address.
-     *  The call is not executed if the target address is not a contract.
+     * @dev Private function to invoke {IERC1363Receiver-onTransferReceived} on a target address.
+     * This will revert if the recipient doesn't accept the token transfer or if the target address is not a contract.
      * @param sender address Representing the previous owner of the given token amount
      * @param recipient address Target address that will receive the tokens
      * @param amount uint256 The amount mount of tokens to be transferred
      * @param data bytes Optional data to send along with the call
-     * @return whether the call correctly returned the expected magic value
      */
-    function _checkOnTransferReceived(
-        address sender,
-        address recipient,
-        uint256 amount,
-        bytes memory data
-    ) internal virtual returns (bool) {
+    function _checkOnTransferReceived(address sender, address recipient, uint256 amount, bytes memory data) private {
         if (recipient.code.length == 0) {
             revert("ERC1363: transfer to non contract address");
         }
 
         try IERC1363Receiver(recipient).onTransferReceived(_msgSender(), sender, amount, data) returns (bytes4 retval) {
-            return retval == IERC1363Receiver.onTransferReceived.selector;
+            require(retval == IERC1363Receiver.onTransferReceived.selector, "ERC1363: receiver returned wrong data");
         } catch (bytes memory reason) {
             if (reason.length == 0) {
                 revert("ERC1363: transfer to non ERC1363Receiver implementer");
@@ -846,24 +840,19 @@ abstract contract ERC1363 is ERC20, IERC1363, ERC165 {
     }
 
     /**
-     * @dev Internal function to invoke {IERC1363Receiver-onApprovalReceived} on a target address.
-     *  The call is not executed if the target address is not a contract.
+     * @dev Private function to invoke {IERC1363Receiver-onApprovalReceived} on a target address.
+     * This will revert if the recipient doesn't accept the token approval or if the target address is not a contract.
      * @param spender address The address which will spend the funds
      * @param amount uint256 The amount of tokens to be spent
      * @param data bytes Optional data to send along with the call
-     * @return whether the call correctly returned the expected magic value
      */
-    function _checkOnApprovalReceived(
-        address spender,
-        uint256 amount,
-        bytes memory data
-    ) internal virtual returns (bool) {
+    function _checkOnApprovalReceived(address spender, uint256 amount, bytes memory data) private {
         if (spender.code.length == 0) {
             revert("ERC1363: approve a non contract address");
         }
 
         try IERC1363Spender(spender).onApprovalReceived(_msgSender(), amount, data) returns (bytes4 retval) {
-            return retval == IERC1363Spender.onApprovalReceived.selector;
+            require(retval == IERC1363Spender.onApprovalReceived.selector, "ERC1363: spender returned wrong data");
         } catch (bytes memory reason) {
             if (reason.length == 0) {
                 revert("ERC1363: approve a non ERC1363Spender implementer");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "erc-payable-token",
-  "version": "4.9.6",
+  "version": "4.9.7",
   "description": "ERC-1363 Payable Token Implementation",
   "files": [
     "contracts",