@ckb-ccc/core 0.0.13 → 0.0.14-alpha.1

package/src/client/jsonRpc/index.ts

@@ -15,6 +15,8 @@ import {
   ClientTransactionResponse,
   ErrorClientBase,
   ErrorClientBaseLike,
+  ErrorClientDuplicatedTransaction,
+  ErrorClientRBFRejected,
   ErrorClientResolveUnknown,
   ErrorClientVerification,
   OutputsValidator,
@@ -50,6 +52,41 @@ async function transform(
   return value;
 }
 
+const ERROR_PARSERS: [
+  string,
+  (error: ErrorClientBaseLike, match: RegExpMatchArray) => ErrorClientBase,
+][] = [
+  [
+    "Resolve\\(Unknown\\(OutPoint\\((0x.*)\\)\\)\\)",
+    (error, match) =>
+      new ErrorClientResolveUnknown(error, OutPoint.fromBytes(match[1])),
+  ],
+  [
+    "Verification\\(Error { kind: Script, inner: TransactionScriptError { source: (Inputs|Outputs)\\[([0-9]*)\\].(Lock|Type), cause: ValidationFailure: see error code (-?[0-9])* on page https://nervosnetwork\\.github\\.io/ckb-script-error-codes/by-(type|data)-hash/(.*)\\.html",
+    (error, match) =>
+      new ErrorClientVerification(
+        error,
+        match[3] === "Lock"
+          ? "lock"
+          : match[1] === "Inputs"
+            ? "inputType"
+            : "outputType",
+        match[2],
+        Number(match[4]),
+        match[5] === "data" ? "data" : "type",
+        match[6],
+      ),
+  ],
+  [
+    "Duplicated\\(Byte32\\((0x.*)\\)\\)",
+    (error, match) => new ErrorClientDuplicatedTransaction(error, match[1]),
+  ],
+  [
+    'RBFRejected\\("Tx\'s current fee is ([0-9]*), expect it to >= ([0-9]*) to replace old txs"\\)',
+    (error, match) => new ErrorClientRBFRejected(error, match[1], match[2]),
+  ],
+];
+
 /**
  * An abstract class implementing JSON-RPC client functionality for a specific URL and timeout.
  * Provides methods for sending transactions and building JSON-RPC payloads.
@@ -353,33 +390,11 @@ export abstract class ClientJsonRpc extends Client {
         }
         const err = errAny as ErrorClientBaseLike;
 
-        const unknownOutPointMatch = err.data.match(
-          new RegExp("Resolve\\(Unknown\\(OutPoint\\((0x.*)\\)\\)\\)"),
-        )?.[1];
-        if (unknownOutPointMatch) {
-          throw new ErrorClientResolveUnknown(
-            err,
-            OutPoint.fromBytes(unknownOutPointMatch),
-          );
-        }
-        const verificationFailedMatch = err.data.match(
-          new RegExp(
-            "Verification\\(Error { kind: Script, inner: TransactionScriptError { source: (Inputs|Outputs)\\[([0-9]*)\\].(Lock|Type), cause: ValidationFailure: see error code (-?[0-9])* on page https://nervosnetwork\\.github\\.io/ckb-script-error-codes/by-(type|data)-hash/(.*)\\.html",
-          ),
-        );
-        if (verificationFailedMatch) {
-          throw new ErrorClientVerification(
-            err,
-            verificationFailedMatch[3] === "Lock"
-              ? "lock"
-              : verificationFailedMatch[1] === "Inputs"
-                ? "inputType"
-                : "outputType",
-            verificationFailedMatch[2],
-            Number(verificationFailedMatch[4]),
-            verificationFailedMatch[5] === "data" ? "data" : "type",
-            verificationFailedMatch[6],
-          );
+        for (const [regexp, builder] of ERROR_PARSERS) {
+          const match = err.data.match(regexp);
+          if (match) {
+            throw builder(err, match);
+          }
         }
 
         throw new ErrorClientBase(err);
@@ -405,7 +420,7 @@ export abstract class ClientJsonRpc extends Client {
       throw new Error(`Id mismatched, got ${res.id}, expected ${payload.id}`);
     }
     if (res.error) {
-      throw res.error;
+      throw new Error(`Client request error ${JSON.stringify(res.error)}`);
     }
     return res.result;
   }

package/src/num/index.ts

@@ -14,6 +14,29 @@ export type Num = bigint;
  */
 export type NumLike = string | number | bigint | HexLike;
 
+/**
+ * Get the min among all numbers.
+ * @public
+ *
+ * @param numbers - numbers.
+ * @returns The min numbers among them.
+ *
+ * @example
+ * ```typescript
+ * numMin(1, 2, 3); // Outputs 1n
+ * ```
+ */
+export function numMin(a: NumLike, ...numbers: NumLike[]): Num {
+  let min = numFrom(a);
+  numbers.forEach((nLike) => {
+    const n = numFrom(nLike);
+    if (n < min) {
+      min = n;
+    }
+  });
+  return min;
+}
+
 /**
  * Get the max among all numbers.
  * @public
@@ -167,7 +190,7 @@ export function numFromBytes(val: BytesLike): Num {
  * ```
  */
 export function numLeFromBytes(val: BytesLike): Num {
-  return numBeFromBytes(bytesFrom(val).reverse());
+  return numBeFromBytes([...bytesFrom(val)].reverse());
 }
 
 /**

package/src/signer/ckb/signerCkbPrivateKey.ts

@@ -45,17 +45,21 @@ export class SignerCkbPrivateKey extends SignerCkbPublicKey {
 
   async signOnlyTransaction(txLike: TransactionLike): Promise<Transaction> {
     const tx = Transaction.from(txLike);
-    const { script } = await this.getRecommendedAddressObj();
-    const info = await tx.getSignHashInfo(script, this.client);
-    if (!info) {
-      return tx;
-    }
 
-    const signature = await this._signMessage(info.message);
+    for (const { script } of await this.getRelatedScripts(tx)) {
+      const info = await tx.getSignHashInfo(script, this.client);
+      if (!info) {
+        return tx;
+      }
+
+      const signature = await this._signMessage(info.message);
+
+      const witness =
+        tx.getWitnessArgsAt(info.position) ?? WitnessArgs.from({});
+      witness.lock = signature;
+      tx.setWitnessArgsAt(info.position, witness);
+    }
 
-    const witness = tx.getWitnessArgsAt(info.position) ?? WitnessArgs.from({});
-    witness.lock = signature;
-    tx.setWitnessArgsAt(info.position, witness);
     return tx;
   }
 }

package/src/signer/ckb/signerCkbPublicKey.ts

@@ -1,7 +1,7 @@
 import { Address } from "../../address/index.js";
 import { bytesFrom } from "../../bytes/index.js";
-import { Transaction, TransactionLike } from "../../ckb/index.js";
-import { Client, KnownScript } from "../../client/index.js";
+import { Script, Transaction, TransactionLike } from "../../ckb/index.js";
+import { CellDepInfo, Client, KnownScript } from "../../client/index.js";
 import { hashCkb } from "../../hasher/index.js";
 import { Hex, HexLike, hexFrom } from "../../hex/index.js";
 import { Signer, SignerSignType, SignerType } from "../signer/index.js";
@@ -43,24 +43,109 @@ export class SignerCkbPublicKey extends Signer {
     return this.publicKey;
   }
 
+  async getAddressObjSecp256k1(): Promise<Address> {
+    return Address.fromKnownScript(
+      this.client,
+      KnownScript.Secp256k1Blake160,
+      bytesFrom(hashCkb(this.publicKey)).slice(0, 20),
+    );
+  }
+
+  async getRecommendedAddressObj(_preference?: unknown): Promise<Address> {
+    return this.getAddressObjSecp256k1();
+  }
+
   async getAddressObjs(): Promise<Address[]> {
-    return [
-      await Address.fromKnownScript(
+    const secp256k1 = await this.getAddressObjSecp256k1();
+
+    const addresses: Address[] = [];
+    let count = 0;
+    for await (const cell of this.client.findCells({
+      script: await Script.fromKnownScript(
         this.client,
-        KnownScript.Secp256k1Blake160,
-        bytesFrom(hashCkb(this.publicKey)).slice(0, 20),
+        KnownScript.AnyoneCanPay,
+        secp256k1.script.args,
       ),
-    ];
+      scriptType: "lock",
+      scriptSearchMode: "prefix",
+      withData: false,
+    })) {
+      if (count >= 10) {
+        break;
+      }
+      count += 1;
+
+      if (addresses.some(({ script }) => script.eq(cell.cellOutput.lock))) {
+        continue;
+      }
+
+      addresses.push(
+        Address.from({
+          prefix: this.client.addressPrefix,
+          script: cell.cellOutput.lock,
+        }),
+      );
+    }
+
+    return [secp256k1, ...addresses];
   }
 
-  async prepareTransaction(txLike: TransactionLike): Promise<Transaction> {
+  async getRelatedScripts(
+    txLike: TransactionLike,
+  ): Promise<{ script: Script; cellDeps: CellDepInfo[] }[]> {
     const tx = Transaction.from(txLike);
-    const { script } = await this.getRecommendedAddressObj();
-    await tx.addCellDepsOfKnownScripts(
+
+    const secp256k1 = await this.getAddressObjSecp256k1();
+    const acp = await Script.fromKnownScript(
       this.client,
-      KnownScript.Secp256k1Blake160,
+      KnownScript.AnyoneCanPay,
+      secp256k1.script.args,
+    );
+
+    const scripts: { script: Script; cellDeps: CellDepInfo[] }[] = [];
+    for (const input of tx.inputs) {
+      await input.completeExtraInfos(this.client);
+      if (!input.cellOutput) {
+        throw new Error("Unable to complete input");
+      }
+
+      const { lock } = input.cellOutput;
+      if (scripts.some(({ script }) => script.eq(lock))) {
+        continue;
+      }
+
+      if (lock.eq(secp256k1.script)) {
+        scripts.push({
+          script: lock,
+          cellDeps: (
+            await this.client.getKnownScript(KnownScript.Secp256k1Blake160)
+          ).cellDeps,
+        });
+      } else if (
+        lock.codeHash === acp.codeHash &&
+        lock.hashType === acp.hashType &&
+        lock.args.startsWith(acp.args)
+      ) {
+        scripts.push({
+          script: lock,
+          cellDeps: (await this.client.getKnownScript(KnownScript.AnyoneCanPay))
+            .cellDeps,
+        });
+      }
+    }
+
+    return scripts;
+  }
+
+  async prepareTransaction(txLike: TransactionLike): Promise<Transaction> {
+    const tx = Transaction.from(txLike);
+
+    await Promise.all(
+      (await this.getRelatedScripts(tx)).map(async ({ script, cellDeps }) => {
+        await tx.prepareSighashAllWitness(script, 65, this.client);
+        await tx.addCellDepInfos(this.client, cellDeps);
+      }),
     );
-    await tx.prepareSighashAllWitness(script, 65, this.client);
     return tx;
   }
 }