@ckb-ccc/core 0.0.16-alpha.3 → 0.1.0-alpha.4

package/dist.commonjs/utils/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWebview = exports.sleep = exports.reduceAsync = exports.apply = void 0;
+exports.apply = apply;
+exports.reduceAsync = reduceAsync;
+exports.sleep = sleep;
+exports.isWebview = isWebview;
 const index_js_1 = require("../num/index.js");
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
@@ -16,7 +19,6 @@ function apply(transformer, value) {
     }
     return transformer(value);
 }
-exports.apply = apply;
 /**
  * Similar to Array.reduce, but the accumulator can returns Promise.
  * @public
@@ -36,15 +38,12 @@ async function reduceAsync(values, accumulator, init) {
     }
     return values.reduce((current, b, i, array) => current.then((v) => Promise.resolve(accumulator(v, b, i, array)).then((r) => r ?? v)), Promise.resolve(init));
 }
-exports.reduceAsync = reduceAsync;
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, Number((0, index_js_1.numFrom)(ms))));
 }
-exports.sleep = sleep;
 /**
  * @public
  */
 function isWebview(userAgent) {
     return /webview|wv|ip((?!.*Safari)|(?=.*like Safari))/i.test(userAgent);
 }
-exports.isWebview = isWebview;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.16-alpha.3",
+  "version": "0.1.0-alpha.4",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -34,6 +34,7 @@
     "@eslint/js": "^9.1.1",
     "@types/blake2b": "^2.1.3",
     "@types/jest": "^29.5.12",
+    "@types/ws": "^8.5.12",
     "copyfiles": "^2.4.1",
     "eslint": "^9.1.0",
     "eslint-config-prettier": "^9.1.0",
@@ -67,7 +68,7 @@
   "scripts": {
     "test": "jest",
     "build": "rimraf ./dist && rimraf ./dist.commonjs && tsc && tsc --project tsconfig.commonjs.json && copyfiles -u 2 misc/basedirs/**/* .",
-    "lint": "eslint",
-    "format": "prettier --write . && eslint --fix"
+    "lint": "eslint ./src",
+    "format": "prettier --write . && eslint --fix ./src"
   }
 }

package/src/bytes/index.ts

@@ -8,7 +8,7 @@ export type Bytes = Uint8Array;
 /**
  * @public
  */
-export type BytesLike = string | Uint8Array | ArrayBuffer | number[];
+export type BytesLike = string | Uint8Array | ArrayBuffer | ArrayLike<number>;
 
 /**
  * Concatenates multiple byte-like arrays into a single byte array.
@@ -98,22 +98,23 @@ export function bytesFrom(
     return new Uint8Array(bytes);
   }
 
-  if (Array.isArray(bytes)) {
-    if (bytes.some((v) => v < 0 || 0xff < v)) {
-      throw new Error(`Invalid bytes ${JSON.stringify(bytes)}`);
+  if (typeof bytes === "string") {
+    if (encoding !== undefined) {
+      return Buffer.from(bytes, encoding);
     }
-    return new Uint8Array(bytes);
-  }
 
-  if (encoding !== undefined) {
-    return Buffer.from(bytes, encoding);
+    const str = bytes.startsWith("0x") ? bytes.slice(2) : bytes;
+    const paddedStr = str.length % 2 === 0 ? str : `0${str}`;
+    const data = Buffer.from(paddedStr, "hex");
+    if (data.length * 2 !== paddedStr.length) {
+      throw new Error(`Invalid bytes ${bytes}`);
+    }
+    return data;
   }
 
-  const str = bytes.startsWith("0x") ? bytes.slice(2) : bytes;
-  const paddedStr = str.length % 2 === 0 ? str : `0${str}`;
-  const data = Buffer.from(paddedStr, "hex");
-  if (data.length * 2 !== paddedStr.length) {
-    throw new Error(`Invalid bytes ${bytes}`);
+  const bytesArr = Array.from(bytes);
+  if (bytesArr.some((v) => v < 0 || 0xff < v)) {
+    throw new Error(`Invalid bytes ${JSON.stringify(bytes)}`);
   }
-  return data;
+  return new Uint8Array(bytes);
 }

package/src/ckb/transaction.ts

@@ -1175,6 +1175,7 @@ export class Transaction {
       if (typeof value === "bigint") {
         return numToHex(value);
       }
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return value;
     });
   }

package/src/client/client.ts

@@ -1,10 +1,8 @@
 import {
   Cell,
   CellDep,
-  CellDepLike,
   OutPoint,
   OutPointLike,
-  Script,
   ScriptLike,
   Transaction,
   TransactionLike,
@@ -12,11 +10,13 @@ import {
 import { Zero } from "../fixedPoint/index.js";
 import { Hex, HexLike, hexFrom } from "../hex/index.js";
 import { Num, NumLike, numFrom, numMax } from "../num/index.js";
-import { apply, reduceAsync, sleep } from "../utils/index.js";
+import { reduceAsync, sleep } from "../utils/index.js";
 import { ClientCache } from "./cache/index.js";
 import { ClientCacheMemory } from "./cache/memory.js";
 import { ClientCollectableSearchKeyLike } from "./clientTypes.advanced.js";
 import {
+  CellDepInfo,
+  CellDepInfoLike,
   ClientBlock,
   ClientBlockHeader,
   ClientFindCellsResponse,
@@ -27,62 +27,11 @@ import {
   ClientIndexerSearchKeyTransactionLike,
   ClientTransactionResponse,
   ErrorClientWaitTransactionTimeout,
+  KnownScript,
   OutputsValidator,
+  ScriptInfo,
 } from "./clientTypes.js";
 
-/**
- * @public
- */
-export enum KnownScript {
-  NervosDao = "NervosDao",
-  Secp256k1Blake160 = "Secp256k1Blake160",
-  Secp256k1Multisig = "Secp256k1Multisig",
-  AnyoneCanPay = "AnyoneCanPay",
-  TypeId = "TypeId",
-  XUdt = "XUdt",
-  JoyId = "JoyId",
-  COTA = "COTA",
-  PWLock = "PWLock",
-  OmniLock = "OmniLock",
-  NostrLock = "NostrLock",
-  UniqueType = "UniqueType",
-
-  // ckb-proxy-locks https://github.com/ckb-ecofund/ckb-proxy-locks
-  AlwaysSuccess = "AlwaysSuccess",
-  InputTypeProxyLock = "InputTypeProxyLock",
-  OutputTypeProxyLock = "OutputTypeProxyLock",
-  LockProxyLock = "LockProxyLock",
-  SingleUseLock = "SingleUseLock",
-  TypeBurnLock = "TypeBurnLock",
-  EasyToDiscoverType = "EasyToDiscoverType",
-  TimeLock = "TimeLock",
-}
-
-/**
- * @public
- */
-export type CellDepInfoLike = {
-  cellDep: CellDepLike;
-  type?: ScriptLike | null;
-};
-
-/**
- * @public
- */
-export class CellDepInfo {
-  constructor(
-    public cellDep: CellDep,
-    public type?: Script,
-  ) {}
-
-  static from(cellDepInfoLike: CellDepInfoLike): CellDepInfo {
-    return new CellDepInfo(
-      CellDep.from(cellDepInfoLike.cellDep),
-      apply(Script.from, cellDepInfoLike.type),
-    );
-  }
-}
-
 /**
  * @public
  */
@@ -96,11 +45,7 @@ export abstract class Client {
   abstract get url(): string;
   abstract get addressPrefix(): string;
 
-  abstract getKnownScript(
-    script: KnownScript,
-  ): Promise<
-    Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfo[] }
-  >;
+  abstract getKnownScript(script: KnownScript): Promise<ScriptInfo>;
 
   abstract getFeeRateStatistics(
     blockRange?: NumLike,
@@ -600,7 +545,7 @@ export abstract class Client {
       } else if (confirmations === 0) {
         return tx;
       } else if (
-        (await this.getTipHeader()).number - tx!.blockNumber! >=
+        (await this.getTipHeader()).number - tx.blockNumber! >=
         confirmations
       ) {
         return tx;