@1inch/solidity-utils 2.2.14 → 2.2.16

package/contracts/libraries/AddressLib.sol

@@ -6,8 +6,10 @@ pragma abicoder v1;
 type Address is uint256;
 
 library AddressLib {
+    uint256 private constant _LOW_160_BIT_MASK = (1 << 160) - 1;
+
     function get(Address a) internal pure returns (address) {
-        return address(uint160(Address.unwrap(a)));
+        return address(uint160(Address.unwrap(a) & _LOW_160_BIT_MASK));
     }
 
     function getFlag(Address a, uint256 flag) internal pure returns (bool) {

package/contracts/libraries/SafeERC20.sol

@@ -7,6 +7,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol";
 import "../interfaces/IDaiLikePermit.sol";
 import "../interfaces/IPermit2.sol";
+import "../interfaces/IWETH.sol";
 import "../libraries/RevertReasonForwarder.sol";
 
 /// @title Implements efficient safe methods for ERC20 interface.
@@ -252,4 +253,44 @@ library SafeERC20 {
             }
         }
     }
+
+    function safeDeposit(IWETH weth, uint256 amount) internal {
+        if (amount > 0) {
+            bytes4 selector = IWETH.deposit.selector;
+            /// @solidity memory-safe-assembly
+            assembly { // solhint-disable-line no-inline-assembly
+                mstore(0, selector)
+                if iszero(call(gas(), weth, amount, 0, 4, 0, 0)) {
+                    returndatacopy(0, 0, returndatasize())
+                    revert(0, returndatasize())
+                }
+            }
+        }
+    }
+
+    function safeWithdraw(IWETH weth, uint256 amount) internal {
+        bytes4 selector = IWETH.withdraw.selector;
+        /// @solidity memory-safe-assembly
+        assembly {  // solhint-disable-line no-inline-assembly
+            mstore(0, selector)
+            mstore(4, amount)
+            if iszero(call(gas(), weth, 0, 0, 0x24, 0, 0)) {
+                returndatacopy(0, 0, returndatasize())
+                revert(0, returndatasize())
+            }
+        }
+    }
+
+    function safeWithdrawTo(IWETH weth, uint256 amount, address to) internal {
+        safeWithdraw(weth, amount);
+        if (to != address(this)) {
+            /// @solidity memory-safe-assembly
+            assembly {  // solhint-disable-line no-inline-assembly
+                if iszero(call(gas(), to, amount, 0, 0, 0, 0)) {
+                    returndatacopy(0, 0, returndatasize())
+                    revert(0, returndatasize())
+                }
+            }
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1inch/solidity-utils",
-  "version": "2.2.14",
+  "version": "2.2.16",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "repository": {