From 6cd341c0f5a503f349408ec73fb1c53d7a4e8a16 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Tue, 29 Aug 2023 15:46:50 +0300
Subject: [PATCH] Start outerEnums population

---
 .../types/src/interfaces/metadata/types.ts    |  6 ++---
 packages/types/src/interfaces/metadata/v15.ts |  6 ++---
 packages/types/src/metadata/v14/toV15.ts      | 24 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/types/src/interfaces/metadata/types.ts b/packages/types/src/interfaces/metadata/types.ts
index c2a1ac6a0d3b..b60cd7bc8891 100644
--- a/packages/types/src/interfaces/metadata/types.ts
+++ b/packages/types/src/interfaces/metadata/types.ts
@@ -314,9 +314,9 @@ export interface OpaqueMetadata extends WrapperOpaque<Bytes> {}
 
 /** @name OuterEnums15 */
 export interface OuterEnums15 extends Struct {
-  readonly callEnumType: SiLookupTypeId;
-  readonly eventEnumType: SiLookupTypeId;
-  readonly errorEnumType: SiLookupTypeId;
+  readonly callType: SiLookupTypeId;
+  readonly eventType: SiLookupTypeId;
+  readonly errorType: SiLookupTypeId;
 }
 
 /** @name PalletCallMetadataLatest */
diff --git a/packages/types/src/interfaces/metadata/v15.ts b/packages/types/src/interfaces/metadata/v15.ts
index 8803f0e3de46..7c037634565d 100644
--- a/packages/types/src/interfaces/metadata/v15.ts
+++ b/packages/types/src/interfaces/metadata/v15.ts
@@ -24,9 +24,9 @@ export const v15: DefinitionsTypes = {
     signedExtensions: 'Vec<SignedExtensionMetadataV14>'
   },
   OuterEnums15: {
-    callEnumType: 'SiLookupTypeId',
-    eventEnumType: 'SiLookupTypeId',
-    errorEnumType: 'SiLookupTypeId'
+    callType: 'SiLookupTypeId',
+    eventType: 'SiLookupTypeId',
+    errorType: 'SiLookupTypeId'
   },
   PalletMetadataV15: {
     name: 'Text',
diff --git a/packages/types/src/metadata/v14/toV15.ts b/packages/types/src/metadata/v14/toV15.ts
index 189f71751582..97aea54a9d79 100644
--- a/packages/types/src/metadata/v14/toV15.ts
+++ b/packages/types/src/metadata/v14/toV15.ts
@@ -22,25 +22,25 @@ export function toV15 (registry: Registry, v14: MetadataV14, _: number): Metadat
 
   // We need the UncheckedExtrinsic to extract the types, at least for v14
   // which does have these details embedded (previous-gen won't populate)
-  const unchecked = v14.lookup.types
-    .find(({ type: { path } }) =>
-      path.join('::') === 'sp_runtime::generic::unchecked_extrinsic::UncheckedExtrinsic'
-    )
-    ?.type.params.map(({ type }) =>
-      type.unwrapOr(0)
-    );
+  const unchecked = v14.lookup.types.find(({ type: { path } }) =>
+    path.join('::') === 'sp_runtime::generic::unchecked_extrinsic::UncheckedExtrinsic'
+  );
 
   return registry.createTypeUnsafe('MetadataV15', [
     unchecked
       ? objectSpread({}, v14, {
         extrinsic: registry.createTypeUnsafe('ExtrinsicMetadataV15', [
           objectSpread({}, v14.extrinsic, {
-            addressType: unchecked[0],
-            callType: unchecked[1],
-            extraType: unchecked[3],
-            signatureType: unchecked[2]
+            addressType: unchecked.type.params[0].type.unwrapOr(0),
+            callType: unchecked.type.params[1].type.unwrapOr(0),
+            extraType: unchecked.type.params[3].type.unwrapOr(0),
+            signatureType: unchecked.type.params[2].type.unwrapOr(0)
           })
-        ])
+        ]),
+        outerEnums: registry.createTypeUnsafe('OuterEnums15', [{
+          callType: unchecked.type.params[1].type.unwrapOr(0)
+          // FIXME We need to add the eventType & errorType in here
+        }])
       })
       : v14
   ]);