Merge pull request #426 from ckb-devrel/develop

Merge 0.4.6 into master

Author: RetricSu

.changeset/dry-actors-open.md

@@ -0,0 +1,12 @@
+---
+'@offckb/cli': patch
+---
+
+Upgrade default CKB version from 0.201.0 to 0.205.0
+
+CKB v0.205.0 includes:
+
+- Terminal module for CKB-TUI
+- Proxy protocol support
+- RPC logs subscription
+- Rust toolchain upgrade to 1.92.0

.changeset/fix-privkey-prefix.md

@@ -0,0 +1,5 @@
+---
+"@offckb/cli": patch
+---
+
+fix(cli): standardize private key inputs and fix 0x prefix parsing error (#422)

.changeset/vast-ravens-invent.md

@@ -0,0 +1,16 @@
+---
+'@offckb/cli': patch
+---
+
+fix(create): ensure CKB binary and devnet config before generating scripts
+
+Fix issue #396 where `offckb create` failed if user hasn't run `offckb node` first.
+
+**Changes:**
+
+- Add imports for `installCKBBinary`, `initChainIfNeeded`, and `readSettings`
+- Call `installCKBBinary` to download CKB binary if not exists
+- Call `initChainIfNeeded` to initialize devnet config if not exists
+- Both calls happen before `genSystemScriptsJsonFile` to ensure dependencies are ready
+
+This makes `offckb create` self-sufficient and doesn't require prior `offckb node` execution.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",

pnpm-lock.yaml

@@ -62,7 +62,7 @@ export const defaultSettings: Settings = {
   proxy: undefined,
   bins: {
     rootFolder: path.resolve(dataPath, 'bins'),
-    defaultCKBVersion: '0.201.0',
+    defaultCKBVersion: '0.205.0',
     downloadPath: path.resolve(cachePath, 'download'),
   },
   devnet: {

src/cfg/setting.ts

@@ -6,6 +6,9 @@ import { InteractivePrompts } from '../templates/prompts';
 import { genSystemScriptsJsonFile } from '../scripts/gen';
 import { CKBDebugger } from '../tools/ckb-debugger';
 import { logger } from '../util/logger';
+import { installCKBBinary as _installCKBBinary } from '../node/install';
+import { initChainIfNeeded as _initChainIfNeeded } from '../node/init-chain';
+import { readSettings } from '../cfg/setting';
 
 export interface CreateScriptProjectOptions {
   manager?: 'pnpm' | 'yarn' | 'npm';
@@ -100,6 +103,11 @@ export async function createScriptProject(name?: string, options: CreateScriptPr
 
     await processor.generateProject(fullProjectPath, contextWithPath);
 
+    const _settings = readSettings();
+
+    await _installCKBBinary(_settings.bins.defaultCKBVersion);
+    await _initChainIfNeeded();
+
     // Generate system-scripts.json
     logger.info('🔧 Generating system scripts configuration...');
     try {

src/cmd/create.ts

@@ -2,7 +2,7 @@
 // to replace lumos with ccc
 
 import { ccc, ClientPublicMainnet, ClientPublicTestnet, OutPointLike, Script } from '@ckb-ccc/core';
-import { isValidNetworkString } from '../util/validator';
+import { isValidNetworkString, normalizePrivKey } from '../util/validator';
 import { networks } from './network';
 import { buildCCCDevnetKnownScripts } from '../scripts/private';
 import { Migration } from '../deploy/migration';
@@ -81,7 +81,8 @@ export class CKB {
   }
 
   buildSigner(privateKey: HexString) {
-    const signer = new ccc.SignerCkbPrivateKey(this.client, privateKey);
+    const normalizedKey = normalizePrivKey(privateKey);
+    const signer = new ccc.SignerCkbPrivateKey(this.client, normalizedKey);
     return signer;
   }
 

src/sdk/ckb.ts

@@ -73,3 +73,43 @@ export function isValidVersion(version: unknown): boolean {
   // Test the version against the regex
   return versionRegex.test(version);
 }
+
+export function normalizePrivKey(privKey: string): string {
+  // Trim surrounding whitespaces
+  let key = privKey ? privKey.trim() : '';
+
+  if (!key) {
+    throw new Error('Private key is required.');
+  }
+
+  // Strip surrounding quotes
+  if (key.startsWith('"') && key.endsWith('"')) {
+    key = key.slice(1, -1);
+  }
+  if (key.startsWith("'") && key.endsWith("'")) {
+    key = key.slice(1, -1);
+  }
+
+  // Trim again to normalize whitespace that was inside surrounding quotes
+  key = key.trim();
+
+  // Remove standard 0x/0X prefix if it exists manually for normalization
+  if (/^0x/i.test(key)) {
+    key = key.slice(2);
+  }
+
+  // Validate only hex characters are left
+  if (!/^[0-9a-fA-F]+$/.test(key)) {
+    throw new Error('Invalid private key: contains non-hexadecimal characters.');
+  }
+
+  // Enforce exactly 32 bytes length
+  if (key.length !== 64) {
+    throw new Error(
+      `Invalid private key length: expected 32 bytes (64 hex characters), but got ${key.length} characters (excluding 0x prefix).`,
+    );
+  }
+
+  // Return the formally strictly padded ckb format `0x` string
+  return '0x' + key;
+}