refactor(extension,cardano,staking): remove redundant code and fix er…

…rors
input-output-hk · Jan 24, 2025 · 1f76bc1 · 1f76bc1
1 parent 1047ddf
commit 1f76bc1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/apps/browser-extension-wallet/src/lib/scripts/background/storage/extension-document-store.ts b/apps/browser-extension-wallet/src/lib/scripts/background/storage/extension-document-store.ts
@@ -29,6 +29,7 @@ export class ExtensionDocumentStore<T extends {}> extends ExtensionStore impleme
 
   /**
    * @param docId unique document id within the store, used as extension storage key
+   * @param logger
    */
   constructor(protected docId: string, logger: Logger) {
     super(contextLogger(logger, `ExtensionStore(${docId})`));

diff --git a/packages/cardano/src/wallet/lib/cardano-wallet.ts b/packages/cardano/src/wallet/lib/cardano-wallet.ts
@@ -31,7 +31,7 @@ import { WsProvider } from '@cardano-sdk/cardano-services-client';
 let bip32Ed25519: Promise<Crypto.SodiumBip32Ed25519> | undefined;
 
 export const getBip32Ed25519 = async (): Promise<Crypto.SodiumBip32Ed25519> =>
-  bip32Ed25519 || (bip32Ed25519 = await Crypto.SodiumBip32Ed25519.create());
+  bip32Ed25519 || (bip32Ed25519 = Crypto.SodiumBip32Ed25519.create());
 
 export type KeyAgentsByChain = Record<ChainName, { keyAgentData: KeyManagement.SerializableKeyAgentData }>;
 
@@ -96,7 +96,11 @@ export const restoreWallet = async (
   keyAgentData: KeyManagement.SerializableKeyAgentData,
   getPassword: () => Promise<Uint8Array>
 ): Promise<{ keyAgent: KeyManagement.KeyAgent }> => {
-  const keyAgent = await restoreKeyAgent(keyAgentData, { logger: console, bip32Ed25519 }, getPassword);
+  const keyAgent = await restoreKeyAgent(
+    keyAgentData,
+    { logger: console, bip32Ed25519: await getBip32Ed25519() },
+    getPassword
+  );
   return { keyAgent };
 };
 
@@ -128,7 +132,7 @@ export const validateWalletPassword = async (
     // Not needed for this
     {
       logger: console,
-      bip32Ed25519
+      bip32Ed25519: await getBip32Ed25519()
     },
     getPassword
   );
@@ -160,7 +164,7 @@ export const validateWalletMnemonic = async (
     },
     {
       logger: console,
-      bip32Ed25519
+      bip32Ed25519: await getBip32Ed25519()
     }
   );
 
@@ -170,15 +174,15 @@ export const validateWalletMnemonic = async (
   return originalPublicKey === validatingPublicKey;
 };
 
-export const createKeyAgent = (
+export const createKeyAgent = async (
   keyAgentData: KeyManagement.SerializableKeyAgentData,
   getPassword: () => Promise<Uint8Array>
 ): Promise<KeyManagement.KeyAgent> =>
   restoreKeyAgent(
     keyAgentData,
     {
       logger: console,
-      bip32Ed25519
+      bip32Ed25519: await getBip32Ed25519()
     },
     getPassword
   );