@offckb/cli 0.3.0-rc7 → 0.3.0-rc9

package/README.md

@@ -212,12 +212,18 @@ To build the script, in the root of the project, run:
 make build
 ```
 
-To deploy the script, cd into the frontend folder and run:
+To deploy the script, cd into the frontend folder where the default `offckb.config.ts` file is located and run:
 
 ```sh
 cd frontend && offckb deploy --network <devnet/testnet>
 ```
 
+Or specific the `offckb.config.ts` file path for deploy command to locate:
+
+```sh
+offckb deploy --network <devnet/testnet> --config <file-path-to-your-offckb.config.ts-file>
+```
+
 Pass `--type-id` option if you want Scripts to be upgradable
 
 ```sh

package/dist/cli.js

@@ -95,9 +95,20 @@ program.command('accounts').description('Print account list info').action(accoun
 program
     .command('list-hashes [CKB-Version]')
     .description('Use the CKB to list blockchain scripts hashes')
-    .action(list_hashes_1.listHashes);
-program.command('inject-config').description('Add offckb.config.ts to your frontend workspace').action(inject_config_1.injectConfig);
-program.command('sync-scripts').description('Sync scripts json files in your frontend workspace').action(sync_scripts_1.syncScripts);
+    .action(list_hashes_1.printDevnetListHashes);
+program
+    .command('inject-config')
+    .description('Add offckb.config.ts to your frontend workspace')
+    .option('--target <target>', 'Specify the custom file path of the new injected config')
+    .action(inject_config_1.injectConfig);
+program
+    .command('sync-scripts')
+    .description('Sync scripts json files in your frontend workspace')
+    .option('--config <config>', 'Specify the offckb.config.ts file path', undefined)
+    .action((opt) => {
+    const configPath = opt.config;
+    return (0, sync_scripts_1.syncScripts)({ configPath });
+});
 program
     .command('deposit [toAddress] [amountInCKB]')
     .description('Deposit CKB tokens to address, only devnet and testnet')
@@ -136,6 +147,7 @@ program
     .description('Deploy contracts to different networks, only supports devnet and testnet')
     .option('--network <network>', 'Specify the network to deploy to', 'devnet')
     .option('--target <target>', 'Specify the relative bin target folder to deploy to')
+    .option('--config <config>', 'Specify the offckb.config.ts file path for deployment', undefined)
     .option('-t, --type-id', 'Specify if use upgradable type id to deploy the script')
     .option('--privkey <privkey>', 'Specify the private key to deploy scripts')
     .option('-r, --proxy-rpc', 'Use Proxy RPC to connect to blockchain')
@@ -166,11 +178,13 @@ program
 }));
 program
     .command('system-scripts')
-    .option('--export-style <exportStyle>', 'Specify the export format, possible values are lumos and ccc.')
-    .description('Output system scripts of the local devnet')
+    .option('--export-style <exportStyle>', 'Specify the export format, possible values are system, lumos and ccc.')
+    .option('--network <network>', 'Specify the CKB blockchain network', 'devnet')
+    .description('Output system scripts of the CKB blockchain')
     .action((option) => __awaiter(void 0, void 0, void 0, function* () {
+    const network = option.network;
     const exportStyle = option.exportStyle;
-    return (0, system_scripts_1.printSystemScripts)(exportStyle);
+    return (0, system_scripts_1.printSystemScripts)({ style: exportStyle, network });
 }));
 program
     .command('mol')

package/dist/cmd/deploy.d.ts

@@ -1,6 +1,7 @@
 import { NetworkOption } from '../type/base';
 export interface DeployOptions extends NetworkOption {
-    target: string | null | undefined;
+    target?: string;
+    config?: string;
     privkey?: string | null;
     typeId?: boolean;
     proxyRpc?: boolean;

package/dist/cmd/deploy.js

@@ -20,7 +20,8 @@ const fs_1 = require("../util/fs");
 const validator_1 = require("../util/validator");
 const deploy_1 = require("../deploy");
 const ckb_1 = require("../sdk/ckb");
-function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: null, proxyRpc: false }) {
+const fs_2 = __importDefault(require("fs"));
+function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: undefined, proxyRpc: false }) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
@@ -30,6 +31,7 @@ function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: n
         // we use deployerAccount to deploy contract by default
         const privateKey = opt.privkey || account_1.deployerAccount.privkey;
         const enableTypeId = (_a = opt.typeId) !== null && _a !== void 0 ? _a : false;
+        const configPath = opt.config;
         const targetFolder = opt.target;
         if (targetFolder) {
             const binFolder = (0, fs_1.isAbsolutePath)(targetFolder) ? targetFolder : path_1.default.resolve(process.cwd(), targetFolder);
@@ -37,21 +39,22 @@ function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: n
             const binPaths = bins.map((bin) => path_1.default.resolve(binFolder, bin));
             const results = yield (0, deploy_1.deployBinaries)(binPaths, privateKey, enableTypeId, ckb);
             // record the deployed contract infos
-            (0, deploy_1.recordDeployResult)(results, network, false); // we don't update my-scripts.json since we don't know where the file is
+            (0, deploy_1.recordDeployResult)(results, network); // we don't update my-scripts.json since we don't know where the file is
             return;
         }
-        // check if target workspace is valid
-        try {
-            (0, validator_1.validateExecDappEnvironment)();
-        }
-        catch (error) {
-            return console.debug('Not a valid offCKB dapp workspace.');
-        }
         // read contract bin folder
-        const bins = (0, deploy_1.getToDeployBinsPath)();
+        const userOffCKBConfigPath = configPath
+            ? (0, fs_1.isAbsolutePath)(configPath)
+                ? configPath
+                : path_1.default.resolve(process.cwd(), configPath)
+            : path_1.default.resolve(process.cwd(), 'offckb.config.ts');
+        if (!fs_2.default.existsSync(userOffCKBConfigPath)) {
+            throw new Error(`config file not exits: ${userOffCKBConfigPath}, tips: use --config to specific the offckb.config.ts file`);
+        }
+        const bins = (0, deploy_1.getToDeployBinsPath)(userOffCKBConfigPath);
         const results = yield (0, deploy_1.deployBinaries)(bins, privateKey, enableTypeId, ckb);
         // record the deployed contract infos
-        (0, deploy_1.recordDeployResult)(results, network);
+        (0, deploy_1.recordDeployResult)(results, network, userOffCKBConfigPath);
     });
 }
 exports.deploy = deploy;

package/dist/cmd/inject-config.d.ts

@@ -1 +1,4 @@
-export declare function injectConfig(): void;
+export interface InjectConfigProp {
+    target?: string;
+}
+export declare function injectConfig({ target }: InjectConfigProp): void;

package/dist/cmd/inject-config.js

@@ -1,22 +1,44 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectConfig = void 0;
 const fs_1 = require("fs");
-const validator_1 = require("../util/validator");
-const path_1 = __importDefault(require("path"));
+const path_1 = __importStar(require("path"));
 const gen_1 = require("../scripts/gen");
 const offckb_config_1 = require("../template/offckb-config");
 const setting_1 = require("../cfg/setting");
 const version = require('../../package.json').version;
-function injectConfig() {
-    (0, validator_1.validateTypescriptWorkspace)();
+function injectConfig({ target }) {
     // inject the offckb.config.ts file into users workspace
     // copy config template
+    const userOffCKBConfigPath = target
+        ? (0, path_1.isAbsolute)(target)
+            ? target
+            : path_1.default.resolve(process.cwd(), target)
+        : path_1.default.resolve(process.cwd(), 'offckb.config.ts');
     const predefinedOffCKBConfigTsPath = path_1.default.resolve(setting_1.packageRootPath, 'templates/v3/offckb.config.example.ts');
-    const userOffCKBConfigPath = path_1.default.resolve(process.cwd(), 'offckb.config.ts');
     (0, fs_1.copyFileSync)(predefinedOffCKBConfigTsPath, userOffCKBConfigPath);
     // update the version in the offckb.config.ts
     offckb_config_1.OffCKBConfigFile.updateVersion(version, userOffCKBConfigPath);

package/dist/cmd/list-hashes.d.ts

@@ -21,5 +21,5 @@ export interface SpecHashes {
 export interface ListHashes {
     offckb: SpecHashes;
 }
-export declare function listHashes(version?: string): Promise<void>;
-export declare function getListHashes(version?: string): string | null;
+export declare function printDevnetListHashes(version?: string): Promise<void>;
+export declare function getDevnetListHashes(version?: string): string | null;

package/dist/cmd/list-hashes.js

@@ -9,18 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getListHashes = exports.listHashes = void 0;
+exports.getDevnetListHashes = exports.printDevnetListHashes = void 0;
 const child_process_1 = require("child_process");
 const setting_1 = require("../cfg/setting");
 const encoding_1 = require("../util/encoding");
-function listHashes(version) {
+function printDevnetListHashes(version) {
     return __awaiter(this, void 0, void 0, function* () {
-        const output = getListHashes(version);
+        const output = getDevnetListHashes(version);
         console.log(output);
     });
 }
-exports.listHashes = listHashes;
-function getListHashes(version) {
+exports.printDevnetListHashes = printDevnetListHashes;
+function getDevnetListHashes(version) {
     const settings = (0, setting_1.readSettings)();
     const ckbVersion = version || settings.bins.defaultCKBVersion;
     const ckbBinPath = (0, encoding_1.encodeBinPathForTerminal)((0, setting_1.getCKBBinaryPath)(ckbVersion));
@@ -37,4 +37,4 @@ function getListHashes(version) {
         return null;
     }
 }
-exports.getListHashes = getListHashes;
+exports.getDevnetListHashes = getDevnetListHashes;

package/dist/cmd/sync-scripts.d.ts

@@ -1 +1,4 @@
-export declare function syncScripts(): void;
+export interface SyncScriptsProp {
+    configPath?: string;
+}
+export declare function syncScripts({ configPath }: SyncScriptsProp): void;

package/dist/cmd/sync-scripts.js

@@ -5,12 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncScripts = void 0;
 const path_1 = __importDefault(require("path"));
-const validator_1 = require("../util/validator");
 const gen_1 = require("../scripts/gen");
 const offckb_config_1 = require("../template/offckb-config");
-function syncScripts() {
-    (0, validator_1.validateExecDappEnvironment)();
-    const userOffCKBConfigPath = path_1.default.resolve(process.cwd(), 'offckb.config.ts');
+const fs_1 = require("../util/fs");
+const fs_2 = __importDefault(require("fs"));
+function syncScripts({ configPath }) {
+    const userOffCKBConfigPath = configPath
+        ? (0, fs_1.isAbsolutePath)(configPath)
+            ? configPath
+            : path_1.default.resolve(process.cwd(), configPath)
+        : path_1.default.resolve(process.cwd(), 'offckb.config.ts');
+    if (!fs_2.default.existsSync(userOffCKBConfigPath)) {
+        throw new Error(`config file not exits: ${userOffCKBConfigPath}, tips: use --config to specific the offckb.config.ts file`);
+    }
     const contractInfoFolder = offckb_config_1.OffCKBConfigFile.readContractInfoFolder(userOffCKBConfigPath);
     if (!contractInfoFolder) {
         throw new Error('No contract info folder found in offckb.config.ts!');

package/dist/cmd/system-scripts.d.ts

@@ -1,40 +1,29 @@
 import { SystemCell } from './list-hashes';
 import { CellDepInfoLike, Script } from '@ckb-ccc/core';
-import { SystemScriptsRecord } from '../scripts/type';
-export type PrintProps = 'lumos' | 'ccc';
-export declare function printSystemScripts(props?: PrintProps): Promise<void>;
-export declare function printInSystemStyle(systemScripts: SystemScriptsRecord): void;
-export declare function printInLumosConfigStyle(scripts: SystemScriptsRecord): void;
-export declare function printInCCCStyle(scripts: SystemScriptsRecord): void;
-export declare function getSystemScriptsFromListHashes(): SystemScriptsRecord | null;
-export declare function systemCellToScriptInfo(cell: SystemCell, depType: 'code' | 'depGroup', depGroup?: {
-    txHash: string;
-    index: number;
-}): {
-    codeHash: string;
-    hashType: string;
-    cellDeps: {
-        cellDep: {
-            outPoint: {
-                txHash: string;
-                index: number;
-            };
-            depType: "code";
-        };
-    }[];
-} | {
-    codeHash: string;
-    hashType: string;
-    cellDeps: {
-        cellDep: {
-            outPoint: {
-                txHash: string;
-                index: number;
-            };
-            depType: "depGroup";
-        };
-    }[];
-};
+import { ScriptInfo, SystemScriptsRecord } from '../scripts/type';
+import { Network, NetworkOption } from '../type/base';
+export declare enum PrintStyle {
+    system = "system",
+    lumos = "lumos",
+    ccc = "ccc"
+}
+export interface PrintProps extends NetworkOption {
+    style?: PrintStyle;
+}
+export declare function printSystemScripts({ style, network }: PrintProps): Promise<void>;
+export declare function printInSystemStyle(systemScripts: SystemScriptsRecord, network: Network): void;
+export declare function printInLumosConfigStyle(scripts: SystemScriptsRecord, network: Network): void;
+export declare function printInCCCStyle(scripts: SystemScriptsRecord, network: Network): void;
+export declare function getDevnetSystemScriptsFromListHashes(): SystemScriptsRecord | null;
+export declare function systemCellToScriptInfo({ cell, depType, depGroup, extraCellDeps, }: {
+    cell: SystemCell;
+    depType: 'code' | 'depGroup';
+    depGroup?: {
+        txHash: string;
+        index: number;
+    };
+    extraCellDeps?: ScriptInfo['cellDeps'];
+}): ScriptInfo;
 export declare function toLumosConfig(scripts: SystemScriptsRecord, addressPrefix?: 'ckb' | 'ckt'): {
     PREFIX: "ckb" | "ckt";
     SCRIPTS: {

package/dist/cmd/system-scripts.js

@@ -12,30 +12,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCCCKnownScripts = exports.toLumosConfig = exports.systemCellToScriptInfo = exports.getSystemScriptsFromListHashes = exports.printInCCCStyle = exports.printInLumosConfigStyle = exports.printInSystemStyle = exports.printSystemScripts = void 0;
+exports.toCCCKnownScripts = exports.toLumosConfig = exports.systemCellToScriptInfo = exports.getDevnetSystemScriptsFromListHashes = exports.printInCCCStyle = exports.printInLumosConfigStyle = exports.printInSystemStyle = exports.printSystemScripts = exports.PrintStyle = void 0;
 const setting_1 = require("../cfg/setting");
 const list_hashes_1 = require("./list-hashes");
 const toml_1 = __importDefault(require("@iarna/toml"));
 const core_1 = require("@ckb-ccc/core");
-function printSystemScripts(props) {
+const base_1 = require("../type/base");
+const public_1 = require("../scripts/public");
+var PrintStyle;
+(function (PrintStyle) {
+    PrintStyle["system"] = "system";
+    PrintStyle["lumos"] = "lumos";
+    PrintStyle["ccc"] = "ccc";
+})(PrintStyle || (exports.PrintStyle = PrintStyle = {}));
+function printSystemScripts({ style = PrintStyle.system, network = base_1.Network.devnet }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const systemScripts = getSystemScriptsFromListHashes();
-        if (systemScripts) {
-            if (!props) {
-                return printInSystemStyle(systemScripts);
-            }
-            if (props === 'lumos') {
-                return printInLumosConfigStyle(systemScripts);
-            }
-            if (props === 'ccc') {
-                return printInCCCStyle(systemScripts);
-            }
+        const systemScripts = network === base_1.Network.mainnet
+            ? public_1.MAINNET_SYSTEM_SCRIPTS
+            : network === base_1.Network.testnet
+                ? public_1.TESTNET_SYSTEM_SCRIPTS
+                : getDevnetSystemScriptsFromListHashes();
+        if (!systemScripts)
+            return console.log(`SystemScripts is null, ${network}`);
+        if (style === PrintStyle.system) {
+            return printInSystemStyle(systemScripts, network);
+        }
+        if (style === PrintStyle.lumos) {
+            return printInLumosConfigStyle(systemScripts, network);
+        }
+        if (style === PrintStyle.ccc) {
+            return printInCCCStyle(systemScripts, network);
         }
     });
 }
 exports.printSystemScripts = printSystemScripts;
-function printInSystemStyle(systemScripts) {
-    console.log('*** OffCKB Devnet System Scripts ***\n');
+function printInSystemStyle(systemScripts, network) {
+    console.log(`*** CKB ${network.toUpperCase()} System Scripts ***\n`);
     for (const [name, script] of Object.entries(systemScripts)) {
         console.log(`- name: ${name}`);
         if (script == null) {
@@ -48,86 +60,93 @@ function printInSystemStyle(systemScripts) {
     }
 }
 exports.printInSystemStyle = printInSystemStyle;
-function printInLumosConfigStyle(scripts) {
-    const config = toLumosConfig(scripts);
-    console.log('*** OffCKB Devnet System Scripts As LumosConfig ***\n');
+function printInLumosConfigStyle(scripts, network) {
+    const config = toLumosConfig(scripts, network === base_1.Network.mainnet ? 'ckb' : 'ckt');
+    console.log(`*** CKB ${network.toUpperCase()} System Scripts As LumosConfig ***\n`);
     console.log(JSON.stringify(config, null, 2));
 }
 exports.printInLumosConfigStyle = printInLumosConfigStyle;
-function printInCCCStyle(scripts) {
+function printInCCCStyle(scripts, network) {
     const knownsScripts = toCCCKnownScripts(scripts);
-    console.log('*** OffCKB Devnet System Scripts As CCC KnownScripts ***\n');
+    console.log(`*** CKB ${network.toUpperCase()} System Scripts As CCC KnownScripts ***\n`);
     console.log(JSON.stringify(knownsScripts, null, 2));
 }
 exports.printInCCCStyle = printInCCCStyle;
-function getSystemScriptsFromListHashes() {
+function getDevnetSystemScriptsFromListHashes() {
+    var _a;
     const settings = (0, setting_1.readSettings)();
-    const listHashesString = (0, list_hashes_1.getListHashes)(settings.bins.defaultCKBVersion);
-    if (listHashesString) {
-        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;
-        }, {});
-        return systemScripts;
-    }
-    else {
+    const listHashesString = (0, list_hashes_1.getDevnetListHashes)(settings.bins.defaultCKBVersion);
+    if (!listHashesString) {
         console.log(`list-hashes not found!`);
         return null;
     }
-}
-exports.getSystemScriptsFromListHashes = getSystemScriptsFromListHashes;
-function systemCellToScriptInfo(cell, depType, depGroup) {
-    if (depType === 'depGroup' && !depGroup) {
-        throw new Error('require depGroup info since the dep type is depGroup');
+    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}`);
     }
-    if (depType === 'code') {
+    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 {
-            codeHash: cell.type_hash || cell.data_hash,
-            hashType: cell.type_hash ? 'type' : 'data1',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: cell.tx_hash,
-                            index: cell.index,
-                        },
-                        depType,
+            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]);
+    return systemScripts;
+}
+exports.getDevnetSystemScriptsFromListHashes = getDevnetSystemScriptsFromListHashes;
+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.
+    // Also, in devnet there is no real need to auto upgrade the system scripts with type-id
+    if (depType === 'code') {
+        let cellDeps = [
+            {
+                cellDep: {
+                    outPoint: {
+                        txHash: cell.tx_hash,
+                        index: cell.index,
                     },
+                    depType,
                 },
-            ],
+            },
+        ];
+        if (extraCellDeps && extraCellDeps.length > 0) {
+            cellDeps = [...extraCellDeps, ...cellDeps];
+        }
+        return {
+            codeHash: (cell.type_hash || cell.data_hash),
+            hashType: cell.type_hash ? 'type' : 'data1',
+            cellDeps,
         };
     }
-    return {
-        codeHash: cell.type_hash || cell.data_hash,
-        hashType: cell.type_hash ? 'type' : 'data1',
-        cellDeps: [
+    if (depType === 'depGroup') {
+        if (!depGroup) {
+            throw new Error('require depGroup info since the dep type is depGroup');
+        }
+        let cellDeps = [
             {
                 cellDep: {
                     outPoint: {
@@ -137,8 +156,17 @@ function systemCellToScriptInfo(cell, depType, depGroup) {
                     depType,
                 },
             },
-        ],
-    };
+        ];
+        if (extraCellDeps && extraCellDeps.length > 0) {
+            cellDeps = [...extraCellDeps, ...cellDeps];
+        }
+        return {
+            codeHash: (cell.type_hash || cell.data_hash),
+            hashType: cell.type_hash ? 'type' : 'data1',
+            cellDeps,
+        };
+    }
+    throw new Error(`unknown DepType ${depType}`);
 }
 exports.systemCellToScriptInfo = systemCellToScriptInfo;
 function toLumosConfig(scripts, addressPrefix = 'ckt') {

package/dist/deploy/index.d.ts

@@ -6,8 +6,8 @@ import { HexString } from '../type/base';
 export type DeployBinaryReturnType = ReturnType<typeof deployBinary>;
 export type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 export type DeployedInterfaceType = UnwrapPromise<DeployBinaryReturnType>;
-export declare function getToDeployBinsPath(): string[];
-export declare function recordDeployResult(results: DeployedInterfaceType[], network: Network, isUpdateMyScriptsJsonFile?: boolean): Promise<void>;
+export declare function getToDeployBinsPath(userOffCKBConfigPath: string): string[];
+export declare function recordDeployResult(results: DeployedInterfaceType[], network: Network, userOffCKBConfigPath?: string): Promise<void>;
 export declare function deployBinaries(binPaths: string[], privateKey: HexString, enableTypeId: boolean, ckb: CKB): Promise<{
     deploymentRecipe: DeploymentRecipe;
     deploymentOptions: DeploymentOptions;

package/dist/deploy/index.js

@@ -21,15 +21,14 @@ const fs_1 = require("../util/fs");
 const path_1 = __importDefault(require("path"));
 const fs_2 = __importDefault(require("fs"));
 const core_1 = require("@ckb-ccc/core");
-function getToDeployBinsPath() {
-    const userOffCKBConfigPath = path_1.default.resolve(process.cwd(), 'offckb.config.ts');
+function getToDeployBinsPath(userOffCKBConfigPath) {
     const fileContent = fs_2.default.readFileSync(userOffCKBConfigPath, 'utf-8');
     const match = fileContent.match(/contractBinFolder:\s*['"]([^'"]+)['"]/);
     if (match && match[1]) {
         const contractBinFolderValue = match[1];
         const binFolderPath = (0, fs_1.isAbsolutePath)(contractBinFolderValue)
             ? contractBinFolderValue
-            : path_1.default.resolve(process.cwd(), contractBinFolderValue);
+            : path_1.default.resolve(userOffCKBConfigPath, contractBinFolderValue);
         const bins = (0, fs_1.listBinaryFilesInFolder)(binFolderPath);
         return bins.map((bin) => path_1.default.resolve(binFolderPath, bin));
     }
@@ -39,7 +38,7 @@ function getToDeployBinsPath() {
     }
 }
 exports.getToDeployBinsPath = getToDeployBinsPath;
-function recordDeployResult(results, network, isUpdateMyScriptsJsonFile = true) {
+function recordDeployResult(results, network, userOffCKBConfigPath) {
     return __awaiter(this, void 0, void 0, function* () {
         if (results.length === 0) {
             return;
@@ -49,8 +48,10 @@ function recordDeployResult(results, network, isUpdateMyScriptsJsonFile = true)
             (0, migration_1.generateDeploymentMigrationFile)(result.deploymentOptions.name, result.deploymentRecipe, network);
         }
         // update my-scripts.json
-        if (isUpdateMyScriptsJsonFile) {
-            const userOffCKBConfigPath = path_1.default.resolve(process.cwd(), 'offckb.config.ts');
+        if (userOffCKBConfigPath) {
+            if (!fs_2.default.existsSync(userOffCKBConfigPath)) {
+                throw new Error(`config file not exits: ${userOffCKBConfigPath}`);
+            }
             const folder = offckb_config_1.OffCKBConfigFile.readContractInfoFolder(userOffCKBConfigPath);
             if (folder) {
                 const myScriptsFilePath = path_1.default.resolve(folder, 'my-scripts.json');

package/dist/scripts/gen.js

@@ -34,7 +34,7 @@ const path_1 = __importDefault(require("path"));
 const base_1 = require("../type/base");
 const util_1 = require("./util");
 function genSystemScripts() {
-    const devnetScripts = (0, system_scripts_1.getSystemScriptsFromListHashes)();
+    const devnetScripts = (0, system_scripts_1.getDevnetSystemScriptsFromListHashes)();
     if (devnetScripts != null) {
         const networkScripts = {
             devnet: devnetScripts,

package/dist/scripts/private.js

@@ -4,7 +4,7 @@ exports.buildCCCDevnetKnownScripts = void 0;
 //todo: extract getSystemScriptsFromListHashes/toCCCKnownScripts from cmd folder
 const system_scripts_1 = require("../cmd/system-scripts");
 function buildCCCDevnetKnownScripts() {
-    const devnetSystemScripts = (0, system_scripts_1.getSystemScriptsFromListHashes)();
+    const devnetSystemScripts = (0, system_scripts_1.getDevnetSystemScriptsFromListHashes)();
     if (devnetSystemScripts == null) {
         throw new Error('can not getSystemScriptsFromListHashes in devnet');
     }

package/dist/scripts/public.js

@@ -1,62 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MAINNET_SYSTEM_SCRIPTS = exports.TESTNET_SYSTEM_SCRIPTS = void 0;
+const advanced_1 = require("@ckb-ccc/core/advanced");
+const advanced_2 = require("@ckb-ccc/core/advanced");
 // spore: https://github.com/sporeprotocol/spore-contract/blob/master/docs/VERSIONS.md
 exports.TESTNET_SYSTEM_SCRIPTS = {
     secp256k1_blake160_sighash_all: {
         name: 'secp256k1_blake160_sighash_all',
-        script: {
-            codeHash: '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xf8de3bb47d055cdf460d93a2a6e1b05f7432f9777c8c474abf4eec1d4aee5d37',
-                            index: 0,
-                        },
-                        depType: 'depGroup',
-                    },
-                },
-            ],
-        },
+        script: advanced_1.TESTNET_SCRIPTS.Secp256k1Blake160,
     },
     dao: {
         name: 'dao',
-        script: {
-            codeHash: '0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0x8f8c79eb6671709633fe6a46de93c0fedc9c1b8a6527a18d3983879542635c9f',
-                            index: 2,
-                        },
-                        depType: 'code',
-                    },
-                },
-            ],
-        },
+        script: advanced_1.TESTNET_SCRIPTS.NervosDao,
     },
     secp256k1_blake160_multisig_all: {
         name: 'secp256k1_blake160_multisig_all',
-        file: 'Bundled(specs/cells/secp256k1_blake160_multisig_all)',
-        script: {
-            codeHash: '0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xf8de3bb47d055cdf460d93a2a6e1b05f7432f9777c8c474abf4eec1d4aee5d37',
-                            index: 1,
-                        },
-                        depType: 'depGroup',
-                    },
-                },
-            ],
-        },
+        script: advanced_1.TESTNET_SCRIPTS.Secp256k1Multisig,
     },
     sudt: {
         name: 'sudt',
@@ -78,57 +37,15 @@ exports.TESTNET_SYSTEM_SCRIPTS = {
     },
     xudt: {
         name: 'xudt',
-        script: {
-            codeHash: '0x25c29dc317811a6f6f3985a7a9ebc4838bd388d19d0feeecf0bcd60f6c0975bb',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xbf6fb538763efec2a70a6a3dcb7242787087e1030c4e7d86585bc63a9d337f5f',
-                            index: 0,
-                        },
-                        depType: 'code',
-                    },
-                },
-            ],
-        },
+        script: advanced_1.TESTNET_SCRIPTS.XUdt,
     },
     omnilock: {
         name: 'omnilock',
-        script: {
-            codeHash: '0xf329effd1c475a2978453c8600e1eaf0bc2087ee093c3ee64cc96ec6847752cb',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xec18bf0d857c981c3d1f4e17999b9b90c484b303378e94de1a57b0872f5d4602',
-                            index: 0,
-                        },
-                        depType: 'code',
-                    },
-                },
-            ],
-        },
+        script: advanced_1.TESTNET_SCRIPTS.OmniLock,
     },
     anyone_can_pay: {
         name: 'anyone_can_pay',
-        script: {
-            codeHash: '0x3419a1c09eb2567f6552ee7a8ecffd64155cffe0f1796e6e61ec088d740c1356',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xec26b0f85ed839ece5f11c4c4e837ec359f5adc4420410f6453b1f6b60fb96a6',
-                            index: 0,
-                        },
-                        depType: 'depGroup',
-                    },
-                },
-            ],
-        },
+        script: advanced_1.TESTNET_SCRIPTS.AnyoneCanPay,
     },
     always_success: undefined,
     spore: {
@@ -225,57 +142,15 @@ exports.TESTNET_SYSTEM_SCRIPTS = {
 exports.MAINNET_SYSTEM_SCRIPTS = {
     secp256k1_blake160_sighash_all: {
         name: 'secp256k1_blake160_sighash_all',
-        script: {
-            codeHash: '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c',
-                            index: 0,
-                        },
-                        depType: 'depGroup',
-                    },
-                },
-            ],
-        },
+        script: advanced_2.MAINNET_SCRIPTS.Secp256k1Blake160,
     },
     dao: {
         name: 'dao',
-        script: {
-            codeHash: '0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c',
-                            index: 2,
-                        },
-                        depType: 'code',
-                    },
-                },
-            ],
-        },
+        script: advanced_2.MAINNET_SCRIPTS.NervosDao,
     },
     secp256k1_blake160_multisig_all: {
         name: 'secp256k1_blake160_multisig_all',
-        script: {
-            codeHash: '0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c',
-                            index: 1,
-                        },
-                        depType: 'depGroup',
-                    },
-                },
-            ],
-        },
+        script: advanced_2.MAINNET_SCRIPTS.Secp256k1Multisig,
     },
     sudt: {
         name: 'sudt',
@@ -297,57 +172,15 @@ exports.MAINNET_SYSTEM_SCRIPTS = {
     },
     xudt: {
         name: 'xudt',
-        script: {
-            codeHash: '0x50bd8d6680b8b9cf98b73f3c08faf8b2a21914311954118ad6609be6e78a1b95',
-            hashType: 'data1',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xc07844ce21b38e4b071dd0e1ee3b0e27afd8d7532491327f39b786343f558ab7',
-                            index: 0,
-                        },
-                        depType: 'code',
-                    },
-                },
-            ],
-        },
+        script: advanced_2.MAINNET_SCRIPTS.XUdt,
     },
     omnilock: {
         name: 'omnilock',
-        script: {
-            codeHash: '0x9b819793a64463aed77c615d6cb226eea5487ccfc0783043a587254cda2b6f26',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0xc76edf469816aa22f416503c38d0b533d2a018e253e379f134c3985b3472c842',
-                            index: 0,
-                        },
-                        depType: 'code',
-                    },
-                },
-            ],
-        },
+        script: advanced_2.MAINNET_SCRIPTS.OmniLock,
     },
     anyone_can_pay: {
         name: 'anyone_can_pay',
-        script: {
-            codeHash: '0xd369597ff47f29fbc0d47d2e3775370d1250b85140c670e4718af712983a2354',
-            hashType: 'type',
-            cellDeps: [
-                {
-                    cellDep: {
-                        outPoint: {
-                            txHash: '0x4153a2014952d7cac45f285ce9a7c5c0c0e1b21f2d378b82ac1433cb11c25c4d',
-                            index: 0,
-                        },
-                        depType: 'depGroup',
-                    },
-                },
-            ],
-        },
+        script: advanced_2.MAINNET_SCRIPTS.AnyoneCanPay,
     },
     always_success: undefined,
     spore: {

package/dist/scripts/type.d.ts

@@ -25,6 +25,11 @@ export interface ScriptInfo {
             };
             depType: DepType;
         };
+        type?: {
+            codeHash: `0x${string}`;
+            hashType: HashType;
+            args: `0x${string}`;
+        };
     }[];
 }
 export interface SystemScript {

package/package.json

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

package/templates/v3/offckb.config.example.ts

@@ -21,7 +21,7 @@ export enum SystemScriptName {
 
 export interface ScriptInfo {
   codeHash: `0x${string}`;
-  hashType: 'type' | 'data';
+  hashType: 'type' | 'data' | 'data1';
   cellDeps: {
     cellDep: {
       outPoint: {
@@ -30,6 +30,11 @@ export interface ScriptInfo {
       };
       depType: 'code' | 'dep_group';
     };
+    type?: {
+      codeHash: `0x${string}`;
+      hashType: 'type' | 'data' | 'data1';
+      args: `0x${string}`;
+    };
   }[];
 }