@offckb/cli 0.4.0-canary-d31cb59.0 → 0.4.0-canary-81f2a49.0

package/build/index.js

@@ -1355,27 +1355,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.PrintStyle = void 0;
 exports.printSystemScripts = printSystemScripts;
 exports.printInSystemStyle = printInSystemStyle;
 exports.printInLumosConfigStyle = printInLumosConfigStyle;
 exports.printInCCCStyle = printInCCCStyle;
-exports.getDevnetSystemScriptsFromListHashes = getDevnetSystemScriptsFromListHashes;
 exports.systemCellToScriptInfo = systemCellToScriptInfo;
 exports.toLumosConfig = toLumosConfig;
-exports.toCCCKnownScripts = toCCCKnownScripts;
-const setting_1 = __nccwpck_require__(25546);
-const list_hashes_1 = __nccwpck_require__(31603);
-const toml_1 = __importDefault(__nccwpck_require__(2811));
-const core_1 = __nccwpck_require__(58906);
 const base_1 = __nccwpck_require__(69951);
 const public_1 = __nccwpck_require__(84535);
 const logger_1 = __nccwpck_require__(65370);
-const const_1 = __nccwpck_require__(75587);
+const private_1 = __nccwpck_require__(5835);
 var PrintStyle;
 (function (PrintStyle) {
     PrintStyle["system"] = "system";
@@ -1388,7 +1379,7 @@ function printSystemScripts(_a) {
             ? public_1.MAINNET_SYSTEM_SCRIPTS
             : network === base_1.Network.testnet
                 ? public_1.TESTNET_SYSTEM_SCRIPTS
-                : getDevnetSystemScriptsFromListHashes();
+                : (0, private_1.getDevnetSystemScriptsFromListHashes)();
         if (!systemScripts)
             return logger_1.logger.info(`SystemScripts is null, ${network}`);
         if (style === PrintStyle.system) {
@@ -1421,56 +1412,10 @@ function printInLumosConfigStyle(scripts, network) {
     logger_1.logger.info(JSON.stringify(config, null, 2));
 }
 function printInCCCStyle(scripts, network) {
-    const knownsScripts = toCCCKnownScripts(scripts);
+    const knownsScripts = (0, private_1.toCCCKnownScripts)(scripts);
     logger_1.logger.info(`*** CKB ${network.toUpperCase()} System Scripts As CCC KnownScripts ***\n`);
     logger_1.logger.info(JSON.stringify(knownsScripts, null, 2));
 }
-function getDevnetSystemScriptsFromListHashes() {
-    var _a;
-    const settings = (0, setting_1.readSettings)();
-    const listHashesString = (0, list_hashes_1.getDevnetListHashes)(settings.bins.defaultCKBVersion);
-    if (!listHashesString) {
-        logger_1.logger.info(`list-hashes not found!`);
-        return null;
-    }
-    const listHashes = toml_1.default.parse(listHashesString);
-    const chainSpecHashes = Object.values(listHashes)[0];
-    if (chainSpecHashes == null) {
-        throw new Error(`invalid chain spec hashes file ${listHashesString}`);
-    }
-    const systemScriptArray = chainSpecHashes.system_cells
-        .map((cell) => {
-        var _a;
-        // Extract the file name
-        const name = ((_a = cell.path.split('/').pop()) === null || _a === void 0 ? void 0 : _a.replace(')', '')) || 'unknown script';
-        const depGroupIndex = chainSpecHashes.dep_groups.findIndex((depGroup) => depGroup.included_cells.includes(`Bundled(specs/cells/${name})`));
-        const depType = depGroupIndex === -1 ? 'code' : 'depGroup';
-        const depGroup = depGroupIndex === -1
-            ? undefined
-            : {
-                txHash: chainSpecHashes.dep_groups[depGroupIndex].tx_hash,
-                index: chainSpecHashes.dep_groups[depGroupIndex].index,
-            };
-        const scriptInfo = systemCellToScriptInfo({ cell, depType, depGroup });
-        return {
-            name,
-            file: cell.path,
-            script: scriptInfo,
-        };
-    })
-        .filter((s) => s.name != 'secp256k1_data');
-    const systemScripts = systemScriptArray.reduce((acc, item) => {
-        const key = item.name;
-        acc[key] = item;
-        return acc;
-    }, {});
-    // some special case fixes
-    // eg: omnilock also requires the deps of secp256k1-sigHashAll
-    (_a = systemScripts.omnilock) === null || _a === void 0 ? void 0 : _a.script.cellDeps.push(systemScripts.secp256k1_blake160_sighash_all.script.cellDeps[0]);
-    // add built-in type_id script
-    systemScripts.type_id = const_1.TYPE_ID_SCRIPT;
-    return systemScripts;
-}
 function systemCellToScriptInfo({ cell, depType, depGroup, extraCellDeps, }) {
     // todo: we left the type in cellDepsInfo since it requires async fetching and
     // chain running to get the full type script of the type-id deps.
@@ -1635,21 +1580,6 @@ function toLumosConfig(scripts, addressPrefix = 'ckt') {
     }
     return config;
 }
-function toCCCKnownScripts(scripts) {
-    const DEVNET_SCRIPTS = {
-        [core_1.KnownScript.Secp256k1Blake160]: scripts.secp256k1_blake160_sighash_all.script,
-        [core_1.KnownScript.Secp256k1Multisig]: scripts.secp256k1_blake160_multisig_all.script,
-        [core_1.KnownScript.AnyoneCanPay]: scripts.anyone_can_pay.script,
-        [core_1.KnownScript.OmniLock]: scripts.omnilock.script,
-        [core_1.KnownScript.XUdt]: scripts.xudt.script,
-        [core_1.KnownScript.TypeId]: {
-            codeHash: '0x00000000000000000000000000000000000000000000000000545950455f4944',
-            hashType: 'type',
-            cellDeps: [],
-        },
-    };
-    return DEVNET_SCRIPTS;
-}
 
 
 /***/ }),
@@ -2567,13 +2497,13 @@ exports.genMyScripts = genMyScripts;
 exports.genMyScriptsJsonFile = genMyScriptsJsonFile;
 const fs = __importStar(__nccwpck_require__(79896));
 const public_1 = __importDefault(__nccwpck_require__(84535));
-const system_scripts_1 = __nccwpck_require__(86198);
 const path_1 = __importDefault(__nccwpck_require__(16928));
 const base_1 = __nccwpck_require__(69951);
 const util_1 = __nccwpck_require__(58642);
 const fs_1 = __nccwpck_require__(37293);
+const private_1 = __nccwpck_require__(5835);
 function genSystemScripts() {
-    const devnetScripts = (0, system_scripts_1.getDevnetSystemScriptsFromListHashes)();
+    const devnetScripts = (0, private_1.getDevnetSystemScriptsFromListHashes)();
     if (devnetScripts != null) {
         const networkScripts = {
             devnet: devnetScripts,
@@ -2611,20 +2541,91 @@ function genMyScriptsJsonFile(filePath) {
 /***/ }),
 
 /***/ 5835:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getDevnetSystemScriptsFromListHashes = getDevnetSystemScriptsFromListHashes;
+exports.toCCCKnownScripts = toCCCKnownScripts;
 exports.buildCCCDevnetKnownScripts = buildCCCDevnetKnownScripts;
-//todo: extract getSystemScriptsFromListHashes/toCCCKnownScripts from cmd folder
+const core_1 = __nccwpck_require__(58906);
+const setting_1 = __nccwpck_require__(25546);
 const system_scripts_1 = __nccwpck_require__(86198);
+const list_hashes_1 = __nccwpck_require__(31603);
+const logger_1 = __nccwpck_require__(65370);
+const const_1 = __nccwpck_require__(75587);
+const toml_1 = __importDefault(__nccwpck_require__(2811));
+function getDevnetSystemScriptsFromListHashes() {
+    var _a;
+    const settings = (0, setting_1.readSettings)();
+    const listHashesString = (0, list_hashes_1.getDevnetListHashes)(settings.bins.defaultCKBVersion);
+    if (!listHashesString) {
+        logger_1.logger.info(`list-hashes not found!`);
+        return null;
+    }
+    const listHashes = toml_1.default.parse(listHashesString);
+    const chainSpecHashes = Object.values(listHashes)[0];
+    if (chainSpecHashes == null) {
+        throw new Error(`invalid chain spec hashes file ${listHashesString}`);
+    }
+    const systemScriptArray = chainSpecHashes.system_cells
+        .map((cell) => {
+        var _a;
+        // Extract the file name
+        const name = ((_a = cell.path.split('/').pop()) === null || _a === void 0 ? void 0 : _a.replace(')', '')) || 'unknown script';
+        const depGroupIndex = chainSpecHashes.dep_groups.findIndex((depGroup) => depGroup.included_cells.includes(cell.path));
+        const depType = depGroupIndex === -1 ? 'code' : 'depGroup';
+        const depGroup = depGroupIndex === -1
+            ? undefined
+            : {
+                txHash: chainSpecHashes.dep_groups[depGroupIndex].tx_hash,
+                index: chainSpecHashes.dep_groups[depGroupIndex].index,
+            };
+        const scriptInfo = (0, system_scripts_1.systemCellToScriptInfo)({ cell, depType, depGroup });
+        return {
+            name,
+            file: cell.path,
+            script: scriptInfo,
+        };
+    })
+        .filter((s) => s.name != 'secp256k1_data');
+    const systemScripts = systemScriptArray.reduce((acc, item) => {
+        const key = item.name;
+        acc[key] = item;
+        return acc;
+    }, {});
+    // some special case fixes
+    // eg: omnilock also requires the deps of secp256k1-sigHashAll
+    (_a = systemScripts.omnilock) === null || _a === void 0 ? void 0 : _a.script.cellDeps.push(systemScripts.secp256k1_blake160_sighash_all.script.cellDeps[0]);
+    // add built-in type_id script
+    systemScripts.type_id = const_1.TYPE_ID_SCRIPT;
+    return systemScripts;
+}
+function toCCCKnownScripts(scripts) {
+    const DEVNET_SCRIPTS = {
+        [core_1.KnownScript.Secp256k1Blake160]: scripts.secp256k1_blake160_sighash_all.script,
+        [core_1.KnownScript.Secp256k1Multisig]: scripts.secp256k1_blake160_multisig_all.script,
+        [core_1.KnownScript.AnyoneCanPay]: scripts.anyone_can_pay.script,
+        [core_1.KnownScript.OmniLock]: scripts.omnilock.script,
+        [core_1.KnownScript.XUdt]: scripts.xudt.script,
+        [core_1.KnownScript.TypeId]: {
+            codeHash: '0x00000000000000000000000000000000000000000000000000545950455f4944',
+            hashType: 'type',
+            cellDeps: [],
+        },
+    };
+    return DEVNET_SCRIPTS;
+}
 function buildCCCDevnetKnownScripts() {
-    const devnetSystemScripts = (0, system_scripts_1.getDevnetSystemScriptsFromListHashes)();
+    const devnetSystemScripts = getDevnetSystemScriptsFromListHashes();
     if (devnetSystemScripts == null) {
         throw new Error('can not getSystemScriptsFromListHashes in devnet');
     }
-    const devnetKnownScripts = (0, system_scripts_1.toCCCKnownScripts)(devnetSystemScripts);
+    const devnetKnownScripts = toCCCKnownScripts(devnetSystemScripts);
     return devnetKnownScripts;
 }
 
@@ -2813,6 +2814,26 @@ exports.TESTNET_SYSTEM_SCRIPTS = {
         },
     },
     type_id: const_1.TYPE_ID_SCRIPT,
+    secp256k1_keccak256_sighash_all: undefined,
+    secp256k1_keccak256_sighash_all_acpl: undefined,
+    secp256k1_blake160_multisig_all_v2: {
+        name: 'secp256k1_blake160_multisig_all_v2',
+        script: {
+            codeHash: '0x36c971b8d41fbd94aabca77dc75e826729ac98447b46f91e00796155dddb0d29',
+            hashType: 'data1',
+            cellDeps: [
+                {
+                    cellDep: {
+                        outPoint: {
+                            txHash: '0x2eefdeb21f3a3edf697c28a52601b4419806ed60bb427420455cc29a090b26d5',
+                            index: 0,
+                        },
+                        depType: 'depGroup',
+                    },
+                },
+            ],
+        },
+    },
 };
 exports.MAINNET_SYSTEM_SCRIPTS = {
     secp256k1_blake160_sighash_all: {
@@ -2917,6 +2938,26 @@ exports.MAINNET_SYSTEM_SCRIPTS = {
         },
     },
     type_id: const_1.TYPE_ID_SCRIPT,
+    secp256k1_keccak256_sighash_all: undefined,
+    secp256k1_keccak256_sighash_all_acpl: undefined,
+    secp256k1_blake160_multisig_all_v2: {
+        name: 'secp256k1_blake160_multisig_all_v2',
+        script: {
+            codeHash: '0x36c971b8d41fbd94aabca77dc75e826729ac98447b46f91e00796155dddb0d29',
+            hashType: 'data1',
+            cellDeps: [
+                {
+                    cellDep: {
+                        outPoint: {
+                            txHash: '0x6888aa39ab30c570c2c30d9d5684d3769bf77265a7973211a3c087fe8efbf738',
+                            index: 0,
+                        },
+                        depType: 'depGroup',
+                    },
+                },
+            ],
+        },
+    },
 };
 exports["default"] = {
     testnet: exports.TESTNET_SYSTEM_SCRIPTS,
@@ -4603,11 +4644,13 @@ function createRPCProxy(network, targetRpcUrl, port) {
             reqData += chunk;
         });
         req.on('end', () => {
+            if (reqData.length === 0)
+                return;
             try {
                 const jsonRpcContent = JSON.parse(reqData);
                 const method = jsonRpcContent.method;
                 const params = jsonRpcContent.params;
-                logger_1.logger.debug('RPC Req: ', method);
+                logger_1.logger.info('RPC Req: ', method);
                 if (method === 'send_transaction') {
                     const tx = params[0];
                     // todo: record tx
@@ -4625,7 +4668,7 @@ function createRPCProxy(network, targetRpcUrl, port) {
                 }
             }
             catch (err) {
-                logger_1.logger.error('Error parsing JSON-RPC content:', err);
+                logger_1.logger.error('Error parsing JSON-RPC req content:', err.message);
             }
         });
     });
@@ -4636,6 +4679,8 @@ function createRPCProxy(network, targetRpcUrl, port) {
         });
         proxyRes.on('end', function () {
             const res = Buffer.concat(body).toString();
+            if (res.length === 0)
+                return;
             try {
                 const jsonRpcResponse = JSON.parse(res);
                 const error = jsonRpcResponse.error;
@@ -4644,7 +4689,7 @@ function createRPCProxy(network, targetRpcUrl, port) {
                 }
             }
             catch (err) {
-                logger_1.logger.error('Error parsing JSON-RPC content:', err);
+                logger_1.logger.error('Error parsing JSON-RPC res content:', err.message);
             }
         });
     });

package/ckb/devnet/specs/dev.toml

@@ -70,6 +70,15 @@ create_type_id = true
 [[genesis.system_cells]]
 file = { file = "nostr_lock" }
 create_type_id = false
+[[genesis.system_cells]]
+file = { file = "pw-lock/secp256k1_keccak256_sighash_all" }
+create_type_id = false
+[[genesis.system_cells]]
+file = { file = "pw-lock/secp256k1_keccak256_sighash_all_acpl" }
+create_type_id = false
+[[genesis.system_cells]]
+file = { file = "secp256k1_blake160_multisig_all_v2" }
+create_type_id = false
 
 [genesis.system_cells_lock]
 code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -89,6 +98,24 @@ files = [
     { bundled = "specs/cells/secp256k1_data" },
     { bundled = "specs/cells/secp256k1_blake160_multisig_all" },
 ]
+[[genesis.dep_groups]]
+name = "secp256k1_blake160_multisig_all_v2"
+files = [
+    { bundled = "specs/cells/secp256k1_data" },
+    { file = "secp256k1_blake160_multisig_all_v2"},
+]
+[[genesis.dep_groups]]
+name = "secp256k1_keccak256_sighash_all"
+files = [
+    { bundled = "specs/cells/secp256k1_data" },
+    { file = "pw-lock/secp256k1_keccak256_sighash_all"},
+]
+[[genesis.dep_groups]]
+name = "secp256k1_keccak256_sighash_all_acpl"
+files = [
+    { bundled = "specs/cells/secp256k1_data" },
+    { file = "pw-lock/secp256k1_keccak256_sighash_all_acpl"},
+]
 
 # For first 11 block
 [genesis.bootstrap_lock]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.4.0-canary-d31cb59.0",
+  "version": "0.4.0-canary-81f2a49.0",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",