don't panic when Session.Validators storage doesn't exist

subsquid · Sep 15, 2023 · e3979ff · e3979ff
1 parent 22df36a
commit e3979ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/common/changes/@subsquid/substrate-data/master_2023-09-15-11-30.json b/common/changes/@subsquid/substrate-data/master_2023-09-15-11-30.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/substrate-data",
+      "comment": "don't panic when `Session.Validators` storage doesn't exist",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@subsquid/substrate-data"
+}
diff --git a/substrate/substrate-data/src/parser.ts b/substrate/substrate-data/src/parser.ts
@@ -78,6 +78,8 @@ export class Parser {
     }
 
     private async setValidators(blocks: RawBlock[]): Promise<void> {
+        blocks = blocks.filter(b => b.runtime!.hasStorageItem('Session.Validators'))
+
         if (blocks.length == 0) return
 
         let prev = this.prevValidators.get(blocks[0].height)

diff --git a/substrate/substrate-data/src/parsing/block.ts b/substrate/substrate-data/src/parsing/block.ts
@@ -132,7 +132,10 @@ class BlockParser {
 
     @def
     validator(): AccountId | undefined {
-        if (this.runtime.checkType(this.runtime.description.digestItem, DigestItem)) {
+        if (
+            this.runtime.hasStorageItem('Session.Validators') &&
+            this.runtime.checkType(this.runtime.description.digestItem, DigestItem)
+        ) {
             let digest = this.digest() as IDigestItem[]
             let validators = assertNotNull(this.src.validators, 'validator data is not provided')
             return getBlockValidator(digest, validators)