@offckb/cli 0.3.0-canary-e0c0069.0 → 0.3.0-canary-4864353.0

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/cmd/deposit.js

@@ -62,7 +62,7 @@ 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',
@@ -76,12 +76,11 @@ function sendClaimRequest(toAddress) {
         });
         const config = {
             method: 'post',
-            url: url,
             headers: headers,
-            data: body,
+            body,
         };
         try {
-            const response = yield request_1.Request.send(config);
+            const response = yield request_1.Request.send(url, config);
             console.log('send claim request, status: ', response.status); // Handle the response data here
         }
         catch (error) {

package/dist/deploy/index.js

@@ -79,7 +79,7 @@ function deployBinary(binPath, privateKey, enableTypeId, ckb) {
     return __awaiter(this, void 0, void 0, function* () {
         const bin = yield (0, fs_1.readFileToUint8Array)(binPath);
         const contractName = path_1.default.basename(binPath);
-        const result = enableTypeId
+        const result = !enableTypeId
             ? yield ckb.deployScript(bin, privateKey)
             : migration_1.Migration.isDeployedWithTypeId(contractName, ckb.network)
                 ? yield ckb.upgradeTypeIdScript(contractName, bin, privateKey)
@@ -89,11 +89,16 @@ function deployBinary(binPath, privateKey, enableTypeId, ckb) {
         yield ckb.waitForTxConfirm(result.txHash);
         console.log('tx committed.');
         const txHash = result.txHash;
+        const typeIdScript = result.typeId;
         const index = result.scriptOutputCellIndex;
         const tx = result.tx;
         const dataByteLen = BigInt(tx.outputsData[+index].slice(2).length / 2);
         const dataShannonLen = dataByteLen * BigInt('100000000');
         const occupiedCapacity = '0x' + dataShannonLen.toString(16);
+        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;
         // todo: handle multiple cell recipes?
         return {
             deploymentOptions: {
@@ -110,7 +115,7 @@ function deployBinary(binPath, privateKey, enableTypeId, ckb) {
                         index: '0x' + index.toString(16),
                         occupiedCapacity,
                         dataHash: (0, utils_1.ckbHash)(tx.outputsData[+index]),
-                        typeId: enableTypeId ? (0, utils_1.computeScriptHash)(result.typeId) : undefined,
+                        typeId: typeIdScriptHash,
                     },
                 ],
                 depGroupRecipes: [],

package/dist/deploy/migration.d.ts

@@ -45,6 +45,6 @@ export declare function generateDeploymentMigrationFile(name: string, deployment
 export declare function readDeploymentMigrationFile(filePath: string): DeploymentRecipe;
 export declare function getFormattedMigrationDate(): string;
 export declare function getMigrationFolderPath(scriptName: string, network: Network): string;
-export declare function getNewestMigrationFile(folderPath: string): string | undefined;
+export declare function getNewestMigrationFile(folderPath: string): string | null;
 export declare function deploymentRecipeToJson(recipe: DeploymentRecipe): MigrationJson;
 export declare function deploymentRecipeFromJson(json: MigrationJson): DeploymentRecipe;

package/dist/deploy/migration.js

@@ -94,6 +94,9 @@ function getMigrationFolderPath(scriptName, network) {
 }
 exports.getMigrationFolderPath = getMigrationFolderPath;
 function getNewestMigrationFile(folderPath) {
+    if (!fs_1.default.existsSync(folderPath) || !fs_1.default.lstatSync(folderPath).isDirectory()) {
+        return null;
+    }
     const files = fs_1.default
         .readdirSync(folderPath)
         .filter((file) => file.endsWith('.json')) // Ensure only JSON files are considered
@@ -104,7 +107,7 @@ function getNewestMigrationFile(folderPath) {
         return timestampA.localeCompare(timestampB);
     });
     // Return the full path of the newest file (last in sorted array) or undefined if no files
-    return files.length > 0 ? path_1.default.join(folderPath, files[files.length - 1]) : undefined;
+    return files.length > 0 ? path_1.default.join(folderPath, files[files.length - 1]) : null;
 }
 exports.getNewestMigrationFile = getNewestMigrationFile;
 function deploymentRecipeToJson(recipe) {

package/dist/node/install.js

@@ -97,10 +97,9 @@ exports.downloadCKBBinaryAndUnzip = downloadCKBBinaryAndUnzip;
 function downloadAndSaveCKBBinary(version, tempFilePath) {
     return __awaiter(this, void 0, void 0, function* () {
         const downloadURL = buildDownloadUrl(version);
-        const response = yield request_1.Request.get(downloadURL, {
-            responseType: 'arraybuffer',
-        });
-        fs.writeFileSync(tempFilePath, response.data);
+        const response = yield request_1.Request.send(downloadURL);
+        const arrayBuffer = yield response.arrayBuffer();
+        fs.writeFileSync(tempFilePath, Buffer.from(arrayBuffer));
     });
 }
 exports.downloadAndSaveCKBBinary = downloadAndSaveCKBBinary;

package/dist/tools/moleculec-es.js

@@ -57,10 +57,9 @@ class MoleculecES {
     static downloadAndSaveMoleculeES(version, tempFilePath) {
         return __awaiter(this, void 0, void 0, function* () {
             const downloadURL = MoleculecES.buildDownloadUrl(version);
-            const response = yield request_1.Request.get(downloadURL, {
-                responseType: 'arraybuffer',
-            });
-            fs_1.default.writeFileSync(tempFilePath, response.data);
+            const response = yield request_1.Request.send(downloadURL);
+            const arrayBuffer = yield response.arrayBuffer();
+            fs_1.default.writeFileSync(tempFilePath, Buffer.from(arrayBuffer));
         });
     }
     static buildDownloadUrl(version) {

package/dist/util/request.d.ts

@@ -1,8 +1,8 @@
-import axios, { AxiosProxyConfig, AxiosRequestConfig } from 'axios';
+import { ProxyConfig } from '../cfg/setting';
+import fetch, { RequestInit } from 'node-fetch';
 export declare class Request {
-    static proxy: axios.AxiosProxyConfig | undefined;
-    static send(_config: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
-    static get(url: string, _config?: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
-    static parseProxyUrl(url: string): AxiosProxyConfig;
-    static proxyConfigToUrl(proxy: AxiosProxyConfig): string;
+    static proxy: ProxyConfig | undefined;
+    static send(url: string, options?: RequestInit): Promise<fetch.Response>;
+    static parseProxyUrl(url: string): ProxyConfig;
+    static proxyConfigToUrl(proxy: ProxyConfig): string;
 }

package/dist/util/request.js

@@ -13,20 +13,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-const axios_1 = __importDefault(require("axios"));
 const setting_1 = require("../cfg/setting");
+const https_proxy_agent_1 = require("https-proxy-agent");
+const node_fetch_1 = __importDefault(require("node-fetch"));
 class Request {
-    static send(_config) {
+    static send(url, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const config = this.proxy ? Object.assign({ proxy: this.proxy }, _config) : _config;
-            return yield (0, axios_1.default)(config);
-        });
-    }
-    static get(url, _config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = this.proxy ? Object.assign({ proxy: this.proxy }, _config) : _config;
-            console.log(config);
-            return yield axios_1.default.get(url, config);
+            const agent = this.proxy ? new https_proxy_agent_1.HttpsProxyAgent(this.proxyConfigToUrl(this.proxy)) : undefined;
+            const opt = Object.assign({ agent }, options);
+            try {
+                const response = yield (0, node_fetch_1.default)(url, opt);
+                if (!response.ok) {
+                    throw new Error(`HTTP error! Status: ${response.status}, URL: ${response.url}`);
+                }
+                return yield response;
+            }
+            catch (error) {
+                throw new Error(`fetch error! ${error.message}`);
+            }
         });
     }
     static parseProxyUrl(url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.3.0-canary-e0c0069.0",
+  "version": "0.3.0-canary-4864353.0",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",
@@ -47,6 +47,7 @@
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",
     "@types/node": "^20.11.19",
+    "@types/node-fetch": "^2.6.11",
     "@types/semver": "^7.5.7",
     "@types/tar": "^6.1.11",
     "@typescript-eslint/eslint-plugin": "^7.0.2",
@@ -65,11 +66,12 @@
     "@inquirer/prompts": "^4.1.0",
     "@types/http-proxy": "^1.17.15",
     "adm-zip": "^0.5.10",
-    "axios": "^1.6.7",
     "child_process": "^1.0.2",
     "ckb-transaction-dumper": "^0.4.0",
     "commander": "^12.0.0",
     "http-proxy": "^1.18.1",
+    "https-proxy-agent": "^7.0.5",
+    "node-fetch": "2",
     "semver": "^7.6.0",
     "tar": "^6.2.1"
   }