Make slashingProtectionStr optional (#4296)

ChainSafe · Jul 17, 2022 · ab13fe2 · ab13fe2
1 parent 13558b5
commit ab13fe2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/api/src/keymanager/routes.ts b/packages/api/src/keymanager/routes.ts
@@ -114,7 +114,7 @@ export type Api = {
   importKeystores(
     keystoresStr: KeystoreStr[],
     passwords: string[],
-    slashingProtectionStr: SlashingProtectionData
+    slashingProtectionStr?: SlashingProtectionData
   ): Promise<{
     data: ResponseStatus<ImportStatus>[];
   }>;
@@ -184,7 +184,7 @@ export type ReqTypes = {
     body: {
       keystores: KeystoreStr[];
       passwords: string[];
-      slashingProtection: SlashingProtectionData;
+      slashingProtection?: SlashingProtectionData;
     };
   };
   deleteKeystores: {body: {pubkeys: string[]}};

diff --git a/packages/cli/src/cmds/validator/keymanager/impl.ts b/packages/cli/src/cmds/validator/keymanager/impl.ts
@@ -52,15 +52,17 @@ export class KeymanagerApi implements Api {
   async importKeystores(
     keystoresStr: KeystoreStr[],
     passwords: string[],
-    slashingProtectionStr: SlashingProtectionData
+    slashingProtectionStr?: SlashingProtectionData
   ): ReturnType<Api["importKeystores"]> {
-    // The arguments to this function is passed in within the body of an HTTP request
-    // hence fastify will parse it into an object before this function is called.
-    // Even though the slashingProtectionStr is typed as SlashingProtectionData,
-    // at runtime, when the handler for the request is selected, it would see slashingProtectionStr
-    // as an object, hence trying to parse it using JSON.parse won't work. Instead, we cast straight to Interchange
-    const interchange = ensureJSON<Interchange>(slashingProtectionStr);
-    await this.validator.importInterchange(interchange);
+    if (slashingProtectionStr) {
+      // The arguments to this function is passed in within the body of an HTTP request
+      // hence fastify will parse it into an object before this function is called.
+      // Even though the slashingProtectionStr is typed as SlashingProtectionData,
+      // at runtime, when the handler for the request is selected, it would see slashingProtectionStr
+      // as an object, hence trying to parse it using JSON.parse won't work. Instead, we cast straight to Interchange
+      const interchange = ensureJSON<Interchange>(slashingProtectionStr);
+      await this.validator.importInterchange(interchange);
+    }
 
     const statuses: {status: ImportStatus; message?: string}[] = [];