True runtime independence

Author: thewhaleking

async_substrate_interface/async_substrate.py

@@ -8,7 +8,6 @@
 import inspect
 import logging
 import ssl
-import time
 import warnings
 from unittest.mock import AsyncMock
 from hashlib import blake2b
@@ -19,7 +18,6 @@
     Callable,
     Awaitable,
     cast,
-    TYPE_CHECKING,
 )
 
 from bt_decode import MetadataV15, PortableRegistry, decode as decode_by_type_string
@@ -32,7 +30,10 @@
     MultiAccountId,
 )
 from websockets.asyncio.client import connect, ClientConnection
-from websockets.exceptions import ConnectionClosed, WebSocketException
+from websockets.exceptions import (
+    ConnectionClosed,
+    WebSocketException,
+)
 from websockets.protocol import State
 
 from async_substrate_interface.errors import (
@@ -1142,12 +1143,8 @@ async def _get_runtime_for_version(
                 f"Exported method Metadata_metadata_at_version is not found for {runtime_version}. This indicates the "
                 f"block is quite old, decoding for this block will use legacy Python decoding."
             )
-        implements_scale_info = metadata.portable_registry is not None
         runtime = Runtime(
             chain=self.chain,
-            runtime_config=self._runtime_config_copy(
-                implements_scale_info=implements_scale_info
-            ),
             metadata=metadata,
             type_registry=self.type_registry,
             metadata_v15=metadata_v15,

async_substrate_interface/sync_substrate.py

@@ -774,6 +774,9 @@ def init_runtime(
 
         if block_id is not None:
             if runtime := self.runtime_cache.retrieve(block=block_id):
+                runtime.load_runtime()
+                if runtime.registry:
+                    runtime.load_registry_type_map()
                 self.runtime = runtime
                 return self.runtime
             block_hash = self.get_block_hash(block_id)
@@ -783,6 +786,9 @@ def init_runtime(
         else:
             self.last_block_hash = block_hash
             if runtime := self.runtime_cache.retrieve(block_hash=block_hash):
+                runtime.load_runtime()
+                if runtime.registry:
+                    runtime.load_registry_type_map()
                 self.runtime = runtime
                 return self.runtime
 
@@ -795,12 +801,17 @@ def init_runtime(
         if self.runtime and runtime_version == self.runtime.runtime_version:
             return self.runtime
 
-        if runtime := self.runtime_cache.retrieve(runtime_version=runtime_version):
-            self.runtime = runtime
-            return self.runtime
+        if (
+            runtime := self.runtime_cache.retrieve(runtime_version=runtime_version)
+        ) is not None:
+            pass
         else:
-            self.runtime = self.get_runtime_for_version(runtime_version, block_hash)
-            return self.runtime
+            runtime = self.get_runtime_for_version(runtime_version, block_hash)
+        runtime.load_runtime()
+        if runtime.registry:
+            runtime.load_registry_type_map()
+        self.runtime = runtime
+        return self.runtime
 
     def get_runtime_for_version(
         self, runtime_version: int, block_hash: Optional[str] = None

async_substrate_interface/types.py

@@ -75,25 +75,25 @@ def retrieve(
             runtime = self.blocks.get(block)
             if runtime is not None:
                 self.last_used = runtime
-                runtime.load_runtime()
-                if runtime.registry:
-                    runtime.load_registry_type_map()
+                # runtime.load_runtime()
+                # if runtime.registry:
+                #     runtime.load_registry_type_map()
                 return runtime
         if block_hash is not None:
             runtime = self.block_hashes.get(block_hash)
             if runtime is not None:
                 self.last_used = runtime
-                runtime.load_runtime()
-                if runtime.registry:
-                    runtime.load_registry_type_map()
+                # runtime.load_runtime()
+                # if runtime.registry:
+                #     runtime.load_registry_type_map()
                 return runtime
         if runtime_version is not None:
             runtime = self.versions.get(runtime_version)
             if runtime is not None:
                 self.last_used = runtime
-                runtime.load_runtime()
-                if runtime.registry:
-                    runtime.load_registry_type_map()
+                # runtime.load_runtime()
+                # if runtime.registry:
+                #     runtime.load_registry_type_map()
                 return runtime
         return None
 
@@ -119,9 +119,9 @@ class Runtime:
     def __init__(
         self,
         chain: str,
-        runtime_config: RuntimeConfigurationObject,
         metadata,
         type_registry,
+        runtime_config: Optional[RuntimeConfigurationObject] = None,
         metadata_v15=None,
         runtime_info=None,
         registry=None,
@@ -131,13 +131,15 @@ def __init__(
         self.config = {}
         self.chain = chain
         self.type_registry = type_registry
-        self.runtime_config = runtime_config
         self.metadata = metadata
         self.metadata_v15 = metadata_v15
         self.runtime_info = runtime_info
         self.registry = registry
         self.runtime_version = runtime_info.get("specVersion")
         self.transaction_version = runtime_info.get("transactionVersion")
+        self.runtime_config = runtime_config or RuntimeConfigurationObject(
+            implements_scale_info=self.implements_scaleinfo
+        )
         self.load_runtime()
         if registry is not None:
             self.load_registry_type_map()