async_substrate.py: drop _old_metadata_v15, load self.registry and make it part of runtime object/cache

Author: µ

async_substrate_interface/async_substrate.py

@@ -706,7 +706,6 @@ def __init__(
         self.runtime_config = RuntimeConfigurationObject(
             ss58_format=self.ss58_format, implements_scale_info=True
         )
-        self._old_metadata_v15 = None
         self._nonces = {}
         self.metadata_version_hex = "0x0f000000"  # v15
         self.reload_type_registry()
@@ -729,7 +728,6 @@ async def initialize(self):
                     chain = await self.rpc_request("system_chain", [])
                     self._chain = chain.get("result")
                 init_load = await asyncio.gather(
-                    self.load_registry(),
                     self._first_initialize_runtime(),
                     return_exceptions=True,
                 )
@@ -794,12 +792,6 @@ async def _get_current_block_hash(
                 return self.last_block_hash
         return block_hash
 
-    async def load_registry(self):
-        # TODO this needs to happen before init_runtime
-        self.metadata_v15 = await self._load_registry_at_block(None)
-        self.registry = PortableRegistry.from_metadata_v15(self.metadata_v15)
-        self._load_registry_type_map()
-
     async def _load_registry_at_block(self, block_hash: Optional[str]) -> MetadataV15:
         # Should be called for any block that fails decoding.
         # Possibly the metadata was different.
@@ -823,6 +815,8 @@ async def _load_registry_at_block(self, block_hash: Optional[str]) -> MetadataV1
         metadata_option_hex_str = metadata_rpc_result["result"]
         metadata_option_bytes = bytes.fromhex(metadata_option_hex_str[2:])
         metadata = MetadataV15.decode_from_metadata_option(metadata_option_bytes)
+        self.registry = PortableRegistry.from_metadata_v15(metadata)
+        self._load_registry_type_map()
         return metadata
 
     async def _wait_for_registry(self, _attempt: int = 1, _retries: int = 3) -> None:
@@ -843,7 +837,7 @@ async def _waiter():
                     "`await AsyncSubstrateInterface.initialize()` or running with `async with`"
                 )
             elif _attempt < _retries:
-                await self.load_registry()
+                await self._load_registry_at_block(None)
                 return await self._wait_for_registry(_attempt + 1, _retries)
             else:
                 raise AttributeError(
@@ -909,10 +903,17 @@ async def _first_initialize_runtime(self):
         """
         TODO docstring
         """
-        runtime_info, metadata = await asyncio.gather(
-            self.get_block_runtime_info(None), self.get_block_metadata()
+        runtime_info, metadata, metadata_v15 = await asyncio.gather(
+            self.get_block_runtime_info(None),
+            self.get_block_metadata(),
+            self._load_registry_at_block(None)
+        )
+        await self.load_runtime(
+            runtime_info = runtime_info,
+            metadata = metadata,
+            metadata_v15 = metadata_v15,
+            registry = self.registry
         )
-        await self.load_runtime(runtime_info=runtime_info, metadata=metadata)
 
         # Check and apply runtime constants
         ss58_prefix_constant = await self.get_constant(
@@ -922,19 +923,19 @@ async def _first_initialize_runtime(self):
         if ss58_prefix_constant:
             self.ss58_format = ss58_prefix_constant
 
-    async def load_runtime(self,runtime_info=None,metadata=None,metadata_v15=None):
+    async def load_runtime(self,runtime_info=None,metadata=None,metadata_v15=None,registry=None):
         # Update type registry
         self.reload_type_registry(use_remote_preset=False, auto_discover=True)
 
+        self.metadata_v15 = metadata_v15
+        self.registry = registry
         self.runtime_version = runtime_info.get("specVersion")
         self._metadata = metadata
         self.runtime_config.set_active_spec_version_id(self.runtime_version)
         self.transaction_version = runtime_info.get("transactionVersion")
         if self.implements_scaleinfo:
             logger.debug("Add PortableRegistry from metadata to type registry")
             self.runtime_config.add_portable_registry(metadata)
-        if metadata_v15 is not None:
-            self._old_metadata_v15 = metadata_v15
         # Set runtime compatibility flags
         try:
             _ = self.runtime_config.create_scale_object("sp_weights::weight_v2::Weight")
@@ -1021,13 +1022,15 @@ async def init_runtime(
                     type_registry=self.type_registry,
                     metadata_v15=metadata_v15,
                     runtime_info=runtime_info,
+                    registry=self.registry,
                 )
             self.runtime_cache.add_item(runtime_version=runtime_version, runtime=runtime)
 
         await self.load_runtime(
                 runtime_info=runtime.runtime_info,
                 metadata=runtime.metadata,
                 metadata_v15=runtime.metadata_v15,
+                registry=runtime.registry,
             )
 
     async def create_storage_key(
@@ -2545,14 +2548,8 @@ async def runtime_call(
             params = {}
 
         try:
-            if block_hash:
-                # Use old metadata v15 from init_runtime call
-                metadata_v15 = self._old_metadata_v15
-            else:
-                metadata_v15 = self.metadata_v15
-
-            self.registry = PortableRegistry.from_metadata_v15(metadata_v15)
-            metadata_v15_value = metadata_v15.value()
+            self.registry = PortableRegistry.from_metadata_v15(self.metadata_v15)
+            metadata_v15_value = self.metadata_v15.value()
 
             apis = {entry["name"]: entry for entry in metadata_v15_value["apis"]}
             api_entry = apis[api]