@ckb-ccc/okx 0.0.9-alpha.1 → 0.0.10-alpha.0

package/dist/advancedBarrel.d.ts

@@ -1,21 +1,42 @@
 import { Nip07A } from "@ckb-ccc/nip07/advanced";
-export interface BitcoinProvider {
-    connect(): Promise<{
+import { UniSatA } from "@ckb-ccc/uni-sat/advanced";
+export interface BitcoinProvider extends UniSatA.Provider {
+    connect?(): Promise<{
         address: string;
         publicKey: string;
         compressedPublicKey: string;
     }>;
-    getSelectedAccount(): Promise<{
+    getSelectedAccount?(): Promise<{
         address: string;
         publicKey: string;
         compressedPublicKey: string;
     } | null>;
-    signMessage(msg: string, type: "ecdsa" | "bip322-simple"): Promise<string>;
 }
 export interface NostrProvider extends Nip07A.Provider {
-    selectedAccount: {
-        address: string;
-        publicKey: string;
-    } | null;
+    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>;
 }
 //# sourceMappingURL=advancedBarrel.d.ts.map

package/dist/advancedBarrel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"advancedBarrel.d.ts","sourceRoot":"","sources":["../src/advancedBarrel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,MAAM,WAAW,eAAe;IAC9B,OAAO,IAAI,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,CAAC,CAAC;IAEH,kBAAkB,IAAI,OAAO,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,GAAG,IAAI,CAAC,CAAC;IAEV,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,QAAQ;IACpD,eAAe,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAChE"}
+{"version":3,"file":"advancedBarrel.d.ts","sourceRoot":"","sources":["../src/advancedBarrel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEpD,MAAM,WAAW,eAAgB,SAAQ,OAAO,CAAC,QAAQ;IACvD,OAAO,CAAC,IAAI,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,CAAC,CAAC;IAEH,kBAAkB,CAAC,IAAI,OAAO,CAAC;QAC7B,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,GAAG,IAAI,CAAC,CAAC;CACX;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,QAAQ;IACpD,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B;;OAEG;IACH,EAAE,EAAE,aAAa,CAAC;IAElB;;;;;OAKG;IACH,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GACxC,aAAa,CAAC;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/E"}

package/dist/btc/index.d.ts

@@ -1,4 +1,4 @@
-import { ccc, Client } from "@ckb-ccc/core";
+import { ccc } from "@ckb-ccc/core";
 import { BitcoinProvider } from "../advancedBarrel";
 /**
  * Class representing a Bitcoin signer that extends SignerBtc from @ckb-ccc/core.
@@ -14,16 +14,8 @@ export declare class BitcoinSigner extends ccc.SignerBtc {
      * @param {ccc.Client} client - The client instance.
      * @param {Provider} provider - The provider instance.
      */
-    constructor(client: ccc.Client, providers: Record<string, BitcoinProvider>, preferredNetworks: ccc.NetworkPreference[]);
+    constructor(client: ccc.Client, providers: Record<string, BitcoinProvider>, preferredNetworks?: ccc.NetworkPreference[]);
     get provider(): BitcoinProvider;
-    /**
-     * Get account info if the signer is connected.
-     * @returns Account information
-     */
-    assertConnection(): Promise<{
-        address: string;
-        publicKey: string;
-    }>;
     /**
      * Gets the Bitcoin account address.
      * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
@@ -39,7 +31,7 @@ export declare class BitcoinSigner extends ccc.SignerBtc {
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     connect(): Promise<void>;
-    replaceClient(client: Client): Promise<boolean>;
+    onReplaced(listener: () => void): () => void;
     /**
      * Checks if the signer is connected.
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/btc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,GAAG,CAAC,SAAS;aAU5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,OAAO,CAAgB;IAE/B;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACzC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE;IAK7D,IAAI,QAAQ,IAAI,eAAe,CAwB9B;IAED;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAQzE;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrD;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/btc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,GAAG,CAAC,SAAS;aAU5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,OAAO,CAAgB;IAE/B;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACzC,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKH,IAAI,QAAQ,IAAI,eAAe,CAwB9B;IAED;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAgBtC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAYzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAe5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAmBrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}

package/dist/btc/index.js

@@ -10,7 +10,18 @@ export class BitcoinSigner extends ccc.SignerBtc {
      * @param {ccc.Client} client - The client instance.
      * @param {Provider} provider - The provider instance.
      */
-    constructor(client, providers, preferredNetworks) {
+    constructor(client, providers, preferredNetworks = [
+        {
+            addressPrefix: "ckb",
+            signerType: ccc.SignerType.BTC,
+            network: "btc",
+        },
+        {
+            addressPrefix: "ckt",
+            signerType: ccc.SignerType.BTC,
+            network: "btcTestnet",
+        },
+    ]) {
         super(client);
         this.providers = providers;
         this.preferredNetworks = preferredNetworks;
@@ -33,49 +44,82 @@ export class BitcoinSigner extends ccc.SignerBtc {
         }
         return provider;
     }
-    /**
-     * Get account info if the signer is connected.
-     * @returns Account information
-     */
-    async assertConnection() {
-        const account = await this.provider.getSelectedAccount();
-        if (!account) {
-            throw Error("Not connected");
-        }
-        return account;
-    }
     /**
      * Gets the Bitcoin account address.
      * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
      */
     async getBtcAccount() {
-        return (await this.assertConnection()).address;
+        if (this.provider.getSelectedAccount) {
+            const account = await this.provider.getSelectedAccount();
+            if (!account) {
+                throw Error("Not connected");
+            }
+            return account.address;
+        }
+        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() {
-        return ccc.hexFrom((await this.assertConnection()).publicKey);
+        if (this.provider.getSelectedAccount) {
+            const account = await this.provider.getSelectedAccount();
+            if (!account) {
+                throw Error("Not connected");
+            }
+            return ccc.hexFrom(account.publicKey);
+        }
+        return ccc.hexFrom(await this.provider.getPublicKey());
     }
     /**
      * Connects to the provider by requesting accounts.
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     async connect() {
-        await this.provider.connect();
+        if (this.provider.connect) {
+            await this.provider.connect();
+            return;
+        }
+        await this.provider.requestAccounts();
     }
-    async replaceClient(client) {
-        const res = await super.replaceClient(client);
-        this.provider; // Check if the network is valid
-        return res;
+    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() {
-        return (await this.provider.getSelectedAccount()) !== null;
+        try {
+            this.provider;
+        }
+        catch (_) {
+            return false;
+        }
+        if (this.provider.getSelectedAccount) {
+            if ((await this.provider.getSelectedAccount()) === null) {
+                return false;
+            }
+        }
+        else if ((await this.provider.getAccounts()).length === 0) {
+            return false;
+        }
+        await this.connect();
+        return true;
     }
     /**
      * Signs a raw message with the Bitcoin account.

package/dist/nostr/index.d.ts

@@ -5,13 +5,14 @@ import { NostrProvider } from "../advancedBarrel";
  * @class
  * @extends {ccc.SignerBtc}
  */
-export declare class SignerNostr extends ccc.SignerNostr {
+export declare class NostrSigner extends ccc.SignerNostr {
     readonly provider: NostrProvider;
+    private publicKeyCache?;
     constructor(client: ccc.Client, provider: NostrProvider);
-    replaceClient(client: ccc.Client): Promise<boolean>;
     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

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,mBAAmB,CAAC;AAElD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;aAG5B,QAAQ,EAAE,aAAa;gBADvC,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,aAAa;IAKnC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAInD,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAQrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAI9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,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,mBAAmB,CAAC;AAElD;;;;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"}

package/dist/nostr/index.js

@@ -4,27 +4,40 @@ import { ccc } from "@ckb-ccc/core";
  * @class
  * @extends {ccc.SignerBtc}
  */
-export class SignerNostr extends ccc.SignerNostr {
+export class NostrSigner extends ccc.SignerNostr {
     constructor(client, provider) {
         super(client);
         this.provider = provider;
-    }
-    async replaceClient(client) {
-        return super.replaceClient(client);
+        this.publicKeyCache = undefined;
     }
     async getNostrPublicKey() {
-        if (!this.provider.selectedAccount) {
-            throw new Error("Not connected");
+        if (!this.publicKeyCache) {
+            this.publicKeyCache = this.provider.getPublicKey();
         }
-        return ccc.hexFrom(this.provider.selectedAccount.publicKey);
+        return ccc.hexFrom(await this.publicKeyCache);
     }
     async signNostrEvent(event) {
-        return this.provider.signEvent(event);
+        return this.provider.signEvent({
+            ...event,
+            pubkey: await this.publicKeyCache,
+        });
     }
     async connect() {
-        await this.provider.getPublicKey();
+        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);
+        });
+        this.provider.on("accountChanged", replacer);
+        return stop[0];
     }
     async isConnected() {
-        return this.provider.selectedAccount !== null;
+        return true;
     }
 }

package/dist/signersFactory.js

@@ -1,5 +1,5 @@
 import { BitcoinSigner } from "./btc";
-import { SignerNostr } from "./nostr";
+import { NostrSigner } from "./nostr";
 /**
  * Retrieves the OKX Bitcoin signer if available.
  * @param {ccc.Client} client - The client instance.
@@ -12,6 +12,6 @@ export function getOKXBitcoinSigner(client, preferredNetworks) {
     }
     return [
         new BitcoinSigner(client, windowRef.okxwallet, preferredNetworks),
-        new SignerNostr(client, windowRef.okxwallet.nostr),
+        new NostrSigner(client, windowRef.okxwallet.nostr),
     ];
 }

package/dist.commonjs/advancedBarrel.d.ts

@@ -1,21 +1,42 @@
 import { Nip07A } from "@ckb-ccc/nip07/advanced";
-export interface BitcoinProvider {
-    connect(): Promise<{
+import { UniSatA } from "@ckb-ccc/uni-sat/advanced";
+export interface BitcoinProvider extends UniSatA.Provider {
+    connect?(): Promise<{
         address: string;
         publicKey: string;
         compressedPublicKey: string;
     }>;
-    getSelectedAccount(): Promise<{
+    getSelectedAccount?(): Promise<{
         address: string;
         publicKey: string;
         compressedPublicKey: string;
     } | null>;
-    signMessage(msg: string, type: "ecdsa" | "bip322-simple"): Promise<string>;
 }
 export interface NostrProvider extends Nip07A.Provider {
-    selectedAccount: {
-        address: string;
-        publicKey: string;
-    } | null;
+    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>;
 }
 //# sourceMappingURL=advancedBarrel.d.ts.map

package/dist.commonjs/advancedBarrel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"advancedBarrel.d.ts","sourceRoot":"","sources":["../src/advancedBarrel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,MAAM,WAAW,eAAe;IAC9B,OAAO,IAAI,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,CAAC,CAAC;IAEH,kBAAkB,IAAI,OAAO,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,GAAG,IAAI,CAAC,CAAC;IAEV,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,QAAQ;IACpD,eAAe,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAChE"}
+{"version":3,"file":"advancedBarrel.d.ts","sourceRoot":"","sources":["../src/advancedBarrel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEpD,MAAM,WAAW,eAAgB,SAAQ,OAAO,CAAC,QAAQ;IACvD,OAAO,CAAC,IAAI,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,CAAC,CAAC;IAEH,kBAAkB,CAAC,IAAI,OAAO,CAAC;QAC7B,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,GAAG,IAAI,CAAC,CAAC;CACX;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,QAAQ;IACpD,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B;;OAEG;IACH,EAAE,EAAE,aAAa,CAAC;IAElB;;;;;OAKG;IACH,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GACxC,aAAa,CAAC;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/E"}

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

@@ -1,4 +1,4 @@
-import { ccc, Client } from "@ckb-ccc/core";
+import { ccc } from "@ckb-ccc/core";
 import { BitcoinProvider } from "../advancedBarrel";
 /**
  * Class representing a Bitcoin signer that extends SignerBtc from @ckb-ccc/core.
@@ -14,16 +14,8 @@ export declare class BitcoinSigner extends ccc.SignerBtc {
      * @param {ccc.Client} client - The client instance.
      * @param {Provider} provider - The provider instance.
      */
-    constructor(client: ccc.Client, providers: Record<string, BitcoinProvider>, preferredNetworks: ccc.NetworkPreference[]);
+    constructor(client: ccc.Client, providers: Record<string, BitcoinProvider>, preferredNetworks?: ccc.NetworkPreference[]);
     get provider(): BitcoinProvider;
-    /**
-     * Get account info if the signer is connected.
-     * @returns Account information
-     */
-    assertConnection(): Promise<{
-        address: string;
-        publicKey: string;
-    }>;
     /**
      * Gets the Bitcoin account address.
      * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
@@ -39,7 +31,7 @@ export declare class BitcoinSigner extends ccc.SignerBtc {
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     connect(): Promise<void>;
-    replaceClient(client: Client): Promise<boolean>;
+    onReplaced(listener: () => void): () => void;
     /**
      * Checks if the signer is connected.
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/btc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,GAAG,CAAC,SAAS;aAU5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,OAAO,CAAgB;IAE/B;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACzC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE;IAK7D,IAAI,QAAQ,IAAI,eAAe,CAwB9B;IAED;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAQzE;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrD;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/btc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,GAAG,CAAC,SAAS;aAU5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,OAAO,CAAgB;IAE/B;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACzC,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKH,IAAI,QAAQ,IAAI,eAAe,CAwB9B;IAED;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAgBtC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAYzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAe5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAmBrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}

package/dist.commonjs/btc/index.js

@@ -13,7 +13,18 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
      * @param {ccc.Client} client - The client instance.
      * @param {Provider} provider - The provider instance.
      */
-    constructor(client, providers, preferredNetworks) {
+    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;
@@ -36,49 +47,82 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
         }
         return provider;
     }
-    /**
-     * Get account info if the signer is connected.
-     * @returns Account information
-     */
-    async assertConnection() {
-        const account = await this.provider.getSelectedAccount();
-        if (!account) {
-            throw Error("Not connected");
-        }
-        return account;
-    }
     /**
      * Gets the Bitcoin account address.
      * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
      */
     async getBtcAccount() {
-        return (await this.assertConnection()).address;
+        if (this.provider.getSelectedAccount) {
+            const account = await this.provider.getSelectedAccount();
+            if (!account) {
+                throw Error("Not connected");
+            }
+            return account.address;
+        }
+        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() {
-        return core_1.ccc.hexFrom((await this.assertConnection()).publicKey);
+        if (this.provider.getSelectedAccount) {
+            const account = await this.provider.getSelectedAccount();
+            if (!account) {
+                throw Error("Not connected");
+            }
+            return core_1.ccc.hexFrom(account.publicKey);
+        }
+        return core_1.ccc.hexFrom(await this.provider.getPublicKey());
     }
     /**
      * Connects to the provider by requesting accounts.
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     async connect() {
-        await this.provider.connect();
+        if (this.provider.connect) {
+            await this.provider.connect();
+            return;
+        }
+        await this.provider.requestAccounts();
     }
-    async replaceClient(client) {
-        const res = await super.replaceClient(client);
-        this.provider; // Check if the network is valid
-        return res;
+    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() {
-        return (await this.provider.getSelectedAccount()) !== null;
+        try {
+            this.provider;
+        }
+        catch (_) {
+            return false;
+        }
+        if (this.provider.getSelectedAccount) {
+            if ((await this.provider.getSelectedAccount()) === null) {
+                return false;
+            }
+        }
+        else if ((await this.provider.getAccounts()).length === 0) {
+            return false;
+        }
+        await this.connect();
+        return true;
     }
     /**
      * Signs a raw message with the Bitcoin account.

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

@@ -5,13 +5,14 @@ import { NostrProvider } from "../advancedBarrel";
  * @class
  * @extends {ccc.SignerBtc}
  */
-export declare class SignerNostr extends ccc.SignerNostr {
+export declare class NostrSigner extends ccc.SignerNostr {
     readonly provider: NostrProvider;
+    private publicKeyCache?;
     constructor(client: ccc.Client, provider: NostrProvider);
-    replaceClient(client: ccc.Client): Promise<boolean>;
     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

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,mBAAmB,CAAC;AAElD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;aAG5B,QAAQ,EAAE,aAAa;gBADvC,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,aAAa;IAKnC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAInD,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAQrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAI9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,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,mBAAmB,CAAC;AAElD;;;;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"}

package/dist.commonjs/nostr/index.js

@@ -1,34 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SignerNostr = void 0;
+exports.NostrSigner = void 0;
 const core_1 = require("@ckb-ccc/core");
 /**
  * Class representing a Bitcoin signer that extends SignerBtc from @ckb-ccc/core.
  * @class
  * @extends {ccc.SignerBtc}
  */
-class SignerNostr extends core_1.ccc.SignerNostr {
+class NostrSigner extends core_1.ccc.SignerNostr {
     constructor(client, provider) {
         super(client);
         this.provider = provider;
-    }
-    async replaceClient(client) {
-        return super.replaceClient(client);
+        this.publicKeyCache = undefined;
     }
     async getNostrPublicKey() {
-        if (!this.provider.selectedAccount) {
-            throw new Error("Not connected");
+        if (!this.publicKeyCache) {
+            this.publicKeyCache = this.provider.getPublicKey();
         }
-        return core_1.ccc.hexFrom(this.provider.selectedAccount.publicKey);
+        return core_1.ccc.hexFrom(await this.publicKeyCache);
     }
     async signNostrEvent(event) {
-        return this.provider.signEvent(event);
+        return this.provider.signEvent({
+            ...event,
+            pubkey: await this.publicKeyCache,
+        });
     }
     async connect() {
-        await this.provider.getPublicKey();
+        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);
+        });
+        this.provider.on("accountChanged", replacer);
+        return stop[0];
     }
     async isConnected() {
-        return this.provider.selectedAccount !== null;
+        return true;
     }
 }
-exports.SignerNostr = SignerNostr;
+exports.NostrSigner = NostrSigner;

package/dist.commonjs/signersFactory.js

@@ -15,7 +15,7 @@ function getOKXBitcoinSigner(client, preferredNetworks) {
     }
     return [
         new btc_1.BitcoinSigner(client, windowRef.okxwallet, preferredNetworks),
-        new nostr_1.SignerNostr(client, windowRef.okxwallet.nostr),
+        new nostr_1.NostrSigner(client, windowRef.okxwallet.nostr),
     ];
 }
 exports.getOKXBitcoinSigner = getOKXBitcoinSigner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/okx",
-  "version": "0.0.9-alpha.1",
+  "version": "0.0.10-alpha.0",
   "description": "CCC - CKBer's Codebase. Common Chains Connector's support for OKX",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -42,8 +42,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.9-alpha.1",
-    "@ckb-ccc/nip07": "0.0.9-alpha.1"
+    "@ckb-ccc/core": "0.0.10-alpha.0",
+    "@ckb-ccc/nip07": "0.0.10-alpha.0",
+    "@ckb-ccc/uni-sat": "0.0.10-alpha.0"
   },
-  "gitHead": "d708cbabd48a160d7608a0b86093b16f35451f79"
+  "gitHead": "8a4c789419f5e12e1f230cead213c59373834a1a"
 }

package/src/advancedBarrel.ts

@@ -1,21 +1,50 @@
 import { Nip07A } from "@ckb-ccc/nip07/advanced";
+import { UniSatA } from "@ckb-ccc/uni-sat/advanced";
 
-export interface BitcoinProvider {
-  connect(): Promise<{
+export interface BitcoinProvider extends UniSatA.Provider {
+  connect?(): Promise<{
     address: string;
     publicKey: string;
     compressedPublicKey: string;
   }>;
 
-  getSelectedAccount(): Promise<{
+  getSelectedAccount?(): Promise<{
     address: string;
     publicKey: string;
     compressedPublicKey: string;
   } | null>;
-
-  signMessage(msg: string, type: "ecdsa" | "bip322-simple"): Promise<string>;
 }
 
 export interface NostrProvider extends Nip07A.Provider {
-  selectedAccount: { address: string; publicKey: string } | null;
+  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>;
 }

package/src/btc/index.ts

@@ -1,4 +1,4 @@
-import { ccc, Client } from "@ckb-ccc/core";
+import { ccc } from "@ckb-ccc/core";
 import { BitcoinProvider } from "../advancedBarrel";
 
 /**
@@ -17,7 +17,18 @@ export class BitcoinSigner extends ccc.SignerBtc {
   constructor(
     client: ccc.Client,
     public readonly providers: Record<string, BitcoinProvider>,
-    private readonly preferredNetworks: ccc.NetworkPreference[],
+    private readonly preferredNetworks: ccc.NetworkPreference[] = [
+      {
+        addressPrefix: "ckb",
+        signerType: ccc.SignerType.BTC,
+        network: "btc",
+      },
+      {
+        addressPrefix: "ckt",
+        signerType: ccc.SignerType.BTC,
+        network: "btcTestnet",
+      },
+    ],
   ) {
     super(client);
   }
@@ -48,24 +59,24 @@ export class BitcoinSigner extends ccc.SignerBtc {
     return provider;
   }
 
-  /**
-   * Get account info if the signer is connected.
-   * @returns Account information
-   */
-  async assertConnection(): Promise<{ address: string; publicKey: string }> {
-    const account = await this.provider.getSelectedAccount();
-    if (!account) {
-      throw Error("Not connected");
-    }
-    return account;
-  }
-
   /**
    * Gets the Bitcoin account address.
    * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
    */
   async getBtcAccount(): Promise<string> {
-    return (await this.assertConnection()).address;
+    if (this.provider.getSelectedAccount) {
+      const account = await this.provider.getSelectedAccount();
+      if (!account) {
+        throw Error("Not connected");
+      }
+      return account.address;
+    }
+
+    const address = (await this.provider.getAccounts())[0];
+    if (!address) {
+      throw Error("Not connected");
+    }
+    return address;
   }
 
   /**
@@ -73,7 +84,15 @@ export class BitcoinSigner extends ccc.SignerBtc {
    * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
    */
   async getBtcPublicKey(): Promise<ccc.Hex> {
-    return ccc.hexFrom((await this.assertConnection()).publicKey);
+    if (this.provider.getSelectedAccount) {
+      const account = await this.provider.getSelectedAccount();
+      if (!account) {
+        throw Error("Not connected");
+      }
+      return ccc.hexFrom(account.publicKey);
+    }
+
+    return ccc.hexFrom(await this.provider.getPublicKey());
   }
 
   /**
@@ -81,13 +100,26 @@ export class BitcoinSigner extends ccc.SignerBtc {
    * @returns {Promise<void>} A promise that resolves when the connection is established.
    */
   async connect(): Promise<void> {
-    await this.provider.connect();
+    if (this.provider.connect) {
+      await this.provider.connect();
+      return;
+    }
+    await this.provider.requestAccounts();
   }
 
-  async replaceClient(client: Client): Promise<boolean> {
-    const res = await super.replaceClient(client);
-    this.provider; // Check if the network is valid
-    return res;
+  onReplaced(listener: () => void): () => void {
+    const stop: (() => void)[] = [];
+    const replacer = async () => {
+      listener();
+      stop[0]?.();
+    };
+    stop.push(() => {
+      this.provider.removeListener("accountChanged", replacer);
+    });
+
+    this.provider.on("accountChanged", replacer);
+
+    return stop[0];
   }
 
   /**
@@ -95,7 +127,22 @@ export class BitcoinSigner extends ccc.SignerBtc {
    * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
    */
   async isConnected(): Promise<boolean> {
-    return (await this.provider.getSelectedAccount()) !== null;
+    try {
+      this.provider;
+    } catch (_) {
+      return false;
+    }
+
+    if (this.provider.getSelectedAccount) {
+      if ((await this.provider.getSelectedAccount()) === null) {
+        return false;
+      }
+    } else if ((await this.provider.getAccounts()).length === 0) {
+      return false;
+    }
+
+    await this.connect();
+    return true;
   }
 
   /**

package/src/nostr/index.ts

@@ -6,7 +6,9 @@ import { NostrProvider } from "../advancedBarrel";
  * @class
  * @extends {ccc.SignerBtc}
  */
-export class SignerNostr extends ccc.SignerNostr {
+export class NostrSigner extends ccc.SignerNostr {
+  private publicKeyCache?: Promise<string> = undefined;
+
   constructor(
     client: ccc.Client,
     public readonly provider: NostrProvider,
@@ -14,29 +16,42 @@ export class SignerNostr extends ccc.SignerNostr {
     super(client);
   }
 
-  async replaceClient(client: ccc.Client): Promise<boolean> {
-    return super.replaceClient(client);
-  }
-
   async getNostrPublicKey(): Promise<ccc.Hex> {
-    if (!this.provider.selectedAccount) {
-      throw new Error("Not connected");
+    if (!this.publicKeyCache) {
+      this.publicKeyCache = this.provider.getPublicKey();
     }
-
-    return ccc.hexFrom(this.provider.selectedAccount.publicKey);
+    return ccc.hexFrom(await this.publicKeyCache);
   }
 
   async signNostrEvent(
     event: ccc.NostrEvent,
   ): Promise<Required<ccc.NostrEvent>> {
-    return this.provider.signEvent(event);
+    return this.provider.signEvent({
+      ...event,
+      pubkey: await this.publicKeyCache,
+    });
   }
 
   async connect(): Promise<void> {
-    await this.provider.getPublicKey();
+    await this.provider.connect?.(); // Help extension to switch network
+  }
+
+  onReplaced(listener: () => void): () => void {
+    const stop: (() => void)[] = [];
+    const replacer = async () => {
+      listener();
+      stop[0]?.();
+    };
+    stop.push(() => {
+      this.provider.removeListener("accountChanged", replacer);
+    });
+
+    this.provider.on("accountChanged", replacer);
+
+    return stop[0];
   }
 
   async isConnected(): Promise<boolean> {
-    return this.provider.selectedAccount !== null;
+    return true;
   }
 }

package/src/signersFactory.ts

@@ -1,7 +1,7 @@
 import { ccc } from "@ckb-ccc/core";
 import { BitcoinProvider, NostrProvider } from "./advancedBarrel";
 import { BitcoinSigner } from "./btc";
-import { SignerNostr } from "./nostr";
+import { NostrSigner } from "./nostr";
 
 /**
  * Retrieves the OKX Bitcoin signer if available.
@@ -22,6 +22,6 @@ export function getOKXBitcoinSigner(
 
   return [
     new BitcoinSigner(client, windowRef.okxwallet, preferredNetworks),
-    new SignerNostr(client, windowRef.okxwallet.nostr),
+    new NostrSigner(client, windowRef.okxwallet.nostr),
   ];
 }