@ckb-ccc/okx 0.0.12-alpha.6 → 0.0.12-alpha.7

package/CHANGELOG.md

@@ -0,0 +1,9 @@
+# @ckb-ccc/okx
+
+## 0.0.12-alpha.7
+
+### Patch Changes
+
+- fix(connector): catch connecting error
+- Updated dependencies
+  - @ckb-ccc/nip07@0.0.12-alpha.2

package/dist/nostr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;aAK5B,QAAQ,EAAE,aAAa;IAJzC,OAAO,CAAC,cAAc,CAAC,CAA8B;gBAGnD,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,aAAa;IAKnC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAOrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAO9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAetC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;CAGtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;aAK5B,QAAQ,EAAE,aAAa;IAJzC,OAAO,CAAC,cAAc,CAAC,CAA8B;gBAGnD,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,aAAa;IAKnC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAsBrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAO9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAetC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;CAGtC"}

package/dist/nostr/index.js

@@ -12,7 +12,20 @@ export class NostrSigner extends ccc.SignerNostr {
     }
     async getNostrPublicKey() {
         if (!this.publicKeyCache) {
-            this.publicKeyCache = this.provider.getPublicKey();
+            this.publicKeyCache = this.provider
+                .getPublicKey()
+                .then((v) => {
+                // For some account types of OKX Wallet, this might returns null
+                // e.g. Keyless accounts
+                if (v) {
+                    return v;
+                }
+                throw Error("This OKX Wallet account does not support Nostr");
+            })
+                .catch((e) => {
+                this.publicKeyCache = undefined;
+                throw e;
+            });
         }
         return ccc.hexFrom(await this.publicKeyCache);
     }
@@ -24,6 +37,7 @@ export class NostrSigner extends ccc.SignerNostr {
     }
     async connect() {
         await this.provider.connect?.(); // Help extension to switch network
+        await this.getNostrPublicKey();
     }
     onReplaced(listener) {
         const stop = [];

package/dist.commonjs/advanced.d.ts

@@ -1,2 +1,2 @@
 export * as OkxA from "./advancedBarrel.js";
-//# sourceMappingURL=advanced.d.ts.map
+//# sourceMappingURL=advanced.d.ts.map

package/dist.commonjs/advanced.js

@@ -1,27 +1,48 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
+var __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+var __setModuleDefault =
+  (this && this.__setModuleDefault) ||
+  (Object.create
+    ? function (o, v) {
+        Object.defineProperty(o, "default", { enumerable: true, value: v });
+      }
+    : function (o, v) {
+        o["default"] = v;
+      });
+var __importStar =
+  (this && this.__importStar) ||
+  function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null)
+      for (var k in mod)
+        if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+          __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
-};
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OkxA = void 0;
 exports.OkxA = __importStar(require("./advancedBarrel.js"));

package/dist.commonjs/advancedBarrel.d.ts

@@ -1,42 +1,47 @@
 import { Nip07A } from "@ckb-ccc/nip07/advanced";
 import { UniSatA } from "@ckb-ccc/uni-sat/advanced";
-export interface BitcoinProvider extends Pick<UniSatA.Provider, "on" | "removeListener" | "signMessage">, Partial<Omit<UniSatA.Provider, "on" | "removeListener" | "signMessage">> {
-    connect?(): Promise<{
-        address: string;
-        publicKey: string;
-        compressedPublicKey: string;
-    }>;
-    getSelectedAccount?(): Promise<{
-        address: string;
-        publicKey: string;
-        compressedPublicKey: string;
-    } | null>;
+export interface BitcoinProvider
+  extends Pick<UniSatA.Provider, "on" | "removeListener" | "signMessage">,
+    Partial<Omit<UniSatA.Provider, "on" | "removeListener" | "signMessage">> {
+  connect?(): Promise<{
+    address: string;
+    publicKey: string;
+    compressedPublicKey: string;
+  }>;
+  getSelectedAccount?(): Promise<{
+    address: string;
+    publicKey: string;
+    compressedPublicKey: string;
+  } | null>;
 }
 export interface NostrProvider extends Nip07A.Provider {
-    connect?(): Promise<void>;
-    /**
-     * Adds an event listener to the provider.
-     */
-    on: NostrOnMethod;
-    /**
-     * Removes an event listener from the provider.
-     * @param eventName - The name of the event to remove the listener from.
-     * @param listener - The listener function to remove.
-     * @returns The provider instance.
-     */
-    removeListener(eventName: string, listener: (...args: unknown[]) => unknown): NostrProvider;
+  connect?(): Promise<void>;
+  /**
+   * Adds an event listener to the provider.
+   */
+  on: NostrOnMethod;
+  /**
+   * Removes an event listener from the provider.
+   * @param eventName - The name of the event to remove the listener from.
+   * @param listener - The listener function to remove.
+   * @returns The provider instance.
+   */
+  removeListener(
+    eventName: string,
+    listener: (...args: unknown[]) => unknown,
+  ): NostrProvider;
 }
 /**
  * Interface representing a method to add event listeners to the provider.
  * @interface
  */
 export interface NostrOnMethod {
-    /**
-     * Adds an event listener to the provider.
-     * @param eventName - The name of the event.
-     * @param listener - The listener function.
-     * @returns The provider instance.
-     */
-    (eventName: string, listener: (...args: unknown[]) => unknown): Promise<void>;
+  /**
+   * Adds an event listener to the provider.
+   * @param eventName - The name of the event.
+   * @param listener - The listener function.
+   * @returns The provider instance.
+   */
+  (eventName: string, listener: (...args: unknown[]) => unknown): Promise<void>;
 }
-//# sourceMappingURL=advancedBarrel.d.ts.map
+//# sourceMappingURL=advancedBarrel.d.ts.map

package/dist.commonjs/barrel.d.ts

@@ -1,3 +1,3 @@
 export * from "./btc/index.js";
 export * from "./signersFactory.js";
-//# sourceMappingURL=barrel.d.ts.map
+//# sourceMappingURL=barrel.d.ts.map

package/dist.commonjs/barrel.js

@@ -1,18 +1,34 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
+var __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+var __exportStar =
+  (this && this.__exportStar) ||
+  function (m, exports) {
+    for (var p in m)
+      if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p))
+        __createBinding(exports, m, p);
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./btc/index.js"), exports);
 __exportStar(require("./signersFactory.js"), exports);

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

@@ -6,42 +6,46 @@ import { BitcoinProvider } from "../advancedBarrel.js";
  * @extends {ccc.SignerBtc}
  */
 export declare class BitcoinSigner extends ccc.SignerBtc {
-    readonly providers: Record<string, BitcoinProvider>;
-    private readonly preferredNetworks;
-    private network;
-    /**
-     * Creates an instance of Signer.
-     * @param {ccc.Client} client - The client instance.
-     * @param {Provider} provider - The provider instance.
-     */
-    constructor(client: ccc.Client, providers: Record<string, BitcoinProvider>, preferredNetworks?: ccc.NetworkPreference[]);
-    get provider(): BitcoinProvider;
-    /**
-     * Gets the Bitcoin account address.
-     * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
-     */
-    getBtcAccount(): Promise<string>;
-    /**
-     * Gets the Bitcoin public key.
-     * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
-     */
-    getBtcPublicKey(): Promise<ccc.Hex>;
-    /**
-     * Connects to the provider by requesting accounts.
-     * @returns {Promise<void>} A promise that resolves when the connection is established.
-     */
-    connect(): Promise<void>;
-    onReplaced(listener: () => void): () => void;
-    /**
-     * Checks if the signer is connected.
-     * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
-     */
-    isConnected(): Promise<boolean>;
-    /**
-     * Signs a raw message with the Bitcoin account.
-     * @param {string | ccc.BytesLike} message - The message to sign.
-     * @returns {Promise<string>} A promise that resolves to the signed message.
-     */
-    signMessageRaw(message: string | ccc.BytesLike): Promise<string>;
+  readonly providers: Record<string, BitcoinProvider>;
+  private readonly preferredNetworks;
+  private network;
+  /**
+   * Creates an instance of Signer.
+   * @param {ccc.Client} client - The client instance.
+   * @param {Provider} provider - The provider instance.
+   */
+  constructor(
+    client: ccc.Client,
+    providers: Record<string, BitcoinProvider>,
+    preferredNetworks?: ccc.NetworkPreference[],
+  );
+  get provider(): BitcoinProvider;
+  /**
+   * Gets the Bitcoin account address.
+   * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
+   */
+  getBtcAccount(): Promise<string>;
+  /**
+   * Gets the Bitcoin public key.
+   * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
+   */
+  getBtcPublicKey(): Promise<ccc.Hex>;
+  /**
+   * Connects to the provider by requesting accounts.
+   * @returns {Promise<void>} A promise that resolves when the connection is established.
+   */
+  connect(): Promise<void>;
+  onReplaced(listener: () => void): () => void;
+  /**
+   * Checks if the signer is connected.
+   * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
+   */
+  isConnected(): Promise<boolean>;
+  /**
+   * Signs a raw message with the Bitcoin account.
+   * @param {string | ccc.BytesLike} message - The message to sign.
+   * @returns {Promise<string>} A promise that resolves to the signed message.
+   */
+  signMessageRaw(message: string | ccc.BytesLike): Promise<string>;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/btc/index.js

@@ -8,142 +8,154 @@ const core_1 = require("@ckb-ccc/core");
  * @extends {ccc.SignerBtc}
  */
 class BitcoinSigner extends core_1.ccc.SignerBtc {
-    /**
-     * Creates an instance of Signer.
-     * @param {ccc.Client} client - The client instance.
-     * @param {Provider} provider - The provider instance.
-     */
-    constructor(client, providers, preferredNetworks = [
-        {
-            addressPrefix: "ckb",
-            signerType: core_1.ccc.SignerType.BTC,
-            network: "btc",
-        },
-        {
-            addressPrefix: "ckt",
-            signerType: core_1.ccc.SignerType.BTC,
-            network: "btcTestnet",
-        },
-    ]) {
-        super(client);
-        this.providers = providers;
-        this.preferredNetworks = preferredNetworks;
-        this.network = "btcTestnet";
+  /**
+   * Creates an instance of Signer.
+   * @param {ccc.Client} client - The client instance.
+   * @param {Provider} provider - The provider instance.
+   */
+  constructor(
+    client,
+    providers,
+    preferredNetworks = [
+      {
+        addressPrefix: "ckb",
+        signerType: core_1.ccc.SignerType.BTC,
+        network: "btc",
+      },
+      {
+        addressPrefix: "ckt",
+        signerType: core_1.ccc.SignerType.BTC,
+        network: "btcTestnet",
+      },
+    ],
+  ) {
+    super(client);
+    this.providers = providers;
+    this.preferredNetworks = preferredNetworks;
+    this.network = "btcTestnet";
+  }
+  get provider() {
+    const { network } = this.matchNetworkPreference(
+      this.preferredNetworks,
+      this.network,
+    ) ?? { network: this.network };
+    this.network = network;
+    const chain = {
+      btc: "bitcoin",
+      btcTestnet: "bitcoinTestnet",
+      btcSignet: "bitcoinSignet",
+    }[network];
+    if (!chain) {
+      throw new Error(
+        `OKX wallet doesn't support the requested chain ${this.network}`,
+      );
     }
-    get provider() {
-        const { network } = this.matchNetworkPreference(this.preferredNetworks, this.network) ?? { network: this.network };
-        this.network = network;
-        const chain = {
-            btc: "bitcoin",
-            btcTestnet: "bitcoinTestnet",
-            btcSignet: "bitcoinSignet",
-        }[network];
-        if (!chain) {
-            throw new Error(`OKX wallet doesn't support the requested chain ${this.network}`);
-        }
-        const provider = this.providers[chain];
-        if (!provider) {
-            throw new Error(`OKX wallet doesn't support the requested chain ${this.network}`);
-        }
-        return provider;
+    const provider = this.providers[chain];
+    if (!provider) {
+      throw new Error(
+        `OKX wallet doesn't support the requested chain ${this.network}`,
+      );
     }
-    /**
-     * Gets the Bitcoin account address.
-     * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
-     */
-    async getBtcAccount() {
-        if (this.provider.getAccounts) {
-            const address = (await this.provider.getAccounts())[0];
-            if (!address) {
-                throw Error("Not connected");
-            }
-            return address;
-        }
-        if (this.provider.getSelectedAccount) {
-            const account = await this.provider.getSelectedAccount();
-            if (!account) {
-                throw Error("Not connected");
-            }
-            return account.address;
-        }
-        throw Error("Unsupported OKX provider");
+    return provider;
+  }
+  /**
+   * Gets the Bitcoin account address.
+   * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
+   */
+  async getBtcAccount() {
+    if (this.provider.getAccounts) {
+      const address = (await this.provider.getAccounts())[0];
+      if (!address) {
+        throw Error("Not connected");
+      }
+      return address;
     }
-    /**
-     * Gets the Bitcoin public key.
-     * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
-     */
-    async getBtcPublicKey() {
-        if (this.provider.getPublicKey) {
-            return core_1.ccc.hexFrom(await this.provider.getPublicKey());
-        }
-        if (this.provider.getSelectedAccount) {
-            const account = await this.provider.getSelectedAccount();
-            if (!account) {
-                throw Error("Not connected");
-            }
-            return core_1.ccc.hexFrom(account.compressedPublicKey);
-        }
-        throw Error("Unsupported OKX provider");
+    if (this.provider.getSelectedAccount) {
+      const account = await this.provider.getSelectedAccount();
+      if (!account) {
+        throw Error("Not connected");
+      }
+      return account.address;
     }
-    /**
-     * Connects to the provider by requesting accounts.
-     * @returns {Promise<void>} A promise that resolves when the connection is established.
-     */
-    async connect() {
-        if (this.provider.requestAccounts) {
-            await this.provider.requestAccounts();
-            return;
-        }
-        if (this.provider.connect) {
-            await this.provider.connect();
-            return;
-        }
-        throw Error("Unsupported OKX provider");
+    throw Error("Unsupported OKX provider");
+  }
+  /**
+   * Gets the Bitcoin public key.
+   * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
+   */
+  async getBtcPublicKey() {
+    if (this.provider.getPublicKey) {
+      return core_1.ccc.hexFrom(await this.provider.getPublicKey());
     }
-    onReplaced(listener) {
-        const stop = [];
-        const replacer = async () => {
-            listener();
-            stop[0]?.();
-        };
-        stop.push(() => {
-            this.provider.removeListener("accountChanged", replacer);
-        });
-        this.provider.on("accountChanged", replacer);
-        return stop[0];
+    if (this.provider.getSelectedAccount) {
+      const account = await this.provider.getSelectedAccount();
+      if (!account) {
+        throw Error("Not connected");
+      }
+      return core_1.ccc.hexFrom(account.compressedPublicKey);
     }
-    /**
-     * Checks if the signer is connected.
-     * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
-     */
-    async isConnected() {
-        try {
-            this.provider;
-        }
-        catch (_) {
-            return false;
-        }
-        if (this.provider.getAccounts) {
-            if ((await this.provider.getAccounts()).length === 0) {
-                return false;
-            }
-        }
-        else if (this.provider.getSelectedAccount) {
-            if ((await this.provider.getSelectedAccount()) === null) {
-                return false;
-            }
-        }
-        await this.connect();
-        return true;
+    throw Error("Unsupported OKX provider");
+  }
+  /**
+   * Connects to the provider by requesting accounts.
+   * @returns {Promise<void>} A promise that resolves when the connection is established.
+   */
+  async connect() {
+    if (this.provider.requestAccounts) {
+      await this.provider.requestAccounts();
+      return;
     }
-    /**
-     * Signs a raw message with the Bitcoin account.
-     * @param {string | ccc.BytesLike} message - The message to sign.
-     * @returns {Promise<string>} A promise that resolves to the signed message.
-     */
-    async signMessageRaw(message) {
-        const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message).slice(2);
-        return this.provider.signMessage(challenge, "ecdsa");
+    if (this.provider.connect) {
+      await this.provider.connect();
+      return;
     }
+    throw Error("Unsupported OKX provider");
+  }
+  onReplaced(listener) {
+    const stop = [];
+    const replacer = async () => {
+      listener();
+      stop[0]?.();
+    };
+    stop.push(() => {
+      this.provider.removeListener("accountChanged", replacer);
+    });
+    this.provider.on("accountChanged", replacer);
+    return stop[0];
+  }
+  /**
+   * Checks if the signer is connected.
+   * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
+   */
+  async isConnected() {
+    try {
+      this.provider;
+    } catch (_) {
+      return false;
+    }
+    if (this.provider.getAccounts) {
+      if ((await this.provider.getAccounts()).length === 0) {
+        return false;
+      }
+    } else if (this.provider.getSelectedAccount) {
+      if ((await this.provider.getSelectedAccount()) === null) {
+        return false;
+      }
+    }
+    await this.connect();
+    return true;
+  }
+  /**
+   * Signs a raw message with the Bitcoin account.
+   * @param {string | ccc.BytesLike} message - The message to sign.
+   * @returns {Promise<string>} A promise that resolves to the signed message.
+   */
+  async signMessageRaw(message) {
+    const challenge =
+      typeof message === "string"
+        ? message
+        : core_1.ccc.hexFrom(message).slice(2);
+    return this.provider.signMessage(challenge, "ecdsa");
+  }
 }
 exports.BitcoinSigner = BitcoinSigner;

package/dist.commonjs/index.d.ts

@@ -1,2 +1,2 @@
 export * as Okx from "./barrel.js";
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/index.js

@@ -1,27 +1,48 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
+var __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+var __setModuleDefault =
+  (this && this.__setModuleDefault) ||
+  (Object.create
+    ? function (o, v) {
+        Object.defineProperty(o, "default", { enumerable: true, value: v });
+      }
+    : function (o, v) {
+        o["default"] = v;
+      });
+var __importStar =
+  (this && this.__importStar) ||
+  function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null)
+      for (var k in mod)
+        if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+          __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
-};
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Okx = void 0;
 exports.Okx = __importStar(require("./barrel.js"));

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

@@ -6,13 +6,13 @@ import { NostrProvider } from "../advancedBarrel.js";
  * @extends {ccc.SignerBtc}
  */
 export declare class NostrSigner extends ccc.SignerNostr {
-    readonly provider: NostrProvider;
-    private publicKeyCache?;
-    constructor(client: ccc.Client, provider: NostrProvider);
-    getNostrPublicKey(): Promise<ccc.Hex>;
-    signNostrEvent(event: ccc.NostrEvent): Promise<Required<ccc.NostrEvent>>;
-    connect(): Promise<void>;
-    onReplaced(listener: () => void): () => void;
-    isConnected(): Promise<boolean>;
+  readonly provider: NostrProvider;
+  private publicKeyCache?;
+  constructor(client: ccc.Client, provider: NostrProvider);
+  getNostrPublicKey(): Promise<ccc.Hex>;
+  signNostrEvent(event: ccc.NostrEvent): Promise<Required<ccc.NostrEvent>>;
+  connect(): Promise<void>;
+  onReplaced(listener: () => void): () => void;
+  isConnected(): Promise<boolean>;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/nostr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;aAK5B,QAAQ,EAAE,aAAa;IAJzC,OAAO,CAAC,cAAc,CAAC,CAA8B;gBAGnD,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,aAAa;IAKnC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAOrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAO9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAetC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;CAGtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;aAK5B,QAAQ,EAAE,aAAa;IAJzC,OAAO,CAAC,cAAc,CAAC,CAA8B;gBAGnD,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,aAAa;IAKnC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAsBrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAO9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAetC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;CAGtC"}

package/dist.commonjs/nostr/index.js

@@ -8,40 +8,54 @@ const core_1 = require("@ckb-ccc/core");
  * @extends {ccc.SignerBtc}
  */
 class NostrSigner extends core_1.ccc.SignerNostr {
-    constructor(client, provider) {
-        super(client);
-        this.provider = provider;
-        this.publicKeyCache = undefined;
-    }
-    async getNostrPublicKey() {
-        if (!this.publicKeyCache) {
-            this.publicKeyCache = this.provider.getPublicKey();
-        }
-        return core_1.ccc.hexFrom(await this.publicKeyCache);
-    }
-    async signNostrEvent(event) {
-        return this.provider.signEvent({
-            ...event,
-            pubkey: await this.publicKeyCache,
-        });
-    }
-    async connect() {
-        await this.provider.connect?.(); // Help extension to switch network
-    }
-    onReplaced(listener) {
-        const stop = [];
-        const replacer = async () => {
-            listener();
-            stop[0]?.();
-        };
-        stop.push(() => {
-            this.provider.removeListener("accountChanged", replacer);
+  constructor(client, provider) {
+    super(client);
+    this.provider = provider;
+    this.publicKeyCache = undefined;
+  }
+  async getNostrPublicKey() {
+    if (!this.publicKeyCache) {
+      this.publicKeyCache = this.provider
+        .getPublicKey()
+        .then((v) => {
+          // For some account types of OKX Wallet, this might returns null
+          // e.g. Keyless accounts
+          if (v) {
+            return v;
+          }
+          throw Error("This OKX Wallet account does not support Nostr");
+        })
+        .catch((e) => {
+          this.publicKeyCache = undefined;
+          throw e;
         });
-        this.provider.on("accountChanged", replacer);
-        return stop[0];
-    }
-    async isConnected() {
-        return true;
     }
+    return core_1.ccc.hexFrom(await this.publicKeyCache);
+  }
+  async signNostrEvent(event) {
+    return this.provider.signEvent({
+      ...event,
+      pubkey: await this.publicKeyCache,
+    });
+  }
+  async connect() {
+    await this.provider.connect?.(); // Help extension to switch network
+    await this.getNostrPublicKey();
+  }
+  onReplaced(listener) {
+    const stop = [];
+    const replacer = async () => {
+      listener();
+      stop[0]?.();
+    };
+    stop.push(() => {
+      this.provider.removeListener("accountChanged", replacer);
+    });
+    this.provider.on("accountChanged", replacer);
+    return stop[0];
+  }
+  async isConnected() {
+    return true;
+  }
 }
 exports.NostrSigner = NostrSigner;

package/dist.commonjs/signersFactory.d.ts

@@ -4,5 +4,8 @@ import { ccc } from "@ckb-ccc/core";
  * @param {ccc.Client} client - The client instance.
  * @returns {BitcoinSigner | undefined} The BitcoinSigner instance if the OKX wallet is available, otherwise undefined.
  */
-export declare function getOKXSigners(client: ccc.Client, preferredNetworks?: ccc.NetworkPreference[]): ccc.SignerInfo[];
-//# sourceMappingURL=signersFactory.d.ts.map
+export declare function getOKXSigners(
+  client: ccc.Client,
+  preferredNetworks?: ccc.NetworkPreference[],
+): ccc.SignerInfo[];
+//# sourceMappingURL=signersFactory.d.ts.map

package/dist.commonjs/signersFactory.js

@@ -9,19 +9,23 @@ const index_js_2 = require("./nostr/index.js");
  * @returns {BitcoinSigner | undefined} The BitcoinSigner instance if the OKX wallet is available, otherwise undefined.
  */
 function getOKXSigners(client, preferredNetworks) {
-    const windowRef = window;
-    if (typeof windowRef.okxwallet === "undefined") {
-        return [];
-    }
-    return [
-        {
-            signer: new index_js_1.BitcoinSigner(client, windowRef.okxwallet, preferredNetworks),
-            name: "BTC",
-        },
-        {
-            signer: new index_js_2.NostrSigner(client, windowRef.okxwallet.nostr),
-            name: "Nostr",
-        },
-    ];
+  const windowRef = window;
+  if (typeof windowRef.okxwallet === "undefined") {
+    return [];
+  }
+  return [
+    {
+      signer: new index_js_1.BitcoinSigner(
+        client,
+        windowRef.okxwallet,
+        preferredNetworks,
+      ),
+      name: "BTC",
+    },
+    {
+      signer: new index_js_2.NostrSigner(client, windowRef.okxwallet.nostr),
+      name: "Nostr",
+    },
+  ];
 }
 exports.getOKXSigners = getOKXSigners;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/okx",
-  "version": "0.0.12-alpha.6",
+  "version": "0.0.12-alpha.7",
   "description": "CCC - CKBer's Codebase. Common Chains Connector's support for OKX",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -22,11 +22,6 @@
       "default": "./dist.commonjs/advanced.js"
     }
   },
-  "scripts": {
-    "build": "rimraf ./dist && rimraf ./dist.commonjs && tsc && tsc --project tsconfig.commonjs.json && copyfiles -u 2 misc/basedirs/**/* .",
-    "lint": "eslint",
-    "format": "prettier --write . && eslint --fix"
-  },
   "devDependencies": {
     "@eslint/js": "^9.1.1",
     "copyfiles": "^2.4.1",
@@ -44,8 +39,12 @@
   },
   "dependencies": {
     "@ckb-ccc/core": "0.0.12-alpha.1",
-    "@ckb-ccc/nip07": "0.0.12-alpha.1",
+    "@ckb-ccc/nip07": "0.0.12-alpha.2",
     "@ckb-ccc/uni-sat": "0.0.12-alpha.1"
   },
-  "gitHead": "3679eba15c5ec5397c514444594a09b777c3ffe1"
-}
+  "scripts": {
+    "build": "rimraf ./dist && rimraf ./dist.commonjs && tsc && tsc --project tsconfig.commonjs.json && copyfiles -u 2 misc/basedirs/**/* .",
+    "lint": "eslint",
+    "format": "prettier --write . && eslint --fix"
+  }
+}

package/src/nostr/index.ts

@@ -18,8 +18,23 @@ export class NostrSigner extends ccc.SignerNostr {
 
   async getNostrPublicKey(): Promise<ccc.Hex> {
     if (!this.publicKeyCache) {
-      this.publicKeyCache = this.provider.getPublicKey();
+      this.publicKeyCache = this.provider
+        .getPublicKey()
+        .then((v) => {
+          // For some account types of OKX Wallet, this might returns null
+          // e.g. Keyless accounts
+          if (v) {
+            return v;
+          }
+
+          throw Error("This OKX Wallet account does not support Nostr");
+        })
+        .catch((e) => {
+          this.publicKeyCache = undefined;
+          throw e;
+        });
     }
+
     return ccc.hexFrom(await this.publicKeyCache);
   }
 
@@ -34,6 +49,8 @@ export class NostrSigner extends ccc.SignerNostr {
 
   async connect(): Promise<void> {
     await this.provider.connect?.(); // Help extension to switch network
+
+    await this.getNostrPublicKey();
   }
 
   onReplaced(listener: () => void): () => void {