fix: only return local keys from /eth/v1/keystores (#7215)

* fix: only return local keys from /eth/v1/keystores * Fix fetching remote keys in node assertion
ChainSafe · Nov 3, 2024 · abe6751 · abe6751
1 parent 07d1145
commit abe6751
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/cli/src/cmds/validator/keymanager/impl.ts b/packages/cli/src/cmds/validator/keymanager/impl.ts
@@ -110,12 +110,15 @@ export class KeymanagerApi implements Api {
   }
 
   async listKeys(): ReturnType<Api["listKeys"]> {
-    const pubkeys = this.validator.validatorStore.votingPubkeys();
+    const localKeys = this.validator.validatorStore
+      .votingPubkeys()
+      .filter((pubkey) => this.validator.validatorStore.getSigner(pubkey)?.type === SignerType.Local);
+
     return {
-      data: pubkeys.map((pubkey) => ({
+      data: localKeys.map((pubkey) => ({
         validatingPubkey: pubkey,
         derivationPath: "",
-        readonly: this.validator.validatorStore.getSigner(pubkey)?.type !== SignerType.Local,
+        readonly: false,
       })),
     };
   }

diff --git a/packages/cli/test/utils/crucible/assertions/nodeAssertion.ts b/packages/cli/test/utils/crucible/assertions/nodeAssertion.ts
@@ -20,8 +20,13 @@ export const nodeAssertion: Assertion<"node", {health: number; keyManagerKeys: s
     if (node.validator.client === ValidatorClient.Lighthouse || getAllKeys(node.validator.keys).length === 0) {
       keyManagerKeys = [];
     } else {
-      const keys = (await node.validator.keyManager.listKeys()).value();
-      keyManagerKeys = keys.map((k) => k.validatingPubkey);
+      if (node.validator.keys.type === "local") {
+        const keys = (await node.validator.keyManager.listKeys()).value();
+        keyManagerKeys = keys.map((k) => k.validatingPubkey);
+      } else {
+        const keys = (await node.validator.keyManager.listRemoteKeys()).value();
+        keyManagerKeys = keys.map((k) => k.pubkey);
+      }
     }
 
     return {health, keyManagerKeys};