WIP check-in

Author: thewhaleking

async_substrate_interface/async_substrate.py

@@ -755,7 +755,9 @@ def __init__(
             ws_shutdown_timer: how long after the last connection your websocket should close
 
         """
-        super().__init__(type_registry, type_registry_preset, use_remote_preset)
+        super().__init__(
+            type_registry, type_registry_preset, use_remote_preset, ss58_format
+        )
         self.max_retries = max_retries
         self.retry_timeout = retry_timeout
         self.chain_endpoint = url
@@ -784,7 +786,6 @@ def __init__(
         }
         self.initialized = False
         self._forgettable_task = None
-        self.ss58_format = ss58_format
         self.type_registry = type_registry
         self.type_registry_preset = type_registry_preset
         self.runtime_cache = RuntimeCache()
@@ -1057,10 +1058,12 @@ async def _get_runtime_for_version(
         logger.debug(
             f"Retrieved metadata and metadata v15 for {runtime_version} from Substrate node"
         )
-
+        implements_scale_info = metadata.portable_registry is not None
         runtime = Runtime(
             chain=self.chain,
-            runtime_config=self.runtime_config,
+            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

@@ -506,7 +506,9 @@ def __init__(
             _log_raw_websockets: whether to log raw websocket requests during RPC requests
 
         """
-        super().__init__(type_registry, type_registry_preset, use_remote_preset)
+        super().__init__(
+            type_registry, type_registry_preset, use_remote_preset, ss58_format
+        )
         self.max_retries = max_retries
         self.retry_timeout = retry_timeout
         self.chain_endpoint = url
@@ -519,7 +521,6 @@ def __init__(
             "strict_scale_decode": True,
         }
         self.initialized = False
-        self.ss58_format = ss58_format
         self.type_registry = type_registry
         self.type_registry_preset = type_registry_preset
         self.runtime_cache = RuntimeCache()
@@ -731,7 +732,9 @@ def init_runtime(
         if block_id is not None:
             if runtime := self.runtime_cache.retrieve(block=block_id):
                 self.runtime = runtime
-                return runtime
+                self.runtime.load_runtime()
+                self.runtime.load_registry_type_map()
+                return self.runtime
             block_hash = self.get_block_hash(block_id)
 
         if not block_hash:
@@ -740,7 +743,9 @@ def init_runtime(
             self.last_block_hash = block_hash
             if runtime := self.runtime_cache.retrieve(block_hash=block_hash):
                 self.runtime = runtime
-                return runtime
+                self.runtime.load_runtime()
+                self.runtime.load_registry_type_map()
+                return self.runtime
 
         runtime_version = self.get_block_runtime_version_for(block_hash)
         if runtime_version is None:
@@ -753,9 +758,13 @@ def init_runtime(
 
         if runtime := self.runtime_cache.retrieve(runtime_version=runtime_version):
             self.runtime = runtime
+            self.runtime.load_runtime()
+            self.runtime.load_registry_type_map()
             return runtime
         else:
             self.runtime = self.get_runtime_for_version(runtime_version, block_hash)
+            self.runtime.load_runtime()
+            self.runtime.load_registry_type_map()
             return self.runtime
 
     def get_runtime_for_version(
@@ -2525,7 +2534,9 @@ def runtime_call(
         for idx, param in enumerate(runtime_call_def["inputs"]):
             param_type_string = f"scale_info::{param['ty']}"
             if isinstance(params, list):
-                param_data += self.encode_scale(param_type_string, params[idx], runtime=runtime)
+                param_data += self.encode_scale(
+                    param_type_string, params[idx], runtime=runtime
+                )
             else:
                 if param["name"] not in params:
                     raise ValueError(f"Runtime Call param '{param['name']}' is missing")

async_substrate_interface/types.py

@@ -1,3 +1,4 @@
+import copy
 import logging
 from abc import ABC
 from collections import defaultdict
@@ -91,11 +92,11 @@ def __init__(
         self.registry = registry
         self.runtime_version = runtime_info.get("specVersion")
         self.transaction_version = runtime_info.get("transactionVersion")
-        self._load_runtime()
+        self.load_runtime()
         if registry is not None:
-            self._load_registry_type_map()
+            self.load_registry_type_map()
 
-    def _load_runtime(self):
+    def load_runtime(self):
         # Update type registry
         self.reload_type_registry(use_remote_preset=False, auto_discover=True)
 
@@ -208,7 +209,7 @@ def apply_type_registry_presets(
             # Load type registries in runtime configuration
             self.runtime_config.update_type_registry(self.type_registry)
 
-    def _load_registry_type_map(self):
+    def load_registry_type_map(self):
         registry_type_map = {}
         type_id_to_name = {}
         types = json.loads(self.registry.registry)["types"]
@@ -512,9 +513,11 @@ def __init__(
         type_registry: Optional[dict] = None,
         type_registry_preset: Optional[str] = None,
         use_remote_preset: bool = False,
+        ss58_format: Optional[int] = None,
     ):
         # We load a very basic RuntimeConfigurationObject that is only used for the initial metadata decoding
-        self.runtime_config = RuntimeConfigurationObject()
+        self.runtime_config = RuntimeConfigurationObject(ss58_format=ss58_format)
+        self.ss58_format = ss58_format
         self.runtime_config.update_type_registry(load_type_registry_preset(name="core"))
         if type_registry_preset is not None:
             type_registry_preset_dict = load_type_registry_preset(
@@ -537,6 +540,19 @@ def __init__(
             # Load type registries in runtime configuration
             self.runtime_config.update_type_registry(type_registry)
 
+    def _runtime_config_copy(self, implements_scale_info: bool = False):
+        runtime_config = RuntimeConfigurationObject(
+            ss58_format=self.ss58_format, implements_scale_info=implements_scale_info
+        )
+        runtime_config.active_spec_version_id = (
+            self.runtime_config.active_spec_version_id
+        )
+        runtime_config.chain_id = self.runtime_config.chain_id
+        # TODO. This works, but deepcopy does not. Indicating this gets updated somewhere else.
+        runtime_config.type_registry = self.runtime_config.type_registry
+        assert runtime_config.type_registry == self.runtime_config.type_registry
+        return runtime_config
+
     @property
     def chain(self):
         """