@hardkas/accounts 0.12.0-rc.16 → 0.12.0-rc.18

package/dist/{authorizers-DDHM4SUH.js → authorizers-23P5SD3F.js}

@@ -2,7 +2,7 @@ import {
   LazyAccountAuthorizer,
   PrivateKeyAuthorizer,
   StaticSignatureScriptAuthorizer
-} from "./chunk-EKQU22GY.js";
+} from "./chunk-EJK4QMPM.js";
 export {
   LazyAccountAuthorizer,
   PrivateKeyAuthorizer,

package/dist/{chunk-SYYYAEO7.js → chunk-7U2IIXLY.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-R5P3WIWR.js";
 import {
   resolveHardkasAccount
-} from "./chunk-AVTGARCA.js";
+} from "./chunk-YBNHOFVX.js";
 import {
   loadKaspaWasm
 } from "./chunk-6DPO5V3N.js";
@@ -15,10 +15,11 @@ import {
 import fs from "fs";
 import path from "path";
 import crypto from "crypto";
-import { deterministicCompare } from "@hardkas/core";
+import { deterministicCompare, getNetworkPrefix as getNetworkPrefix2 } from "@hardkas/core";
 
 // src/kaspa-wasm-signer.ts
 import { calculateContentHash } from "@hardkas/artifacts";
+import { getNetworkPrefix } from "@hardkas/core";
 var KaspaWasmPrivateKeySigner = class {
   constructor(options) {
     this.options = options;
@@ -56,7 +57,7 @@ var KaspaWasmPrivateKeySigner = class {
       if (!pkValue && account.keystorePath) {
         try {
           const KeystoreManager2 = (await import("./keystore-CMWEKGBF.js")).KeystoreManager;
-          const DEV_ACCOUNTS_PASSWORD2 = (await import("./dev-accounts-K5TPW2TH.js")).DEV_ACCOUNTS_PASSWORD;
+          const DEV_ACCOUNTS_PASSWORD2 = (await import("./dev-accounts-F7LATHCT.js")).DEV_ACCOUNTS_PASSWORD;
           const keystore = await KeystoreManager2.loadEncryptedKeystore(account.keystorePath);
           const unlock = await KeystoreManager2.decryptEncryptedKeystore(keystore, DEV_ACCOUNTS_PASSWORD2);
           if (unlock.success && unlock.payload) {
@@ -75,8 +76,8 @@ var KaspaWasmPrivateKeySigner = class {
         err.code = "INVALID_PRIVATE_KEY_MATERIAL";
         throw err;
       }
-      const expectedAddress = new sdk.PrivateKey(pkValue).toKeypair().toAddress(plan.networkId || "simnet").toString();
-      const { PrivateKeyAuthorizer } = await import("./authorizers-DDHM4SUH.js");
+      const expectedAddress = new sdk.PrivateKey(pkValue).toKeypair().toAddress(getNetworkPrefix(plan.networkId || "simnet")).toString();
+      const { PrivateKeyAuthorizer } = await import("./authorizers-23P5SD3F.js");
       const sourceInputs = plan.inputs || plan.selectedUtxos || [];
       for (let i = 0; i < numInputs; i++) {
         if (!authorizers[i]) {
@@ -93,7 +94,6 @@ var KaspaWasmPrivateKeySigner = class {
       }
     }
     try {
-      console.log("DEBUG PLAN INPUTS:", JSON.stringify(plan.inputs || plan.selectedUtxos, null, 2));
       const sourceInputs = plan.inputs || plan.selectedUtxos || [];
       const utxos = sourceInputs.map((u) => {
         if (!u.outpoint.transactionId || u.outpoint.index === void 0) {
@@ -105,15 +105,27 @@ var KaspaWasmPrivateKeySigner = class {
             "UTXO is missing scriptPublicKey. Real signing flows must never fabricate cryptographic state."
           );
         }
+        let spkHex = "";
+        let spkVersion = 0;
+        if (typeof spk === "object" && spk !== null) {
+          spkVersion = Number(spk.version ?? 0);
+          spkHex = String(spk.scriptPublicKey || spk.script || "");
+        } else {
+          spkHex = String(spk);
+          if (/^[0-9a-fA-F]{72}$/.test(spkHex) && spkHex.startsWith("0000")) {
+            spkVersion = parseInt(spkHex.slice(0, 4), 16) || 0;
+            spkHex = spkHex.slice(4);
+          }
+        }
         return {
-          address: plan.from.address,
+          address: u.address || plan.from.address,
           outpoint: {
             transactionId: u.outpoint.transactionId,
             index: u.outpoint.index
           },
           utxoEntry: {
             amount: BigInt(u.amountSompi),
-            scriptPublicKey: new sdk.ScriptPublicKey(parseInt(spk.substring(0, 4), 16) || 0, spk.substring(4)),
+            scriptPublicKey: new sdk.ScriptPublicKey(spkVersion, spkHex),
             blockDaaScore: BigInt(u.blockDaaScore || "0"),
             isCoinbase: !!u.isCoinbase
           }
@@ -142,9 +154,6 @@ var KaspaWasmPrivateKeySigner = class {
             }
             return new sdk.PaymentOutput(new sdk.Address(o.address), BigInt(o.amountSompi));
           });
-          console.log("DEBUG: Calling V1 createTransaction with:", { utxos: utxos.length, wasmOutputs: wasmOutputs.length, priorityFee });
-          console.log("DEBUG KASPA-WASM PATH:", import.meta.resolve("kaspa-wasm"));
-          console.log("DEBUG CREATE TRANSACTION FN:", sdk.createTransaction.toString());
           unsignedTx = sdk.createTransaction(
             utxos,
             wasmOutputs,
@@ -183,8 +192,7 @@ var KaspaWasmPrivateKeySigner = class {
               amount: BigInt(o.amountSompi)
             };
           });
-          console.log("DEBUG: Calling V0 createTransaction with:", { utxos: utxos.length, wasmOutputs: wasmOutputs.length, priorityFee });
-          const dummyChange = plan.change?.address || plan.from.address;
+          const dummyChange = plan.change && plan.change.address || (typeof plan.from === "string" ? plan.from : plan.from?.address) || plan.outputs && plan.outputs[0] && plan.outputs[0].address;
           unsignedTx = sdk.createTransaction(
             utxos,
             wasmOutputs,
@@ -202,7 +210,6 @@ var KaspaWasmPrivateKeySigner = class {
             inputs[i].sigOpCount = 0;
           }
         }
-        console.log("DEBUG createFreshTx RETURNING:", unsignedTx?.constructor?.name);
         return unsignedTx;
       };
       const inputOverrides = {};
@@ -245,8 +252,6 @@ var KaspaWasmPrivateKeySigner = class {
       const finalTx = createFreshTx();
       const signedTx = finalTx;
       const wasmTxStr = typeof signedTx.serializeToJSON === "function" ? signedTx.serializeToJSON() : signedTx.toString();
-      console.log("DEBUG wasmTxStr:", wasmTxStr);
-      console.log("DEBUG: about to parseWasmTxToRpc");
       const rpcTx = parseWasmTxToRpc(wasmTxStr, signedTx, inputOverrides, plan);
       const rawTx = JSON.stringify(rpcTx);
       return {
@@ -263,8 +268,6 @@ var KaspaWasmPrivateKeySigner = class {
         }
       };
     } catch (error) {
-      console.error("DEBUG SIGNING ERROR:", error);
-      console.error("DEBUG STACK:", error?.stack || "NO STACK (raw panic)");
       throw new Error(
         `Kaspa WASM signing failed: ${error instanceof Error ? error.stack || error.message : JSON.stringify(error, Object.getOwnPropertyNames(error))}`
       );
@@ -290,6 +293,8 @@ async function ensureDevAccounts(workspaceDir) {
   }
   await getOrCreateDevAccount(workspaceDir, 0, "alice");
   await getOrCreateDevAccount(workspaceDir, 1, "bob");
+  await getOrCreateDevAccount(workspaceDir, 2, "carol");
+  await getOrCreateDevAccount(workspaceDir, 3, "dave");
 }
 async function getOrCreateDevAccount(workspaceDir, index, alias) {
   const devAccountsDir = path.join(workspaceDir, ".hardkas", "dev-accounts");
@@ -320,20 +325,11 @@ async function getOrCreateDevAccount(workspaceDir, index, alias) {
   let publicKey = "";
   try {
     if (isSimnet) {
-      let kaspaWasm;
-      try {
-        kaspaWasm = await import(
-          /* @vite-ignore */
-          "kaspa-wasm"
-        );
-      } catch (e) {
-        console.warn(`
-[Warning] kaspa-wasm is not installed. Required for simnet.`);
-        return { address: "", privateKey: "", publicKey: "" };
-      }
+      const { loadKaspaWasm: loadKaspaWasm2 } = await import("./signer-backend-W3LNCQA3.js");
+      const kaspaWasm = await loadKaspaWasm2();
       const privKey = new kaspaWasm.PrivateKey(privateKeyHex);
       const kp = privKey.toKeypair();
-      address = kp.toAddress(network).toString();
+      address = kp.toAddress(getNetworkPrefix2(network)).toString();
       publicKey = kp.publicKey;
       privateKey = privateKeyHex;
     } else {
@@ -355,7 +351,7 @@ async function getOrCreateDevAccount(workspaceDir, index, alias) {
       const privKey = new sdk.PrivateKey(privateKeyHex);
       const pubKey = privKey.toPublicKey();
       try {
-        address = pubKey.toAddress(network).toString();
+        address = pubKey.toAddress(getNetworkPrefix2(network)).toString();
       } catch (e) {
         const msg = e instanceof Error ? e instanceof Error ? e instanceof Error ? e.message : String(e) : String(e) : String(e);
         if (msg.includes("Second argument must be") || msg.includes("Unsupported")) {

package/dist/{chunk-EKQU22GY.js → chunk-EJK4QMPM.js}

@@ -1,4 +1,5 @@
 // src/authorizers.ts
+import { getNetworkPrefix } from "@hardkas/core";
 var StaticSignatureScriptAuthorizer = class {
   constructor(signatureScript) {
     this.signatureScript = signatureScript;
@@ -30,7 +31,7 @@ var PrivateKeyAuthorizer = class {
           const { wasm, wasmTransaction, inputIndex } = ctx;
           const privateKey = new wasm.PrivateKey(this.privateKeyHex);
           const networkId = context.plan.networkId || "simnet";
-          const expectedAddress = privateKey.toKeypair().toAddress(networkId).toString();
+          const expectedAddress = privateKey.toKeypair().toAddress(getNetworkPrefix(networkId)).toString();
           if (planInput.address && expectedAddress !== planInput.address) {
             throw new Error(
               `PRIVATE_KEY_DOES_NOT_CONTROL_INPUT: The provided private key for account '${this.accountName}' derives to address '${expectedAddress}', but input ${context.inputIndex} is controlled by '${planInput.address}'.`
@@ -63,7 +64,7 @@ var LazyAccountAuthorizer = class {
   accountName;
   workspaceRoot;
   async authorize(context) {
-    const { resolveHardkasAccount } = await import("./resolve-5JBZXBNN.js");
+    const { resolveHardkasAccount } = await import("./resolve-5G6NEL62.js");
     const account = await resolveHardkasAccount({
       nameOrAddress: this.accountName,
       config: { cwd: this.workspaceRoot }
@@ -75,7 +76,7 @@ var LazyAccountAuthorizer = class {
     if (!pkValue && account.keystorePath) {
       try {
         const { KeystoreManager } = await import("./keystore-CMWEKGBF.js");
-        const { DEV_ACCOUNTS_PASSWORD } = await import("./dev-accounts-K5TPW2TH.js");
+        const { DEV_ACCOUNTS_PASSWORD } = await import("./dev-accounts-F7LATHCT.js");
         const keystore = await KeystoreManager.loadEncryptedKeystore(account.keystorePath);
         const unlock = await KeystoreManager.decryptEncryptedKeystore(keystore, DEV_ACCOUNTS_PASSWORD);
         if (unlock.success && unlock.payload) {

package/dist/{chunk-AVTGARCA.js → chunk-YBNHOFVX.js}

@@ -219,7 +219,7 @@ function resolveHardkasAccount(options) {
   let alias = nameOrAddress;
   if (alias === "0") alias = "alice";
   if (alias === "1") alias = "bob";
-  const accounts = listHardkasAccounts(config);
+  const accounts = listHardkasAccounts(config, options.executionTarget);
   const found = accounts.find((a) => a.name === alias);
   if (found) {
     return found;
@@ -245,24 +245,28 @@ function assertAccountCompatible(account, target) {
     });
   }
 }
-function listHardkasAccounts(config) {
+function listHardkasAccounts(config, executionTarget) {
   const accounts = /* @__PURE__ */ new Map();
   let targetMode = "localnet";
-  const execConfig = config?.execution;
-  if (execConfig) {
-    if (execConfig.mode) {
-      targetMode = execConfig.mode;
-    } else if (execConfig.default) {
-      const targetName = execConfig.default;
-      const target = execConfig.targets?.[targetName];
-      if (target?.mode) {
-        targetMode = target.mode;
-      } else if (targetName === "simulator") {
-        targetMode = "simulator";
+  if (executionTarget) {
+    targetMode = executionTarget.mode;
+  } else {
+    const execConfig = config?.execution;
+    if (execConfig) {
+      if (execConfig.mode) {
+        targetMode = execConfig.mode;
+      } else if (execConfig.default) {
+        const targetName = execConfig.default;
+        const target = execConfig.targets?.[targetName];
+        if (target?.mode) {
+          targetMode = target.mode;
+        } else if (targetName === "simulator") {
+          targetMode = "simulator";
+        }
       }
+    } else if (config?.defaultNetwork === "simulated") {
+      targetMode = "simulator";
     }
-  } else if (config?.defaultNetwork === "simulated") {
-    targetMode = "simulator";
   }
   const detAccounts = createDeterministicAccounts();
   for (const det of detAccounts) {
@@ -271,7 +275,7 @@ function listHardkasAccounts(config) {
         name: det.name,
         kind: "synthetic",
         executionMode: "simulator",
-        address: det.address,
+        address: `kaspa:sim_${det.name}`,
         evmAddress: det.evmAddress
       });
     } else {
@@ -297,15 +301,23 @@ function listHardkasAccounts(config) {
             if (!keystore.metadata?.network) {
               throw new AccountNetworkMismatchError({ expected: "known network", actual: "undefined", detail: `at ${path2.join(devAccountsDir, file)}` });
             }
-            const accountKind = targetMode === "simulator" ? "synthetic" : "kaspa";
-            accounts.set(name, {
-              name,
-              kind: accountKind,
-              network: keystore.metadata.network,
-              address: keystore.payload?.address || keystore.metadata?.address,
-              keystorePath: path2.join(devAccountsDir, file),
-              ...accountKind === "synthetic" ? { executionMode: "simulator" } : {}
-            });
+            if (targetMode === "simulator") {
+              accounts.set(name, {
+                name,
+                kind: "synthetic",
+                executionMode: "simulator",
+                address: `kaspa:sim_${name}`,
+                keystorePath: path2.join(devAccountsDir, file)
+              });
+            } else {
+              accounts.set(name, {
+                name,
+                kind: "kaspa",
+                network: keystore.metadata.network,
+                address: keystore.payload?.address || keystore.metadata?.address,
+                keystorePath: path2.join(devAccountsDir, file)
+              });
+            }
           }
         } catch (e) {
           if (e instanceof AccountNetworkMismatchError) throw e;
@@ -319,19 +331,15 @@ function listHardkasAccounts(config) {
       const data = fs2.readFileSync(keystoreJsonPath, "utf-8");
       const ks = JSON.parse(data);
       for (const [name, acc] of Object.entries(ks)) {
-        const existing = accounts.get(name);
-        const configKind = acc.type === "simulated" ? "synthetic" : "kaspa";
-        if (existing && existing.kind !== configKind) {
-          console.error(`COLLISION DETECTED for ${name}. existing:`, existing, `configKind:`, configKind, `workspaceRoot:`, workspaceRoot, `keystoreJsonPath:`, keystoreJsonPath);
-          throw new CrossWorldAccountCollisionError({ accountId: name, worlds: [existing.kind, configKind] });
-        }
         if (acc.type === "simulated") {
-          accounts.set(name, {
-            name,
-            kind: "synthetic",
-            executionMode: "simulator",
-            address: acc.address
-          });
+          if (targetMode === "simulator") {
+            accounts.set(name, {
+              name,
+              kind: "synthetic",
+              executionMode: "simulator",
+              address: acc.address
+            });
+          }
         } else {
           if (!acc.network) {
             throw new AccountNetworkMismatchError({ expected: "known network", actual: "undefined", detail: "in keystore.json" });

package/dist/{dev-accounts-K5TPW2TH.js → dev-accounts-F7LATHCT.js}

@@ -4,9 +4,9 @@ import {
   ensureDevAccounts,
   getOrCreateDevAccount,
   listDevAccountsSync
-} from "./chunk-SYYYAEO7.js";
+} from "./chunk-7U2IIXLY.js";
 import "./chunk-R5P3WIWR.js";
-import "./chunk-AVTGARCA.js";
+import "./chunk-YBNHOFVX.js";
 import "./chunk-6DPO5V3N.js";
 import "./chunk-YLG2NIAU.js";
 export {

package/dist/index.d.ts

@@ -151,10 +151,11 @@ declare class SimulatedSigner implements HardkasSigner {
 interface ResolveAccountOptions {
     nameOrAddress: string;
     config?: HardkasConfig | undefined;
+    executionTarget?: _hardkas_core.HardkasExecutionTarget | undefined;
 }
 declare function resolveHardkasAccount(options: ResolveAccountOptions): HardkasAccount;
 declare function assertAccountCompatible(account: HardkasAccount, target: _hardkas_core.HardkasExecutionTarget): void;
-declare function listHardkasAccounts(config?: HardkasConfig): HardkasAccount[];
+declare function listHardkasAccounts(config?: HardkasConfig, executionTarget?: _hardkas_core.HardkasExecutionTarget): HardkasAccount[];
 declare function resolveHardkasAccountAddress(accountOrAddress: string, config?: HardkasConfig, context?: "L1" | "L2"): Promise<string>;
 declare function describeAccount(account: HardkasAccount): Record<string, unknown>;
 

package/dist/index.js

@@ -6,7 +6,7 @@ import {
   ensureDevAccounts,
   getOrCreateDevAccount,
   listDevAccountsSync
-} from "./chunk-SYYYAEO7.js";
+} from "./chunk-7U2IIXLY.js";
 import "./chunk-R5P3WIWR.js";
 import {
   assertAccountCompatible,
@@ -28,7 +28,7 @@ import {
   validateAccountName,
   validateAddressNetwork,
   validateAddressPrefix
-} from "./chunk-AVTGARCA.js";
+} from "./chunk-YBNHOFVX.js";
 import {
   detectCapabilities,
   getKaspaSigningBackendStatus,
@@ -41,7 +41,7 @@ import {
   LazyAccountAuthorizer,
   PrivateKeyAuthorizer,
   StaticSignatureScriptAuthorizer
-} from "./chunk-EKQU22GY.js";
+} from "./chunk-EJK4QMPM.js";
 
 // src/simulated.ts
 var SimulatedSigner = class {
@@ -238,6 +238,7 @@ async function signTxPlanArtifact(input) {
 }
 
 // src/kaspa-sdk-keygen.ts
+import { getNetworkPrefix } from "@hardkas/core";
 var KaspaSdkKeyGenerator = class {
   networkId;
   sdkLoader;
@@ -268,7 +269,7 @@ var KaspaSdkKeyGenerator = class {
         const hex = randomBytes.toString("hex");
         const privKey = new sdk.PrivateKey(hex);
         const kp = privKey.toKeypair();
-        const address = kp.toAddress(network).toString();
+        const address = kp.toAddress(getNetworkPrefix(network)).toString();
         const privateKeyStr = typeof kp.privateKey === "object" ? hex : kp.privateKey;
         const publicKeyStr = typeof kp.publicKey === "object" ? kp.publicKey.toString() : kp.publicKey;
         if (typeof privateKeyStr !== "string" || !/^[0-9a-f]{64}$/i.test(privateKeyStr)) {
@@ -482,6 +483,7 @@ async function appendToKeystoreJson(workspaceRoot, alias, accountData) {
 // src/address-manager.ts
 import { createHash } from "crypto";
 import { createRequire } from "module";
+import { getNetworkPrefix as getNetworkPrefix2 } from "@hardkas/core";
 var require2 = createRequire(import.meta.url);
 function resolveChain(chain) {
   if (chain === "receive" || chain === 0) return 0;
@@ -516,7 +518,7 @@ var AddressManager = {
     try {
       const kaspa = require2("kaspa-wasm");
       const priv = new kaspa.PrivateKey(hash);
-      address = priv.toKeypair().toAddress(network).toString();
+      address = priv.toKeypair().toAddress(getNetworkPrefix2(network)).toString();
     } catch (e) {
       const prefix = network.includes("sim") ? "kaspasim" : "kaspatest";
       address = `${prefix}:q${hash.slice(0, 42)}`;

package/dist/{resolve-5JBZXBNN.js → resolve-5G6NEL62.js}

@@ -4,7 +4,7 @@ import {
   listHardkasAccounts,
   resolveHardkasAccount,
   resolveHardkasAccountAddress
-} from "./chunk-AVTGARCA.js";
+} from "./chunk-YBNHOFVX.js";
 export {
   assertAccountCompatible,
   describeAccount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hardkas/accounts",
-  "version": "0.12.0-rc.16",
+  "version": "0.12.0-rc.18",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,11 +24,11 @@
   "dependencies": {
     "hash-wasm": "^4.12.0",
     "kaspa-wasm": "0.13.0",
-    "@hardkas/artifacts": "0.12.0-rc.16",
-    "@hardkas/config": "0.12.0-rc.16",
-    "@hardkas/tx-builder": "0.12.0-rc.16",
-    "@hardkas/core": "0.12.0-rc.16",
-    "@hardkas/localnet": "0.12.0-rc.16"
+    "@hardkas/artifacts": "0.12.0-rc.18",
+    "@hardkas/core": "0.12.0-rc.18",
+    "@hardkas/config": "0.12.0-rc.18",
+    "@hardkas/tx-builder": "0.12.0-rc.18",
+    "@hardkas/localnet": "0.12.0-rc.18"
   },
   "devDependencies": {
     "tsup": "^8.3.5",