@1inch/solidity-utils 2.2.17 → 2.2.19

package/contracts/libraries/ECDSA.sol

@@ -25,8 +25,7 @@ library ECDSA {
         bytes32 r,
         bytes32 s
     ) internal view returns (address signer) {
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             if lt(s, _S_BOUNDARY) {
                 let ptr := mload(0x40)
 
@@ -46,8 +45,7 @@ library ECDSA {
         bytes32 r,
         bytes32 vs
     ) internal view returns (address signer) {
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let s := and(vs, _COMPACT_S_MASK)
             if lt(s, _S_BOUNDARY) {
                 let ptr := mload(0x40)
@@ -71,8 +69,7 @@ library ECDSA {
     /// signature uniqueness will get rekt.
     /// More info: https://github.com/OpenZeppelin/openzeppelin-contracts/security/advisories/GHSA-4h98-2769-gh6h
     function recover(bytes32 hash, bytes calldata signature) internal view returns (address signer) {
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
 
             // memory[ptr:ptr+0x80] = (hash, v, r, s)
@@ -166,8 +163,7 @@ library ECDSA {
         // (bool success, bytes memory data) = signer.staticcall(abi.encodeWithSelector(IERC1271.isValidSignature.selector, hash, signature));
         // return success && data.length >= 4 && abi.decode(data, (bytes4)) == IERC1271.isValidSignature.selector;
         bytes4 selector = IERC1271.isValidSignature.selector;
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
 
             mstore(ptr, selector)
@@ -189,8 +185,7 @@ library ECDSA {
         bytes32 s
     ) internal view returns (bool success) {
         bytes4 selector = IERC1271.isValidSignature.selector;
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
 
             mstore(ptr, selector)
@@ -215,8 +210,7 @@ library ECDSA {
         // (bool success, bytes memory data) = signer.staticcall(abi.encodeWithSelector(IERC1271.isValidSignature.selector, hash, abi.encodePacked(r, vs)));
         // return success && data.length >= 4 && abi.decode(data, (bytes4)) == IERC1271.isValidSignature.selector;
         bytes4 selector = IERC1271.isValidSignature.selector;
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
 
             mstore(ptr, selector)
@@ -240,8 +234,7 @@ library ECDSA {
         // (bool success, bytes memory data) = signer.staticcall(abi.encodeWithSelector(IERC1271.isValidSignature.selector, hash, abi.encodePacked(r, vs & ~uint256(1 << 255), uint8(vs >> 255))));
         // return success && data.length >= 4 && abi.decode(data, (bytes4)) == IERC1271.isValidSignature.selector;
         bytes4 selector = IERC1271.isValidSignature.selector;
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
 
             mstore(ptr, selector)
@@ -260,8 +253,7 @@ library ECDSA {
     function toEthSignedMessageHash(bytes32 hash) internal pure returns (bytes32 res) {
         // 32 is the length in bytes of hash, enforced by the type signature above
         // return keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n32", hash));
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             mstore(0, 0x19457468657265756d205369676e6564204d6573736167653a0a333200000000) // "\x19Ethereum Signed Message:\n32"
             mstore(28, hash)
             res := keccak256(0, 60)
@@ -270,8 +262,7 @@ library ECDSA {
 
     function toTypedDataHash(bytes32 domainSeparator, bytes32 structHash) internal pure returns (bytes32 res) {
         // return keccak256(abi.encodePacked("\x19\x01", domainSeparator, structHash));
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
             mstore(ptr, 0x1901000000000000000000000000000000000000000000000000000000000000) // "\x19\x01"
             mstore(add(ptr, 0x02), domainSeparator)

package/contracts/libraries/RevertReasonForwarder.sol

@@ -8,8 +8,7 @@ library RevertReasonForwarder {
     /// @dev Forwards latest externall call revert.
     function reRevert() internal pure {
         // bubble up revert reason from latest external call
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
             returndatacopy(ptr, 0, returndatasize())
             revert(ptr, returndatasize())

package/contracts/libraries/RevertReasonParser.sol

@@ -27,8 +27,7 @@ library RevertReasonParser {
         // We assume that revert reason is abi-encoded as Error(string)
         bytes4 selector;
         if (data.length >= 4) {
-            /// @solidity memory-safe-assembly
-            assembly { // solhint-disable-line no-inline-assembly
+            assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
                 selector := mload(add(data, 0x20))
             }
         }
@@ -36,8 +35,7 @@ library RevertReasonParser {
         // 68 = 4-byte selector + 32 bytes offset + 32 bytes length
         if (selector == _ERROR_SELECTOR && data.length >= 68) {
             string memory reason;
-            /// @solidity memory-safe-assembly
-            assembly { // solhint-disable-line no-inline-assembly
+            assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
                 // 68 = 32 bytes data length + 4-byte selector + 32 bytes offset
                 reason := add(data, 68)
             }
@@ -55,8 +53,7 @@ library RevertReasonParser {
         // 36 = 4-byte selector + 32 bytes integer
         else if (selector == _PANIC_SELECTOR && data.length == 36) {
             uint256 code;
-            /// @solidity memory-safe-assembly
-            assembly { // solhint-disable-line no-inline-assembly
+            assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
                 // 36 = 32 bytes data length + 4-byte selector
                 code := mload(add(data, 36))
             }

package/contracts/libraries/SafeERC20.sol

@@ -46,8 +46,7 @@ library SafeERC20 {
     ) internal {
         bytes4 selector = token.transferFrom.selector;
         bool success;
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let data := mload(0x40)
 
             mstore(data, selector)
@@ -77,8 +76,7 @@ library SafeERC20 {
     ) internal {
         bytes4 selector = IPermit2.transferFrom.selector;
         bool success;
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let data := mload(0x40)
 
             mstore(data, selector)
@@ -159,8 +157,7 @@ library SafeERC20 {
         bytes4 permitSelector = IERC20Permit.permit.selector;
         bytes4 daiPermitSelector = IDaiLikePermit.permit.selector;
         bytes4 permit2Selector = IPermit2.permit.selector;
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let ptr := mload(0x40)
             switch permit.length
             case 100 {
@@ -250,8 +247,7 @@ library SafeERC20 {
         address to,
         uint256 amount
     ) private returns (bool success) {
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             let data := mload(0x40)
 
             mstore(data, selector)
@@ -273,8 +269,7 @@ 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
+            assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
                 mstore(0, selector)
                 if iszero(call(gas(), weth, amount, 0, 4, 0, 0)) {
                     returndatacopy(0, 0, returndatasize())
@@ -286,8 +281,7 @@ library SafeERC20 {
 
     function safeWithdraw(IWETH weth, uint256 amount) internal {
         bytes4 selector = IWETH.withdraw.selector;
-        /// @solidity memory-safe-assembly
-        assembly {  // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") {  // solhint-disable-line no-inline-assembly
             mstore(0, selector)
             mstore(4, amount)
             if iszero(call(gas(), weth, 0, 0, 0x24, 0, 0)) {
@@ -300,8 +294,7 @@ library SafeERC20 {
     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
+            assembly ("memory-safe") {  // solhint-disable-line no-inline-assembly
                 if iszero(call(gas(), to, amount, 0, 0, 0, 0)) {
                     returndatacopy(0, 0, returndatasize())
                     revert(0, returndatasize())

package/contracts/libraries/StringUtil.sol

@@ -16,8 +16,7 @@ library StringUtil {
     /// @dev this is the assembly adaptation of highly optimized toHex16 code from Mikhail Vladimirov
     /// https://stackoverflow.com/a/69266989
     function toHex(bytes memory data) internal pure returns (string memory result) {
-        /// @solidity memory-safe-assembly
-        assembly { // solhint-disable-line no-inline-assembly
+        assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
             function _toHex16(input) -> output {
                 output := or(
                     and(input, 0xFFFFFFFFFFFFFFFF000000000000000000000000000000000000000000000000),

package/contracts/libraries/UniERC20.sol

@@ -133,8 +133,7 @@ library UniERC20 {
                 that overall data length is greater or equal than string length + extra 64 bytes
             */
             if (offset == 0x20 && data.length >= 0x40 + len) {
-                /// @solidity memory-safe-assembly
-                assembly { // solhint-disable-line no-inline-assembly
+                assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
                     result := add(data, 0x40)
                 }
                 return result;
@@ -149,8 +148,7 @@ library UniERC20 {
             }
 
             if (len > 0) {
-                /// @solidity memory-safe-assembly
-                assembly { // solhint-disable-line no-inline-assembly
+                assembly ("memory-safe") { // solhint-disable-line no-inline-assembly
                     mstore(data, len)
                 }
                 return string(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1inch/solidity-utils",
-  "version": "2.2.17",
+  "version": "2.2.19",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -9,10 +9,9 @@
   },
   "license": "MIT",
   "scripts": {
-    "prebuild": "rimraf ./dist && cti src -b",
-    "build": "tsc -p tsconfig.publish.json",
-    "postbuild": "echo done",
-    "prepublish": "yarn build",
+    "clean": "rimraf artifacts cache coverage contracts/hardhat-dependency-compiler dist typechain-types",
+    "build": "yarn typechain && cti src -b && tsc -p tsconfig.publish.json",
+    "prepack": "yarn clean && yarn build",
     "coverage": "hardhat coverage",
     "format": "yarn format-ts && yarn format-sol",
     "format-ts": "prettier '**/*.ts' --write",