Use isStructMembers

OpenZeppelin · Sep 19, 2023 · d9d7799 · d9d7799
1 parent 1ff29fe
commit d9d7799
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/core/src/storage/extract.ts b/packages/core/src/storage/extract.ts
@@ -8,7 +8,7 @@ import {
   TypeName,
 } from 'solidity-ast';
 import { isNodeType, findAll, ASTDereferencer } from 'solidity-ast/utils';
-import { StorageLayout, StructMember, TypeItem } from './layout';
+import { StorageLayout, StructMember, TypeItem, isStructMembers } from './layout';
 import { normalizeTypeIdentifier } from '../utils/type-id';
 import { SrcDecoder } from '../src-decoder';
 import { mapValues } from '../utils/map-values';
@@ -43,9 +43,10 @@ export function extractStorageLayout(
   layout.types = mapValues({ ...namespacedContext?.storageLayout?.types, ...storageLayout?.types }, m => {
     return {
       label: m.label,
-      members: m.members?.map(m =>
-        typeof m === 'string' ? m : pick(m, ['label', 'type', 'offset', 'slot']),
-      ) as TypeItem['members'],
+      members:
+        m.members && isStructMembers(m.members)
+          ? m.members.map(m => pick(m, ['label', 'type', 'offset', 'slot']))
+          : m.members,
       numberOfBytes: m.numberOfBytes,
     };
   });