From 9100aabbac6a72ab3b575efc974eee05793545ec Mon Sep 17 00:00:00 2001
From: Nantian <nxiiun@gmail.com>
Date: Fri, 5 Feb 2021 20:25:17 +1300
Subject: [PATCH] fix signedExtensions  type (#3148)

---
 packages/api/src/types/index.ts                        | 2 +-
 packages/types/src/create/registry.ts                  | 6 +++---
 packages/types/src/extrinsic/signedExtensions/index.ts | 6 +++---
 packages/types/src/types/registry.ts                   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/api/src/types/index.ts b/packages/api/src/types/index.ts
index 057444b752..3cf1db073a 100644
--- a/packages/api/src/types/index.ts
+++ b/packages/api/src/types/index.ts
@@ -60,7 +60,7 @@ export interface ApiOptions extends RegisteredTypes {
   /**
    * @description Any chain-specific signed extensions that are now well-known
    */
-  signedExtensions?: Record<string, ExtDef>;
+  signedExtensions?: ExtDef;
   /**
    * @description An external signer which will be used to sign extrinsic when account passed in is not KeyringPair
    */
diff --git a/packages/types/src/create/registry.ts b/packages/types/src/create/registry.ts
index f7d7783f03..6a3f98b936 100644
--- a/packages/types/src/create/registry.ts
+++ b/packages/types/src/create/registry.ts
@@ -134,7 +134,7 @@ export class TypeRegistry implements Registry {
 
   #signedExtensions: string[] = defaultExtensions;
 
-  #userExtensions?: Record<string, ExtDef>;
+  #userExtensions?: ExtDef;
 
   constructor () {
     this.#knownDefaults = { Json, Metadata, Raw, ...baseTypes };
@@ -377,7 +377,7 @@ export class TypeRegistry implements Registry {
   }
 
   // sets the metadata
-  public setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void {
+  public setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: ExtDef): void {
     injectExtrinsics(this, metadata, this.#metadataCalls);
     injectErrors(this, metadata, this.#metadataErrors);
     injectEvents(this, metadata, this.#metadataEvents);
@@ -399,7 +399,7 @@ export class TypeRegistry implements Registry {
   }
 
   // sets the available signed extensions
-  setSignedExtensions (signedExtensions: string[] = defaultExtensions, userExtensions?: Record<string, ExtDef>): void {
+  setSignedExtensions (signedExtensions: string[] = defaultExtensions, userExtensions?: ExtDef): void {
     this.#signedExtensions = signedExtensions;
     this.#userExtensions = userExtensions;
 
diff --git a/packages/types/src/extrinsic/signedExtensions/index.ts b/packages/types/src/extrinsic/signedExtensions/index.ts
index ca105de3ba..307ae20395 100644
--- a/packages/types/src/extrinsic/signedExtensions/index.ts
+++ b/packages/types/src/extrinsic/signedExtensions/index.ts
@@ -26,15 +26,15 @@ const defaultExtensions: Array<keyof typeof allExtensions> = [
   'CheckBlockGasLimit'
 ];
 
-function findUnknownExtensions (extensions: string[], userExtensions: Record<string, ExtDef> = {}): string[] {
+function findUnknownExtensions (extensions: string[], userExtensions: ExtDef = {}): string[] {
   const names = [...Object.keys(allExtensions), ...Object.keys(userExtensions)];
 
   return extensions.filter((key) => !names.includes(key));
 }
 
-function expandExtensionTypes (extensions: string[], type: keyof ExtInfo, userExtensions: Record<string, ExtDef> = {}): ExtTypes {
+function expandExtensionTypes (extensions: string[], type: keyof ExtInfo, userExtensions: ExtDef = {}): ExtTypes {
   return extensions
-    .map((key) => allExtensions[key] || userExtensions[key])
+    .map((key) => userExtensions[key] || allExtensions[key])
     .filter((info): info is ExtInfo => !!info)
     .reduce((result, info): ExtTypes => ({ ...result, ...info[type] }), {});
 }
diff --git a/packages/types/src/types/registry.ts b/packages/types/src/types/registry.ts
index 60230c28ad..3ff0f95d56 100644
--- a/packages/types/src/types/registry.ts
+++ b/packages/types/src/types/registry.ts
@@ -116,6 +116,6 @@ export interface Registry {
   register (arg1: string | Constructor | RegistryTypes, arg2?: Constructor): void;
   setChainProperties (properties?: ChainProperties): void;
   setHasher (hasher?: (data: Uint8Array) => Uint8Array): void;
-  setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void;
-  setSignedExtensions (signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void;
+  setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: ExtDef): void;
+  setSignedExtensions (signedExtensions?: string[], userExtensions?: ExtDef): void;
 }