Merge branch 'develop' of github.com:blocknative/web3-onboard into develop

Author: Adamj1232

docs/package.json

@@ -72,7 +72,7 @@
     "@web3-onboard/keystone": "^2.3.7",
     "@web3-onboard/ledger": "^2.6.0",
     "@web3-onboard/magic": "^2.1.7",
-    "@web3-onboard/metamask": "^2.0.4",
+    "@web3-onboard/metamask": "^2.0.5-alpha.1",
     "@web3-onboard/mew-wallet": "^2.0.4",
     "@web3-onboard/phantom": "^2.0.3",
     "@web3-onboard/portis": "^2.1.7",

packages/demo/package.json

@@ -47,7 +47,7 @@
     "@web3-onboard/keystone": "^2.3.8",
     "@web3-onboard/ledger": "^2.6.0",
     "@web3-onboard/magic": "^2.1.6",
-    "@web3-onboard/metamask": "^2.0.4",
+    "@web3-onboard/metamask": "^2.0.5-alpha.1",
     "@web3-onboard/mew-wallet": "^2.0.3",
     "@web3-onboard/phantom": "^2.0.3",
     "@web3-onboard/portis": "^2.1.6",

packages/metamask/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/metamask",
-  "version": "2.0.4",
+  "version": "2.0.5-alpha-1",
   "description": "MetaMask SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -60,7 +60,7 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@metamask/sdk": "^0.18.3",
+    "@metamask/sdk": "^0.18.4",
     "@web3-onboard/common": "^2.3.3"
   },
   "engines": {

packages/metamask/src/index.ts

@@ -27,7 +27,6 @@ const loadImports = async () => {
 
 let importPromise: Promise<ImportSDK> | null = null
 let sdk: MetaMaskSDK | null = null
-let createInstance: typeof createEIP1193Provider
 
 function metamask({
   options
@@ -39,14 +38,6 @@ function metamask({
       throw error
     })
 
-    const getProvider = (_sdk: MetaMaskSDK) => {
-      const provider = createInstance(_sdk.getProvider(), {})
-      provider.disconnect = () => {
-        sdk?.terminate()
-      }
-      return provider
-    }
-
     return {
       label: 'MetaMask',
       getIcon: async () => (await import('./icon.js')).default,
@@ -66,9 +57,6 @@ function metamask({
         const appLogoUrl = `data:image/svg+xml;base64,${base64}`
         const imports = await importPromise
 
-        // Patch issue with MetaMask SDK, remove after SDK is fixed
-        localStorage.removeItem('providerType')
-
         if (
           !imports?.MetaMaskSDKConstructor ||
           !imports?.createEIP1193Provider
@@ -78,25 +66,24 @@ function metamask({
 
         const { createEIP1193Provider, MetaMaskSDKConstructor } = imports
 
-        createInstance = createEIP1193Provider
         sdk = new MetaMaskSDKConstructor({
           ...options,
           dappMetadata: {
             name: options.dappMetadata?.name || name || '',
+            url: options.dappMetadata?.url || window.location.origin,
             base64Icon: appLogoUrl
           },
           _source: 'web3-onboard'
         })
-        await sdk.init()
 
-        const provider = getProvider(sdk)
+        await sdk.init();
+        const provider = sdk.getProvider();
 
-        const _request = provider.request
-        provider.request = async ({ method, params }) => {
-          if (sdk?.isExtensionActive()) {
-            return (window.extension as any).request({ method, params })
+        const _disconnect = sdk.disconnect
+        if(provider) {
+          (provider as any).disconnect = () => {
+            sdk?.terminate();
           }
-          return _request({ method, params }) as Promise<any>
         }
 
         return {

yarn.lock

@@ -2987,10 +2987,10 @@
   resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-3.0.0.tgz#8c2b9073fe0722d48693143b0dc8448840daa3bd"
   integrity sha512-j6Z47VOmVyGMlnKXZmL0fyvWfEYtKWCA9yGZkU3FCsGZUT5lHGmvaV9JA5F2Y+010y7+ROtR3WMXIkvl/nVzqQ==
 
-"@metamask/sdk-communication-layer@0.18.2":
-  version "0.18.2"
-  resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.18.2.tgz#f7cf48a6938890397f39386bcfc82c8b967b7652"
-  integrity sha512-5Hf2K+v3PWjmk+yxl9C2UXc7bMp77tBu3nUvZrpETB+bJ5y5rsKSe8Tkz7EFTobP+Xp6zUmqkSGmw24kO+Qqag==
+"@metamask/sdk-communication-layer@0.18.4":
+  version "0.18.4"
+  resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.18.4.tgz#8ddef419101de86149a8cdc442dcbb80686f002c"
+  integrity sha512-aBJu3l56h8nnToYF+KXVGXQ82m4MEl8x3q89GBjMyX8/+f7SnmgNkkB2ApqLI/1XMnJRBQw/s1/zUSI7TUyutA==
   dependencies:
     bufferutil "^4.0.8"
     date-fns "^2.29.3"
@@ -3005,14 +3005,14 @@
   dependencies:
     qr-code-styling "^1.6.0-rc.1"
 
-"@metamask/sdk@^0.18.3":
-  version "0.18.3"
-  resolved "https://registry.yarnpkg.com/@metamask/sdk/-/sdk-0.18.3.tgz#0e29fc88633fc8d74495d7f149eb7a34a2f4b4ef"
-  integrity sha512-rdPJ0RjxMnikpI1uqJJDYkBE8smyM49G9ErzauBzDjdlpnkjt6TdF0Qobro8yHv/glLrECy+38BjlT3eSQTOiQ==
+"@metamask/sdk@^0.18.4":
+  version "0.18.4"
+  resolved "https://registry.yarnpkg.com/@metamask/sdk/-/sdk-0.18.4.tgz#17164ce3cef2d1b9ab45e4bdb4087856a10aae6c"
+  integrity sha512-AW9R3lu0Z+bJKgEAnSEqo4OFjG+Q9PHQI5p2ZRQJWul08uvdlSFJsM424ZxKJtWBcN49YcZI+NuHZfKfAXrEvg==
   dependencies:
     "@metamask/onboarding" "^1.0.1"
     "@metamask/providers" "^15.0.0"
-    "@metamask/sdk-communication-layer" "0.18.2"
+    "@metamask/sdk-communication-layer" "0.18.4"
     "@metamask/sdk-install-modal-web" "0.17.0"
     "@types/dom-screen-wake-lock" "^1.0.0"
     bowser "^2.9.0"