@clawlabz/clawnetwork 0.1.22 → 0.1.24

package/index.ts

@@ -7,7 +7,7 @@ declare function setInterval(fn: () => void, ms: number): unknown
 declare function clearInterval(id: unknown): void
 declare function fetch(url: string, init?: Record<string, unknown>): Promise<{ status: number; ok: boolean; text: () => Promise<string>; json: () => Promise<unknown> }>
 
-const VERSION = '0.1.22'
+const VERSION = '0.1.24'
 const PLUGIN_ID = 'clawnetwork'
 const GITHUB_REPO = 'clawlabz/claw-network'
 const DEFAULT_RPC_PORT = 9710
@@ -139,7 +139,8 @@ function homePath(...segments: string[]): string {
 
 const WORKSPACE_DIR = path.join(getBaseDir(), 'workspace', 'clawnetwork')
 const BIN_DIR = path.join(getBaseDir(), 'bin')
-const DATA_DIR = homePath('.clawnetwork')
+// Plugin uses its own chain data dir under workspace to avoid locking conflicts with other nodes
+const DATA_DIR = path.join(getBaseDir(), 'workspace', 'clawnetwork', 'chain-data')
 const WALLET_PATH = path.join(WORKSPACE_DIR, 'wallet.json')
 const LOG_PATH = path.join(WORKSPACE_DIR, 'node.log')
 const UI_PORT_FILE = path.join(getBaseDir(), 'clawnetwork-ui-port')
@@ -363,7 +364,8 @@ function initNode(binaryPath: string, network: string, api: OpenClawApi): void {
   }
   api.logger?.info?.(`[clawnetwork] initializing node for ${network}...`)
   try {
-    const output = execFileSync(binaryPath, ['init', '--network', network], {
+    ensureDir(DATA_DIR)
+    const output = execFileSync(binaryPath, ['init', '--network', network, '--data-dir', DATA_DIR], {
       encoding: 'utf8',
       timeout: 30_000,
       env: { HOME: os.homedir(), PATH: process.env.PATH || '' }, // minimal env
@@ -528,10 +530,10 @@ function findAvailablePorts(rpcPort: number, p2pPort: number, api: OpenClawApi):
     rpc++
   }
 
-  // Find available P2P port
+  // Find available P2P port (must also differ from RPC port)
   for (let i = 0; i < MAX_TRIES; i++) {
-    if (!isPortInUse(p2p)) break
-    api.logger?.info?.(`[clawnetwork] P2P port ${p2p} in use, trying ${p2p + 1}...`)
+    if (!isPortInUse(p2p) && p2p !== rpc) break
+    api.logger?.info?.(`[clawnetwork] P2P port ${p2p} in use or conflicts with RPC, trying ${p2p + 1}...`)
     p2p++
   }
 
@@ -613,7 +615,7 @@ function startNodeProcess(binaryPath: string, cfg: PluginConfig, api: OpenClawAp
   activeRpcPort = ports.rpcPort
   activeP2pPort = ports.p2pPort
 
-  const args = ['start', '--network', cfg.network, '--rpc-port', String(ports.rpcPort), '--p2p-port', String(ports.p2pPort), '--sync-mode', cfg.syncMode, '--allow-genesis']
+  const args = ['start', '--network', cfg.network, '--rpc-port', String(ports.rpcPort), '--p2p-port', String(ports.p2pPort), '--sync-mode', cfg.syncMode, '--data-dir', DATA_DIR, '--allow-genesis']
 
   // Add bootstrap peers: built-in for the network + user-configured extra peers
   const peers = [...(BOOTSTRAP_PEERS[cfg.network] ?? []), ...cfg.extraBootstrapPeers]
@@ -1518,6 +1520,7 @@ const OC_PID_FILE = path.join(OC_WORKSPACE, 'node.pid');
 const OC_CONFIG_PATH = path.join(OC_WORKSPACE, 'config.json');
 const OC_STOP_SIGNAL = path.join(OC_WORKSPACE, 'stop.signal');
 const OC_LOG_PATH_DEFAULT = path.join(OC_WORKSPACE, 'node.log');
+const OC_DATA_DIR = path.join(OC_WORKSPACE, 'chain-data');
 
 const PORT = parseInt(process.argv[2] || '19877', 10);
 const RPC_PORT = parseInt(process.argv[3] || '9710', 10);
@@ -1784,7 +1787,7 @@ async function handle(req, res) {
         } catch {}
         const bootstrapPeers = { mainnet: ['/ip4/178.156.162.162/tcp/9711', '/ip4/39.102.144.231/tcp/9711'], testnet: ['/ip4/178.156.162.162/tcp/9721', '/ip4/39.102.144.231/tcp/9721'], devnet: [] };
         const peers = [...(bootstrapPeers[network] || []), ...extraPeers];
-        const args = ['start', '--network', network, '--rpc-port', String(RPC_PORT), '--p2p-port', String(p2pPort), '--sync-mode', syncMode, '--allow-genesis'];
+        const args = ['start', '--network', network, '--rpc-port', String(RPC_PORT), '--p2p-port', String(p2pPort), '--sync-mode', syncMode, '--data-dir', OC_DATA_DIR, '--allow-genesis'];
         for (const peer of peers) { args.push('--bootstrap', peer); }
         // Spawn detached
         const logPath = OC_LOG_PATH_DEFAULT;
@@ -1867,7 +1870,7 @@ async function handle(req, res) {
         } catch {}
         const bootstrapPeers = { mainnet: ['/ip4/178.156.162.162/tcp/9711', '/ip4/39.102.144.231/tcp/9711'], testnet: ['/ip4/178.156.162.162/tcp/9721', '/ip4/39.102.144.231/tcp/9721'], devnet: [] };
         const peers = [...(bootstrapPeers[network] || []), ...extraPeers];
-        const args = ['start', '--network', network, '--rpc-port', String(RPC_PORT), '--p2p-port', String(p2pPort), '--sync-mode', syncMode, '--allow-genesis'];
+        const args = ['start', '--network', network, '--rpc-port', String(RPC_PORT), '--p2p-port', String(p2pPort), '--sync-mode', syncMode, '--data-dir', OC_DATA_DIR, '--allow-genesis'];
         for (const peer of peers) { args.push('--bootstrap', peer); }
         const logPath = OC_LOG_PATH_DEFAULT;
         const logFd = fs.openSync(logPath, 'a');
@@ -1982,7 +1985,7 @@ function startUiServer(cfg: PluginConfig, api: OpenClawApi): string | null {
   fs.writeFileSync(scriptPath, fullScript)
 
   try {
-    const child = fork(scriptPath, [String(cfg.uiPort), String(cfg.rpcPort), LOG_PATH], {
+    const child = fork(scriptPath, [String(cfg.uiPort), String(activeRpcPort ?? cfg.rpcPort), LOG_PATH], {
       detached: true,
       stdio: 'ignore',
     })

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "clawnetwork",
   "name": "ClawNetwork Node",
   "description": "Run a ClawNetwork blockchain node inside OpenClaw. Every agent is a node.",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawlabz/clawnetwork",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "Run a ClawNetwork blockchain node inside OpenClaw. Every agent is a blockchain node.",
   "type": "module",
   "license": "MIT",