@ckb-ccc/core 0.0.13-alpha.6 → 0.0.13-alpha.8

package/dist.commonjs/client/jsonRpc/transformers.js

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonRpcTransformers = void 0;
-const index_js_1 = require("../../ckb/index.js");
-const index_js_2 = require("../../hex/index.js");
-const index_js_3 = require("../../num/index.js");
-const index_js_4 = require("../../utils/index.js");
+const index_js_1 = require("../../bytes/index.js");
+const index_js_2 = require("../../ckb/index.js");
+const index_js_3 = require("../../hex/index.js");
+const index_js_4 = require("../../num/index.js");
+const index_js_5 = require("../../utils/index.js");
 const clientTypes_js_1 = require("../clientTypes.js");
 class JsonRpcTransformers {
     static hashTypeFrom(hashType) {
-        return (0, index_js_1.hashTypeFrom)(hashType);
+        return (0, index_js_2.hashTypeFrom)(hashType);
     }
     static hashTypeTo(hashType) {
         return hashType;
     }
     static depTypeFrom(depType) {
-        switch ((0, index_js_1.depTypeFrom)(depType)) {
+        switch ((0, index_js_2.depTypeFrom)(depType)) {
             case "code":
                 return "code";
             case "depGroup":
@@ -30,7 +31,7 @@ class JsonRpcTransformers {
         }
     }
     static scriptFrom(scriptLike) {
-        const script = index_js_1.Script.from(scriptLike);
+        const script = index_js_2.Script.from(scriptLike);
         return {
             code_hash: script.codeHash,
             hash_type: JsonRpcTransformers.hashTypeFrom(script.hashType),
@@ -38,50 +39,50 @@ class JsonRpcTransformers {
         };
     }
     static scriptTo(script) {
-        return index_js_1.Script.from({
+        return index_js_2.Script.from({
             codeHash: script.code_hash,
             hashType: JsonRpcTransformers.hashTypeTo(script.hash_type),
             args: script.args,
         });
     }
     static outPointFrom(outPointLike) {
-        const outPoint = index_js_1.OutPoint.from(outPointLike);
+        const outPoint = index_js_2.OutPoint.from(outPointLike);
         return {
-            index: (0, index_js_3.numToHex)(outPoint.index),
+            index: (0, index_js_4.numToHex)(outPoint.index),
             tx_hash: outPoint.txHash,
         };
     }
     static outPointTo(outPoint) {
-        return index_js_1.OutPoint.from({
+        return index_js_2.OutPoint.from({
             index: outPoint.index,
             txHash: outPoint.tx_hash,
         });
     }
     static cellInputFrom(cellInputLike) {
-        const cellInput = index_js_1.CellInput.from(cellInputLike);
+        const cellInput = index_js_2.CellInput.from(cellInputLike);
         return {
             previous_output: JsonRpcTransformers.outPointFrom(cellInput.previousOutput),
-            since: (0, index_js_3.numToHex)(cellInput.since),
+            since: (0, index_js_4.numToHex)(cellInput.since),
         };
     }
     static cellInputTo(cellInput) {
-        return index_js_1.CellInput.from({
+        return index_js_2.CellInput.from({
             previousOutput: JsonRpcTransformers.outPointTo(cellInput.previous_output),
             since: cellInput.since,
         });
     }
     static cellOutputFrom(cellOutput) {
         return {
-            capacity: (0, index_js_3.numToHex)(cellOutput.capacity),
+            capacity: (0, index_js_4.numToHex)(cellOutput.capacity),
             lock: JsonRpcTransformers.scriptFrom(cellOutput.lock),
-            type: (0, index_js_4.apply)(JsonRpcTransformers.scriptFrom, cellOutput.type),
+            type: (0, index_js_5.apply)(JsonRpcTransformers.scriptFrom, cellOutput.type),
         };
     }
     static cellOutputTo(cellOutput) {
-        return index_js_1.CellOutput.from({
+        return index_js_2.CellOutput.from({
             capacity: cellOutput.capacity,
             lock: JsonRpcTransformers.scriptTo(cellOutput.lock),
-            type: (0, index_js_4.apply)(JsonRpcTransformers.scriptTo, cellOutput.type),
+            type: (0, index_js_5.apply)(JsonRpcTransformers.scriptTo, cellOutput.type),
         });
     }
     static cellDepFrom(cellDep) {
@@ -91,15 +92,15 @@ class JsonRpcTransformers {
         };
     }
     static cellDepTo(cellDep) {
-        return index_js_1.CellDep.from({
+        return index_js_2.CellDep.from({
             outPoint: JsonRpcTransformers.outPointTo(cellDep.out_point),
             depType: JsonRpcTransformers.depTypeTo(cellDep.dep_type),
         });
     }
     static transactionFrom(txLike) {
-        const tx = index_js_1.Transaction.from(txLike);
+        const tx = index_js_2.Transaction.from(txLike);
         return {
-            version: (0, index_js_3.numToHex)(tx.version),
+            version: (0, index_js_4.numToHex)(tx.version),
             cell_deps: tx.cellDeps.map((c) => JsonRpcTransformers.cellDepFrom(c)),
             header_deps: tx.headerDeps,
             inputs: tx.inputs.map((i) => JsonRpcTransformers.cellInputFrom(i)),
@@ -109,7 +110,7 @@ class JsonRpcTransformers {
         };
     }
     static transactionTo(tx) {
-        return index_js_1.Transaction.from({
+        return index_js_2.Transaction.from({
             version: tx.version,
             cellDeps: tx.cell_deps.map((c) => JsonRpcTransformers.cellDepTo(c)),
             headerDeps: tx.header_deps,
@@ -126,27 +127,33 @@ class JsonRpcTransformers {
         return {
             transaction: JsonRpcTransformers.transactionTo(transaction),
             status,
-            cycles: (0, index_js_4.apply)(index_js_3.numFrom, cycles),
-            blockHash: (0, index_js_4.apply)(index_js_2.hexFrom, block_hash),
-            blockNumber: (0, index_js_4.apply)(index_js_3.numFrom, block_number),
-            txIndex: (0, index_js_4.apply)(index_js_3.numFrom, tx_index),
+            cycles: (0, index_js_5.apply)(index_js_4.numFrom, cycles),
+            blockHash: (0, index_js_5.apply)(index_js_3.hexFrom, block_hash),
+            blockNumber: (0, index_js_5.apply)(index_js_4.numFrom, block_number),
+            txIndex: (0, index_js_5.apply)(index_js_4.numFrom, tx_index),
             reason,
         };
     }
     static blockHeaderTo(header) {
+        const dao = (0, index_js_1.bytesFrom)(header.dao);
         return {
-            compactTarget: (0, index_js_3.numFrom)(header.compact_target),
-            dao: header.dao,
-            epoch: (0, index_js_3.numFrom)(header.epoch),
+            compactTarget: (0, index_js_4.numFrom)(header.compact_target),
+            dao: {
+                c: (0, index_js_4.numLeFromBytes)(dao.slice(0, 8)),
+                ar: (0, index_js_4.numLeFromBytes)(dao.slice(8, 16)),
+                s: (0, index_js_4.numLeFromBytes)(dao.slice(16, 24)),
+                u: (0, index_js_4.numLeFromBytes)(dao.slice(24, 32)),
+            },
+            epoch: (0, index_js_2.epochFromHex)(header.epoch),
             extraHash: header.extra_hash,
             hash: header.hash,
-            nonce: (0, index_js_3.numFrom)(header.nonce),
-            number: (0, index_js_3.numFrom)(header.number),
+            nonce: (0, index_js_4.numFrom)(header.nonce),
+            number: (0, index_js_4.numFrom)(header.number),
             parentHash: header.parent_hash,
             proposalsHash: header.proposals_hash,
-            timestamp: (0, index_js_3.numFrom)(header.timestamp),
+            timestamp: (0, index_js_4.numFrom)(header.timestamp),
             transactionsRoot: header.transactions_root,
-            version: (0, index_js_3.numFrom)(header.version),
+            version: (0, index_js_4.numFrom)(header.version),
         };
     }
     static blockUncleTo(block) {
@@ -164,17 +171,17 @@ class JsonRpcTransformers {
         };
     }
     static rangeFrom([a, b]) {
-        return [(0, index_js_3.numToHex)(a), (0, index_js_3.numToHex)(b)];
+        return [(0, index_js_4.numToHex)(a), (0, index_js_4.numToHex)(b)];
     }
     static indexerSearchKeyFilterFrom(filter) {
         return {
-            script: (0, index_js_4.apply)(JsonRpcTransformers.scriptFrom, filter.script),
-            script_len_range: (0, index_js_4.apply)(JsonRpcTransformers.rangeFrom, filter.scriptLenRange),
+            script: (0, index_js_5.apply)(JsonRpcTransformers.scriptFrom, filter.script),
+            script_len_range: (0, index_js_5.apply)(JsonRpcTransformers.rangeFrom, filter.scriptLenRange),
             output_data: filter.outputData,
             output_data_filter_mode: filter.outputDataSearchMode,
-            output_data_len_range: (0, index_js_4.apply)(JsonRpcTransformers.rangeFrom, filter.outputDataLenRange),
-            output_capacity_range: (0, index_js_4.apply)(JsonRpcTransformers.rangeFrom, filter.outputCapacityRange),
-            block_range: (0, index_js_4.apply)(JsonRpcTransformers.rangeFrom, filter.blockRange),
+            output_data_len_range: (0, index_js_5.apply)(JsonRpcTransformers.rangeFrom, filter.outputDataLenRange),
+            output_capacity_range: (0, index_js_5.apply)(JsonRpcTransformers.rangeFrom, filter.outputCapacityRange),
+            block_range: (0, index_js_5.apply)(JsonRpcTransformers.rangeFrom, filter.blockRange),
         };
     }
     static indexerSearchKeyFrom(keyLike) {
@@ -183,14 +190,14 @@ class JsonRpcTransformers {
             script: JsonRpcTransformers.scriptFrom(key.script),
             script_type: key.scriptType,
             script_search_mode: key.scriptSearchMode,
-            filter: (0, index_js_4.apply)(JsonRpcTransformers.indexerSearchKeyFilterFrom, key.filter),
+            filter: (0, index_js_5.apply)(JsonRpcTransformers.indexerSearchKeyFilterFrom, key.filter),
             with_data: key.withData,
         };
     }
     static findCellsResponseTo({ last_cursor, objects, }) {
         return {
             lastCursor: last_cursor,
-            cells: objects.map((cell) => index_js_1.Cell.from({
+            cells: objects.map((cell) => index_js_2.Cell.from({
                 outPoint: JsonRpcTransformers.outPointTo(cell.out_point),
                 cellOutput: JsonRpcTransformers.cellOutputTo(cell.output),
                 outputData: cell.output_data ?? "0x",
@@ -203,7 +210,7 @@ class JsonRpcTransformers {
             script: JsonRpcTransformers.scriptFrom(key.script),
             script_type: key.scriptType,
             script_search_mode: key.scriptSearchMode,
-            filter: (0, index_js_4.apply)(JsonRpcTransformers.indexerSearchKeyFilterFrom, key.filter),
+            filter: (0, index_js_5.apply)(JsonRpcTransformers.indexerSearchKeyFilterFrom, key.filter),
             group_by_transaction: key.groupByTransaction,
         };
     }
@@ -219,9 +226,9 @@ class JsonRpcTransformers {
                 lastCursor: last_cursor,
                 transactions: objects.map((tx) => ({
                     txHash: tx.tx_hash,
-                    blockNumber: (0, index_js_3.numFrom)(tx.block_number),
-                    txIndex: (0, index_js_3.numFrom)(tx.tx_index),
-                    cellIndex: (0, index_js_3.numFrom)(tx.io_index),
+                    blockNumber: (0, index_js_4.numFrom)(tx.block_number),
+                    txIndex: (0, index_js_4.numFrom)(tx.tx_index),
+                    cellIndex: (0, index_js_4.numFrom)(tx.io_index),
                     isInput: tx.io_type === "input",
                 })),
             };
@@ -230,11 +237,11 @@ class JsonRpcTransformers {
             lastCursor: last_cursor,
             transactions: objects.map((tx) => ({
                 txHash: tx.tx_hash,
-                blockNumber: (0, index_js_3.numFrom)(tx.block_number),
-                txIndex: (0, index_js_3.numFrom)(tx.tx_index),
+                blockNumber: (0, index_js_4.numFrom)(tx.block_number),
+                txIndex: (0, index_js_4.numFrom)(tx.tx_index),
                 cells: tx.cells.map(([type, i]) => ({
                     isInput: type === "input",
-                    cellIndex: (0, index_js_3.numFrom)(i),
+                    cellIndex: (0, index_js_4.numFrom)(i),
                 })),
             })),
         };

package/dist.commonjs/fixedPoint/index.d.ts

@@ -20,8 +20,8 @@ export type FixedPointLike = bigint | string | number;
  * @example
  * ```typescript
  * const str = fixedPointToString(123456789n, 8); // Outputs "1.23456789"
- * const strFromString = fixedPointToString("123456789", 8); // Outputs "1.23456789"
- * const strFromNumber = fixedPointToString(123456789, 8); // Outputs "1.23456789"
+ * const strFromString = fixedPointToString("1.23456789", 8); // Outputs "1.23456789"
+ * const strFromNumber = fixedPointToString(1.23456789, 8); // Outputs "1.23456789"
  * ```
  */
 export declare function fixedPointToString(val: FixedPointLike, decimals?: number): string;
@@ -35,7 +35,7 @@ export declare function fixedPointToString(val: FixedPointLike, decimals?: numbe
  *
  * @example
  * ```typescript
- * const fixedPoint = fixedPointFrom(1.23456789, 8); // Outputs 123456789n
+ * const fixedPoint = fixedPointFrom(123456789n, 8); // Outputs 123456789n
  * const fixedPointFromString = fixedPointFrom("1.23456789", 8); // Outputs 123456789n
  * const fixedPointFromNumber = fixedPointFrom(1.23456789, 8); // Outputs 123456789n
  * ```

package/dist.commonjs/fixedPoint/index.js

@@ -16,8 +16,8 @@ exports.One = exports.Zero = exports.fixedPointFrom = exports.fixedPointToString
  * @example
  * ```typescript
  * const str = fixedPointToString(123456789n, 8); // Outputs "1.23456789"
- * const strFromString = fixedPointToString("123456789", 8); // Outputs "1.23456789"
- * const strFromNumber = fixedPointToString(123456789, 8); // Outputs "1.23456789"
+ * const strFromString = fixedPointToString("1.23456789", 8); // Outputs "1.23456789"
+ * const strFromNumber = fixedPointToString(1.23456789, 8); // Outputs "1.23456789"
  * ```
  */
 function fixedPointToString(val, decimals = 8) {
@@ -43,7 +43,7 @@ exports.fixedPointToString = fixedPointToString;
  *
  * @example
  * ```typescript
- * const fixedPoint = fixedPointFrom(1.23456789, 8); // Outputs 123456789n
+ * const fixedPoint = fixedPointFrom(123456789n, 8); // Outputs 123456789n
  * const fixedPointFromString = fixedPointFrom("1.23456789", 8); // Outputs 123456789n
  * const fixedPointFromNumber = fixedPointFrom(1.23456789, 8); // Outputs 123456789n
  * ```

package/dist.commonjs/signer/signer/index.d.ts

@@ -1,6 +1,7 @@
 import { Address } from "../../address/index.js";
+import { ClientCollectableSearchKeyFilterLike } from "../../advancedBarrel.js";
 import { BytesLike } from "../../bytes/index.js";
-import { Transaction, TransactionLike } from "../../ckb/index.js";
+import { Cell, Transaction, TransactionLike } from "../../ckb/index.js";
 import { Client } from "../../client/index.js";
 import { Hex } from "../../hex/index.js";
 import { Num } from "../../num/index.js";
@@ -128,6 +129,7 @@ export declare abstract class Signer {
      * @returns A promise that resolves to an array of addresses as strings.
      */
     getAddresses(): Promise<string[]>;
+    findCells(filter: ClientCollectableSearchKeyFilterLike, withData?: boolean | null): AsyncGenerator<Cell>;
     /**
      * Gets balance of all addresses
      *

package/dist.commonjs/signer/signer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/signer/signer/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/signer/signer/index.ts"],"names":[],"mappings":"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"}

package/dist.commonjs/signer/signer/index.js

@@ -129,6 +129,20 @@ class Signer {
     async getAddresses() {
         return this.getAddressObjs().then((addresses) => addresses.map((address) => address.toString()));
     }
+    async *findCells(filter, withData) {
+        const scripts = await this.getAddressObjs();
+        for (const { script } of scripts) {
+            for await (const cell of this.client.findCells({
+                script,
+                scriptType: "lock",
+                filter,
+                scriptSearchMode: "exact",
+                withData,
+            })) {
+                yield cell;
+            }
+        }
+    }
     /**
      * Gets balance of all addresses
      *

package/package.json

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

package/src/ckb/transaction.ts

@@ -1,5 +1,5 @@
 import { ClientCollectableSearchKeyFilterLike } from "../advancedBarrel.js";
-import { Bytes, BytesLike, bytesFrom } from "../bytes/index.js";
+import { Bytes, BytesLike, bytesConcat, bytesFrom } from "../bytes/index.js";
 import { CellDepInfoLike, Client, KnownScript } from "../client/index.js";
 import {
   Zero,
@@ -11,8 +11,11 @@ import { Hex, HexLike, hexFrom } from "../hex/index.js";
 import {
   Num,
   NumLike,
+  numBeToBytes,
   numFrom,
   numFromBytes,
+  numLeFromBytes,
+  numLeToBytes,
   numToBytes,
   numToHex,
 } from "../num/index.js";
@@ -416,12 +419,162 @@ export class Cell {
   }
 }
 
+/**
+ * @public
+ */
+export type EpochLike = [NumLike, NumLike, NumLike];
+/**
+ * @public
+ */
+export type Epoch = [Num, Num, Num];
+/**
+ * @public
+ */
+export function epochFrom(epochLike: EpochLike): Epoch {
+  return [numFrom(epochLike[0]), numFrom(epochLike[1]), numFrom(epochLike[2])];
+}
+/**
+ * @public
+ */
+export function epochFromHex(hex: HexLike): Epoch {
+  const bytes = bytesFrom(hexFrom(hex));
+
+  return [
+    numFrom(bytes.slice(4, 7)),
+    numFrom(bytes.slice(2, 4)),
+    numFrom(bytes.slice(0, 2)),
+  ];
+}
+/**
+ * @public
+ */
+export function epochToHex(epochLike: EpochLike): Hex {
+  const epoch = epochFrom(epochLike);
+
+  return hexFrom(
+    bytesConcat(
+      numBeToBytes(epoch[2], 2),
+      numBeToBytes(epoch[1], 2),
+      numBeToBytes(epoch[0], 3),
+    ),
+  );
+}
+
+/**
+ * @public
+ */
+export type SinceLike =
+  | {
+      relative: "absolute" | "relative";
+      metric: "blockNumber" | "epoch" | "timestamp";
+      value: NumLike;
+    }
+  | NumLike;
+/**
+ * @public
+ */
+export class Since {
+  /**
+   * Creates an instance of Since.
+   *
+   * @param relative - Absolute or relative
+   * @param metric - The metric of since
+   * @param value - The value of since
+   */
+
+  constructor(
+    public relative: "absolute" | "relative",
+    public metric: "blockNumber" | "epoch" | "timestamp",
+    public value: Num,
+  ) {}
+
+  /**
+   * Clone a Since.
+   *
+   * @returns A cloned Since instance.
+   *
+   * @example
+   * ```typescript
+   * const since1 = since0.clone();
+   * ```
+   */
+  clone(): Since {
+    return new Since(this.relative, this.metric, this.value);
+  }
+
+  /**
+   * Creates a Since instance from a SinceLike object.
+   *
+   * @param since - A SinceLike object or an instance of Since.
+   * @returns A Since instance.
+   *
+   * @example
+   * ```typescript
+   * const since = Since.from("0x1234567812345678");
+   * ```
+   */
+  static from(since: SinceLike): Since {
+    if (since instanceof Since) {
+      return since;
+    }
+
+    if (typeof since === "object" && "relative" in since) {
+      return new Since(since.relative, since.metric, numFrom(since.value));
+    }
+
+    return Since.fromNum(since);
+  }
+
+  /**
+   * Converts the Since instance to num.
+   *
+   * @returns A num
+   *
+   * @example
+   * ```typescript
+   * const num = since.toNum();
+   * ```
+   */
+
+  toNum(): Num {
+    const flag =
+      ((this.relative === "absolute" ? 0 : 1) << 7) |
+      ({ blockNumber: 0, epoch: 1, timestamp: 2 }[this.metric] << 5);
+
+    return numFrom(bytesConcat([flag], numLeToBytes(this.value, 7)));
+  }
+
+  /**
+   * Creates a Since instance from a num-like value.
+   *
+   * @param numLike - The num-like value to convert.
+   * @returns A Since instance.
+   *
+   * @example
+   * ```typescript
+   * const since = Since.fromNum("0x0");
+   * ```
+   */
+
+  static fromNum(numLike: NumLike): Since {
+    const bytes = numBeToBytes(numLike, 8);
+
+    const relative = bytes[0] >> 7 === 0 ? "absolute" : "relative";
+    const metric = (["blockNumber", "epoch", "timestamp"] as Since["metric"][])[
+      (bytes[0] >> 5) & 3
+    ];
+    const value = numLeFromBytes(bytes.slice(1, 8));
+
+    return new Since(relative, metric, value);
+  }
+}
+
 /**
  * @public
  */
 export type CellInputLike = {
   previousOutput: OutPointLike;
-  since?: NumLike | null;
+  since?: SinceLike | NumLike | null;
   cellOutput?: CellOutputLike | null;
   outputData?: HexLike | null;
 };
@@ -485,7 +638,7 @@ export class CellInput {
 
     return new CellInput(
       OutPoint.from(cellInput.previousOutput),
-      numFrom(cellInput.since ?? 0),
+      Since.from(cellInput.since ?? 0).toNum(),
       apply(CellOutput.from, cellInput.cellOutput),
       apply(hexFrom, cellInput.outputData),
     );
@@ -1536,46 +1689,33 @@ export class Transaction {
     addedCount: number;
     accumulated?: T;
   }> {
-    const scripts = (await from.getAddressObjs()).map(({ script }) => script);
     const collectedCells = [];
 
     let acc: T = init;
     let fulfilled = false;
-    for (const script of scripts) {
-      for await (const cell of from.client.findCellsByCollectableSearchKey({
-        script,
-        scriptType: "lock",
-        filter,
-        scriptSearchMode: "exact",
-        withData: true,
-      })) {
-        if (
-          this.inputs.some(({ previousOutput }) =>
-            previousOutput.eq(cell.outPoint),
-          )
-        ) {
-          continue;
-        }
-        const i = collectedCells.push(cell);
-        const next = await Promise.resolve(
-          accumulator(acc, cell, i - 1, collectedCells),
-        );
-        if (next === undefined) {
-          fulfilled = true;
-          break;
-        }
-        acc = next;
+    for await (const cell of from.findCells(filter, true)) {
+      if (
+        this.inputs.some(({ previousOutput }) =>
+          previousOutput.eq(cell.outPoint),
+        )
+      ) {
+        continue;
       }
-      if (fulfilled) {
+      const i = collectedCells.push(cell);
+      const next = await Promise.resolve(
+        accumulator(acc, cell, i - 1, collectedCells),
+      );
+      if (next === undefined) {
+        fulfilled = true;
         break;
       }
+      acc = next;
     }
 
     this.inputs.push(
       ...collectedCells.map(({ outPoint, outputData, cellOutput }) =>
         CellInput.from({
           previousOutput: outPoint,
-          since: 0,
           outputData,
           cellOutput,
         }),