wative-core 2.4.1 → 2.4.2

package/dist/{svm-B5q8YaV9.d.ts → svm-B51NevS8.d.ts}

@@ -1,4 +1,4 @@
-import { c as Address, G as SvmTxBuildParams, F as SvmTransaction } from './workspace-kq3QyAgm.js';
+import { c as Address, G as SvmTxBuildParams, F as SvmTransaction } from './workspace-CBxKR80D.js';
 
 interface SvmInstruction {
     readonly programId: string;

package/dist/{svm-CXFwmeMo.d.cts → svm-DswX6XRv.d.cts}

@@ -1,4 +1,4 @@
-import { c as Address, G as SvmTxBuildParams, F as SvmTransaction } from './workspace-kq3QyAgm.cjs';
+import { c as Address, G as SvmTxBuildParams, F as SvmTransaction } from './workspace-CBxKR80D.cjs';
 
 interface SvmInstruction {
     readonly programId: string;

package/dist/{workspace-kq3QyAgm.d.cts → workspace-CBxKR80D.d.cts}

@@ -622,7 +622,8 @@ declare class Account {
         after: number;
         dropped: number;
     }>;
-    importPrivateKey(pk: string, vm: ChainVM): Promise<Wallet>;
+    
+    importPrivateKey(pk: string, vm?: ChainVM): Promise<Wallet>;
     drop(): Promise<void>;
     
     filterAddress(network: NetworkLike, addr?: string): Address | null;

package/dist/{workspace-kq3QyAgm.d.ts → workspace-CBxKR80D.d.ts}

@@ -622,7 +622,8 @@ declare class Account {
         after: number;
         dropped: number;
     }>;
-    importPrivateKey(pk: string, vm: ChainVM): Promise<Wallet>;
+    
+    importPrivateKey(pk: string, vm?: ChainVM): Promise<Wallet>;
     drop(): Promise<void>;
     
     filterAddress(network: NetworkLike, addr?: string): Address | null;

package/examples/03-pk-account.test.cjs

@@ -1,4 +1,18 @@
 // 03 — PK account flows. Heterogeneous private keys, one wallet per import.
+//
+// Two things worth noticing as you read:
+//
+//   * `vm` is optional. The key formats do not overlap — 64 hex characters for
+//     EVM, 80–96 base58 (or a solana-keygen JSON array) for Solana — so the
+//     chain is read off the key. Pass it anyway when you want the mismatch to
+//     be an error rather than an inference.
+//
+//   * One import gives you TWO addresses. The key signs on its own chain, and
+//     the same 32 secret bytes seed a keypair on the other one, so the wallet
+//     has an address on both. The chain you imported for stays first.
+//     ⚠️ One secret controls both addresses. That is different from an HD
+//     account, where a slot's two addresses come from two derivation paths and
+//     are independent keys.
 
 const test = require("node:test");
 const assert = require("node:assert");
@@ -10,6 +24,16 @@ const { Workspace } = require("wative-core");
 
 const EVM_PK = "0x4f3edf983ac636a65a842ce7c78d9aa706d3b113bce9c46f30d7d21715b23b1d";
 const SVM_PK = "xtGWcHvQsr5ue8zG2F5fm31bW8vyn597Y92gUWaZZg3S1Z6FeJMATL8KU3xJMGbLfALnokcct9y5wYtCRrwNXZW";
+// A second Solana key, base58 of its 64-byte secret key.
+const SVM_PK_2 = "gaiC7Rnf9J6tV3SGwJyzvMDdz9RMmreSWZDyDK682MUKZHaWdZbbqgf35qD7FSwXka2Rf2o4MuhbWQTg82W9mbV";
+// A third, in the shape `solana-keygen` writes: the 64 secret-key bytes as
+// JSON. This is literally the contents of ~/.config/solana/id.json.
+const SVM_KEYGEN_BYTES = [
+  51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+  51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+  23, 203, 121, 251, 43, 65, 32, 242, 177, 236, 101, 228, 25, 141, 110, 8,
+  178, 142, 129, 63, 235, 1, 228, 164, 0, 131, 155, 133, 225, 128, 128, 206,
+];
 
 test("PK account — create from EVM key + import a Solana key", async () => {
   const root = mkdtempSync(join(tmpdir(), "wative-pk-"));
@@ -24,11 +48,52 @@ test("PK account — create from EVM key + import a Solana key", async () => {
   );
   assert.strictEqual(acc.organizationType, "PK");
   assert.strictEqual(acc.wallets.length, 1);
+  // The chain the key is for comes first; its sibling follows.
   assert.strictEqual(acc.wallets[0].addresses[0].vm, "evm");
+  assert.strictEqual(acc.wallets[0].addresses[1].vm, "svm");
 
   await acc.importPrivateKey(SVM_PK, "svm");
   assert.strictEqual(acc.wallets.length, 2);
   assert.strictEqual(acc.wallets[1].addresses[0].vm, "svm");
+  assert.strictEqual(acc.wallets[1].addresses[1].vm, "evm");
+
+  await ws.lock();
+});
+
+// The three ways you are likely to be holding a private key, and what each
+// one does without being told which chain it belongs to.
+test("PK account — the key formats importPrivateKey accepts", async () => {
+  const root = mkdtempSync(join(tmpdir(), "wative-pk-fmt-"));
+  const ws = await Workspace.open({ path: root, password: "wsp-pwd" });
+  const acc = await ws.accounts.create("Formats", "wsp-pwd", EVM_PK, undefined, { kind: "PK" });
+
+  // 1. EVM: 32 bytes of hex, 0x-prefix optional. No vm argument needed.
+  const evm = await acc.importPrivateKey(
+    "0x6cbed15c793ce57650b9877cf6fa156fbef513c4e6134f022a85b1ffdd59b2a1",
+  );
+  assert.strictEqual(evm.addresses[0].vm, "evm");
+
+  // 2. Solana: base58 of the 64-byte secret key.
+  const svm = await acc.importPrivateKey(SVM_PK_2);
+  assert.strictEqual(svm.addresses[0].vm, "svm");
+
+  // 3. Solana: the JSON byte array `solana-keygen` writes to id.json. This is
+  //    what you get from `cat ~/.config/solana/id.json`, usable as-is.
+  const fromKeygen = await acc.importPrivateKey(JSON.stringify(SVM_KEYGEN_BYTES));
+  assert.strictEqual(fromKeygen.addresses[0].vm, "svm");
+
+  // A value that is neither is refused rather than guessed at.
+  await assert.rejects(
+    acc.importPrivateKey("definitely-not-a-key"),
+    (err) => err.code === "INVALID_PRIVATE_KEY",
+  );
+
+  // So is 32 bytes of hex that is not a valid secp256k1 scalar — being the
+  // right length is not the same as being a key.
+  await assert.rejects(
+    acc.importPrivateKey("0x" + "0".repeat(64), "evm"),
+    (err) => err.code === "INVALID_PRIVATE_KEY",
+  );
 
   await ws.lock();
 });

package/examples/README.md

@@ -33,7 +33,7 @@ All tests work fully offline — no RPC calls, no real networks. Each test creat
 |---|---|
 | [01-quick-start.test.cjs](01-quick-start.test.cjs) | Open a workspace, create an HD account, derive 5 wallets, inspect EVM + Solana addresses, lock. |
 | [02-hd-account.test.cjs](02-hd-account.test.cjs) | HD-specific flows — deriving / slicing wallets, dumping the mnemonic, account-level passwords with `resetPassword`, round-trip across lock + reopen. |
-| [03-pk-account.test.cjs](03-pk-account.test.cjs) | PK accounts — creating from a private key, importing more keys (mix EVM + Solana under one account), duplicate-import rejection, dropping wallets. |
+| [03-pk-account.test.cjs](03-pk-account.test.cjs) | PK accounts — creating from a private key, importing more keys, and the three key formats accepted (EVM hex, Solana base58, `solana-keygen` JSON) with the chain inferred from the key. Also shows each import producing an address on both chains, duplicate-import rejection, and dropping wallets. |
 | [04-network-management.test.cjs](04-network-management.test.cjs) | The 10 pre-loaded networks, adding a brand-new network, overriding a pre-loaded RPC URL via `update()`, dropping user networks, the built-in protection guard. |
 | [05-asset-management.test.cjs](05-asset-management.test.cjs) | The 25 pre-loaded tokens, adding a custom user token, id collision rejection, contract-address collision rejection, dropping user tokens, `workspace.filter(q, "Asset")` search. |
 | [06-address-signing.test.cjs](06-address-signing.test.cjs) | Personal-message signing on EVM and Solana, building a transaction fully offline (no RPC). |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wative-core",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Hyperscale crypto wallet management library — multi-workspace, multi-chain, originally designed for on-chain market makers",
   "type": "module",
   "main": "./dist/index.node.cjs",