refactor: required chain params and remove scaffolds, move solana uti…

…ls to scaffold-utils (#2730)

apps/laboratory/tests/shared/pages/ModalPage.ts

@@ -66,10 +66,7 @@ export class ModalPage {
     return value!
   }
 
-  async getConnectUri(timingRecords?: TimingRecords, goToPage = true): Promise<string> {
-    if (goToPage) {
-      await this.page.goto(this.url)
-    }
+  async getConnectUri(timingRecords?: TimingRecords): Promise<string> {
     await this.connectButton.click()
     const connect = this.page.getByTestId('wallet-selector-walletconnect')
     await connect.waitFor({

apps/laboratory/tests/wallet.spec.ts

@@ -40,11 +40,7 @@ sampleWalletTest.afterAll(async () => {
 
 // -- Tests --------------------------------------------------------------------
 sampleWalletTest('it should switch networks and sign', async ({ library }) => {
-  if (library === 'solana') {
-    return
-  }
-
-  const chains = ['Polygon', 'Ethereum']
+  const chains = library === 'solana' ? ['Solana Testnet', 'Solana'] : ['Polygon', 'Ethereum']
 
   async function processChain(index: number) {
     if (index >= chains.length) {

packages/base/adapters/evm/ethers/client.ts

@@ -10,7 +10,7 @@ import type {
   SendTransactionArgs,
   Token,
   WriteContractArgs
-} from '@web3modal/scaffold'
+} from '@web3modal/core'
 import { ConstantsUtil, PresetsUtil, HelpersUtil } from '@web3modal/scaffold-utils'
 import { ConstantsUtil as CommonConstantsUtil } from '@web3modal/common'
 import EthereumProvider, { OPTIONAL_METHODS } from '@walletconnect/ethereum-provider'
@@ -1254,7 +1254,7 @@ export class EVMEthersClient {
       const registeredWcNames = await this.appKit?.getWalletConnectName(address)
       if (registeredWcNames?.[0]) {
         const wcName = registeredWcNames[0]
-        this.appKit?.setProfileName(wcName.name)
+        this.appKit?.setProfileName(wcName.name, this.chain)
       } else {
         this.appKit?.setProfileName(null, this.chain)
       }

packages/base/adapters/evm/ethers5/client.ts

@@ -9,7 +9,7 @@ import type {
   PublicStateControllerState,
   SendTransactionArgs,
   Token
-} from '@web3modal/scaffold'
+} from '@web3modal/core'
 import { ConstantsUtil, PresetsUtil, HelpersUtil } from '@web3modal/scaffold-utils'
 import { ConstantsUtil as CommonConstantsUtil } from '@web3modal/common'
 import EthereumProvider, { OPTIONAL_METHODS } from '@walletconnect/ethereum-provider'
@@ -584,7 +584,7 @@ export class EVMEthers5Client {
           imageUrl: chainImages?.[chain.chainId]
         }) as CaipNetwork
     )
-    this.appKit?.setRequestedCaipNetworks(requestedCaipNetworks ?? [])
+    this.appKit?.setRequestedCaipNetworks(requestedCaipNetworks ?? [], this.chain)
   }
 
   private async checkActiveWalletConnectProvider() {
@@ -861,14 +861,14 @@ export class EVMEthers5Client {
     const chainId = EthersStoreUtil.state.chainId
     const isConnected = EthersStoreUtil.state.isConnected
 
-    this.appKit?.resetAccount()
+    this.appKit?.resetAccount(this.chain)
 
     if (isConnected && address && chainId) {
       const caipAddress: CaipAddress = `${ConstantsUtil.EIP155}:${chainId}:${address}`
 
-      this.appKit?.setIsConnected(isConnected)
+      this.appKit?.setIsConnected(isConnected, this.chain)
 
-      this.appKit?.setCaipAddress(caipAddress)
+      this.appKit?.setCaipAddress(caipAddress, this.chain)
       this.syncConnectedWalletInfo()
 
       await Promise.all([
@@ -904,12 +904,12 @@ export class EVMEthers5Client {
         })
         if (isConnected && address) {
           const caipAddress: CaipAddress = `${ConstantsUtil.EIP155}:${chainId}:${address}`
-          this.appKit?.setCaipAddress(caipAddress)
+          this.appKit?.setCaipAddress(caipAddress, this.chain)
           if (chain.explorerUrl) {
             const url = `${chain.explorerUrl}/address/${address}`
-            this.appKit?.setAddressExplorerUrl(url)
+            this.appKit?.setAddressExplorerUrl(url, this.chain)
           } else {
-            this.appKit?.setAddressExplorerUrl(undefined)
+            this.appKit?.setAddressExplorerUrl(undefined, this.chain)
           }
           if (this.hasSyncedConnectedAccount) {
             await this.syncBalance(address)
@@ -929,7 +929,7 @@ export class EVMEthers5Client {
       const registeredWcNames = await this.appKit?.getWalletConnectName(address)
       if (registeredWcNames?.[0]) {
         const wcName = registeredWcNames[0]
-        this.appKit?.setProfileName(wcName.name)
+        this.appKit?.setProfileName(wcName.name, this.chain)
       } else {
         this.appKit?.setProfileName(null, this.chain)
       }
@@ -948,8 +948,8 @@ export class EVMEthers5Client {
       const name = identity?.name
       const avatar = identity?.avatar
 
-      this.appKit?.setProfileName(name)
-      this.appKit?.setProfileImage(avatar)
+      this.appKit?.setProfileName(name, this.chain)
+      this.appKit?.setProfileImage(avatar, this.chain)
 
       if (!name) {
         await this.syncWalletConnectName(address)
@@ -961,14 +961,14 @@ export class EVMEthers5Client {
         const avatar = await ensProvider.getAvatar(address)
 
         if (name) {
-          this.appKit?.setProfileName(name)
+          this.appKit?.setProfileName(name, this.chain)
         }
         if (avatar) {
-          this.appKit?.setProfileImage(avatar)
+          this.appKit?.setProfileImage(avatar, this.chain)
         }
       } else {
-        this.appKit?.setProfileName(null)
-        this.appKit?.setProfileImage(null)
+        this.appKit?.setProfileName(null, this.chain)
+        this.appKit?.setProfileImage(null, this.chain)
       }
     }
   }
@@ -986,7 +986,7 @@ export class EVMEthers5Client {
         if (JsonRpcProvider) {
           const balance = await JsonRpcProvider.getBalance(address)
           const formattedBalance = utils.formatEther(balance)
-          this.appKit?.setBalance(formattedBalance, chain.currency)
+          this.appKit?.setBalance(formattedBalance, chain.currency, this.chain)
         }
       }
     }

packages/base/adapters/evm/wagmi/client.ts

@@ -34,7 +34,7 @@ import type {
   SendTransactionArgs,
   SocialProvider,
   WriteContractArgs
-} from '@web3modal/scaffold'
+} from '@web3modal/core'
 import { formatUnits, parseUnits } from 'viem'
 import type { Hex } from 'viem'
 import { ConstantsUtil, PresetsUtil, HelpersUtil } from '@web3modal/scaffold-utils'

packages/base/adapters/evm/wagmi/utils/helpers.ts

@@ -1,13 +1,13 @@
-import { CoreHelperUtil } from '@web3modal/scaffold'
 import { ConstantsUtil as CommonConstantsUtil } from '@web3modal/common'
 import { ConstantsUtil, PresetsUtil } from '@web3modal/scaffold-utils'
 import { EthereumProvider } from '@walletconnect/ethereum-provider'
 import { getChainsFromAccounts } from '@walletconnect/utils'
 import { fallback, http, type Hex } from 'viem'
 
-import type { CaipNetwork, CaipNetworkId } from '@web3modal/scaffold'
+import type { CaipNetwork, CaipNetworkId } from '@web3modal/core'
 import type { Chain } from '@wagmi/core/chains'
 import type { Connector } from '@wagmi/core'
+import { CoreHelperUtil } from '@web3modal/core'
 
 export function getCaipDefaultChain(chain?: Chain) {
   if (!chain) {

packages/base/adapters/evm/wagmi/utils/provider.ts

@@ -1,6 +1,6 @@
 import { http } from '@wagmi/core'
 import type { Chain } from '@wagmi/core/chains'
-import { CoreHelperUtil } from '@web3modal/scaffold'
+import { CoreHelperUtil } from '@web3modal/core'
 import { ConstantsUtil, PresetsUtil } from '@web3modal/scaffold-utils'
 
 // -- Helpers ------------------------------------------------------------------

packages/base/adapters/solana/web3js/client.ts

@@ -10,7 +10,7 @@ import {
 import { ConstantsUtil, PresetsUtil } from '@web3modal/scaffold-utils'
 import { ConstantsUtil as CommonConstantsUtil } from '@web3modal/common'
 
-import { SolConstantsUtil, SolHelpersUtil, SolStoreUtil } from './utils/scaffold/index.js'
+import { SolConstantsUtil, SolHelpersUtil, SolStoreUtil } from '@web3modal/scaffold-utils/solana'
 
 import type { BaseWalletAdapter } from '@solana/wallet-adapter-base'
 import { PublicKey, type Commitment, type ConnectionConfig } from '@solana/web3.js'
@@ -23,10 +23,15 @@ import type {
   Connector,
   CaipAddress,
   CaipNetwork
-} from '@web3modal/scaffold'
+} from '@web3modal/core'
 import type { Chain as AvailableChain } from '@web3modal/common'
 
-import type { ProviderType, Chain, Provider, SolStoreUtilState } from './utils/scaffold/index.js'
+import type {
+  ProviderType,
+  Chain,
+  Provider,
+  SolStoreUtilState
+} from '@web3modal/scaffold-utils/solana'
 import { watchStandard } from './utils/watchStandard.js'
 import { WalletConnectProvider } from './providers/WalletConnectProvider.js'
 import type { AppKit } from '../../../src/client.js'

packages/base/adapters/solana/web3js/index.ts

@@ -4,12 +4,12 @@ export { SolanaWeb3JsClient } from './client.js'
 
 // -- Types -----------------------------------------------------------
 export type { Web3ModalClientOptions } from './client.js'
-export type * from './utils/scaffold/SolanaTypesUtil.js'
+export type * from '@web3modal/scaffold-utils/solana'
 export type * from '@solana/wallet-adapter-base'
 
 // -- Utils -----------------------------------------------------------
 export * from './utils/defaultConfig.js'
-export * from './utils/scaffold/SolanaStoreUtil.js'
+export * from '@web3modal/scaffold-utils/solana'
 
 // -- Constants -------------------------------------------------------
 export { solana, solanaDevnet, solanaTestnet } from './utils/chains.js'

packages/base/adapters/solana/web3js/providers/WalletConnectProvider.ts

@@ -4,7 +4,7 @@ import {
   type AnyTransaction,
   type Chain,
   type Provider
-} from '../utils/scaffold/index.js'
+} from '@web3modal/scaffold-utils/solana'
 import { ProviderEventEmitter } from './shared/ProviderEventEmitter.js'
 import type { SessionTypes } from '@walletconnect/types'
 import base58 from 'bs58'

packages/base/adapters/solana/web3js/providers/WalletStandardProvider.ts

@@ -31,7 +31,7 @@ import {
   type Chain,
   type GetActiveChain,
   type Provider
-} from '../utils/scaffold/index.js'
+} from '@web3modal/scaffold-utils/solana'
 import base58 from 'bs58'
 import { WalletStandardFeatureNotSupportedError } from './shared/Errors.js'
 import { ProviderEventEmitter } from './shared/ProviderEventEmitter.js'

packages/base/adapters/solana/web3js/providers/shared/ProviderEventEmitter.ts

@@ -1,4 +1,4 @@
-import type { ProviderEventEmitterMethods } from '../../utils/scaffold/index.js'
+import type { ProviderEventEmitterMethods } from '@web3modal/scaffold-utils/solana'
 
 type Listeners = {
   [Event in ProviderEventEmitterMethods.Event]: Array<

packages/base/adapters/solana/web3js/tests/GenericProvider.test.ts

@@ -1,5 +1,5 @@
 import { beforeAll, describe, expect, it, vi } from 'vitest'
-import type { Provider } from '../utils/scaffold/SolanaTypesUtil.js'
+import type { Provider } from '@web3modal/scaffold-utils/solana'
 import { WalletConnectProvider } from '../providers/WalletConnectProvider.js'
 import { mockUniversalProvider } from './mocks/UniversalProvider.js'
 import { WalletStandardProvider } from '../providers/WalletStandardProvider.js'

packages/base/adapters/solana/web3js/tests/WalletConnectProvider.test.ts

@@ -3,7 +3,7 @@ import { mockUniversalProvider, mockUniversalProviderSession } from './mocks/Uni
 import { WalletConnectProvider } from '../providers/WalletConnectProvider.js'
 import { TestConstants } from './util/TestConstants.js'
 import { mockLegacyTransaction, mockVersionedTransaction } from './mocks/Transaction.js'
-import { type Chain } from '../utils/scaffold/index.js'
+import { type Chain } from '@web3modal/scaffold-utils/solana'
 
 describe('WalletConnectProvider specific tests', () => {
   let provider = mockUniversalProvider()

packages/base/adapters/solana/web3js/utils/chains.ts

@@ -1,5 +1,5 @@
 import { ConstantsUtil } from '@web3modal/common'
-import type { Chain } from './scaffold/index.js'
+import type { Chain } from '@web3modal/scaffold-utils/solana'
 
 export const solana = {
   chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',

packages/base/adapters/solana/web3js/utils/defaultConfig.ts

@@ -1,6 +1,6 @@
 import '@web3modal/polyfills'
 
-import type { Chain, Metadata, Provider, ProviderType } from './scaffold/index.js'
+import type { Chain, Metadata, Provider, ProviderType } from '@web3modal/scaffold-utils/solana'
 
 declare global {
   interface Navigator {

packages/base/adapters/solana/web3js/utils/watchStandard.ts

@@ -2,7 +2,7 @@ import { getWallets } from '@wallet-standard/app'
 import { WalletStandardProvider } from '../providers/WalletStandardProvider.js'
 import { isWalletAdapterCompatibleStandardWallet } from '@solana/wallet-adapter-base'
 import type { Wallet } from '@wallet-standard/base'
-import { SolStoreUtil } from './scaffold/SolanaStoreUtil.js'
+import { SolStoreUtil } from '@web3modal/scaffold-utils/solana'
 
 const { get, on } = getWallets()
 let standardAdapters: WalletStandardProvider[] = wrapWalletsWithAdapters(get())

packages/base/exports/react.ts

@@ -1,13 +1,13 @@
 import { ConstantsUtil } from '@web3modal/scaffold-utils'
-import { getWeb3Modal } from '@web3modal/scaffold-react'
 import { AppKit } from '../src/client.js'
 import type { AppKitOptions } from '../utils/TypesUtil.js'
+import { getWeb3Modal } from '../utils/library/react/index.js'
 
 // -- Views ------------------------------------------------------------
 export * from '@web3modal/scaffold-ui'
 
 // -- Hooks ------------------------------------------------------------
-export * from '@web3modal/scaffold-react'
+export * from '../utils/library/react/index.js'
 
 // -- Utils & Other -----------------------------------------------------
 export type * from '@web3modal/core'

packages/base/exports/vue.ts

@@ -1,13 +1,13 @@
 import { ConstantsUtil } from '@web3modal/scaffold-utils'
-import { getWeb3Modal } from '@web3modal/scaffold-vue'
 import { AppKit } from '../src/client.js'
 import type { AppKitOptions } from '../utils/TypesUtil.js'
+import { getWeb3Modal } from '../utils/library/vue/index.js'
 
 // -- Views ------------------------------------------------------------
 export * from '@web3modal/scaffold-ui'
 
 // -- Hooks ------------------------------------------------------------
-export * from '@web3modal/scaffold-vue'
+export * from '../utils/library/vue/index.js'
 
 // -- Utils & Other -----------------------------------------------------
 export type * from '@web3modal/core'

packages/base/package.json

@@ -38,6 +38,16 @@
       "types": "./dist/types/adapters/solana/web3js/index.d.ts",
       "import": "./dist/esm/adapters/solana/web3js/index.js",
       "default": "./dist/esm/adapters/solana/web3js/index.js"
+    },
+    "./utils/library/react": {
+      "types": "./dist/types/utils/library/react/index.d.ts",
+      "import": "./dist/esm/utils/library/react/index.js",
+      "default": "./dist/esm/utils/library/react/index.js"
+    },
+    "./utils/library/vue": {
+      "types": "./dist/types/utils/library/vue/index.d.ts",
+      "import": "./dist/esm/utils/library/vue/index.js",
+      "default": "./dist/esm/utils/library/vue/index.js"
     }
   },
   "scripts": {
@@ -67,11 +77,8 @@
     "@web3modal/common": "workspace:*",
     "@web3modal/core": "workspace:*",
     "@web3modal/polyfills": "workspace:*",
-    "@web3modal/scaffold": "workspace:*",
-    "@web3modal/scaffold-react": "workspace:*",
     "@web3modal/scaffold-ui": "workspace:*",
     "@web3modal/scaffold-utils": "workspace:*",
-    "@web3modal/scaffold-vue": "workspace:*",
     "@web3modal/siwe": "workspace:*",
     "@web3modal/ui": "workspace:*",
     "@web3modal/wallet": "workspace:*",
@@ -90,9 +97,13 @@
   "devDependencies": {
     "@types/bn.js": "5.1.5",
     "@vitest/coverage-v8": "2.0.5",
+    "@vue/runtime-core": "3.4.3",
+    "@types/react": "18.2.0",
+    "@types/react-dom": "18.2.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "vitest": "2.0.3"
+    "vitest": "2.0.3",
+    "vue": "3.4.3"
   },
   "keywords": [
     "web3",