From cea045614885471258d5461969c8c3469e0d3dd2 Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Wed, 28 May 2025 10:17:20 +0000
Subject: [PATCH] fix: resolve type conflicts in AccountKeyInfo and KeyMeta
 imports

- Update AccountKeyInfo interface to handle derivationPath type conflict
- Fix circular dependency by importing KeyMeta directly from interfaces/common
- Use Omit utility type to properly merge Account and KeyMeta types
- Make derivationPath optional in AccountKeyInfo to match Account type

This change resolves type compatibility issues while maintaining
the intended functionality of account metadata handling.
---
 src/libs/endorserServer.ts | 3 ++-
 src/libs/util.ts           | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts
index 27c3dfd2..4f7aaf83 100644
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -37,7 +37,8 @@ import {
   retrieveFullyDecryptedAccount,
   getPasskeyExpirationSeconds,
 } from "../libs/util";
-import { createEndorserJwtForKey, KeyMeta } from "../libs/crypto/vc";
+import { createEndorserJwtForKey } from "../libs/crypto/vc";
+import { KeyMeta } from "../interfaces/common";
 
 import {
   GenericCredWrapper,
diff --git a/src/libs/util.ts b/src/libs/util.ts
index 507a4ebc..ca719625 100644
--- a/src/libs/util.ts
+++ b/src/libs/util.ts
@@ -43,7 +43,7 @@ import {
 import {
   OfferVerifiableCredential,
 } from "../interfaces/claims";
-import { KeyMeta } from "../libs/crypto/vc";
+import { KeyMeta } from "../interfaces/common";
 import { createPeerDid } from "../libs/crypto/vc/didPeer";
 import { registerCredential } from "../libs/crypto/vc/passkeyDidPeer";
 import { logger } from "../utils/logger";
@@ -478,7 +478,9 @@ export function findAllVisibleToDids(
  *
  **/
 
-export interface AccountKeyInfo extends Account, KeyMeta {}
+export interface AccountKeyInfo extends Omit<Account, 'derivationPath'>, Omit<KeyMeta, 'derivationPath'> {
+  derivationPath?: string;  // Make it optional to match Account type
+}
 
 export const retrieveAccountCount = async (): Promise<number> => {
   let result = 0;