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

package/dist/address/address.advanced.js

@@ -20,15 +20,16 @@ import { hexFrom } from "../hex";
  */
 export function addressPayloadFromString(address) {
     // Try parse full format address
-    {
+    try {
         const { words, prefix } = bech32m.decode(address, ADDRESS_BECH32_LIMIT);
         const [formatType, ...payload] = bech32m.fromWords(words);
         if (formatType === AddressFormat.Full) {
             return { prefix, format: AddressFormat.Full, payload };
         }
     }
+    catch (_) { }
     // Try parse legacy 2019 format address
-    {
+    try {
         const { prefix, words } = bech32.decode(address, ADDRESS_BECH32_LIMIT);
         const [formatType, ...payload] = bech32.fromWords(words);
         if ([
@@ -39,6 +40,7 @@ export function addressPayloadFromString(address) {
             return { prefix, format: formatType, payload };
         }
     }
+    catch (_) { }
     throw Error(`Unknown address format ${address}`);
 }
 /**

package/dist/signer/ckb/signerCkbPrivateKey.d.ts

@@ -6,6 +6,7 @@ import { SignerCkbPublicKey } from "./signerCkbPublicKey";
 export declare class SignerCkbPrivateKey extends SignerCkbPublicKey {
     readonly privateKey: Hex;
     constructor(client: Client, privateKey: HexLike);
+    _signMessage(message: HexLike): Promise<Hex>;
     signMessageRaw(message: string | BytesLike): Promise<Hex>;
     signOnlyTransaction(txLike: TransactionLike): Promise<Transaction>;
 }

package/dist/signer/ckb/signerCkbPrivateKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerCkbPrivateKey.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/signerCkbPrivateKey.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,GAAG,EAAW,OAAO,EAAE,MAAM,WAAW,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,mBAAoB,SAAQ,kBAAkB;IACzD,SAAgB,UAAU,EAAE,GAAG,CAAC;gBAEpB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO;IAUzC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC;IAoBzD,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAezE"}
+{"version":3,"file":"signerCkbPrivateKey.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/signerCkbPrivateKey.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,GAAG,EAAW,OAAO,EAAE,MAAM,WAAW,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,qBAAa,mBAAoB,SAAQ,kBAAkB;IACzD,SAAgB,UAAU,EAAE,GAAG,CAAC;gBAEpB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO;IAUzC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAgB5C,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC;IAIzD,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAezE"}

package/dist/signer/ckb/signerCkbPrivateKey.js

@@ -1,10 +1,10 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
 import { bytesConcat, bytesFrom } from "../../bytes";
 import { Transaction, WitnessArgs } from "../../ckb";
-import { hashCkb } from "../../hasher";
 import { hexFrom } from "../../hex";
 import { numBeToBytes } from "../../num";
 import { SignerCkbPublicKey } from "./signerCkbPublicKey";
+import { messageHashCkbSecp256k1 } from "./verifyCkbSecp256k1";
 export class SignerCkbPrivateKey extends SignerCkbPublicKey {
     constructor(client, privateKey) {
         const pk = hexFrom(privateKey);
@@ -14,14 +14,14 @@ export class SignerCkbPrivateKey extends SignerCkbPublicKey {
         super(client, secp256k1.getPublicKey(bytesFrom(pk), true));
         this.privateKey = pk;
     }
-    async signMessageRaw(message) {
-        const msg = typeof message === "string" ? message : hexFrom(message);
-        const buffer = bytesFrom(`Nervos Message:${msg}`, "utf8");
-        const hash = hashCkb(buffer);
-        const signature = secp256k1.sign(bytesFrom(hash), bytesFrom(this.privateKey));
+    async _signMessage(message) {
+        const signature = secp256k1.sign(bytesFrom(message), bytesFrom(this.privateKey));
         const { r, s, recovery } = signature;
         return hexFrom(bytesConcat(numBeToBytes(r, 32), numBeToBytes(s, 32), numBeToBytes(recovery, 1)));
     }
+    async signMessageRaw(message) {
+        return this._signMessage(messageHashCkbSecp256k1(message));
+    }
     async signOnlyTransaction(txLike) {
         const tx = Transaction.from(txLike);
         const { script } = await this.getRecommendedAddressObj();
@@ -29,7 +29,7 @@ export class SignerCkbPrivateKey extends SignerCkbPublicKey {
         if (!info) {
             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;
         tx.setWitnessArgsAt(info.position, witness);

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

@@ -137,15 +137,6 @@ export declare abstract class Signer {
      * @throws Will throw an error if not implemented.
      */
     verifyMessage(message: string | BytesLike, signature: string | Signature): Promise<boolean>;
-    /**
-     * 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>;
     /**
      * Sends a transaction after signing it.
      *

package/dist/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/signer/signer/index.js

@@ -158,24 +158,17 @@ export class Signer {
      */
     async verifyMessage(message, signature) {
         if (typeof signature === "string") {
-            return this.verifyMessageRaw(message, signature);
+            return Signer.verifyMessage(message, {
+                signType: this.signType,
+                signature,
+                identity: await this.getIdentity(),
+            });
         }
         if (signature.identity !== (await this.getIdentity()) ||
             ![SignerSignType.Unknown, this.signType].includes(signature.signType)) {
             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, _1) {
-        throw Error("Signer.verifyMessageRaw not implemented");
+        return Signer.verifyMessage(message, signature);
     }
     /**
      * Sends a transaction after signing it.

package/dist.commonjs/address/address.advanced.js

@@ -23,15 +23,16 @@ const hex_1 = require("../hex");
  */
 function addressPayloadFromString(address) {
     // Try parse full format address
-    {
+    try {
         const { words, prefix } = bech32_1.bech32m.decode(address, exports.ADDRESS_BECH32_LIMIT);
         const [formatType, ...payload] = bech32_1.bech32m.fromWords(words);
         if (formatType === AddressFormat.Full) {
             return { prefix, format: AddressFormat.Full, payload };
         }
     }
+    catch (_) { }
     // Try parse legacy 2019 format address
-    {
+    try {
         const { prefix, words } = bech32_1.bech32.decode(address, exports.ADDRESS_BECH32_LIMIT);
         const [formatType, ...payload] = bech32_1.bech32.fromWords(words);
         if ([
@@ -42,6 +43,7 @@ function addressPayloadFromString(address) {
             return { prefix, format: formatType, payload };
         }
     }
+    catch (_) { }
     throw Error(`Unknown address format ${address}`);
 }
 exports.addressPayloadFromString = addressPayloadFromString;

package/dist.commonjs/signer/ckb/signerCkbPrivateKey.d.ts

@@ -6,6 +6,7 @@ import { SignerCkbPublicKey } from "./signerCkbPublicKey";
 export declare class SignerCkbPrivateKey extends SignerCkbPublicKey {
     readonly privateKey: Hex;
     constructor(client: Client, privateKey: HexLike);
+    _signMessage(message: HexLike): Promise<Hex>;
     signMessageRaw(message: string | BytesLike): Promise<Hex>;
     signOnlyTransaction(txLike: TransactionLike): Promise<Transaction>;
 }

package/dist.commonjs/signer/ckb/signerCkbPrivateKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerCkbPrivateKey.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/signerCkbPrivateKey.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,GAAG,EAAW,OAAO,EAAE,MAAM,WAAW,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,mBAAoB,SAAQ,kBAAkB;IACzD,SAAgB,UAAU,EAAE,GAAG,CAAC;gBAEpB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO;IAUzC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC;IAoBzD,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAezE"}
+{"version":3,"file":"signerCkbPrivateKey.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/signerCkbPrivateKey.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,GAAG,EAAW,OAAO,EAAE,MAAM,WAAW,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,qBAAa,mBAAoB,SAAQ,kBAAkB;IACzD,SAAgB,UAAU,EAAE,GAAG,CAAC;gBAEpB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO;IAUzC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAgB5C,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC;IAIzD,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAezE"}

package/dist.commonjs/signer/ckb/signerCkbPrivateKey.js

@@ -4,10 +4,10 @@ exports.SignerCkbPrivateKey = void 0;
 const secp256k1_1 = require("@noble/curves/secp256k1");
 const bytes_1 = require("../../bytes");
 const ckb_1 = require("../../ckb");
-const hasher_1 = require("../../hasher");
 const hex_1 = require("../../hex");
 const num_1 = require("../../num");
 const signerCkbPublicKey_1 = require("./signerCkbPublicKey");
+const verifyCkbSecp256k1_1 = require("./verifyCkbSecp256k1");
 class SignerCkbPrivateKey extends signerCkbPublicKey_1.SignerCkbPublicKey {
     constructor(client, privateKey) {
         const pk = (0, hex_1.hexFrom)(privateKey);
@@ -17,14 +17,14 @@ class SignerCkbPrivateKey extends signerCkbPublicKey_1.SignerCkbPublicKey {
         super(client, secp256k1_1.secp256k1.getPublicKey((0, bytes_1.bytesFrom)(pk), true));
         this.privateKey = pk;
     }
-    async signMessageRaw(message) {
-        const msg = typeof message === "string" ? message : (0, hex_1.hexFrom)(message);
-        const buffer = (0, bytes_1.bytesFrom)(`Nervos Message:${msg}`, "utf8");
-        const hash = (0, hasher_1.hashCkb)(buffer);
-        const signature = secp256k1_1.secp256k1.sign((0, bytes_1.bytesFrom)(hash), (0, bytes_1.bytesFrom)(this.privateKey));
+    async _signMessage(message) {
+        const signature = secp256k1_1.secp256k1.sign((0, bytes_1.bytesFrom)(message), (0, bytes_1.bytesFrom)(this.privateKey));
         const { r, s, recovery } = signature;
         return (0, hex_1.hexFrom)((0, bytes_1.bytesConcat)((0, num_1.numBeToBytes)(r, 32), (0, num_1.numBeToBytes)(s, 32), (0, num_1.numBeToBytes)(recovery, 1)));
     }
+    async signMessageRaw(message) {
+        return this._signMessage((0, verifyCkbSecp256k1_1.messageHashCkbSecp256k1)(message));
+    }
     async signOnlyTransaction(txLike) {
         const tx = ckb_1.Transaction.from(txLike);
         const { script } = await this.getRecommendedAddressObj();
@@ -32,7 +32,7 @@ class SignerCkbPrivateKey extends signerCkbPublicKey_1.SignerCkbPublicKey {
         if (!info) {
             return tx;
         }
-        const signature = await this.signMessageRaw(info.message);
+        const signature = await this._signMessage(info.message);
         const witness = tx.getWitnessArgsAt(info.position) ?? ckb_1.WitnessArgs.from({});
         witness.lock = signature;
         tx.setWitnessArgsAt(info.position, witness);

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

@@ -137,15 +137,6 @@ export declare abstract class Signer {
      * @throws Will throw an error if not implemented.
      */
     verifyMessage(message: string | BytesLike, signature: string | Signature): Promise<boolean>;
-    /**
-     * 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>;
     /**
      * Sends a transaction after signing it.
      *

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

@@ -162,24 +162,17 @@ class Signer {
      */
     async verifyMessage(message, signature) {
         if (typeof signature === "string") {
-            return this.verifyMessageRaw(message, signature);
+            return Signer.verifyMessage(message, {
+                signType: this.signType,
+                signature,
+                identity: await this.getIdentity(),
+            });
         }
         if (signature.identity !== (await this.getIdentity()) ||
             ![SignerSignType.Unknown, this.signType].includes(signature.signType)) {
             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, _1) {
-        throw Error("Signer.verifyMessageRaw not implemented");
+        return Signer.verifyMessage(message, signature);
     }
     /**
      * Sends a transaction after signing it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.10-alpha.5",
+  "version": "0.0.10-alpha.6",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -68,5 +68,5 @@
     "cross-fetch": "^4.0.0",
     "ethers": "^6.13.1"
   },
-  "gitHead": "40a3d50aa3697a98c7ac711cd526ef322ccad760"
+  "gitHead": "16cf49da60cb01f0f0903fccc0d597d8de54f905"
 }

package/src/address/address.advanced.ts

@@ -27,17 +27,17 @@ export function addressPayloadFromString(address: string): {
   payload: number[];
 } {
   // Try parse full format address
-  {
+  try {
     const { words, prefix } = bech32m.decode(address, ADDRESS_BECH32_LIMIT);
     const [formatType, ...payload] = bech32m.fromWords(words);
 
     if (formatType === (AddressFormat.Full as number)) {
       return { prefix, format: AddressFormat.Full, payload };
     }
-  }
+  } catch (_) {}
 
   // Try parse legacy 2019 format address
-  {
+  try {
     const { prefix, words } = bech32.decode(address, ADDRESS_BECH32_LIMIT);
     const [formatType, ...payload] = bech32.fromWords(words);
     if (
@@ -49,7 +49,7 @@ export function addressPayloadFromString(address: string): {
     ) {
       return { prefix, format: formatType, payload };
     }
-  }
+  } catch (_) {}
 
   throw Error(`Unknown address format ${address}`);
 }

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