Allow nested struct generation (#3760)

* Allow nested struct generation

* CHANGELOG

* Update packages/typegen/src/util/formatting.ts

* Rebuild

packages/types/src/augment/registry.ts

@@ -32,7 +32,7 @@ import type { AuthorityIndex, AuthorityList, AuthoritySet, AuthoritySetChange, A
 import type { IdentityFields, IdentityInfo, IdentityInfoAdditional, IdentityJudgement, RegistrarIndex, RegistrarInfo, Registration, RegistrationJudgement } from '@polkadot/types/interfaces/identity';
 import type { AuthIndex, AuthoritySignature, Heartbeat, HeartbeatTo244, OpaqueMultiaddr, OpaqueNetworkState, OpaquePeerId } from '@polkadot/types/interfaces/imOnline';
 import type { CallIndex, LotteryConfig } from '@polkadot/types/interfaces/lottery';
-import type { DoubleMapTypeLatest, DoubleMapTypeV10, DoubleMapTypeV11, DoubleMapTypeV12, DoubleMapTypeV13, DoubleMapTypeV9, ErrorMetadataLatest, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV12, ErrorMetadataV13, ErrorMetadataV9, EventMetadataLatest, EventMetadataV10, EventMetadataV11, EventMetadataV12, EventMetadataV13, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, ExtrinsicMetadataV12, ExtrinsicMetadataV13, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV12, FunctionArgumentMetadataV13, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV12, FunctionMetadataV13, FunctionMetadataV9, MapTypeLatest, MapTypeV10, MapTypeV11, MapTypeV12, MapTypeV13, MapTypeV9, MetadataAll, MetadataLatest, MetadataV10, MetadataV11, MetadataV12, MetadataV13, MetadataV9, ModuleConstantMetadataLatest, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV12, ModuleConstantMetadataV13, ModuleConstantMetadataV9, ModuleMetadataLatest, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV12, ModuleMetadataV13, ModuleMetadataV9, NMapTypeLatest, NMapTypeV13, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV12, StorageEntryMetadataV13, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV12, StorageEntryModifierV13, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV12, StorageEntryTypeV13, StorageEntryTypeV9, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV12, StorageHasherV13, StorageHasherV9, StorageMetadataLatest, StorageMetadataV10, StorageMetadataV11, StorageMetadataV12, StorageMetadataV13, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata';
+import type { ErrorMetadataLatest, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV12, ErrorMetadataV13, ErrorMetadataV9, EventMetadataLatest, EventMetadataV10, EventMetadataV11, EventMetadataV12, EventMetadataV13, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, ExtrinsicMetadataV12, ExtrinsicMetadataV13, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV12, FunctionArgumentMetadataV13, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV12, FunctionMetadataV13, FunctionMetadataV9, MetadataAll, MetadataLatest, MetadataV10, MetadataV11, MetadataV12, MetadataV13, MetadataV9, ModuleConstantMetadataLatest, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV12, ModuleConstantMetadataV13, ModuleConstantMetadataV9, ModuleMetadataLatest, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV12, ModuleMetadataV13, ModuleMetadataV9, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV12, StorageEntryMetadataV13, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV12, StorageEntryModifierV13, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV12, StorageEntryTypeV13, StorageEntryTypeV9, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV12, StorageHasherV13, StorageHasherV9, StorageMetadataLatest, StorageMetadataV10, StorageMetadataV11, StorageMetadataV12, StorageMetadataV13, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata';
 import type { MmrLeafProof } from '@polkadot/types/interfaces/mmr';
 import type { StorageKind } from '@polkadot/types/interfaces/offchain';
 import type { DeferredOffenceOf, Kind, OffenceDetails, Offender, OpaqueTimeSlot, ReportIdOf, Reporter } from '@polkadot/types/interfaces/offences';
@@ -371,12 +371,6 @@ declare module '@polkadot/types/types/registry' {
     'Option<DisputeStatement>': Option<DisputeStatement>;
     'Option<DisputeStatementSet>': Option<DisputeStatementSet>;
     'Option<DoubleEncodedCall>': Option<DoubleEncodedCall>;
-    'Option<DoubleMapTypeLatest>': Option<DoubleMapTypeLatest>;
-    'Option<DoubleMapTypeV10>': Option<DoubleMapTypeV10>;
-    'Option<DoubleMapTypeV11>': Option<DoubleMapTypeV11>;
-    'Option<DoubleMapTypeV12>': Option<DoubleMapTypeV12>;
-    'Option<DoubleMapTypeV13>': Option<DoubleMapTypeV13>;
-    'Option<DoubleMapTypeV9>': Option<DoubleMapTypeV9>;
     'Option<DoubleVoteReport>': Option<DoubleVoteReport>;
     'Option<DownwardMessage>': Option<DownwardMessage>;
     'Option<EcdsaSignature>': Option<EcdsaSignature>;
@@ -594,12 +588,6 @@ declare module '@polkadot/types/types/registry' {
     'Option<LookupSource>': Option<LookupSource>;
     'Option<LookupTarget>': Option<LookupTarget>;
     'Option<LotteryConfig>': Option<LotteryConfig>;
-    'Option<MapTypeLatest>': Option<MapTypeLatest>;
-    'Option<MapTypeV10>': Option<MapTypeV10>;
-    'Option<MapTypeV11>': Option<MapTypeV11>;
-    'Option<MapTypeV12>': Option<MapTypeV12>;
-    'Option<MapTypeV13>': Option<MapTypeV13>;
-    'Option<MapTypeV9>': Option<MapTypeV9>;
     'Option<MaybeRandomness>': Option<MaybeRandomness>;
     'Option<MaybeVrf>': Option<MaybeVrf>;
     'Option<MemberCount>': Option<MemberCount>;
@@ -655,8 +643,6 @@ declare module '@polkadot/types/types/registry' {
     'Option<NextAuthority>': Option<NextAuthority>;
     'Option<NextConfigDescriptor>': Option<NextConfigDescriptor>;
     'Option<NextConfigDescriptorV1>': Option<NextConfigDescriptorV1>;
-    'Option<NMapTypeLatest>': Option<NMapTypeLatest>;
-    'Option<NMapTypeV13>': Option<NMapTypeV13>;
     'Option<NodeRole>': Option<NodeRole>;
     'Option<Nominations>': Option<Nominations>;
     'Option<NominatorIndex>': Option<NominatorIndex>;
@@ -1255,12 +1241,6 @@ declare module '@polkadot/types/types/registry' {
     'Vec<DisputeStatement>': Vec<DisputeStatement>;
     'Vec<DisputeStatementSet>': Vec<DisputeStatementSet>;
     'Vec<DoubleEncodedCall>': Vec<DoubleEncodedCall>;
-    'Vec<DoubleMapTypeLatest>': Vec<DoubleMapTypeLatest>;
-    'Vec<DoubleMapTypeV10>': Vec<DoubleMapTypeV10>;
-    'Vec<DoubleMapTypeV11>': Vec<DoubleMapTypeV11>;
-    'Vec<DoubleMapTypeV12>': Vec<DoubleMapTypeV12>;
-    'Vec<DoubleMapTypeV13>': Vec<DoubleMapTypeV13>;
-    'Vec<DoubleMapTypeV9>': Vec<DoubleMapTypeV9>;
     'Vec<DoubleVoteReport>': Vec<DoubleVoteReport>;
     'Vec<DownwardMessage>': Vec<DownwardMessage>;
     'Vec<EcdsaSignature>': Vec<EcdsaSignature>;
@@ -1478,12 +1458,6 @@ declare module '@polkadot/types/types/registry' {
     'Vec<LookupSource>': Vec<LookupSource>;
     'Vec<LookupTarget>': Vec<LookupTarget>;
     'Vec<LotteryConfig>': Vec<LotteryConfig>;
-    'Vec<MapTypeLatest>': Vec<MapTypeLatest>;
-    'Vec<MapTypeV10>': Vec<MapTypeV10>;
-    'Vec<MapTypeV11>': Vec<MapTypeV11>;
-    'Vec<MapTypeV12>': Vec<MapTypeV12>;
-    'Vec<MapTypeV13>': Vec<MapTypeV13>;
-    'Vec<MapTypeV9>': Vec<MapTypeV9>;
     'Vec<MaybeRandomness>': Vec<MaybeRandomness>;
     'Vec<MaybeVrf>': Vec<MaybeVrf>;
     'Vec<MemberCount>': Vec<MemberCount>;
@@ -1539,8 +1513,6 @@ declare module '@polkadot/types/types/registry' {
     'Vec<NextAuthority>': Vec<NextAuthority>;
     'Vec<NextConfigDescriptor>': Vec<NextConfigDescriptor>;
     'Vec<NextConfigDescriptorV1>': Vec<NextConfigDescriptorV1>;
-    'Vec<NMapTypeLatest>': Vec<NMapTypeLatest>;
-    'Vec<NMapTypeV13>': Vec<NMapTypeV13>;
     'Vec<NodeRole>': Vec<NodeRole>;
     'Vec<Nominations>': Vec<Nominations>;
     'Vec<NominatorIndex>': Vec<NominatorIndex>;
@@ -2139,12 +2111,6 @@ declare module '@polkadot/types/types/registry' {
     DisputeStatement: DisputeStatement;
     DisputeStatementSet: DisputeStatementSet;
     DoubleEncodedCall: DoubleEncodedCall;
-    DoubleMapTypeLatest: DoubleMapTypeLatest;
-    DoubleMapTypeV10: DoubleMapTypeV10;
-    DoubleMapTypeV11: DoubleMapTypeV11;
-    DoubleMapTypeV12: DoubleMapTypeV12;
-    DoubleMapTypeV13: DoubleMapTypeV13;
-    DoubleMapTypeV9: DoubleMapTypeV9;
     DoubleVoteReport: DoubleVoteReport;
     DownwardMessage: DownwardMessage;
     EcdsaSignature: EcdsaSignature;
@@ -2362,12 +2328,6 @@ declare module '@polkadot/types/types/registry' {
     LookupSource: LookupSource;
     LookupTarget: LookupTarget;
     LotteryConfig: LotteryConfig;
-    MapTypeLatest: MapTypeLatest;
-    MapTypeV10: MapTypeV10;
-    MapTypeV11: MapTypeV11;
-    MapTypeV12: MapTypeV12;
-    MapTypeV13: MapTypeV13;
-    MapTypeV9: MapTypeV9;
     MaybeRandomness: MaybeRandomness;
     MaybeVrf: MaybeVrf;
     MemberCount: MemberCount;
@@ -2423,8 +2383,6 @@ declare module '@polkadot/types/types/registry' {
     NextAuthority: NextAuthority;
     NextConfigDescriptor: NextConfigDescriptor;
     NextConfigDescriptorV1: NextConfigDescriptorV1;
-    NMapTypeLatest: NMapTypeLatest;
-    NMapTypeV13: NMapTypeV13;
     NodeRole: NodeRole;
     Nominations: Nominations;
     NominatorIndex: NominatorIndex;

packages/types/src/interfaces/metadata/definitions.ts

@@ -21,13 +21,6 @@ export default {
   rpc: {},
   types: {
     // v9
-    DoubleMapTypeV9: {
-      hasher: 'StorageHasherV9',
-      key1: 'Type',
-      key2: 'Type',
-      value: 'Type',
-      key2Hasher: 'StorageHasherV9'
-    },
     ErrorMetadataV9: {
       name: 'Text',
       documentation: 'Vec<Text>'
@@ -46,12 +39,6 @@ export default {
       args: 'Vec<FunctionArgumentMetadataV9>',
       documentation: 'Vec<Text>'
     },
-    MapTypeV9: {
-      hasher: 'StorageHasherV9',
-      key: 'Type',
-      value: 'Type',
-      linked: 'bool'
-    },
     MetadataV9: {
       modules: 'Vec<ModuleMetadataV9>'
     },
@@ -82,8 +69,19 @@ export default {
     StorageEntryTypeV9: {
       _enum: {
         Plain: 'Type',
-        Map: 'MapTypeV9',
-        DoubleMap: 'DoubleMapTypeV9'
+        Map: {
+          hasher: 'StorageHasherV9',
+          key: 'Type',
+          value: 'Type',
+          linked: 'bool'
+        },
+        DoubleMap: {
+          hasher: 'StorageHasherV9',
+          key1: 'Type',
+          key2: 'Type',
+          value: 'Type',
+          key2Hasher: 'StorageHasherV9'
+        }
       }
     },
     StorageHasherV9: {
@@ -101,23 +99,10 @@ export default {
     },
 
     // v10
-    DoubleMapTypeV10: {
-      hasher: 'StorageHasherV10',
-      key1: 'Type',
-      key2: 'Type',
-      value: 'Type',
-      key2Hasher: 'StorageHasherV10'
-    },
     ErrorMetadataV10: 'ErrorMetadataV9',
     EventMetadataV10: 'EventMetadataV9',
     FunctionArgumentMetadataV10: 'FunctionArgumentMetadataV9',
     FunctionMetadataV10: 'FunctionMetadataV9',
-    MapTypeV10: {
-      hasher: 'StorageHasherV10',
-      key: 'Type',
-      value: 'Type',
-      linked: 'bool'
-    },
     MetadataV10: {
       modules: 'Vec<ModuleMetadataV10>'
     },
@@ -141,8 +126,19 @@ export default {
     StorageEntryTypeV10: {
       _enum: {
         Plain: 'Type',
-        Map: 'MapTypeV10',
-        DoubleMap: 'DoubleMapTypeV10'
+        Map: {
+          hasher: 'StorageHasherV10',
+          key: 'Type',
+          value: 'Type',
+          linked: 'bool'
+        },
+        DoubleMap: {
+          hasher: 'StorageHasherV10',
+          key1: 'Type',
+          key2: 'Type',
+          value: 'Type',
+          key2Hasher: 'StorageHasherV10'
+        }
       }
     },
     StorageMetadataV10: {
@@ -161,13 +157,6 @@ export default {
     },
 
     // v11
-    DoubleMapTypeV11: {
-      hasher: 'StorageHasherV11',
-      key1: 'Type',
-      key2: 'Type',
-      value: 'Type',
-      key2Hasher: 'StorageHasherV11'
-    },
     ErrorMetadataV11: 'ErrorMetadataV10',
     EventMetadataV11: 'EventMetadataV10',
     ExtrinsicMetadataV11: {
@@ -176,12 +165,6 @@ export default {
     },
     FunctionArgumentMetadataV11: 'FunctionArgumentMetadataV10',
     FunctionMetadataV11: 'FunctionMetadataV10',
-    MapTypeV11: {
-      hasher: 'StorageHasherV11',
-      key: 'Type',
-      value: 'Type',
-      linked: 'bool'
-    },
     MetadataV11: {
       modules: 'Vec<ModuleMetadataV11>',
       extrinsic: 'ExtrinsicMetadataV11'
@@ -206,8 +189,19 @@ export default {
     StorageEntryTypeV11: {
       _enum: {
         Plain: 'Type',
-        Map: 'MapTypeV11',
-        DoubleMap: 'DoubleMapTypeV11'
+        Map: {
+          hasher: 'StorageHasherV11',
+          key: 'Type',
+          value: 'Type',
+          linked: 'bool'
+        },
+        DoubleMap: {
+          hasher: 'StorageHasherV11',
+          key1: 'Type',
+          key2: 'Type',
+          value: 'Type',
+          key2Hasher: 'StorageHasherV11'
+        }
       }
     },
     StorageMetadataV11: {
@@ -219,13 +213,11 @@ export default {
     },
 
     // v12
-    DoubleMapTypeV12: 'DoubleMapTypeV11',
     ErrorMetadataV12: 'ErrorMetadataV11',
     EventMetadataV12: 'EventMetadataV11',
     ExtrinsicMetadataV12: 'ExtrinsicMetadataV11',
     FunctionArgumentMetadataV12: 'FunctionArgumentMetadataV11',
     FunctionMetadataV12: 'FunctionMetadataV11',
-    MapTypeV12: 'MapTypeV11',
     MetadataV12: {
       modules: 'Vec<ModuleMetadataV12>',
       extrinsic: 'ExtrinsicMetadataV12'
@@ -247,13 +239,11 @@ export default {
     StorageHasherV12: 'StorageHasherV11',
 
     // v13
-    DoubleMapTypeV13: 'DoubleMapTypeV12',
     ErrorMetadataV13: 'ErrorMetadataV12',
     EventMetadataV13: 'EventMetadataV12',
     ExtrinsicMetadataV13: 'ExtrinsicMetadataV12',
     FunctionArgumentMetadataV13: 'FunctionArgumentMetadataV12',
     FunctionMetadataV13: 'FunctionMetadataV12',
-    MapTypeV13: 'MapTypeV12',
     MetadataV13: {
       modules: 'Vec<ModuleMetadataV13>',
       extrinsic: 'ExtrinsicMetadataV13'
@@ -268,11 +258,6 @@ export default {
       errors: 'Vec<ErrorMetadataV13>',
       index: 'u8'
     },
-    NMapTypeV13: {
-      keyVec: 'Vec<Type>',
-      hashers: 'Vec<StorageHasherV13>',
-      value: 'Type'
-    },
     StorageEntryModifierV13: 'StorageEntryModifierV12',
     StorageEntryMetadataV13: {
       name: 'Text',
@@ -284,9 +269,24 @@ export default {
     StorageEntryTypeV13: {
       _enum: {
         Plain: 'Type',
-        Map: 'MapTypeV13',
-        DoubleMap: 'DoubleMapTypeV13',
-        NMap: 'NMapTypeV13'
+        Map: {
+          hasher: 'StorageHasherV13',
+          key: 'Type',
+          value: 'Type',
+          linked: 'bool'
+        },
+        DoubleMap: {
+          hasher: 'StorageHasherV13',
+          key1: 'Type',
+          key2: 'Type',
+          value: 'Type',
+          key2Hasher: 'StorageHasherV13'
+        },
+        NMap: {
+          keyVec: 'Vec<Type>',
+          hashers: 'Vec<StorageHasherV13>',
+          value: 'Type'
+        }
       }
     },
     StorageMetadataV13: {
@@ -296,17 +296,14 @@ export default {
     StorageHasherV13: 'StorageHasherV12',
 
     // This always maps to the latest
-    DoubleMapTypeLatest: 'DoubleMapTypeV13',
     ErrorMetadataLatest: 'ErrorMetadataV13',
     EventMetadataLatest: 'EventMetadataV13',
     ExtrinsicMetadataLatest: 'ExtrinsicMetadataV13',
     FunctionArgumentMetadataLatest: 'FunctionArgumentMetadataV13',
     FunctionMetadataLatest: 'FunctionMetadataV13',
-    MapTypeLatest: 'MapTypeV13',
     MetadataLatest: 'MetadataV13',
     ModuleConstantMetadataLatest: 'ModuleConstantMetadataV13',
     ModuleMetadataLatest: 'ModuleMetadataV13',
-    NMapTypeLatest: 'NMapTypeV13',
     StorageEntryMetadataLatest: 'StorageEntryMetadataV13',
     StorageEntryModifierLatest: 'StorageEntryModifierV13',
     StorageEntryTypeLatest: 'StorageEntryTypeV13',

packages/types/src/interfaces/metadata/types.ts

@@ -3,42 +3,6 @@
 
 import type { Bytes, Enum, Option, Struct, Text, Type, Vec, bool, u8 } from '@polkadot/types';
 
-/** @name DoubleMapTypeLatest */
-export interface DoubleMapTypeLatest extends DoubleMapTypeV13 {}
-
-/** @name DoubleMapTypeV10 */
-export interface DoubleMapTypeV10 extends Struct {
-  readonly hasher: StorageHasherV10;
-  readonly key1: Type;
-  readonly key2: Type;
-  readonly value: Type;
-  readonly key2Hasher: StorageHasherV10;
-}
-
-/** @name DoubleMapTypeV11 */
-export interface DoubleMapTypeV11 extends Struct {
-  readonly hasher: StorageHasherV11;
-  readonly key1: Type;
-  readonly key2: Type;
-  readonly value: Type;
-  readonly key2Hasher: StorageHasherV11;
-}
-
-/** @name DoubleMapTypeV12 */
-export interface DoubleMapTypeV12 extends DoubleMapTypeV11 {}
-
-/** @name DoubleMapTypeV13 */
-export interface DoubleMapTypeV13 extends DoubleMapTypeV12 {}
-
-/** @name DoubleMapTypeV9 */
-export interface DoubleMapTypeV9 extends Struct {
-  readonly hasher: StorageHasherV9;
-  readonly key1: Type;
-  readonly key2: Type;
-  readonly value: Type;
-  readonly key2Hasher: StorageHasherV9;
-}
-
 /** @name ErrorMetadataLatest */
 export interface ErrorMetadataLatest extends ErrorMetadataV13 {}
 
@@ -140,39 +104,6 @@ export interface FunctionMetadataV9 extends Struct {
   readonly documentation: Vec<Text>;
 }
 
-/** @name MapTypeLatest */
-export interface MapTypeLatest extends MapTypeV13 {}
-
-/** @name MapTypeV10 */
-export interface MapTypeV10 extends Struct {
-  readonly hasher: StorageHasherV10;
-  readonly key: Type;
-  readonly value: Type;
-  readonly linked: bool;
-}
-
-/** @name MapTypeV11 */
-export interface MapTypeV11 extends Struct {
-  readonly hasher: StorageHasherV11;
-  readonly key: Type;
-  readonly value: Type;
-  readonly linked: bool;
-}
-
-/** @name MapTypeV12 */
-export interface MapTypeV12 extends MapTypeV11 {}
-
-/** @name MapTypeV13 */
-export interface MapTypeV13 extends MapTypeV12 {}
-
-/** @name MapTypeV9 */
-export interface MapTypeV9 extends Struct {
-  readonly hasher: StorageHasherV9;
-  readonly key: Type;
-  readonly value: Type;
-  readonly linked: bool;
-}
-
 /** @name MetadataAll */
 export interface MetadataAll extends Enum {
   readonly isV9: boolean;
@@ -296,16 +227,6 @@ export interface ModuleMetadataV9 extends Struct {
   readonly errors: Vec<ErrorMetadataV9>;
 }
 
-/** @name NMapTypeLatest */
-export interface NMapTypeLatest extends NMapTypeV13 {}
-
-/** @name NMapTypeV13 */
-export interface NMapTypeV13 extends Struct {
-  readonly keyVec: Vec<Type>;
-  readonly hashers: Vec<StorageHasherV13>;
-  readonly value: Type;
-}
-
 /** @name StorageEntryMetadataLatest */
 export interface StorageEntryMetadataLatest extends StorageEntryMetadataV13 {}
 
@@ -378,9 +299,9 @@ export interface StorageEntryTypeV10 extends Enum {
   readonly isPlain: boolean;
   readonly asPlain: Type;
   readonly isMap: boolean;
-  readonly asMap: MapTypeV10;
+  readonly asMap: { hasher: StorageHasherV10; key: Type; value: Type; linked: bool; } & Struct;
   readonly isDoubleMap: boolean;
-  readonly asDoubleMap: DoubleMapTypeV10;
+  readonly asDoubleMap: { hasher: StorageHasherV10; key1: Type; key2: Type; value: Type; key2Hasher: StorageHasherV10; } & Struct;
 }
 
 /** @name StorageEntryTypeV11 */
@@ -388,9 +309,9 @@ export interface StorageEntryTypeV11 extends Enum {
   readonly isPlain: boolean;
   readonly asPlain: Type;
   readonly isMap: boolean;
-  readonly asMap: MapTypeV11;
+  readonly asMap: { hasher: StorageHasherV11; key: Type; value: Type; linked: bool; } & Struct;
   readonly isDoubleMap: boolean;
-  readonly asDoubleMap: DoubleMapTypeV11;
+  readonly asDoubleMap: { hasher: StorageHasherV11; key1: Type; key2: Type; value: Type; key2Hasher: StorageHasherV11; } & Struct;
 }
 
 /** @name StorageEntryTypeV12 */
@@ -401,11 +322,11 @@ export interface StorageEntryTypeV13 extends Enum {
   readonly isPlain: boolean;
   readonly asPlain: Type;
   readonly isMap: boolean;
-  readonly asMap: MapTypeV13;
+  readonly asMap: { hasher: StorageHasherV13; key: Type; value: Type; linked: bool; } & Struct;
   readonly isDoubleMap: boolean;
-  readonly asDoubleMap: DoubleMapTypeV13;
+  readonly asDoubleMap: { hasher: StorageHasherV13; key1: Type; key2: Type; value: Type; key2Hasher: StorageHasherV13; } & Struct;
   readonly isNMap: boolean;
-  readonly asNMap: NMapTypeV13;
+  readonly asNMap: { keyVec: Vec<Type>; hashers: Vec<StorageHasherV13>; value: Type; } & Struct;
 }
 
 /** @name StorageEntryTypeV9 */
@@ -413,9 +334,9 @@ export interface StorageEntryTypeV9 extends Enum {
   readonly isPlain: boolean;
   readonly asPlain: Type;
   readonly isMap: boolean;
-  readonly asMap: MapTypeV9;
+  readonly asMap: { hasher: StorageHasherV9; key: Type; value: Type; linked: bool; } & Struct;
   readonly isDoubleMap: boolean;
-  readonly asDoubleMap: DoubleMapTypeV9;
+  readonly asDoubleMap: { hasher: StorageHasherV9; key1: Type; key2: Type; value: Type; key2Hasher: StorageHasherV9; } & Struct;
 }
 
 /** @name StorageHasher */