@ckb-ccc/core 1.6.0 → 1.7.0

package/src/signer/nostr/signerNostr.ts

@@ -50,7 +50,9 @@ export abstract class SignerNostr extends Signer {
    *
    * @returns A promise that resolves to the signed event.
    */
-  abstract signNostrEvent(event: NostrEvent): Promise<Required<NostrEvent>>;
+  async signNostrEvent(_event: NostrEvent): Promise<Required<NostrEvent>> {
+    throw Error("SignerNostr.signNostrEvent not implemented");
+  }
 
   /**
    * Sign a message.

package/src/signer/nostr/signerNostrPrivateKey.ts

@@ -1,25 +1,18 @@
 import { schnorr } from "@noble/curves/secp256k1";
 import { Client } from "../../client/index.js";
 import { Hex, hexFrom, HexLike } from "../../hex/index.js";
-import { NostrEvent, SignerNostr } from "./signerNostr.js";
+import { NostrEvent } from "./signerNostr.js";
+import { SignerNostrPublicKeyReadonly } from "./signerNostrPublicKeyReadonly.js";
 import { nostrEventHash } from "./verify.js";
 
-export class SignerNostrPrivateKey extends SignerNostr {
+export class SignerNostrPrivateKey extends SignerNostrPublicKeyReadonly {
   private readonly privateKey: Hex;
 
-  constructor(client: Client, privateKey: HexLike) {
-    super(client);
-    this.privateKey = hexFrom(privateKey);
-  }
-
-  async connect(): Promise<void> {}
-
-  async isConnected(): Promise<boolean> {
-    return true;
-  }
+  constructor(client: Client, privateKeyLike: HexLike) {
+    const privateKey = hexFrom(privateKeyLike);
+    super(client, schnorr.getPublicKey(privateKey.slice(2)));
 
-  async getNostrPublicKey(): Promise<Hex> {
-    return hexFrom(schnorr.getPublicKey(this.privateKey.slice(2)));
+    this.privateKey = privateKey;
   }
 
   async signNostrEvent(event: NostrEvent): Promise<Required<NostrEvent>> {

package/src/signer/nostr/signerNostrPublicKeyReadonly.ts

@@ -0,0 +1,29 @@
+import { bech32 } from "bech32";
+import { Client } from "../../client/index.js";
+import { Hex, hexFrom, HexLike } from "../../hex/index.js";
+import { SignerNostr } from "./signerNostr.js";
+
+export class SignerNostrPublicKeyReadonly extends SignerNostr {
+  public readonly publicKey: Hex;
+
+  constructor(client: Client, publicKey: HexLike) {
+    super(client);
+
+    if (typeof publicKey === "string" && publicKey.startsWith("npub")) {
+      const { words } = bech32.decode(publicKey);
+      this.publicKey = hexFrom(bech32.fromWords(words));
+    } else {
+      this.publicKey = hexFrom(publicKey);
+    }
+  }
+
+  async connect(): Promise<void> {}
+
+  async isConnected(): Promise<boolean> {
+    return true;
+  }
+
+  async getNostrPublicKey(): Promise<Hex> {
+    return this.publicKey;
+  }
+}