@ckb-ccc/core 0.0.10-alpha.4 → 0.0.10-alpha.6

package/src/signer/ckb/signerCkbPrivateKey.ts

@@ -2,10 +2,10 @@ 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 { messageHashCkbSecp256k1 } from "./verifyCkbSecp256k1";
 
 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/signer/index.ts

@@ -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);
   }
 
   /**