wayfinder-paths 0.1.20__py3-none-any.whl → 0.1.22__py3-none-any.whl

wayfinder_paths/adapters/balance_adapter/adapter.py

@@ -5,8 +5,8 @@ from wayfinder_paths.adapters.token_adapter.adapter import TokenAdapter
 from wayfinder_paths.core.adapters.BaseAdapter import BaseAdapter
 from wayfinder_paths.core.clients.TokenClient import TokenClient
 from wayfinder_paths.core.clients.WalletClient import WalletClient
-from wayfinder_paths.core.utils.erc20_service import build_send_transaction
 from wayfinder_paths.core.utils.evm_helpers import resolve_chain_id
+from wayfinder_paths.core.utils.tokens import build_send_transaction
 from wayfinder_paths.core.utils.transaction import send_transaction
 
 

wayfinder_paths/adapters/brap_adapter/adapter.py

@@ -15,7 +15,7 @@ from wayfinder_paths.core.clients.BRAPClient import (
 from wayfinder_paths.core.clients.LedgerClient import TransactionRecord
 from wayfinder_paths.core.clients.TokenClient import TokenClient
 from wayfinder_paths.core.constants import DEFAULT_SLIPPAGE, ZERO_ADDRESS
-from wayfinder_paths.core.utils.erc20_service import (
+from wayfinder_paths.core.utils.tokens import (
     build_approve_transaction,
     get_token_allowance,
 )

wayfinder_paths/adapters/hyperlend_adapter/adapter.py

@@ -16,7 +16,7 @@ from wayfinder_paths.core.constants.hyperlend_abi import (
     POOL_ABI,
     WRAPPED_TOKEN_GATEWAY_ABI,
 )
-from wayfinder_paths.core.utils.erc20_service import (
+from wayfinder_paths.core.utils.tokens import (
     build_approve_transaction,
     get_token_allowance,
 )

wayfinder_paths/adapters/moonwell_adapter/adapter.py

@@ -14,7 +14,7 @@ from wayfinder_paths.core.constants.moonwell_abi import (
     REWARD_DISTRIBUTOR_ABI,
     WETH_ABI,
 )
-from wayfinder_paths.core.utils.erc20_service import (
+from wayfinder_paths.core.utils.tokens import (
     build_approve_transaction,
     get_token_allowance,
 )

wayfinder_paths/core/utils/{erc20_service.py → tokens.py}

@@ -3,7 +3,7 @@ from web3 import AsyncWeb3
 from wayfinder_paths.core.constants.erc20_abi import ERC20_ABI
 from wayfinder_paths.core.utils.web3 import web3_from_chain_id
 
-NATIVE_CURRENCY_ADDRESSES: set = {
+NATIVE_TOKEN_ADDRESSES: set = {
     "0x0000000000000000000000000000000000000000",
     "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
     # TODO: This is not a proper SOL address, this short form is for LIFI only, fix this after fixing lifi
@@ -12,21 +12,26 @@ NATIVE_CURRENCY_ADDRESSES: set = {
 }
 
 
+def is_native_token(token_address: str) -> bool:
+    return token_address.lower() in NATIVE_TOKEN_ADDRESSES
+
+
 async def get_token_balance(
     token_address: str, chain_id: int, wallet_address: str
 ) -> int:
     async with web3_from_chain_id(chain_id) as web3:
         checksum_wallet = AsyncWeb3.to_checksum_address(wallet_address)
-        if not token_address or token_address.lower() in NATIVE_CURRENCY_ADDRESSES:
+
+        if is_native_token(token_address):
             balance = await web3.eth.get_balance(checksum_wallet)
             return int(balance)
-
-        checksum_token = AsyncWeb3.to_checksum_address(token_address)
-        contract = web3.eth.contract(address=checksum_token, abi=ERC20_ABI)
-        balance = await contract.functions.balanceOf(checksum_wallet).call(
-            block_identifier="pending"
-        )
-        return int(balance)
+        else:
+            checksum_token = AsyncWeb3.to_checksum_address(token_address)
+            contract = web3.eth.contract(address=checksum_token, abi=ERC20_ABI)
+            balance = await contract.functions.balanceOf(checksum_wallet).call(
+                block_identifier="pending"
+            )
+            return int(balance)
 
 
 async def get_token_allowance(
@@ -79,21 +84,21 @@ async def build_send_transaction(
         from_checksum = web3.to_checksum_address(from_address)
         to_checksum = web3.to_checksum_address(to_address)
 
-        if not token_address or token_address.lower() in NATIVE_CURRENCY_ADDRESSES:
+        if is_native_token(token_address):
             return {
                 "to": to_checksum,
                 "from": from_checksum,
                 "value": amount,
                 "chainId": chain_id,
             }
+        else:
+            token_checksum = web3.to_checksum_address(token_address)
+            contract = web3.eth.contract(address=token_checksum, abi=ERC20_ABI)
+            data = contract.encode_abi("transfer", [to_checksum, amount])
 
-        token_checksum = web3.to_checksum_address(token_address)
-        contract = web3.eth.contract(address=token_checksum, abi=ERC20_ABI)
-        data = contract.encode_abi("transfer", [to_checksum, amount])
-
-        return {
-            "to": token_checksum,
-            "from": from_checksum,
-            "data": data,
-            "chainId": chain_id,
-        }
+            return {
+                "to": token_checksum,
+                "from": from_checksum,
+                "data": data,
+                "chainId": chain_id,
+            }

{wayfinder_paths-0.1.20.dist-info → wayfinder_paths-0.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: wayfinder-paths
-Version: 0.1.20
+Version: 0.1.22
 Summary: Wayfinder Path: strategies and adapters
 Author: Wayfinder
 Author-email: dev@wayfinder.ai

{wayfinder_paths-0.1.20.dist-info → wayfinder_paths-0.1.22.dist-info}/RECORD

@@ -1,16 +1,16 @@
 wayfinder_paths/__init__.py,sha256=xKU94QbtPMmpY-Y3ktZfHwC7Rgaspl69GE8a8LQdAHs,337
 wayfinder_paths/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wayfinder_paths/adapters/balance_adapter/README.md,sha256=mq4cSYrrW5TNcXKnGBg9PwQcjCYZtXFNzEAfNGYumb8,2402
-wayfinder_paths/adapters/balance_adapter/adapter.py,sha256=bOPWOr11IfDPnTg5J6hQQ1wI2gyRlxJ_-qTn6o48aBg,10091
+wayfinder_paths/adapters/balance_adapter/adapter.py,sha256=VrttK4gyZQbszU2qLYYKQSEdx09tyAow88ukoYvHL4c,10084
 wayfinder_paths/adapters/balance_adapter/examples.json,sha256=3R1M4B_VsIy29viAuFT9nQbnQShWl8ZbU-rnSNWUW9U,129
 wayfinder_paths/adapters/balance_adapter/test_adapter.py,sha256=gf7WlA-RkMmSDP1jIYi0hUXkMfqfGTjzUZjQa9H07nU,5334
 wayfinder_paths/adapters/brap_adapter/README.md,sha256=u_UZNB3RBLAHrwklgd-ZPftNiIpIutzfH1FulJ4QB-Y,2673
 wayfinder_paths/adapters/brap_adapter/__init__.py,sha256=Hx4JW1tDijXS5YQhVliE0syw1RD1YKO2MM37wN_to9M,60
-wayfinder_paths/adapters/brap_adapter/adapter.py,sha256=yhiP54TjcS1cbbAH1Is6yQtFe9Esw1ZfxoXMa_5TBjw,26217
+wayfinder_paths/adapters/brap_adapter/adapter.py,sha256=z_uGXGx8IHd2fBXZUbnjFeAwX5mZCrM1c46ToIDEhqM,26210
 wayfinder_paths/adapters/brap_adapter/examples.json,sha256=FGZhNaMCAQ56KhovEGSsV1BHOcMd_QqQBNmCU6m8zfQ,5389
 wayfinder_paths/adapters/brap_adapter/test_adapter.py,sha256=CmK8TUxmnf4IzExToJ68FgUyE4FB7B2IOeB6GF5-B0E,11361
 wayfinder_paths/adapters/hyperlend_adapter/__init__.py,sha256=IDgYOx5rF2Zd8DjZ_VzmZc6EUGS34SfIVQ_M1PdZ0YQ,112
-wayfinder_paths/adapters/hyperlend_adapter/adapter.py,sha256=MCQcp8m_-Wp6702B9BxSXNnT8lkPaZc95bAFDCxnnys,9632
+wayfinder_paths/adapters/hyperlend_adapter/adapter.py,sha256=y7zy09-bkCiYTsE3E3-DoWe8A4ft4pHzuQ527oyxGFE,9625
 wayfinder_paths/adapters/hyperlend_adapter/test_adapter.py,sha256=f7YEJTT8o8FdN8OmDFuNYcIZRZ99kCAWcDHEFsgYFIQ,10884
 wayfinder_paths/adapters/hyperliquid_adapter/__init__.py,sha256=QpA258RzVbxzsha86HQduAuNVG0g0qvsI5OcZunQ8DQ,467
 wayfinder_paths/adapters/hyperliquid_adapter/adapter.py,sha256=GCI4up7fGuyiiYd_5zw00y497UdggjDSJ_G-ZhU_tgA,25217
@@ -28,7 +28,7 @@ wayfinder_paths/adapters/ledger_adapter/examples.json,sha256=DdqTSe4vnBrfIycQVQQ
 wayfinder_paths/adapters/ledger_adapter/test_adapter.py,sha256=haPVZQGL0f-vZPvNMUcfoq63Bu7F4FumVBuAJKiRmwg,6827
 wayfinder_paths/adapters/moonwell_adapter/README.md,sha256=A-xKZo4ssLh1-uJqlp9ihMrnlZ8hB-KW2e0MRH4pnhU,3036
 wayfinder_paths/adapters/moonwell_adapter/__init__.py,sha256=5wMDRIM6z0QbSqKEqaV8tUGkpwrAABqz1T0hP4YJbMg,109
-wayfinder_paths/adapters/moonwell_adapter/adapter.py,sha256=SdVA4_wXjL3NR3yql8jWOrm5zBuFGSrJA62PmCKLTD4,39525
+wayfinder_paths/adapters/moonwell_adapter/adapter.py,sha256=V6qoIOQm7JZqPgJRE435Q7zJOHifNooSc0J_KTDbbQI,39518
 wayfinder_paths/adapters/moonwell_adapter/test_adapter.py,sha256=Uv9jtHJEifAZ_IUafo5e5tsNkjslAhFhnZqRkwmxXQ0,25391
 wayfinder_paths/adapters/pool_adapter/README.md,sha256=qxXNcTgxQ4-YEDC-ZHiQ5wTpV_76t-vK58vyDh0IBgU,1282
 wayfinder_paths/adapters/pool_adapter/__init__.py,sha256=LTbty0SuACoj3X5yeGESDUdtJQt8zyB2Loq8BuEp7rE,60
@@ -72,8 +72,8 @@ wayfinder_paths/core/strategies/__init__.py,sha256=r3v5Eriz5mb7vurIGxB-2Hzo4ZApG
 wayfinder_paths/core/strategies/base.py,sha256=-s0qeiGZl5CHTUL2PavGXM7ACkNlaa0c4jeZR_4DuBM,155
 wayfinder_paths/core/strategies/descriptors.py,sha256=2Olef0VWols1CWb-TWcb5pil2rztC0jP6F_Trpv2hIw,1958
 wayfinder_paths/core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wayfinder_paths/core/utils/erc20_service.py,sha256=0epXzo2vUWwb6AXNyP0RLhQTwiwoDvlkuHd8wKL_a3g,3376
 wayfinder_paths/core/utils/evm_helpers.py,sha256=VIXDd_4uDrnttqqapoPGd1PCfmWzX1T_CsMZ1bPe77w,4147
+wayfinder_paths/core/utils/tokens.py,sha256=G7hHILLaFKw88uA0W03Qoeb1bgY10Y5yWoxydoSNS3M,3488
 wayfinder_paths/core/utils/transaction.py,sha256=OC-hig-H9IeCLFh64Hal2y-Du7RCK2ka7KjBohEV17c,6729
 wayfinder_paths/core/utils/wallets.py,sha256=ccCQ128lDShO265AFMOCdijzPLucWe-Neg5wjLrOsnk,1948
 wayfinder_paths/core/utils/web3.py,sha256=r0vHvKvFC167MygHhmxr2nfYtLYN0ttSUEI--hPetO0,1877
@@ -123,7 +123,7 @@ wayfinder_paths/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 wayfinder_paths/tests/test_smoke_manifest.py,sha256=kTcIa4qikcspVh2ohQIk0aHUdIvBvcQBfNbm3PNiVvg,1636
 wayfinder_paths/tests/test_test_coverage.py,sha256=paZd0U-J7oVDtkJ-DCBBEOHdupMRLsvs7WG5NrpAPRA,7203
 wayfinder_paths/tests/test_utils.py,sha256=VzweYVaO20deZOwR8RKGYFrDnKTW0gZLm3dBwZiMK28,1015
-wayfinder_paths-0.1.20.dist-info/LICENSE,sha256=dYKnlkC_xosBAEQNUvB6cHMuhFgcUtN0oBR7E8_aR2Y,1066
-wayfinder_paths-0.1.20.dist-info/METADATA,sha256=UOXIWLq5N7RxpkrvETfbIpa7oV3pY9vZY2UHDINLwVQ,11638
-wayfinder_paths-0.1.20.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-wayfinder_paths-0.1.20.dist-info/RECORD,,
+wayfinder_paths-0.1.22.dist-info/LICENSE,sha256=dYKnlkC_xosBAEQNUvB6cHMuhFgcUtN0oBR7E8_aR2Y,1066
+wayfinder_paths-0.1.22.dist-info/METADATA,sha256=bnBEwR7ggclbH5QFvJ1C29UK3Vz0yswJ-vHNiner9fw,11638
+wayfinder_paths-0.1.22.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wayfinder_paths-0.1.22.dist-info/RECORD,,

{wayfinder_paths-0.1.20.dist-info → wayfinder_paths-0.1.22.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any