traderclaw-v1 1.0.3 → 1.0.4

package/bin/openclaw-trader.mjs

@@ -6,7 +6,7 @@ import { join } from "path";
 import { homedir } from "os";
 import { randomUUID, createPrivateKey, sign as cryptoSign } from "crypto";
 
-const VERSION = "2.0.0";
+const VERSION = "1.0.4";
 const PLUGIN_ID = "solana-trader";
 const CONFIG_DIR = join(homedir(), ".openclaw");
 const CONFIG_FILE = join(CONFIG_DIR, "openclaw.json");
@@ -138,6 +138,49 @@ function setPluginConfig(config, pluginConfig) {
   };
 }
 
+function extractWalletId(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return null;
+  if (typeof payload.id === "string" || typeof payload.id === "number") return String(payload.id);
+  if (typeof payload.walletId === "string" || typeof payload.walletId === "number") return String(payload.walletId);
+  if (payload.wallet && typeof payload.wallet === "object" && !Array.isArray(payload.wallet)) {
+    if (typeof payload.wallet.id === "string" || typeof payload.wallet.id === "number") return String(payload.wallet.id);
+    if (typeof payload.wallet.walletId === "string" || typeof payload.wallet.walletId === "number") return String(payload.wallet.walletId);
+  }
+  if (payload.data && typeof payload.data === "object" && !Array.isArray(payload.data)) {
+    if (typeof payload.data.id === "string" || typeof payload.data.id === "number") return String(payload.data.id);
+    if (typeof payload.data.walletId === "string" || typeof payload.data.walletId === "number") return String(payload.data.walletId);
+  }
+  return null;
+}
+
+function extractWalletKeys(payload) {
+  const scopes = [];
+  if (payload && typeof payload === "object" && !Array.isArray(payload)) {
+    scopes.push(payload);
+    if (payload.wallet && typeof payload.wallet === "object" && !Array.isArray(payload.wallet)) {
+      scopes.push(payload.wallet);
+    }
+    if (payload.data && typeof payload.data === "object" && !Array.isArray(payload.data)) {
+      scopes.push(payload.data);
+    }
+  }
+
+  const pick = (keys) => {
+    for (const scope of scopes) {
+      for (const key of keys) {
+        const val = scope[key];
+        if (typeof val === "string" && val.length > 0) return val;
+      }
+    }
+    return undefined;
+  };
+
+  return {
+    publicKey: pick(["walletPublicKey", "publicKey", "address"]),
+    privateKey: pick(["walletPrivateKey", "privateKey", "secretKey"]),
+  };
+}
+
 const BS58_CHARS = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 
 function b58Decode(str) {
@@ -334,6 +377,9 @@ async function cmdSetup(args) {
   let apiKey = "";
   let orchestratorUrl = "";
   let externalUserId = "";
+  let walletPrivateKey = "";
+  let showApiKey = false;
+  let showWalletPrivateKey = false;
   let doSignupFlow = false;
 
   for (let i = 0; i < args.length; i++) {
@@ -346,6 +392,15 @@ async function cmdSetup(args) {
     if ((args[i] === "--user-id") && args[i + 1]) {
       externalUserId = args[++i];
     }
+    if (args[i] === "--wallet-private-key" && args[i + 1]) {
+      walletPrivateKey = args[++i];
+    }
+    if (args[i] === "--show-api-key") {
+      showApiKey = true;
+    }
+    if (args[i] === "--show-wallet-private-key") {
+      showWalletPrivateKey = true;
+    }
     if (args[i] === "--signup") {
       doSignupFlow = true;
     }
@@ -376,6 +431,7 @@ async function cmdSetup(args) {
       apiKey = signupResult.apiKey;
       printSuccess(`  Signup successful!`);
       printInfo(`  API Key: ${maskKey(apiKey)}`);
+      if (showApiKey) printWarn(`  Full API Key: ${apiKey}`);
       printInfo(`  Tier: ${signupResult.tier}`);
       printInfo(`  Scopes: ${signupResult.scopes.join(", ")}`);
     } catch (err) {
@@ -398,6 +454,7 @@ async function cmdSetup(args) {
     apiTimeout: 30000,
     refreshToken: undefined,
     walletPublicKey: undefined,
+    walletPrivateKey: walletPrivateKey || undefined,
   };
 
   let sessionTokens;
@@ -437,6 +494,7 @@ async function cmdSetup(args) {
 
   let walletId = null;
   let walletLabel = "";
+  let createdNewWallet = false;
 
   try {
     const walletsRes = await httpRequest(`${orchestratorUrl}/api/wallets`, { accessToken });
@@ -453,11 +511,18 @@ async function cmdSetup(args) {
         walletLabel = await prompt("Wallet label", "Trading Wallet");
         const createRes = await httpRequest(`${orchestratorUrl}/api/wallet/create`, {
           method: "POST",
-          body: { label: walletLabel, strategyProfile: "aggressive" },
+          body: { label: walletLabel, strategyProfile: "aggressive", includePrivateKey: true },
           accessToken,
         });
         if (createRes.ok) {
-          walletId = createRes.data.id;
+          createdNewWallet = true;
+          walletId = extractWalletId(createRes.data);
+          if (!walletId) {
+            throw new Error(`Wallet create response missing wallet ID: ${JSON.stringify(createRes.data)}`);
+          }
+          const keys = extractWalletKeys(createRes.data);
+          if (keys.publicKey) pluginConfig.walletPublicKey = keys.publicKey;
+          if (keys.privateKey && !pluginConfig.walletPrivateKey) pluginConfig.walletPrivateKey = keys.privateKey;
           printSuccess(`  Wallet created (ID: ${walletId})`);
         } else {
           printError("Failed to create wallet");
@@ -467,12 +532,16 @@ async function cmdSetup(args) {
       } else {
         const idx = parseInt(choice, 10) - 1;
         if (idx >= 0 && idx < wallets.length) {
-          walletId = wallets[idx].id;
+          walletId = extractWalletId(wallets[idx]) || String(wallets[idx].id);
           walletLabel = wallets[idx].label || "Unnamed";
+          const keys = extractWalletKeys(wallets[idx]);
+          if (keys.publicKey) pluginConfig.walletPublicKey = keys.publicKey;
           printSuccess(`  Using wallet: ${walletLabel} (ID: ${walletId})`);
         } else {
-          walletId = wallets[0].id;
+          walletId = extractWalletId(wallets[0]) || String(wallets[0].id);
           walletLabel = wallets[0].label || "Unnamed";
+          const keys = extractWalletKeys(wallets[0]);
+          if (keys.publicKey) pluginConfig.walletPublicKey = keys.publicKey;
           printSuccess(`  Using wallet: ${walletLabel} (ID: ${walletId})`);
         }
       }
@@ -481,11 +550,18 @@ async function cmdSetup(args) {
       walletLabel = await prompt("Wallet label", "Trading Wallet");
       const createRes = await httpRequest(`${orchestratorUrl}/api/wallet/create`, {
         method: "POST",
-        body: { label: walletLabel, strategyProfile: "aggressive" },
+        body: { label: walletLabel, strategyProfile: "aggressive", includePrivateKey: true },
         accessToken,
       });
       if (createRes.ok) {
-        walletId = createRes.data.id;
+        createdNewWallet = true;
+        walletId = extractWalletId(createRes.data);
+        if (!walletId) {
+          throw new Error(`Wallet create response missing wallet ID: ${JSON.stringify(createRes.data)}`);
+        }
+        const keys = extractWalletKeys(createRes.data);
+        if (keys.publicKey) pluginConfig.walletPublicKey = keys.publicKey;
+        if (keys.privateKey && !pluginConfig.walletPrivateKey) pluginConfig.walletPrivateKey = keys.privateKey;
         printSuccess(`  Wallet created (ID: ${walletId})`);
       } else {
         printError("Failed to create wallet");
@@ -509,13 +585,39 @@ async function cmdSetup(args) {
 
   printSuccess(`  Config written to ${CONFIG_FILE}`);
 
+  if (createdNewWallet) {
+    print("\n" + "=".repeat(60));
+    printWarn("  IMPORTANT: New wallet credentials");
+    print("=".repeat(60));
+    print(`  Wallet Public Key:  ${pluginConfig.walletPublicKey || "not returned by API"}`);
+    if (pluginConfig.walletPrivateKey) {
+      printWarn(`  Wallet Private Key: ${pluginConfig.walletPrivateKey}`);
+      printWarn("  Save this private key now in a secure password manager.");
+      printWarn("  You may not be able to retrieve this private key again.");
+    } else {
+      printWarn("  Wallet private key was not returned by the API.");
+      printWarn("  If this is expected custody behavior, backup via your wallet provider.");
+    }
+
+    if (pluginConfig.walletPrivateKey) {
+      const ack = await prompt("Type BACKED_UP to continue", "");
+      if (ack !== "BACKED_UP") {
+        printError("Backup confirmation not provided. Aborting setup to prevent key loss.");
+        process.exit(1);
+      }
+      printSuccess("  Backup confirmation received.");
+    }
+  }
+
   print("\n" + "=".repeat(60));
   printSuccess("\n  Setup complete!\n");
   print("=".repeat(60));
   print(`
   Orchestrator:  ${orchestratorUrl}
   Wallet:        ${walletLabel} (ID: ${walletId})
-  API Key:       ${maskKey(apiKey)}
+  Wallet PubKey: ${pluginConfig.walletPublicKey || "not set"}
+  Wallet PrivKey:${pluginConfig.walletPrivateKey ? (createdNewWallet || showWalletPrivateKey ? " " + pluginConfig.walletPrivateKey : " " + maskKey(pluginConfig.walletPrivateKey)) : " not set"}
+  API Key:       ${showApiKey ? apiKey : maskKey(apiKey)}
   Session:       Active (tier: ${sessionTokens.session?.tier || "?"})
   Config:        ${CONFIG_FILE}
 `);
@@ -748,6 +850,7 @@ async function cmdConfig(subArgs) {
     print(`  API Key:          ${pluginConfig.apiKey ? maskKey(pluginConfig.apiKey) : "not set"}`);
     print(`  Refresh Token:    ${pluginConfig.refreshToken ? maskKey(pluginConfig.refreshToken) : "not set"}`);
     print(`  Wallet Pub Key:   ${pluginConfig.walletPublicKey || "not set"}`);
+    print(`  Wallet Priv Key:  ${pluginConfig.walletPrivateKey ? maskKey(pluginConfig.walletPrivateKey) : "not set"}`);
     print(`  API Timeout:      ${pluginConfig.apiTimeout || 30000}ms`);
     print("=".repeat(45));
     print("");
@@ -835,6 +938,9 @@ Setup options:
   --api-key, -k      API key (skip interactive prompt)
   --url, -u          Orchestrator URL (skip interactive prompt)
   --user-id          External user ID for signup
+  --wallet-private-key  Optional base58 private key for wallet proof flow
+  --show-api-key     Reveal full API key in setup output
+  --show-wallet-private-key  Reveal full wallet private key in setup output
   --signup           Force signup flow (create new account)
 
 Config subcommands:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "traderclaw-v1",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "TraderClaw V1 — autonomous Solana memecoin trading agent plugin for OpenClaw",
   "type": "module",
   "main": "./dist/index.js",