Merge pull request #37 from opentensor/backmerge-main-staging-rc12

ibraheem-abe · web-flow · commit 02cdf55af3dc · 2025-02-10T13:34:47.000-08:00
Backmerge main to staging rc12
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.0rc12 /2025-02-07
+* python 3.9 support by @roman-opentensor in https://github.com/opentensor/async-substrate-interface/pull/33
+
 ## 1.0.0rc11 /2025-02-06
 * Reuses the websocket for sync Substrate by @thewhaleking in https://github.com/opentensor/async-substrate-interface/pull/29
 * Feat/metadata v15 cache by @camfairchild in https://github.com/opentensor/async-substrate-interface/pull/30
diff --git a/async_substrate_interface/async_substrate.py b/async_substrate_interface/async_substrate.py
@@ -61,6 +61,8 @@
 
 ResultHandler = Callable[[dict, Any], Awaitable[tuple[dict, bool]]]
 
+logger = logging.getLogger("async_substrate_interface")
+
 
 class AsyncExtrinsicReceipt:
     """
@@ -1017,7 +1019,7 @@ async def get_runtime(block_hash, block_id) -> Runtime:
             if not self._metadata:
                 if self.runtime_version in self._metadata_cache:
                     # Get metadata from cache
-                    logging.debug(
+                    logger.debug(
                         "Retrieved metadata for {} from memory".format(
                             self.runtime_version
                         )
@@ -1031,7 +1033,7 @@ async def get_runtime(block_hash, block_id) -> Runtime:
                     metadata = self._metadata = await self.get_block_metadata(
                         block_hash=runtime_block_hash, decode=True
                     )
-                    logging.debug(
+                    logger.debug(
                         "Retrieved metadata for {} from Substrate node".format(
                             self.runtime_version
                         )
@@ -1044,7 +1046,7 @@ async def get_runtime(block_hash, block_id) -> Runtime:
 
             if self.runtime_version in self._metadata_v15_cache:
                 # Get metadata v15 from cache
-                logging.debug(
+                logger.debug(
                     "Retrieved metadata v15 for {} from memory".format(
                         self.runtime_version
                     )
@@ -1056,7 +1058,7 @@ async def get_runtime(block_hash, block_id) -> Runtime:
                 metadata_v15 = (
                     self._old_metadata_v15
                 ) = await self._load_registry_at_block(block_hash=runtime_block_hash)
-                logging.debug(
+                logger.debug(
                     "Retrieved metadata v15 for {} from Substrate node".format(
                         self.runtime_version
                     )
@@ -1069,7 +1071,7 @@ async def get_runtime(block_hash, block_id) -> Runtime:
             self.reload_type_registry(use_remote_preset=False, auto_discover=True)
 
             if self.implements_scaleinfo:
-                logging.debug("Add PortableRegistry from metadata to type registry")
+                logger.debug("Add PortableRegistry from metadata to type registry")
                 self.runtime_config.add_portable_registry(metadata)
 
             # Set active runtime version
@@ -1988,14 +1990,14 @@ async def _make_rpc_request(
                     break
                 if time.time() - self.ws.last_received >= self.retry_timeout:
                     if attempt >= self.max_retries:
-                        logging.warning(
+                        logger.warning(
                             f"Timed out waiting for RPC requests {attempt} times. Exiting."
                         )
                         raise SubstrateRequestException("Max retries reached.")
                     else:
                         self.ws.last_received = time.time()
                         await self.ws.connect(force=True)
-                        logging.error(
+                        logger.error(
                             f"Timed out waiting for RPC requests. "
                             f"Retrying attempt {attempt + 1} of {self.max_retries}"
                         )
@@ -2067,7 +2069,7 @@ async def rpc_request(
                 "Failed to get runtime version"
                 in result[payload_id][0]["error"]["message"]
             ):
-                logging.warning(
+                logger.warning(
                     "Failed to get runtime. Re-fetching from chain, and retrying."
                 )
                 await self.init_runtime()
@@ -2544,7 +2546,7 @@ async def _do_runtime_call_old(
         params: Optional[Union[list, dict]] = None,
         block_hash: Optional[str] = None,
     ) -> ScaleType:
-        logging.debug(
+        logger.debug(
             f"Decoding old runtime call: {api}.{method} with params: {params} at block hash: {block_hash}"
         )
         runtime_call_def = _TYPE_REGISTRY["runtime_api"][api]["methods"][method]
@@ -2582,7 +2584,7 @@ async def _do_runtime_call_old(
         # Get correct type
         result_decoded = runtime_call_def["decoder"](bytes(result_bytes))
         as_dict = _bt_decode_to_dict_or_list(result_decoded)
-        logging.debug("Decoded old runtime call result: ", as_dict)
+        logger.debug("Decoded old runtime call result: ", as_dict)
         result_obj = ScaleObj(as_dict)
 
         return result_obj
diff --git a/async_substrate_interface/sync_substrate.py b/async_substrate_interface/sync_substrate.py
@@ -41,6 +41,8 @@
 
 ResultHandler = Callable[[dict, Any], tuple[dict, bool]]
 
+logger = logging.getLogger("async_substrate_interface")
+
 
 class ExtrinsicReceipt:
     """
@@ -768,7 +770,7 @@ def get_runtime(block_hash, block_id) -> Runtime:
             if not self._metadata:
                 if self.runtime_version in self._metadata_cache:
                     # Get metadata from cache
-                    logging.debug(
+                    logger.debug(
                         "Retrieved metadata for {} from memory".format(
                             self.runtime_version
                         )
@@ -780,7 +782,7 @@ def get_runtime(block_hash, block_id) -> Runtime:
                     metadata = self._metadata = self.get_block_metadata(
                         block_hash=runtime_block_hash, decode=True
                     )
-                    logging.debug(
+                    logger.debug(
                         "Retrieved metadata for {} from Substrate node".format(
                             self.runtime_version
                         )
@@ -793,7 +795,7 @@ def get_runtime(block_hash, block_id) -> Runtime:
 
             if self.runtime_version in self._metadata_v15_cache:
                 # Get metadata v15 from cache
-                logging.debug(
+                logger.debug(
                     "Retrieved metadata v15 for {} from memory".format(
                         self.runtime_version
                     )
@@ -805,7 +807,7 @@ def get_runtime(block_hash, block_id) -> Runtime:
                 metadata_v15 = self._old_metadata_v15 = self._load_registry_at_block(
                     block_hash=runtime_block_hash
                 )
-                logging.debug(
+                logger.debug(
                     "Retrieved metadata v15 for {} from Substrate node".format(
                         self.runtime_version
                     )
@@ -817,7 +819,7 @@ def get_runtime(block_hash, block_id) -> Runtime:
             self.reload_type_registry(use_remote_preset=False, auto_discover=True)
 
             if self.implements_scaleinfo:
-                logging.debug("Add PortableRegistry from metadata to type registry")
+                logger.debug("Add PortableRegistry from metadata to type registry")
                 self.runtime_config.add_portable_registry(metadata)
 
             # Set active runtime version
@@ -1690,7 +1692,7 @@ def _make_rpc_request(
                 response = json.loads(ws.recv(timeout=self.retry_timeout, decode=False))
             except (TimeoutError, ConnectionClosed):
                 if attempt >= self.max_retries:
-                    logging.warning(
+                    logger.warning(
                         f"Timed out waiting for RPC requests {attempt} times. Exiting."
                     )
                     raise SubstrateRequestException("Max retries reached.")
@@ -1801,7 +1803,7 @@ def rpc_request(
                 "Failed to get runtime version"
                 in result[payload_id][0]["error"]["message"]
             ):
-                logging.warning(
+                logger.warning(
                     "Failed to get runtime. Re-fetching from chain, and retrying."
                 )
                 self.init_runtime()
@@ -2265,7 +2267,7 @@ def _do_runtime_call_old(
         params: Optional[Union[list, dict]] = None,
         block_hash: Optional[str] = None,
     ) -> ScaleType:
-        logging.debug(
+        logger.debug(
             f"Decoding old runtime call: {api}.{method} with params: {params} at block hash: {block_hash}"
         )
         runtime_call_def = _TYPE_REGISTRY["runtime_api"][api]["methods"][method]
@@ -2301,7 +2303,7 @@ def _do_runtime_call_old(
         # Get correct type
         result_decoded = runtime_call_def["decoder"](bytes(result_bytes))
         as_dict = _bt_decode_to_dict_or_list(result_decoded)
-        logging.debug("Decoded old runtime call result: ", as_dict)
+        logger.debug("Decoded old runtime call result: ", as_dict)
         result_obj = ScaleObj(as_dict)
 
         return result_obj
diff --git a/async_substrate_interface/types.py b/async_substrate_interface/types.py
@@ -14,6 +14,9 @@
 from scalecodec.types import GenericCall, ScaleType
 
 
+logger = logging.getLogger("async_substrate_interface")
+
+
 class RuntimeCache:
     blocks: dict[int, "Runtime"]
     block_hashes: dict[str, "Runtime"]
@@ -644,7 +647,7 @@ def apply_type_registry_presets(
                 type_registry_preset_dict = load_type_registry_preset(
                     type_registry_name
                 )
-                logging.debug(
+                logger.debug(
                     f"Auto set type_registry_preset to {type_registry_name} ..."
                 )
                 self.type_registry_preset = type_registry_name
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "async-substrate-interface"
-version = "1.0.0rc11"
+version = "1.0.0rc12"
 description = "Asyncio library for interacting with substrate. Mostly API-compatible with py-substrate-interface"
 readme = "README.md"
 license = { file = "LICENSE" }
