@hardkas/accounts 0.9.4-alpha → 0.9.7-alpha

package/dist/index.d.ts

@@ -385,6 +385,9 @@ declare class KeystoreManager {
     static saveEncryptedKeystore(filePath: string, keystore: EncryptedKeystoreV2): Promise<void>;
 }
 
+declare function withKeystoreLock<T>(filePath: string, operation: () => Promise<T>): Promise<T>;
+declare function appendToKeystoreJson(workspaceRoot: string, alias: string, accountData: any): Promise<void>;
+
 declare const DEV_ACCOUNTS_PASSWORD = "hardkas-local-dev";
 declare function ensureDevAccounts(workspaceDir: string): Promise<void>;
 declare function getOrCreateDevAccount(workspaceDir: string, index: number, alias: string): Promise<GeneratedKaspaDevAccount>;
@@ -393,4 +396,4 @@ declare function listDevAccountsSync(workspaceDir: string): {
     address: string;
 }[];
 
-export { type CreateKaspaWalletOptions, DEV_ACCOUNTS_PASSWORD, type EncryptedKeystoreV2, type EvmExportResult, type GeneratedKaspaDevAccount, type HardkasAccount, type HardkasAccountKind, type HardkasBaseAccount, type HardkasEvmPrivateKeyAccount, type HardkasExternalWalletAccount, HardkasFixtureSigner, type HardkasKaspaPrivateKeyAccount, type HardkasSigner, type HardkasSignerKind, type HardkasSimulatedAccount, type HardkasTxPlanSigner, type KaspaKeyGenerator, KaspaSdkKeyGenerator, type KaspaSdkKeyGeneratorOptions, KaspaSdkRealTxSigner, type KaspaSdkRealTxSignerOptions, type KaspaSigningBackendStatus, KaspaWasmPrivateKeySigner, type KeystoreCipherParams, type KeystoreKdfParams, KeystoreManager, type KeystorePayload, type KeystoreUnlockResult, type RealAccountStore, type RealDevAccount, type RealTxSigner, type RealTxSigningInput, type RealTxSigningResult, type ResolveAccountOptions, type SignTxPlanInput, type SignTxPlanResult, SimulatedSigner, SimulatedTxPlanSigner, UnsupportedKaspaKeyGenerator, UnsupportedRealKaspaSigner, UnsupportedRealTxSigner, assertSigningNetworkAllowed, createEmptyRealAccountStore, createLocalKaspaWallet, describeAccount, ensureDevAccounts, getDefaultRealAccountsPath, getKaspaSigningBackendStatus, getOrCreateDevAccount, getRealDevAccount, getRequiredEnv, importRealDevAccount, listDevAccountsSync, listHardkasAccounts, listRealDevAccounts, loadKaspaWasm, loadOrCreateRealAccountStore, loadRealAccountStore, loadRealAccountStoreSync, prepareEvmAccountExport, removeRealDevAccount, resolveHardkasAccount, resolveHardkasAccountAddress, resolveRealAccountOrAddress, saveRealAccountStore, signTxPlanArtifact, validateAccountName, validateAddressNetwork, validateAddressPrefix };
+export { type CreateKaspaWalletOptions, DEV_ACCOUNTS_PASSWORD, type EncryptedKeystoreV2, type EvmExportResult, type GeneratedKaspaDevAccount, type HardkasAccount, type HardkasAccountKind, type HardkasBaseAccount, type HardkasEvmPrivateKeyAccount, type HardkasExternalWalletAccount, HardkasFixtureSigner, type HardkasKaspaPrivateKeyAccount, type HardkasSigner, type HardkasSignerKind, type HardkasSimulatedAccount, type HardkasTxPlanSigner, type KaspaKeyGenerator, KaspaSdkKeyGenerator, type KaspaSdkKeyGeneratorOptions, KaspaSdkRealTxSigner, type KaspaSdkRealTxSignerOptions, type KaspaSigningBackendStatus, KaspaWasmPrivateKeySigner, type KeystoreCipherParams, type KeystoreKdfParams, KeystoreManager, type KeystorePayload, type KeystoreUnlockResult, type RealAccountStore, type RealDevAccount, type RealTxSigner, type RealTxSigningInput, type RealTxSigningResult, type ResolveAccountOptions, type SignTxPlanInput, type SignTxPlanResult, SimulatedSigner, SimulatedTxPlanSigner, UnsupportedKaspaKeyGenerator, UnsupportedRealKaspaSigner, UnsupportedRealTxSigner, appendToKeystoreJson, assertSigningNetworkAllowed, createEmptyRealAccountStore, createLocalKaspaWallet, describeAccount, ensureDevAccounts, getDefaultRealAccountsPath, getKaspaSigningBackendStatus, getOrCreateDevAccount, getRealDevAccount, getRequiredEnv, importRealDevAccount, listDevAccountsSync, listHardkasAccounts, listRealDevAccounts, loadKaspaWasm, loadOrCreateRealAccountStore, loadRealAccountStore, loadRealAccountStoreSync, prepareEvmAccountExport, removeRealDevAccount, resolveHardkasAccount, resolveHardkasAccountAddress, resolveRealAccountOrAddress, saveRealAccountStore, signTxPlanArtifact, validateAccountName, validateAddressNetwork, validateAddressPrefix, withKeystoreLock };

package/dist/index.js

@@ -240,6 +240,21 @@ function resolveHardkasAccount(options) {
     } catch (e) {
     }
   }
+  const keystoreJsonPath = path2.join(workspaceRoot, ".hardkas", "keystore.json");
+  if (fs2.existsSync(keystoreJsonPath)) {
+    try {
+      const data = fs2.readFileSync(keystoreJsonPath, "utf-8");
+      const ks = JSON.parse(data);
+      if (ks[alias]) {
+        return {
+          name: alias,
+          kind: ks[alias].type === "simulated" ? "simulated" : "kaspa-private-key",
+          address: ks[alias].address
+        };
+      }
+    } catch (e) {
+    }
+  }
   if (config?.accounts && config.accounts[alias]) {
     const accConfig = config.accounts[alias];
     return {
@@ -308,6 +323,29 @@ function listHardkasAccounts(config) {
       }
     }
   }
+  const keystoreJsonPath = path2.join(workspaceRoot, ".hardkas", "keystore.json");
+  if (fs2.existsSync(keystoreJsonPath)) {
+    try {
+      const data = fs2.readFileSync(keystoreJsonPath, "utf-8");
+      const ks = JSON.parse(data);
+      for (const [name, acc] of Object.entries(ks)) {
+        if (acc.type === "simulated") {
+          accounts.set(name, {
+            name,
+            kind: "simulated",
+            address: acc.address
+          });
+        } else {
+          accounts.set(name, {
+            name,
+            kind: "kaspa-private-key",
+            address: acc.address
+          });
+        }
+      }
+    } catch (e) {
+    }
+  }
   const realStore = loadRealAccountStoreSync({ cwd: workspaceRoot });
   if (realStore) {
     for (const realAcc of listRealDevAccounts(realStore)) {
@@ -346,6 +384,10 @@ function listHardkasAccounts(config) {
   }
   if (config?.accounts) {
     for (const [name, accConfig] of Object.entries(config.accounts)) {
+      const existing = accounts.get(name);
+      if (existing && existing.kind === "kaspa-private-key" && accConfig.kind === "simulated") {
+        continue;
+      }
       accounts.set(name, {
         name,
         ...accConfig
@@ -747,7 +789,7 @@ async function getOrCreateDevAccount(workspaceDir, index, alias) {
       const kp = privKey.toKeypair();
       address = kp.toAddress(network).toString();
       publicKey = kp.publicKey;
-      privateKey = kp.privateKey;
+      privateKey = privateKeyHex;
     } else {
       let sdkModule;
       try {
@@ -1446,6 +1488,76 @@ var UnsupportedKaspaKeyGenerator = class {
     );
   }
 };
+
+// src/keystore-lock.ts
+import fs5 from "fs";
+import path5 from "path";
+async function withKeystoreLock(filePath, operation) {
+  const lockFilePath = `${filePath}.lock`;
+  const staleTimeoutMs = parseInt(process.env.HARDKAS_KEYSTORE_LOCK_STALE_MS || "30000", 10);
+  const acquireTimeoutMs = parseInt(process.env.HARDKAS_KEYSTORE_LOCK_TIMEOUT_MS || "10000", 10);
+  const start = Date.now();
+  while (true) {
+    try {
+      fs5.mkdirSync(path5.dirname(lockFilePath), { recursive: true });
+      fs5.writeFileSync(lockFilePath, process.pid.toString(), { flag: "wx" });
+      break;
+    } catch (err) {
+      if (err.code === "EEXIST") {
+        const stats = fs5.statSync(lockFilePath, { throwIfNoEntry: false });
+        if (stats && Date.now() - stats.mtimeMs > staleTimeoutMs) {
+          try {
+            fs5.unlinkSync(lockFilePath);
+          } catch (e) {
+          }
+          continue;
+        }
+        if (Date.now() - start > acquireTimeoutMs) {
+          const e = new Error("KEYSTORE_LOCK_TIMEOUT: Failed to acquire lock for keystore.json");
+          e.code = "KEYSTORE_LOCK_TIMEOUT";
+          throw e;
+        }
+        const jitter = Math.floor(Math.random() * 75) + 25;
+        await new Promise((resolve) => setTimeout(resolve, jitter));
+      } else {
+        throw err;
+      }
+    }
+  }
+  try {
+    return await operation();
+  } finally {
+    try {
+      fs5.unlinkSync(lockFilePath);
+    } catch (e) {
+    }
+  }
+}
+async function appendToKeystoreJson(workspaceRoot, alias, accountData) {
+  const keystorePath = path5.join(workspaceRoot, ".hardkas", "keystore.json");
+  const tempPath = path5.join(workspaceRoot, ".hardkas", `keystore-${process.pid}-${Date.now()}.json.tmp`);
+  await withKeystoreLock(keystorePath, async () => {
+    let ks = {};
+    if (fs5.existsSync(keystorePath)) {
+      try {
+        const data = await fs5.promises.readFile(keystorePath, "utf-8");
+        ks = JSON.parse(data);
+      } catch (e) {
+      }
+    }
+    ks[alias] = accountData;
+    const fd = await fs5.promises.open(tempPath, "w");
+    try {
+      await fd.writeFile(JSON.stringify(ks, null, 2));
+      await fd.sync();
+    } finally {
+      await fd.close();
+    }
+    await fs5.promises.rename(tempPath, keystorePath);
+    const written = await fs5.promises.readFile(keystorePath, "utf-8");
+    JSON.parse(written);
+  });
+}
 export {
   DEV_ACCOUNTS_PASSWORD,
   HardkasFixtureSigner,
@@ -1458,6 +1570,7 @@ export {
   UnsupportedKaspaKeyGenerator,
   UnsupportedRealKaspaSigner,
   UnsupportedRealTxSigner,
+  appendToKeystoreJson,
   assertSigningNetworkAllowed,
   createEmptyRealAccountStore,
   createLocalKaspaWallet,
@@ -1485,5 +1598,6 @@ export {
   signTxPlanArtifact,
   validateAccountName,
   validateAddressNetwork,
-  validateAddressPrefix
+  validateAddressPrefix,
+  withKeystoreLock
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hardkas/accounts",
-  "version": "0.9.4-alpha",
+  "version": "0.9.7-alpha",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,10 +19,10 @@
   "dependencies": {
     "hash-wasm": "^4.12.0",
     "kaspa-wasm": "0.13.0",
-    "@hardkas/config": "0.9.4-alpha",
-    "@hardkas/artifacts": "0.9.4-alpha",
-    "@hardkas/core": "0.9.4-alpha",
-    "@hardkas/localnet": "0.9.4-alpha"
+    "@hardkas/artifacts": "0.9.7-alpha",
+    "@hardkas/core": "0.9.7-alpha",
+    "@hardkas/config": "0.9.7-alpha",
+    "@hardkas/localnet": "0.9.7-alpha"
   },
   "devDependencies": {
     "tsup": "^8.3.5",