@wagmi/connectors 4.0.0-alpha.0 → 4.0.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/README.md +13 -0
  2. package/dist/esm/coinbaseWallet.js +11 -14
  3. package/dist/esm/coinbaseWallet.js.map +1 -1
  4. package/dist/esm/exports/index.js +8 -0
  5. package/dist/esm/exports/index.js.map +1 -0
  6. package/dist/esm/exports/index.test-d.js.map +1 -0
  7. package/dist/esm/ledger.js +2 -2
  8. package/dist/esm/ledger.js.map +1 -1
  9. package/dist/esm/metaMask.js +246 -0
  10. package/dist/esm/metaMask.js.map +1 -0
  11. package/dist/esm/safe.js +17 -16
  12. package/dist/esm/safe.js.map +1 -1
  13. package/dist/esm/tsconfig.build.tsbuildinfo +1 -1
  14. package/dist/esm/version.js +1 -1
  15. package/dist/esm/version.js.map +1 -1
  16. package/dist/esm/walletConnect.js +7 -7
  17. package/dist/esm/walletConnect.js.map +1 -1
  18. package/dist/types/coinbaseWallet.d.ts.map +1 -1
  19. package/dist/types/exports/index.d.ts +8 -0
  20. package/dist/types/exports/index.d.ts.map +1 -0
  21. package/dist/types/exports/index.test-d.d.ts.map +1 -0
  22. package/dist/types/metaMask.d.ts +10 -0
  23. package/dist/types/metaMask.d.ts.map +1 -0
  24. package/dist/types/safe.d.ts +2 -2
  25. package/dist/types/safe.d.ts.map +1 -1
  26. package/dist/types/version.d.ts +1 -1
  27. package/dist/types/version.d.ts.map +1 -1
  28. package/package.json +19 -24
  29. package/src/coinbaseWallet.ts +12 -14
  30. package/src/exports/index.ts +24 -0
  31. package/src/ledger.ts +2 -2
  32. package/src/metaMask.ts +316 -0
  33. package/src/safe.ts +24 -20
  34. package/src/version.ts +1 -1
  35. package/src/walletConnect.ts +7 -7
  36. package/dist/esm/index.js +0 -7
  37. package/dist/esm/index.js.map +0 -1
  38. package/dist/esm/index.test-d.js.map +0 -1
  39. package/dist/esm/injected.js +0 -372
  40. package/dist/esm/injected.js.map +0 -1
  41. package/dist/types/index.d.ts +0 -7
  42. package/dist/types/index.d.ts.map +0 -1
  43. package/dist/types/index.test-d.d.ts.map +0 -1
  44. package/dist/types/injected.d.ts +0 -382
  45. package/dist/types/injected.d.ts.map +0 -1
  46. package/src/index.ts +0 -17
  47. package/src/injected.ts +0 -535
  48. /package/dist/esm/{index.test-d.js → exports/index.test-d.js} +0 -0
  49. /package/dist/types/{index.test-d.d.ts → exports/index.test-d.d.ts} +0 -0
@@ -0,0 +1,316 @@
1
+ import {
2
+ EventType,
3
+ MetaMaskSDK,
4
+ type MetaMaskSDKOptions,
5
+ SDKProvider,
6
+ } from '@metamask/sdk'
7
+ import {
8
+ ChainNotConfiguredError,
9
+ createConnector,
10
+ normalizeChainId,
11
+ } from '@wagmi/core'
12
+ import type { Evaluate, ExactPartial, Omit } from '@wagmi/core/internal'
13
+ import {
14
+ type Address,
15
+ type ProviderConnectInfo,
16
+ type ProviderRpcError,
17
+ ResourceUnavailableRpcError,
18
+ RpcError,
19
+ SwitchChainError,
20
+ UserRejectedRequestError,
21
+ type WalletPermission,
22
+ getAddress,
23
+ numberToHex,
24
+ } from 'viem'
25
+
26
+ export type MetaMaskParameters = Evaluate<
27
+ ExactPartial<
28
+ Omit<
29
+ MetaMaskSDKOptions,
30
+ | 'checkInstallationImmediately'
31
+ | 'checkInstallationOnAllCalls'
32
+ | 'defaultReadOnlyChainId'
33
+ | 'readonlyRPCMap'
34
+ >
35
+ >
36
+ >
37
+
38
+ export function metaMask(parameters: MetaMaskParameters = {}) {
39
+ type Provider = SDKProvider
40
+ type Properties = {
41
+ onConnect(connectInfo: ProviderConnectInfo): void
42
+ }
43
+ type StorageItem = { 'metaMaskSDK.disconnected': true }
44
+ type Listener = Parameters<Provider['on']>[1]
45
+
46
+ let sdk: MetaMaskSDK
47
+ let walletProvider: Provider | undefined
48
+
49
+ return createConnector<Provider, Properties, StorageItem>((config) => ({
50
+ id: 'metaMaskSDK',
51
+ name: 'MetaMask',
52
+ async setup() {
53
+ const provider = await this.getProvider()
54
+ if (provider)
55
+ provider.on('connect', this.onConnect.bind(this) as Listener)
56
+ },
57
+ async connect({ chainId, isReconnecting } = {}) {
58
+ const provider = await this.getProvider()
59
+
60
+ let accounts: readonly Address[] | null = null
61
+ if (!isReconnecting) {
62
+ accounts = await this.getAccounts().catch(() => null)
63
+ const isAuthorized = !!accounts?.length
64
+ if (isAuthorized)
65
+ // Attempt to show another prompt for selecting account if already connected
66
+ try {
67
+ const permissions = (await provider.request({
68
+ method: 'wallet_requestPermissions',
69
+ params: [{ eth_accounts: {} }],
70
+ })) as WalletPermission[]
71
+ accounts = permissions[0]?.caveats?.[0]?.value?.map(getAddress)
72
+ } catch (err) {
73
+ const error = err as RpcError
74
+ // Not all injected providers support `wallet_requestPermissions` (e.g. MetaMask iOS).
75
+ // Only bubble up error if user rejects request
76
+ if (error.code === UserRejectedRequestError.code)
77
+ throw new UserRejectedRequestError(error)
78
+ // Or prompt is already open
79
+ if (error.code === ResourceUnavailableRpcError.code) throw error
80
+ }
81
+ }
82
+
83
+ try {
84
+ if (!accounts?.length) {
85
+ const requestedAccounts = (await sdk.connect()) as string[]
86
+ accounts = requestedAccounts.map(getAddress)
87
+ }
88
+
89
+ provider.removeListener(
90
+ 'connect',
91
+ this.onConnect.bind(this) as Listener,
92
+ )
93
+ provider.on(
94
+ 'accountsChanged',
95
+ this.onAccountsChanged.bind(this) as Listener,
96
+ )
97
+ provider.on('chainChanged', this.onChainChanged as Listener)
98
+ provider.on('disconnect', this.onDisconnect.bind(this) as Listener)
99
+
100
+ // Backward compatibility with older wallet (<7.3) version that return accounts before authorization
101
+ if (!sdk.isExtensionActive() && !sdk._getConnection()?.isAuthorized()) {
102
+ function waitForAuthorized() {
103
+ return new Promise((resolve) => {
104
+ const connection = sdk._getConnection()
105
+ const connector = connection?.getConnector()
106
+ connector?.once(EventType.AUTHORIZED, () => resolve(true))
107
+ })
108
+ }
109
+ await waitForAuthorized()
110
+ }
111
+
112
+ // Switch to chain if provided
113
+ let currentChainId = await this.getChainId()
114
+ if (chainId && currentChainId !== chainId) {
115
+ const chain = await this.switchChain!({ chainId }).catch(() => ({
116
+ id: currentChainId,
117
+ }))
118
+ currentChainId = chain?.id ?? currentChainId
119
+ }
120
+
121
+ await config.storage?.removeItem('metaMaskSDK.disconnected')
122
+
123
+ return { accounts, chainId: currentChainId }
124
+ } catch (err) {
125
+ const error = err as RpcError
126
+ if (error.code === UserRejectedRequestError.code)
127
+ throw new UserRejectedRequestError(error)
128
+ if (error.code === ResourceUnavailableRpcError.code)
129
+ throw new ResourceUnavailableRpcError(error)
130
+ throw error
131
+ }
132
+ },
133
+ async disconnect() {
134
+ const provider = await this.getProvider()
135
+
136
+ provider.removeListener(
137
+ 'accountsChanged',
138
+ this.onAccountsChanged.bind(this),
139
+ )
140
+ provider.removeListener('chainChanged', this.onChainChanged)
141
+ provider.removeListener('disconnect', this.onDisconnect.bind(this))
142
+ provider.on('connect', this.onConnect.bind(this) as Listener)
143
+
144
+ // Add shim signalling connector is disconnected
145
+ await config.storage?.setItem('metaMaskSDK.disconnected', true)
146
+ },
147
+ async getAccounts() {
148
+ const provider = await this.getProvider()
149
+ const accounts = (await provider.request({
150
+ method: 'eth_accounts',
151
+ })) as string[]
152
+ return accounts.map(getAddress)
153
+ },
154
+ async getChainId() {
155
+ const provider = await this.getProvider()
156
+ const chainId =
157
+ provider.chainId ?? (await provider?.request({ method: 'eth_chainId' }))
158
+ return normalizeChainId(chainId)
159
+ },
160
+ async getProvider() {
161
+ if (!walletProvider) {
162
+ if (!sdk || !sdk?.isInitialized()) {
163
+ sdk = new MetaMaskSDK({
164
+ enableDebug: false,
165
+ dappMetadata: { name: 'wagmi' },
166
+ extensionOnly: true,
167
+ useDeeplink: true,
168
+ _source: 'wagmi',
169
+ ...parameters,
170
+ checkInstallationImmediately: false,
171
+ checkInstallationOnAllCalls: false,
172
+ })
173
+ await sdk.init()
174
+ }
175
+ walletProvider = sdk.getProvider()
176
+ }
177
+ return walletProvider
178
+ },
179
+ async isAuthorized() {
180
+ try {
181
+ const isDisconnected =
182
+ // If shim exists in storage, connector is disconnected
183
+ await config.storage?.getItem('metaMaskSDK.disconnected')
184
+ if (isDisconnected) return false
185
+
186
+ const accounts = await this.getAccounts()
187
+ return !!accounts.length
188
+ } catch {
189
+ return false
190
+ }
191
+ },
192
+ async switchChain({ chainId }) {
193
+ const provider = await this.getProvider()
194
+
195
+ const chain = config.chains.find((x) => x.id === chainId)
196
+ if (!chain) throw new SwitchChainError(new ChainNotConfiguredError())
197
+
198
+ try {
199
+ await Promise.all([
200
+ provider.request({
201
+ method: 'wallet_switchEthereumChain',
202
+ params: [{ chainId: numberToHex(chainId) }],
203
+ }),
204
+ new Promise<void>((resolve) =>
205
+ config.emitter.once('change', ({ chainId: currentChainId }) => {
206
+ if (currentChainId === chainId) resolve()
207
+ }),
208
+ ),
209
+ ])
210
+ return chain
211
+ } catch (err) {
212
+ const error = err as RpcError
213
+
214
+ // Indicates chain is not added to provider
215
+ if (
216
+ error.code === 4902 ||
217
+ // Unwrapping for MetaMask Mobile
218
+ // https://github.com/MetaMask/metamask-mobile/issues/2944#issuecomment-976988719
219
+ (error as ProviderRpcError<{ originalError?: { code: number } }>)
220
+ ?.data?.originalError?.code === 4902
221
+ ) {
222
+ try {
223
+ const { default: blockExplorer, ...blockExplorers } =
224
+ chain.blockExplorers ?? {}
225
+ let blockExplorerUrls: string[] = []
226
+ if (blockExplorer)
227
+ blockExplorerUrls = [
228
+ blockExplorer.url,
229
+ ...Object.values(blockExplorers).map((x) => x.url),
230
+ ]
231
+
232
+ await provider.request({
233
+ method: 'wallet_addEthereumChain',
234
+ params: [
235
+ {
236
+ chainId: numberToHex(chainId),
237
+ chainName: chain.name,
238
+ nativeCurrency: chain.nativeCurrency,
239
+ rpcUrls: [chain.rpcUrls.public?.http[0] ?? ''],
240
+ blockExplorerUrls,
241
+ },
242
+ ],
243
+ })
244
+
245
+ const currentChainId = await this.getChainId()
246
+ if (currentChainId !== chainId)
247
+ throw new UserRejectedRequestError(
248
+ new Error('User rejected switch after adding network.'),
249
+ )
250
+
251
+ return chain
252
+ } catch (error) {
253
+ throw new UserRejectedRequestError(error as Error)
254
+ }
255
+ }
256
+
257
+ if (error.code === UserRejectedRequestError.code)
258
+ throw new UserRejectedRequestError(error)
259
+ throw new SwitchChainError(error)
260
+ }
261
+ },
262
+ async onAccountsChanged(accounts) {
263
+ // Disconnect if there are no accounts
264
+ if (accounts.length === 0) this.onDisconnect()
265
+ // Connect if emitter is listening for connect event (e.g. is disconnected and connects through wallet interface)
266
+ else if (config.emitter.listenerCount('connect')) {
267
+ const chainId = (await this.getChainId()).toString()
268
+ this.onConnect({ chainId })
269
+ await config.storage?.removeItem('metaMaskSDK.disconnected')
270
+ }
271
+ // Regular change event
272
+ else config.emitter.emit('change', { accounts: accounts.map(getAddress) })
273
+ },
274
+ onChainChanged(chain) {
275
+ const chainId = normalizeChainId(chain)
276
+ config.emitter.emit('change', { chainId })
277
+ },
278
+ async onConnect(connectInfo) {
279
+ const accounts = await this.getAccounts()
280
+ if (accounts.length === 0) return
281
+
282
+ const chainId = normalizeChainId(connectInfo.chainId)
283
+ config.emitter.emit('connect', { accounts, chainId })
284
+
285
+ const provider = await this.getProvider()
286
+ if (provider) {
287
+ provider.removeListener('connect', this.onConnect.bind(this))
288
+ provider.on('accountsChanged', this.onAccountsChanged.bind(this) as any)
289
+ provider.on('chainChanged', this.onChainChanged as any)
290
+ provider.on('disconnect', this.onDisconnect.bind(this) as any)
291
+ }
292
+ },
293
+ async onDisconnect(error) {
294
+ const provider = await this.getProvider()
295
+
296
+ // If MetaMask emits a `code: 1013` error, wait for reconnection before disconnecting
297
+ // https://github.com/MetaMask/providers/pull/120
298
+ if (error && (error as RpcError<1013>).code === 1013) {
299
+ if (provider && !!(await this.getAccounts()).length) return
300
+ }
301
+
302
+ // No need to remove 'metaMaskSDK.disconnected' from storage because `onDisconnect` is typically
303
+ // only called when the wallet is disconnected through the wallet's interface, meaning the wallet
304
+ // actually disconnected and we don't need to simulate it.
305
+ config.emitter.emit('disconnect')
306
+
307
+ provider.removeListener(
308
+ 'accountsChanged',
309
+ this.onAccountsChanged.bind(this),
310
+ )
311
+ provider.removeListener('chainChanged', this.onChainChanged)
312
+ provider.removeListener('disconnect', this.onDisconnect.bind(this))
313
+ provider.on('connect', this.onConnect.bind(this) as any)
314
+ },
315
+ }))
316
+ }
package/src/safe.ts CHANGED
@@ -1,7 +1,10 @@
1
1
  import { SafeAppProvider } from '@safe-global/safe-apps-provider'
2
2
  import { type Opts, default as SafeAppsSDK } from '@safe-global/safe-apps-sdk'
3
- import { ProviderNotFoundError } from '@wagmi/core'
4
- import { createConnector, normalizeChainId } from '@wagmi/core'
3
+ import {
4
+ ProviderNotFoundError,
5
+ createConnector,
6
+ normalizeChainId,
7
+ } from '@wagmi/core'
5
8
  import type { Evaluate } from '@wagmi/core/internal'
6
9
  import { getAddress } from 'viem'
7
10
 
@@ -20,11 +23,11 @@ export type SafeParameters = Evaluate<
20
23
  >
21
24
 
22
25
  export function safe(parameters: SafeParameters = {}) {
23
- type Provider = SafeAppProvider
24
- type Properties = {}
25
- type StorageItem = { 'safe.shimDisconnect': true }
26
+ const { shimDisconnect = false } = parameters
26
27
 
27
- const shimDisconnectStorageKey = 'safe.shimDisconnect'
28
+ type Provider = SafeAppProvider | undefined
29
+ type Properties = {}
30
+ type StorageItem = { 'safe.disconnected': true }
28
31
 
29
32
  let provider_: Provider | undefined
30
33
  let SDK: typeof SafeAppsSDK.default
@@ -40,11 +43,6 @@ export function safe(parameters: SafeParameters = {}) {
40
43
  id: 'safe',
41
44
  name: 'Safe',
42
45
  async connect() {
43
- // Only allowed in iframe context
44
- const isIframe =
45
- typeof window !== 'undefined' && window?.parent !== window
46
- if (!isIframe) throw new ProviderNotFoundError()
47
-
48
46
  const provider = await this.getProvider()
49
47
  if (!provider) throw new ProviderNotFoundError()
50
48
 
@@ -53,19 +51,20 @@ export function safe(parameters: SafeParameters = {}) {
53
51
 
54
52
  provider.on('disconnect', this.onDisconnect.bind(this))
55
53
 
56
- // Add shim to storage signalling wallet is connected
57
- if (parameters.shimDisconnect)
58
- await config.storage?.setItem(shimDisconnectStorageKey, true)
54
+ // Remove disconnected shim if it exists
55
+ if (shimDisconnect) await config.storage?.removeItem('safe.disconnected')
59
56
 
60
57
  return { accounts, chainId }
61
58
  },
62
59
  async disconnect() {
63
60
  const provider = await this.getProvider()
61
+ if (!provider) throw new ProviderNotFoundError()
62
+
64
63
  provider.removeListener('disconnect', this.onDisconnect.bind(this))
65
64
 
66
- // Remove shim signalling wallet is disconnected
67
- if (parameters.shimDisconnect)
68
- await config.storage?.removeItem(shimDisconnectStorageKey)
65
+ // Add shim signalling connector is disconnected
66
+ if (shimDisconnect)
67
+ await config.storage?.setItem('safe.disconnected', true)
69
68
  },
70
69
  async getAccounts() {
71
70
  const provider = await this.getProvider()
@@ -75,6 +74,11 @@ export function safe(parameters: SafeParameters = {}) {
75
74
  )
76
75
  },
77
76
  async getProvider() {
77
+ // Only allowed in iframe context
78
+ const isIframe =
79
+ typeof window !== 'undefined' && window?.parent !== window
80
+ if (!isIframe) return
81
+
78
82
  if (!provider_) {
79
83
  const safe = await sdk.safe.getInfo()
80
84
  if (!safe) throw new Error('Could not load Safe information')
@@ -90,9 +94,9 @@ export function safe(parameters: SafeParameters = {}) {
90
94
  async isAuthorized() {
91
95
  try {
92
96
  const isDisconnected =
93
- parameters.shimDisconnect &&
94
- // If shim does not exist in storage, wallet is disconnected
95
- !(await config.storage?.getItem(shimDisconnectStorageKey))
97
+ shimDisconnect &&
98
+ // If shim exists in storage, connector is disconnected
99
+ (await config.storage?.getItem('safe.disconnected'))
96
100
  if (isDisconnected) return false
97
101
 
98
102
  const accounts = await this.getAccounts()
package/src/version.ts CHANGED
@@ -1 +1 @@
1
- export const version = '4.0.0-alpha.0'
1
+ export const version = '4.0.0-alpha.10'
@@ -105,7 +105,7 @@ export function walletConnect(parameters: WalletConnectParameters) {
105
105
  id: 'walletConnect',
106
106
  name: 'WalletConnect',
107
107
  async setup() {
108
- const provider = await this.getProvider()
108
+ const provider = await this.getProvider().catch(() => null)
109
109
  if (!provider) return
110
110
  provider.on('connect', this.onConnect.bind(this))
111
111
  provider.on('session_delete', this.onSessionDelete.bind(this))
@@ -173,21 +173,21 @@ export function walletConnect(parameters: WalletConnectParameters) {
173
173
  async disconnect() {
174
174
  const provider = await this.getProvider()
175
175
  try {
176
- await provider.disconnect()
176
+ await provider?.disconnect()
177
177
  } catch (error) {
178
178
  if (!/No matching key/i.test((error as Error).message)) throw error
179
179
  } finally {
180
- provider.removeListener(
180
+ provider?.removeListener(
181
181
  'accountsChanged',
182
182
  this.onAccountsChanged.bind(this),
183
183
  )
184
- provider.removeListener('chainChanged', this.onChainChanged)
185
- provider.removeListener('disconnect', this.onDisconnect.bind(this))
186
- provider.removeListener(
184
+ provider?.removeListener('chainChanged', this.onChainChanged)
185
+ provider?.removeListener('disconnect', this.onDisconnect.bind(this))
186
+ provider?.removeListener(
187
187
  'session_delete',
188
188
  this.onSessionDelete.bind(this),
189
189
  )
190
- provider.on('connect', this.onConnect.bind(this))
190
+ provider?.on('connect', this.onConnect.bind(this))
191
191
 
192
192
  this.setRequestedChainsIds([])
193
193
  }
package/dist/esm/index.js DELETED
@@ -1,7 +0,0 @@
1
- export { coinbaseWallet, } from './coinbaseWallet.js';
2
- export { injected } from './injected.js';
3
- export { ledger } from './ledger.js';
4
- export { safe } from './safe.js';
5
- export { walletConnect, } from './walletConnect.js';
6
- export { version } from './version.js';
7
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,GACf,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAA2B,QAAQ,EAAE,MAAM,eAAe,CAAA;AAEjE,OAAO,EAAyB,MAAM,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,EAAuB,IAAI,EAAE,MAAM,WAAW,CAAA;AAErD,OAAO,EAEL,aAAa,GACd,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.test-d.js","sourceRoot":"","sources":["../../src/index.test-d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAErC,uFAAuF;AACvF,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,EAAU,CAAA"}