@ckb-ccc/eip6963 0.0.11-alpha.3 → 0.0.12-alpha.1

package/dist/signer.d.ts

@@ -1,19 +1,19 @@
 import { ccc } from "@ckb-ccc/core";
-import { ProviderDetail as EIP6963ProviderDetail } from "./eip6963.advanced.js";
+import { Provider } from "./eip1193.advanced.js";
 /**
  * Class representing an EVM signer that extends SignerEvm from @ckb-ccc/core.
  * @class
  * @extends {ccc.SignerEvm}
  */
 export declare class Signer extends ccc.SignerEvm {
-    readonly detail: EIP6963ProviderDetail;
+    readonly provider: Provider;
     private accountCache?;
     /**
      * Creates an instance of Signer.
      * @param {ccc.Client} client - The client instance.
      * @param {EIP6963ProviderDetail} detail - The provider detail.
      */
-    constructor(client: ccc.Client, detail: EIP6963ProviderDetail);
+    constructor(client: ccc.Client, provider: Provider);
     /**
      * Gets the EVM account address.
      * @returns A promise that resolves to the EVM account address.

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,MAAM,EAAE,qBAAqB;IAT/C,OAAO,CAAC,YAAY,CAAC,CAAsB;IAE3C;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,MAAM,EAAE,qBAAqB;IAK/C;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAOvC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;CAWxE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,QAAQ,EAAE,QAAQ;IATpC,OAAO,CAAC,YAAY,CAAC,CAAsB;IAE3C;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ;IAKpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAOvC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAMrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;CAWxE"}

package/dist/signer.js

@@ -10,9 +10,9 @@ export class Signer extends ccc.SignerEvm {
      * @param {ccc.Client} client - The client instance.
      * @param {EIP6963ProviderDetail} detail - The provider detail.
      */
-    constructor(client, detail) {
+    constructor(client, provider) {
         super(client);
-        this.detail = detail;
+        this.provider = provider;
         this.accountCache = undefined;
     }
     /**
@@ -20,7 +20,7 @@ export class Signer extends ccc.SignerEvm {
      * @returns A promise that resolves to the EVM account address.
      */
     async getEvmAccount() {
-        this.accountCache = (await this.detail.provider.request({ method: "eth_accounts" }))[0];
+        this.accountCache = (await this.provider.request({ method: "eth_accounts" }))[0];
         return this.accountCache;
     }
     /**
@@ -28,7 +28,7 @@ export class Signer extends ccc.SignerEvm {
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     async connect() {
-        await this.detail.provider.request({ method: "eth_requestAccounts" });
+        await this.provider.request({ method: "eth_requestAccounts" });
     }
     onReplaced(listener) {
         const stop = [];
@@ -37,11 +37,11 @@ export class Signer extends ccc.SignerEvm {
             stop[0]?.();
         };
         stop.push(() => {
-            this.detail.provider.removeListener("accountsChanged", replacer);
-            this.detail.provider.removeListener("disconnect", replacer);
+            this.provider.removeListener("accountsChanged", replacer);
+            this.provider.removeListener("disconnect", replacer);
         });
-        this.detail.provider.on("accountsChanged", replacer);
-        this.detail.provider.on("disconnect", replacer);
+        this.provider.on("accountsChanged", replacer);
+        this.provider.on("disconnect", replacer);
         return stop[0];
     }
     /**
@@ -49,8 +49,7 @@ export class Signer extends ccc.SignerEvm {
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
      */
     async isConnected() {
-        return ((await this.detail.provider.request({ method: "eth_accounts" }))
-            .length !== 0);
+        return ((await this.provider.request({ method: "eth_accounts" })).length !== 0);
     }
     /**
      * Signs a raw message with the personal account.
@@ -60,7 +59,7 @@ export class Signer extends ccc.SignerEvm {
     async signMessageRaw(message) {
         const challenge = typeof message === "string" ? ccc.bytesFrom(message, "utf8") : message;
         const account = this.accountCache ?? (await this.getEvmAccount());
-        return this.detail.provider.request({
+        return this.provider.request({
             method: "personal_sign",
             params: [ccc.hexFrom(challenge), account],
         });

package/dist/signersFactory.d.ts

@@ -1,5 +1,6 @@
 import { ccc } from "@ckb-ccc/core";
-import { Signer as EIP6963Signer } from "./signer.js";
+import { ProviderDetail } from "./eip6963.advanced.js";
+import { Signer } from "./signer.js";
 /**
  * Class representing a factory for creating and managing Signer instances.
  * @class
@@ -14,9 +15,9 @@ export declare class SignerFactory {
     constructor(client: ccc.Client);
     /**
      * Subscribes to new signers and triggers a callback when a new signer is available.
-     * @param {(newSigner: EIP6963Signer) => unknown} callback - The callback to trigger with the new signer.
-     * @returns {() => void} A function to unsubscribe from the signer events.
+     * @param callback - The callback to trigger with the new signer.
+     * @returns A function to unsubscribe from the signer events.
      */
-    subscribeSigners(callback: (newSigner: EIP6963Signer) => unknown): () => void;
+    subscribeSigners(callback: (newSigner: Signer, detail?: ProviderDetail) => unknown): () => void;
 }
 //# sourceMappingURL=signersFactory.d.ts.map

package/dist/signersFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signersFactory.d.ts","sourceRoot":"","sources":["../src/signersFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtD;;;GAGG;AACH,qBAAa,aAAa;IAOZ,OAAO,CAAC,QAAQ,CAAC,MAAM;IANnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C;;;OAGG;gBAC0B,MAAM,EAAE,GAAG,CAAC,MAAM;IAE/C;;;;OAIG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,SAAS,EAAE,aAAa,KAAK,OAAO,GAC9C,MAAM,IAAI;CAoBd"}
+{"version":3,"file":"signersFactory.d.ts","sourceRoot":"","sources":["../src/signersFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAEL,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;GAGG;AACH,qBAAa,aAAa;IAOZ,OAAO,CAAC,QAAQ,CAAC,MAAM;IANnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C;;;OAGG;gBAC0B,MAAM,EAAE,GAAG,CAAC,MAAM;IAE/C;;;;OAIG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,KAAK,OAAO,GAChE,MAAM,IAAI;CA0Bd"}

package/dist/signersFactory.js

@@ -1,4 +1,4 @@
-import { Signer as EIP6963Signer } from "./signer.js";
+import { Signer } from "./signer.js";
 /**
  * Class representing a factory for creating and managing Signer instances.
  * @class
@@ -14,8 +14,8 @@ export class SignerFactory {
     }
     /**
      * Subscribes to new signers and triggers a callback when a new signer is available.
-     * @param {(newSigner: EIP6963Signer) => unknown} callback - The callback to trigger with the new signer.
-     * @returns {() => void} A function to unsubscribe from the signer events.
+     * @param callback - The callback to trigger with the new signer.
+     * @returns A function to unsubscribe from the signer events.
      */
     subscribeSigners(callback) {
         const onNewProvider = (event) => {
@@ -25,11 +25,15 @@ export class SignerFactory {
                 return;
             }
             this.existedUuids.push(uuid);
-            const signer = new EIP6963Signer(this.client, detail);
-            callback(signer);
+            const signer = new Signer(this.client, detail.provider);
+            callback(signer, detail);
         };
         window.addEventListener("eip6963:announceProvider", onNewProvider);
         window.dispatchEvent(new Event("eip6963:requestProvider"));
+        const windowRef = window;
+        if (typeof windowRef.ethereum !== "undefined") {
+            callback(new Signer(this.client, windowRef.ethereum));
+        }
         return () => window.removeEventListener("eip6963:announceProvider", onNewProvider);
     }
 }

package/dist.commonjs/signer.d.ts

@@ -1,19 +1,19 @@
 import { ccc } from "@ckb-ccc/core";
-import { ProviderDetail as EIP6963ProviderDetail } from "./eip6963.advanced.js";
+import { Provider } from "./eip1193.advanced.js";
 /**
  * Class representing an EVM signer that extends SignerEvm from @ckb-ccc/core.
  * @class
  * @extends {ccc.SignerEvm}
  */
 export declare class Signer extends ccc.SignerEvm {
-    readonly detail: EIP6963ProviderDetail;
+    readonly provider: Provider;
     private accountCache?;
     /**
      * Creates an instance of Signer.
      * @param {ccc.Client} client - The client instance.
      * @param {EIP6963ProviderDetail} detail - The provider detail.
      */
-    constructor(client: ccc.Client, detail: EIP6963ProviderDetail);
+    constructor(client: ccc.Client, provider: Provider);
     /**
      * Gets the EVM account address.
      * @returns A promise that resolves to the EVM account address.

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

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,MAAM,EAAE,qBAAqB;IAT/C,OAAO,CAAC,YAAY,CAAC,CAAsB;IAE3C;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,MAAM,EAAE,qBAAqB;IAK/C;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAOvC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;CAWxE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,QAAQ,EAAE,QAAQ;IATpC,OAAO,CAAC,YAAY,CAAC,CAAsB;IAE3C;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ;IAKpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAOvC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAMrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;CAWxE"}

package/dist.commonjs/signer.js

@@ -13,9 +13,9 @@ class Signer extends core_1.ccc.SignerEvm {
      * @param {ccc.Client} client - The client instance.
      * @param {EIP6963ProviderDetail} detail - The provider detail.
      */
-    constructor(client, detail) {
+    constructor(client, provider) {
         super(client);
-        this.detail = detail;
+        this.provider = provider;
         this.accountCache = undefined;
     }
     /**
@@ -23,7 +23,7 @@ class Signer extends core_1.ccc.SignerEvm {
      * @returns A promise that resolves to the EVM account address.
      */
     async getEvmAccount() {
-        this.accountCache = (await this.detail.provider.request({ method: "eth_accounts" }))[0];
+        this.accountCache = (await this.provider.request({ method: "eth_accounts" }))[0];
         return this.accountCache;
     }
     /**
@@ -31,7 +31,7 @@ class Signer extends core_1.ccc.SignerEvm {
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     async connect() {
-        await this.detail.provider.request({ method: "eth_requestAccounts" });
+        await this.provider.request({ method: "eth_requestAccounts" });
     }
     onReplaced(listener) {
         const stop = [];
@@ -40,11 +40,11 @@ class Signer extends core_1.ccc.SignerEvm {
             stop[0]?.();
         };
         stop.push(() => {
-            this.detail.provider.removeListener("accountsChanged", replacer);
-            this.detail.provider.removeListener("disconnect", replacer);
+            this.provider.removeListener("accountsChanged", replacer);
+            this.provider.removeListener("disconnect", replacer);
         });
-        this.detail.provider.on("accountsChanged", replacer);
-        this.detail.provider.on("disconnect", replacer);
+        this.provider.on("accountsChanged", replacer);
+        this.provider.on("disconnect", replacer);
         return stop[0];
     }
     /**
@@ -52,8 +52,7 @@ class Signer extends core_1.ccc.SignerEvm {
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
      */
     async isConnected() {
-        return ((await this.detail.provider.request({ method: "eth_accounts" }))
-            .length !== 0);
+        return ((await this.provider.request({ method: "eth_accounts" })).length !== 0);
     }
     /**
      * Signs a raw message with the personal account.
@@ -63,7 +62,7 @@ class Signer extends core_1.ccc.SignerEvm {
     async signMessageRaw(message) {
         const challenge = typeof message === "string" ? core_1.ccc.bytesFrom(message, "utf8") : message;
         const account = this.accountCache ?? (await this.getEvmAccount());
-        return this.detail.provider.request({
+        return this.provider.request({
             method: "personal_sign",
             params: [core_1.ccc.hexFrom(challenge), account],
         });

package/dist.commonjs/signersFactory.d.ts

@@ -1,5 +1,6 @@
 import { ccc } from "@ckb-ccc/core";
-import { Signer as EIP6963Signer } from "./signer.js";
+import { ProviderDetail } from "./eip6963.advanced.js";
+import { Signer } from "./signer.js";
 /**
  * Class representing a factory for creating and managing Signer instances.
  * @class
@@ -14,9 +15,9 @@ export declare class SignerFactory {
     constructor(client: ccc.Client);
     /**
      * Subscribes to new signers and triggers a callback when a new signer is available.
-     * @param {(newSigner: EIP6963Signer) => unknown} callback - The callback to trigger with the new signer.
-     * @returns {() => void} A function to unsubscribe from the signer events.
+     * @param callback - The callback to trigger with the new signer.
+     * @returns A function to unsubscribe from the signer events.
      */
-    subscribeSigners(callback: (newSigner: EIP6963Signer) => unknown): () => void;
+    subscribeSigners(callback: (newSigner: Signer, detail?: ProviderDetail) => unknown): () => void;
 }
 //# sourceMappingURL=signersFactory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"signersFactory.d.ts","sourceRoot":"","sources":["../src/signersFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtD;;;GAGG;AACH,qBAAa,aAAa;IAOZ,OAAO,CAAC,QAAQ,CAAC,MAAM;IANnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C;;;OAGG;gBAC0B,MAAM,EAAE,GAAG,CAAC,MAAM;IAE/C;;;;OAIG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,SAAS,EAAE,aAAa,KAAK,OAAO,GAC9C,MAAM,IAAI;CAoBd"}
+{"version":3,"file":"signersFactory.d.ts","sourceRoot":"","sources":["../src/signersFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAEL,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;GAGG;AACH,qBAAa,aAAa;IAOZ,OAAO,CAAC,QAAQ,CAAC,MAAM;IANnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C;;;OAGG;gBAC0B,MAAM,EAAE,GAAG,CAAC,MAAM;IAE/C;;;;OAIG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,KAAK,OAAO,GAChE,MAAM,IAAI;CA0Bd"}

package/dist.commonjs/signersFactory.js

@@ -17,8 +17,8 @@ class SignerFactory {
     }
     /**
      * Subscribes to new signers and triggers a callback when a new signer is available.
-     * @param {(newSigner: EIP6963Signer) => unknown} callback - The callback to trigger with the new signer.
-     * @returns {() => void} A function to unsubscribe from the signer events.
+     * @param callback - The callback to trigger with the new signer.
+     * @returns A function to unsubscribe from the signer events.
      */
     subscribeSigners(callback) {
         const onNewProvider = (event) => {
@@ -28,11 +28,15 @@ class SignerFactory {
                 return;
             }
             this.existedUuids.push(uuid);
-            const signer = new signer_js_1.Signer(this.client, detail);
-            callback(signer);
+            const signer = new signer_js_1.Signer(this.client, detail.provider);
+            callback(signer, detail);
         };
         window.addEventListener("eip6963:announceProvider", onNewProvider);
         window.dispatchEvent(new Event("eip6963:requestProvider"));
+        const windowRef = window;
+        if (typeof windowRef.ethereum !== "undefined") {
+            callback(new signer_js_1.Signer(this.client, windowRef.ethereum));
+        }
         return () => window.removeEventListener("eip6963:announceProvider", onNewProvider);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/eip6963",
-  "version": "0.0.11-alpha.3",
+  "version": "0.0.12-alpha.1",
   "description": "CCC - CKBer's Codebase. Common Chains Connector's support for EIP6963",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.11-alpha.3"
+    "@ckb-ccc/core": "0.0.12-alpha.1"
   },
-  "gitHead": "235ba3c69a0a1098fcd741fafb4b8f32dcfbc2b5"
+  "gitHead": "22b1e1e4c7e56c8a6e9f699f54193cbec7d30a8b"
 }

package/src/signer.ts

@@ -1,5 +1,5 @@
 import { ccc } from "@ckb-ccc/core";
-import { ProviderDetail as EIP6963ProviderDetail } from "./eip6963.advanced.js";
+import { Provider } from "./eip1193.advanced.js";
 
 /**
  * Class representing an EVM signer that extends SignerEvm from @ckb-ccc/core.
@@ -16,7 +16,7 @@ export class Signer extends ccc.SignerEvm {
    */
   constructor(
     client: ccc.Client,
-    public readonly detail: EIP6963ProviderDetail,
+    public readonly provider: Provider,
   ) {
     super(client);
   }
@@ -27,7 +27,7 @@ export class Signer extends ccc.SignerEvm {
    */
   async getEvmAccount(): Promise<ccc.Hex> {
     this.accountCache = (
-      await this.detail.provider.request({ method: "eth_accounts" })
+      await this.provider.request({ method: "eth_accounts" })
     )[0];
     return this.accountCache;
   }
@@ -37,7 +37,7 @@ export class Signer extends ccc.SignerEvm {
    * @returns {Promise<void>} A promise that resolves when the connection is established.
    */
   async connect(): Promise<void> {
-    await this.detail.provider.request({ method: "eth_requestAccounts" });
+    await this.provider.request({ method: "eth_requestAccounts" });
   }
 
   onReplaced(listener: () => void): () => void {
@@ -47,12 +47,12 @@ export class Signer extends ccc.SignerEvm {
       stop[0]?.();
     };
     stop.push(() => {
-      this.detail.provider.removeListener("accountsChanged", replacer);
-      this.detail.provider.removeListener("disconnect", replacer);
+      this.provider.removeListener("accountsChanged", replacer);
+      this.provider.removeListener("disconnect", replacer);
     });
 
-    this.detail.provider.on("accountsChanged", replacer);
-    this.detail.provider.on("disconnect", replacer);
+    this.provider.on("accountsChanged", replacer);
+    this.provider.on("disconnect", replacer);
 
     return stop[0];
   }
@@ -63,8 +63,7 @@ export class Signer extends ccc.SignerEvm {
    */
   async isConnected(): Promise<boolean> {
     return (
-      (await this.detail.provider.request({ method: "eth_accounts" }))
-        .length !== 0
+      (await this.provider.request({ method: "eth_accounts" })).length !== 0
     );
   }
 
@@ -79,7 +78,7 @@ export class Signer extends ccc.SignerEvm {
 
     const account = this.accountCache ?? (await this.getEvmAccount());
 
-    return this.detail.provider.request({
+    return this.provider.request({
       method: "personal_sign",
       params: [ccc.hexFrom(challenge), account],
     });

package/src/signersFactory.ts

@@ -1,6 +1,10 @@
 import { ccc } from "@ckb-ccc/core";
-import { AnnounceProviderEvent as EIP6963AnnounceProviderEvent } from "./eip6963.advanced.js";
-import { Signer as EIP6963Signer } from "./signer.js";
+import { Provider } from "./eip1193.advanced.js";
+import {
+  AnnounceProviderEvent as EIP6963AnnounceProviderEvent,
+  ProviderDetail,
+} from "./eip6963.advanced.js";
+import { Signer } from "./signer.js";
 
 /**
  * Class representing a factory for creating and managing Signer instances.
@@ -17,11 +21,11 @@ export class SignerFactory {
 
   /**
    * Subscribes to new signers and triggers a callback when a new signer is available.
-   * @param {(newSigner: EIP6963Signer) => unknown} callback - The callback to trigger with the new signer.
-   * @returns {() => void} A function to unsubscribe from the signer events.
+   * @param callback - The callback to trigger with the new signer.
+   * @returns A function to unsubscribe from the signer events.
    */
   subscribeSigners(
-    callback: (newSigner: EIP6963Signer) => unknown,
+    callback: (newSigner: Signer, detail?: ProviderDetail) => unknown,
   ): () => void {
     const onNewProvider = (event: Event) => {
       const { detail } = event as unknown as EIP6963AnnounceProviderEvent;
@@ -32,13 +36,19 @@ export class SignerFactory {
       }
 
       this.existedUuids.push(uuid);
-      const signer = new EIP6963Signer(this.client, detail);
-      callback(signer);
+      const signer = new Signer(this.client, detail.provider);
+      callback(signer, detail);
     };
 
     window.addEventListener("eip6963:announceProvider", onNewProvider);
     window.dispatchEvent(new Event("eip6963:requestProvider"));
 
+    const windowRef = window as { ethereum?: Provider };
+
+    if (typeof windowRef.ethereum !== "undefined") {
+      callback(new Signer(this.client, windowRef.ethereum));
+    }
+
     return () =>
       window.removeEventListener("eip6963:announceProvider", onNewProvider);
   }