fix: wrong capacity completion while deserializing transaction

Author: Hanssen0

.changeset/purple-states-judge.md

@@ -0,0 +1,6 @@
+---
+"@ckb-ccc/core": patch
+---
+
+fix: wrong capacity completion while deserializing transaction
+  

packages/core/src/ckb/transaction.test.ts

@@ -656,6 +656,15 @@ describe("Transaction", () => {
         expect(cellOutput.capacity).toBe(1000n);
       });
 
+      it("should not modify capacity when data is not provided", () => {
+        const cellOutput = ccc.CellOutput.from({
+          capacity: 0n,
+          lock,
+        });
+
+        expect(cellOutput.capacity).toBe(0n);
+      });
+
       it("should calculate capacity automatically when capacity is 0", () => {
         const outputData = "0x1234"; // 2 bytes
         const cellOutput = ccc.CellOutput.from(
@@ -813,6 +822,30 @@ describe("Transaction", () => {
         );
       });
 
+      it("should automatically fill capacity considering outputData while deserialization", () => {
+        const outputsData = ["0x1234"];
+        const calculatedTx = ccc.Transaction.from({
+          outputs: [
+            {
+              lock,
+            },
+          ],
+          outputsData,
+        });
+        calculatedTx.outputs[0].capacity = 0n;
+        const data = calculatedTx.toBytes();
+        expect(ccc.hexFrom(data)).toBe(
+          "0xb30000000c000000af000000a30000001c0000002000000024000000280000002c00000095000000000000000000000000000000000000006900000008000000610000001000000018000000610000000000000000000000490000001000000030000000310000009bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8011400000036053c1bbc237e164137c03664fe8384b2cf9b260e0000000800000002000000123404000000",
+        );
+        const tx = ccc.Transaction.fromBytes(data);
+
+        // Should use outputData for calculation
+        const expectedCapacity = 8 + lock.occupiedSize + 2;
+        expect(tx.outputs[0].capacity).toBe(
+          ccc.fixedPointFrom(expectedCapacity),
+        );
+      });
+
       it("should handle empty outputsData array", () => {
         const tx = ccc.Transaction.from({
           outputs: [

packages/core/src/ckb/transaction.ts

@@ -235,7 +235,7 @@ export class CellOutput extends mol.Entity.Base<CellOutputLike, CellOutput>() {
 
   /**
    * Creates a CellOutput instance from a CellOutputLike object.
-   * This method supports automatic capacity calculation when capacity is 0 or omitted.
+   * This method supports automatic capacity calculation when outputData is provided and capacity is 0 or omitted.
    *
    * @param cellOutput - A CellOutputLike object or an instance of CellOutput.
    * @param outputData - Optional output data used for automatic capacity calculation.
@@ -262,19 +262,20 @@ export class CellOutput extends mol.Entity.Base<CellOutputLike, CellOutput>() {
     cellOutput: CellOutputLike,
     outputData?: HexLike | null,
   ): CellOutput {
-    if (cellOutput instanceof CellOutput) {
-      return cellOutput;
-    }
-
-    const output = new CellOutput(
-      numFrom(cellOutput.capacity ?? 0),
-      Script.from(cellOutput.lock),
-      apply(Script.from, cellOutput.type),
-    );
+    const output = (() => {
+      if (cellOutput instanceof CellOutput) {
+        return cellOutput;
+      }
+      return new CellOutput(
+        numFrom(cellOutput.capacity ?? 0),
+        Script.from(cellOutput.lock),
+        apply(Script.from, cellOutput.type),
+      );
+    })();
 
-    if (output.capacity === Zero) {
+    if (output.capacity === Zero && outputData != null) {
       output.capacity = fixedPointFrom(
-        output.occupiedSize + bytesFrom(outputData ?? "0x").length,
+        output.occupiedSize + bytesFrom(outputData).length,
       );
     }
 
@@ -365,9 +366,11 @@ export class CellAny {
       return cell;
     }
 
+    const outputData = hexFrom(cell.outputData ?? "0x");
+
     return new CellAny(
-      CellOutput.from(cell.cellOutput, cell.outputData),
-      hexFrom(cell.outputData ?? "0x"),
+      CellOutput.from(cell.cellOutput, outputData),
+      outputData,
       apply(OutPoint.from, cell.outPoint ?? cell.previousOutput),
     );
   }

packages/core/src/molecule/entity.ts

@@ -128,6 +128,12 @@ export abstract class Entity {
       }
     }
 
+    /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+    Impl.encode = undefined as any;
+    Impl.decode = undefined as any;
+    Impl.fromBytes = undefined as any;
+    /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
+
     return Impl;
   }
 
@@ -168,15 +174,21 @@ export function codec<
     },
   >(Constructor: ConstructorType, ..._: unknown[]) {
     Constructor.byteLength = codec.byteLength;
-    Constructor.encode = function (encodable: TypeLike) {
-      return codec.encode(encodable);
-    };
-    Constructor.decode = function (bytesLike: BytesLike) {
-      return Constructor.from(codec.decode(bytesLike));
-    };
-    Constructor.fromBytes = function (bytes: BytesLike) {
-      return Constructor.from(codec.decode(bytes));
-    };
+    if (Constructor.encode === undefined) {
+      Constructor.encode = function (encodable: TypeLike) {
+        return codec.encode(encodable);
+      };
+    }
+    if (Constructor.decode === undefined) {
+      Constructor.decode = function (bytesLike: BytesLike) {
+        return Constructor.from(codec.decode(bytesLike));
+      };
+    }
+    if (Constructor.fromBytes === undefined) {
+      Constructor.fromBytes = function (bytes: BytesLike) {
+        return Constructor.from(codec.decode(bytes));
+      };
+    }
 
     return Constructor;
   };

packages/playground/src/app/components/Cell.tsx

@@ -176,7 +176,7 @@ export function Cell({
       return 0;
     }
 
-    const total = cellOutput.capacity;
+    const total = ccc.numMax(cellOutput.capacity, 1);
     const freeSize =
       total -
       ccc.fixedPointFrom(