@offckb/cli 0.3.0-canary-1bb6394.0 → 0.3.0-canary-ee0ab6a.0

package/README.md

@@ -58,28 +58,29 @@ Usage: offckb [options] [command]
 ckb development network for your first try
 
 Options:
-  -V, --version                                     output the version number
-  -h, --help                                        display help for command
+  -V, --version                                 output the version number
+  -h, --help                                    display help for command
 
 Commands:
-  create [options] [your-project-name]              Create a new dApp from bare templates
-  node [options] [CKB-Version]                      Use the CKB to start devnet
-  proxy-rpc [options]                               Start the rpc proxy server
-  clean                                             Clean the devnet data, need to stop running the chain first
-  accounts                                          Print account list info
-  list-hashes [CKB-Version]                         Use the CKB to list blockchain scripts hashes
-  inject-config                                     Add offckb.config.ts to your frontend workspace
-  sync-scripts                                      Sync scripts json file in your frontend workspace
-  deposit [options] [toAddress] [amountInShannon]   Deposit CKB tokens to address, only devnet and testnet
-  transfer [options] [toAddress] [amountInShannon]  Transfer CKB tokens to address, only devnet and testnet
-  balance [options] [toAddress]                     Check account balance, only devnet and testnet
-  deploy [options]                                  Deploy contracts to different networks, only supports devnet and testnet
-  my-scripts [options]                              Show deployed contracts info on different networks, only supports devnet and testnet
-  config <action> [item] [value]                    do a configuration action
-  debug [options]                                   CKB Debugger for development
-  system-scripts [options]                          Output system scripts of the local devnet
-  mol [options]                                     Generate CKB Moleculec binding code for development
-  help [command]                                    display help for command
+  create [options] [your-project-name]          Create a new dApp from bare templates
+  node [options] [CKB-Version]                  Use the CKB to start devnet
+  proxy-rpc [options]                           Start the rpc proxy server
+  clean                                         Clean the devnet data, need to stop running the chain first
+  accounts                                      Print account list info
+  list-hashes [CKB-Version]                     Use the CKB to list blockchain scripts hashes
+  inject-config                                 Add offckb.config.ts to your frontend workspace
+  sync-scripts                                  Sync scripts json files in your frontend workspace
+  deposit [options] [toAddress] [amountInCKB]   Deposit CKB tokens to address, only devnet and testnet
+  transfer [options] [toAddress] [amountInCKB]  Transfer CKB tokens to address, only devnet and testnet
+  transfer-all [options] [toAddress]            Transfer All CKB tokens to address, only devnet and testnet
+  balance [options] [toAddress]                 Check account balance, only devnet and testnet
+  deploy [options]                              Deploy contracts to different networks, only supports devnet and testnet
+  my-scripts [options]                          Show deployed contracts info on different networks, only supports devnet and testnet
+  config <action> [item] [value]                do a configuration action
+  debug [options]                               CKB Debugger for development
+  system-scripts [options]                      Output system scripts of the local devnet
+  mol [options]                                 Generate CKB Moleculec binding code for development
+  help [command]                                display help for command
 ```
 
 _Use `offckb [command] -h` to learn more about a specific command._

package/dist/cli.js

@@ -53,6 +53,7 @@ const system_scripts_1 = require("./cmd/system-scripts");
 const proxy_rpc_1 = require("./cmd/proxy-rpc");
 const mol_1 = require("./cmd/mol");
 const fs = __importStar(require("fs"));
+const transfer_all_1 = require("./cmd/transfer-all");
 const version = require('../package.json').version;
 const description = require('../package.json').description;
 // fix windows terminal encoding of simplified chinese text
@@ -111,6 +112,14 @@ program
     .action((toAddress, amountInCKB, options) => __awaiter(void 0, void 0, void 0, function* () {
     return (0, transfer_1.transfer)(toAddress, amountInCKB, options);
 }));
+program
+    .command('transfer-all [toAddress]')
+    .description('Transfer All CKB tokens to address, only devnet and testnet')
+    .option('--network <network>', 'Specify the network to transfer to', 'devnet')
+    .option('--privkey <privkey>', 'Specify the private key to deploy scripts')
+    .action((toAddress, options) => __awaiter(void 0, void 0, void 0, function* () {
+    return (0, transfer_all_1.transferAll)(toAddress, options);
+}));
 program
     .command('balance [toAddress]')
     .description('Check account balance, only devnet and testnet')

package/dist/cmd/balance.d.ts

@@ -1,4 +1,4 @@
-import { NetworkOption } from '../util/type';
+import { NetworkOption } from '../type/base';
 export interface BalanceOption extends NetworkOption {
 }
 export declare function balanceOf(address: string, opt?: BalanceOption): Promise<void>;

package/dist/cmd/balance.js

@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.balanceOf = void 0;
 const ckb_1 = require("../sdk/ckb");
 const validator_1 = require("../util/validator");
-const type_1 = require("../util/type");
-function balanceOf(address, opt = { network: type_1.Network.devnet }) {
+const base_1 = require("../type/base");
+function balanceOf(address, opt = { network: base_1.Network.devnet }) {
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
         (0, validator_1.validateNetworkOpt)(network);

package/dist/cmd/debug.d.ts

@@ -1,4 +1,4 @@
-import { Network } from '../util/type';
+import { Network } from '../type/base';
 export declare function debugTransaction(txHash: string, network: Network): void;
 export declare function buildTransactionDebugOptions(txHash: string, network: Network): {
     name: string;

package/dist/cmd/debug.js

@@ -10,7 +10,7 @@ const fs_1 = __importDefault(require("fs"));
 const ckb_tx_dumper_1 = require("../tools/ckb-tx-dumper");
 const path_1 = __importDefault(require("path"));
 const advanced_1 = require("@ckb-ccc/core/advanced");
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 function debugTransaction(txHash, network) {
     const txFile = buildTxFileOptionBy(txHash, network);
     const opts = buildTransactionDebugOptions(txHash, network);
@@ -91,10 +91,10 @@ function buildTxFileOptionBy(txHash, network) {
 exports.buildTxFileOptionBy = buildTxFileOptionBy;
 function buildTransactionJsonFilePath(network, txHash) {
     const settings = (0, setting_1.readSettings)();
-    if (network === type_1.Network.devnet) {
+    if (network === base_1.Network.devnet) {
         return `${settings.devnet.transactionsPath}/${txHash}.json`;
     }
-    if (network === type_1.Network.testnet) {
+    if (network === base_1.Network.testnet) {
         return `${settings.testnet.transactionsPath}/${txHash}.json`;
     }
     return `${settings.mainnet.transactionsPath}/${txHash}.json`;
@@ -102,10 +102,10 @@ function buildTransactionJsonFilePath(network, txHash) {
 exports.buildTransactionJsonFilePath = buildTransactionJsonFilePath;
 function buildDebugFullTransactionFilePath(network, txHash) {
     const settings = (0, setting_1.readSettings)();
-    if (network === type_1.Network.devnet) {
+    if (network === base_1.Network.devnet) {
         return `${settings.devnet.debugFullTransactionsPath}/${txHash}.json`;
     }
-    if (network === type_1.Network.testnet) {
+    if (network === base_1.Network.testnet) {
         return `${settings.testnet.debugFullTransactionsPath}/${txHash}.json`;
     }
     return `${settings.mainnet.debugFullTransactionsPath}/${txHash}.json`;

package/dist/cmd/deploy.d.ts

@@ -1,4 +1,4 @@
-import { NetworkOption } from '../util/type';
+import { NetworkOption } from '../type/base';
 export interface DeployOptions extends NetworkOption {
     target: string | null | undefined;
     privkey?: string | null;

package/dist/cmd/deploy.js

@@ -13,14 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const path_1 = __importDefault(require("path"));
 const account_1 = require("../cfg/account");
 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: type_1.Network.devnet, typeId: false, target: null }) {
+function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: null }) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;

package/dist/cmd/deposit.d.ts

@@ -1,4 +1,4 @@
-import { NetworkOption } from '../util/type';
+import { NetworkOption } from '../type/base';
 export interface DepositOptions extends NetworkOption {
 }
 export declare function deposit(toAddress: string, amountInCKB: string, opt?: DepositOptions): Promise<void>;

package/dist/cmd/deposit.js

@@ -12,11 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deposit = void 0;
 const ckb_1 = require("../sdk/ckb");
 const account_1 = require("../cfg/account");
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const link_1 = require("../util/link");
 const validator_1 = require("../util/validator");
 const request_1 = require("../util/request");
-function deposit(toAddress, amountInCKB, opt = { network: type_1.Network.devnet }) {
+function deposit(toAddress, amountInCKB, opt = { network: base_1.Network.devnet }) {
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
         (0, validator_1.validateNetworkOpt)(network);

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

@@ -1,4 +1,4 @@
-import { H256 } from '../util/type';
+import { H256 } from '../type/base';
 export interface SystemCell {
     path: string;
     tx_hash: H256;

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

@@ -1,4 +1,4 @@
-import { NetworkOption } from '../util/type';
+import { NetworkOption } from '../type/base';
 export interface DeployedScriptOption extends NetworkOption {
 }
 export declare function printMyScripts(option?: DeployedScriptOption): void;

package/dist/cmd/my-scripts.js

@@ -4,9 +4,9 @@ exports.printMyScripts = void 0;
 const toml_1 = require("../deploy/toml");
 const util_1 = require("../deploy/util");
 const util_2 = require("../scripts/util");
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const validator_1 = require("../util/validator");
-function printMyScripts(option = { network: type_1.Network.devnet }) {
+function printMyScripts(option = { network: base_1.Network.devnet }) {
     const network = option.network;
     (0, validator_1.validateNetworkOpt)(network);
     const scriptsInfo = (0, util_2.readUserDeployedScriptsInfo)(network);

package/dist/cmd/node.js

@@ -16,7 +16,7 @@ const install_1 = require("../node/install");
 const setting_1 = require("../cfg/setting");
 const encoding_1 = require("../util/encoding");
 const rpc_proxy_1 = require("../tools/rpc-proxy");
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 function node({ version, noProxyServer }) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
@@ -54,7 +54,7 @@ function node({ version, noProxyServer }) {
                     if (!noProxyServer) {
                         const ckbRpc = settings.devnet.rpcUrl;
                         const port = settings.rpc.proxyPort;
-                        const proxy = (0, rpc_proxy_1.createRPCProxy)(type_1.Network.devnet, ckbRpc, port);
+                        const proxy = (0, rpc_proxy_1.createRPCProxy)(base_1.Network.devnet, ckbRpc, port);
                         proxy.start();
                     }
                 }

package/dist/cmd/proxy-rpc.d.ts

@@ -1,4 +1,4 @@
-import { Network } from '../util/type';
+import { Network } from '../type/base';
 export interface ProxyRpcOptions {
     ckbRpc?: string;
     port?: number;

package/dist/cmd/proxy-rpc.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.proxyRpc = void 0;
 const setting_1 = require("../cfg/setting");
 const rpc_proxy_1 = require("../tools/rpc-proxy");
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 function proxyRpc(options) {
     const settings = (0, setting_1.readSettings)();
-    const network = options.network || type_1.Network.devnet;
+    const network = options.network || base_1.Network.devnet;
     let ckbRpc = options.ckbRpc;
     if (!ckbRpc) {
         ckbRpc =
-            network === type_1.Network.devnet
+            network === base_1.Network.devnet
                 ? settings.devnet.rpcUrl
-                : network === type_1.Network.testnet
+                : network === base_1.Network.testnet
                     ? settings.testnet.rpcUrl
                     : settings.mainnet.rpcUrl;
     }

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

@@ -1,4 +1,3 @@
-import { config } from '@ckb-lumos/lumos';
 import { SystemCell } from './list-hashes';
 import { CellDepInfoLike, Script } from '@ckb-ccc/core';
 import { SystemScriptsRecord } from '../scripts/type';
@@ -36,7 +35,76 @@ export declare function systemCellToScriptInfo(cell: SystemCell, depType: 'code'
         };
     }[];
 };
-export declare function toLumosConfig(scripts: SystemScriptsRecord, addressPrefix?: 'ckb' | 'ckt'): config.Config;
+export declare function toLumosConfig(scripts: SystemScriptsRecord, addressPrefix?: 'ckb' | 'ckt'): {
+    PREFIX: "ckb" | "ckt";
+    SCRIPTS: {
+        SECP256K1_BLAKE160: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+            SHORT_ID: number;
+        };
+        SECP256K1_BLAKE160_MULTISIG: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+        };
+        DAO: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+            SHORT_ID: number;
+        };
+        SUDT: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+        };
+        XUDT: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+        };
+        OMNILOCK: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+        };
+        ANYONE_CAN_PAY: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+        };
+        SPORE: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+        };
+        SPORE_CLUSTER: {
+            CODE_HASH: `0x${string}`;
+            HASH_TYPE: import("@ckb-ccc/core").HashType;
+            TX_HASH: `0x${string}`;
+            INDEX: string;
+            DEP_TYPE: import("@ckb-ccc/core").DepType;
+        };
+    };
+};
 export declare function toCCCKnownScripts(scripts: SystemScriptsRecord): Record<string, Pick<Script, "codeHash" | "hashType"> & {
     cellDeps: CellDepInfoLike[];
 }>;

package/dist/cmd/system-scripts.js

@@ -213,6 +213,7 @@ function toLumosConfig(scripts, addressPrefix = 'ckt') {
         },
     };
     if (scripts.always_success) {
+        // @ts-expect-error we remove the lumos config type deps
         config.SCRIPTS['ALWAYS_SUCCESS'] = {
             CODE_HASH: scripts.always_success.script.codeHash,
             HASH_TYPE: scripts.always_success.script.hashType,
@@ -222,6 +223,7 @@ function toLumosConfig(scripts, addressPrefix = 'ckt') {
         };
     }
     if (scripts.spore_cluster_agent) {
+        // @ts-expect-error we remove the lumos config type deps
         config.SCRIPTS['SPORE_CLUSTER_AGENT'] = {
             CODE_HASH: scripts.spore_cluster_agent.script.codeHash,
             HASH_TYPE: scripts.spore_cluster_agent.script.hashType,
@@ -231,6 +233,7 @@ function toLumosConfig(scripts, addressPrefix = 'ckt') {
         };
     }
     if (scripts.spore_cluster_proxy) {
+        // @ts-expect-error we remove the lumos config type deps
         config.SCRIPTS['SPORE_CLUSTER_PROXY'] = {
             CODE_HASH: scripts.spore_cluster_proxy.script.codeHash,
             HASH_TYPE: scripts.spore_cluster_proxy.script.hashType,
@@ -240,6 +243,7 @@ function toLumosConfig(scripts, addressPrefix = 'ckt') {
         };
     }
     if (scripts.spore_extension_lua) {
+        // @ts-expect-error we remove the lumos config type deps
         config.SCRIPTS['SPORE_LUA'] = {
             CODE_HASH: scripts.spore_extension_lua.script.codeHash,
             HASH_TYPE: scripts.spore_extension_lua.script.hashType,

package/dist/cmd/transfer-all.d.ts

@@ -0,0 +1,5 @@
+import { NetworkOption } from '../type/base';
+export interface TransferAllOptions extends NetworkOption {
+    privkey?: string | null;
+}
+export declare function transferAll(toAddress: string, opt?: TransferAllOptions): Promise<void>;

package/dist/cmd/transfer-all.js

@@ -0,0 +1,37 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transferAll = void 0;
+const ckb_1 = require("../sdk/ckb");
+const base_1 = require("../type/base");
+const link_1 = require("../util/link");
+const validator_1 = require("../util/validator");
+function transferAll(toAddress, opt = { network: base_1.Network.devnet }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const network = opt.network;
+        (0, validator_1.validateNetworkOpt)(network);
+        if (opt.privkey == null) {
+            throw new Error('--privkey is required!');
+        }
+        const privateKey = opt.privkey;
+        const ckb = new ckb_1.CKB({ network });
+        const txHash = yield ckb.transferAll({
+            toAddress,
+            privateKey,
+        });
+        if (network === 'testnet') {
+            console.log(`Successfully transfer, check ${(0, link_1.buildTestnetTxLink)(txHash)} for details.`);
+            return;
+        }
+        console.log('Successfully transfer, txHash:', txHash);
+    });
+}
+exports.transferAll = transferAll;

package/dist/cmd/transfer.d.ts

@@ -1,4 +1,4 @@
-import { NetworkOption } from '../util/type';
+import { NetworkOption } from '../type/base';
 export interface TransferOptions extends NetworkOption {
     privkey?: string | null;
 }

package/dist/cmd/transfer.js

@@ -11,10 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transfer = void 0;
 const ckb_1 = require("../sdk/ckb");
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const link_1 = require("../util/link");
 const validator_1 = require("../util/validator");
-function transfer(toAddress, amountInCKB, opt = { network: type_1.Network.devnet }) {
+function transfer(toAddress, amountInCKB, opt = { network: base_1.Network.devnet }) {
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
         (0, validator_1.validateNetworkOpt)(network);

package/dist/deploy/index.d.ts

@@ -1,8 +1,8 @@
 import { DeploymentOptions } from '../deploy/toml';
 import { DeploymentRecipe } from '../deploy/migration';
-import { HexString } from '@ckb-lumos/lumos';
-import { Network } from '../util/type';
+import { Network } from '../type/base';
 import { CKB } from '../sdk/ckb';
+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>;

package/dist/deploy/index.js

@@ -15,12 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployBinary = exports.deployBinaries = exports.recordDeployResult = exports.getToDeployBinsPath = void 0;
 const toml_1 = require("../deploy/toml");
 const migration_1 = require("../deploy/migration");
-const utils_1 = require("@ckb-lumos/lumos/utils");
 const gen_1 = require("../scripts/gen");
 const offckb_config_1 = require("../template/offckb-config");
 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');
     const fileContent = fs_2.default.readFileSync(userOffCKBConfigPath, 'utf-8');
@@ -98,7 +98,7 @@ function deployBinary(binPath, privateKey, enableTypeId, ckb) {
         if (enableTypeId && typeIdScript == null) {
             throw new Error('type id script is null while enableTypeId is true.');
         }
-        const typeIdScriptHash = enableTypeId ? (0, utils_1.computeScriptHash)(typeIdScript) : undefined;
+        const typeIdScriptHash = enableTypeId ? core_1.ccc.Script.from(typeIdScript).hash() : undefined;
         // todo: handle multiple cell recipes?
         return {
             deploymentOptions: {
@@ -114,7 +114,7 @@ function deployBinary(binPath, privateKey, enableTypeId, ckb) {
                         txHash,
                         index: '0x' + index.toString(16),
                         occupiedCapacity,
-                        dataHash: (0, utils_1.ckbHash)(tx.outputsData[+index]),
+                        dataHash: core_1.ccc.hashCkb(tx.outputsData[+index]),
                         typeId: typeIdScriptHash,
                     },
                 ],

package/dist/deploy/migration.d.ts

@@ -1,5 +1,5 @@
-import { HexNumber } from '@ckb-lumos/lumos';
-import { Network } from '../util/type';
+import { Network } from '../type/base';
+import { HexNumber } from '../type/base';
 export interface CellRecipe {
     name: string;
     txHash: string;

package/dist/deploy/migration.js

@@ -27,25 +27,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploymentRecipeFromJson = exports.deploymentRecipeToJson = exports.getNewestMigrationFile = exports.getMigrationFolderPath = exports.getFormattedMigrationDate = exports.readDeploymentMigrationFile = exports.generateDeploymentMigrationFile = exports.Migration = void 0;
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const path_1 = __importStar(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const util_1 = require("./util");
 class Migration {
-    static find(scriptName, network = type_1.Network.devnet) {
+    static find(scriptName, network = base_1.Network.devnet) {
         const filePath = getMigrationFolderPath(scriptName, network);
         const migrationFile = getNewestMigrationFile(filePath);
         if (migrationFile == null)
             return null;
         return readDeploymentMigrationFile(migrationFile);
     }
-    static isDeployed(scriptName, network = type_1.Network.devnet) {
+    static isDeployed(scriptName, network = base_1.Network.devnet) {
         const deploymentReceipt = Migration.find(scriptName, network);
         if (deploymentReceipt == null)
             return false;
         return true;
     }
-    static isDeployedWithTypeId(scriptName, network = type_1.Network.devnet) {
+    static isDeployedWithTypeId(scriptName, network = base_1.Network.devnet) {
         const isDeployed = this.isDeployed(scriptName, network);
         if (isDeployed === false)
             return false;
@@ -57,7 +57,7 @@ class Migration {
     }
 }
 exports.Migration = Migration;
-function generateDeploymentMigrationFile(name, deploymentRecipe, network = type_1.Network.devnet) {
+function generateDeploymentMigrationFile(name, deploymentRecipe, network = base_1.Network.devnet) {
     const cellRecipes = deploymentRecipe.cellRecipes;
     const depGroupRecipes = deploymentRecipe.depGroupRecipes;
     const jsonString = JSON.stringify(deploymentRecipeToJson({ cellRecipes, depGroupRecipes }), null, 2);

package/dist/deploy/toml.d.ts

@@ -1,11 +1,15 @@
-import { Script } from '@ckb-lumos/lumos';
-import { Network } from '../util/type';
+import { Network } from '../type/base';
 import { HashType } from '@ckb-ccc/core';
+import { HexString } from '../type/base';
 export interface DeploymentOptions {
     name: string;
     binFilePath: string;
     enableTypeId: boolean;
-    lockScript: Script;
+    lockScript: {
+        codeHash: HexString;
+        hashType: HashType;
+        args: HexString;
+    };
 }
 export interface DeploymentToml {
     cells: {

package/dist/deploy/util.d.ts

@@ -1,2 +1,2 @@
-import { Network } from '../util/type';
+import { Network } from '../type/base';
 export declare function getContractsPath(network: Network): string;

package/dist/deploy/util.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContractsPath = void 0;
 const setting_1 = require("../cfg/setting");
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 function getContractsPath(network) {
     const settings = (0, setting_1.readSettings)();
-    if (network === type_1.Network.devnet) {
+    if (network === base_1.Network.devnet) {
         return settings.devnet.contractsPath;
     }
-    if (network === type_1.Network.testnet) {
+    if (network === base_1.Network.testnet) {
         return settings.testnet.contractsPath;
     }
-    if (network === type_1.Network.mainnet) {
+    if (network === base_1.Network.mainnet) {
         return settings.mainnet.contractsPath;
     }
     throw new Error(`invalid network ${network}`);

package/dist/scripts/gen.js

@@ -31,7 +31,7 @@ const fs = __importStar(require("fs"));
 const public_1 = __importDefault(require("./public"));
 const system_scripts_1 = require("../cmd/system-scripts");
 const path_1 = __importDefault(require("path"));
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const util_1 = require("./util");
 function genSystemScripts() {
     const devnetScripts = (0, system_scripts_1.getSystemScriptsFromListHashes)();
@@ -54,9 +54,9 @@ function genSystemScriptsJsonFile(filePath) {
 exports.genSystemScriptsJsonFile = genSystemScriptsJsonFile;
 function genMyScripts() {
     const networkMyScripts = {
-        devnet: (0, util_1.readUserDeployedScriptsInfo)(type_1.Network.devnet),
-        testnet: (0, util_1.readUserDeployedScriptsInfo)(type_1.Network.testnet),
-        mainnet: (0, util_1.readUserDeployedScriptsInfo)(type_1.Network.mainnet),
+        devnet: (0, util_1.readUserDeployedScriptsInfo)(base_1.Network.devnet),
+        testnet: (0, util_1.readUserDeployedScriptsInfo)(base_1.Network.testnet),
+        mainnet: (0, util_1.readUserDeployedScriptsInfo)(base_1.Network.mainnet),
     };
     return networkMyScripts;
 }

package/dist/scripts/util.d.ts

@@ -1,3 +1,3 @@
 import { MyScriptsRecord } from '../scripts/type';
-import { Network } from '../util/type';
+import { Network } from '../type/base';
 export declare function readUserDeployedScriptsInfo(network: Network): MyScriptsRecord;

package/dist/sdk/ckb.d.ts

@@ -1,6 +1,5 @@
 import { ccc, Script } from '@ckb-ccc/core';
-import { Network } from '../util/type';
-import { HexNumber, HexString } from '@ckb-lumos/lumos';
+import { Network, HexNumber, HexString } from '../type/base';
 export declare class CKBProps {
     network?: Network;
     feeRate?: number;

package/dist/sdk/ckb.js

@@ -13,16 +13,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CKB = exports.CKBProps = void 0;
 const core_1 = require("@ckb-ccc/core");
-const type_1 = require("../util/type");
 const validator_1 = require("../util/validator");
 const network_1 = require("./network");
 const private_1 = require("../scripts/private");
 const migration_1 = require("../deploy/migration");
+const base_1 = require("../type/base");
 class CKBProps {
 }
 exports.CKBProps = CKBProps;
 class CKB {
-    constructor({ network = type_1.Network.devnet, feeRate = 1000, isEnableProxyRpc = false }) {
+    constructor({ network = base_1.Network.devnet, feeRate = 1000, isEnableProxyRpc = false }) {
         if (!(0, validator_1.isValidNetworkString)(network)) {
             throw new Error('invalid network option');
         }

package/dist/tools/rpc-proxy.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import http from 'http';
-import { Network } from '../util/type';
+import { Network } from '../type/base';
 export declare function createRPCProxy(network: Network, targetRpcUrl: string, port: number): {
     server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     network: Network;

package/dist/tools/rpc-proxy.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPCProxy = void 0;
 const http_proxy_1 = __importDefault(require("http-proxy"));
 const http_1 = __importDefault(require("http"));
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const fs_1 = __importDefault(require("fs"));
 const setting_1 = require("../cfg/setting");
 const path_1 = __importDefault(require("path"));
@@ -38,7 +38,7 @@ function createRPCProxy(network, targetRpcUrl, port) {
                     if (method === 'send_transaction') {
                         const tx = params[0];
                         // todo: record tx
-                        if (network === type_1.Network.devnet) {
+                        if (network === base_1.Network.devnet) {
                             const cccTx = cccA.JsonRpcTransformers.transactionTo(tx);
                             const txHash = cccTx.hash();
                             const settings = (0, setting_1.readSettings)();

package/dist/{util/type.d.ts → type/base.d.ts}

@@ -7,3 +7,5 @@ export interface NetworkOption {
     network: Network;
 }
 export type H256 = string;
+export type HexString = string;
+export type HexNumber = string;

package/dist/util/validator.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidVersion = exports.validateNetworkOpt = exports.isValidNetworkString = exports.validateExecDappEnvironment = exports.validateTypescriptWorkspace = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const type_1 = require("./type");
+const base_1 = require("../type/base");
 function validateTypescriptWorkspace() {
     const cwd = process.cwd();
     // Check if package.json exists
@@ -50,7 +50,7 @@ function validateNetworkOpt(network) {
     if (!isValidNetworkString(network)) {
         throw new Error('invalid network option, ' + network);
     }
-    if (network === type_1.Network.mainnet) {
+    if (network === base_1.Network.mainnet) {
         console.log('Mainnet not support yet. Please use CKB-CLI to operate on mainnet for better security. Check https://github.com/nervosnetwork/ckb-cli');
         process.exit(1);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.3.0-canary-1bb6394.0",
+  "version": "0.3.0-canary-ee0ab6a.0",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",
@@ -61,7 +61,6 @@
   },
   "dependencies": {
     "@ckb-ccc/core": "^0.0.16-alpha.3",
-    "@ckb-lumos/lumos": "0.23.0",
     "@iarna/toml": "^2.2.5",
     "@inquirer/prompts": "^4.1.0",
     "@types/http-proxy": "^1.17.15",