@1inch/solidity-utils 2.0.15 → 2.0.18

package/contracts/libraries/AddressArray.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.0;
-
+pragma abicoder v1;
 
 library AddressArray {
     error IndexOutOfBounds();

package/contracts/libraries/AddressSet.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.0;
+pragma abicoder v1;
 
 import "./AddressArray.sol";
 
-
 library AddressSet {
     using AddressArray for AddressArray.Data;
 

package/contracts/libraries/RevertReasonForwarder.sol

@@ -6,9 +6,11 @@ pragma abicoder v1;
 library RevertReasonForwarder {
     function reRevert() internal pure {
         // bubble up revert reason from latest external call
-        assembly {  // solhint-disable-line no-inline-assembly
-            returndatacopy(0, 0, returndatasize())
-            revert(0, returndatasize())
+        /// @solidity memory-safe-assembly
+        assembly { // solhint-disable-line no-inline-assembly
+            let ptr := mload(0x40)
+            returndatacopy(ptr, 0, returndatasize())
+            revert(ptr, returndatasize())
         }
     }
 }

package/contracts/libraries/RevertReasonParser.sol

@@ -25,15 +25,18 @@ library RevertReasonParser {
         // https://solidity.readthedocs.io/en/latest/control-structures.html#revert
         // We assume that revert reason is abi-encoded as Error(string)
         bytes4 selector;
-        assembly {  // solhint-disable-line no-inline-assembly
-            selector := mload(add(data, 0x20))
+        if (data.length >= 4) {
+            /// @solidity memory-safe-assembly
+            assembly { // solhint-disable-line no-inline-assembly
+                selector := mload(add(data, 0x20))
+            }
         }
 
         // 68 = 4-byte selector + 32 bytes offset + 32 bytes length
         if (selector == _ERROR_SELECTOR && data.length >= 68) {
             string memory reason;
-            // solhint-disable no-inline-assembly
-            assembly {
+            /// @solidity memory-safe-assembly
+            assembly { // solhint-disable-line no-inline-assembly
                 // 68 = 32 bytes data length + 4-byte selector + 32 bytes offset
                 reason := add(data, 68)
             }
@@ -42,16 +45,17 @@ library RevertReasonParser {
                 also sometimes there is extra 32 bytes of zeros padded in the end:
                 https://github.com/ethereum/solidity/issues/10170
                 because of that we can't check for equality and instead check
-                that string length + extra 68 bytes is less than overall data length
+                that string length + extra 68 bytes is equal or greater than overall data length
             */
-            if (data.length < 68 + bytes(reason).length) revert InvalidRevertReason();
-            return string.concat(prefix, "Error(", reason, ")");
+            if (data.length >= 68 + bytes(reason).length) {
+                return string.concat(prefix, "Error(", reason, ")");
+            }
         }
         // 36 = 4-byte selector + 32 bytes integer
         else if (selector == _PANIC_SELECTOR && data.length == 36) {
             uint256 code;
-            // solhint-disable no-inline-assembly
-            assembly {
+            /// @solidity memory-safe-assembly
+            assembly { // solhint-disable-line no-inline-assembly
                 // 36 = 32 bytes data length + 4-byte selector
                 code := mload(add(data, 36))
             }

package/contracts/libraries/SafeERC20.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.0;
+pragma abicoder v1;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol";
@@ -19,9 +20,9 @@ library SafeERC20 {
     function safeTransferFrom(IERC20 token, address from, address to, uint256 amount) internal {
         bytes4 selector = token.transferFrom.selector;
         bool success;
+        /// @solidity memory-safe-assembly
         assembly { // solhint-disable-line no-inline-assembly
             let data := mload(0x40)
-            mstore(0x40, add(data, 100))
 
             mstore(data, selector)
             mstore(add(data, 0x04), from)
@@ -83,9 +84,9 @@ library SafeERC20 {
     }
 
     function _makeCall(IERC20 token, bytes4 selector, address to, uint256 amount) private returns(bool done) {
+        /// @solidity memory-safe-assembly
         assembly { // solhint-disable-line no-inline-assembly
             let data := mload(0x40)
-            mstore(0x40, add(data, 68))
 
             mstore(data, selector)
             mstore(add(data, 0x04), to)
@@ -102,10 +103,10 @@ library SafeERC20 {
     }
 
     function _makeCalldataCall(IERC20 token, bytes4 selector, bytes calldata args) private returns(bool done) {
+        /// @solidity memory-safe-assembly
         assembly { // solhint-disable-line no-inline-assembly
             let len := add(4, args.length)
             let data := mload(0x40)
-            mstore(0x40, add(data, len))
 
             mstore(data, selector)
             calldatacopy(add(data, 0x04), args.offset, args.length)

package/contracts/libraries/StringUtil.sol

@@ -14,8 +14,8 @@ library StringUtil {
     }
 
     function toHex(bytes memory data) internal pure returns (string memory result) {
-        // solhint-disable no-inline-assembly
-        assembly {
+        /// @solidity memory-safe-assembly
+        assembly { // solhint-disable-line no-inline-assembly
             function _toHex16(input) -> output {
                 output := or(
                     and(input, 0xFFFFFFFFFFFFFFFF000000000000000000000000000000000000000000000000),

package/contracts/libraries/UniERC20.sol

@@ -3,14 +3,12 @@
 pragma solidity ^0.8.0;
 pragma abicoder v1;
 
-import "@openzeppelin/contracts/utils/math/SafeMath.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "./RevertReasonForwarder.sol";
+import "./SafeERC20.sol";
 import "./StringUtil.sol";
 
 library UniERC20 {
-    using SafeMath for uint256;
     using SafeERC20 for IERC20;
 
     error ApproveCalledOnETH();
@@ -52,7 +50,7 @@ library UniERC20 {
                 if (to != address(this)) revert ToIsNotThis();
                 if (msg.value > amount) {
                     // Return remainder if exist
-                    from.transfer(msg.value.sub(amount));
+                    unchecked { from.transfer(msg.value - amount); }
                 }
             } else {
                 token.safeTransferFrom(from, to, amount);

package/dist/src/prelude.d.ts

@@ -1,7 +1,7 @@
 import { Assertion, AssertionError, assert, expect, config, should } from 'chai';
 import 'chai-bn';
-import { toBN } from 'web3-utils';
 import BN from 'bn.js';
+export declare function toBN(num: string | number, base?: number | 'hex'): BN;
 export declare const constants: {
     readonly ZERO_ADDRESS: "0x0000000000000000000000000000000000000000";
     readonly EEE_ADDRESS: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
@@ -10,7 +10,7 @@ export declare const constants: {
     readonly MAX_INT256: string;
     readonly MIN_INT256: string;
 };
-export { toBN, };
+export { BN, };
 export declare type Time = {
     increaseTo: (target: string | number | BN) => Promise<BN>;
     latest: () => Promise<BN>;

package/dist/src/prelude.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.should = exports.config = exports.expect = exports.assert = exports.AssertionError = exports.Assertion = exports.ether = exports.time = exports.toBN = exports.constants = void 0;
+exports.should = exports.config = exports.expect = exports.assert = exports.AssertionError = exports.Assertion = exports.ether = exports.time = exports.BN = exports.constants = exports.toBN = void 0;
 const tslib_1 = require("tslib");
 const chai_1 = tslib_1.__importStar(require("chai"));
 Object.defineProperty(exports, "Assertion", { enumerable: true, get: function () { return chai_1.Assertion; } });
@@ -12,21 +12,26 @@ Object.defineProperty(exports, "should", { enumerable: true, get: function () {
 require("chai-bn");
 const chai_as_promised_1 = tslib_1.__importDefault(require("chai-as-promised"));
 const web3_utils_1 = require("web3-utils");
-Object.defineProperty(exports, "toBN", { enumerable: true, get: function () { return web3_utils_1.toBN; } });
+const bn_js_1 = tslib_1.__importDefault(require("bn.js"));
+exports.BN = bn_js_1.default;
 chai_1.default.use(chai_as_promised_1.default);
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { time: timeImpl } = require('@openzeppelin/test-helpers');
+function toBN(num, base) {
+    return new bn_js_1.default(num, base);
+}
+exports.toBN = toBN;
 exports.constants = {
     ZERO_ADDRESS: '0x0000000000000000000000000000000000000000',
     EEE_ADDRESS: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
     ZERO_BYTES32: '0x0000000000000000000000000000000000000000000000000000000000000000',
-    MAX_UINT256: (0, web3_utils_1.toBN)('2').pow((0, web3_utils_1.toBN)('256')).sub((0, web3_utils_1.toBN)('1')).toString(),
-    MAX_INT256: (0, web3_utils_1.toBN)('2').pow((0, web3_utils_1.toBN)('255')).sub((0, web3_utils_1.toBN)('1')).toString(),
-    MIN_INT256: (0, web3_utils_1.toBN)('2').pow((0, web3_utils_1.toBN)('255')).mul((0, web3_utils_1.toBN)('-1')).toString(),
+    MAX_UINT256: toBN('2').pow(toBN('256')).sub(toBN('1')).toString(),
+    MAX_INT256: toBN('2').pow(toBN('255')).sub(toBN('1')).toString(),
+    MIN_INT256: toBN('2').pow(toBN('255')).mul(toBN('-1')).toString(),
 };
 exports.time = timeImpl;
 function ether(n) {
-    return (0, web3_utils_1.toBN)((0, web3_utils_1.toWei)(n, 'ether'));
+    return toBN((0, web3_utils_1.toWei)(n, 'ether'));
 }
 exports.ether = ether;
 //# sourceMappingURL=prelude.js.map

package/dist/src/prelude.js.map

@@ -1 +1 @@
-{"version":3,"file":"prelude.js","sourceRoot":"","sources":["../../src/prelude.ts"],"names":[],"mappings":";;;;AAAA,qDAAuF;AAqCnF,0FArCW,gBAAS,OAqCX;AACT,+FAtCsB,qBAAc,OAsCtB;AACd,uFAvCsC,aAAM,OAuCtC;AACN,uFAxC8C,aAAM,OAwC9C;AACN,uFAzCsD,aAAM,OAyCtD;AACN,uFA1C8D,aAAM,OA0C9D;AAzCV,mBAAiB;AACjB,gFAA8C;AAC9C,2CAAyC;AAiBrC,qFAjBK,iBAAI,OAiBL;AAfR,cAAI,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;AACzB,8DAA8D;AAC9D,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEpD,QAAA,SAAS,GAAG;IACrB,YAAY,EAAE,4CAA4C;IAC1D,WAAW,EAAE,4CAA4C;IACzD,YAAY,EAAE,oEAAoE;IAClF,WAAW,EAAE,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAA,iBAAI,EAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;IACjE,UAAU,EAAE,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAA,iBAAI,EAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChE,UAAU,EAAE,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAA,iBAAI,EAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAA,iBAAI,EAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC;AAaE,QAAA,IAAI,GAAS,QAAQ,CAAC;AAEnC,SAAgB,KAAK,CAAE,CAAS;IAC5B,OAAO,IAAA,iBAAI,EAAC,IAAA,kBAAK,EAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AAFD,sBAEC"}
+{"version":3,"file":"prelude.js","sourceRoot":"","sources":["../../src/prelude.ts"],"names":[],"mappings":";;;;AAAA,qDAAuF;AAyCnF,0FAzCW,gBAAS,OAyCX;AACT,+FA1CsB,qBAAc,OA0CtB;AACd,uFA3CsC,aAAM,OA2CtC;AACN,uFA5C8C,aAAM,OA4C9C;AACN,uFA7CsD,aAAM,OA6CtD;AACN,uFA9C8D,aAAM,OA8C9D;AA7CV,mBAAiB;AACjB,gFAA8C;AAC9C,2CAAmC;AACnC,0DAAuB;AAoBnB,aApBG,eAAE,CAoBH;AAnBN,cAAI,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;AACzB,8DAA8D;AAC9D,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEjE,SAAgB,IAAI,CAAE,GAAoB,EAAE,IAAqB;IAC7D,OAAO,IAAI,eAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC7B,CAAC;AAFD,oBAEC;AAEY,QAAA,SAAS,GAAG;IACrB,YAAY,EAAE,4CAA4C;IAC1D,WAAW,EAAE,4CAA4C;IACzD,YAAY,EAAE,oEAAoE;IAClF,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;IACjE,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChE,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC;AAaE,QAAA,IAAI,GAAS,QAAQ,CAAC;AAEnC,SAAgB,KAAK,CAAE,CAAS;IAC5B,OAAO,IAAI,CAAC,IAAA,kBAAK,EAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AAFD,sBAEC"}

package/dist/src/profileEVM.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { PathLike, promises as fs } from 'fs';
 export declare const gasspectOptionsDefault: {
     minOpGasCost: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1inch/solidity-utils",
-  "version": "2.0.15",
+  "version": "2.0.18",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -26,50 +26,50 @@
     "typechain": "hardhat typechain"
   },
   "dependencies": {
-    "@metamask/eth-sig-util": "4.0.0",
-    "@openzeppelin/contracts": "4.5.0",
+    "@metamask/eth-sig-util": "4.0.1",
+    "@openzeppelin/contracts": "4.6.0",
     "@openzeppelin/test-helpers": "0.5.15",
-    "bn.js": "5.2.0",
+    "bn.js": "5.2.1",
     "chai": "4.3.6",
     "chai-as-promised": "7.1.1",
     "chai-bn": "0.3.1",
-    "ethereumjs-util": "7.1.4",
-    "web3-utils": "1.7.1"
+    "ethereumjs-util": "7.1.5",
+    "web3-utils": "1.7.4"
   },
   "devDependencies": {
-    "@nomiclabs/hardhat-truffle5": "2.0.5",
+    "@nomiclabs/hardhat-truffle5": "2.0.6",
     "@nomiclabs/hardhat-web3": "2.0.0",
-    "@typechain/hardhat": "6.0.0",
+    "@typechain/hardhat": "4.0.0",
     "@typechain/truffle-v5": "7.0.0",
-    "@types/chai": "4.3.0",
+    "@types/chai": "4.3.1",
     "@types/chai-as-promised": "7.1.5",
     "@types/eth-sig-util": "2.1.1",
     "@types/ethereumjs-util": "6.1.0",
-    "@types/mocha": "9.1.0",
-    "@types/node": "17.0.23",
-    "@typescript-eslint/eslint-plugin": "5.18.0",
-    "@typescript-eslint/parser": "5.18.0",
+    "@types/mocha": "9.1.1",
+    "@types/node": "18.0.0",
+    "@typescript-eslint/eslint-plugin": "5.30.0",
+    "@typescript-eslint/parser": "5.30.0",
     "acquit": "1.2.1",
     "commander": "9.3.0",
     "create-ts-index": "1.14.0",
     "cross-spawn": "7.0.3",
-    "dotenv": "16.0.0",
-    "eslint": "8.12.0",
-    "eslint-config-standard": "16.0.3",
+    "dotenv": "16.0.1",
+    "eslint": "8.18.0",
+    "eslint-config-standard": "17.0.0",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-n": "15.2.3",
     "eslint-plugin-promise": "6.0.0",
     "eslint-plugin-standard": "5.0.0",
     "ethereumjs-wallet": "1.0.2",
-    "hardhat": "2.9.3",
+    "hardhat": "2.9.9",
     "hardhat-gas-reporter": "1.0.8",
     "rimraf": "3.0.2",
     "shx": "0.3.4",
     "solhint": "3.3.7",
-    "solidity-coverage": "0.7.20",
-    "ts-node": "10.7.0",
+    "solidity-coverage": "0.7.21",
+    "ts-node": "10.8.1",
     "typechain": "7.0.0",
-    "typescript": "4.6.3"
+    "typescript": "4.7.4"
   },
   "bin": {
     "solidity-utils-docify": "utils/docify.utils.js",