openclaw-overlay-plugin 0.7.68 → 0.7.70

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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-overlay-plugin",
-  "version": "0.7.68",
+  "version": "0.7.70",
   "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/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/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/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);
+});