@offckb/cli 0.3.0 → 0.3.2

package/dist/cli.js

@@ -146,7 +146,7 @@ program
     .command('deploy')
     .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('--target <target>', 'Specify the script binaries file/folder path to deploy')
     .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')

package/dist/cmd/deploy.js

@@ -34,9 +34,8 @@ function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: u
         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);
-            const bins = (0, fs_1.listBinaryFilesInFolder)(binFolder);
-            const binPaths = bins.map((bin) => path_1.default.resolve(binFolder, bin));
+            const binFilesOrFolder = (0, fs_1.isAbsolutePath)(targetFolder) ? targetFolder : path_1.default.resolve(process.cwd(), targetFolder);
+            const binPaths = (0, fs_1.getBinaryFilesFromPath)(binFilesOrFolder);
             const results = yield (0, deploy_1.deployBinaries)(binPaths, privateKey, enableTypeId, ckb);
             // record the deployed contract infos
             (0, deploy_1.recordDeployResult)(results, network); // we don't update my-scripts.json since we don't know where the file is

package/dist/cmd/repl.d.ts

@@ -4,8 +4,14 @@ export interface ReplProp extends NetworkOption {
     proxyRpc?: boolean;
 }
 export declare function repl({ network, proxyRpc }: ReplProp): void;
-export declare function initGlobalClientBuilder(): {
+export declare function initGlobalClientBuilder(proxyRpc: boolean): {
     new: (network: Network) => ccc.ClientPublicTestnet | ccc.ClientPublicMainnet;
     fromUrl: (rpcUrl: string, network: Network) => ccc.ClientPublicTestnet | ccc.ClientPublicMainnet;
 };
 export declare function printHelpText(): void;
+export declare function buildSystemScripts(): {
+    new: (network: Network) => import("../scripts/type").SystemScriptsRecord | undefined;
+};
+export declare function buildMyScripts(): {
+    new: (network: Network) => import("../scripts/type").MyScriptsRecord;
+};

package/dist/cmd/repl.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printHelpText = exports.initGlobalClientBuilder = exports.repl = void 0;
+exports.buildMyScripts = exports.buildSystemScripts = exports.printHelpText = exports.initGlobalClientBuilder = exports.repl = void 0;
 const repl_1 = require("repl");
 const core_1 = require("@ckb-ccc/core");
 const advanced_1 = require("@ckb-ccc/core/advanced");
@@ -12,6 +12,8 @@ const base_1 = require("../type/base");
 const private_1 = require("../scripts/private");
 const account_json_1 = __importDefault(require("../../account/account.json"));
 const validator_1 = require("../util/validator");
+const gen_1 = require("../scripts/gen");
+const util_1 = require("../scripts/util");
 function repl({ network = base_1.Network.devnet, proxyRpc = false }) {
     (0, validator_1.validateNetworkOpt)(network);
     console.log(
@@ -25,15 +27,27 @@ function repl({ network = base_1.Network.devnet, proxyRpc = false }) {
     context.ccc = core_1.ccc;
     context.cccA = advanced_1.cccA;
     context.networks = network_1.networks;
-    context.Client = initGlobalClientBuilder();
-    context.client = initGlobalClientBuilder().new(network);
+    context.Client = initGlobalClientBuilder(proxyRpc);
+    context.client = initGlobalClientBuilder(proxyRpc).new(network);
     context.accounts = account_json_1.default;
+    context.myScripts = buildMyScripts().new(network);
+    context.systemScripts = buildSystemScripts().new(network);
     context.help = printHelpText;
 }
 exports.repl = repl;
-function initGlobalClientBuilder() {
+function initGlobalClientBuilder(proxyRpc) {
     return {
         new: (network) => {
+            if (proxyRpc) {
+                return network === 'mainnet'
+                    ? new core_1.ccc.ClientPublicMainnet({ url: network_1.networks.mainnet.proxy_rpc_url })
+                    : network === 'testnet'
+                        ? new core_1.ccc.ClientPublicTestnet({ url: network_1.networks.testnet.proxy_rpc_url })
+                        : new core_1.ccc.ClientPublicTestnet({
+                            url: network_1.networks.devnet.proxy_rpc_url,
+                            scripts: (0, private_1.buildCCCDevnetKnownScripts)(),
+                        });
+            }
             return network === 'mainnet'
                 ? new core_1.ccc.ClientPublicMainnet()
                 : network === 'testnet'
@@ -69,7 +83,30 @@ Global Variables to use:
      const myClient = Client.fromUrl('<your rpc url>', 'devnet' | 'testnet' | 'mainnet');
   - accounts, test accounts array from OffCKB
   - networks, network information configs
+  - myScripts, user-deployed scripts information via offckb deploy
+  - systemScripts, built-in scripts information in the blockchain
   - help, print this help message
 `);
 }
 exports.printHelpText = printHelpText;
+function buildSystemScripts() {
+    return {
+        new: (network) => {
+            const systemScripts = (0, gen_1.genSystemScripts)();
+            return network === base_1.Network.devnet
+                ? systemScripts === null || systemScripts === void 0 ? void 0 : systemScripts.devnet
+                : network === base_1.Network.testnet
+                    ? systemScripts === null || systemScripts === void 0 ? void 0 : systemScripts.testnet
+                    : systemScripts === null || systemScripts === void 0 ? void 0 : systemScripts.mainnet;
+        },
+    };
+}
+exports.buildSystemScripts = buildSystemScripts;
+function buildMyScripts() {
+    return {
+        new: (network) => {
+            return (0, util_1.readUserDeployedScriptsInfo)(network);
+        },
+    };
+}
+exports.buildMyScripts = buildMyScripts;

package/dist/deploy/index.js

@@ -26,11 +26,11 @@ function getToDeployBinsPath(userOffCKBConfigPath) {
     const match = fileContent.match(/contractBinFolder:\s*['"]([^'"]+)['"]/);
     if (match && match[1]) {
         const contractBinFolderValue = match[1];
-        const binFolderPath = (0, fs_1.isAbsolutePath)(contractBinFolderValue)
+        const binFileOrFolderPath = (0, fs_1.isAbsolutePath)(contractBinFolderValue)
             ? contractBinFolderValue
             : path_1.default.resolve(userOffCKBConfigPath, contractBinFolderValue);
-        const bins = (0, fs_1.listBinaryFilesInFolder)(binFolderPath);
-        return bins.map((bin) => path_1.default.resolve(binFolderPath, bin));
+        const bins = (0, fs_1.getBinaryFilesFromPath)(binFileOrFolderPath);
+        return bins;
     }
     else {
         console.log('contractBinFolder value not found in offckb.config.ts');

package/dist/tools/rpc-proxy.js

@@ -39,6 +39,7 @@ function createRPCProxy(network, targetRpcUrl, port) {
                         }
                         const txFile = path_1.default.resolve(settings.devnet.transactionsPath, `${txHash}.json`);
                         fs_1.default.writeFileSync(txFile, JSON.stringify(tx, null, 2));
+                        console.debug(`RPC Req:  store tx ${txHash}`);
                     }
                 }
             }
@@ -47,6 +48,25 @@ function createRPCProxy(network, targetRpcUrl, port) {
             }
         });
     });
+    proxy.on('proxyRes', function (proxyRes, _req, _res) {
+        const body = [];
+        proxyRes.on('data', function (chunk) {
+            body.push(chunk);
+        });
+        proxyRes.on('end', function () {
+            const res = Buffer.concat(body).toString();
+            try {
+                const jsonRpcResponse = JSON.parse(res);
+                const error = jsonRpcResponse.error;
+                if (error) {
+                    console.debug('RPC Response: ', jsonRpcResponse);
+                }
+            }
+            catch (err) {
+                console.error('Error parsing JSON-RPC content:', err);
+            }
+        });
+    });
     const server = http_1.default.createServer((req, res) => {
         proxy.web(req, res, {}, (err) => {
             if (err) {

package/dist/util/fs.d.ts

@@ -4,6 +4,7 @@ export declare function copyFileSync(source: string, target: string): void;
 export declare function copyFilesWithExclusion(sourceDir: string, destinationDir: string, excludedFolders: string[]): Promise<void>;
 export declare function copyRecursive(source: string, destination: string, excludedFolders: string[]): Promise<void>;
 export declare function readFileToUint8Array(filePath: string): Promise<Uint8Array>;
+export declare function getBinaryFilesFromPath(fileOrFolderPath: string): string[];
 export declare function listBinaryFilesInFolder(folderPath: string): string[];
 export declare function isBinaryFile(filePath: string): boolean;
 export declare function isAbsolutePath(filePath: string): boolean;

package/dist/util/fs.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSubfolders = exports.findFileInFolder = exports.isAbsolutePath = exports.isBinaryFile = exports.listBinaryFilesInFolder = exports.readFileToUint8Array = exports.copyRecursive = exports.copyFilesWithExclusion = exports.copyFileSync = exports.copyFolderSync = exports.isFolderExists = void 0;
+exports.getSubfolders = exports.findFileInFolder = exports.isAbsolutePath = exports.isBinaryFile = exports.listBinaryFilesInFolder = exports.getBinaryFilesFromPath = exports.readFileToUint8Array = exports.copyRecursive = exports.copyFilesWithExclusion = exports.copyFileSync = exports.copyFolderSync = exports.isFolderExists = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 function isFolderExists(folderPath) {
@@ -135,19 +135,29 @@ function readFileToUint8Array(filePath) {
     });
 }
 exports.readFileToUint8Array = readFileToUint8Array;
+function getBinaryFilesFromPath(fileOrFolderPath) {
+    if (!fs.existsSync(fileOrFolderPath)) {
+        throw new Error(`File or Folder not exits ${fileOrFolderPath}`);
+    }
+    // Check if the provided path is a directory
+    if (fs.lstatSync(fileOrFolderPath).isDirectory()) {
+        return listBinaryFilesInFolder(fileOrFolderPath);
+    }
+    if (fs.lstatSync(fileOrFolderPath).isFile() && isBinaryFile(fileOrFolderPath)) {
+        return [fileOrFolderPath];
+    }
+    throw new Error(`${fileOrFolderPath} is not a valid path to deploy scripts.`);
+}
+exports.getBinaryFilesFromPath = getBinaryFilesFromPath;
 function listBinaryFilesInFolder(folderPath) {
     // Check if the provided path is a directory
     if (!fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) {
         throw new Error(`${folderPath} is not a valid directory.`);
     }
     // Read the contents of the directory
-    const files = fs.readdirSync(folderPath);
+    const files = fs.readdirSync(folderPath).map((f) => path.join(folderPath, f));
     // Filter out only the binary files (assuming they have extensions like .exe, .bin, .dll, etc.)
-    const binaryFiles = files.filter((file) => {
-        const filePath = path.join(folderPath, file);
-        // Check if the file is a regular file and not a directory
-        return fs.statSync(filePath).isFile() && isBinaryFile(filePath);
-    });
+    const binaryFiles = files.filter((file) => fs.statSync(file).isFile() && isBinaryFile(file));
     return binaryFiles;
 }
 exports.listBinaryFilesInFolder = listBinaryFilesInFolder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",
@@ -67,7 +67,7 @@
     "@types/http-proxy": "^1.17.15",
     "adm-zip": "^0.5.10",
     "child_process": "^1.0.2",
-    "ckb-transaction-dumper": "^0.4.0",
+    "ckb-transaction-dumper": "^0.4.2",
     "commander": "^12.0.0",
     "cpu-features": "^0.0.10",
     "http-proxy": "^1.18.1",