@ckb-ccc/core 0.0.15 → 0.0.16-alpha.1

package/src/client/clientPublicMainnet.advanced.ts

@@ -6,6 +6,23 @@ export const MAINNET_SCRIPTS: Record<
   | (Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfoLike[] })
   | undefined
 > = Object.freeze({
+  [KnownScript.NervosDao]: {
+    codeHash:
+      "0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e",
+    hashType: "type",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c",
+            index: 2,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
   [KnownScript.Secp256k1Blake160]: {
     codeHash:
       "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
@@ -220,9 +237,9 @@ export const MAINNET_SCRIPTS: Record<
       },
     ],
   },
-  [KnownScript.SingleUseLock]: {
+  [KnownScript.AlwaysSuccess]: {
     codeHash:
-      "0x8290467a512e5b9a6b816469b0edabba1f4ac474e28ffdd604c2a7c76446bbaf",
+      "0x3b521cc4b552f109d092d8cc468a8048acb53c5952dbe769d2b2f9cf6e47f7f1",
     hashType: "data1",
     cellDeps: [
       {
@@ -230,7 +247,24 @@ export const MAINNET_SCRIPTS: Record<
           outPoint: {
             txHash:
               "0x10d63a996157d32c01078058000052674ca58d15f921bec7f1dcdac2160eb66b",
-            index: 4,
+            index: 0,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.InputTypeProxyLock]: {
+    codeHash:
+      "0x5123908965c711b0ffd8aec642f1ede329649bda1ebdca6bd24124d3796f768a",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x10d63a996157d32c01078058000052674ca58d15f921bec7f1dcdac2160eb66b",
+            index: 1,
           },
           depType: "code",
         },
@@ -254,17 +288,85 @@ export const MAINNET_SCRIPTS: Record<
       },
     ],
   },
-  [KnownScript.NervosDao]: {
+  [KnownScript.LockProxyLock]: {
     codeHash:
-      "0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e",
-    hashType: "type",
+      "0x5d41e32e224c15f152b7e6529100ebeac83b162f5f692a5365774dad2c1a1d02",
+    hashType: "data1",
     cellDeps: [
       {
         cellDep: {
           outPoint: {
             txHash:
-              "0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c",
-            index: 2,
+              "0x10d63a996157d32c01078058000052674ca58d15f921bec7f1dcdac2160eb66b",
+            index: 3,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.SingleUseLock]: {
+    codeHash:
+      "0x8290467a512e5b9a6b816469b0edabba1f4ac474e28ffdd604c2a7c76446bbaf",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x10d63a996157d32c01078058000052674ca58d15f921bec7f1dcdac2160eb66b",
+            index: 4,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.TypeBurnLock]: {
+    codeHash:
+      "0xff78bae0abf17d7a404c0be0f9ad9c9185b3f88dcc60403453d5ba8e1f22f53a",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x10d63a996157d32c01078058000052674ca58d15f921bec7f1dcdac2160eb66b",
+            index: 5,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.EasyToDiscoverType]: {
+    codeHash:
+      "0xaba4430cc7110d699007095430a1faa72973edf2322ddbfd4d1d219cacf237af",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0xb0ed754fb27d67fd8388c97fed914fb7998eceaa01f3e6f967e498de1ba0ac9b",
+            index: 0,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.TimeLock]: {
+    codeHash:
+      "0x6fac4b2e89360a1e692efcddcb3a28656d8446549fb83da6d896db8b714f4451",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0xb0ed754fb27d67fd8388c97fed914fb7998eceaa01f3e6f967e498de1ba0ac9b",
+            index: 1,
           },
           depType: "code",
         },

package/src/client/clientPublicTestnet.advanced.ts

@@ -5,6 +5,23 @@ export const TESTNET_SCRIPTS: Record<
   KnownScript,
   Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfoLike[] }
 > = Object.freeze({
+  [KnownScript.NervosDao]: {
+    codeHash:
+      "0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e",
+    hashType: "type",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x8f8c79eb6671709633fe6a46de93c0fedc9c1b8a6527a18d3983879542635c9f",
+            index: 2,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
   [KnownScript.Secp256k1Blake160]: {
     codeHash:
       "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
@@ -231,9 +248,9 @@ export const TESTNET_SCRIPTS: Record<
       },
     ],
   },
-  [KnownScript.SingleUseLock]: {
+  [KnownScript.AlwaysSuccess]: {
     codeHash:
-      "0x8290467a512e5b9a6b816469b0edabba1f4ac474e28ffdd604c2a7c76446bbaf",
+      "0x3b521cc4b552f109d092d8cc468a8048acb53c5952dbe769d2b2f9cf6e47f7f1",
     hashType: "data1",
     cellDeps: [
       {
@@ -241,7 +258,24 @@ export const TESTNET_SCRIPTS: Record<
           outPoint: {
             txHash:
               "0xb4f171c9c9caf7401f54a8e56225ae21d95032150a87a4678eac3f66a3137b93",
-            index: 4,
+            index: 0,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.InputTypeProxyLock]: {
+    codeHash:
+      "0x5123908965c711b0ffd8aec642f1ede329649bda1ebdca6bd24124d3796f768a",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0xb4f171c9c9caf7401f54a8e56225ae21d95032150a87a4678eac3f66a3137b93",
+            index: 1,
           },
           depType: "code",
         },
@@ -265,17 +299,85 @@ export const TESTNET_SCRIPTS: Record<
       },
     ],
   },
-  [KnownScript.NervosDao]: {
+  [KnownScript.LockProxyLock]: {
     codeHash:
-      "0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e",
-    hashType: "type",
+      "0x5d41e32e224c15f152b7e6529100ebeac83b162f5f692a5365774dad2c1a1d02",
+    hashType: "data1",
     cellDeps: [
       {
         cellDep: {
           outPoint: {
             txHash:
-              "0x8f8c79eb6671709633fe6a46de93c0fedc9c1b8a6527a18d3983879542635c9f",
-            index: 2,
+              "0xb4f171c9c9caf7401f54a8e56225ae21d95032150a87a4678eac3f66a3137b93",
+            index: 3,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.SingleUseLock]: {
+    codeHash:
+      "0x8290467a512e5b9a6b816469b0edabba1f4ac474e28ffdd604c2a7c76446bbaf",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0xb4f171c9c9caf7401f54a8e56225ae21d95032150a87a4678eac3f66a3137b93",
+            index: 4,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.TypeBurnLock]: {
+    codeHash:
+      "0xff78bae0abf17d7a404c0be0f9ad9c9185b3f88dcc60403453d5ba8e1f22f53a",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0xb4f171c9c9caf7401f54a8e56225ae21d95032150a87a4678eac3f66a3137b93",
+            index: 5,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.EasyToDiscoverType]: {
+    codeHash:
+      "0xaba4430cc7110d699007095430a1faa72973edf2322ddbfd4d1d219cacf237af",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x1b4ffcad55ecd36ffb2715b6816b83da73851f1a24fe594f263c4f34dad90792",
+            index: 0,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.TimeLock]: {
+    codeHash:
+      "0x6fac4b2e89360a1e692efcddcb3a28656d8446549fb83da6d896db8b714f4451",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x1b4ffcad55ecd36ffb2715b6816b83da73851f1a24fe594f263c4f34dad90792",
+            index: 1,
           },
           depType: "code",
         },

package/src/client/clientTypes.ts

@@ -304,3 +304,9 @@ export class ErrorClientRBFRejected extends ErrorClientBase {
     this.leastFee = numFrom(leastFee);
   }
 }
+
+export class ErrorClientWaitTransactionTimeout extends Error {
+  constructor() {
+    super("Wait transaction timeout");
+  }
+}

package/src/client/jsonRpc/index.ts

@@ -37,15 +37,12 @@ import { JsonRpcCellOutput, JsonRpcTransformers } from "./advanced.js";
  *
  * @example
  * ```typescript
- * const result = await transform(5, (x) => x * 2); // Outputs 10
- * const resultWithoutTransformer = await transform(5); // Outputs 5
+ * const result = transform(5, (x) => x * 2); // Outputs 10
+ * const resultWithoutTransformer = transform(5); // Outputs 5
  * ```
  */
 
-async function transform(
-  value: unknown,
-  transformer?: (i: unknown) => unknown,
-) {
+function transform(value: unknown, transformer?: (i: unknown) => unknown) {
   if (transformer) {
     return transformer(value);
   }
@@ -122,6 +119,18 @@ export abstract class ClientJsonRpc extends Client {
     return this.url_;
   }
 
+  /**
+   * Get fee rate statistics
+   *
+   * @returns Fee rate statistics
+   */
+
+  getFeeRateStatistics = this.buildSender(
+    "get_fee_rate_statistics",
+    [(n) => apply(numFrom, n)],
+    ({ mean, median }) => ({ mean: numFrom(mean), median: numFrom(median) }),
+  ) as Client["getFeeRateStatistics"];
+
   /**
    * Get tip block number
    *
@@ -367,15 +376,13 @@ export abstract class ClientJsonRpc extends Client {
     return async (...req: unknown[]) => {
       const payload = this.buildPayload(
         rpcMethod,
-        await Promise.all(
-          req
-            .concat(
-              Array.from(
-                new Array(Math.max(inTransformers.length - req.length, 0)),
-              ),
-            )
-            .map((v, i) => transform(v, inTransformers[i])),
-        ),
+        req
+          .concat(
+            Array.from(
+              new Array(Math.max(inTransformers.length - req.length, 0)),
+            ),
+          )
+          .map((v, i) => transform(v, inTransformers[i])),
       );
 
       try {

package/src/client/transports/webSocket.ts

@@ -17,55 +17,60 @@ export class TransportWebSocket implements Transport {
     private readonly timeout = 30000,
   ) {}
 
-  async request(data: JsonRpcPayload) {
-    const socket = (() => {
-      if (this.socket) {
-        return this.socket;
-      }
-
-      const socket = new WebSocket(this.url);
-      const onMessage = ({ data }: { data: string }) => {
-        const res = JSON.parse(data);
-        if (typeof res !== "object" || res === null) {
-          throw new Error(`Unknown response ${data}`);
+  request(data: JsonRpcPayload) {
+    const socket = (this.socket ?? Promise.resolve(undefined)).then(
+      (existed) => {
+        if (existed && existed.readyState === existed.OPEN) {
+          return existed;
         }
 
-        const req = this.ongoing.get(res.id);
-        if (!req) {
-          return;
-        }
-        clearTimeout(req[2]);
-        this.ongoing.delete(res.id);
+        const socket = new WebSocket(this.url);
+        const onMessage = ({ data }: { data: string }) => {
+          const res = JSON.parse(data);
+          if (typeof res !== "object" || res === null) {
+            throw new Error(`Unknown response ${data}`);
+          }
 
-        req[0](res);
-      };
-      const onClose = (error?: unknown) => {
-        this.socket = undefined;
-        this.ongoing.forEach(([_, onError]) =>
-          onError(error ?? new Error("Connection closed")),
-        );
-        this.ongoing.clear();
-      };
+          const req = this.ongoing.get(res.id);
+          if (!req) {
+            return;
+          }
+          clearTimeout(req[2]);
+          this.ongoing.delete(res.id);
 
-      socket.onclose = onClose;
-      socket.onerror = onClose;
-      socket.onmessage = onMessage;
+          req[0](res);
+        };
+        const onClose = () => {
+          this.socket = undefined;
+          this.ongoing.forEach(([_, onError]) =>
+            onError(new Error("Connection closed")),
+          );
+          this.ongoing.clear();
+        };
 
-      this.socket = new Promise((resolve) => {
-        if (socket.readyState === socket.CONNECTING) {
-          socket.onopen = resolve;
-        } else {
-          resolve(undefined);
-        }
-      }).then(() => socket);
-      return this.socket;
-    })();
+        socket.onclose = onClose;
+        socket.onerror = onClose;
+        socket.onmessage = onMessage;
+
+        this.socket = new Promise((resolve) => {
+          if (socket.readyState === socket.OPEN) {
+            resolve(undefined);
+          } else {
+            socket.onopen = resolve;
+          }
+        }).then(() => socket);
+        return this.socket;
+      },
+    );
 
     return new Promise((resolve, reject) => {
       this.ongoing.set(data.id, [
         resolve,
         reject,
-        setTimeout(() => reject(new Error("Request timeout")), this.timeout),
+        setTimeout(() => {
+          socket.then((socket) => socket.close());
+          reject(new Error("Request timeout"));
+        }, this.timeout),
       ]);
       socket.then((socket) => {
         if (

package/src/utils/index.ts

@@ -1,3 +1,5 @@
+import { NumLike, numFrom } from "../num/index.js";
+
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
  * @public
@@ -166,6 +168,10 @@ export async function reduceAsync<T, V>(
   );
 }
 
+export function sleep(ms: NumLike) {
+  return new Promise((resolve) => setTimeout(resolve, Number(numFrom(ms))));
+}
+
 /**
  * @public
  */