import bytesToBool from toolkit

zeta-chain · Jun 20, 2024 · a0610c9 · a0610c9
1 parent 276be9c
commit a0610c9
Show file tree

Hide file tree

Showing 4 changed files with 1,503 additions and 1,650 deletions.
diff --git a/omnichain/swap/contracts/SwapToAnyToken.sol b/omnichain/swap/contracts/SwapToAnyToken.sol
@@ -39,7 +39,7 @@ contract SwapToAnyToken is zContract, OnlySystem {
             params.target = BytesHelperLib.bytesToAddress(message, 0);
             params.to = abi.encodePacked(BytesHelperLib.bytesToAddress(message, 20));
             if (message.length >= 41) {
-                params.withdraw = bytesToBool(message, 40);
+                params.withdraw = BytesHelperLib.bytesToBool(message, 40);
             }
         } else {
             (address targetToken, bytes memory recipient, bool withdrawFlag) = abi.decode(
@@ -82,13 +82,4 @@ contract SwapToAnyToken is zContract, OnlySystem {
             IWETH9(params.target).transfer(address(uint160(bytes20(params.to))), outputAmount);
         }
     }
-
-    function bytesToBool(bytes calldata data, uint256 offset)
-        internal
-        pure
-        returns (bool)
-    {
-        require(offset < data.length, "Offset is out of bounds");
-        return uint8(data[offset]) != 0;
-    }
 }
diff --git a/omnichain/swap/package.json b/omnichain/swap/package.json
@@ -26,7 +26,7 @@
     "@types/node": ">=12.0.0",
     "@typescript-eslint/eslint-plugin": "^5.59.9",
     "@typescript-eslint/parser": "^5.59.9",
-    "@zetachain/toolkit": "9.0.0",
+    "@zetachain/toolkit": "10.0.0",
     "axios": "^1.3.6",
     "chai": "^4.2.0",
     "dotenv": "^16.0.3",