openclaw-overlay-plugin 0.7.68 → 0.7.71

package/SKILL.md

@@ -1,10 +1,10 @@
 ---
-name: openclaw-overlay
+name: overlay
 description: >
   Connect to the BSV Overlay Network — a decentralized agent marketplace for
   discovering other AI agents and exchanging BSV micropayments for services.
   Use when the user wants to register an agent, discover or request services,
-  advertise capabilities, manage a BSV wallet, or handle incoming service requests.
+  advertise capabilities (via SHIP/SLAP), manage a BSV wallet, or handle incoming service requests.
 metadata: '{"openclaw": {"requires": {"bins": ["node"]}}}'
 ---
 
@@ -12,81 +12,62 @@ metadata: '{"openclaw": {"requires": {"bins": ["node"]}}}'
 
 | Action | Description |
 |--------|-------------|
+| `status` | **Recommended**: Show identity key, balance, network, and services |
 | `onboard` | One-step setup: wallet, address, funding check, register |
 | `request` | Auto-discover cheapest provider and request a service |
 | `discover` | List agents and services on the network |
 | `balance` | Show wallet balance |
-| `status` | Show identity, balance, and services |
 | `pay` | Direct payment to an agent |
-| `setup` | Initialize wallet |
-| `address` | Show receive address |
-| `import` | Import funded UTXO by txid |
+| `address` | Show receive address (network-aware) |
 | `register` | Register on overlay network |
 | `advertise` | Advertise a new service |
+| `advertise-ship` | Advertise a Topic Manager (SHIP protocol) |
+| `advertise-slap` | Advertise a Lookup Service (SLAP protocol) |
 | `readvertise` | Update service pricing/name/description |
 | `remove` | Remove an advertised service |
 | `services` | List our advertised services |
-| `send` | Send direct message to agent |
-| `inbox` | Check incoming messages |
-| `refund` | Sweep wallet to external address |
 | `pending-requests` | Check pending incoming service requests |
 | `fulfill` | Fulfill a pending service request |
+| `setup` | Initialize wallet |
+| `import` | Import funded UTXO by txid |
 | `unregister` | Remove agent from network (destructive, requires confirmation) |
-| `remove-service` | Remove a service from network (destructive, requires confirmation) |
 
-## Onboarding
+## Network Support
 
-On first run, the plugin auto-creates a wallet and wakes you. Guide the user through setup as a conversation:
+The plugin is network-aware and supports:
+- **`mainnet`**: Production network (Babbage tracker: `https://overlay.babbage.systems`)
+- **`testnet`**: Testing network (Babbage tracker: `https://testnet-users.bapp.dev`)
+- **`local`**: Local development (default tracker: `http://localhost:8080`)
 
-1. **Ask for agent name**: "What name do you want for your agent on the network?"
-2. **Ask for description**: "Describe what your agent does in 1-2 sentences."
-3. **Show funding address**: `openclaw_overlay({ action: "address" })` — explain minimum 1,000 sats
-4. **After funding**: `openclaw_overlay({ action: "onboard", agentName: "...", agentDescription: "..." })`
-5. **Ask which services to offer**: Present the list from the onboard response, let user pick
-6. **Advertise selected**: `openclaw_overlay({ action: "advertise", ... })` for each
+Addresses and WIFs will automatically use the correct prefix ('1' for mainnet, 'm'/'n' for testnet).
 
-If you need to customize settings, tell the user to add them to their config under `plugins.entries["openclaw-overlay-plugin"]`:
-```json
-{
-  "plugins": {
-    "entries": {
-      "openclaw-overlay-plugin": {
-        "agentName": "...",
-        "overlayUrl": "..."
-      }
-    }
-  }
-}
-```
+## Onboarding & Setup
 
-Do NOT use defaults without asking. Do NOT skip the name/description questions.
+1. **Check Status**: `overlay({ action: "status" })`
+2. **Initialize**: If not setup, ask for agent name/description.
+3. **Show Address**: `overlay({ action: "address" })` — explain minimum 1,000 sats
+4. **Fund & Onboard**: Once funded, `overlay({ action: "onboard" })`
+5. **Advertise**: `overlay({ action: "advertise", serviceId: "...", name: "...", priceSats: 500 })`
 
-## Requesting Services
+## Discovery & Services
 
-Use `openclaw_overlay({ action: "request", service: "<id>", input: {...} })` to auto-discover the cheapest provider, pay, and send the request. The response arrives asynchronously via the background WebSocket service — you'll be woken when it comes back.
-
-Set `maxPrice` to cap spending. Requests within `maxAutoPaySats` (default 200) auto-pay.
+- **Find services**: `overlay({ action: "discover", service: "tell-joke" })`
+- **Request service**: `overlay({ action: "request", service: "tell-joke", input: { topic: "tech" } })`
+- **Advertise Infrastructure**:
+    - SHIP: `overlay({ action: "advertise-ship", domain: "https://my-node.com", topic: "tm_openclaw_identity" })`
+    - SLAP: `overlay({ action: "advertise-slap", domain: "https://my-node.com", service: "ls_openclaw_agents" })`
 
 ## Fulfilling Requests
 
-The background service queues incoming requests and wakes you automatically.
-
-1. `openclaw_overlay({ action: "pending-requests" })` — see what needs handling
-2. Process each request using your full capabilities
-3. `openclaw_overlay({ action: "fulfill", requestId: "...", recipientKey: "...", serviceId: "...", result: {...} })` — send response
-
-Always fulfill promptly — requesters have already paid.
-
-## Spending Rules
+Incoming requests are queued and you'll be woken automatically.
 
-- **Auto-pay**: Requests under `maxAutoPaySats` (default 200 sats) pay automatically
-- **Budget**: Daily spending capped at `dailyBudgetSats` (default 1,000 sats/day)
-- **Over limit**: Returns an error — get user confirmation before retrying with `maxPrice`
-- **Destructive actions** (`unregister`, `remove-service`): Require a two-step confirmation token
+1. `overlay({ action: "pending-requests" })` — see what needs handling
+2. Process the request payload.
+3. `overlay({ action: "fulfill", requestId: "...", recipientKey: "...", serviceId: "...", result: {...} })`
 
-## References
+## Spending & Security
 
-- [Service catalog and input schemas](references/services.md)
-- [Configuration, environment variables, and CLI commands](references/configuration.md)
-- [Wallet operations, funding, budget, and import details](references/wallet-operations.md)
-- [Overlay protocol specification](references/protocol.md)
+- **Auto-pay**: Requests under `maxAutoPaySats` (default 200 sats) pay automatically.
+- **Budget**: Daily spending is capped (default 5,000 sats/day).
+- **Destructive actions**: `unregister` requires a two-step confirmation token.
+- **Privacy**: Private keys are stored locally in `~/.openclaw/bsv-wallet`. Never share `wallet-identity.json`.

package/dist/index.js

@@ -302,7 +302,7 @@ function getCliPath() {
  * Decentralized agent marketplace with BSV micropayments.
  */
 export const plugin = {
-    id: "openclaw-overlay-plugin",
+    id: "overlay",
     name: "BSV Overlay Network",
     description: "OpenClaw Overlay — decentralized agent marketplace with BSV micropayments",
     async activate(api) {
@@ -313,7 +313,7 @@ export const plugin = {
             return;
         isInitialized = true;
         const entries = api.getConfig?.()?.plugins?.entries || {};
-        const entry = entries['openclaw-overlay-plugin'] || entries['openclaw-overlay'] || {};
+        const entry = entries['overlay'] || entries['openclaw-overlay-plugin'] || entries['openclaw-overlay'] || {};
         const pluginConfig = { ...entry, ...(entry.config || {}), ...(api.config || {}) };
         // 1. Tool
         api.registerTool({
@@ -322,8 +322,10 @@ export const plugin = {
             parameters: {
                 type: "object",
                 properties: {
-                    action: { type: "string", enum: ["request", "discover", "balance", "status", "pay", "onboard", "pending-requests", "fulfill", "unregister"] },
+                    action: { type: "string", enum: ["request", "discover", "balance", "status", "pay", "onboard", "pending-requests", "fulfill", "unregister", "advertise-ship", "advertise-slap"] },
                     service: { type: "string" },
+                    topic: { type: "string" },
+                    domain: { type: "string" },
                     input: { type: "object" },
                     identityKey: { type: "string" },
                     sats: { type: "number" },
@@ -353,10 +355,29 @@ export const plugin = {
                 try {
                     const action = ctx.args?.[0] || 'status';
                     if (action === 'help') {
-                        return { text: `🛰️ **Overlay Help**\n\n**Subcommands**:\n- \`status\`: Show identity and wallet balance\n- \`balance\`: Show current satoshis\n- \`onboard\`: Start discovery setup\n- \`discover <serviceId>\`: Find providers on network\n- \`pending-requests\`: See incoming service jobs\n- \`fulfill\`: Complete a request (Agent only)` };
+                        return { text: `🛰️ **Overlay Help**\n\n**Subcommands**:\n- \`status\`: Show identity and wallet balance\n- \`balance\`: Show current satoshis\n- \`onboard\`: Start discovery setup\n- \`discover <serviceId>\`: Find providers on network\n- \`advertise-ship <domain> <topic>\`: Advertise a topic manager\n- \`advertise-slap <domain> <service>\`: Advertise a lookup service\n- \`pending-requests\`: See incoming service jobs\n- \`fulfill\`: Complete a request (Agent only)` };
                     }
-                    const result = await executeOverlayAction({ action }, pluginConfig, api);
-                    return { text: `**Overlay ${action.toUpperCase()}**\n\n${typeof result === 'string' ? result : JSON.stringify(result, null, 2)}` };
+                    const params = { action };
+                    if (action === 'discover') {
+                        params.service = ctx.args[1];
+                    }
+                    else if (action === 'advertise-ship') {
+                        params.domain = ctx.args[1];
+                        params.topic = ctx.args[2];
+                    }
+                    else if (action === 'advertise-slap') {
+                        params.domain = ctx.args[1];
+                        params.service = ctx.args[2];
+                    }
+                    const result = await executeOverlayAction(params, pluginConfig, api);
+                    if (typeof result === 'string')
+                        return { text: result };
+                    // Formatted status response
+                    if (action === 'status') {
+                        const status = result;
+                        return { text: `🛰️ **Overlay Status**\n\n**Identity Key**: \`${status.identity?.identityKey || 'Not setup'}\`\n**Balance**: ${status.balance?.walletBalance || 0} satoshis\n**Network**: ${status.identity?.network || 'mainnet'}` };
+                    }
+                    return { text: `**Overlay ${action.toUpperCase()}**\n\n${JSON.stringify(result, null, 2)}` };
                 }
                 catch (error) {
                     return { text: `❌ Error: ${error.message}` };
@@ -404,9 +425,21 @@ async function executeOverlayAction(params, config, api) {
         case "onboard": return await handleOnboard(params, env, cliPath);
         case "pending-requests": return await handlePendingRequests(env, cliPath);
         case "fulfill": return await handleFulfill(params, env, cliPath);
+        case "advertise-ship": return await handleAdvertiseSHIP(params, env, cliPath);
+        case "advertise-slap": return await handleAdvertiseSLAP(params, env, cliPath);
         default: throw new Error(`Unknown action: ${action}`);
     }
 }
+async function handleAdvertiseSHIP(params, env, cliPath) {
+    const { domain, topic } = params;
+    const result = await execFileAsync('node', [cliPath, 'advertise-ship', domain, topic], { env });
+    return parseCliOutput(result.stdout).data;
+}
+async function handleAdvertiseSLAP(params, env, cliPath) {
+    const { domain, service } = params;
+    const result = await execFileAsync('node', [cliPath, 'advertise-slap', domain, service], { env });
+    return parseCliOutput(result.stdout).data;
+}
 async function handleServiceRequest(params, env, cliPath, config, api) {
     const { service, identityKey: targetKey, input } = params;
     const walletDir = config?.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');

package/dist/src/cli-main.js

@@ -6,7 +6,7 @@
  */
 import { ok, fail } from './scripts/output.js';
 // Wallet commands
-import { cmdSetup, cmdIdentity, cmdAddress } from './scripts/wallet/setup.js';
+import { cmdSetup, cmdIdentity, cmdAddress, cmdStatus } from './scripts/wallet/setup.js';
 import { cmdBalance, cmdImport, cmdRefund } from './scripts/wallet/balance.js';
 // Overlay registration commands
 import { cmdRegister, cmdUnregister } from './scripts/overlay/registration.js';
@@ -14,6 +14,7 @@ import { cmdRegister, cmdUnregister } from './scripts/overlay/registration.js';
 import { cmdServices, cmdAdvertise, cmdRemove, cmdReadvertise } from './scripts/overlay/services.js';
 // Discovery commands
 import { cmdDiscover } from './scripts/overlay/discover.js';
+import { cmdAdvertiseSHIP, cmdAdvertiseSLAP } from './scripts/overlay/advertisement.js';
 // Payment commands
 import { cmdPay, cmdVerify, cmdAccept } from './scripts/payment/commands.js';
 // Messaging commands
@@ -43,7 +44,7 @@ async function main() {
                         wallet: ['setup', 'identity', 'address', 'balance', 'import <txid> [vout]', 'refund <address>'],
                         registration: ['register', 'unregister'],
                         services: ['services', 'advertise <id> <name> <priceSats> [desc]', 'readvertise <id> [name] [priceSats] [desc]', 'remove <id>'],
-                        discovery: ['discover [--service <type>] [--agent <name>]'],
+                        discovery: ['discover [--service <type>] [--agent <name>]', 'advertise-ship <domain> <topic>', 'advertise-slap <domain> <service>'],
                         payments: ['pay <pubkey> <sats> [desc]', 'verify <beef>', 'accept <beef> <prefix> <suffix> <senderKey> [desc]'],
                         messaging: ['send <key> <type> <json>', 'inbox', 'ack', 'poll', 'connect'],
                         'service-requests': ['request-service <key> <serviceId> <sats> [input]', 'service-queue', 'respond-service <reqId> <key> <serviceId> <result>'],
@@ -54,6 +55,9 @@ async function main() {
                 });
                 break;
             // Wallet
+            case 'status':
+                await cmdStatus();
+                break;
             case 'setup':
                 await cmdSetup();
                 break;
@@ -96,6 +100,12 @@ async function main() {
             case 'discover':
                 await cmdDiscover(args);
                 break;
+            case 'advertise-ship':
+                await cmdAdvertiseSHIP(args[0], args[1]);
+                break;
+            case 'advertise-slap':
+                await cmdAdvertiseSLAP(args[0], args[1]);
+                break;
             // Payments
             case 'pay':
                 await cmdPay(args[0], args[1], args.slice(2).join(' ') || undefined);

package/dist/src/scripts/baemail/commands.js

@@ -4,7 +4,8 @@ import os from 'node:os';
 import fs from 'node:fs';
 import process from 'node:process';
 import { ok, fail } from '../output.js';
-import { loadIdentity } from '../wallet/identity.js';
+import { loadIdentity, deriveWalletAddress } from '../wallet/identity.js';
+import { NETWORK } from '../config.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 // Define paths relative to home directory
@@ -172,7 +173,7 @@ export async function cmdBaemailRefund(requestId) {
         return fail('Refund already processed for this request');
     }
     // Load wallet and SDK
-    const { identityKey, privKey } = await loadIdentity();
+    const { identityKey, privKey: rootKey } = await loadIdentity();
     const walletIdentityRaw = fs.readFileSync(PATHS.walletIdentity, 'utf-8');
     const walletIdentity = JSON.parse(walletIdentityRaw);
     // Dynamic import SDK
@@ -191,20 +192,20 @@ export async function cmdBaemailRefund(requestId) {
     }
     // Derive refund address from sender's identity key
     const senderPubKey = PublicKey.fromString(entry.from);
-    const refundAddress = senderPubKey.toAddress().toString();
+    const refundAddress = senderPubKey.toAddress(NETWORK).toString();
     try {
-        // Load UTXOs
-        const address = walletIdentity.address;
-        const utxosResp = await fetchWithTimeout(`https://api.whatsonchain.com/v1/bsv/main/address/${address}/unspent/all`);
+        // Load UTXOs - Derive local address correctly
+        const { address } = await deriveWalletAddress(rootKey);
+        const wocNet = NETWORK === 'mainnet' ? 'main' : 'test';
+        const utxosResp = await fetchWithTimeout(`https://api.whatsonchain.com/v1/bsv/${wocNet}/address/${address}/unspent/all`);
         const data = await utxosResp.json();
         const utxos = data.result || [];
         if (!utxos || utxos.length === 0) {
-            return fail('No UTXOs available for refund');
+            return fail(`No UTXOs available for refund at ${address}`);
         }
         // Build transaction
         const tx = new Transaction();
         let totalInput = 0;
-        const rootKey = PrivateKey.fromHex(walletIdentity.rootKeyHex);
         for (const utxo of utxos) {
             if (totalInput >= refundSats + 50)
                 break;
@@ -212,7 +213,7 @@ export async function cmdBaemailRefund(requestId) {
                 sourceTXID: utxo.tx_hash,
                 sourceOutputIndex: utxo.tx_pos,
                 sourceSatoshis: utxo.value,
-                script: new P2PKH().lock(rootKey.toPublicKey().toAddress()).toHex(),
+                script: new P2PKH().lock(rootKey.toPublicKey().toAddress(NETWORK)).toHex(),
                 unlockingScriptTemplate: new P2PKH().unlock(rootKey),
             });
             totalInput += utxo.value;
@@ -231,7 +232,7 @@ export async function cmdBaemailRefund(requestId) {
         if (change > 1) {
             tx.addOutput({
                 satoshis: change,
-                lockingScript: new P2PKH().lock(rootKey.toPublicKey().toAddress()),
+                lockingScript: new P2PKH().lock(rootKey.toPublicKey().toAddress(NETWORK)),
             });
         }
         await tx.sign();
@@ -246,7 +247,7 @@ export async function cmdBaemailRefund(requestId) {
             });
         }
         else {
-            broadcastResp = await fetchWithTimeout('https://api.whatsonchain.com/v1/bsv/main/tx/raw', {
+            broadcastResp = await fetchWithTimeout(`https://api.whatsonchain.com/v1/bsv/${wocNet}/tx/raw`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({ txhex: tx.toHex() }),

package/dist/src/scripts/config.d.ts

@@ -22,7 +22,11 @@ export declare const TOPICS: {
     readonly IDENTITY: "tm_openclaw_identity";
     readonly SERVICES: "tm_openclaw_services";
     readonly X_VERIFICATION: "tm_openclaw_x_verification";
+    readonly SHIP: "tm_ship";
+    readonly SLAP: "tm_slap";
 };
+/** Default SLAP trackers */
+export declare const DEFAULT_SLAP_TRACKERS: Record<'mainnet' | 'testnet', string[]>;
 /** Lookup services for overlay queries */
 export declare const LOOKUP_SERVICES: {
     readonly AGENTS: "ls_openclaw_agents";

package/dist/src/scripts/config.js

@@ -42,6 +42,13 @@ export const TOPICS = {
     IDENTITY: 'tm_openclaw_identity',
     SERVICES: 'tm_openclaw_services',
     X_VERIFICATION: 'tm_openclaw_x_verification',
+    SHIP: 'tm_ship',
+    SLAP: 'tm_slap',
+};
+/** Default SLAP trackers */
+export const DEFAULT_SLAP_TRACKERS = {
+    mainnet: ['https://overlay.babbage.systems'],
+    testnet: ['https://testnet-users.bapp.dev'],
 };
 /** Lookup services for overlay queries */
 export const LOOKUP_SERVICES = {

package/dist/src/scripts/overlay/advertisement.d.ts

@@ -0,0 +1,16 @@
+/**
+ * SHIP and SLAP advertisement commands.
+ *
+ * SHIP: Service Health & Information Protocol (tm_ship)
+ * SLAP: Service Level Agreement Protocol (tm_slap)
+ */
+/**
+ * Advertise a SHIP record.
+ * Announce that you host a specific Topic Manager (tm_).
+ */
+export declare function cmdAdvertiseSHIP(domain?: string, topic?: string): Promise<never>;
+/**
+ * Advertise a SLAP record.
+ * Announce that you host a specific Lookup Service (ls_).
+ */
+export declare function cmdAdvertiseSLAP(domain?: string, service?: string): Promise<never>;

package/dist/src/scripts/overlay/advertisement.js

@@ -0,0 +1,122 @@
+/**
+ * SHIP and SLAP advertisement commands.
+ *
+ * SHIP: Service Health & Information Protocol (tm_ship)
+ * SLAP: Service Level Agreement Protocol (tm_slap)
+ */
+import { PushDrop, Utils } from '@bsv/sdk';
+import { NETWORK, WALLET_DIR, TOPICS, DEFAULT_SLAP_TRACKERS } from '../config.js';
+import { BSVAgentWallet } from '../../core/wallet.js';
+import { ok, fail } from '../output.js';
+/**
+ * Advertise a SHIP record.
+ * Announce that you host a specific Topic Manager (tm_).
+ */
+export async function cmdAdvertiseSHIP(domain, topic) {
+    if (!domain || !topic) {
+        return fail('Usage: advertise-ship <domain> <topic>');
+    }
+    if (!topic.startsWith('tm_')) {
+        return fail('Topic must start with "tm_"');
+    }
+    try {
+        const wallet = await BSVAgentWallet.load({ network: NETWORK, storageDir: WALLET_DIR });
+        const token = new PushDrop(wallet._setup.wallet);
+        // SHIP format: Payload is the domain hosting the topic
+        const fields = [Utils.toArray(domain, 'utf8')];
+        // Context is [0, topic] to identify the topic manager being advertised
+        const lockingScript = (await token.lock(fields, [0, topic], '1', 'self', true, true)).toHex();
+        const response = await wallet._setup.wallet.createAction({
+            description: `advertise SHIP for ${topic}`,
+            outputs: [{
+                    lockingScript,
+                    satoshis: 1,
+                    outputDescription: 'SHIP advertisement',
+                    basket: TOPICS.SHIP
+                }]
+        });
+        // Broadcast to primary overlay and SLAP trackers
+        const trackers = [
+            ...DEFAULT_SLAP_TRACKERS[NETWORK]
+        ];
+        const results = await broadcastToTrackers(response.tx, [TOPICS.SHIP, topic], trackers);
+        return ok({
+            advertised: 'SHIP',
+            topic,
+            domain,
+            txid: response.txid,
+            broadcasts: results
+        });
+    }
+    catch (err) {
+        return fail(`SHIP advertisement failed: ${err.message}`);
+    }
+}
+/**
+ * Advertise a SLAP record.
+ * Announce that you host a specific Lookup Service (ls_).
+ */
+export async function cmdAdvertiseSLAP(domain, service) {
+    if (!domain || !service) {
+        return fail('Usage: advertise-slap <domain> <service>');
+    }
+    if (!service.startsWith('ls_')) {
+        return fail('Service must start with "ls_"');
+    }
+    try {
+        const wallet = await BSVAgentWallet.load({ network: NETWORK, storageDir: WALLET_DIR });
+        const token = new PushDrop(wallet._setup.wallet);
+        // SLAP format: Payload is the domain hosting the lookup service
+        const fields = [Utils.toArray(domain, 'utf8')];
+        // Context is [0, service] to identify the lookup service being advertised
+        const lockingScript = (await token.lock(fields, [0, service], '1', 'self', true, true)).toHex();
+        const response = await wallet._setup.wallet.createAction({
+            description: `advertise SLAP for ${service}`,
+            outputs: [{
+                    lockingScript,
+                    satoshis: 1,
+                    outputDescription: 'SLAP advertisement',
+                    basket: TOPICS.SLAP
+                }]
+        });
+        // Broadcast to primary overlay and SLAP trackers
+        const trackers = [
+            ...DEFAULT_SLAP_TRACKERS[NETWORK]
+        ];
+        const results = await broadcastToTrackers(response.tx, [TOPICS.SLAP, service], trackers);
+        return ok({
+            advertised: 'SLAP',
+            service,
+            domain,
+            txid: response.txid,
+            broadcasts: results
+        });
+    }
+    catch (err) {
+        return fail(`SLAP advertisement failed: ${err.message}`);
+    }
+}
+/**
+ * Helper to broadcast BEEF to multiple trackers/overlays.
+ */
+async function broadcastToTrackers(tx, topics, trackers) {
+    const results = {};
+    const body = new Uint8Array(tx);
+    for (const url of trackers) {
+        try {
+            const resp = await fetch(`${url.replace(/\/$/, '')}/submit`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/octet-stream',
+                    'X-Topics': JSON.stringify(topics)
+                },
+                body
+            });
+            results[url] = resp.ok ? 'success' : `error: ${resp.status}`;
+        }
+        catch (err) {
+            results[url] = `failed: ${err.message}`;
+        }
+    }
+    return results;
+}

package/dist/src/scripts/wallet/identity.d.ts

@@ -47,7 +47,7 @@ export declare function verifyRelaySignature(fromKey: string, to: string, type:
  *
  * Use deriveWalletKeys() to get both the address and signing key.
  */
-export declare function deriveWalletAddress(privKey: any): Promise<{
+export declare function deriveWalletAddress(privKey: any, network?: string): Promise<{
     address: string;
     hash160: Uint8Array;
     pubKey: any;
@@ -60,9 +60,10 @@ export declare function deriveWalletAddress(privKey: any): Promise<{
  * root private key - it will cause signature verification failures!
  *
  * @param rootPrivKey - Root private key from wallet identity
+ * @param network - Optional network override
  * @returns Object with address, hash160, and CHILD private key for signing
  */
-export declare function deriveWalletKeys(rootPrivKey: any): Promise<{
+export declare function deriveWalletKeys(rootPrivKey: any, network?: string): Promise<{
     address: string;
     hash160: Uint8Array;
     pubKey: any;

package/dist/src/scripts/wallet/identity.js

@@ -2,7 +2,7 @@
  * Wallet identity helpers.
  */
 import fs from 'node:fs';
-import { PATHS } from '../config.js';
+import { PATHS, NETWORK } from '../config.js';
 import { CachedKeyDeriver, Utils } from '@bsv/sdk';
 import { brc29ProtocolID } from '@bsv/wallet-toolbox';
 // Dynamic import for @bsv/sdk
@@ -119,10 +119,10 @@ export async function verifyRelaySignature(fromKey, to, type, payload, signature
  *
  * Use deriveWalletKeys() to get both the address and signing key.
  */
-export async function deriveWalletAddress(privKey) {
+export async function deriveWalletAddress(privKey, network = NETWORK) {
     const keyDeriver = new CachedKeyDeriver(privKey);
     const pubKey = keyDeriver.derivePublicKey(brc29ProtocolID, Utils.toBase64(Utils.toArray('import')) + ' ' + Utils.toBase64(Utils.toArray('now')), 'self', true);
-    const address = pubKey.toAddress();
+    const address = pubKey.toAddress(network);
     const hash160 = Buffer.from(pubKey.toHash());
     return { address, hash160, pubKey };
 }
@@ -134,9 +134,10 @@ export async function deriveWalletAddress(privKey) {
  * root private key - it will cause signature verification failures!
  *
  * @param rootPrivKey - Root private key from wallet identity
+ * @param network - Optional network override
  * @returns Object with address, hash160, and CHILD private key for signing
  */
-export async function deriveWalletKeys(rootPrivKey) {
+export async function deriveWalletKeys(rootPrivKey, network = NETWORK) {
     const keyDeriver = new CachedKeyDeriver(rootPrivKey);
     const derivationPrefix = Utils.toBase64(Utils.toArray('import'));
     const derivationSuffix = Utils.toBase64(Utils.toArray('now'));
@@ -145,7 +146,7 @@ export async function deriveWalletKeys(rootPrivKey) {
     const childPrivKey = keyDeriver.derivePrivateKey(brc29ProtocolID, keyString, 'self');
     // Derive child public key (for address)
     const pubKey = keyDeriver.derivePublicKey(brc29ProtocolID, keyString, 'self', true);
-    const address = pubKey.toAddress();
+    const address = pubKey.toAddress(network);
     const hash160 = Buffer.from(pubKey.toHash());
     return { address, hash160, pubKey, childPrivKey };
 }

package/dist/src/scripts/wallet/setup.d.ts

@@ -9,6 +9,10 @@ export declare function cmdSetup(): Promise<never>;
  * Identity command: show identity public key.
  */
 export declare function cmdIdentity(): Promise<never>;
+/**
+ * Status command: show identity and balance.
+ */
+export declare function cmdStatus(): Promise<never>;
 /**
  * Address command: show P2PKH receive address.
  */

package/dist/src/scripts/wallet/setup.js

@@ -83,6 +83,20 @@ export async function cmdIdentity() {
     await wallet.destroy();
     return ok({ identityKey });
 }
+/**
+ * Status command: show identity and balance.
+ */
+export async function cmdStatus() {
+    const BSVAgentWallet = await getBSVAgentWallet();
+    const wallet = await BSVAgentWallet.load({ network: NETWORK, storageDir: WALLET_DIR });
+    const identityKey = await wallet.getIdentityKey();
+    const total = await wallet.getBalance();
+    await wallet.destroy();
+    return ok({
+        identity: { identityKey, network: NETWORK },
+        balance: { walletBalance: total }
+    });
+}
 /**
  * Address command: show P2PKH receive address.
  */

package/dist/src/test/network-address.test.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Unit tests for network-specific address generation.
+ *
+ * These tests verify that address generation correctly uses the specified
+ * network prefix (mainnet vs testnet).
+ *
+ * Run: npx tsx src/test/network-address.test.ts
+ */
+export {};

package/dist/src/test/network-address.test.js

@@ -0,0 +1,37 @@
+/**
+ * Unit tests for network-specific address generation.
+ *
+ * These tests verify that address generation correctly uses the specified
+ * network prefix (mainnet vs testnet).
+ *
+ * Run: npx tsx src/test/network-address.test.ts
+ */
+import { PrivateKey } from '@bsv/sdk';
+import { deriveWalletAddress } from '../scripts/wallet/identity.js';
+async function assert(condition, message) {
+    if (!condition) {
+        throw new Error(`Assertion failed: ${message}`);
+    }
+}
+async function runTests() {
+    console.log('🧪 Running Network Address Generation Tests...\n');
+    const privKey = PrivateKey.fromRandom();
+    // Test 1: Mainnet Address Generation
+    console.log('✓ Test 1: Mainnet address starts with 1');
+    const mainnet = await deriveWalletAddress(privKey, 'mainnet');
+    console.log(`  Mainnet: ${mainnet.address}`);
+    await assert(mainnet.address.startsWith('1'), 'Mainnet address should start with 1');
+    // Test 2: Testnet Address Generation
+    console.log('✓ Test 2: Testnet address starts with m or n');
+    const testnet = await deriveWalletAddress(privKey, 'testnet');
+    console.log(`  Testnet: ${testnet.address}`);
+    await assert(testnet.address.startsWith('m') || testnet.address.startsWith('n'), 'Testnet address should start with m or n');
+    // Test 3: Addresses are different
+    console.log('✓ Test 3: Mainnet and testnet addresses for same key are different');
+    await assert(mainnet.address !== testnet.address, 'Addresses should be different across networks');
+    console.log('\n✅ All network address tests passed!\n');
+}
+runTests().catch((err) => {
+    console.error('\n❌ Tests failed:', err.message);
+    process.exit(1);
+});

package/index.ts

@@ -314,7 +314,7 @@ function getCliPath() {
  * Decentralized agent marketplace with BSV micropayments.
  */
 export const plugin = {
-  id: "openclaw-overlay-plugin",
+  id: "overlay",
   name: "BSV Overlay Network",
   description: "OpenClaw Overlay — decentralized agent marketplace with BSV micropayments",
   
@@ -327,7 +327,7 @@ export const plugin = {
     isInitialized = true;
 
     const entries = api.getConfig?.()?.plugins?.entries || {};
-    const entry = entries['openclaw-overlay-plugin'] || entries['openclaw-overlay'] || {};
+    const entry = entries['overlay'] || entries['openclaw-overlay-plugin'] || entries['openclaw-overlay'] || {};
     const pluginConfig = { ...entry, ...(entry.config || {}), ...(api.config || {}) };
 
     // 1. Tool
@@ -337,8 +337,10 @@ export const plugin = {
       parameters: {
         type: "object",
         properties: {
-          action: { type: "string", enum: ["request", "discover", "balance", "status", "pay", "onboard", "pending-requests", "fulfill", "unregister"] },
+          action: { type: "string", enum: ["request", "discover", "balance", "status", "pay", "onboard", "pending-requests", "fulfill", "unregister", "advertise-ship", "advertise-slap"] },
           service: { type: "string" },
+          topic: { type: "string" },
+          domain: { type: "string" },
           input: { type: "object" },
           identityKey: { type: "string" },
           sats: { type: "number" },
@@ -369,11 +371,31 @@ export const plugin = {
           const action = ctx.args?.[0] || 'status';
 
           if (action === 'help') {
-            return { text: `🛰️ **Overlay Help**\n\n**Subcommands**:\n- \`status\`: Show identity and wallet balance\n- \`balance\`: Show current satoshis\n- \`onboard\`: Start discovery setup\n- \`discover <serviceId>\`: Find providers on network\n- \`pending-requests\`: See incoming service jobs\n- \`fulfill\`: Complete a request (Agent only)` };
+            return { text: `🛰️ **Overlay Help**\n\n**Subcommands**:\n- \`status\`: Show identity and wallet balance\n- \`balance\`: Show current satoshis\n- \`onboard\`: Start discovery setup\n- \`discover <serviceId>\`: Find providers on network\n- \`advertise-ship <domain> <topic>\`: Advertise a topic manager\n- \`advertise-slap <domain> <service>\`: Advertise a lookup service\n- \`pending-requests\`: See incoming service jobs\n- \`fulfill\`: Complete a request (Agent only)` };
           }
 
-          const result = await executeOverlayAction({ action }, pluginConfig, api);
-          return { text: `**Overlay ${action.toUpperCase()}**\n\n${typeof result === 'string' ? result : JSON.stringify(result, null, 2)}` };
+          const params: any = { action };
+          if (action === 'discover') {
+            params.service = ctx.args[1];
+          } else if (action === 'advertise-ship') {
+            params.domain = ctx.args[1];
+            params.topic = ctx.args[2];
+          } else if (action === 'advertise-slap') {
+            params.domain = ctx.args[1];
+            params.service = ctx.args[2];
+          }
+
+          const result = await executeOverlayAction(params, pluginConfig, api);
+          
+          if (typeof result === 'string') return { text: result };
+          
+          // Formatted status response
+          if (action === 'status') {
+            const status = result as any;
+            return { text: `🛰️ **Overlay Status**\n\n**Identity Key**: \`${status.identity?.identityKey || 'Not setup'}\`\n**Balance**: ${status.balance?.walletBalance || 0} satoshis\n**Network**: ${status.identity?.network || 'mainnet'}` };
+          }
+
+          return { text: `**Overlay ${action.toUpperCase()}**\n\n${JSON.stringify(result, null, 2)}` };
         } catch (error: any) {
           return { text: `❌ Error: ${error.message}` };
         }
@@ -425,10 +447,24 @@ async function executeOverlayAction(params: any, config: any, api: any) {
     case "onboard": return await handleOnboard(params, env, cliPath);
     case "pending-requests": return await handlePendingRequests(env, cliPath);
     case "fulfill": return await handleFulfill(params, env, cliPath);
+    case "advertise-ship": return await handleAdvertiseSHIP(params, env, cliPath);
+    case "advertise-slap": return await handleAdvertiseSLAP(params, env, cliPath);
     default: throw new Error(`Unknown action: ${action}`);
   }
 }
 
+async function handleAdvertiseSHIP(params: any, env: any, cliPath: string) {
+  const { domain, topic } = params;
+  const result = await execFileAsync('node', [cliPath, 'advertise-ship', domain, topic], { env });
+  return parseCliOutput(result.stdout).data;
+}
+
+async function handleAdvertiseSLAP(params: any, env: any, cliPath: string) {
+  const { domain, service } = params;
+  const result = await execFileAsync('node', [cliPath, 'advertise-slap', domain, service], { env });
+  return parseCliOutput(result.stdout).data;
+}
+
 async function handleServiceRequest(params: any, env: any, cliPath: string, config: any, api: any) {
   const { service, identityKey: targetKey, input } = params;
   const walletDir = config?.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');

package/openclaw.plugin.json

@@ -1,8 +1,8 @@
 {
-  "id": "openclaw-overlay-plugin",
+  "id": "overlay",
   "name": "BSV Overlay Network",
   "description": "OpenClaw Overlay — decentralized agent marketplace with BSV micropayments",
-  "version": "0.7.67",
+  "version": "0.7.70",
   "skills": [
     "./SKILL.md"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-overlay-plugin",
-  "version": "0.7.68",
+  "version": "0.7.71",
   "description": "Openclaw BSV Overlay — agent discovery, service marketplace, and micropayments on the BSV blockchain",
   "publishConfig": {
     "access": "public"
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@bsv/sdk": "^2.0.13",
-    "@bsv/wallet-toolbox": "^2.1.17",
+    "@bsv/wallet-toolbox": "^2.1.18",
     "dotenv": "^17.3.1",
-    "knex": "^3.2.8",
+    "knex": "^3.2.9",
     "sqlite3": "^5.1.7"
   },
   "devDependencies": {

package/src/cli-main.ts

@@ -8,7 +8,7 @@
 import { ok, fail } from './scripts/output.js';
 
 // Wallet commands
-import { cmdSetup, cmdIdentity, cmdAddress } from './scripts/wallet/setup.js';
+import { cmdSetup, cmdIdentity, cmdAddress, cmdStatus } from './scripts/wallet/setup.js';
 import { cmdBalance, cmdImport, cmdRefund } from './scripts/wallet/balance.js';
 
 // Overlay registration commands
@@ -19,6 +19,7 @@ import { cmdServices, cmdAdvertise, cmdRemove, cmdReadvertise } from './scripts/
 
 // Discovery commands
 import { cmdDiscover } from './scripts/overlay/discover.js';
+import { cmdAdvertiseSHIP, cmdAdvertiseSLAP } from './scripts/overlay/advertisement.js';
 
 // Payment commands
 import { cmdPay, cmdVerify, cmdAccept } from './scripts/payment/commands.js';
@@ -69,7 +70,7 @@ async function main() {
             wallet: ['setup', 'identity', 'address', 'balance', 'import <txid> [vout]', 'refund <address>'],
             registration: ['register', 'unregister'],
             services: ['services', 'advertise <id> <name> <priceSats> [desc]', 'readvertise <id> [name] [priceSats] [desc]', 'remove <id>'],
-            discovery: ['discover [--service <type>] [--agent <name>]'],
+            discovery: ['discover [--service <type>] [--agent <name>]', 'advertise-ship <domain> <topic>', 'advertise-slap <domain> <service>'],
             payments: ['pay <pubkey> <sats> [desc]', 'verify <beef>', 'accept <beef> <prefix> <suffix> <senderKey> [desc]'],
             messaging: ['send <key> <type> <json>', 'inbox', 'ack', 'poll', 'connect'],
             'service-requests': ['request-service <key> <serviceId> <sats> [input]', 'service-queue', 'respond-service <reqId> <key> <serviceId> <result>'],
@@ -81,6 +82,9 @@ async function main() {
         break;
 
       // Wallet
+      case 'status':
+        await cmdStatus();
+        break;
       case 'setup':
         await cmdSetup();
         break;
@@ -126,6 +130,12 @@ async function main() {
       case 'discover':
         await cmdDiscover(args);
         break;
+      case 'advertise-ship':
+        await cmdAdvertiseSHIP(args[0], args[1]);
+        break;
+      case 'advertise-slap':
+        await cmdAdvertiseSLAP(args[0], args[1]);
+        break;
 
       // Payments
       case 'pay':

package/src/scripts/baemail/commands.ts

@@ -5,7 +5,8 @@ import fs from 'node:fs';
 import process from 'node:process';
 import { Buffer } from 'node:buffer';
 import { ok, fail } from '../output.js';
-import { loadIdentity } from '../wallet/identity.js';
+import { loadIdentity, deriveWalletAddress } from '../wallet/identity.js';
+import { NETWORK } from '../config.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -186,7 +187,7 @@ export async function cmdBaemailRefund(requestId: string | undefined): Promise<n
   }
 
   // Load wallet and SDK
-  const { identityKey, privKey } = await loadIdentity();
+  const { identityKey, privKey: rootKey } = await loadIdentity();
   const walletIdentityRaw = fs.readFileSync(PATHS.walletIdentity, 'utf-8');
   const walletIdentity = JSON.parse(walletIdentityRaw);
 
@@ -208,23 +209,23 @@ export async function cmdBaemailRefund(requestId: string | undefined): Promise<n
 
   // Derive refund address from sender's identity key
   const senderPubKey = PublicKey.fromString(entry.from);
-  const refundAddress = senderPubKey.toAddress().toString();
+  const refundAddress = senderPubKey.toAddress(NETWORK).toString();
 
   try {
-    // Load UTXOs
-    const address = walletIdentity.address;
-    const utxosResp = await fetchWithTimeout(`https://api.whatsonchain.com/v1/bsv/main/address/${address}/unspent/all`);
+    // Load UTXOs - Derive local address correctly
+    const { address } = await deriveWalletAddress(rootKey);
+    const wocNet = NETWORK === 'mainnet' ? 'main' : 'test';
+    const utxosResp = await fetchWithTimeout(`https://api.whatsonchain.com/v1/bsv/${wocNet}/address/${address}/unspent/all`);
     const data = await utxosResp.json();
     const utxos = data.result || [];
 
     if (!utxos || utxos.length === 0) {
-      return fail('No UTXOs available for refund');
+      return fail(`No UTXOs available for refund at ${address}`);
     }
 
     // Build transaction
     const tx = new Transaction();
     let totalInput = 0;
-    const rootKey = PrivateKey.fromHex(walletIdentity.rootKeyHex);
 
     for (const utxo of utxos) {
       if (totalInput >= refundSats + 50) break;
@@ -232,7 +233,7 @@ export async function cmdBaemailRefund(requestId: string | undefined): Promise<n
         sourceTXID: utxo.tx_hash,
         sourceOutputIndex: utxo.tx_pos,
         sourceSatoshis: utxo.value,
-        script: new P2PKH().lock(rootKey.toPublicKey().toAddress()).toHex(),
+        script: new P2PKH().lock(rootKey.toPublicKey().toAddress(NETWORK)).toHex(),
         unlockingScriptTemplate: new P2PKH().unlock(rootKey),
       });
       totalInput += utxo.value;
@@ -254,7 +255,7 @@ export async function cmdBaemailRefund(requestId: string | undefined): Promise<n
     if (change > 1) {
       tx.addOutput({
         satoshis: change,
-        lockingScript: new P2PKH().lock(rootKey.toPublicKey().toAddress()),
+        lockingScript: new P2PKH().lock(rootKey.toPublicKey().toAddress(NETWORK)),
       });
     }
 
@@ -271,7 +272,7 @@ export async function cmdBaemailRefund(requestId: string | undefined): Promise<n
         body: JSON.stringify({ rawTx: tx.toHex() }),
       });
     } else {
-      broadcastResp = await fetchWithTimeout('https://api.whatsonchain.com/v1/bsv/main/tx/raw', {
+      broadcastResp = await fetchWithTimeout(`https://api.whatsonchain.com/v1/bsv/${wocNet}/tx/raw`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ txhex: tx.toHex() }),

package/src/scripts/config.ts

@@ -53,8 +53,16 @@ export const TOPICS = {
   IDENTITY: 'tm_openclaw_identity',
   SERVICES: 'tm_openclaw_services',
   X_VERIFICATION: 'tm_openclaw_x_verification',
+  SHIP: 'tm_ship',
+  SLAP: 'tm_slap',
 } as const;
 
+/** Default SLAP trackers */
+export const DEFAULT_SLAP_TRACKERS: Record<'mainnet' | 'testnet', string[]> = {
+  mainnet: ['https://overlay.babbage.systems'],
+  testnet: ['https://testnet-users.bapp.dev'],
+};
+
 /** Lookup services for overlay queries */
 export const LOOKUP_SERVICES = {
   AGENTS: 'ls_openclaw_agents',

package/src/scripts/overlay/advertisement.ts

@@ -0,0 +1,138 @@
+/**
+ * SHIP and SLAP advertisement commands.
+ * 
+ * SHIP: Service Health & Information Protocol (tm_ship)
+ * SLAP: Service Level Agreement Protocol (tm_slap)
+ */
+
+import { PushDrop, Utils } from '@bsv/sdk';
+import { NETWORK, WALLET_DIR, TOPICS, DEFAULT_SLAP_TRACKERS } from '../config.js';
+import { BSVAgentWallet } from '../../core/wallet.js';
+import { ok, fail } from '../output.js';
+
+/**
+ * Advertise a SHIP record.
+ * Announce that you host a specific Topic Manager (tm_).
+ */
+export async function cmdAdvertiseSHIP(domain?: string, topic?: string): Promise<never> {
+  if (!domain || !topic) {
+    return fail('Usage: advertise-ship <domain> <topic>');
+  }
+
+  if (!topic.startsWith('tm_')) {
+    return fail('Topic must start with "tm_"');
+  }
+
+  try {
+    const wallet = await BSVAgentWallet.load({ network: NETWORK, storageDir: WALLET_DIR });
+    const token = new PushDrop(wallet._setup.wallet);
+    
+    // SHIP format: Payload is the domain hosting the topic
+    const fields = [Utils.toArray(domain, 'utf8')];
+    // Context is [0, topic] to identify the topic manager being advertised
+    const lockingScript = (await token.lock(fields, [0, topic], '1', 'self', true, true)).toHex();
+
+    const response = await wallet._setup.wallet.createAction({
+      description: `advertise SHIP for ${topic}`,
+      outputs: [{
+        lockingScript,
+        satoshis: 1,
+        outputDescription: 'SHIP advertisement',
+        basket: TOPICS.SHIP
+      }]
+    });
+
+    // Broadcast to primary overlay and SLAP trackers
+    const trackers = [
+      ...DEFAULT_SLAP_TRACKERS[NETWORK]
+    ];
+
+    const results = await broadcastToTrackers(response.tx as number[], [TOPICS.SHIP, topic], trackers);
+
+    return ok({
+      advertised: 'SHIP',
+      topic,
+      domain,
+      txid: response.txid,
+      broadcasts: results
+    });
+  } catch (err: any) {
+    return fail(`SHIP advertisement failed: ${err.message}`);
+  }
+}
+
+/**
+ * Advertise a SLAP record.
+ * Announce that you host a specific Lookup Service (ls_).
+ */
+export async function cmdAdvertiseSLAP(domain?: string, service?: string): Promise<never> {
+  if (!domain || !service) {
+    return fail('Usage: advertise-slap <domain> <service>');
+  }
+
+  if (!service.startsWith('ls_')) {
+    return fail('Service must start with "ls_"');
+  }
+
+  try {
+    const wallet = await BSVAgentWallet.load({ network: NETWORK, storageDir: WALLET_DIR });
+    const token = new PushDrop(wallet._setup.wallet);
+    
+    // SLAP format: Payload is the domain hosting the lookup service
+    const fields = [Utils.toArray(domain, 'utf8')];
+    // Context is [0, service] to identify the lookup service being advertised
+    const lockingScript = (await token.lock(fields, [0, service], '1', 'self', true, true)).toHex();
+
+    const response = await wallet._setup.wallet.createAction({
+      description: `advertise SLAP for ${service}`,
+      outputs: [{
+        lockingScript,
+        satoshis: 1,
+        outputDescription: 'SLAP advertisement',
+        basket: TOPICS.SLAP
+      }]
+    });
+
+    // Broadcast to primary overlay and SLAP trackers
+    const trackers = [
+      ...DEFAULT_SLAP_TRACKERS[NETWORK]
+    ];
+
+    const results = await broadcastToTrackers(response.tx as number[], [TOPICS.SLAP, service], trackers);
+
+    return ok({
+      advertised: 'SLAP',
+      service,
+      domain,
+      txid: response.txid,
+      broadcasts: results
+    });
+  } catch (err: any) {
+    return fail(`SLAP advertisement failed: ${err.message}`);
+  }
+}
+
+/**
+ * Helper to broadcast BEEF to multiple trackers/overlays.
+ */
+async function broadcastToTrackers(tx: number[], topics: string[], trackers: string[]) {
+  const results: Record<string, any> = {};
+  const body = new Uint8Array(tx);
+
+  for (const url of trackers) {
+    try {
+      const resp = await fetch(`${url.replace(/\/$/, '')}/submit`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/octet-stream',
+          'X-Topics': JSON.stringify(topics)
+        },
+        body
+      });
+      results[url] = resp.ok ? 'success' : `error: ${resp.status}`;
+    } catch (err: any) {
+      results[url] = `failed: ${err.message}`;
+    }
+  }
+  return results;
+}

package/src/scripts/wallet/identity.ts

@@ -3,7 +3,7 @@
  */
 
 import fs from 'node:fs';
-import { PATHS } from '../config.js';
+import { PATHS, NETWORK } from '../config.js';
 import type { WalletIdentity } from '../types.js';
 import { CachedKeyDeriver, Utils } from '@bsv/sdk';
 import { brc29ProtocolID } from '@bsv/wallet-toolbox';
@@ -139,7 +139,7 @@ export async function verifyRelaySignature(
  * 
  * Use deriveWalletKeys() to get both the address and signing key.
  */
-export async function deriveWalletAddress(privKey: any): Promise<{
+export async function deriveWalletAddress(privKey: any, network: string = NETWORK): Promise<{
   address: string;
   hash160: Uint8Array;
   pubKey: any;
@@ -153,7 +153,7 @@ export async function deriveWalletAddress(privKey: any): Promise<{
     true
   );
 
-  const address = pubKey.toAddress();
+  const address = pubKey.toAddress(network);
   const hash160 = Buffer.from(pubKey.toHash());
 
   return { address, hash160, pubKey };
@@ -167,9 +167,10 @@ export async function deriveWalletAddress(privKey: any): Promise<{
  * root private key - it will cause signature verification failures!
  * 
  * @param rootPrivKey - Root private key from wallet identity
+ * @param network - Optional network override
  * @returns Object with address, hash160, and CHILD private key for signing
  */
-export async function deriveWalletKeys(rootPrivKey: any): Promise<{
+export async function deriveWalletKeys(rootPrivKey: any, network: string = NETWORK): Promise<{
   address: string;
   hash160: Uint8Array;
   pubKey: any;
@@ -196,7 +197,7 @@ export async function deriveWalletKeys(rootPrivKey: any): Promise<{
     true
   );
 
-  const address = pubKey.toAddress();
+  const address = pubKey.toAddress(network);
   const hash160 = Buffer.from(pubKey.toHash());
 
   return { address, hash160, pubKey, childPrivKey };

package/src/scripts/wallet/setup.ts

@@ -97,6 +97,22 @@ export async function cmdIdentity(): Promise<never> {
   return ok({ identityKey });
 }
 
+/**
+ * Status command: show identity and balance.
+ */
+export async function cmdStatus(): Promise<never> {
+  const BSVAgentWallet = await getBSVAgentWallet();
+  const wallet = await BSVAgentWallet.load({ network: NETWORK, storageDir: WALLET_DIR });
+  const identityKey = await wallet.getIdentityKey();
+  const total = await wallet.getBalance();
+  await wallet.destroy();
+
+  return ok({
+    identity: { identityKey, network: NETWORK },
+    balance: { walletBalance: total }
+  });
+}
+
 /**
  * Address command: show P2PKH receive address.
  */

package/src/test/network-address.test.ts

@@ -0,0 +1,46 @@
+/**
+ * Unit tests for network-specific address generation.
+ * 
+ * These tests verify that address generation correctly uses the specified
+ * network prefix (mainnet vs testnet).
+ * 
+ * Run: npx tsx src/test/network-address.test.ts
+ */
+
+import { PrivateKey } from '@bsv/sdk';
+import { deriveWalletAddress } from '../scripts/wallet/identity.js';
+
+async function assert(condition: boolean, message: string) {
+  if (!condition) {
+    throw new Error(`Assertion failed: ${message}`);
+  }
+}
+
+async function runTests() {
+  console.log('🧪 Running Network Address Generation Tests...\n');
+
+  const privKey = PrivateKey.fromRandom();
+  
+  // Test 1: Mainnet Address Generation
+  console.log('✓ Test 1: Mainnet address starts with 1');
+  const mainnet = await deriveWalletAddress(privKey, 'mainnet');
+  console.log(`  Mainnet: ${mainnet.address}`);
+  await assert(mainnet.address.startsWith('1'), 'Mainnet address should start with 1');
+
+  // Test 2: Testnet Address Generation
+  console.log('✓ Test 2: Testnet address starts with m or n');
+  const testnet = await deriveWalletAddress(privKey, 'testnet');
+  console.log(`  Testnet: ${testnet.address}`);
+  await assert(testnet.address.startsWith('m') || testnet.address.startsWith('n'), 'Testnet address should start with m or n');
+
+  // Test 3: Addresses are different
+  console.log('✓ Test 3: Mainnet and testnet addresses for same key are different');
+  await assert(mainnet.address !== testnet.address, 'Addresses should be different across networks');
+
+  console.log('\n✅ All network address tests passed!\n');
+}
+
+runTests().catch((err) => {
+  console.error('\n❌ Tests failed:', err.message);
+  process.exit(1);
+});