Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion async_substrate_interface/async_substrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ async def process_events(self):
self.__error_message = {
"type": "System",
"name": "Token",
"docs": dispatch_error["Token"]
"docs": dispatch_error["Token"],
}

elif not has_transaction_fee_paid_event:
Expand Down Expand Up @@ -1068,6 +1068,7 @@ async def init_runtime(
return runtime

runtime_version = await self.get_block_runtime_version_for(block_hash)

if runtime_version is None:
raise SubstrateRequestException(
f"No runtime information for block '{block_hash}'"
Expand Down
16 changes: 2 additions & 14 deletions async_substrate_interface/sync_substrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def process_events(self):
self.__error_message = {
"type": "System",
"name": "Token",
"docs": dispatch_error["Token"]
"docs": dispatch_error["Token"],
}

elif not has_transaction_fee_paid_event:
Expand Down Expand Up @@ -773,9 +773,6 @@ def init_runtime(
if block_id is not None:
if runtime := self.runtime_cache.retrieve(block=block_id):
self.runtime = runtime
self.runtime.load_runtime()
if self.runtime.registry:
self.runtime.load_registry_type_map()
return self.runtime
block_hash = self.get_block_hash(block_id)

Expand All @@ -785,9 +782,6 @@ def init_runtime(
self.last_block_hash = block_hash
if runtime := self.runtime_cache.retrieve(block_hash=block_hash):
self.runtime = runtime
self.runtime.load_runtime()
if self.runtime.registry:
self.runtime.load_registry_type_map()
return self.runtime

runtime_version = self.get_block_runtime_version_for(block_hash)
Expand All @@ -801,15 +795,9 @@ def init_runtime(

if runtime := self.runtime_cache.retrieve(runtime_version=runtime_version):
self.runtime = runtime
self.runtime.load_runtime()
if self.runtime.registry:
self.runtime.load_registry_type_map()
return runtime
return self.runtime
else:
self.runtime = self.get_runtime_for_version(runtime_version, block_hash)
self.runtime.load_runtime()
if self.runtime.registry:
self.runtime.load_registry_type_map()
return self.runtime

def get_runtime_for_version(
Expand Down
9 changes: 9 additions & 0 deletions async_substrate_interface/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +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()
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()
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()
return runtime
return None

Expand Down
Loading