Merge pull request #315 from tranchess/dev-terry-dependency

Upgrade dependencies
tranchess · Aug 1, 2023 · e27259a · e27259a
2 parents fe7d7aa + 9757027
commit e27259a
Show file tree

Hide file tree

Showing 85 changed files with 6,119 additions and 5,093 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,15 +10,12 @@ jobs:
     test:
         name: Unit Test
         runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                node-version: [14.x]
         steps:
             - uses: actions/checkout@v2
             - name: Setup Node.js ${{ matrix.node-version }} environment
               uses: actions/setup-node@v2.1.4
               with:
-                  node-version: ${{ matrix.node-version }}
+                  node-version: 20.x
             - name: Install dependencies
               run: yarn install --immutable
             - name: Run unit test
@@ -31,7 +28,7 @@ jobs:
             - name: Setup Node.js environment
               uses: actions/setup-node@v2.1.4
               with:
-                  node-version: 12.x
+                  node-version: 20.x
             - name: Install dependencies
               run: yarn install --immutable
             - name: Check lint and format

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v20.2.0
diff --git a/.yarn/releases/yarn-3.6.1.cjs b/.yarn/releases/yarn-3.6.1.cjs
diff --git a/.yarn/releases/yarn-berry.cjs b/.yarn/releases/yarn-berry.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,2 +1,3 @@
-yarnPath: ".yarn/releases/yarn-berry.cjs"
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.6.1.cjs
diff --git a/contracts/anyswap/AnyCallAppBase.sol b/contracts/anyswap/AnyCallAppBase.sol
@@ -14,14 +14,7 @@ interface IAnyCallV6Proxy {
 }
 
 interface IAnyCallExecutor {
-    function context()
-        external
-        view
-        returns (
-            address from,
-            uint256 fromChainID,
-            uint256 nonce
-        );
+    function context() external view returns (address from, uint256 fromChainID, uint256 nonce);
 }
 
 interface IAnyFallback {
@@ -51,11 +44,7 @@ abstract contract AnyCallAppBase {
         _;
     }
 
-    function _anyCall(
-        address to,
-        uint256 toChainID,
-        bytes memory data
-    ) internal {
+    function _anyCall(address to, uint256 toChainID, bytes memory data) internal {
         uint256 callValue = anyCallFlag == ANY_CALL_FLAG_PAY_ON_DEST ? 0 : msg.value;
         address fallbackAddress = anyCallExecuteFallback ? address(this) : address(0);
         IAnyCallV6Proxy(anyCallProxy).anyCall{value: callValue}(
@@ -67,17 +56,18 @@ abstract contract AnyCallAppBase {
         );
     }
 
-    function anyExecute(bytes calldata data)
-        external
-        onlyExecutor
-        returns (bool success, bytes memory result)
-    {
-        (address from, uint256 fromChainID, ) =
-            IAnyCallExecutor(IAnyCallV6Proxy(anyCallProxy).executor()).context();
+    function anyExecute(
+        bytes calldata data
+    ) external onlyExecutor returns (bool success, bytes memory result) {
+        (address from, uint256 fromChainID, ) = IAnyCallExecutor(
+            IAnyCallV6Proxy(anyCallProxy).executor()
+        ).context();
         bytes4 selector = data.length >= 32 ? bytes4(abi.decode(data[0:32], (bytes32))) : bytes4(0);
         if (from == address(this) && selector == IAnyFallback.anyFallback.selector) {
-            (address to, bytes memory fallbackData) =
-                abi.decode(data[4:data.length], (address, bytes));
+            (address to, bytes memory fallbackData) = abi.decode(
+                data[4:data.length],
+                (address, bytes)
+            );
             require(_checkAnyFallbackTo(to, fromChainID), "Invalid anyFallback to");
             _anyFallback(fallbackData);
             return (true, "");
@@ -91,10 +81,10 @@ abstract contract AnyCallAppBase {
         return (true, "");
     }
 
-    function _checkAnyExecuteFrom(address from, uint256 fromChainID)
-        internal
-        virtual
-        returns (bool);
+    function _checkAnyExecuteFrom(
+        address from,
+        uint256 fromChainID
+    ) internal virtual returns (bool);
 
     function _checkAnyFallbackTo(address to, uint256 fromChainID) internal virtual returns (bool);
 

diff --git a/contracts/anyswap/AnyswapChessPool.sol b/contracts/anyswap/AnyswapChessPool.sol
@@ -86,11 +86,7 @@ contract AnyswapChessPool is IAnyswapV6ERC20, ERC20, ChessRoles, Ownable {
         return _withdraw(from, amount, to);
     }
 
-    function _withdraw(
-        address from,
-        uint256 amount,
-        address to
-    ) internal returns (uint256) {
+    function _withdraw(address from, uint256 amount, address to) internal returns (uint256) {
         _burn(from, amount);
         IERC20(underlying).safeTransfer(to, amount);
         return amount;