@hardkas/accounts 0.5.4-alpha → 0.6.0-alpha

package/dist/index.d.ts

@@ -52,6 +52,7 @@ interface HardkasBaseAccount {
 interface HardkasSimulatedAccount extends HardkasBaseAccount {
     kind: "simulated";
     address: string;
+    evmAddress?: string;
 }
 interface HardkasKaspaPrivateKeyAccount extends HardkasBaseAccount {
     kind: "kaspa-private-key";
@@ -107,7 +108,7 @@ interface ResolveAccountOptions {
 }
 declare function resolveHardkasAccount(options: ResolveAccountOptions): HardkasAccount;
 declare function listHardkasAccounts(config?: HardkasConfig): HardkasAccount[];
-declare function resolveHardkasAccountAddress(accountOrAddress: string, config?: HardkasConfig): string;
+declare function resolveHardkasAccountAddress(accountOrAddress: string, config?: HardkasConfig, context?: "L1" | "L2"): string;
 declare function describeAccount(account: HardkasAccount): Record<string, unknown>;
 
 interface EvmExportResult {

package/dist/index.js

@@ -178,7 +178,8 @@ function resolveHardkasAccount(options) {
     return {
       name: det.name,
       kind: "simulated",
-      address: det.address
+      address: det.address,
+      evmAddress: det.evmAddress
     };
   }
   const available = listHardkasAccounts(config).map((a) => a.name).join(", ");
@@ -191,7 +192,8 @@ function listHardkasAccounts(config) {
     accounts.set(det.name, {
       name: det.name,
       kind: "simulated",
-      address: det.address
+      address: det.address,
+      evmAddress: det.evmAddress
     });
   }
   const realStore = loadRealAccountStoreSync();
@@ -236,11 +238,24 @@ function listHardkasAccounts(config) {
   }
   return Array.from(accounts.values());
 }
-function resolveHardkasAccountAddress(accountOrAddress, config) {
+function resolveHardkasAccountAddress(accountOrAddress, config, context = "L1") {
   if (accountOrAddress.startsWith("kaspa:") || accountOrAddress.startsWith("kaspatest:") || accountOrAddress.startsWith("kaspasim:")) {
+    if (context === "L2") {
+      throw new Error(`Invalid L2 address provided: ${accountOrAddress}. Expected EVM address or account alias.`);
+    }
+    return accountOrAddress;
+  }
+  if (accountOrAddress.startsWith("0x") && accountOrAddress.length === 42) {
     return accountOrAddress;
   }
   const account = resolveHardkasAccount({ nameOrAddress: accountOrAddress, config });
+  if (context === "L2") {
+    const evmAddress = account.evmAddress;
+    if (!evmAddress) {
+      throw new Error(`Account '${account.name}' does not have an EVM address configured for L2.`);
+    }
+    return evmAddress;
+  }
   if (!account.address) {
     throw new Error(`Account '${account.name}' does not have a resolved address yet.`);
   }
@@ -319,6 +334,7 @@ import {
   calculateContentHash as calculateContentHash2,
   HARDKAS_VERSION as HARDKAS_VERSION2
 } from "@hardkas/artifacts";
+import { systemRuntimeContext } from "@hardkas/core";
 
 // src/signer-backend.ts
 async function loadKaspaWasm() {
@@ -455,9 +471,10 @@ var UnsupportedRealKaspaSigner = class {
 };
 async function signTxPlanArtifact(input) {
   const { planArtifact, account } = input;
+  const planRecord = planArtifact;
   if (planArtifact.schema === "hardkas.txPlan") {
-  } else if (planArtifact.status !== "built" && planArtifact.status !== "unsigned") {
-    throw new Error(`Cannot sign artifact with status: ${planArtifact.status}`);
+  } else if (planRecord.status !== "built" && planRecord.status !== "unsigned") {
+    throw new Error(`Cannot sign artifact with status: ${planRecord.status}`);
   }
   if (planArtifact.mode === "simulated") {
     if (account.kind !== "simulated") {
@@ -474,7 +491,8 @@ async function signTxPlanArtifact(input) {
   if (account.kind === "simulated") {
     return createSimulatedSignedTxArtifact(
       planArtifact,
-      `simulated-signed-tx:${planArtifact.planId}`
+      `simulated-signed-tx:${planArtifact.planId}`,
+      systemRuntimeContext
     );
   }
   if (account.kind === "kaspa-private-key") {
@@ -520,7 +538,8 @@ async function signTxPlanArtifact(input) {
   if (account.kind === "evm-private-key") {
     throw new Error("EVM accounts are reserved for future Igra support and cannot sign Kaspa L1 transactions.");
   }
-  throw new Error(`Unsupported account kind for signing: ${account.kind}`);
+  const accountRecord = account;
+  throw new Error(`Unsupported account kind for signing: ${accountRecord.kind}`);
 }
 
 // src/kaspa-sdk-keygen.ts

package/package.json

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