@ckb-ccc/core 1.22.0 → 1.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",

package/src/ckb/transaction.ts

@@ -2497,13 +2497,22 @@ export class Transaction extends Entity.Base<TransactionLike, Transaction>() {
       const needed = numFrom(
         await Promise.resolve(change(changedTx, fee - leastFee)),
       );
+
       if (needed > Zero) {
         // No enough extra capacity to create new cells for change, collect inputs again
         leastExtraCapacity = needed;
         continue;
       }
 
-      if ((await changedTx.getFee(from.client)) !== leastFee) {
+      const changedActualFee = await changedTx.getFee(from.client);
+      if (changedActualFee < leastFee && fee < leastFee) {
+        // Fee is not fully paid yet because the initial transaction had insufficient inputs.
+        // Collect inputs again to pay leastFee.
+        leastExtraCapacity = Zero;
+        continue;
+      }
+
+      if (changedActualFee !== leastFee) {
         throw new Error(
           "The change function doesn't use all available capacity",
         );
@@ -2671,14 +2680,21 @@ export class Transaction extends Entity.Base<TransactionLike, Transaction>() {
       shouldAddInputs?: boolean;
     },
   ): Promise<[number, boolean]> {
-    const change = Number(numFrom(index));
-    if (!this.outputs[change]) {
+    const change = transactionIndexFrom(index);
+    if (change === undefined || !this.outputs[change]) {
       throw new Error("Non-existed output to change");
     }
     return this.completeFee(
       from,
       (tx, capacity) => {
-        tx.outputs[change].capacity += capacity;
+        tx.setOutput(
+          change,
+          {
+            ...tx.outputs[change],
+            capacity: tx.outputs[change].capacity + capacity,
+          },
+          tx.outputsData[change],
+        );
         return 0;
       },
       feeRate,

package/src/client/jsonRpc/client.ts

@@ -178,7 +178,7 @@ export abstract class ClientJsonRpc extends Client {
 
   getFeeRateStatistics = this.buildSender(
     "get_fee_rate_statistics",
-    [(n: NumLike) => apply(numFrom, n)],
+    [(n?: NumLike) => apply(numToHex, n)],
     // TODO: This is a temporary workaround for the fact that the node may return null for fee rate statistics.
     // We should change the method signature to return null instead of falling back to the default value,
     // but this would be a breaking change.

package/src/fixedPoint/index.ts

@@ -30,7 +30,11 @@ export type FixedPointLike = bigint | string | number;
  */
 
 export function fixedPointToString(val: FixedPointLike, decimals = 8): string {
-  const str = fixedPointFrom(val).toString();
+  const fp = fixedPointFrom(val, decimals);
+  if (fp < 0n) {
+    return `-${fixedPointToString(-fp, decimals)}`;
+  }
+  const str = fp.toString();
   if (decimals === 0) {
     return str;
   }
@@ -65,15 +69,20 @@ export function fixedPointFrom(val: FixedPointLike, decimals = 8): FixedPoint {
     return val;
   }
 
-  const [l, r] = (
-    typeof val === "number" ? val.toFixed(decimals) : val.toString()
-  ).split(".");
-  const lVal = BigInt(l.padEnd(l.length + decimals, "0"));
-  if (r === undefined) {
-    return lVal;
+  let str = typeof val === "number" ? val.toFixed(decimals) : val.toString();
+  const isNegative = str.startsWith("-");
+  if (isNegative || str.startsWith("+")) {
+    str = str.slice(1);
+  }
+
+  const [l, r] = str.split(".");
+  const lVal = l === "" ? 0n : BigInt(l.padEnd(l.length + decimals, "0"));
+  if (r === undefined || decimals === 0) {
+    return isNegative ? -lVal : lVal;
   }
 
-  return lVal + BigInt(r.slice(0, decimals).padEnd(decimals, "0"));
+  const unsignedVal = lVal + BigInt(r.slice(0, decimals).padEnd(decimals, "0"));
+  return isNegative ? -unsignedVal : unsignedVal;
 }
 
 /**

package/src/jsonRpc/transports/webSocket.ts

@@ -209,7 +209,9 @@ export class JsonRpcTransportWebSocket implements JsonRpcTransport {
     this.disposed = true;
     const socket = this.socket;
 
-    if (!socket || socket.readyState === socket.CLOSED) return;
+    if (!socket || socket.readyState === socket.CLOSED) {
+      return;
+    }
 
     await new Promise<void>((resolve) => {
       socket.addEventListener("close", () => resolve(), { once: true });

package/src/utils/index.ts

@@ -326,7 +326,9 @@ export async function waitForAvailability(signal?: AbortSignal): Promise<void> {
     }
 
     function onAbort() {
-      if (settled) return;
+      if (settled) {
+        return;
+      }
 
       settled = true;
       cleanup();