Library updates and fixes (related to #21)

* Updated to latest py-scale-codec and py-substrate-interface * Several function call fixes (thanks to @imstar15)
polkascan · Aug 2, 2021 · 95c28a9 · 95c28a9
1 parent 9d0393a
commit 95c28a9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/app/processors/converters.py b/app/processors/converters.py
@@ -94,8 +94,7 @@ def process_genesis(self, block):
             # Get accounts from storage keys
             storage_key_prefix = self.substrate.generate_storage_hash(
                 storage_module='System',
-                storage_function='Account',
-                metadata_version=settings.SUBSTRATE_METADATA_VERSION
+                storage_function='Account'
             )
 
             rpc_result = self.substrate.rpc_request(
@@ -1027,13 +1026,12 @@ def create_full_balance_snaphot(self, block_id):
         )
 
         if storage_method:
-            if storage_method.get("type_hasher_key1") == "Blake2_128Concat":
+            if storage_method.type['MapType']['hasher'] == "Blake2_128Concat":
 
                 # get balances storage prefix
                 storage_key_prefix = self.substrate.generate_storage_hash(
                     storage_module='System',
-                    storage_function='Account',
-                    metadata_version=settings.SUBSTRATE_METADATA_VERSION
+                    storage_function='Account'
                 )
 
                 rpc_result = self.substrate.rpc_request(

diff --git a/app/processors/event.py b/app/processors/event.py
@@ -298,14 +298,17 @@ def add_session_old(self, db_session, session_id):
                             metadata_version=SUBSTRATE_METADATA_VERSION
                         ) or []
                     except RemainingScaleBytesNotEmptyException:
-                        validator_session_list = substrate.get_storage(
-                            block_hash=self.block.hash,
-                            module="Session",
-                            function="QueuedKeys",
-                            return_scale_type='Vec<(ValidatorId, EdgewareKeys)>',
-                            hasher=storage_call.type_hasher,
-                            metadata_version=SUBSTRATE_METADATA_VERSION
-                        ) or []
+                        try:
+                            validator_session_list = substrate.get_storage(
+                                block_hash=self.block.hash,
+                                module="Session",
+                                function="QueuedKeys",
+                                return_scale_type='Vec<(ValidatorId, EdgewareKeys)>',
+                                hasher=storage_call.type_hasher,
+                                metadata_version=SUBSTRATE_METADATA_VERSION
+                            ) or []
+                        except RemainingScaleBytesNotEmptyException:
+                            validator_session_list = []
 
                 # build lookup dict
                 validation_session_lookup = {}
@@ -345,7 +348,7 @@ def add_session_old(self, db_session, session_id):
                             block_hash=self.block.hash,
                             module="Staking",
                             function="Bonded",
-                            params=validator_stash,
+                            params=[validator_stash],
                             return_scale_type=storage_call.get_return_type(),
                             hasher=storage_call.type_hasher,
                             metadata_version=SUBSTRATE_METADATA_VERSION
@@ -375,7 +378,7 @@ def add_session_old(self, db_session, session_id):
                             block_hash=self.block.hash,
                             module="Staking",
                             function="Ledger",
-                            params=validator_controller,
+                            params=[validator_controller],
                             return_scale_type=storage_call.get_return_type(),
                             hasher=storage_call.type_hasher,
                             metadata_version=SUBSTRATE_METADATA_VERSION
@@ -399,7 +402,7 @@ def add_session_old(self, db_session, session_id):
                             block_hash=self.block.hash,
                             module="Session",
                             function="NextKeyFor",
-                            params=validator_controller,
+                            params=[validator_controller],
                             return_scale_type=storage_call.get_return_type(),
                             hasher=storage_call.type_hasher,
                             metadata_version=SUBSTRATE_METADATA_VERSION
@@ -422,7 +425,7 @@ def add_session_old(self, db_session, session_id):
                         block_hash=self.block.hash,
                         module="Staking",
                         function="Validators",
-                        params=validator_stash,
+                        params=[validator_stash],
                         return_scale_type=storage_call.get_return_type(),
                         hasher=storage_call.type_hasher,
                         metadata_version=SUBSTRATE_METADATA_VERSION
@@ -443,7 +446,7 @@ def add_session_old(self, db_session, session_id):
                         block_hash=self.block.hash,
                         module="Staking",
                         function="Stakers",
-                        params=validator_stash,
+                        params=[validator_stash],
                         return_scale_type=storage_call.get_return_type(),
                         hasher=storage_call.type_hasher,
                         metadata_version=SUBSTRATE_METADATA_VERSION

diff --git a/py-substrate-interface b/py-substrate-interface
diff --git a/requirements.txt b/requirements.txt
@@ -49,4 +49,4 @@ py-ed25519-bindings>=0.1.2
 py-bip39-bindings>=0.1.6
 
 scalecodec~=0.11.17
-substrate-interface~=0.13.11
+substrate-interface~=0.13.12
+1 −1		requirements.txt
+1 −1		setup.py
+1 −2		substrateinterface/base.py