Merge pull request #99 from 1inch/feature/bump-deps

bump deps

.github/workflows/ci.yml

@@ -10,22 +10,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'yarn'
+      - run: yarn
       - run: yarn lint
 
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'yarn'
+      - run: yarn
       - run: yarn typechain
       - run: yarn test:ci
 
   coverage:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'yarn'
+      - run: yarn
       - run: yarn typechain
       - run: yarn coverage
       - uses: codecov/codecov-action@v3

.github/workflows/cpv.yml

@@ -1,4 +1,4 @@
-name: PR
+name: CHECK_PACKAGE_VERSION
 
 on:
   pull_request:
@@ -11,8 +11,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
-      - run: npm install -g yarn
+          node-version: 20
+          cache: 'yarn'
       - run: yarn global add semver-compare-cli
       - run: export PATH="$PATH:$(yarn global bin)"
       - name: Get local package version

.github/workflows/publish.yml

@@ -9,18 +9,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'yarn'
+      - run: yarn
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
       - run: yarn publish
-  
+
   publish-github:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'yarn'
+      - run: yarn
       - name: Auth in GitHub private registry npm
         run: |
           echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" > .npmrc
           echo "@1inch:registry=https://npm.pkg.github.com" >> .npmrc
-      - run: yarn publish
+      - run: yarn publish

contracts/interfaces/IWETH.sol

@@ -5,9 +5,9 @@ pragma solidity ^0.8.0;
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 interface IWETH is IERC20 {
-    event Deposit(address indexed dst, uint wad);
+    event Deposit(address indexed dst, uint256 wad);
 
-    event Withdrawal(address indexed src, uint wad);
+    event Withdrawal(address indexed src, uint256 wad);
 
     function deposit() external payable;
 

contracts/mocks/TokenCustomDecimalsMock.sol

@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 
 contract TokenCustomDecimalsMock is ERC20Permit, Ownable {
-    uint8 internal immutable _decimals;
+    uint8 internal immutable _DECIMALS;
 
     constructor(
         string memory name,
@@ -15,7 +15,7 @@ contract TokenCustomDecimalsMock is ERC20Permit, Ownable {
         uint8 decimals_
     ) ERC20(name, symbol) ERC20Permit(name) Ownable(msg.sender) {
         _mint(msg.sender, amount);
-        _decimals = decimals_;
+        _DECIMALS = decimals_;
     }
 
     function mint(address account, uint256 amount) external onlyOwner {
@@ -27,7 +27,7 @@ contract TokenCustomDecimalsMock is ERC20Permit, Ownable {
     }
 
     function decimals() public view virtual override returns (uint8) {
-        return _decimals;
+        return _DECIMALS;
     }
 
     function getChainId() external view returns (uint256) {

contracts/tests/RevertReasonParserTest.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import "../libraries/RevertReasonParser.sol";
 
+// solhint-disable custom-errors
 contract RevertReasonParserTest {
     error TestDidNotThrow();
 

contracts/tests/mocks/DaiLikePermitMock.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 
+// solhint-disable custom-errors
 contract DaiLikePermitMock is ERC20Permit {
     // bytes32 public constant PERMIT_TYPEHASH = keccak256("Permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed)");
     bytes32 public constant PERMIT_TYPEHASH = 0xea2aa0a1be11a07ed86d755c93467f4f82362b452371d1ba94d1715123511acb;

contracts/tests/mocks/SafeERC20Helper.sol

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: MIT
+// solhint-disable one-contract-per-file
 
 pragma solidity ^0.8.0;
 
@@ -13,12 +14,11 @@ contract ERC20ReturnFalseMock {
     // we write to a dummy state variable.
     uint256 private _dummy;
 
-    function balanceOf(address) external view returns (uint256) {
-        require(_dummy == 0, "Dummy"); // Dummy read from a state variable so that the function is view
+    function balanceOf(address) external pure returns (uint256) {
         return 0;
     }
 
-    function transfer(address, uint256) public returns (bool) {
+    function transfer(address, uint256) external returns (bool) {
         _dummy = 0;
         return false;
     }
@@ -27,18 +27,17 @@ contract ERC20ReturnFalseMock {
         address,
         address,
         uint256
-    ) public returns (bool) {
+    ) external returns (bool) {
         _dummy = 0;
         return false;
     }
 
-    function approve(address, uint256) public returns (bool) {
+    function approve(address, uint256) external returns (bool) {
         _dummy = 0;
         return false;
     }
 
-    function allowance(address, address) public view returns (uint256) {
-        require(_dummy == 0, "Dummy"); // Dummy read from a state variable so that the function is view
+    function allowance(address, address) external pure returns (uint256) {
         return 0;
     }
 }
@@ -50,7 +49,7 @@ contract ERC20ReturnTrueMock {
     // we write to a dummy state variable.
     uint256 private _dummy;
 
-    function transfer(address, uint256) public returns (bool) {
+    function transfer(address, uint256) external returns (bool) {
         _dummy = 0;
         return true;
     }
@@ -59,21 +58,21 @@ contract ERC20ReturnTrueMock {
         address,
         address,
         uint256
-    ) public returns (bool) {
+    ) external returns (bool) {
         _dummy = 0;
         return true;
     }
 
-    function approve(address, uint256) public returns (bool) {
+    function approve(address, uint256) external returns (bool) {
         _dummy = 0;
         return true;
     }
 
-    function setAllowance(uint256 allowance_) public {
+    function setAllowance(uint256 allowance_) external {
         _allowances[msg.sender] = allowance_;
     }
 
-    function allowance(address owner, address) public view returns (uint256) {
+    function allowance(address owner, address) external view returns (uint256) {
         return _allowances[owner];
     }
 }
@@ -88,7 +87,7 @@ contract Permit2ReturnTrueMock {
         address,
         uint160,
         address
-    ) public {
+    ) external {
         _dummy = 0;
     }
 }
@@ -100,27 +99,27 @@ contract ERC20NoReturnMock {
     // we write to a dummy state variable.
     uint256 private _dummy;
 
-    function transfer(address, uint256) public {
+    function transfer(address, uint256) external {
         _dummy = 0;
     }
 
     function transferFrom(
         address,
         address,
         uint256
-    ) public {
+    ) external {
         _dummy = 0;
     }
 
-    function approve(address, uint256) public {
+    function approve(address, uint256) external {
         _dummy = 0;
     }
 
-    function setAllowance(uint256 allowance_) public {
+    function setAllowance(uint256 allowance_) external {
         _allowances[msg.sender] = allowance_;
     }
 
-    function allowance(address owner, address) public view returns (uint256) {
+    function allowance(address owner, address) external view returns (uint256) {
         return _allowances[owner];
     }
 }
@@ -130,12 +129,12 @@ contract ERC20ThroughZeroApprove {
 
     mapping(address => mapping(address => uint256)) private _allowances;
 
-    function approve(address to, uint256 amount) public {
+    function approve(address to, uint256 amount) external {
         if (_allowances[msg.sender][to] != 0 && amount != 0) revert NonZeroToNonZeroApprove();
         _allowances[msg.sender][to] = amount;
     }
 
-    function allowance(address owner, address spender) public view returns (uint256) {
+    function allowance(address owner, address spender) external view returns (uint256) {
         return _allowances[owner][spender];
     }
 }
@@ -156,7 +155,7 @@ contract ERC20PermitNoRevertMock is
         uint8 v,
         bytes32 r,
         bytes32 s
-    ) public virtual {
+    ) external virtual {
         super.permit(owner, spender, value, deadline, v, r, s);
     }
 
@@ -183,31 +182,31 @@ contract SafeERC20Wrapper {
         _token = token;
     }
 
-    function balanceOf() public view returns (uint256) {
+    function balanceOf() external view returns (uint256) {
         return _token.safeBalanceOf(address(0));
     }
 
-    function transfer() public {
+    function transfer() external {
         _token.safeTransfer(address(0), 0);
     }
 
-    function transferFrom() public {
+    function transferFrom() external {
         _token.safeTransferFrom(address(0), address(0), 0);
     }
 
-    function transferFromUniversal(bool permit2) public {
+    function transferFromUniversal(bool permit2) external {
         _token.safeTransferFromUniversal(address(0), address(0), 0, permit2);
     }
 
-    function approve(uint256 amount) public {
+    function approve(uint256 amount) external {
         _token.forceApprove(address(0), amount);
     }
 
-    function increaseAllowance(uint256 amount) public {
+    function increaseAllowance(uint256 amount) external {
         _token.safeIncreaseAllowance(address(0), amount);
     }
 
-    function decreaseAllowance(uint256 amount) public {
+    function decreaseAllowance(uint256 amount) external {
         _token.safeDecreaseAllowance(address(0), amount);
     }
 
@@ -223,11 +222,11 @@ contract SafeERC20Wrapper {
         _token.safePermit(msg.data[4:]);
     }
 
-    function setAllowance(uint256 allowance_) public {
+    function setAllowance(uint256 allowance_) external {
         ERC20ReturnTrueMock(address(_token)).setAllowance(allowance_);
     }
 
-    function allowance() public view returns (uint256) {
+    function allowance() external view returns (uint256) {
         return _token.allowance(address(0), address(0));
     }
 }
@@ -242,8 +241,7 @@ contract SafeWETHWrapper {
     }
 
     // solhint-disable-next-line no-empty-blocks
-    receive() external payable {
-    }
+    receive() external payable {}
 
     function deposit() external payable {
         _token.safeDeposit(msg.value);
@@ -261,17 +259,17 @@ contract SafeWETHWrapper {
 contract ERC20WithSafeBalance {
     using SafeERC20 for IERC20;
 
-    IERC20 private immutable _token;
+    IERC20 private immutable _TOKEN;
 
     constructor(IERC20 token) {
-        _token = token;
+        _TOKEN = token;
     }
 
-    function balanceOf(address account) public view returns (uint256) {
-        return _token.balanceOf(account);
+    function balanceOf(address account) external view returns (uint256) {
+        return _TOKEN.balanceOf(account);
     }
 
-    function safeBalanceOf(address account) public view returns (uint256) {
-        return _token.safeBalanceOf(account);
+    function safeBalanceOf(address account) external view returns (uint256) {
+        return _TOKEN.safeBalanceOf(account);
     }
 }