Merge branch 'develop' into develop

Author: Adamj1232

docs/package.json

@@ -12,8 +12,8 @@
     "format": "prettier --plugin-search-dir . --write .",
     "prepare": "svelte-kit sync",
     "test": "playwright test",
-    "w3o-latest-prod": "yarn add '@web3-onboard/core' '@web3-onboard/coinbase' '@web3-onboard/transaction-preview' '@web3-onboard/dcent' '@web3-onboard/frontier' '@web3-onboard/fortmatic' '@web3-onboard/frame' '@web3-onboard/gas' '@web3-onboard/gnosis' '@web3-onboard/keepkey' '@web3-onboard/keystone' '@web3-onboard/ledger' '@web3-onboard/infinity-wallet' '@web3-onboard/injected-wallets' '@web3-onboard/magic' '@web3-onboard/phantom' '@web3-onboard/portis' '@web3-onboard/sequence' '@web3-onboard/trezor' '@web3-onboard/trust' '@web3-onboard/torus' '@web3-onboard/taho' '@web3-onboard/web3auth' '@web3-onboard/walletconnect' '@web3-onboard/enkrypt' '@web3-onboard/mew-wallet' '@web3-onboard/xdefi' '@web3-onboard/uauth' '@web3-onboard/zeal' '@web3-onboard/cede-store' '@web3-onboard/blocto'",
-    "w3o-latest-alpha": "yarn add '@web3-onboard/core@next' '@web3-onboard/coinbase@next' '@web3-onboard/transaction-preview@next' '@web3-onboard/dcent@next' '@web3-onboard/frontier@next' '@web3-onboard/fortmatic@next' '@web3-onboard/frame@next' '@web3-onboard/gas@next' '@web3-onboard/gnosis@next' '@web3-onboard/keepkey@next' '@web3-onboard/keystone@next' '@web3-onboard/ledger@next' '@web3-onboard/infinity-wallet@next' '@web3-onboard/injected-wallets@next' '@web3-onboard/magic@next' '@web3-onboard/phantom@next' '@web3-onboard/portis@next' '@web3-onboard/sequence@next' '@web3-onboard/trezor@next' '@web3-onboard/trust@next' '@web3-onboard/torus@next' '@web3-onboard/taho@next' '@web3-onboard/web3auth@next' '@web3-onboard/walletconnect@next' '@web3-onboard/enkrypt@next' '@web3-onboard/mew-wallet@next' '@web3-onboard/xdefi@next' '@web3-onboard/uauth@next' '@web3-onboard/zeal@next' '@web3-onboard/cede-store@next' '@web3-onboard/blocto@next'"
+    "w3o-latest-prod": "yarn add '@web3-onboard/core' '@web3-onboard/coinbase' '@web3-onboard/transaction-preview' '@web3-onboard/dcent' '@web3-onboard/frontier' '@web3-onboard/fortmatic' '@web3-onboard/frame' '@web3-onboard/gas' '@web3-onboard/gnosis' '@web3-onboard/keepkey' '@web3-onboard/keystone' '@web3-onboard/ledger' '@web3-onboard/infinity-wallet' '@web3-onboard/injected-wallets' '@web3-onboard/magic' '@web3-onboard/phantom' '@web3-onboard/portis' '@web3-onboard/sequence' '@web3-onboard/trezor' '@web3-onboard/trust' '@web3-onboard/torus' '@web3-onboard/taho' '@web3-onboard/web3auth' '@web3-onboard/walletconnect' '@web3-onboard/enkrypt' '@web3-onboard/mew-wallet' '@web3-onboard/xdefi' '@web3-onboard/uauth' '@web3-onboard/zeal' '@web3-onboard/cede-store' '@web3-onboard/blocto' '@web3-onboard/capsule' '@web3-onboard/particle-network' '@web3-onboard/metamask' '@web3-onboard/bitget' '@web3-onboard/arcana-auth' '@web3-onboard/venly'",
+    "w3o-latest-alpha": "yarn add '@web3-onboard/core@next' '@web3-onboard/coinbase@next' '@web3-onboard/transaction-preview@next' '@web3-onboard/dcent@next' '@web3-onboard/frontier@next' '@web3-onboard/fortmatic@next' '@web3-onboard/frame@next' '@web3-onboard/gas@next' '@web3-onboard/gnosis@next' '@web3-onboard/keepkey@next' '@web3-onboard/keystone@next' '@web3-onboard/ledger@next' '@web3-onboard/infinity-wallet@next' '@web3-onboard/injected-wallets@next' '@web3-onboard/magic@next' '@web3-onboard/phantom@next' '@web3-onboard/portis@next' '@web3-onboard/sequence@next' '@web3-onboard/trezor@next' '@web3-onboard/trust@next' '@web3-onboard/torus@next' '@web3-onboard/taho@next' '@web3-onboard/web3auth@next' '@web3-onboard/walletconnect@next' '@web3-onboard/enkrypt@next' '@web3-onboard/mew-wallet@next' '@web3-onboard/xdefi@next' '@web3-onboard/uauth@next' '@web3-onboard/zeal@next' '@web3-onboard/cede-store@next' '@web3-onboard/blocto@next' '@web3-onboard/capsule@next' '@web3-onboard/metamask@next' '@web3-onboard/bitget@next' '@web3-onboard/arcana-auth@next' '@web3-onboard/venly@next' '@web3-onboard/particle-network@next'"
   },
   "devDependencies": {
     "@algolia/client-search": "^4.17.0",
@@ -36,60 +36,58 @@
     "prettier-plugin-svelte": "^2.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rollup-plugin-polyfill-node": "^0.12.0",
+    "rollup-plugin-polyfill-node": "^0.13.0",
     "shiki": "^0.12.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "svelte": "^3.54.0",
     "svelte-check": "^3.0.1",
     "svelte-preprocess": "^5.0.3",
     "tslib": "^2.4.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.4.5",
     "unplugin-icons": "^0.14.0",
     "vite": "^4.5.3"
   },
   "type": "module",
   "dependencies": {
     "@safe-global/safe-apps-provider": "^0.18.0",
     "@safe-global/safe-apps-sdk": "^8.1.0",
-    "@web3-onboard/arcana-auth": "^2.0.0",
-    "@web3-onboard/bitget": "^2.0.0",
-    "@web3-onboard/blocto": "^2.0.0",
-    "@web3-onboard/capsule": "^2.0.3",
-    "@web3-onboard/cede-store": "^2.2.0",
-    "@web3-onboard/coinbase": "^2.2.7",
-    "@web3-onboard/core": "^2.21.6",
-    "@web3-onboard/dcent": "^2.2.7",
-    "@web3-onboard/enkrypt": "^2.0.4",
-    "@web3-onboard/fortmatic": "^2.0.19",
-    "@web3-onboard/frame": "^2.0.2",
-    "@web3-onboard/frontier": "^2.0.4",
-    "@web3-onboard/gas": "^2.1.8",
-    "@web3-onboard/gnosis": "^2.2.2",
-    "@web3-onboard/infinity-wallet": "^2.0.4",
-    "@web3-onboard/injected-wallets": "^2.10.17",
-    "@web3-onboard/keepkey": "^2.3.7",
-    "@web3-onboard/keystone": "^2.3.7",
-    "@web3-onboard/ledger": "^2.6.0",
-    "@web3-onboard/magic": "^2.1.7",
-    "@web3-onboard/metamask": "^2.0.7",
-    "@web3-onboard/mew-wallet": "^2.0.4",
+    "@web3-onboard/bitget": "^2.1.0",
+    "@web3-onboard/blocto": "^2.1.0",
+    "@web3-onboard/cede-store": "^2.3.0",
+    "@web3-onboard/coinbase": "^2.3.0",
+    "@web3-onboard/core": "^2.22.0",
+    "@web3-onboard/dcent": "^2.2.8",
+    "@web3-onboard/enkrypt": "^2.1.0",
+    "@web3-onboard/fortmatic": "^2.1.0",
+    "@web3-onboard/frame": "^2.1.0",
+    "@web3-onboard/frontier": "^2.1.0",
+    "@web3-onboard/gas": "^2.2.0",
+    "@web3-onboard/gnosis": "^2.3.0",
+    "@web3-onboard/infinity-wallet": "^2.1.0",
+    "@web3-onboard/injected-wallets": "^2.11.0",
+    "@web3-onboard/keepkey": "^2.3.8",
+    "@web3-onboard/keystone": "^2.3.8",
+    "@web3-onboard/ledger": "^2.7.0",
+    "@web3-onboard/magic": "^2.2.0",
+    "@web3-onboard/metamask": "^2.1.0",
+    "@web3-onboard/mew-wallet": "^2.1.0",
     "@web3-onboard/okx": "^2.0.0-alpha.1",
-    "@web3-onboard/phantom": "^2.0.3",
-    "@web3-onboard/portis": "^2.1.7",
-    "@web3-onboard/sequence": "^2.0.8",
-    "@web3-onboard/taho": "^2.0.5",
-    "@web3-onboard/torus": "^2.2.6",
-    "@web3-onboard/transaction-preview": "^2.0.8",
-    "@web3-onboard/trezor": "^2.4.3",
-    "@web3-onboard/trust": "^2.0.4",
-    "@web3-onboard/uauth": "^2.1.1",
-    "@web3-onboard/venly": "^2.0.0",
-    "@web3-onboard/walletconnect": "^2.5.5",
-    "@web3-onboard/web3auth": "^2.2.3",
-    "@web3-onboard/xdefi": "^2.0.4",
-    "@web3-onboard/zeal": "^2.0.4",
-    "@web3-onboard/particle-network": "^2.0.1",
+    "@web3-onboard/particle-network": "^2.1.0",
+    "@web3-onboard/phantom": "^2.1.0",
+    "@web3-onboard/portis": "^2.2.0",
+    "@web3-onboard/sequence": "^2.1.0",
+    "@web3-onboard/taho": "^2.1.0",
+    "@web3-onboard/torus": "^2.3.0",
+    "@web3-onboard/transaction-preview": "^2.1.0",
+    "@web3-onboard/trezor": "^2.4.4",
+    "@web3-onboard/trust": "^2.1.0",
+    "@web3-onboard/uauth": "^2.2.0",
+    "@web3-onboard/venly": "^2.1.0",
+    "@web3-onboard/walletconnect": "^2.6.0",
+    "@web3-onboard/web3auth": "^2.3.0",
+    "@web3-onboard/xdefi": "^2.1.0",
+    "@web3-onboard/zeal": "^2.1.0",
     "animejs": "^3.2.1",
     "bnc-sdk": "^4.6.6",
     "ethers": "^5.7.0",

docs/src/lib/services/onboard.js

@@ -55,19 +55,19 @@ const intiOnboard = async (theme) => {
   const { default: xdefiModule } = await import('@web3-onboard/xdefi')
   const { default: cedeModule } = await import('@web3-onboard/cede-store')
   const { default: frameModule } = await import('@web3-onboard/frame')
-  const { default: arcanaModule } = await import('@web3-onboard/arcana-auth')
+  // const { default: arcanaModule } = await import('@web3-onboard/arcana-auth')
   const { default: bloctoModule } = await import('@web3-onboard/blocto')
   const { default: venlyModule } = await import('@web3-onboard/venly')
   const { default: bitgetModule } = await import('@web3-onboard/bitget')
-  const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule')
+  // // const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule')
   const { default: particleAuthModule } = await import('@web3-onboard/particle-network')
   const INFURA_ID = '8b60d52405694345a99bcb82e722e0af'
 
   const injected = injectedModule()
   const infinityWallet = infinityWalletModule()
-  const arcanaWallet = arcanaModule({
-    clientID: 'xar_test_c9c3bc702eb13255c58dab0e74cfa859711c13cb'
-  })
+  // const arcanaWallet = arcanaModule({
+  //   clientID: 'xar_test_c9c3bc702eb13255c58dab0e74cfa859711c13cb'
+  // })
   const coinbase = coinbaseModule()
   const metamask = metamaskModule({
     options: {
@@ -133,10 +133,10 @@ const intiOnboard = async (theme) => {
     environment: 'staging'
   })
 
-  const capsule = capsuleModule({
-    environment: Environment.DEVELOPMENT,
-    apiKey: '992bbd9146d5de8ad0419f141d9a7ca7'
-  })
+  // // const capsule = capsuleModule({
+  // //   environment: Environment.DEVELOPMENT,
+  // //   apiKey: '992bbd9146d5de8ad0419f141d9a7ca7'
+  // // })
 
   const particle = particleAuthModule({
     projectId: 'b385ccf0-73c3-485a-9941-159b7855b806',
@@ -161,7 +161,7 @@ const intiOnboard = async (theme) => {
       xdefi,
       uauth,
       cede,
-      arcanaWallet,
+      // arcanaWallet,
       torus,
       sequence,
       dcent,
@@ -175,11 +175,9 @@ const intiOnboard = async (theme) => {
       frame,
       infinityWallet,
       blocto,
-      capsule,
       particle,
+      venly
       // capsule
-
-      // venly
     ],
     chains: [
       {

docs/src/routes/docs/[...3]modules/[...1]core/+page.md

@@ -108,6 +108,10 @@ type InitOptions {
   wallets: WalletInit[]
   chains: Chain[]
   appMetadata?: AppMetadata
+  /** Web3-Onboard module to add Wagmi support
+   * see https://www.npmjs.com/package/@web3-onboard/wagmi
+   */
+  wagmi?: typeof wagmi
   i18n?: i18nOptions
   accountCenter?: AccountCenterOptions
   apiKey?: string
@@ -388,6 +392,57 @@ It will allow you to customize the look and feel of Web3 Onboard, try different
 
 ---
 
+#### wagmi
+
+To add [WAGMI API](https://wagmi.sh/core/getting-started) support to your project you can simply install `web3-onboard/wagmi` import and pass in the [wagmi package](/docs/modules/wagmi) export directly into your onboard configuration. After doing so you can use all of the native WAGMI API functions directly from `@web3-onboard/wagmi`. This will give access to all WAGMI function available on or before `@wagmi/core` version `2.10.4`.
+After initialization an up-to-date WAGMI config will will be available from the onboard state object `onboard.state.get().wagmiConfig` which will need to be passed as the first prop of most [@wagmi/core](https://wagmi.sh/core/getting-started) methods. Wallets will also have a [wagmiConnector](#state) prop within the onboard state object which will allow you to target specific wallets for interactions. This can also be bi-passed if the primary or most recently connected wallet is the wallet meant for the transactions.
+The config and connectors can be used with the WAGMI API returned from this module or an external WAGMI instance.
+
+Full documentation for the `@web3-onboard/wagmi` module can be found [here](/docs/modules/wagmi).
+
+```typescript
+import Onboard from '@web3-onboard/core'
+import wagmi from '@web3-onboard/wagmi'
+import {
+  sendTransaction as wagmiSendTransaction,
+  switchChain,
+  disconnect,
+  getConnectors
+} from '@web3-onboard/wagmi'
+
+const injected = injectedModule()
+
+const onboard = Onboard({
+  // This javascript object is unordered meaning props do not require a certain order
+  wagmi,
+  wallets: [injected],
+  chains: [
+    {
+      id: '0x1',
+      token: 'ETH',
+      label: 'Ethereum',
+      rpcUrl: 'https://mainnet.infura.io/v3/17c1e1500e384acfb6a72c5d2e67742e'
+    }
+  ]
+  // ... other Onboard options
+})
+
+const sendTransaction = async () => {
+  // current primary wallet - as multiple wallets can connect this value is the currently active
+  const [activeWallet] = onboard.state.get().wallets
+  const { wagmiConnector } = activeWallet
+  const wagmiConfig = onboard.state.get().wagmiConfig
+  const result = await wagmiSendTransaction(wagmiConfig, {
+    to: toAddress,
+    // desired connector to send txn from
+    connector: wagmiConnector,
+    value: parseEther('0.001')
+  })
+  console.log(result)
+}
+```
+---
+
 #### disableFontDownload
 
 If set to `true` the default `Inter` font will not be imported and instead the web based `sans-serif` font will be used if a font is not defined through the `Theme` or exposed css variable.
@@ -845,6 +900,13 @@ type WalletState = {
   accounts: Account[]
   chains: ConnectedChain[]
   instance?: unknown
+  /**
+   * WAGMI Connector object
+   * Can be used to leverage all WAGMI functions from
+   * the @web3-onboard/wagmi module
+   * See https://www.npmjs.com/package/@web3-onboard/wagmi for more details
+   */
+  wagmiConnector?: Connector
 }
 
 type Account = {