@offckb/cli 0.3.0-canary-e0c0069.0 → 0.3.0-canary-884fccd.0

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.3.0-canary-e0c0069.0",
+  "version": "0.3.0-canary-884fccd.0",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",