defi-state-querier 0.5.7__py3-none-any.whl → 0.5.8__py3-none-any.whl

defi_services/__init__.py

@@ -1 +1 @@
-__version__ = "0.5.7"
+__version__ = "0.5.8"

defi_services/jobs/processors/cosmos_state_processor.py

@@ -14,16 +14,17 @@ class CosmosStateProcessor:
         if self.chain_id in MulticallContract.mapping:
             data = cosmos.query_balances(address, tokens)
         else:
-            data = cosmos.query_coin_balances(address=address)
-            result = {}
-            for item in data:
+            result = cosmos.query_coin_balances(address=address)
+            data = {}
+            for item in result:
                 denom = item.get('denom', "").lower()
                 amount = int(item.get('amount', None))
                 decimal = Denoms.all.get(denom, {}).get("decimal", 0)
-                result[denom] = amount / 10 ** decimal
+                data[denom] = amount / 10 ** decimal
+
         return data
 
-    def run(self, address: str, queries: list):
+    def run(self, address: str, queries: list, *args, **kwargs):
         result = []
         tokens = [query.get('entity_id').lower() for query in queries if query.get('query_type') == 'token_balance']
         token_balances = self.get_token_balance(address, tokens)

defi_services/services/cosmos_token_services.py

@@ -14,8 +14,10 @@ class CosmosTokenServices:
     def __init__(self, lcd: str, rest_uri: str, chain_id: str):
         self.chain_id = chain_id
         self.lcd = lcd
+
         self.rest_uri = rest_uri
         self.client = CosmWasmRestClient(RestClient(rest_address=rest_uri))
+
         self.decimals = Denoms.cosmos
         self.decimals.update(Denoms.orai)
 
@@ -23,34 +25,34 @@ class CosmosTokenServices:
     def query_coin_balances(self, address: str):
         responses = []
         endpoint = '/cosmos/bank/v1beta1/balances/'
-        try:
-            results = json.loads(requests.get(self.lcd + endpoint + address, timeout=60).content)
+
+        response = requests.get(self.lcd + endpoint + address, timeout=60).content
+        results = json.loads(response)
+
+        responses += results['balances']
+        pagination = results['pagination']['next_key']
+
+        while pagination is not None:
+            response = requests.get(self.lcd + endpoint + '?pagination.key=' + quote(str(pagination)), timeout=60)
+            results = json.loads(response.content)
+
             responses += results['balances']
             pagination = results['pagination']['next_key']
-            while pagination is not None:
-                results = json.loads(
-                    requests.get(self.lcd + endpoint + '?pagination.key=' + quote(str(pagination)), timeout=60).content)
-                responses += results['balances']
-                pagination = results['pagination']['next_key']
-            return responses
-        except Exception:
-            raise Exception
+
+        return responses
 
     # queries the balance of a given denom for a single account.
     def query_balances_by_denom(self, address, denom):
         endpoint = '/cosmos/bank/v1beta1/balances/'
-        try:
-            return json.loads(
-                requests.get(self.lcd + endpoint + address + '/by_denom?denom=' + denom, timeout=60).content)
-        except Exception:
-            raise Exception
+
+        response = requests.get(self.lcd + endpoint + address + '/by_denom?denom=' + denom, timeout=60)
+        return json.loads(response.content)
 
     def query_token_decimal(self):
         endpoint = '/cosmos/bank/v1beta1/denoms_metadata'
-        try:
-            return json.loads(requests.get(self.lcd + endpoint, timeout=60).content)
-        except Exception:
-            raise Exception
+
+        response = requests.get(self.lcd + endpoint, timeout=60)
+        return json.loads(response.content)
 
     def query_balances(self, address: str, tokens: list):
         balance_query, cw20_tokens = self.get_balance_function_info(address, tokens)
@@ -93,7 +95,7 @@ class CosmosTokenServices:
             balances[tokens[idx]] = int(balance_data[idx])
 
         for token in tokens:
-            if token in decimals:
+            if decimals.get(token) is not None:
                 balances[token] /= 10**decimals[token]
             else:
                 balances[token] /= 10**self.decimals.get(token, {}).get("decimal", 0)

{defi_state_querier-0.5.7.dist-info → defi_state_querier-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.5.7
+Version: 0.5.8
 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.5.7.dist-info → defi_state_querier-0.5.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-defi_services/__init__.py,sha256=KiyyYbyEe0O858kmiWcg1RdmqGUYtk_JqRmc3_Ev2Q8,22
+defi_services/__init__.py,sha256=bDuZ37zImJZsQ3a4pW87q4kg-zsIBrUFAv1aumIf_7k,22
 defi_services/abis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/multicall_v3_abi.py,sha256=0aPxjrJJFU17fODjvYFRDn5Y5J1yi_AJKc8v1uohNGY,12352
 defi_services/abis/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -313,7 +313,7 @@ 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/call_state_processor.py,sha256=WseX0OaMA5D_ANYofrz7W2BooSMdHlGRay4NuiABmM4,436
-defi_services/jobs/processors/cosmos_state_processor.py,sha256=eZa2fO5Vh4n_VTJjKSHTud325KjHvFA_e8NcywDEun4,1813
+defi_services/jobs/processors/cosmos_state_processor.py,sha256=u9CdGF41XQlxe3IyXV2ocdHdaq1aLeonOZOIpCPNojY,1831
 defi_services/jobs/processors/multi_call_state_processor.py,sha256=AksswGMSyStbnvkQcBVb0Y2tdpkUgc1CWoeSiMpGy8U,462
 defi_services/jobs/processors/multi_state_processor.py,sha256=Od7Y8zPz7xj0L-_0YuK4wg_94fX8Q1PquuKUUYteIJU,5731
 defi_services/jobs/processors/solana_state_processor.py,sha256=szsBYrkEV8kBzuA_iaSVescnwKJ2MHoTbut5kORbWTs,4065
@@ -325,7 +325,7 @@ defi_services/jobs/queriers/solana_state_querier.py,sha256=TQELYo6GUoF8s-LfetqYb
 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=-QGmhS-WtwJbOnOFQ7CuM10glPgzZvYPtPlCE6IZIKM,5248
+defi_services/services/cosmos_token_services.py,sha256=pRw_rEhoofd6V1-KwU74ZHjhg6PsXSznK6eD1ASyROA,5108
 defi_services/services/dex_protocol_services.py,sha256=J93P7kwy1v98aeA95ErT7jDCCOAelFuCNiTXl3PVFFo,6656
 defi_services/services/nft_services.py,sha256=vKva0OJQTTxgP1lrZ5ij2sw2N44JxN5dfLLtvNJB6aA,2188
 defi_services/services/protocol_services.py,sha256=3Yca433xGXowcV4EjFoQ90AJHg-SfuOBsDF7aMCJ8Zk,7626
@@ -464,8 +464,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.5.7.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
-defi_state_querier-0.5.7.dist-info/METADATA,sha256=2jNWm8RrkBwLUcc5rH05G4bzi4I98wrRKdKw6dyAttw,4417
-defi_state_querier-0.5.7.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-defi_state_querier-0.5.7.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
-defi_state_querier-0.5.7.dist-info/RECORD,,
+defi_state_querier-0.5.8.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
+defi_state_querier-0.5.8.dist-info/METADATA,sha256=nHPUkRUA4JSqteq0wAaCA_OIaPJSXZOZTAat6zZOo94,4417
+defi_state_querier-0.5.8.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+defi_state_querier-0.5.8.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
+defi_state_querier-0.5.8.dist-info/RECORD,,