@unicitylabs/openclaw-unicity 0.5.4 → 0.5.6-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unicitylabs/openclaw-unicity",
-  "version": "0.5.4",
+  "version": "0.5.6-dev.1",
   "description": "Unicity wallet identity and encrypted DMs for OpenClaw agents — powered by Sphere SDK",
   "type": "module",
   "main": "src/index.ts",
@@ -44,7 +44,7 @@
   "dependencies": {
     "@clack/prompts": "^0.10.0",
     "@sinclair/typebox": "^0.34.48",
-    "@unicitylabs/sphere-sdk": "^0.5.4"
+    "@unicitylabs/sphere-sdk": "0.6.8-dev.2"
   },
   "peerDependencies": {
     "openclaw": "*"

package/src/channel.ts

@@ -244,16 +244,27 @@ export const unicityChannelPlugin = {
 
       // Track DM start time and seen IDs to skip historical replays from the relay.
       // The SDK fires onDirectMessage for every cached/replayed DM on connect.
-      const dmStartTime = Math.floor(Date.now() / 1000);
+      // msg.timestamp is milliseconds, so dmStartTime must be ms too.
+      const dmStartTime = Date.now();
       const seenDmIds = new Set<string>();
       const DM_SEEN_MAX = 1000;
 
       // Collect all known representations of "self" so we can detect echoed-back
-      // messages.  The SDK's built-in self-check compares transport pubkey against
-      // chainPubkey, but those may differ in format (33-byte compressed vs 32-byte
-      // x-only Nostr key), letting self-messages slip through.
+      // messages.  We must track BOTH the 33-byte compressed chainPubkey (02/03…)
+      // and the 32-byte x-only Nostr transport key (chainPubkey without prefix).
+      // The SDK's own self-check in CommunicationsModule has a bug where it
+      // compares transport pubkey (32-byte) against chainPubkey (33-byte), which
+      // never matches — so self-messages can leak through to dmHandlers.
       const selfPubkeys = new Set<string>();
-      if (sphere.identity?.chainPubkey) selfPubkeys.add(sphere.identity.chainPubkey);
+      if (sphere.identity?.chainPubkey) {
+        const cpk = sphere.identity.chainPubkey;
+        selfPubkeys.add(cpk);
+        // x-only transport key = compressed pubkey without the 02/03 prefix
+        if (cpk.length === 66 && (cpk.startsWith("02") || cpk.startsWith("03"))) {
+          selfPubkeys.add(cpk.slice(2));
+        }
+      }
+      // Also add the groupChat key (same value but grabbed independently for safety)
       const myNostrPubkey = sphere.groupChat?.getMyPublicKey?.() ?? null;
       if (myNostrPubkey) selfPubkeys.add(myNostrPubkey);
 

package/src/sphere.ts

@@ -116,6 +116,7 @@ async function doInitSphere(
     ...(existingMnemonic ? { mnemonic: existingMnemonic } : { autoGenerate: true }),
     ...(cfg.nametag ? { nametag: cfg.nametag } : {}),
     ...(groupChat ? { groupChat: groupChatRelays ? { relays: groupChatRelays } : true } : {}),
+    dmSince: Math.floor(Date.now() / 1000) - 86400,
   });
 
   sphereInstance = result.sphere;
@@ -133,8 +134,10 @@ async function doInitSphere(
   }
 
   // Register nametag if configured and wallet doesn't have one yet
-  const walletNametag = result.sphere.identity?.nametag;
-  if (cfg.nametag && !walletNametag) {
+  // Normalize: strip leading '@' for consistent comparison
+  const walletNametag = result.sphere.identity?.nametag?.replace(/^@/, "");
+  const cfgNametag = cfg.nametag?.replace(/^@/, "");
+  if (cfgNametag && !walletNametag) {
     try {
       await result.sphere.registerNametag(cfg.nametag);
       const log = logger ?? console;
@@ -148,11 +151,31 @@ async function doInitSphere(
         console.warn(msg);
       }
     }
-  } else if (cfg.nametag && walletNametag && cfg.nametag !== walletNametag) {
+  } else if (cfgNametag && walletNametag && cfgNametag !== walletNametag) {
+    // Nametag changed — check if another address in this wallet already owns it,
+    // otherwise derive a new HD address and mint the nametag there.
     const log = logger ?? console;
-    log.warn(
-      `[unicity] Config nametag '${cfg.nametag}' differs from wallet nametag '${walletNametag}'. Wallet nametag is used. To change nametag, create a new wallet.`,
-    );
+    try {
+      const activeAddresses = result.sphere.getActiveAddresses() as
+        { index: number; nametag?: string }[];
+      const existing = activeAddresses.find(
+        (a) => a.nametag?.replace(/^@/, "") === cfgNametag,
+      );
+      if (existing) {
+        log.info(`[unicity] Switching to existing address ${existing.index} for nametag '${cfg.nametag}'...`);
+        await result.sphere.switchToAddress(existing.index);
+        log.info(`[unicity] Switched to address ${existing.index} with nametag '${cfg.nametag}'.`);
+      } else {
+        const nextIndex = activeAddresses.length > 0
+          ? Math.max(...activeAddresses.map((a) => a.index)) + 1
+          : 1;
+        log.info(`[unicity] Minting nametag '${cfg.nametag}' on new address ${nextIndex}...`);
+        await result.sphere.switchToAddress(nextIndex, { nametag: cfg.nametag });
+        log.info(`[unicity] Switched to address ${nextIndex} with nametag '${cfg.nametag}'.`);
+      }
+    } catch (err) {
+      log.warn(`[unicity] Failed to switch address for nametag '${cfg.nametag}': ${err}`);
+    }
   }
 
   // Send greeting DM to owner on first wallet creation