@ckb-ccc/core 1.11.5 → 1.12.0

package/src/signer/doge/verify.ts

@@ -1,12 +1,32 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
-import { magicHash } from "bitcoinjs-message";
-import { bytesFrom, BytesLike } from "../../bytes/index.js";
+import { Bytes, bytesFrom, BytesLike } from "../../bytes/index.js";
 import { hexFrom } from "../../hex/index.js";
 import {
   btcEcdsaPublicKeyHash,
   btcPublicKeyFromP2pkhAddress,
+  messageHashBtcEcdsa,
 } from "../btc/verify.js";
 
+/**
+ * Computes the message hash for Dogecoin ECDSA signatures.
+ * This function follows the Dogecoin message signing standard, which involves
+ * prefixing the message with a magic string and its length, then double SHA256 hashing the result.
+ *
+ * @param message - The message to be hashed. Can be a string or BytesLike.
+ * @param messagePrefix - Optional. A custom prefix to use instead of the default "\x19Dogecoin Signed Message:\n".
+ * @returns The Dogecoin hash of the prefixed message as Bytes.
+ * @public
+ */
+export function messageHashDogeEcdsa(
+  message: string | BytesLike,
+  messagePrefix?: string | BytesLike,
+): Bytes {
+  return messageHashBtcEcdsa(
+    message,
+    messagePrefix ?? "\x19Dogecoin Signed Message:\n",
+  );
+}
+
 /**
  * @public
  */
@@ -29,11 +49,7 @@ export function verifyMessageDogeEcdsa(
     btcPublicKeyFromP2pkhAddress(address) ===
     hexFrom(
       btcEcdsaPublicKeyHash(
-        sig
-          .recoverPublicKey(
-            magicHash(challenge, "\x19Dogecoin Signed Message:\n"),
-          )
-          .toHex(),
+        sig.recoverPublicKey(messageHashDogeEcdsa(challenge)).toHex(),
       ),
     )
   );

package/src/signer/signer/index.ts

@@ -96,11 +96,12 @@ export abstract class Signer {
   ): NetworkPreference | undefined {
     if (
       currentNetwork !== undefined &&
-      preferences.some(({ signerType, addressPrefix, network }) => {
-        signerType === this.type &&
+      preferences.some(
+        ({ signerType, addressPrefix, network }) =>
+          signerType === this.type &&
           addressPrefix === this.client.addressPrefix &&
-          network === currentNetwork;
-      })
+          network === currentNetwork,
+      )
     ) {
       return;
     }
@@ -459,14 +460,23 @@ export abstract class Signer {
   }
 
   /**
-   * prepare a transaction before signing. This method is not implemented and should be overridden by subclasses.
+   * Prepares a transaction before signing.
+   * This method can be overridden by subclasses to perform any necessary steps,
+   * such as adding cell dependencies or witnesses, before the transaction is signed.
+   * The default implementation converts the {@link TransactionLike} object to a {@link Transaction} object
+   * without modification.
    *
-   * @param _ - The transaction to prepare, represented as a TransactionLike object.
-   * @returns A promise that resolves to the prepared Transaction object.
-   * @throws Will throw an error if not implemented.
+   * @remarks
+   * Note that this default implementation does not add any cell dependencies or dummy witnesses.
+   * This may lead to an underestimation of transaction size and fees if used with methods
+   * like `Transaction.completeFee`. Subclasses for signers that are intended to sign
+   * transactions should override this method to perform necessary preparations.
+   *
+   * @param tx - The transaction to prepare.
+   * @returns A promise that resolves to the prepared {@link Transaction} object.
    */
-  prepareTransaction(_: TransactionLike): Promise<Transaction> {
-    throw Error("Signer.prepareTransaction not implemented");
+  async prepareTransaction(tx: TransactionLike): Promise<Transaction> {
+    return Transaction.from(tx);
   }
 
   /**