feat: topic import now matches admin and submit keys from mirror node with KMS and stores the matched key references for signing

Signed-off-by: rozekmichal <michal.rozek@blockydevs.com>

Author: rozekmichal

src/__tests__/mocks/mocks.ts

@@ -20,7 +20,7 @@ import type { Destination } from '@/core/services/key-resolver/types';
 import type { KmsService } from '@/core/services/kms/kms-service.interface';
 import type {
   Credential,
-  KeyManager,
+  KmsCredentialRecord,
 } from '@/core/services/kms/kms-types.interface';
 import type { Logger } from '@/core/services/logger/logger-service.interface';
 import type { HederaMirrornodeService } from '@/core/services/mirrornode/hedera-mirrornode-service.interface';
@@ -38,7 +38,10 @@ import type { TopicData } from '@/plugins/topic/schema';
 import { createMockTransaction } from '@/__tests__/mocks/hedera-sdk-mocks';
 import { StateError, ValidationError } from '@/core';
 import { AliasType } from '@/core/services/alias/alias-service.interface';
-import { CredentialType } from '@/core/services/kms/kms-types.interface';
+import {
+  CredentialType,
+  KeyManager,
+} from '@/core/services/kms/kms-types.interface';
 import { KeyAlgorithm } from '@/core/shared/constants';
 import { SupportedNetwork } from '@/core/types/shared.types';
 
@@ -150,13 +153,30 @@ export const makeKmsMock = (): jest.Mocked<KmsService> => ({
   signContractCreateFlow: jest.fn(),
 });
 
+/**
+ * Create a minimal KmsCredentialRecord
+ */
+export const createMockKmsRecord = (
+  keyRefId: string,
+  publicKey: string,
+): KmsCredentialRecord => {
+  const now = new Date().toISOString();
+  return {
+    keyRefId,
+    publicKey,
+    keyManager: KeyManager.local,
+    keyAlgorithm: KeyAlgorithm.ED25519,
+    createdAt: now,
+    updatedAt: now,
+  };
+};
+
 /**
  * Create a mocked AliasService
  */
 export const makeAliasMock = (): jest.Mocked<AliasService> => ({
   register: jest.fn(),
   resolve: jest.fn().mockImplementation((alias, type) => {
-    // Domyślnie zwracaj dane dla typowych aliasów używanych w testach
     if (type === AliasType.Account) {
       const accountAliases: Record<string, AccountAlias> = {
         'admin-key': {

src/plugins/topic/__tests__/unit/import.test.ts

@@ -3,8 +3,18 @@ import type { HederaMirrornodeService } from '@/core/services/mirrornode/hedera-
 import type { NetworkService } from '@/core/services/network/network-service.interface';
 
 import {
+  ECDSA_DER_PUBLIC_KEY,
+  ECDSA_HEX_PUBLIC_KEY,
+  ED25519_DER_PUBLIC_KEY,
+  ED25519_HEX_PUBLIC_KEY,
+  MOCK_TOPIC_ADMIN_KEY_REF_ID,
+  MOCK_TOPIC_SUBMIT_KEY_REF_ID,
+} from '@/__tests__/mocks/fixtures';
+import {
+  createMockKmsRecord,
   makeAliasMock,
   makeArgs,
+  makeKmsMock,
   makeLogger,
   makeMirrorMock,
   makeNetworkMock,
@@ -144,6 +154,167 @@ describe('topic plugin - import command (ADR-007)', () => {
     expect(output.name).toBe(undefined);
   });
 
+  test('imports topic with admin_key and submit_key matched in KMS', async () => {
+    const logger = makeLogger();
+    const saveTopicMock = jest.fn().mockReturnValue(undefined);
+
+    MockedHelper.mockImplementation(() => ({
+      loadTopic: jest.fn().mockReturnValue(null),
+      saveTopic: saveTopicMock,
+    }));
+
+    const topicInfo = createMockTopicInfo({
+      topic_id: '0.0.123456',
+      memo: 'Topic with keys',
+      created_timestamp: '1704067200.000000000',
+      admin_key: { _type: 'ED25519', key: ED25519_DER_PUBLIC_KEY },
+      submit_key: { _type: 'ECDSA_SECP256K1', key: ECDSA_DER_PUBLIC_KEY },
+    });
+
+    const mirrorMock = makeMirrorMock() as Partial<HederaMirrornodeService> & {
+      getTopicInfo: jest.Mock;
+    };
+    mirrorMock.getTopicInfo = jest.fn().mockResolvedValue(topicInfo);
+
+    const kms = makeKmsMock();
+    kms.findByPublicKey.mockImplementation((publicKey: string) => {
+      if (publicKey === ED25519_HEX_PUBLIC_KEY)
+        return createMockKmsRecord(MOCK_TOPIC_ADMIN_KEY_REF_ID, publicKey);
+      if (publicKey === ECDSA_HEX_PUBLIC_KEY)
+        return createMockKmsRecord(MOCK_TOPIC_SUBMIT_KEY_REF_ID, publicKey);
+      return undefined;
+    });
+
+    const api: Partial<CoreApi> = {
+      mirror: mirrorMock as HederaMirrornodeService,
+      network: makeNetworkMock(SupportedNetwork.TESTNET) as NetworkService,
+      alias: makeAliasMock(),
+      logger,
+      state: makeStateMock(),
+      kms,
+    };
+
+    const args = makeArgs(api, logger, { topic: '0.0.123456' });
+
+    const result = await topicImport(args);
+
+    expect(saveTopicMock).toHaveBeenCalledWith(
+      `${SupportedNetwork.TESTNET}:0.0.123456`,
+      expect.objectContaining({
+        topicId: '0.0.123456',
+        adminKeyRefIds: [MOCK_TOPIC_ADMIN_KEY_REF_ID],
+        submitKeyRefIds: [MOCK_TOPIC_SUBMIT_KEY_REF_ID],
+      }),
+    );
+
+    const output = assertOutput(result.result, TopicImportOutputSchema);
+    expect(output.adminKeyPresent).toBe(true);
+    expect(output.submitKeyPresent).toBe(true);
+    expect(output.adminKeysMatched).toBe(1);
+    expect(output.submitKeysMatched).toBe(1);
+  });
+
+  test('imports topic with admin_key when key is not in KMS', async () => {
+    const logger = makeLogger();
+    const saveTopicMock = jest.fn().mockReturnValue(undefined);
+
+    MockedHelper.mockImplementation(() => ({
+      loadTopic: jest.fn().mockReturnValue(null),
+      saveTopic: saveTopicMock,
+    }));
+
+    const topicInfo = createMockTopicInfo({
+      topic_id: '0.0.123456',
+      created_timestamp: '1704067200.000000000',
+      admin_key: { _type: 'ED25519', key: ED25519_DER_PUBLIC_KEY },
+    });
+
+    const mirrorMock = makeMirrorMock() as Partial<HederaMirrornodeService> & {
+      getTopicInfo: jest.Mock;
+    };
+    mirrorMock.getTopicInfo = jest.fn().mockResolvedValue(topicInfo);
+
+    const kms = makeKmsMock();
+    kms.findByPublicKey.mockReturnValue(undefined);
+
+    const api: Partial<CoreApi> = {
+      mirror: mirrorMock as HederaMirrornodeService,
+      network: makeNetworkMock(SupportedNetwork.TESTNET) as NetworkService,
+      alias: makeAliasMock(),
+      logger,
+      state: makeStateMock(),
+      kms,
+    };
+
+    const args = makeArgs(api, logger, { topic: '0.0.123456' });
+
+    const result = await topicImport(args);
+
+    expect(saveTopicMock).toHaveBeenCalledWith(
+      `${SupportedNetwork.TESTNET}:0.0.123456`,
+      expect.objectContaining({
+        topicId: '0.0.123456',
+        adminKeyRefIds: undefined,
+      }),
+    );
+
+    const output = assertOutput(result.result, TopicImportOutputSchema);
+    expect(output.adminKeyPresent).toBe(true);
+    expect(output.adminKeysMatched).toBe(0);
+  });
+
+  test('imports topic with submit_key when key is in KMS', async () => {
+    const logger = makeLogger();
+    const saveTopicMock = jest.fn().mockReturnValue(undefined);
+
+    MockedHelper.mockImplementation(() => ({
+      loadTopic: jest.fn().mockReturnValue(null),
+      saveTopic: saveTopicMock,
+    }));
+
+    const topicInfo = createMockTopicInfo({
+      topic_id: '0.0.123456',
+      created_timestamp: '1704067200.000000000',
+      submit_key: { _type: 'ED25519', key: ED25519_DER_PUBLIC_KEY },
+    });
+
+    const mirrorMock = makeMirrorMock() as Partial<HederaMirrornodeService> & {
+      getTopicInfo: jest.Mock;
+    };
+    mirrorMock.getTopicInfo = jest.fn().mockResolvedValue(topicInfo);
+
+    const kms = makeKmsMock();
+    kms.findByPublicKey.mockImplementation((publicKey: string) =>
+      publicKey === ED25519_HEX_PUBLIC_KEY
+        ? createMockKmsRecord(MOCK_TOPIC_SUBMIT_KEY_REF_ID, publicKey)
+        : undefined,
+    );
+
+    const api: Partial<CoreApi> = {
+      mirror: mirrorMock as HederaMirrornodeService,
+      network: makeNetworkMock(SupportedNetwork.TESTNET) as NetworkService,
+      alias: makeAliasMock(),
+      logger,
+      state: makeStateMock(),
+      kms,
+    };
+
+    const args = makeArgs(api, logger, { topic: '0.0.123456' });
+
+    const result = await topicImport(args);
+
+    expect(saveTopicMock).toHaveBeenCalledWith(
+      `${SupportedNetwork.TESTNET}:0.0.123456`,
+      expect.objectContaining({
+        submitKeyRefIds: [MOCK_TOPIC_SUBMIT_KEY_REF_ID],
+      }),
+    );
+
+    const output = assertOutput(result.result, TopicImportOutputSchema);
+    expect(output.submitKeyPresent).toBe(true);
+    expect(output.submitKeysMatched).toBe(1);
+  });
+
   test('throws when topic already exists in state', async () => {
     const logger = makeLogger();
 

src/plugins/topic/commands/import/handler.ts

@@ -8,6 +8,10 @@ import { ValidationError } from '@/core/errors';
 import { AliasType } from '@/core/services/alias/alias-service.interface';
 import { hederaTimestampToIso } from '@/core/utils/hedera-timestamp';
 import { composeKey } from '@/core/utils/key-composer';
+import {
+  extractPublicKeysFromMirrorNodeKey,
+  matchKeysWithKms,
+} from '@/plugins/topic/utils/extract-public-keys';
 import { ZustandTopicStateHelper } from '@/plugins/topic/zustand-state-helper';
 
 import { TopicImportInputSchema } from './input';
@@ -55,12 +59,31 @@ export class TopicImportCommand implements Command {
     }
 
     const createdAt = hederaTimestampToIso(topicInfo.created_timestamp);
+
+    const adminKeysExtracted = extractPublicKeysFromMirrorNodeKey(
+      topicInfo.admin_key,
+    );
+    const submitKeysExtracted = extractPublicKeysFromMirrorNodeKey(
+      topicInfo.submit_key,
+    );
+
+    const adminKeyRefIds =
+      adminKeysExtracted && adminKeysExtracted.publicKeys.length > 0
+        ? matchKeysWithKms(adminKeysExtracted.publicKeys, api.kms)
+        : [];
+    const submitKeyRefIds =
+      submitKeysExtracted && submitKeysExtracted.publicKeys.length > 0
+        ? matchKeysWithKms(submitKeysExtracted.publicKeys, api.kms)
+        : [];
+
     const topicData: TopicData = {
       name: normalisedParams.alias,
       topicId: normalisedParams.topicId,
       memo: topicInfo.memo || '(No memo)',
-      adminKeyRefIds: [],
-      submitKeyRefIds: [],
+      adminKeyRefIds: adminKeyRefIds.length > 0 ? adminKeyRefIds : undefined,
+      submitKeyRefIds: submitKeyRefIds.length > 0 ? submitKeyRefIds : undefined,
+      adminKeyThreshold: adminKeysExtracted?.threshold,
+      submitKeyThreshold: submitKeysExtracted?.threshold,
       network: normalisedParams.network,
       createdAt,
     };
@@ -74,6 +97,8 @@ export class TopicImportCommand implements Command {
       memo: topicInfo.memo || undefined,
       adminKeyPresent: Boolean(topicInfo.admin_key),
       submitKeyPresent: Boolean(topicInfo.submit_key),
+      adminKeysMatched: adminKeyRefIds.length,
+      submitKeysMatched: submitKeyRefIds.length,
     };
 
     return { result };

src/plugins/topic/commands/import/output.ts

@@ -19,6 +19,16 @@ export const TopicImportOutputSchema = z.object({
   submitKeyPresent: z
     .boolean()
     .describe('Whether submit key is set on the topic'),
+  adminKeysMatched: z
+    .number()
+    .int()
+    .min(0)
+    .describe('Number of admin keys matched with KMS'),
+  submitKeysMatched: z
+    .number()
+    .int()
+    .min(0)
+    .describe('Number of submit keys matched with KMS'),
 });
 
 export type TopicImportOutput = z.infer<typeof TopicImportOutputSchema>;
@@ -35,7 +45,7 @@ export const TOPIC_IMPORT_TEMPLATE = `
 {{#if memo}}
    Memo: {{memo}}
 {{/if}}
-   Admin key: {{#if adminKeyPresent}}✅ Present{{else}}❌ Not set{{/if}}
-   Submit key: {{#if submitKeyPresent}}✅ Present{{else}}❌ Not set (public topic){{/if}}
+   Admin key: {{#if adminKeyPresent}}✅ Present{{#if adminKeysMatched}} ({{adminKeysMatched}} matched in KMS){{/if}}{{else}}❌ Not set{{/if}}
+   Submit key: {{#if submitKeyPresent}}✅ Present{{#if submitKeysMatched}} ({{submitKeysMatched}} matched in KMS){{/if}}{{else}}❌ Not set (public topic){{/if}}
 
 `.trim();