defi-state-querier 0.4.28__py3-none-any.whl → 0.4.30__py3-none-any.whl

defi_services/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.28"
+__version__ = "0.4.30"

defi_services/jobs/processors/multi_state_processor.py

@@ -3,6 +3,7 @@ import logging
 from web3 import Web3
 
 from defi_services.constants.entities.lending_services import LendingServices
+from defi_services.constants.query_constant import Query
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.nft_services import NFTServices
 from defi_services.services.protocol_services import ProtocolServices
@@ -44,6 +45,15 @@ class MultiStateProcessor:
         if entity_id in self.services:
             entity_service: ProtocolServices = self.services.get(entity_id)
             rpc_calls.update(entity_service.get_function_info([query_type], wallet, block_number, **kwargs))
+
+        if query_type == Query.token_balance:
+            entity_service: TokenServices = self.token_service
+            rpc_calls.update(entity_service.get_function_info(wallet, entity_id, block_number))
+
+        if query_type == Query.nft_balance:
+            entity_service: NFTServices = self.nft_service
+            rpc_calls.update(entity_service.get_function_info(wallet, entity_id, block_number))
+
         queries[entity_id] = rpc_calls
 
         return {query_id: queries}
@@ -77,7 +87,17 @@ class MultiStateProcessor:
         query_value = decoded_data.get(query_id)
         for entity, entity_value in query_value.items():
             result["entity_id"] = entity
-            if entity in self.lending_services:
+            if query_type == Query.token_balance:
+                entity_service: TokenServices = self.token_service
+                data = entity_service.get_data(
+                    wallet, entity, entity_value, block_number, **kwargs
+                )
+            elif query_type == Query.nft_balance:
+                entity_service: NFTServices = self.nft_service
+                data = entity_service.get_data(
+                    wallet, entity, entity_value, block_number, **kwargs
+                )
+            elif entity in self.lending_services:
                 entity_service: ProtocolServices = self.services.get(entity)
                 data = entity_service.get_data(
                     [query_type], wallet, entity_value, block_number, **kwargs)

defi_services/jobs/queriers/state_querier.py

@@ -2,9 +2,8 @@ import logging
 
 from query_state_lib.base.mappers.eth_call_mapper import EthCall
 from query_state_lib.base.mappers.get_balance_mapper import GetBalance
-from query_state_lib.base.utils.encoder import encode_eth_call_data
 from query_state_lib.client.client_querier import ClientQuerier
-from web3 import Web3
+from web3 import Web3, contract
 from web3.middleware import geth_poa_middleware
 
 from defi_services.constants.query_constant import Query
@@ -124,7 +123,11 @@ class StateQuerier:
                     item = self._w3.to_checksum_address(item)
                 args.append(item)
 
-        data_call = encode_eth_call_data(abi=abi, fn_name=fn_name, args=args)
+        c = contract.Contract
+        c.w3 = self._w3
+        c.abi = abi
+        data_call = c.encodeABI(fn_name=fn_name, args=args)
+        # data_call = encode_eth_call_data(abi=abi, fn_name=fn_name, args=args)
         eth_call = EthCall(to=self._w3.to_checksum_address(contract_address), block_number=block_number,
                            data=data_call, abi=abi, fn_name=fn_name, id=call_id)
         return eth_call

{defi_state_querier-0.4.28.dist-info → defi_state_querier-0.4.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.4.28
+Version: 0.4.30
 Summary: Calculate apy, apr, and wallet information,... in decentralized applications.
 Home-page: https://github.com/Centic-io/defi-state-querier
 Author: Viet-Bang Pham

{defi_state_querier-0.4.28.dist-info → defi_state_querier-0.4.30.dist-info}/RECORD

@@ -1,4 +1,4 @@
-defi_services/__init__.py,sha256=QZ0p7EqvqxpClz_YH3XtlxgPmyXKcK-CGg_B_p5Z7w0,23
+defi_services/__init__.py,sha256=oJL8XtG8mmnvRfpE8L0X7P-SyENhGR162XgumWN6O4A,23
 defi_services/abis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/biswap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -311,13 +311,13 @@ defi_services/constants/entities/vault_services.py,sha256=IMmQc15wS1KA7EuQqM_Ara
 defi_services/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/jobs/processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/jobs/processors/cosmos_state_processor.py,sha256=2S5fhqHQ4pUtRaLnbFJNUo4jKc5MHq7HA-0FHebOJyo,1334
-defi_services/jobs/processors/multi_state_processor.py,sha256=uMv1kVkkBV_GkYnMVaE8UgAhdnu7J_FzU6-fAoXCqjo,4752
+defi_services/jobs/processors/multi_state_processor.py,sha256=W-5qLwIFj4kfx0V2Tj7eg0mjrRb3jyPdxEBB2TBxbW4,5726
 defi_services/jobs/processors/solana_state_processor.py,sha256=szsBYrkEV8kBzuA_iaSVescnwKJ2MHoTbut5kORbWTs,4065
 defi_services/jobs/processors/state_processor.py,sha256=Ze_5isU_l_APB262E-VV_4KZwEG6W0XE6PikJZIcAoM,7291
 defi_services/jobs/processors/substrate_state_processor.py,sha256=KkiY1NkaxnizNJBTfn4twB-zuQo3fT3akOlbie8VF5g,3940
 defi_services/jobs/queriers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/jobs/queriers/solana_state_querier.py,sha256=TQELYo6GUoF8s-LfetqYbclNaH8bakQqC7y2ifACIb8,3239
-defi_services/jobs/queriers/state_querier.py,sha256=-bx71x2ZobwuAlc2pVp5Ju_fxYt48wLrs8IdLN1KJVs,7306
+defi_services/jobs/queriers/state_querier.py,sha256=q7cAW395urZjcWTpqw8m_nDunLyyTuAXJ3DRx_1HOxo,7384
 defi_services/jobs/queriers/substrate_state_querier.py,sha256=_T0Dk06sP_uBKaxgj2J_EBtJDoq-hi8jU7Np4iuO0LA,3858
 defi_services/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/cosmos_token_services.py,sha256=6z_eE7lF5tY461VJ6uVoG18hOdXKeWR4NgDDP-MGI0k,1603
@@ -452,8 +452,8 @@ defi_services/utils/market_service.py,sha256=imPtPHBkpEx5JnhqeIWYqbCjsIEm8IKBYHN
 defi_services/utils/memory_storage.py,sha256=BOT8laB0iVSCGE-oDlpWJQLbSC6X2blKX4zuQbs4inc,851
 defi_services/utils/sqrt_price_math.py,sha256=9lgUeWFT4wjl3Vq3b7-jZ2bGvvZx7dDBSfVnM3lsZ8o,5575
 defi_services/utils/thread_proxy.py,sha256=5Z8biAyEReUkh3vfJSvEv7GwMe3CsE5M8CbghkQtePw,2951
-defi_state_querier-0.4.28.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
-defi_state_querier-0.4.28.dist-info/METADATA,sha256=7q5kqwd2KpWPPDeCmBNTzhCmB4FOfBkMlrojFhs75qA,4388
-defi_state_querier-0.4.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-defi_state_querier-0.4.28.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
-defi_state_querier-0.4.28.dist-info/RECORD,,
+defi_state_querier-0.4.30.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
+defi_state_querier-0.4.30.dist-info/METADATA,sha256=9gw44vjCnsAPTaMyK6PNHXp9WKHXuOtnvVGCN2zWtrs,4388
+defi_state_querier-0.4.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+defi_state_querier-0.4.30.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
+defi_state_querier-0.4.30.dist-info/RECORD,,