@ckb-ccc/core 1.11.4 → 1.11.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ckb-ccc/core
 
+## 1.11.5
+### Patch Changes
+
+
+
+- [#306](https://github.com/ckb-devrel/ccc/pull/306) [`cec9b39`](https://github.com/ckb-devrel/ccc/commit/cec9b39345fc37a6ae72c0774059b2e31efc9e89) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix(core): nostr signature verification
+
+
+
+- [#304](https://github.com/ckb-devrel/ccc/pull/304) [`c95913f`](https://github.com/ckb-devrel/ccc/commit/c95913f58c889c9d8c0b164014f9917501c11dbc) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix(core): `ccc.mol.codec` decorator
+  
+  * The runtime will invoke the decorator with 2 arguments, but the decorator expects 1.
+  * Decorator function return type '...' is not assignable to type '...'
+
 ## 1.11.4
 ### Patch Changes
 

package/dist/molecule/entity.d.ts

@@ -102,11 +102,11 @@ export declare abstract class Entity {
  * }
  * ```
  */
-export declare function codec<Encodable, TypeLike extends Encodable, Decoded extends TypeLike, Type extends object & TypeLike, ConstructorType extends Constructor<Type> & {
+export declare function codec<Encodable, TypeLike extends Encodable, Decoded extends TypeLike>(codec: Codec<Encodable, Decoded>): <Type extends TypeLike, ConstructorType extends Constructor<Type> & {
     from(decoded: TypeLike): Type;
     byteLength?: number;
     encode(encodable: TypeLike): Bytes;
-    decode(bytesLike: BytesLike): TypeLike;
+    decode(bytesLike: BytesLike): Type;
     fromBytes(bytes: BytesLike): Type;
-}>(codec: Codec<Encodable, Decoded>): (Constructor: ConstructorType) => ConstructorType;
+}>(Constructor: ConstructorType, ..._: unknown[]) => ConstructorType;
 //# sourceMappingURL=entity.d.ts.map

package/dist/molecule/entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,IACf,aAAa,eAAe,qBAc9C"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,IAE9B,IAAI,SAAS,QAAQ,EACrB,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,aAAa,eAAe,EAAE,GAAG,GAAG,OAAO,EAAE,qBAchD"}

package/dist/molecule/entity.js

@@ -115,7 +115,7 @@ export class Entity {
  * ```
  */
 export function codec(codec) {
-    return function (Constructor) {
+    return function (Constructor, ..._) {
         Constructor.byteLength = codec.byteLength;
         Constructor.encode = function (encodable) {
             return codec.encode(encodable);

package/dist/signer/nostr/verify.js

@@ -1,5 +1,5 @@
 import { schnorr } from "@noble/curves/secp256k1";
-import { sha256 } from "@noble/hashes/sha256";
+import { sha256 } from "@noble/hashes/sha2.js";
 import { bech32 } from "bech32";
 import { bytesFrom } from "../../bytes/index.js";
 import { hexFrom } from "../../hex/index.js";
@@ -43,11 +43,11 @@ export function nostrEventHash(event) {
 }
 export function verifyMessageNostrEvent(message, signature, address) {
     const { words } = bech32.decode(address);
-    const publicKey = hexFrom(bech32.fromWords(words)).slice(2);
+    const pubkey = hexFrom(bech32.fromWords(words)).slice(2);
     const event = buildNostrEventFromMessage(message);
-    const eventHash = nostrEventHash(event);
+    const eventHash = nostrEventHash({ ...event, pubkey });
     try {
-        return schnorr.verify(hexFrom(signature).slice(2), eventHash, publicKey);
+        return schnorr.verify(hexFrom(signature).slice(2), eventHash, pubkey);
     }
     catch (_) {
         return false;

package/dist.commonjs/molecule/entity.d.ts

@@ -102,11 +102,11 @@ export declare abstract class Entity {
  * }
  * ```
  */
-export declare function codec<Encodable, TypeLike extends Encodable, Decoded extends TypeLike, Type extends object & TypeLike, ConstructorType extends Constructor<Type> & {
+export declare function codec<Encodable, TypeLike extends Encodable, Decoded extends TypeLike>(codec: Codec<Encodable, Decoded>): <Type extends TypeLike, ConstructorType extends Constructor<Type> & {
     from(decoded: TypeLike): Type;
     byteLength?: number;
     encode(encodable: TypeLike): Bytes;
-    decode(bytesLike: BytesLike): TypeLike;
+    decode(bytesLike: BytesLike): Type;
     fromBytes(bytes: BytesLike): Type;
-}>(codec: Codec<Encodable, Decoded>): (Constructor: ConstructorType) => ConstructorType;
+}>(Constructor: ConstructorType, ..._: unknown[]) => ConstructorType;
 //# sourceMappingURL=entity.d.ts.map

package/dist.commonjs/molecule/entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,IACf,aAAa,eAAe,qBAc9C"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,IAE9B,IAAI,SAAS,QAAQ,EACrB,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,aAAa,eAAe,EAAE,GAAG,GAAG,OAAO,EAAE,qBAchD"}

package/dist.commonjs/molecule/entity.js

@@ -120,7 +120,7 @@ exports.Entity = Entity;
  * ```
  */
 function codec(codec) {
-    return function (Constructor) {
+    return function (Constructor, ..._) {
         Constructor.byteLength = codec.byteLength;
         Constructor.encode = function (encodable) {
             return codec.encode(encodable);

package/dist.commonjs/signer/nostr/verify.js

@@ -4,7 +4,7 @@ exports.buildNostrEventFromMessage = buildNostrEventFromMessage;
 exports.nostrEventHash = nostrEventHash;
 exports.verifyMessageNostrEvent = verifyMessageNostrEvent;
 const secp256k1_1 = require("@noble/curves/secp256k1");
-const sha256_1 = require("@noble/hashes/sha256");
+const sha2_js_1 = require("@noble/hashes/sha2.js");
 const bech32_1 = require("bech32");
 const index_js_1 = require("../../bytes/index.js");
 const index_js_2 = require("../../hex/index.js");
@@ -44,15 +44,15 @@ function nostrEventHash(event) {
         event.tags,
         event.content,
     ]);
-    return (0, sha256_1.sha256)((0, index_js_1.bytesFrom)(serialized, "utf8"));
+    return (0, sha2_js_1.sha256)((0, index_js_1.bytesFrom)(serialized, "utf8"));
 }
 function verifyMessageNostrEvent(message, signature, address) {
     const { words } = bech32_1.bech32.decode(address);
-    const publicKey = (0, index_js_2.hexFrom)(bech32_1.bech32.fromWords(words)).slice(2);
+    const pubkey = (0, index_js_2.hexFrom)(bech32_1.bech32.fromWords(words)).slice(2);
     const event = buildNostrEventFromMessage(message);
-    const eventHash = nostrEventHash(event);
+    const eventHash = nostrEventHash({ ...event, pubkey });
     try {
-        return secp256k1_1.schnorr.verify((0, index_js_2.hexFrom)(signature).slice(2), eventHash, publicKey);
+        return secp256k1_1.schnorr.verify((0, index_js_2.hexFrom)(signature).slice(2), eventHash, pubkey);
     }
     catch (_) {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",

package/src/molecule/entity.ts

@@ -156,16 +156,17 @@ export function codec<
   Encodable,
   TypeLike extends Encodable,
   Decoded extends TypeLike,
-  Type extends object & TypeLike,
-  ConstructorType extends Constructor<Type> & {
-    from(decoded: TypeLike): Type;
-    byteLength?: number;
-    encode(encodable: TypeLike): Bytes;
-    decode(bytesLike: BytesLike): TypeLike;
-    fromBytes(bytes: BytesLike): Type;
-  },
 >(codec: Codec<Encodable, Decoded>) {
-  return function (Constructor: ConstructorType) {
+  return function <
+    Type extends TypeLike,
+    ConstructorType extends Constructor<Type> & {
+      from(decoded: TypeLike): Type;
+      byteLength?: number;
+      encode(encodable: TypeLike): Bytes;
+      decode(bytesLike: BytesLike): Type;
+      fromBytes(bytes: BytesLike): Type;
+    },
+  >(Constructor: ConstructorType, ..._: unknown[]) {
     Constructor.byteLength = codec.byteLength;
     Constructor.encode = function (encodable: TypeLike) {
       return codec.encode(encodable);

package/src/signer/nostr/verify.ts

@@ -1,5 +1,5 @@
 import { schnorr } from "@noble/curves/secp256k1";
-import { sha256 } from "@noble/hashes/sha256";
+import { sha256 } from "@noble/hashes/sha2.js";
 import { bech32 } from "bech32";
 import { Bytes, BytesLike, bytesFrom } from "../../bytes/index.js";
 import { hexFrom } from "../../hex/index.js";
@@ -59,13 +59,13 @@ export function verifyMessageNostrEvent(
   address: string,
 ): boolean {
   const { words } = bech32.decode(address);
-  const publicKey = hexFrom(bech32.fromWords(words)).slice(2);
+  const pubkey = hexFrom(bech32.fromWords(words)).slice(2);
 
   const event = buildNostrEventFromMessage(message);
-  const eventHash = nostrEventHash(event);
+  const eventHash = nostrEventHash({ ...event, pubkey });
 
   try {
-    return schnorr.verify(hexFrom(signature).slice(2), eventHash, publicKey);
+    return schnorr.verify(hexFrom(signature).slice(2), eventHash, pubkey);
   } catch (_) {
     return false;
   }