@offckb/cli 0.3.0-rc3 → 0.3.0-rc5

package/README.md

@@ -60,28 +60,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._
@@ -212,6 +213,12 @@ To deploy the script, cd into the frontend folder and run:
 cd frontend && offckb deploy --network <devnet/testnet>
 ```
 
+Pass `--type-id` option if you want Scripts to be upgradable
+
+```sh
+cd frontend && offckb deploy --type-id --network <devnet/testnet>
+```
+
 Once the deployment is done, you can use the following command to check the deployed scripts:
 
 ```sh

package/dist/cfg/setting.d.ts

@@ -1,11 +1,20 @@
-import { AxiosProxyConfig } from 'axios';
 export declare const configPath: string;
 export declare const dataPath: string;
 export declare const cachePath: string;
 export declare const packageSrcPath: string;
 export declare const packageRootPath: string;
+export interface ProxyBasicCredentials {
+    username: string;
+    password: string;
+}
+export interface ProxyConfig {
+    host: string;
+    port: number;
+    auth?: ProxyBasicCredentials;
+    protocol?: string;
+}
 export interface Settings {
-    proxy?: AxiosProxyConfig;
+    proxy?: ProxyConfig;
     rpc: {
         proxyPort: number;
     };

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
@@ -97,19 +98,27 @@ program
 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);
 program
-    .command('deposit [toAddress] [amountInShannon]')
+    .command('deposit [toAddress] [amountInCKB]')
     .description('Deposit CKB tokens to address, only devnet and testnet')
     .option('--network <network>', 'Specify the network to deposit to', 'devnet')
-    .action((toAddress, amount, options) => __awaiter(void 0, void 0, void 0, function* () {
-    return (0, deposit_1.deposit)(toAddress, amount, options);
+    .action((toAddress, amountInCKB, options) => __awaiter(void 0, void 0, void 0, function* () {
+    return (0, deposit_1.deposit)(toAddress, amountInCKB, options);
 }));
 program
-    .command('transfer [toAddress] [amountInShannon]')
+    .command('transfer [toAddress] [amountInCKB]')
     .description('Transfer 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, amount, options) => __awaiter(void 0, void 0, void 0, function* () {
-    return (0, transfer_1.transfer)(toAddress, amount, options);
+    .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]')
@@ -123,6 +132,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('-t, --type-id', 'Specify if use upgradable type id to deploy the script')
     .option('--privkey <privkey>', 'Specify the private key to deploy scripts')
     .action((options) => (0, deploy_1.deploy)(options));
 program

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

@@ -10,19 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.balanceOf = void 0;
-const lumos_1 = require("@ckb-lumos/lumos");
-const ckb_1 = require("../util/ckb");
+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);
-        const ckb = new ckb_1.CKB(network);
-        const lumosConfig = ckb.getLumosConfig();
-        const balance = yield ckb.capacityOf(address, lumosConfig);
-        const balanceInCKB = balance.div(lumos_1.BI.from('100000000'));
+        const ckb = new ckb_1.CKB({ network });
+        const balanceInCKB = yield ckb.balance(address);
         console.log(`Balance: ${balanceInCKB} CKB`);
+        process.exit(0);
     });
 }
 exports.balanceOf = balanceOf;

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,6 +1,7 @@
-import { NetworkOption } from '../util/type';
+import { NetworkOption } from '../type/base';
 export interface DeployOptions extends NetworkOption {
     target: string | null | undefined;
     privkey?: string | null;
+    typeId?: boolean;
 }
 export declare function deploy(opt?: DeployOptions): Promise<void>;

package/dist/cmd/deploy.js

@@ -13,36 +13,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
-const lumos_1 = require("@ckb-lumos/lumos");
-const fs_1 = __importDefault(require("fs"));
-const type_1 = require("../util/type");
+const base_1 = require("../type/base");
 const path_1 = __importDefault(require("path"));
-const ckb_1 = require("../util/ckb");
 const account_1 = require("../cfg/account");
-const fs_2 = require("../util/fs");
+const fs_1 = require("../util/fs");
 const validator_1 = require("../util/validator");
-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");
-function deploy(opt = { network: type_1.Network.devnet, target: null }) {
+const deploy_1 = require("../deploy");
+const ckb_1 = require("../sdk/ckb");
+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;
         (0, validator_1.validateNetworkOpt)(network);
-        const ckb = new ckb_1.CKB(network);
+        const ckb = new ckb_1.CKB({ network });
         // we use deployerAccount to deploy contract by default
         const privateKey = opt.privkey || account_1.deployerAccount.privkey;
-        const lumosConfig = ckb.getLumosConfig();
-        const from = ckb_1.CKB.generateAccountFromPrivateKey(privateKey, lumosConfig);
+        const enableTypeId = (_a = opt.typeId) !== null && _a !== void 0 ? _a : false;
         const targetFolder = opt.target;
         if (targetFolder) {
-            const binFolder = (0, fs_2.isAbsolutePath)(targetFolder) ? targetFolder : path_1.default.resolve(process.cwd(), targetFolder);
-            const bins = (0, fs_2.listBinaryFilesInFolder)(binFolder);
+            const binFolder = (0, fs_1.isAbsolutePath)(targetFolder) ? targetFolder : path_1.default.resolve(process.cwd(), targetFolder);
+            const bins = (0, fs_1.listBinaryFilesInFolder)(binFolder);
             const binPaths = bins.map((bin) => path_1.default.resolve(binFolder, bin));
-            const results = yield deployBinaries(binPaths, from, ckb);
+            const results = yield (0, deploy_1.deployBinaries)(binPaths, privateKey, enableTypeId, ckb);
             // record the deployed contract infos
-            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, false); // we don't update my-scripts.json since we don't know where the file is
             return;
         }
         // check if target workspace is valid
@@ -53,105 +47,10 @@ function deploy(opt = { network: type_1.Network.devnet, target: null }) {
             return console.debug('Not a valid offCKB dapp workspace.');
         }
         // read contract bin folder
-        const bins = getToDeployBinsPath();
-        const results = yield deployBinaries(bins, from, ckb);
+        const bins = (0, deploy_1.getToDeployBinsPath)();
+        const results = yield (0, deploy_1.deployBinaries)(bins, privateKey, enableTypeId, ckb);
         // record the deployed contract infos
-        recordDeployResult(results, network);
+        (0, deploy_1.recordDeployResult)(results, network);
     });
 }
 exports.deploy = deploy;
-function getToDeployBinsPath() {
-    const userOffCKBConfigPath = path_1.default.resolve(process.cwd(), 'offckb.config.ts');
-    const fileContent = fs_1.default.readFileSync(userOffCKBConfigPath, 'utf-8');
-    const match = fileContent.match(/contractBinFolder:\s*['"]([^'"]+)['"]/);
-    if (match && match[1]) {
-        const contractBinFolderValue = match[1];
-        const binFolderPath = (0, fs_2.isAbsolutePath)(contractBinFolderValue)
-            ? contractBinFolderValue
-            : path_1.default.resolve(process.cwd(), contractBinFolderValue);
-        const bins = (0, fs_2.listBinaryFilesInFolder)(binFolderPath);
-        return bins.map((bin) => path_1.default.resolve(binFolderPath, bin));
-    }
-    else {
-        console.log('contractBinFolder value not found in offckb.config.ts');
-        return [];
-    }
-}
-function recordDeployResult(results, network, updateMyScriptsJsonFile = true) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (results.length === 0) {
-            return;
-        }
-        for (const result of results) {
-            (0, toml_1.generateDeploymentToml)(result.deploymentOptions, network);
-            (0, migration_1.generateDeploymentRecipeJsonFile)(result.deploymentOptions.name, result.deploymentRecipe, network);
-        }
-        // update my-scripts.json
-        if (updateMyScriptsJsonFile) {
-            const userOffCKBConfigPath = path_1.default.resolve(process.cwd(), 'offckb.config.ts');
-            const folder = offckb_config_1.OffCKBConfigFile.readContractInfoFolder(userOffCKBConfigPath);
-            if (folder) {
-                const myScriptsFilePath = path_1.default.resolve(folder, 'my-scripts.json');
-                (0, gen_1.genMyScriptsJsonFile)(myScriptsFilePath);
-            }
-        }
-        console.log('done.');
-    });
-}
-function deployBinaries(binPaths, from, ckb) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (binPaths.length === 0) {
-            console.log('No binary to deploy.');
-        }
-        const results = [];
-        for (const bin of binPaths) {
-            const result = yield deployBinary(bin, from, ckb);
-            results.push(result);
-        }
-        return results;
-    });
-}
-function deployBinary(binPath, from, ckb) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const bin = yield (0, fs_2.readFileToUint8Array)(binPath);
-        const contractName = path_1.default.basename(binPath);
-        const result = yield lumos_1.commons.deploy.generateDeployWithTypeIdTx({
-            cellProvider: ckb.indexer,
-            fromInfo: from.address,
-            scriptBinary: bin,
-            config: ckb.getLumosConfig(),
-        });
-        // send deploy tx
-        let txSkeleton = result.txSkeleton;
-        txSkeleton = lumos_1.commons.common.prepareSigningEntries(txSkeleton);
-        const message = txSkeleton.get('signingEntries').get(0).message;
-        const Sig = lumos_1.hd.key.signRecoverable(message, from.privKey);
-        const tx = lumos_1.helpers.sealTransaction(txSkeleton, [Sig]);
-        const res = yield ckb.rpc.sendTransaction(tx, 'passthrough');
-        console.log(`contract ${contractName} deployed, tx hash:`, res);
-        console.log('wait 4 blocks..');
-        yield ckb.indexer.waitForSync(-4); // why negative 4? a bug in ckb-lumos
-        // todo: handle multiple cell recipes?
-        return {
-            deploymentOptions: {
-                name: contractName,
-                binFilePath: binPath,
-                enableTypeId: true,
-                lockScript: tx.outputs[+result.scriptConfig.INDEX].lock,
-            },
-            deploymentRecipe: {
-                cellRecipes: [
-                    {
-                        name: contractName,
-                        txHash: result.scriptConfig.TX_HASH,
-                        index: result.scriptConfig.INDEX,
-                        occupiedCapacity: '0x' + BigInt(tx.outputsData[+result.scriptConfig.INDEX].slice(2).length / 2).toString(16),
-                        dataHash: (0, utils_1.ckbHash)(tx.outputsData[+result.scriptConfig.INDEX]),
-                        typeId: (0, utils_1.computeScriptHash)(result.typeId),
-                    },
-                ],
-                depGroupRecipes: [],
-            },
-        };
-    });
-}

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, amount: string, opt?: DepositOptions): Promise<void>;
+export declare function deposit(toAddress: string, amountInCKB: string, opt?: DepositOptions): Promise<void>;

package/dist/cmd/deposit.js

@@ -10,29 +10,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deposit = void 0;
-const ckb_1 = require("../util/ckb");
+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, amount, 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);
-        const ckb = new ckb_1.CKB(network);
-        const lumosConfig = ckb.getLumosConfig();
+        const ckb = new ckb_1.CKB({ network });
         if (network === 'testnet') {
             return yield depositFromTestnetFaucet(toAddress, ckb);
         }
         // deposit from devnet miner
-        const from = ckb_1.CKB.generateAccountFromPrivateKey(account_1.ckbDevnetMinerAccount.privkey, lumosConfig);
+        const privateKey = account_1.ckbDevnetMinerAccount.privkey;
         const txHash = yield ckb.transfer({
-            from: from.address,
-            to: toAddress,
-            privKey: from.privKey,
-            amount,
-        }, lumosConfig);
+            toAddress,
+            privateKey,
+            amountInCKB,
+        });
         console.log('tx hash: ', txHash);
     });
 }
@@ -40,29 +38,33 @@ exports.deposit = deposit;
 function depositFromTestnetFaucet(ckbAddress, ckb) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('testnet faucet only supports fixed-amount claim: 10,000 CKB');
-        const lumosConfig = ckb.getLumosConfig();
         const randomAccountPrivateKey = '0x' + generateHex(64);
-        const randomAccount = ckb_1.CKB.generateAccountFromPrivateKey(randomAccountPrivateKey, lumosConfig);
-        console.log(`use random account to claim from faucet: \n\nprivate key: ${randomAccountPrivateKey}\n\n address: ${randomAccount.address}`);
+        const randomAccountAddress = yield ckb.buildSecp256k1Address(randomAccountPrivateKey);
+        console.log(`use random account to claim from faucet: \n\nprivate key: ${randomAccountPrivateKey}\n\n address: ${randomAccountAddress}`);
         try {
-            yield sendClaimRequest(randomAccount.address);
-            console.log('Wait for 4 blocks to transfer all from random account to your account..');
+            const claimResponse = yield sendClaimRequest(randomAccountAddress);
+            console.log('Wait for claim transaction confirmed to transfer all from random account to your account..');
             console.log('You can transfer by yourself if it ends up fails..');
-            yield ckb.indexer.waitForSync(-4);
-            const txHash = yield ckb.transferAll(randomAccount.privKey, ckbAddress, lumosConfig);
-            console.log(`Done, check ${(0, link_1.buildTestnetTxLink)(txHash)} for details.`);
+            if (claimResponse.txHash != null) {
+                yield ckb.waitForTxConfirm(claimResponse.txHash);
+            }
+            else {
+                yield ckb.waitForBlocksBy(4); // wait 4 blocks
+            }
         }
         catch (error) {
             console.log(error);
-            throw new Error('request failed.');
+            throw new Error('claim request failed.');
         }
+        const txHash = yield ckb.transferAll({ privateKey: randomAccountPrivateKey, toAddress: ckbAddress });
+        console.log(`Done, check ${(0, link_1.buildTestnetTxLink)(txHash)} for details.`);
     });
 }
 function sendClaimRequest(toAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         const url = 'https://faucet-api.nervos.org/claim_events'; // Replace 'YOUR_API_ENDPOINT' with the actual API endpoint
         const headers = {
-            'User-Agent': 'axios-requests/2.31.0',
+            'User-Agent': 'node-fetch-requests/v2',
             'Accept-Encoding': 'gzip, deflate',
             Accept: '*/*',
             Connection: 'keep-alive',
@@ -71,22 +73,18 @@ function sendClaimRequest(toAddress) {
         const body = JSON.stringify({
             claim_event: {
                 address_hash: toAddress,
-                amount: '10000',
+                amount: '10000', // unit: CKB
             },
         });
         const config = {
             method: 'post',
-            url: url,
             headers: headers,
-            data: body,
+            body,
         };
-        try {
-            const response = yield request_1.Request.send(config);
-            console.log('send claim request, status: ', response.status); // Handle the response data here
-        }
-        catch (error) {
-            console.error('Error:', error);
-        }
+        const response = yield request_1.Request.send(url, config);
+        console.log('send claim request, status: ', response.status); // Handle the response data here
+        const jsonResponse = yield response.json();
+        return jsonResponse.data.attributes;
     });
 }
 function generateHex(length) {

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;
     }