@ckb-ccc/core 0.0.10-alpha.5 → 0.0.10-alpha.7

package/src/signer/btc/signerBtc.ts

@@ -1,12 +1,12 @@
 import { ripemd160 } from "@noble/hashes/ripemd160";
 import { sha256 } from "@noble/hashes/sha256";
-import { Address } from "../../address";
-import { bytesConcat, bytesFrom } from "../../bytes";
-import { Transaction, TransactionLike, WitnessArgs } from "../../ckb";
-import { KnownScript } from "../../client";
-import { HexLike, hexFrom } from "../../hex";
-import { numToBytes } from "../../num";
-import { Signer, SignerSignType, SignerType } from "../signer";
+import { Address } from "../../address/index.js";
+import { bytesConcat, bytesFrom } from "../../bytes/index.js";
+import { Transaction, TransactionLike, WitnessArgs } from "../../ckb/index.js";
+import { KnownScript } from "../../client/index.js";
+import { HexLike, hexFrom } from "../../hex/index.js";
+import { numToBytes } from "../../num/index.js";
+import { Signer, SignerSignType, SignerType } from "../signer/index.js";
 
 /**
  * An abstract class extending the Signer class for Bitcoin-like signing operations.

package/src/signer/btc/signerBtcPublicKeyReadonly.ts

@@ -1,6 +1,6 @@
-import { Client } from "../../client";
-import { Hex, HexLike, hexFrom } from "../../hex";
-import { SignerBtc } from "./signerBtc";
+import { Client } from "../../client/index.js";
+import { Hex, HexLike, hexFrom } from "../../hex/index.js";
+import { SignerBtc } from "./signerBtc.js";
 
 /**
  * A class extending SignerBtc that provides read-only access to a Bitcoin public key and account.

package/src/signer/btc/verify.ts

@@ -1,7 +1,7 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
 import { magicHash } from "bitcoinjs-message";
-import { BytesLike, bytesFrom } from "../../bytes";
-import { hexFrom } from "../../hex";
+import { BytesLike, bytesFrom } from "../../bytes/index.js";
+import { hexFrom } from "../../hex/index.js";
 
 export function verifyMessageBtcEcdsa(
   message: string | BytesLike,

package/src/signer/ckb/index.ts

@@ -1,5 +1,5 @@
-export * from "./signerCkbPrivateKey";
-export * from "./signerCkbPublicKey";
-export * from "./signerCkbScriptReadonly";
-export * from "./verifyCkbSecp256k1";
-export * from "./verifyJoyId";
+export * from "./signerCkbPrivateKey.js";
+export * from "./signerCkbPublicKey.js";
+export * from "./signerCkbScriptReadonly.js";
+export * from "./verifyCkbSecp256k1.js";
+export * from "./verifyJoyId.js";

package/src/signer/ckb/signerCkbPrivateKey.ts

@@ -1,11 +1,11 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
-import { bytesConcat, bytesFrom, BytesLike } from "../../bytes";
-import { Transaction, TransactionLike, WitnessArgs } from "../../ckb";
-import { Client } from "../../client";
-import { hashCkb } from "../../hasher";
-import { Hex, hexFrom, HexLike } from "../../hex";
-import { numBeToBytes } from "../../num";
-import { SignerCkbPublicKey } from "./signerCkbPublicKey";
+import { bytesConcat, bytesFrom, BytesLike } from "../../bytes/index.js";
+import { Transaction, TransactionLike, WitnessArgs } from "../../ckb/index.js";
+import { Client } from "../../client/index.js";
+import { Hex, hexFrom, HexLike } from "../../hex/index.js";
+import { numBeToBytes } from "../../num/index.js";
+import { SignerCkbPublicKey } from "./signerCkbPublicKey.js";
+import { messageHashCkbSecp256k1 } from "./verifyCkbSecp256k1.js";
 
 export class SignerCkbPrivateKey extends SignerCkbPublicKey {
   public readonly privateKey: Hex;
@@ -20,13 +20,9 @@ export class SignerCkbPrivateKey extends SignerCkbPublicKey {
     this.privateKey = pk;
   }
 
-  async signMessageRaw(message: string | BytesLike): Promise<Hex> {
-    const msg = typeof message === "string" ? message : hexFrom(message);
-    const buffer = bytesFrom(`Nervos Message:${msg}`, "utf8");
-    const hash = hashCkb(buffer);
-
+  async _signMessage(message: HexLike): Promise<Hex> {
     const signature = secp256k1.sign(
-      bytesFrom(hash),
+      bytesFrom(message),
       bytesFrom(this.privateKey),
     );
     const { r, s, recovery } = signature;
@@ -40,6 +36,10 @@ export class SignerCkbPrivateKey extends SignerCkbPublicKey {
     );
   }
 
+  async signMessageRaw(message: string | BytesLike): Promise<Hex> {
+    return this._signMessage(messageHashCkbSecp256k1(message));
+  }
+
   async signOnlyTransaction(txLike: TransactionLike): Promise<Transaction> {
     const tx = Transaction.from(txLike);
     const { script } = await this.getRecommendedAddressObj();
@@ -48,7 +48,7 @@ export class SignerCkbPrivateKey extends SignerCkbPublicKey {
       return tx;
     }
 
-    const signature = await this.signMessageRaw(info.message);
+    const signature = await this._signMessage(info.message);
 
     const witness = tx.getWitnessArgsAt(info.position) ?? WitnessArgs.from({});
     witness.lock = signature;

package/src/signer/ckb/signerCkbPublicKey.ts

@@ -1,10 +1,10 @@
-import { Address } from "../../address";
-import { bytesFrom } from "../../bytes";
-import { Transaction, TransactionLike } from "../../ckb";
-import { Client, KnownScript } from "../../client";
-import { hashCkb } from "../../hasher";
-import { Hex, HexLike, hexFrom } from "../../hex";
-import { Signer, SignerSignType, SignerType } from "../signer";
+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 { hashCkb } from "../../hasher/index.js";
+import { Hex, HexLike, hexFrom } from "../../hex/index.js";
+import { Signer, SignerSignType, SignerType } from "../signer/index.js";
 
 export class SignerCkbPublicKey extends Signer {
   get type(): SignerType {

package/src/signer/ckb/signerCkbScriptReadonly.ts

@@ -1,7 +1,7 @@
-import { Address } from "../../address";
-import { Script, ScriptLike } from "../../ckb";
-import { Client } from "../../client";
-import { Signer, SignerSignType, SignerType } from "../signer";
+import { Address } from "../../address/index.js";
+import { Script, ScriptLike } from "../../ckb/index.js";
+import { Client } from "../../client/index.js";
+import { Signer, SignerSignType, SignerType } from "../signer/index.js";
 
 /**
  * A class extending Signer that provides read-only access to a CKB script.

package/src/signer/ckb/verifyCkbSecp256k1.ts

@@ -1,8 +1,8 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
-import { BytesLike, bytesFrom } from "../../bytes";
-import { hashCkb } from "../../hasher";
-import { Hex, hexFrom } from "../../hex";
-import { numFrom } from "../../num";
+import { BytesLike, bytesFrom } from "../../bytes/index.js";
+import { hashCkb } from "../../hasher/index.js";
+import { Hex, hexFrom } from "../../hex/index.js";
+import { numFrom } from "../../num/index.js";
 
 export function messageHashCkbSecp256k1(message: string | BytesLike): Hex {
   const msg = typeof message === "string" ? message : hexFrom(message);

package/src/signer/ckb/verifyJoyId.ts

@@ -1,6 +1,6 @@
 import { verifySignature } from "@joyid/ckb";
-import { BytesLike } from "../../bytes";
-import { hexFrom } from "../../hex";
+import { BytesLike } from "../../bytes/index.js";
+import { hexFrom } from "../../hex/index.js";
 
 export function verifyMessageJoyId(
   message: string | BytesLike,

package/src/signer/dummy/alwaysError.ts

@@ -1,6 +1,6 @@
-import { Client } from "../../client";
-import { SignerType } from "../signer";
-import { SignerDummy } from "./dummy";
+import { Client } from "../../client/index.js";
+import { SignerType } from "../signer/index.js";
+import { SignerDummy } from "./dummy.js";
 
 export class SignerAlwaysError extends SignerDummy {
   constructor(

package/src/signer/dummy/dummy.ts

@@ -1,6 +1,6 @@
-import { Address } from "../../address";
-import { Client } from "../../client";
-import { Signer, SignerSignType, SignerType } from "../signer";
+import { Address } from "../../address/index.js";
+import { Client } from "../../client/index.js";
+import { Signer, SignerSignType, SignerType } from "../signer/index.js";
 
 export abstract class SignerDummy extends Signer {
   get signType(): SignerSignType {

package/src/signer/dummy/index.ts

@@ -1,3 +1,3 @@
-export * from "./alwaysError";
-export * from "./dummy";
-export * from "./openLink";
+export * from "./alwaysError.js";
+export * from "./dummy.js";
+export * from "./openLink.js";

package/src/signer/dummy/openLink.ts

@@ -1,6 +1,6 @@
-import { Client } from "../../client";
-import { SignerType } from "../signer";
-import { SignerDummy } from "./dummy";
+import { Client } from "../../client/index.js";
+import { SignerType } from "../signer/index.js";
+import { SignerDummy } from "./dummy.js";
 
 export class SignerOpenLink extends SignerDummy {
   constructor(

package/src/signer/evm/index.ts

@@ -1,3 +1,3 @@
-export * from "./signerEvm";
-export * from "./signerEvmAddressReadonly";
-export * from "./verify";
+export * from "./signerEvm.js";
+export * from "./signerEvmAddressReadonly.js";
+export * from "./verify.js";

package/src/signer/evm/signerEvm.ts

@@ -1,11 +1,16 @@
-import { Address } from "../../address";
-import { BytesLike, bytesConcat, bytesFrom } from "../../bytes";
-import { Script, Transaction, TransactionLike, WitnessArgs } from "../../ckb";
-import { KnownScript } from "../../client";
-import { Hex, hexFrom } from "../../hex";
-import { numToBytes } from "../../num";
-import { reduceAsync } from "../../utils";
-import { Signer, SignerSignType, SignerType } from "../signer";
+import { Address } from "../../address/index.js";
+import { BytesLike, bytesConcat, bytesFrom } from "../../bytes/index.js";
+import {
+  Script,
+  Transaction,
+  TransactionLike,
+  WitnessArgs,
+} from "../../ckb/index.js";
+import { KnownScript } from "../../client/index.js";
+import { Hex, hexFrom } from "../../hex/index.js";
+import { numToBytes } from "../../num/index.js";
+import { reduceAsync } from "../../utils/index.js";
+import { Signer, SignerSignType, SignerType } from "../signer/index.js";
 
 /**
  * An abstract class extending Signer for Ethereum Virtual Machine (EVM) based signing operations.

package/src/signer/evm/signerEvmAddressReadonly.ts

@@ -1,6 +1,6 @@
-import { Client } from "../../client";
-import { Hex, HexLike, hexFrom } from "../../hex";
-import { SignerEvm } from "./signerEvm";
+import { Client } from "../../client/index.js";
+import { Hex, HexLike, hexFrom } from "../../hex/index.js";
+import { SignerEvm } from "./signerEvm.js";
 
 /**
  * A class extending SignerEvm that provides read-only access to an EVM address.

package/src/signer/evm/verify.ts

@@ -1,5 +1,5 @@
 import { verifyMessage } from "ethers";
-import { BytesLike, bytesFrom } from "../../bytes";
+import { BytesLike, bytesFrom } from "../../bytes/index.js";
 
 export function verifyMessageEvmPersonal(
   message: string | BytesLike,

package/src/signer/index.ts

@@ -1,6 +1,6 @@
-export * from "./btc";
-export * from "./ckb";
-export * from "./dummy";
-export * from "./evm";
-export * from "./nostr";
-export * from "./signer";
+export * from "./btc/index.js";
+export * from "./ckb/index.js";
+export * from "./dummy/index.js";
+export * from "./evm/index.js";
+export * from "./nostr/index.js";
+export * from "./signer/index.js";

package/src/signer/nostr/index.ts

@@ -1 +1 @@
-export * from "./signerNostr";
+export * from "./signerNostr.js";

package/src/signer/nostr/signerNostr.ts

@@ -1,12 +1,12 @@
 import { bech32 } from "bech32";
-import { Address } from "../../address";
-import { BytesLike, bytesConcat, bytesFrom } from "../../bytes";
-import { Transaction, TransactionLike, WitnessArgs } from "../../ckb";
-import { KnownScript } from "../../client";
-import { hashCkb } from "../../hasher";
-import { Hex, hexFrom } from "../../hex";
-import { Signer, SignerSignType, SignerType } from "../signer";
-import { buildNostrEventFromMessage } from "./verify";
+import { Address } from "../../address/index.js";
+import { BytesLike, bytesConcat, bytesFrom } from "../../bytes/index.js";
+import { Transaction, TransactionLike, WitnessArgs } from "../../ckb/index.js";
+import { KnownScript } from "../../client/index.js";
+import { hashCkb } from "../../hasher/index.js";
+import { Hex, hexFrom } from "../../hex/index.js";
+import { Signer, SignerSignType, SignerType } from "../signer/index.js";
+import { buildNostrEventFromMessage } from "./verify.js";
 
 export interface NostrEvent {
   id?: string;

package/src/signer/nostr/verify.ts

@@ -1,9 +1,9 @@
 import { schnorr } from "@noble/curves/secp256k1";
 import { sha256 } from "@noble/hashes/sha256";
 import { bech32 } from "bech32";
-import { BytesLike, bytesFrom } from "../../bytes";
-import { hexFrom } from "../../hex";
-import { NostrEvent } from "./signerNostr";
+import { BytesLike, bytesFrom } from "../../bytes/index.js";
+import { hexFrom } from "../../hex/index.js";
+import { NostrEvent } from "./signerNostr.js";
 
 export function buildNostrEventFromMessage(
   message: string | BytesLike,

package/src/signer/signer/index.ts

@@ -1,14 +1,14 @@
-import { Address } from "../../address";
-import { BytesLike } from "../../bytes";
-import { Transaction, TransactionLike } from "../../ckb";
-import { Client } from "../../client";
-import { Hex } from "../../hex";
-import { Num } from "../../num";
-import { verifyMessageBtcEcdsa } from "../btc";
-import { verifyMessageCkbSecp256k1 } from "../ckb/verifyCkbSecp256k1";
-import { verifyMessageJoyId } from "../ckb/verifyJoyId";
-import { verifyMessageEvmPersonal } from "../evm/verify";
-import { verifyMessageNostrEvent } from "../nostr/verify";
+import { Address } from "../../address/index.js";
+import { BytesLike } from "../../bytes/index.js";
+import { Transaction, TransactionLike } from "../../ckb/index.js";
+import { Client } from "../../client/index.js";
+import { Hex } from "../../hex/index.js";
+import { Num } from "../../num/index.js";
+import { verifyMessageBtcEcdsa } from "../btc/index.js";
+import { verifyMessageCkbSecp256k1 } from "../ckb/verifyCkbSecp256k1.js";
+import { verifyMessageJoyId } from "../ckb/verifyJoyId.js";
+import { verifyMessageEvmPersonal } from "../evm/verify.js";
+import { verifyMessageNostrEvent } from "../nostr/verify.js";
 
 export enum SignerSignType {
   Unknown = "Unknown",
@@ -263,7 +263,11 @@ export abstract class Signer {
     signature: string | Signature,
   ): Promise<boolean> {
     if (typeof signature === "string") {
-      return this.verifyMessageRaw(message, signature);
+      return Signer.verifyMessage(message, {
+        signType: this.signType,
+        signature,
+        identity: await this.getIdentity(),
+      });
     }
 
     if (
@@ -273,19 +277,7 @@ export abstract class Signer {
       return false;
     }
 
-    return this.verifyMessageRaw(message, signature.signature);
-  }
-
-  /**
-   * Verify a string signature. This method is not implemented and should be overridden by subclasses.
-   *
-   * @param _0 - The original message.
-   * @param _1 - The signature to verify.
-   * @returns A promise that resolves to the verification result.
-   * @throws Will throw an error if not implemented.
-   */
-  verifyMessageRaw(_0: string | BytesLike, _1: string): Promise<boolean> {
-    throw Error("Signer.verifyMessageRaw not implemented");
+    return Signer.verifyMessage(message, signature);
   }
 
   /**