Merge branch 'main' into adding-base-sepolia-support-for-wagmi-permis…

…sion-tests
reown-com · Sep 20, 2024 · b65aa8f · b65aa8f
2 parents 5800cc0 + 48ad644
commit b65aa8f
Show file tree

Hide file tree

Showing 60 changed files with 1,097 additions and 657 deletions.
diff --git a/.changeset/nasty-rats-destroy.md b/.changeset/nasty-rats-destroy.md
@@ -0,0 +1,38 @@
+---
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-core': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@examples/html-ethers': patch
+'@examples/html-ethers5': patch
+'@examples/html-wagmi': patch
+'@examples/next-ethers': patch
+'@examples/next-wagmi': patch
+'@examples/react-ethers': patch
+'@examples/react-ethers5': patch
+'@examples/react-solana': patch
+'@examples/react-wagmi': patch
+'@examples/vue-ethers5': patch
+'@examples/vue-solana': patch
+'@examples/vue-wagmi': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-solana': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+---
+
+Fixes issue where wagmi would not reconnect on an active session
diff --git a/.changeset/sharp-wombats-fix.md b/.changeset/sharp-wombats-fix.md
@@ -0,0 +1,38 @@
+---
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-core': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@examples/html-ethers': patch
+'@examples/html-ethers5': patch
+'@examples/html-wagmi': patch
+'@examples/next-ethers': patch
+'@examples/next-wagmi': patch
+'@examples/react-ethers': patch
+'@examples/react-ethers5': patch
+'@examples/react-solana': patch
+'@examples/react-wagmi': patch
+'@examples/vue-ethers5': patch
+'@examples/vue-solana': patch
+'@examples/vue-wagmi': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-solana': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+---
+
+Refactors solana network and account syncing logic to clean up the code and fix missing project id for solana connection
diff --git a/.changeset/small-parents-judge.md b/.changeset/small-parents-judge.md
@@ -0,0 +1,38 @@
+---
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-core': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@examples/html-ethers': patch
+'@examples/html-ethers5': patch
+'@examples/html-wagmi': patch
+'@examples/next-ethers': patch
+'@examples/next-wagmi': patch
+'@examples/react-ethers': patch
+'@examples/react-ethers5': patch
+'@examples/react-solana': patch
+'@examples/react-wagmi': patch
+'@examples/vue-ethers5': patch
+'@examples/vue-solana': patch
+'@examples/vue-wagmi': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-solana': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+---
+
+Add Solana CoinbaseWalletProvider to allow connecting with coinbase extension
diff --git a/.changeset/two-cats-wave.md b/.changeset/two-cats-wave.md
@@ -0,0 +1,38 @@
+---
+'@reown/appkit-adapter-wagmi': patch
+'@apps/laboratory': patch
+'@reown/appkit-core': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@examples/html-ethers': patch
+'@examples/html-ethers5': patch
+'@examples/html-wagmi': patch
+'@examples/next-ethers': patch
+'@examples/next-wagmi': patch
+'@examples/react-ethers': patch
+'@examples/react-ethers5': patch
+'@examples/react-solana': patch
+'@examples/react-wagmi': patch
+'@examples/vue-ethers5': patch
+'@examples/vue-solana': patch
+'@examples/vue-wagmi': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-solana': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+'@reown/appkit-wallet': patch
+---
+
+Fixes wrong wagmi authConnector name causing issues when merging multiple authConnectors
diff --git a/.changeset/wise-bobcats-hang.md b/.changeset/wise-bobcats-hang.md
@@ -0,0 +1,38 @@
+---
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-utils': patch
+'@reown/appkit': patch
+'@reown/appkit-common': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-core': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@examples/html-ethers': patch
+'@examples/html-ethers5': patch
+'@examples/html-wagmi': patch
+'@examples/next-ethers': patch
+'@examples/next-wagmi': patch
+'@examples/react-ethers': patch
+'@examples/react-ethers5': patch
+'@examples/react-solana': patch
+'@examples/react-wagmi': patch
+'@examples/vue-ethers5': patch
+'@examples/vue-solana': patch
+'@examples/vue-wagmi': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-solana': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+---
+
+Updates the localstorage keys
diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
@@ -78,7 +78,6 @@
     "@tanstack/react-query": "5.24.8",
     "@wagmi/connectors": "5.1.9",
     "@wagmi/core": "2.13.4",
-    "@walletconnect/ethereum-provider": "2.16.1",
     "@walletconnect/universal-provider": "2.16.1",
     "@walletconnect/utils": "2.16.1",
     "@reown/appkit": "workspace:*",

diff --git a/apps/laboratory/src/components/Ethers/Ethers5GetCallsStatusTest.tsx b/apps/laboratory/src/components/Ethers/Ethers5GetCallsStatusTest.tsx
@@ -6,7 +6,7 @@ import {
   useAppKitProvider,
   type Provider
 } from '@reown/appkit/react'
-import { EthereumProvider } from '@walletconnect/ethereum-provider'
+import { UniversalProvider } from '@walletconnect/universal-provider'
 import { useChakraToast } from '../Toast'
 import { ethers } from 'ethers5'
 import { W3mFrameProvider } from '@reown/appkit-wallet'
@@ -59,9 +59,9 @@ export function Ethers5GetCallsStatusTest() {
     if (walletProvider instanceof W3mFrameProvider) {
       return true
     }
-    if (walletProvider instanceof EthereumProvider) {
+    if (walletProvider instanceof UniversalProvider) {
       return Boolean(
-        walletProvider?.signer?.session?.namespaces?.['eip155']?.methods?.includes(
+        walletProvider?.session?.namespaces?.['eip155']?.methods?.includes(
           EIP_5792_RPC_METHODS.WALLET_GET_CALLS_STATUS
         )
       )

diff --git a/apps/laboratory/src/components/Ethers/Ethers5ModalInfo.tsx b/apps/laboratory/src/components/Ethers/Ethers5ModalInfo.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { useAppKitAccount, useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
-import EthereumProvider from '@walletconnect/ethereum-provider'
+import UniversalProvider from '@walletconnect/universal-provider'
 
 import { AppKitInfo } from '../AppKitInfo'
 
@@ -10,11 +10,11 @@ export function Ethers5ModalInfo() {
 
   const { chainId } = useAppKitNetwork()
   const { isConnected, address } = useAppKitAccount()
-  const { walletProvider, walletProviderType } = useAppKitProvider<EthereumProvider>('eip155')
+  const { walletProvider, walletProviderType } = useAppKitProvider<UniversalProvider>('eip155')
 
   async function getClientId() {
     if (walletProviderType === 'walletConnect') {
-      return await walletProvider?.signer?.client?.core?.crypto?.getClientId()
+      return await walletProvider?.client?.core?.crypto?.getClientId()
     }
 
     return undefined

diff --git a/apps/laboratory/src/components/Ethers/Ethers5SendCallsTest.tsx b/apps/laboratory/src/components/Ethers/Ethers5SendCallsTest.tsx
@@ -1,7 +1,7 @@
 import { Button, Stack, Text, Spacer, Heading } from '@chakra-ui/react'
 import { useState, useEffect } from 'react'
 import { useAppKitAccount, useAppKitProvider, useAppKitNetwork } from '@reown/appkit/react'
-import { EthereumProvider } from '@walletconnect/ethereum-provider'
+import { UniversalProvider } from '@walletconnect/universal-provider'
 import { useChakraToast } from '../Toast'
 import type { Address } from 'viem'
 import type { Provider as RawProvider } from '@reown/appkit'
@@ -14,7 +14,7 @@ import {
 } from '../../utils/EIP5792Utils'
 import { W3mFrameProvider } from '@reown/appkit-wallet'
 
-type Provider = W3mFrameProvider | Awaited<ReturnType<(typeof EthereumProvider)['init']>>
+type Provider = W3mFrameProvider | Awaited<ReturnType<(typeof UniversalProvider)['init']>>
 
 export function Ethers5SendCallsTest() {
   const [loading, setLoading] = useState(false)
@@ -102,9 +102,9 @@ export function Ethers5SendCallsTest() {
     if (walletProvider instanceof W3mFrameProvider) {
       return true
     }
-    if (walletProvider instanceof EthereumProvider) {
+    if (walletProvider instanceof UniversalProvider) {
       return Boolean(
-        walletProvider?.signer?.session?.namespaces?.['eip155']?.methods?.includes(
+        walletProvider?.session?.namespaces?.['eip155']?.methods?.includes(
           EIP_5792_RPC_METHODS.WALLET_SEND_CALLS
         )
       )

diff --git a/apps/laboratory/src/components/Ethers/Ethers5SendCallsWithPaymasterServiceTest.tsx b/apps/laboratory/src/components/Ethers/Ethers5SendCallsWithPaymasterServiceTest.tsx
@@ -6,7 +6,7 @@ import {
   useAppKitProvider,
   type Provider
 } from '@reown/appkit/react'
-import { EthereumProvider } from '@walletconnect/ethereum-provider'
+import { UniversalProvider } from '@walletconnect/universal-provider'
 import { useChakraToast } from '../Toast'
 import { parseGwei } from 'viem'
 import { vitalikEthAddress } from '../../utils/DataUtil'
@@ -34,7 +34,7 @@ export function Ethers5SendCallsWithPaymasterServiceTest() {
   useEffect(() => {
     if (
       address &&
-      (walletProvider instanceof EthereumProvider || walletProvider instanceof W3mFrameProvider)
+      (walletProvider instanceof UniversalProvider || walletProvider instanceof W3mFrameProvider)
     ) {
       getCapabilitySupportedChainInfo(
         WALLET_CAPABILITIES.PAYMASTER_SERVICE,
@@ -111,9 +111,9 @@ export function Ethers5SendCallsWithPaymasterServiceTest() {
 
   function isSendCallsSupported(): boolean {
     // We are currently checking capabilities above. We should use those capabilities instead of this check.
-    if (walletProvider instanceof EthereumProvider) {
+    if (walletProvider instanceof UniversalProvider) {
       return Boolean(
-        walletProvider?.signer?.session?.namespaces?.['eip155']?.methods?.includes(
+        walletProvider?.session?.namespaces['eip155']?.methods?.includes(
           EIP_5792_RPC_METHODS.WALLET_SEND_CALLS
         )
       )

diff --git a/apps/laboratory/src/components/Ethers/EthersGetCallsStatusTest.tsx b/apps/laboratory/src/components/Ethers/EthersGetCallsStatusTest.tsx
@@ -6,7 +6,7 @@ import {
   useAppKitProvider,
   type Provider
 } from '@reown/appkit/react'
-import { EthereumProvider } from '@walletconnect/ethereum-provider'
+import { UniversalProvider } from '@walletconnect/universal-provider'
 import { useChakraToast } from '../Toast'
 import { BrowserProvider } from 'ethers'
 import { W3mFrameProvider } from '@reown/appkit-wallet'
@@ -58,9 +58,9 @@ export function EthersGetCallsStatusTest() {
     if (walletProvider instanceof W3mFrameProvider) {
       return true
     }
-    if (walletProvider instanceof EthereumProvider) {
+    if (walletProvider instanceof UniversalProvider) {
       return Boolean(
-        walletProvider?.signer?.session?.namespaces?.['eip155']?.methods?.includes(
+        walletProvider?.session?.namespaces?.['eip155']?.methods?.includes(
           EIP_5792_RPC_METHODS.WALLET_GET_CALLS_STATUS
         )
       )

diff --git a/apps/laboratory/src/components/Ethers/EthersModalInfo.tsx b/apps/laboratory/src/components/Ethers/EthersModalInfo.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { useAppKitAccount, useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
-import EthereumProvider from '@walletconnect/ethereum-provider'
+import UniversalProvider from '@walletconnect/universal-provider'
 
 import { AppKitInfo } from '../AppKitInfo'
 
@@ -9,11 +9,11 @@ export function EthersModalInfo() {
   const [clientId, setClientId] = React.useState<string | undefined>(undefined)
   const { isConnected, address } = useAppKitAccount()
   const { chainId } = useAppKitNetwork()
-  const { walletProvider, walletProviderType } = useAppKitProvider<EthereumProvider>('eip155')
+  const { walletProvider, walletProviderType } = useAppKitProvider<UniversalProvider>('eip155')
 
   async function getClientId() {
     if (walletProviderType === 'walletConnect') {
-      return await walletProvider?.signer?.client?.core?.crypto?.getClientId()
+      return await walletProvider?.client?.core?.crypto?.getClientId()
     }
 
     return undefined

diff --git a/apps/laboratory/src/components/Ethers/EthersSendCallsTest.tsx b/apps/laboratory/src/components/Ethers/EthersSendCallsTest.tsx
@@ -1,7 +1,7 @@
 import { Button, Stack, Text, Spacer, Heading } from '@chakra-ui/react'
 import { useState, useEffect } from 'react'
 import { useAppKitAccount, useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
-import { EthereumProvider } from '@walletconnect/ethereum-provider'
+import { UniversalProvider } from '@walletconnect/universal-provider'
 import { useChakraToast } from '../Toast'
 import type { Address } from 'viem'
 import { vitalikEthAddress } from '../../utils/DataUtil'
@@ -12,8 +12,7 @@ import {
   getCapabilitySupportedChainInfo
 } from '../../utils/EIP5792Utils'
 import { W3mFrameProvider } from '@reown/appkit-wallet'
-
-type Provider = W3mFrameProvider | Awaited<ReturnType<(typeof EthereumProvider)['init']>>
+type Provider = W3mFrameProvider | Awaited<ReturnType<(typeof UniversalProvider)['init']>>
 
 export function EthersSendCallsTest() {
   const [loading, setLoading] = useState(false)
@@ -33,7 +32,7 @@ export function EthersSendCallsTest() {
     if (address && walletProvider) {
       getCapabilitySupportedChainInfo(
         WALLET_CAPABILITIES.ATOMIC_BATCH,
-        walletProvider as Provider,
+        walletProvider as unknown as Provider,
         address
       ).then(capabilities => setAtomicBatchSupportedChains(capabilities))
     } else {
@@ -100,9 +99,9 @@ export function EthersSendCallsTest() {
     if (walletProvider instanceof W3mFrameProvider) {
       return true
     }
-    if (walletProvider instanceof EthereumProvider) {
+    if (walletProvider instanceof UniversalProvider) {
       return Boolean(
-        walletProvider?.signer?.session?.namespaces?.['eip155']?.methods?.includes(
+        walletProvider?.session?.namespaces?.['eip155']?.methods?.includes(
           EIP_5792_RPC_METHODS.WALLET_SEND_CALLS
         )
       )