@1inch/solidity-utils 2.0.20 → 2.0.23

package/contracts/OnlyWethReceiver.sol

@@ -3,18 +3,19 @@
 pragma solidity ^0.8.0;
 pragma abicoder v1;
 
+import "./interfaces/IWETH.sol";
+
 abstract contract OnlyWethReceiver {
     error EthDepositRejected();
 
-    // solhint-disable-next-line var-name-mixedcase
-    address internal immutable _WETH;
+    IWETH internal immutable _WETH;  // solhint-disable-line var-name-mixedcase
 
-    constructor(address weth) {
+    constructor(IWETH weth) {
         _WETH = weth;
     }
 
     receive() external payable {
         // solhint-disable-next-line avoid-tx-origin
-        if (msg.sender != _WETH) revert EthDepositRejected();
+        if (msg.sender != address(_WETH)) revert EthDepositRejected();
     }
 }

package/contracts/libraries/UniERC20.sol

@@ -69,13 +69,7 @@ library UniERC20 {
     function uniApprove(IERC20 token, address to, uint256 amount) internal {
         if (isETH(token)) revert ApproveCalledOnETH();
 
-        // solhint-disable-next-line avoid-low-level-calls
-        (bool success, bytes memory returndata) = address(token).call(abi.encodeWithSelector(token.approve.selector, to, amount));
-
-        if (!success || (returndata.length > 0 && !abi.decode(returndata, (bool)))) {
-            _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, to, 0));
-            _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, to, amount));
-        }
+        token.forceApprove(to, amount);
     }
 
     function _uniDecode(IERC20 token, string memory lowerCaseSignature, string memory upperCaseSignature) private view returns(string memory) {
@@ -100,34 +94,19 @@ library UniERC20 {
         }
 
         if (success && data.length == 32) {
-            uint len = 0;
+            uint256 len = 0;
             while (len < data.length && data[len] >= 0x20 && data[len] <= 0x7E) {
                 len++;
             }
 
             if (len > 0) {
-                bytes memory result = new bytes(len);
-                unchecked {
-                    for (uint i = 0; i < len; i++) {
-                        result[i] = data[i];
-                    }
+                assembly { // solhint-disable-line no-inline-assembly
+                    mstore(data, len)
                 }
-                return string(result);
+                return string(data);
             }
         }
 
         return StringUtil.toHex(address(token));
     }
-
-    function _callOptionalReturn(IERC20 token, bytes memory data) private {
-        // solhint-disable-next-line avoid-low-level-calls
-        (bool success, bytes memory result) = address(token).call(data);
-        if (!success) {
-            RevertReasonForwarder.reRevert();
-        }
-
-        if (result.length > 0) { // Return data is optional
-            if (!abi.decode(result, (bool))) revert ERC20OperationFailed();
-        }
-    }
 }

package/contracts/mocks/TokenCustomDecimalsMock.sol

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
+
+contract TokenCustomDecimalsMock is ERC20Permit, Ownable {
+    uint8 internal immutable _decimals;
+
+    constructor(string memory name, string memory symbol, uint256 amount, uint8 decimals_) ERC20(name, symbol) ERC20Permit(name) {
+        _mint(msg.sender, amount);
+        _decimals = decimals_;
+    }
+
+    function mint(address account, uint256 amount) external onlyOwner {
+        _mint(account, amount);
+    }
+
+    function burn(address account, uint256 amount) external onlyOwner {
+        _burn(account, amount);
+    }
+
+    function decimals() public view virtual override returns (uint8) {
+        return _decimals;
+    }
+
+    function getChainId() external view returns(uint256) {
+        return block.chainid;
+    }
+}

package/contracts/mocks/TokenMock.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+pragma abicoder v1;
+
+import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+
+contract TokenMock is ERC20, Ownable {
+    // solhint-disable-next-line no-empty-blocks
+    constructor(string memory name, string memory symbol) ERC20(name, symbol) {}
+
+    function mint(address account, uint256 amount) external onlyOwner {
+        _mint(account, amount);
+    }
+
+    function burn(address account, uint256 amount) external onlyOwner {
+        _burn(account, amount);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1inch/solidity-utils",
-  "version": "2.0.20",
+  "version": "2.0.23",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -87,6 +87,7 @@
     "./utils",
     "contracts/*.sol",
     "contracts/interfaces",
-    "contracts/libraries"
+    "contracts/libraries",
+    "contracts/mocks"
   ]
 }