@wagmi/connectors 6.1.3 → 6.2.0

package/dist/esm/version.js

@@ -1,2 +1,2 @@
-export const version = '6.1.3';
+export const version = '6.2.0';
 //# sourceMappingURL=version.js.map

package/dist/types/baseAccount.d.ts

@@ -1,5 +1,40 @@
 import type { createBaseAccountSDK, ProviderInterface } from '@base-org/account';
 import type { Mutable, Omit } from '@wagmi/core/internal';
+import { type Address, type Hex } from 'viem';
 export type BaseAccountParameters = Mutable<Omit<Parameters<typeof createBaseAccountSDK>[0], 'appChainIds'>>;
-export declare function baseAccount(parameters?: BaseAccountParameters): import("@wagmi/core").CreateConnectorFn<ProviderInterface, Record<string, unknown>, Record<string, unknown>>;
+export declare function baseAccount(parameters?: BaseAccountParameters): import("@wagmi/core").CreateConnectorFn<ProviderInterface, {
+    connect<withCapabilities extends boolean = false>(parameters?: {
+        chainId?: number | undefined;
+        capabilities?: {
+            signInWithEthereum?: {
+                chainId?: string | undefined;
+                domain?: string | undefined;
+                expirationTime?: string | undefined;
+                issuedAt?: string | undefined;
+                nonce: string;
+                notBefore?: string | undefined;
+                requestId?: string | undefined;
+                resources?: string[] | undefined;
+                scheme?: string | undefined;
+                statement?: string | undefined;
+                uri?: string | undefined;
+                version?: string | undefined;
+            };
+            [capability: string]: any;
+        } | undefined;
+        withCapabilities?: withCapabilities | boolean | undefined;
+    }): Promise<{
+        accounts: withCapabilities extends true ? readonly {
+            address: Address;
+            capabilities: {
+                [capability: string]: any;
+                signInWithEthereum?: {
+                    message: string;
+                    signature: Hex;
+                } | undefined;
+            };
+        }[] : readonly Address[];
+        chainId: number;
+    }>;
+}, Record<string, unknown>>;
 //# sourceMappingURL=baseAccount.d.ts.map

package/dist/types/baseAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseAccount.d.ts","sourceRoot":"","sources":["../../src/baseAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAMhF,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAWzD,MAAM,MAAM,qBAAqB,GAAG,OAAO,CACzC,IAAI,CACF,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAC1C,aAAa,CACd,CACF,CAAA;AAED,wBAAgB,WAAW,CAAC,UAAU,GAAE,qBAA0B,gHAmNjE"}
+{"version":3,"file":"baseAccount.d.ts","sourceRoot":"","sources":["../../src/baseAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAMhF,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAEL,KAAK,OAAO,EAEZ,KAAK,GAAG,EAKT,MAAM,MAAM,CAAA;AAEb,MAAM,MAAM,qBAAqB,GAAG,OAAO,CACzC,IAAI,CACF,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAC1C,aAAa,CACd,CACF,CAAA;AAED,wBAAgB,WAAW,CAAC,UAAU,GAAE,qBAA0B;YAGtD,gBAAgB,SAAS,OAAO,uBAAuB;QAC7D,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5B,YAAY,CAAC,EACT;YACE,kBAAkB,CAAC,EAAE;gBACnB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBAC3B,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBACnC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBAC7B,KAAK,EAAE,MAAM,CAAA;gBACb,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBAC9B,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;gBAChC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBAC3B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBAC9B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;gBACxB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;aAC7B,CAAA;YACD,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;SAC1B,GACD,SAAS,CAAA;QACb,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,GAAG,SAAS,CAAA;KAC1D,GAAG,OAAO,CAAC;QACV,QAAQ,EAAE,gBAAgB,SAAS,IAAI,GACnC,SAAS;YACP,OAAO,EAAE,OAAO,CAAA;YAChB,YAAY;;qCAOC;oBAAE,OAAO,EAAE,MAAM,CAAC;oBAAC,SAAS,EAAE,GAAG,CAAA;iBAAE,GAAG,SAAS;cAPb;SAChD,EAAE,GACH,SAAS,OAAO,EAAE,CAAA;QACtB,OAAO,EAAE,MAAM,CAAA;KAChB,CAAC;4BAiPL"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "6.1.3";
+export declare const version = "6.2.0";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wagmi/connectors",
   "description": "Collection of connectors for Wagmi",
-  "version": "6.1.3",
+  "version": "6.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
   "dependencies": {
     "@base-org/account": "2.4.0",
     "@coinbase/wallet-sdk": "4.3.6",
-    "@gemini-wallet/core": "0.3.1",
+    "@gemini-wallet/core": "0.3.2",
     "@metamask/sdk": "0.33.1",
     "@safe-global/safe-apps-provider": "0.18.6",
     "@safe-global/safe-apps-sdk": "9.1.0",

package/src/baseAccount.ts

@@ -7,6 +7,7 @@ import {
 import type { Mutable, Omit } from '@wagmi/core/internal'
 import {
   type AddEthereumChainParameter,
+  type Address,
   getAddress,
   type Hex,
   numberToHex,
@@ -24,6 +25,43 @@ export type BaseAccountParameters = Mutable<
 
 export function baseAccount(parameters: BaseAccountParameters = {}) {
   type Provider = ProviderInterface
+  type Properties = {
+    connect<withCapabilities extends boolean = false>(parameters?: {
+      chainId?: number | undefined
+      capabilities?:
+        | {
+            signInWithEthereum?: {
+              chainId?: string | undefined
+              domain?: string | undefined
+              expirationTime?: string | undefined
+              issuedAt?: string | undefined
+              nonce: string
+              notBefore?: string | undefined
+              requestId?: string | undefined
+              resources?: string[] | undefined
+              scheme?: string | undefined
+              statement?: string | undefined
+              uri?: string | undefined
+              version?: string | undefined
+            }
+            [capability: string]: any
+          }
+        | undefined
+      withCapabilities?: withCapabilities | boolean | undefined
+    }): Promise<{
+      accounts: withCapabilities extends true
+        ? readonly {
+            address: Address
+            capabilities: WalletConnectResponseCapabilities
+          }[]
+        : readonly Address[]
+      chainId: number
+    }>
+  }
+  type WalletConnectResponseCapabilities = {
+    signInWithEthereum?: { message: string; signature: Hex } | undefined
+    [capability: string]: any
+  }
 
   let walletProvider: Provider | undefined
 
@@ -31,20 +69,47 @@ export function baseAccount(parameters: BaseAccountParameters = {}) {
   let chainChanged: Connector['onChainChanged'] | undefined
   let disconnect: Connector['onDisconnect'] | undefined
 
-  return createConnector<Provider>((config) => ({
+  return createConnector<Provider, Properties>((config) => ({
     id: 'baseAccount',
     name: 'Base Account',
     rdns: 'app.base.account',
     type: 'baseAccount',
-    async connect({ chainId, withCapabilities } = {}) {
+    async connect({ chainId, withCapabilities, ...rest } = {}) {
       try {
         const provider = await this.getProvider()
-        const accounts = (
-          (await provider.request({
-            method: 'eth_requestAccounts',
-            params: [],
-          })) as string[]
-        ).map((x) => getAddress(x))
+
+        const targetChainId = chainId ?? config.chains[0]?.id
+        if (!targetChainId) throw new ChainNotConfiguredError()
+
+        const response = (await provider.request({
+          method: 'wallet_connect',
+          params: [
+            {
+              capabilities:
+                'capabilities' in rest && rest.capabilities
+                  ? rest.capabilities
+                  : {},
+              chainIds: [
+                numberToHex(targetChainId),
+                ...config.chains
+                  .filter((x) => x.id !== targetChainId)
+                  .map((x) => numberToHex(x.id)),
+              ],
+            },
+          ],
+        })) as {
+          accounts: {
+            address: Address
+            capabilities?: WalletConnectResponseCapabilities | undefined
+          }[]
+          chainIds: Hex[]
+        }
+
+        const accounts = response.accounts.map((account) => ({
+          address: getAddress(account.address),
+          capabilities: account.capabilities ?? {},
+        }))
+        let currentChainId = Number(response.chainIds[0])
 
         if (!accountsChanged) {
           accountsChanged = this.onAccountsChanged.bind(this)
@@ -60,7 +125,6 @@ export function baseAccount(parameters: BaseAccountParameters = {}) {
         }
 
         // Switch to chain if provided
-        let currentChainId = await this.getChainId()
         if (chainId && currentChainId !== chainId) {
           const chain = await this.switchChain!({ chainId }).catch((error) => {
             if (error.code === UserRejectedRequestError.code) throw error
@@ -72,8 +136,8 @@ export function baseAccount(parameters: BaseAccountParameters = {}) {
         return {
           // TODO(v3): Make `withCapabilities: true` default behavior
           accounts: (withCapabilities
-            ? accounts.map((address) => ({ address, capabilities: {} }))
-            : accounts) as never,
+            ? accounts
+            : accounts.map((account) => account.address)) as never,
           chainId: currentChainId,
         }
       } catch (error) {

package/src/version.ts

@@ -1 +1 @@
-export const version = '6.1.3'
+export const version = '6.2.0'