@ckb-ccc/core 1.5.0 → 1.6.0

package/src/client/jsonRpc/client.ts

@@ -169,11 +169,11 @@ export abstract class ClientJsonRpc extends Client {
    * @param withCycles - whether the return cycles of block transactions. (Optional, default false.)
    * @returns Block
    */
-  getBlockByNumber = this.buildSender(
+  getBlockByNumberNoCache = this.buildSender(
     "get_block_by_number",
     [(v: NumLike) => numToHex(numFrom(v))],
     (b: JsonRpcBlock) => apply(JsonRpcTransformers.blockTo, b),
-  ) as Client["getBlockByNumber"];
+  ) as Client["getBlockByNumberNoCache"];
 
   /**
    * Get block by block hash
@@ -183,9 +183,11 @@ export abstract class ClientJsonRpc extends Client {
    * @param withCycles - whether the return cycles of block transactions. (Optional, default false.)
    * @returns Block
    */
-  getBlockByHash = this.buildSender("get_block", [hexFrom], (b: JsonRpcBlock) =>
-    apply(JsonRpcTransformers.blockTo, b),
-  ) as Client["getBlockByHash"];
+  getBlockByHashNoCache = this.buildSender(
+    "get_block",
+    [hexFrom],
+    (b: JsonRpcBlock) => apply(JsonRpcTransformers.blockTo, b),
+  ) as Client["getBlockByHashNoCache"];
 
   /**
    * Get header by block number
@@ -194,11 +196,11 @@ export abstract class ClientJsonRpc extends Client {
    * @param verbosity - result format which allows 0 and 1. (Optional, the default is 1.)
    * @returns BlockHeader
    */
-  getHeaderByNumber = this.buildSender(
+  getHeaderByNumberNoCache = this.buildSender(
     "get_header_by_number",
     [(v: NumLike) => numToHex(numFrom(v))],
     (b: JsonRpcBlockHeader) => apply(JsonRpcTransformers.blockHeaderTo, b),
-  ) as Client["getHeaderByNumber"];
+  ) as Client["getHeaderByNumberNoCache"];
 
   /**
    * Get header by block hash
@@ -207,11 +209,11 @@ export abstract class ClientJsonRpc extends Client {
    * @param verbosity - result format which allows 0 and 1. (Optional, the default is 1.)
    * @returns BlockHeader
    */
-  getHeaderByHash = this.buildSender(
+  getHeaderByHashNoCache = this.buildSender(
     "get_header",
     [hexFrom],
     (b: JsonRpcBlockHeader) => apply(JsonRpcTransformers.blockHeaderTo, b),
-  ) as Client["getHeaderByHash"];
+  ) as Client["getHeaderByHashNoCache"];
 
   /**
    * Estimate cycles of a transaction.

package/src/client/jsonRpc/transformers.ts

@@ -192,7 +192,7 @@ export class JsonRpcTransformers {
       return;
     }
 
-    return {
+    return ClientTransactionResponse.from({
       transaction: JsonRpcTransformers.transactionTo(transaction),
       status,
       cycles: apply(numFrom, cycles),
@@ -200,7 +200,7 @@ export class JsonRpcTransformers {
       blockNumber: apply(numFrom, block_number),
       txIndex: apply(numFrom, tx_index),
       reason,
-    };
+    });
   }
   static blockHeaderTo(header: JsonRpcBlockHeader): ClientBlockHeader {
     const dao = bytesFrom(header.dao);

package/src/jsonRpc/transports/webSocket.ts

@@ -87,24 +87,28 @@ export class TransportWebSocket implements Transport {
         reject,
         setTimeout(() => {
           this.ongoing.delete(data.id);
-          void socket.then((socket) => socket.close());
+          void socket
+            .then((socket) => socket.close())
+            .catch((err) => reject(err));
           reject(new Error("Request timeout"));
         }, this.timeout),
       ];
       this.ongoing.set(data.id, req);
 
-      void socket.then((socket) => {
-        if (
-          socket.readyState === socket.CLOSED ||
-          socket.readyState === socket.CLOSING
-        ) {
-          clearTimeout(req[2]);
-          this.ongoing.delete(data.id);
-          reject(new Error("Connection closed"));
-        } else {
-          socket.send(JSON.stringify(data));
-        }
-      });
+      void socket
+        .then((socket) => {
+          if (
+            socket.readyState === socket.CLOSED ||
+            socket.readyState === socket.CLOSING
+          ) {
+            clearTimeout(req[2]);
+            this.ongoing.delete(data.id);
+            reject(new Error("Connection closed"));
+          } else {
+            socket.send(JSON.stringify(data));
+          }
+        })
+        .catch((err) => reject(err));
     });
   }
 }

package/src/utils/index.ts

@@ -1,4 +1,4 @@
-import { NumLike, numFrom } from "../num/index.js";
+import { NumLike, numFrom, numToHex } from "../num/index.js";
 
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
@@ -183,3 +183,16 @@ export type Constructor<T> = {
 export function isWebview(userAgent: string): boolean {
   return /webview|wv|ip((?!.*Safari)|(?=.*like Safari))/i.test(userAgent);
 }
+
+/**
+ * @public
+ */
+export function stringify(val: unknown) {
+  return JSON.stringify(val, (_, value) => {
+    if (typeof value === "bigint") {
+      return numToHex(value);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return value;
+  });
+}