map storage by pallet name instead of prefix

subsquid · Apr 8, 2024 · d99c7ef · d99c7ef
1 parent f359138
commit d99c7ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/substrate/substrate-runtime/src/metadata/runtime-description.ts b/substrate/substrate-runtime/src/metadata/runtime-description.ts
@@ -270,18 +270,18 @@ class FromV14 {
         return assertNotNull(def.type.params[idx].type)
     }
 
-    private getStorageItem(prefix: string, name: string): StorageItem {
+    private getStorageItem(pallet: string, name: string): StorageItem {
         let storage = this.storage()
-        let item = storage[prefix]?.[name]
-        return assertNotNull(item, `Can't find ${prefix}.${name} storage item`)
+        let item = storage[pallet]?.[name]
+        return assertNotNull(item, `Can't find ${pallet}.${name} storage item`)
     }
 
     @def
     private storage(): Storage {
         let storage: Storage = {}
         this.metadata.pallets.forEach(pallet => {
             if (pallet.storage == null) return
-            let items: Record<string, StorageItem> = storage[pallet.storage.prefix] = {}
+            let items: Record<string, StorageItem> = storage[pallet.name] = {}
             pallet.storage.items.forEach(e => {
                 let hashers: StorageHasher[]
                 let keys: Ti[]
@@ -313,6 +313,9 @@ class FromV14 {
                     docs: e.docs
                 }
             })
+            if (storage[pallet.storage.prefix] == null) {
+                storage[pallet.storage.prefix] = items
+            }
         })
         return storage
     }
@@ -669,7 +672,7 @@ class FromOld {
         let storage: Storage = {}
         this.forEachPallet(null, mod => {
             if (mod.storage == null) return
-            let items: Record<string, StorageItem> = storage[mod.storage.prefix] || {}
+            let items: Record<string, StorageItem> = storage[mod.name] = {}
             mod.storage.items.forEach(e => {
                 let hashers: StorageHasher[]
                 let keys: Ti[]
@@ -708,7 +711,9 @@ class FromOld {
                     docs: e.docs
                 }
             })
-            storage[mod.storage.prefix] = items
+            if (storage[mod.storage.prefix] == null) {
+                storage[mod.storage.prefix] = items
+            }
         })
         return storage
     }

diff --git a/substrate/substrate-typegen/src/typegen.ts b/substrate/substrate-typegen/src/typegen.ts
@@ -303,7 +303,7 @@ export class Typegen {
             runtime => {
                 let storage = runtime.description.storage
                 return getStorageItems(runtime).map(({pallet, prefix, name}) => {
-                    let def = assertNotNull(storage[prefix][name])
+                    let def = assertNotNull(storage[pallet][name])
                     return {
                         runtime,
                         name: pallet + '.' + name,