Merge pull request #335 from InjectiveLabs/feat/sync_dev_with_master_v154

Feat/sync dev with master v154

Author: aarmoa

CHANGELOG.md

@@ -14,10 +14,23 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Refactored cookies management logic to use all gRPC calls' responses to update the current cookies
 
+## [1.5.4] - 2024-07-03
+### Changed
+- Fixed all import statements in pyinjective.proto modules to make them explicit
+
+## [1.4.4] - 2024-07-03
+### Changed
+- Fixed all import statements in pyinjective.proto modules to make them explicit
+
+## [1.5.3] - 2024-06-12
+### Changed
+- Changed parameter `key` from the PaginationOption class.
+- Fixed an error when using the next page key in PaginationOption, causing incorrect pagination responses.
+
 ## [1.4.3] - 2024-06-06
 ### Changed
 - Fixed `protobuf` dependency version to "<5" to for the v1.4 branch, because newer versions require a code refactoring (done in v1.5)
-+ Fixed `protobuf` dependency version to "<5" for the v1.4 branch because newer versions require a code refactoring (done in v1.5)
+- Fixed `protobuf` dependency version to "<5" for the v1.4 branch because newer versions require a code refactoring (done in v1.5)
 
 ## [1.5.2] - 2024-05-10
 ### Changed

Makefile

@@ -3,17 +3,25 @@ all:
 gen: gen-client
 
 gen-client: clone-all copy-proto
+	mkdir -p ./pyinjective/proto
 	@for dir in $(shell find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq); do \
-		mkdir -p ./pyinjective/$${dir}; \
 		python3 -m grpc_tools.protoc \
-		-I proto \
+		--proto_path=./proto \
 		--python_out=./pyinjective/proto \
 		--grpc_python_out=./pyinjective/proto \
 		$$(find ./$${dir} -type f -name '*.proto'); \
-	done; \
+	done
 	rm -rf proto
 	$(call clean_repos)
-	echo "import os\nimport sys\n\nsys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))" > pyinjective/proto/__init__.py
+	touch pyinjective/proto/__init__.py
+	$(MAKE) fix-proto-imports
+
+PROTO_MODULES := cosmwasm exchange gogoproto cosmos_proto cosmos testpb ibc amino tendermint injective
+fix-proto-imports:
+	@for module in $(PROTO_MODULES); do \
+  		find ./pyinjective/proto -type f -name "*.py" -exec sed -i "" -e "s/from $${module}/from pyinjective.proto.$${module}/g" {} \; ; \
+	done
+	@find ./pyinjective/proto -type f -name "*.py" -exec sed -i "" -e "s/from google.api/from pyinjective.proto.google.api/g" {} \;
 
 define clean_repos
 	rm -Rf cosmos-sdk

examples/chain_client/9_PaginatedRequestExample.py

@@ -0,0 +1,41 @@
+import asyncio
+
+from pyinjective.async_client import AsyncClient
+from pyinjective.client.model.pagination import PaginationOption
+from pyinjective.core.network import Network
+
+
+async def main() -> None:
+    network = Network.testnet()
+    client = AsyncClient(network)
+    pagination = PaginationOption(
+        limit=10,
+        count_total=True,
+    )
+    first_result = await client.fetch_total_supply(
+        pagination=pagination,
+    )
+    print(f"First result:\n{first_result}")
+
+    next_page_key = first_result["pagination"]["nextKey"]
+
+    for i in range(5):
+        if next_page_key == "":
+            break
+
+        next_request_pagination = PaginationOption(
+            limit=pagination.limit,
+            count_total=pagination.count_total,
+            encoded_page_key=next_page_key,
+        )
+
+        next_result = await client.fetch_total_supply(
+            pagination=next_request_pagination,
+        )
+        print(f"Page {i+2} result:\n{next_result}")
+
+        next_page_key = next_result["pagination"]["nextKey"]
+
+
+if __name__ == "__main__":
+    asyncio.get_event_loop().run_until_complete(main())

poetry.lock

@@ -1,5 +1,4 @@
 import asyncio
-import base64
 import time
 from copy import deepcopy
 from decimal import Decimal
@@ -3228,11 +3227,10 @@ async def initialize_tokens_from_chain_denoms(self):
         next_key = query_result.get("pagination", {}).get("nextKey", "")
 
         while next_key != "":
-            query_result = await self.fetch_denoms_metadata(pagination=PaginationOption(key=next_key))
+            query_result = await self.fetch_denoms_metadata(pagination=PaginationOption(encoded_page_key=next_key))
 
             all_denoms_metadata.extend(query_result.get("metadatas", []))
-            result_next_key = query_result.get("pagination", {}).get("nextKey", "")
-            next_key = base64.b64decode(result_next_key).decode()
+            next_key = query_result.get("pagination", {}).get("nextKey", "")
 
         for token_metadata in all_denoms_metadata:
             symbol = token_metadata["symbol"]

pyinjective/async_client.py

@@ -1,3 +1,4 @@
+import base64
 from typing import Optional
 
 from pyinjective.proto.cosmos.base.query.v1beta1 import pagination_pb2 as pagination_pb
@@ -6,7 +7,7 @@
 class PaginationOption:
     def __init__(
         self,
-        key: Optional[str] = None,
+        encoded_page_key: Optional[str] = None,
         skip: Optional[int] = None,
         limit: Optional[int] = None,
         start_time: Optional[int] = None,
@@ -17,7 +18,7 @@ def __init__(
         to_number: Optional[int] = None,
     ):
         super().__init__()
-        self.key = key
+        self.encoded_page_key = encoded_page_key
         self.skip = skip
         self.limit = limit
         self.start_time = start_time
@@ -30,8 +31,9 @@ def __init__(
     def create_pagination_request(self) -> pagination_pb.PageRequest:
         page_request = pagination_pb.PageRequest()
 
-        if self.key is not None:
-            page_request.key = self.key.encode()
+        if self.encoded_page_key is not None and self.encoded_page_key != "":
+            page_key = base64.b64decode(self.encoded_page_key)
+            page_request.key = page_key
         if self.skip is not None:
             page_request.offset = self.skip
         if self.limit is not None:

pyinjective/client/model/pagination.py

@@ -1,4 +0,0 @@
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))

pyinjective/proto/__init__.py

@@ -1,4 +1,29 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
+import warnings
 
+
+GRPC_GENERATED_VERSION = '1.64.1'
+GRPC_VERSION = grpc.__version__
+EXPECTED_ERROR_RELEASE = '1.65.0'
+SCHEDULED_RELEASE_DATE = 'June 25, 2024'
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    warnings.warn(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in amino/amino_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
+        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
+        RuntimeWarning
+    )