diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
index fcb90d70b8..cd310fb3e9 100644
--- a/.github/workflows/check-build.yml
+++ b/.github/workflows/check-build.yml
@@ -41,6 +41,7 @@ jobs:
 
           touch apps/bridge-dapp/.env
           echo NX_BRIDGE_APP_DOMAIN=${{ secrets.NX_BRIDGE_APP_DOMAIN }} >> apps/bridge-dapp/.env
+          echo WALLET_CONNECT_PROJECT_ID=${{ secrets.WALLET_CONNECT_PROJECT_ID }} >> apps/bridge-dapp/.env
           echo HOSTED_ORBIT_MULTLICALL3_ADDRESS=${{ secrets.HOSTED_ORBIT_MULTLICALL3_ADDRESS }} >> apps/bridge-dapp/.env
           echo ATHENA_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK=${{ secrets.ATHENA_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK }} >> apps/bridge-dapp/.env
           echo HERMES_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK=${{ secrets.HERMES_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK }} >> apps/bridge-dapp/.env
diff --git a/.github/workflows/deploy-bridge-dapp-dev.yml b/.github/workflows/deploy-bridge-dapp-dev.yml
index 4a9a97bebf..7c19ec3045 100644
--- a/.github/workflows/deploy-bridge-dapp-dev.yml
+++ b/.github/workflows/deploy-bridge-dapp-dev.yml
@@ -37,6 +37,7 @@ jobs:
         run: |
           touch apps/bridge-dapp/.env
           echo NX_BRIDGE_APP_DOMAIN=${{ secrets.NX_BRIDGE_APP_DOMAIN }} >> apps/bridge-dapp/.env
+          echo WALLET_CONNECT_PROJECT_ID=${{ secrets.WALLET_CONNECT_PROJECT_ID }} >> apps/bridge-dapp/.env
           echo HOSTED_ORBIT_MULTLICALL3_ADDRESS=${{ secrets.HOSTED_ORBIT_MULTLICALL3_ADDRESS }} >> apps/bridge-dapp/.env
           echo ATHENA_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK=${{ secrets.ATHENA_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK }} >> apps/bridge-dapp/.env
           echo HERMES_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK=${{ secrets.HERMES_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK }} >> apps/bridge-dapp/.env
diff --git a/.github/workflows/deploy-webbsite-dev.yml b/.github/workflows/deploy-webbsite-dev.yml
index fbd0b50a6f..3b0f0cd509 100644
--- a/.github/workflows/deploy-webbsite-dev.yml
+++ b/.github/workflows/deploy-webbsite-dev.yml
@@ -57,6 +57,10 @@ jobs:
         run: yarn add -D -W netlify-cli
 
       - name: Build project
+        # Fix: JavaScript heap out of memory
+        # https://github.com/actions/runner-images/issues/70#issuecomment-1191708172
+        env:
+          NODE_OPTIONS: '--max_old_space_size=4096'
         run: yarn build:webbsite
 
       - name: Deploy site
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b18d347993..65ac1c7782 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -82,6 +82,7 @@ jobs:
 
           touch apps/bridge-dapp/.env
           echo NX_BRIDGE_APP_DOMAIN=${{ secrets.NX_BRIDGE_APP_DOMAIN }} >> apps/bridge-dapp/.env
+          echo WALLET_CONNECT_PROJECT_ID=${{ secrets.WALLET_CONNECT_PROJECT_ID }} >> apps/bridge-dapp/.env
           echo HOSTED_ORBIT_MULTLICALL3_ADDRESS=${{ secrets.HOSTED_ORBIT_MULTLICALL3_ADDRESS }} >> apps/bridge-dapp/.env
           echo ATHENA_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK=${{ secrets.ATHENA_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK }} >> apps/bridge-dapp/.env
           echo HERMES_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK=${{ secrets.HERMES_ORBIT_MULTICALL3_DEPLOYMENT_BLOCK }} >> apps/bridge-dapp/.env
diff --git a/apps/bridge-dapp/.env.example b/apps/bridge-dapp/.env.example
index b8fc28e50c..f74420f0d5 100644
--- a/apps/bridge-dapp/.env.example
+++ b/apps/bridge-dapp/.env.example
@@ -5,6 +5,8 @@ NX_BRIDGE_APP_DOMAIN=http:localhost:3000
 
 POLKADOT_TEST_ACCOUNT_ADDRESS="<YOUR_POLKADOT_TEST_ACCOUNT_ADDRESS>"
 
+WALLET_CONNECT_PROJECT_ID="<WALLET_CONNECT_PROJECT_ID>"
+
 # If you want to enable the local orbit integration,
 # you need to set the local anchor addresses of the local orbit instance
 LOCAL_ORBIT_ANCHOR_ADDRESS=""
diff --git a/apps/bridge-dapp/src/components/ChainListCardWrapper/ChainListCardWrapper.tsx b/apps/bridge-dapp/src/components/ChainListCardWrapper/ChainListCardWrapper.tsx
index 64944b5781..91cb3b6280 100644
--- a/apps/bridge-dapp/src/components/ChainListCardWrapper/ChainListCardWrapper.tsx
+++ b/apps/bridge-dapp/src/components/ChainListCardWrapper/ChainListCardWrapper.tsx
@@ -55,7 +55,7 @@ export const ChainListCardWrapper: FC<ChainListCardWrapperProps> = ({
     return getActiveSourceChains(apiConfig.chains).map((val) => {
       const currency = getNativeCurrencyFromConfig(
         apiConfig.currencies,
-        calculateTypedChainId(val.chainType, val.chainId)
+        calculateTypedChainId(val.chainType, val.id)
       );
 
       return {
@@ -84,7 +84,7 @@ export const ChainListCardWrapper: FC<ChainListCardWrapperProps> = ({
       const isSupported =
         activeWallet &&
         activeWallet.supportedChainIds.includes(
-          calculateTypedChainId(chain.chainType, chain.chainId)
+          calculateTypedChainId(chain.chainType, chain.id)
         );
 
       let bridge: Bridge | undefined;
diff --git a/apps/bridge-dapp/src/components/Header/WalletButton.tsx b/apps/bridge-dapp/src/components/Header/WalletButton.tsx
index d98908d033..3a8b87ba27 100644
--- a/apps/bridge-dapp/src/components/Header/WalletButton.tsx
+++ b/apps/bridge-dapp/src/components/Header/WalletButton.tsx
@@ -27,6 +27,8 @@ import {
 import { FC, useCallback, useMemo, useState } from 'react';
 import { ClearDataModal } from './ClearDataModal';
 import { HeaderButton } from './HeaderButton';
+import { WebbWeb3Provider, isViemError } from '@webb-tools/web3-api-provider';
+import { WebbError, WebbErrorCodes } from '@webb-tools/dapp-types';
 
 export const WalletButton: FC<{ account: Account; wallet: WalletConfig }> = ({
   account,
@@ -35,14 +37,20 @@ export const WalletButton: FC<{ account: Account; wallet: WalletConfig }> = ({
   // Clear data modal
   const [isOpen, setIsOpen] = useState(false);
 
-  const { activeChain, noteManager, purgeNoteAccount, inactivateApi } =
-    useWebContext();
+  const {
+    activeApi,
+    activeChain,
+    noteManager,
+    purgeNoteAccount,
+    inactivateApi,
+  } = useWebContext();
 
   // Get all note, syncNotes and isSyncingNote function
   const {
     allNotes,
     isSyncingNote,
     syncNotes: handleSyncNotes,
+    syncNotesProgress,
   } = useNoteAccount();
 
   const { setMainComponent, notificationApi, logger } = useWebbUI();
@@ -78,13 +86,11 @@ export const WalletButton: FC<{ account: Account; wallet: WalletConfig }> = ({
 
   // Calculate the account explorer url
   const accountExplorerUrl = useMemo(() => {
-    if (!activeChain?.blockExplorerStub) return '#';
+    if (!activeChain?.blockExplorers) return '#';
 
-    const uri = activeChain.blockExplorerStub.endsWith('/')
-      ? `address/${account.address}`
-      : `/address/${account.address}`;
+    const url = activeChain.blockExplorers.default.url;
 
-    return `${activeChain.blockExplorerStub}${uri}`;
+    return new URL(`/address/${account.address}`, url).toString();
   }, [activeChain, account]);
 
   // Clear data function
@@ -148,32 +154,25 @@ export const WalletButton: FC<{ account: Account; wallet: WalletConfig }> = ({
 
   // Funciton to switch account within the connected wallet
   const handleSwitchAccount = useCallback(async () => {
-    if (!activeChain) {
-      notificationApi({
-        variant: 'error',
-        message: 'No active chain',
-      });
+    // Switch account only support on web3 provider
+    if (!activeApi || !(activeApi instanceof WebbWeb3Provider)) {
       return;
     }
 
-    if (
-      typeof window !== 'undefined' &&
-      typeof window.ethereum !== 'undefined'
-    ) {
-      try {
-        await window.ethereum.request({
-          method: 'wallet_requestPermissions',
-          params: [
-            {
-              eth_accounts: {},
-            },
-          ],
-        });
-      } catch (error) {
-        console.log(error);
+    try {
+      const walletClient = activeApi.walletClient;
+
+      await walletClient.requestPermissions({ eth_accounts: {} });
+    } catch (error) {
+      let message = WebbError.from(WebbErrorCodes.SwitchAccountFailed).message;
+
+      if (isViemError(error)) {
+        message = error.shortMessage;
       }
+
+      notificationApi({ variant: 'error', message });
     }
-  }, [activeChain, notificationApi]);
+  }, [activeApi, notificationApi]);
 
   // Disconnect function
   // TODO: The disconnect function does not work properly
@@ -276,6 +275,11 @@ export const WalletButton: FC<{ account: Account; wallet: WalletConfig }> = ({
             <div className="flex items-center space-x-1">
               <Button
                 isLoading={isSyncingNote}
+                loadingText={
+                  Number.isNaN(syncNotesProgress)
+                    ? ''
+                    : `${syncNotesProgress.toFixed(2)}%`
+                }
                 onClick={() => handleSyncNotes(handleNewNotes, handleSyncNotes)}
                 variant="utility"
               >
diff --git a/apps/bridge-dapp/src/components/Header/WalletModal.tsx b/apps/bridge-dapp/src/components/Header/WalletModal.tsx
index 3ddadc851c..5c5ea82d76 100644
--- a/apps/bridge-dapp/src/components/Header/WalletModal.tsx
+++ b/apps/bridge-dapp/src/components/Header/WalletModal.tsx
@@ -28,7 +28,7 @@ export const WalletModal: FC = () => {
 
   const { notificationApi } = useWebbUI();
 
-  const { chains } = useWebContext();
+  const { apiConfig, chains } = useWebContext();
 
   const chain = useMemo(() => {
     if (!selectedChain) {
@@ -38,6 +38,12 @@ export const WalletModal: FC = () => {
     return selectedChain;
   }, [chains, selectedChain]);
 
+  const supportedWalletCfgs = useMemo(() => {
+    return chain.wallets
+      .map((walletId) => apiConfig.wallets[walletId])
+      .filter((w) => !!w);
+  }, [apiConfig.wallets, chain.wallets]);
+
   // Get the current failed or connecting wallet
   const getCurrentWallet = useCallback(() => {
     const walletId = failedWalletId ?? connectingWalletId;
@@ -45,8 +51,12 @@ export const WalletModal: FC = () => {
       return undefined;
     }
 
-    return chain.wallets[walletId];
-  }, [chain, failedWalletId, connectingWalletId]);
+    if (!chain.wallets.includes(walletId)) {
+      return undefined;
+    }
+
+    return apiConfig.wallets[walletId];
+  }, [failedWalletId, connectingWalletId, chain.wallets, apiConfig.wallets]);
 
   const isNotInstalledError = useMemo(() => {
     if (!connectError) {
@@ -140,7 +150,7 @@ export const WalletModal: FC = () => {
         isCenter
       >
         <WalletConnectionCard
-          wallets={Object.values(chain.wallets)}
+          wallets={supportedWalletCfgs}
           onWalletSelect={handleWalletSelect}
           onClose={() => toggleModal(false)}
           connectingWalletId={connectingWalletId}
diff --git a/apps/bridge-dapp/src/components/tables/LoadingTable.tsx b/apps/bridge-dapp/src/components/tables/LoadingTable.tsx
index 274456a639..e097baebeb 100644
--- a/apps/bridge-dapp/src/components/tables/LoadingTable.tsx
+++ b/apps/bridge-dapp/src/components/tables/LoadingTable.tsx
@@ -1,8 +1,11 @@
 import { Spinner } from '@webb-tools/icons';
+import { useNoteAccount } from '@webb-tools/react-hooks';
 import { Typography } from '@webb-tools/webb-ui-components';
 import { useEffect, useState } from 'react';
 
 export const LoadingTable = () => {
+  const { syncNotesProgress } = useNoteAccount();
+
   return (
     <div className="h-[511px] bg-mono-0 dark:bg-mono-160 rounded-lg flex items-center justify-center">
       <div>
@@ -11,7 +14,10 @@ export const LoadingTable = () => {
         </div>
 
         <Typography variant="h5" ta="center" fw="bold">
-          Syncing notes
+          Syncing notes{' '}
+          {Number.isNaN(syncNotesProgress)
+            ? ''
+            : `${syncNotesProgress.toFixed(2)}%`}
         </Typography>
 
         <LoadingText />
@@ -38,7 +44,12 @@ const LoadingText = () => {
   }, []);
 
   return (
-    <Typography variant="body2" fw="semibold" className="!text-mono-100">
+    <Typography
+      ta="center"
+      variant="body2"
+      fw="semibold"
+      className="!text-mono-100"
+    >
       Please wait a few minutes{`...`.slice(0, dots)}
     </Typography>
   );
diff --git a/apps/bridge-dapp/src/containers/CreateAccountModal/CreateAccountModal.tsx b/apps/bridge-dapp/src/containers/CreateAccountModal/CreateAccountModal.tsx
index 698b36ff37..2a9f573bd7 100644
--- a/apps/bridge-dapp/src/containers/CreateAccountModal/CreateAccountModal.tsx
+++ b/apps/bridge-dapp/src/containers/CreateAccountModal/CreateAccountModal.tsx
@@ -1,12 +1,12 @@
 import { useWebContext } from '@webb-tools/api-provider-environment';
-import cx from 'classnames';
+import { WebbError, WebbErrorCodes } from '@webb-tools/dapp-types';
 import {
+  Download,
   ExchangeLine,
   InformationLine,
   WalletLineIcon,
-  Download,
 } from '@webb-tools/icons';
-import { Web3Provider } from '@webb-tools/web3-api-provider';
+import { WebbWeb3Provider } from '@webb-tools/web3-api-provider';
 import {
   Button,
   CheckBox,
@@ -16,12 +16,13 @@ import {
   ModalHeader,
   Typography,
 } from '@webb-tools/webb-ui-components';
-import { FC, useCallback, useState } from 'react';
-import { CreateAccountModalProps } from './types';
+import cx from 'classnames';
 import Lottie from 'lottie-react';
-import privacySecurityJson from './privacy-security.json';
-import congratsJson from './congrats.json';
+import { FC, useCallback, useState } from 'react';
 import { createSignInMessage } from '../../constants/signIn';
+import congratsJson from './congrats.json';
+import privacySecurityJson from './privacy-security.json';
+import { CreateAccountModalProps } from './types';
 
 const successBridgeInfo = [
   {
@@ -62,35 +63,42 @@ export const CreateAccountModal: FC<CreateAccountModalProps> = ({
   // Loading button when user hits create account
   const [isCreating, setIsCreating] = useState(false);
 
-  const { loginNoteAccount } = useWebContext();
+  const { loginNoteAccount, activeApi } = useWebContext();
 
   const loginWithMetamask = useCallback(async () => {
     try {
       setIsCreating(true);
-      const metamask = await Web3Provider.fromExtension();
-      const accounts = await metamask.eth.getAccounts();
-      if (accounts.length && accounts[0] != null) {
-        const msg = createSignInMessage(
-          accounts[0],
-          await metamask.eth.getChainId()
-        );
-
-        const signedString = await metamask.eth.personal.sign(
-          msg,
-          accounts[0],
-          undefined as any
-        );
-        await loginNoteAccount(signedString.slice(0, 66));
-
-        setIsSuccess?.(true);
+
+      if (!activeApi) {
+        throw WebbError.from(WebbErrorCodes.ApiNotReady);
+      }
+
+      if (!(activeApi instanceof WebbWeb3Provider)) {
+        throw WebbError.from(WebbErrorCodes.NotImplemented);
+      }
+
+      const account = activeApi.accounts.activeOrDefault;
+      if (!account) {
+        throw WebbError.from(WebbErrorCodes.NoAccountAvailable);
       }
+
+      const msg = createSignInMessage(
+        account.address,
+        await activeApi.getChainId()
+      );
+
+      const signedString = await activeApi.sign(msg);
+
+      await loginNoteAccount(signedString.slice(0, 66));
+
+      setIsSuccess?.(true);
     } catch (error) {
       console.log('Error occurs when creating note account');
       console.log(error);
     } finally {
       setIsCreating(false);
     }
-  }, [loginNoteAccount, setIsSuccess]);
+  }, [activeApi, loginNoteAccount, setIsSuccess]);
 
   const handleOpenChange = useCallback(
     async (nextOpen: boolean) => {
diff --git a/apps/bridge-dapp/src/containers/DepositContainer/DepositConfirmContainer.tsx b/apps/bridge-dapp/src/containers/DepositContainer/DepositConfirmContainer.tsx
index 7f9f97f2da..b03d25d7a9 100644
--- a/apps/bridge-dapp/src/containers/DepositContainer/DepositConfirmContainer.tsx
+++ b/apps/bridge-dapp/src/containers/DepositContainer/DepositConfirmContainer.tsx
@@ -8,10 +8,10 @@ import { useWebContext } from '@webb-tools/api-provider-environment';
 import { downloadString } from '@webb-tools/browser-utils';
 import { chainsPopulated } from '@webb-tools/dapp-config';
 import { useVAnchor } from '@webb-tools/react-hooks';
-import { Note, parseTypedChainId } from '@webb-tools/sdk-core';
+import { Note } from '@webb-tools/sdk-core';
 import { DepositConfirm, useCopyable } from '@webb-tools/webb-ui-components';
-import { ethers } from 'ethers';
-import { forwardRef, useCallback, useMemo, useState } from 'react';
+import { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
+import { ContractFunctionRevertedError, formatUnits } from 'viem';
 import {
   useLatestTransactionStage,
   useTransactionProgressValue,
@@ -24,6 +24,7 @@ import {
   getTransactionHash,
 } from '../../utils';
 import { DepositConfirmContainerProps } from './types';
+import { isViemError } from '@webb-tools/web3-api-provider';
 
 export const DepositConfirmContainer = forwardRef<
   HTMLDivElement,
@@ -85,7 +86,7 @@ export const DepositConfirmContainer = forwardRef<
     }, [apiConfig.currencies, fungibleTokenId]);
 
     const wrappableToken = useMemo(() => {
-      if (!wrappableTokenId) {
+      if (typeof wrappableTokenId === 'undefined') {
         return;
       }
 
@@ -127,7 +128,7 @@ export const DepositConfirmContainer = forwardRef<
       } = note.note;
 
       // Calculate the amount
-      const formattedAmount = ethers.utils.formatUnits(amount, denomination);
+      const formattedAmount = formatUnits(BigInt(amount), +denomination);
 
       // Get the deposit token symbol
       let srcTokenSymbol = tokenSymbol;
@@ -187,15 +188,14 @@ export const DepositConfirmContainer = forwardRef<
         );
         const indexBeforeInsert = nextIdx === 0 ? nextIdx : nextIdx - 1;
 
-        const { transactionHash, receipt } = await api.transact(...args);
+        const transactionHash = await api.transact(...args);
 
         tx.txHash = transactionHash;
 
-        const leaf = note.getLeaf();
-
         const noteIndex = await api.getLeafIndex(
-          receipt ?? leaf,
-          receipt ? note : indexBeforeInsert,
+          transactionHash,
+          note,
+          indexBeforeInsert,
           sourceIdentifyingData
         );
 
@@ -209,11 +209,26 @@ export const DepositConfirmContainer = forwardRef<
           txHash: transactionHash,
           outputNotes: [indexedNote],
         });
-      } catch (error: any) {
+      } catch (error) {
         console.error(error);
         removeNoteFromNoteManager(note);
         tx.txHash = getTransactionHash(error);
-        tx.fail(getErrorMessage(error));
+
+        let errorMessage = getErrorMessage(error);
+        if (isViemError(error)) {
+          errorMessage = error.shortMessage;
+
+          const revertError = error.walk(
+            (err) => err instanceof ContractFunctionRevertedError
+          );
+
+          if (revertError instanceof ContractFunctionRevertedError) {
+            errorMessage = revertError.reason ?? revertError.shortMessage;
+          }
+        }
+
+        tx.fail(errorMessage);
+
         captureSentryException(error, 'transactionType', 'deposit');
       } finally {
         onResetState?.();
diff --git a/apps/bridge-dapp/src/containers/DepositContainer/DepositContainer.tsx b/apps/bridge-dapp/src/containers/DepositContainer/DepositContainer.tsx
index 7bb20cfa71..a204cf1fbe 100644
--- a/apps/bridge-dapp/src/containers/DepositContainer/DepositContainer.tsx
+++ b/apps/bridge-dapp/src/containers/DepositContainer/DepositContainer.tsx
@@ -138,7 +138,7 @@ export const DepositContainer = forwardRef<
           if (maybeChain) {
             const currency = getNativeCurrencyFromConfig(
               currencies,
-              calculateTypedChainId(maybeChain.chainType, maybeChain.chainId)
+              calculateTypedChainId(maybeChain.chainType, maybeChain.id)
             );
 
             return {
@@ -169,7 +169,7 @@ export const DepositContainer = forwardRef<
 
       const currency = getNativeCurrencyFromConfig(
         currencies,
-        calculateTypedChainId(activeChain.chainType, activeChain.chainId)
+        calculateTypedChainId(activeChain.chainType, activeChain.id)
       );
 
       return {
@@ -314,7 +314,7 @@ export const DepositContainer = forwardRef<
 
       return getNativeCurrencyFromConfig(
         currencies,
-        calculateTypedChainId(activeChain.chainType, activeChain.chainId)
+        calculateTypedChainId(activeChain.chainType, activeChain.id)
       );
     }, [activeChain, currencies]);
 
@@ -403,12 +403,12 @@ export const DepositContainer = forwardRef<
 
       const sourceTypedChainId = calculateTypedChainId(
         activeChain.chainType,
-        activeChain.chainId
+        activeChain.id
       );
 
       const destTypedChainId = calculateTypedChainId(
         destChain.chainType,
-        destChain.chainId
+        destChain.id
       );
 
       const sourceId = apiConfig.getAnchorIdentifier(
@@ -445,11 +445,11 @@ export const DepositContainer = forwardRef<
         amount,
         sourceChain: {
           name: activeChain.name,
-          type: activeChain.base ?? 'webb-dev',
+          type: activeChain.group ?? 'webb-dev',
         },
         destChain: {
           name: destChain.name,
-          type: destChain.base ?? 'webb-dev',
+          type: destChain.group ?? 'webb-dev',
         },
         note: newNote,
         onResetState: handleResetState,
@@ -681,7 +681,7 @@ export const DepositContainer = forwardRef<
           const isSupported =
             activeWallet &&
             activeWallet.supportedChainIds.includes(
-              calculateTypedChainId(chain.chainType, chain.chainId)
+              calculateTypedChainId(chain.chainType, chain.id)
             );
 
           // If the selected chain is supported by the active wallet
diff --git a/apps/bridge-dapp/src/containers/TransferContainer/TransferConfirmContainer.tsx b/apps/bridge-dapp/src/containers/TransferContainer/TransferConfirmContainer.tsx
index 92a1357262..79b4dbfbea 100644
--- a/apps/bridge-dapp/src/containers/TransferContainer/TransferConfirmContainer.tsx
+++ b/apps/bridge-dapp/src/containers/TransferContainer/TransferConfirmContainer.tsx
@@ -7,7 +7,7 @@ import {
 import { useWebContext } from '@webb-tools/api-provider-environment';
 import { LoggerService } from '@webb-tools/app-util';
 import { downloadString } from '@webb-tools/browser-utils';
-import { chainsPopulated } from '@webb-tools/dapp-config';
+import { ZERO_BIG_INT, chainsPopulated } from '@webb-tools/dapp-config';
 import { useRelayers, useVAnchor } from '@webb-tools/react-hooks';
 import {
   ChainType,
@@ -20,7 +20,6 @@ import {
   getRoundedAmountString,
   useWebbUI,
 } from '@webb-tools/webb-ui-components';
-import { BigNumber, ethers } from 'ethers';
 import { forwardRef, useCallback, useMemo, useState } from 'react';
 import {
   useLatestTransactionStage,
@@ -34,6 +33,8 @@ import {
 } from '../../utils';
 import { RecipientPublicKeyTooltipContent } from './shared';
 import { TransferConfirmContainerProps } from './types';
+import { ContractFunctionRevertedError, formatEther } from 'viem';
+import { isViemError } from '@webb-tools/web3-api-provider';
 
 const logger = LoggerService.get('TransferConfirmContainer');
 
@@ -82,7 +83,7 @@ export const TransferConfirmContainer = forwardRef<
     const progress = useTransactionProgressValue(stage);
 
     const targetChainId = useMemo(
-      () => calculateTypedChainId(destChain.chainType, destChain.chainId),
+      () => calculateTypedChainId(destChain.chainType, destChain.id),
       [destChain]
     );
 
@@ -207,7 +208,7 @@ export const TransferConfirmContainer = forwardRef<
           notes: inputNotes,
           changeUtxo,
           transferUtxo,
-          feeAmount: feeAmount ?? BigNumber.from(0),
+          feeAmount: feeAmount ?? ZERO_BIG_INT,
         };
 
         const args = await vAnchorApi.prepareTransaction(tx, txPayload, '');
@@ -221,7 +222,7 @@ export const TransferConfirmContainer = forwardRef<
             outputNotes
           );
         } else {
-          const { transactionHash } = await vAnchorApi.transact(...args);
+          const transactionHash = await vAnchorApi.transact(...args);
 
           // Notification Success Transaction
           tx.txHash = transactionHash;
@@ -239,7 +240,22 @@ export const TransferConfirmContainer = forwardRef<
         console.error('Error occured while transfering', error);
         changeNote && (await removeNoteFromNoteManager(changeNote));
         tx.txHash = getTransactionHash(error);
-        tx.fail(getErrorMessage(error));
+
+        let errorMessage = getErrorMessage(error);
+        if (isViemError(error)) {
+          errorMessage = error.shortMessage;
+
+          const revertError = error.walk(
+            (err) => err instanceof ContractFunctionRevertedError
+          );
+
+          if (revertError instanceof ContractFunctionRevertedError) {
+            errorMessage = revertError.reason ?? revertError.shortMessage;
+          }
+        }
+
+        tx.fail(errorMessage);
+
         captureSentryException(error, 'transactionType', 'transfer');
       } finally {
         setMainComponent(undefined);
@@ -278,7 +294,7 @@ export const TransferConfirmContainer = forwardRef<
         return undefined;
       }
 
-      const amountNum = Number(ethers.utils.formatEther(feeAmount));
+      const amountNum = Number(formatEther(feeAmount));
 
       return getRoundedAmountString(amountNum, 3, {
         roundingFunction: Math.round,
@@ -295,11 +311,11 @@ export const TransferConfirmContainer = forwardRef<
         changeAmount={changeAmount}
         sourceChain={{
           name: activeChain?.name ?? '',
-          type: activeChain?.base ?? 'webb-dev',
+          type: activeChain?.group ?? 'webb-dev',
         }}
         destChain={{
           name: destChain.name,
-          type: destChain.base ?? 'webb-dev',
+          type: destChain.group ?? 'webb-dev',
         }}
         note={changeNote?.serialize()}
         progress={progress}
diff --git a/apps/bridge-dapp/src/containers/TransferContainer/TransferContainer.tsx b/apps/bridge-dapp/src/containers/TransferContainer/TransferContainer.tsx
index 5320c839eb..ca8dc5c932 100644
--- a/apps/bridge-dapp/src/containers/TransferContainer/TransferContainer.tsx
+++ b/apps/bridge-dapp/src/containers/TransferContainer/TransferContainer.tsx
@@ -1,6 +1,7 @@
 import { utxoFromVAnchorNote } from '@webb-tools/abstract-api-provider';
 import { useWebContext } from '@webb-tools/api-provider-environment';
 import {
+  ZERO_BIG_INT,
   Chain,
   CurrencyConfig,
   getNativeCurrencyFromConfig,
@@ -35,7 +36,7 @@ import {
   RelayerType,
 } from '@webb-tools/webb-ui-components/components/ListCard/types';
 import { TransferCardProps } from '@webb-tools/webb-ui-components/containers/TransferCard/types';
-import { BigNumber, ethers } from 'ethers';
+import { formatEther, parseUnits, formatUnits } from 'viem';
 import { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
 import { ChainListCardWrapper } from '../../components';
 import {
@@ -147,12 +148,16 @@ export const TransferContainer = forwardRef<
       resetMaxFeeInfo,
     } = useMaxFeeInfo(maxFeeArgs);
 
-    const feeInWei = useMemo(() => {
-      if (!feeInfo || feeInfo instanceof BigNumber) {
-        return feeInfo;
+    const [feeInWei, feeInEther] = useMemo(() => {
+      if (!feeInfo) {
+        return [null, null];
       }
 
-      return feeInfo.estimatedFee;
+      if (typeof feeInfo === 'bigint') {
+        return [feeInfo, +formatEther(feeInfo)];
+      }
+
+      return [feeInfo.estimatedFee, +formatEther(feeInfo.estimatedFee)];
     }, [feeInfo]);
 
     const currentNativeCurrency = useMemo(() => {
@@ -276,7 +281,7 @@ export const TransferContainer = forwardRef<
           if (destChain) {
             const typedChainId = calculateTypedChainId(
               destChain.chainType,
-              destChain.chainId
+              destChain.id
             );
 
             // If the selected currency does not support the selected chain, reset the selected chain
@@ -295,7 +300,7 @@ export const TransferContainer = forwardRef<
     // Callback for bridging asset input click
     const handleBridgingAssetInputClick = useCallback(() => {
       const typedChainId = destChain
-        ? calculateTypedChainId(destChain.chainType, destChain.chainId)
+        ? calculateTypedChainId(destChain.chainType, destChain.id)
         : currentTypedChainId ?? 0;
 
       const currencies = selectableBridgingAssets
@@ -426,9 +431,7 @@ export const TransferContainer = forwardRef<
         .map((relayer) => {
           const relayerData = relayer.capabilities.supportedChains[
             activeChain.chainType === ChainTypeEnum.EVM ? 'evm' : 'substrate'
-          ].get(
-            calculateTypedChainId(activeChain.chainType, activeChain.chainId)
-          );
+          ].get(calculateTypedChainId(activeChain.chainType, activeChain.id));
 
           if (!relayerData?.beneficiary) {
             return undefined;
@@ -489,22 +492,18 @@ export const TransferContainer = forwardRef<
         return transferAmount;
       }
 
-      if (!feeInWei || !transferAmount) {
+      if (!feeInEther || !transferAmount) {
         return transferAmount;
       }
 
       // If relayer selected, return the amount minus the relayer fee
-      const fee = Number(ethers.utils.formatEther(feeInWei));
-      return transferAmount - fee;
-    }, [activeRelayer, transferAmount, feeInWei]);
+      return transferAmount - feeInEther;
+    }, [activeRelayer, feeInEther, transferAmount]);
 
     // Boolean indicating whether inputs are valid to transfer
     const isValidToTransfer = useMemo<boolean>(() => {
-      const totalFee = Number(
-        ethers.utils.formatEther(feeInWei ?? ethers.constants.Zero)
-      );
-
       const amountOrZero = transferAmount ?? 0;
+      const totalFee = feeInEther ?? 0;
 
       return [
         Boolean(fungibleCurrency), // No fungible currency selected
@@ -516,7 +515,8 @@ export const TransferContainer = forwardRef<
         activeRelayer ? amountOrZero >= totalFee : true, // Insufficient balance
       ].some((value) => value === false);
     }, [
-      feeInWei,
+      transferAmount,
+      feeInEther,
       fungibleCurrency,
       destChain,
       recipientError,
@@ -524,73 +524,61 @@ export const TransferContainer = forwardRef<
       recipientPubKey,
       isValidRecipient,
       activeRelayer,
-      transferAmount,
     ]);
 
+    const transferAmountWei = useMemo(() => {
+      if (typeof transferAmount !== 'number' || !fungibleCurrency) {
+        return undefined;
+      }
+
+      return parseUnits(`${transferAmount}`, fungibleCurrency.view.decimals);
+    }, [fungibleCurrency, transferAmount]);
+
     // Calculate input notes for current amount
     const inputNotes = useMemo(() => {
-      if (!fungibleCurrency) {
+      if (!fungibleCurrency || !transferAmountWei) {
         return [];
       }
 
-      return (
-        NoteManager.getNotesFifo(
-          availableNotes,
-          ethers.utils.parseUnits(
-            transferAmount?.toString() ?? '0',
-            fungibleCurrency.view.decimals
-          )
-        ) ?? []
-      );
-    }, [transferAmount, availableNotes, fungibleCurrency]);
+      return NoteManager.getNotesFifo(availableNotes, transferAmountWei) ?? [];
+    }, [fungibleCurrency, transferAmountWei, availableNotes]);
 
     // Calculate the info for UI display
     const infoFormatted = useMemo(() => {
-      const spentValue = inputNotes.reduce<ethers.BigNumber>(
-        (acc, note) => acc.add(ethers.BigNumber.from(note.note.amount)),
-        ethers.BigNumber.from(0)
+      const spentValue = inputNotes.reduce<bigint>(
+        (acc, note) => acc + BigInt(note.note.amount),
+        ZERO_BIG_INT
       );
 
-      const changeAmountBigNumber = fungibleCurrency
-        ? spentValue.sub(
-            ethers.utils.parseUnits(
-              transferAmount?.toString() ?? '0',
-              fungibleCurrency.view.decimals
-            )
-          )
-        : ethers.BigNumber.from(0);
+      const changeAmountBigInt =
+        fungibleCurrency && transferAmountWei
+          ? spentValue - transferAmountWei
+          : ZERO_BIG_INT;
 
       const formattedTransferAmount = isValidAmount
         ? getRoundedAmountString(receivingAmount)
         : undefined;
 
-      const changeAmount =
+      const changeAmount = fungibleCurrency
+        ? +formatUnits(changeAmountBigInt, fungibleCurrency.view.decimals)
+        : 0;
+
+      const formattedChangeAmount =
         isValidAmount && fungibleCurrency
-          ? getRoundedAmountString(
-              Number(
-                ethers.utils.formatUnits(
-                  changeAmountBigNumber,
-                  fungibleCurrency.view.decimals
-                )
-              )
-            )
+          ? getRoundedAmountString(changeAmount)
           : undefined;
 
       return {
         transferAmount: formattedTransferAmount,
-        changeAmount,
+        changeAmount: formattedChangeAmount,
         transferTokenSymbol: selectedBridgingAsset?.symbol ?? '',
-        rawChangeAmount: fungibleCurrency
-          ? +ethers.utils.formatUnits(
-              changeAmountBigNumber,
-              fungibleCurrency.getDecimals()
-            )
-          : 0,
+        rawChangeAmount: changeAmountBigInt,
+        rawChangeAmountInEther: changeAmount,
       };
     }, [
-      transferAmount,
-      fungibleCurrency,
       inputNotes,
+      fungibleCurrency,
+      transferAmountWei,
       isValidAmount,
       receivingAmount,
       selectedBridgingAsset?.symbol,
@@ -670,17 +658,13 @@ export const TransferContainer = forwardRef<
         return;
       }
 
-      const changeAmount = infoFormatted.rawChangeAmount;
+      const changeAmountBI = infoFormatted.rawChangeAmount;
+      const changeAmountInEther = infoFormatted.rawChangeAmountInEther;
       const fungibleCurrencyDecimals = fungibleCurrency.getDecimals();
 
-      const transferAmountBN = ethers.utils.parseUnits(
-        transferAmount.toString(),
-        fungibleCurrencyDecimals
-      );
-
       const destTypedChainId = calculateTypedChainId(
         destChain.chainType,
-        destChain.chainId
+        destChain.id
       );
 
       // Current user keypair
@@ -690,14 +674,16 @@ export const TransferContainer = forwardRef<
         return;
       }
 
+      const transferAmountBI = transferAmountWei ?? ZERO_BIG_INT;
+
       // Setup the recipient's keypair.
       const recipientKeypair = Keypair.fromString(recipientPubKey);
 
-      const fee = feeInWei ?? BigNumber.from(0);
+      const fee = feeInWei ?? ZERO_BIG_INT;
 
       const utxoAmount = activeRelayer
-        ? transferAmountBN.sub(fee)
-        : transferAmountBN;
+        ? transferAmountBI - fee
+        : transferAmountBI;
 
       const transferUtxo = await activeApi.generateUtxo({
         curve: noteManager.defaultNoteGenInput.curve,
@@ -709,16 +695,11 @@ export const TransferContainer = forwardRef<
         index: activeApi.state.defaultUtxoIndex.toString(),
       });
 
-      const changeAmountBigNumber = ethers.utils.parseUnits(
-        changeAmount.toString(),
-        fungibleCurrencyDecimals
-      );
-
       const srcAddress =
         activeApi.state.activeBridge.targets[currentTypedChainId];
 
       let changeNote: Note | undefined;
-      if (changeAmountBigNumber.gt(0)) {
+      if (changeAmountBI > 0) {
         changeNote = await noteManager.generateNote(
           activeApi.backend,
           currentTypedChainId,
@@ -727,7 +708,7 @@ export const TransferContainer = forwardRef<
           srcAddress,
           fungibleCurrency.view.symbol,
           fungibleCurrency.getDecimals(),
-          changeAmount
+          changeAmountBI
         );
       }
 
@@ -739,7 +720,7 @@ export const TransferContainer = forwardRef<
         : await activeApi.generateUtxo({
             curve: noteManager.defaultNoteGenInput.curve,
             backend: activeApi.backend,
-            amount: changeAmountBigNumber.toString(),
+            amount: changeAmountBI.toString(),
             chainId: currentTypedChainId.toString(),
             keypair,
             originChainId: currentTypedChainId.toString(),
@@ -750,12 +731,10 @@ export const TransferContainer = forwardRef<
         <TransferConfirmContainer
           className="min-w-[550px]"
           inputNotes={inputNotes}
-          amount={Number(
-            ethers.utils.formatUnits(utxoAmount, fungibleCurrencyDecimals)
-          )}
+          amount={Number(formatUnits(utxoAmount, fungibleCurrencyDecimals))}
           feeInWei={feeInWei}
           feeToken={feeTokenSymbol}
-          changeAmount={changeAmount}
+          changeAmount={changeAmountInEther}
           currency={fungibleCurrency}
           destChain={destChain}
           recipient={recipientPubKey}
@@ -780,6 +759,8 @@ export const TransferContainer = forwardRef<
       currentTypedChainId,
       inputNotes,
       infoFormatted.rawChangeAmount,
+      infoFormatted.rawChangeAmountInEther,
+      transferAmountWei,
       recipientPubKey,
       feeInWei,
       activeRelayer,
@@ -823,7 +804,7 @@ export const TransferContainer = forwardRef<
           if (destChain) {
             const typedChainId = calculateTypedChainId(
               destChain.chainType,
-              destChain.chainId
+              destChain.id
             );
 
             // If the default fungible currency doesn't have the chain, reset the dest chain
@@ -979,16 +960,14 @@ export const TransferContainer = forwardRef<
         return 'Calculating...';
       }
 
-      if (!feeInWei) {
+      if (!feeInEther) {
         return '--';
       }
 
-      return `${getRoundedAmountString(
-        Number(ethers.utils.formatEther(feeInWei)),
-        3,
-        { roundingFunction: Math.round }
-      )} ${feeTokenSymbol}`;
-    }, [feeInWei, feeTokenSymbol, isFetchingMaxFeeInfo]);
+      return `${getRoundedAmountString(feeInEther, 3, {
+        roundingFunction: Math.round,
+      })} ${feeTokenSymbol}`;
+    }, [feeInEther, feeTokenSymbol, isFetchingMaxFeeInfo]);
 
     const infoItemProps = useMemo<TransferCardProps['infoItemProps']>(() => {
       const { transferTokenSymbol } = infoFormatted;
@@ -1030,27 +1009,26 @@ export const TransferContainer = forwardRef<
 
     // Transfer button props
     const buttonDesc = useMemo(() => {
-      if (!feeInWei || !transferAmount) {
+      if (!feeInEther || !transferAmount) {
         return;
       }
 
-      const totalFee = Number(ethers.utils.formatEther(feeInWei));
-      const formattedFee = getRoundedAmountString(totalFee, 3, {
+      const formattedFee = getRoundedAmountString(feeInEther, 3, {
         roundingFunction: Math.round,
       });
       const tkSymbol = infoFormatted?.transferTokenSymbol ?? '';
       const feeText = `${formattedFee} ${tkSymbol}`.trim();
 
-      if (activeRelayer && transferAmount < totalFee) {
+      if (activeRelayer && transferAmount < feeInEther) {
         return `Insufficient funds. You need more than ${feeText} to cover the fee`;
       }
 
       return;
     }, [
-      activeRelayer,
+      feeInEther,
       transferAmount,
-      feeInWei,
       infoFormatted?.transferTokenSymbol,
+      activeRelayer,
     ]);
 
     const isDisabled = useMemo(() => {
diff --git a/apps/bridge-dapp/src/containers/TransferContainer/types.d.ts b/apps/bridge-dapp/src/containers/TransferContainer/types.d.ts
index 53adab75bf..13196412d5 100644
--- a/apps/bridge-dapp/src/containers/TransferContainer/types.d.ts
+++ b/apps/bridge-dapp/src/containers/TransferContainer/types.d.ts
@@ -5,7 +5,6 @@ import { AssetType } from '@webb-tools/webb-ui-components/components/ListCard/ty
 import { Chain } from '@webb-tools/dapp-config';
 import { Note } from '@webb-tools/sdk-core';
 import { TransactionPayload } from '@webb-tools/webb-ui-components';
-import { BigNumber } from 'ethers';
 
 export type CurrencyRecord = Record<Currency['id'], Currency>;
 
@@ -98,7 +97,7 @@ export interface TransferConfirmContainerProps
   /**
    * The fee amount
    */
-  feeInWei?: BigNumber | null;
+  feeInWei?: bigint | null;
 
   /**
    * The fee token
diff --git a/apps/bridge-dapp/src/containers/UploadSpendNoteModal/PasteModalContent.tsx b/apps/bridge-dapp/src/containers/UploadSpendNoteModal/PasteModalContent.tsx
index 1e1d0d58eb..61b8937418 100644
--- a/apps/bridge-dapp/src/containers/UploadSpendNoteModal/PasteModalContent.tsx
+++ b/apps/bridge-dapp/src/containers/UploadSpendNoteModal/PasteModalContent.tsx
@@ -15,9 +15,9 @@ import {
   chainsPopulated,
   getNativeCurrencyFromConfig,
 } from '@webb-tools/dapp-config';
-import { ethers } from 'ethers';
 import { PasteModalContentProps } from './types';
 import { isValidNote } from '../../utils';
+import { formatUnits } from 'viem';
 
 const initialNotes = {
   [uniqueId()]: '',
@@ -115,20 +115,20 @@ export const PasteModalContent: FC<PasteModalContentProps> = ({
 
             const sourceCurrency = getNativeCurrencyFromConfig(
               currencies,
-              calculateTypedChainId(sourceChain.chainType, sourceChain.chainId)
+              calculateTypedChainId(sourceChain.chainType, sourceChain.id)
             );
             const destCurrency = getNativeCurrencyFromConfig(
               currencies,
-              calculateTypedChainId(destChain.chainType, destChain.chainId)
+              calculateTypedChainId(destChain.chainType, destChain.id)
             );
 
             if (!sourceCurrency || !destCurrency) {
               return null;
             }
 
-            const balance = ethers.utils.formatUnits(
-              note.note.amount,
-              note.note.denomination
+            const balance = formatUnits(
+              BigInt(note.note.amount),
+              +note.note.denomination
             );
 
             return (
diff --git a/apps/bridge-dapp/src/containers/UploadSpendNoteModal/UploadModalContent.tsx b/apps/bridge-dapp/src/containers/UploadSpendNoteModal/UploadModalContent.tsx
index c9a6733085..d8e6c99e04 100644
--- a/apps/bridge-dapp/src/containers/UploadSpendNoteModal/UploadModalContent.tsx
+++ b/apps/bridge-dapp/src/containers/UploadSpendNoteModal/UploadModalContent.tsx
@@ -15,7 +15,6 @@ import {
   getHumanFileSize,
   notificationApi,
 } from '@webb-tools/webb-ui-components';
-import { ethers } from 'ethers';
 import { uniqueId } from 'lodash';
 import {
   forwardRef,
@@ -26,6 +25,7 @@ import {
   useState,
 } from 'react';
 import { RefHandle, UploadModalContentProps } from './types';
+import { formatUnits } from 'viem';
 
 export const UploadModalContent = forwardRef<
   RefHandle,
@@ -189,20 +189,20 @@ export const UploadModalContent = forwardRef<
 
             const sourceCurrency = getNativeCurrencyFromConfig(
               currencies,
-              calculateTypedChainId(sourceChain.chainType, sourceChain.chainId)
+              calculateTypedChainId(sourceChain.chainType, sourceChain.id)
             );
             const destCurrency = getNativeCurrencyFromConfig(
               currencies,
-              calculateTypedChainId(destChain.chainType, destChain.chainId)
+              calculateTypedChainId(destChain.chainType, destChain.id)
             );
 
             if (!sourceCurrency || !destCurrency) {
               return null;
             }
 
-            const balance = ethers.utils.formatUnits(
-              note.note.amount,
-              note.note.denomination
+            const balance = formatUnits(
+              BigInt(note.note.amount),
+              +note.note.denomination
             );
 
             return (
diff --git a/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawConfirmContainer.tsx b/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawConfirmContainer.tsx
index 0160e39710..b416d437fb 100644
--- a/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawConfirmContainer.tsx
+++ b/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawConfirmContainer.tsx
@@ -1,6 +1,6 @@
 import { useWebContext } from '@webb-tools/api-provider-environment';
 import { downloadString } from '@webb-tools/browser-utils';
-import { chainsPopulated } from '@webb-tools/dapp-config';
+import { ZERO_BIG_INT, chainsPopulated } from '@webb-tools/dapp-config';
 import { useRelayers, useVAnchor } from '@webb-tools/react-hooks';
 import { ChainType, Note } from '@webb-tools/sdk-core';
 import {
@@ -17,7 +17,6 @@ import {
   TransactionState,
   WithdrawTransactionPayloadType,
 } from '@webb-tools/abstract-api-provider';
-import { BigNumber, ethers } from 'ethers';
 import {
   useLatestTransactionStage,
   useTransactionProgressValue,
@@ -29,6 +28,8 @@ import {
   getTransactionHash,
 } from '../../utils';
 import { WithdrawConfirmContainerProps } from './types';
+import { ContractFunctionRevertedError, formatEther, formatUnits } from 'viem';
+import { isViemError } from '@webb-tools/web3-api-provider';
 
 export const WithdrawConfirmContainer = forwardRef<
   HTMLDivElement,
@@ -195,6 +196,7 @@ export const WithdrawConfirmContainer = forwardRef<
       const {
         sourceChainId: sourceTypedChainId,
         targetChainId: destTypedChainId,
+        denomination,
         tokenSymbol,
       } = note.note;
 
@@ -215,7 +217,7 @@ export const WithdrawConfirmContainer = forwardRef<
       }
       const tokenURI = getTokenURI(currency, destTypedChainId);
 
-      const amount = Number(ethers.utils.formatEther(amountAfterFee));
+      const amount = Number(formatUnits(amountAfterFee, +denomination));
 
       const tx = Transaction.new<NewNotesTxResult>('Withdraw', {
         amount,
@@ -238,14 +240,14 @@ export const WithdrawConfirmContainer = forwardRef<
           await addNoteToNoteManager(changeNote);
         }
 
-        const refund = refundAmount ?? BigNumber.from(0);
+        const refund = refundAmount ?? ZERO_BIG_INT;
 
         const txPayload: WithdrawTransactionPayloadType = {
           notes: availableNotes,
           changeUtxo,
           recipient,
-          refundAmount: refund.toBigInt(),
-          feeAmount: fee.toBigInt(),
+          refundAmount: refund,
+          feeAmount: fee,
         };
 
         const args = await vAnchorApi.prepareTransaction(
@@ -263,7 +265,7 @@ export const WithdrawConfirmContainer = forwardRef<
             outputNotes
           );
         } else {
-          const { transactionHash } = await vAnchorApi.transact(...args);
+          const transactionHash = await vAnchorApi.transact(...args);
 
           // Notification Success Transaction
           tx.txHash = transactionHash;
@@ -281,7 +283,22 @@ export const WithdrawConfirmContainer = forwardRef<
         console.log('Error while executing withdraw', error);
         changeNote && (await removeNoteFromNoteManager(changeNote));
         tx.txHash = getTransactionHash(error);
-        tx.fail(getErrorMessage(error));
+
+        let errorMessage = getErrorMessage(error);
+        if (isViemError(error)) {
+          errorMessage = error.shortMessage;
+
+          const revertError = error.walk(
+            (err) => err instanceof ContractFunctionRevertedError
+          );
+
+          if (revertError instanceof ContractFunctionRevertedError) {
+            errorMessage = revertError.reason ?? revertError.shortMessage;
+          }
+        }
+
+        tx.fail(errorMessage);
+
         captureSentryException(error, 'transactionType', 'withdraw');
       } finally {
         setMainComponent(undefined);
@@ -319,7 +336,7 @@ export const WithdrawConfirmContainer = forwardRef<
     }, [txId, txPayloads]);
 
     const formattedFee = useMemo(() => {
-      const feeInEthers = ethers.utils.formatEther(fee);
+      const feeInEthers = formatEther(fee);
 
       if (activeRelayer) {
         const formattedRelayerFee = getRoundedAmountString(
@@ -338,7 +355,7 @@ export const WithdrawConfirmContainer = forwardRef<
         return undefined;
       }
 
-      const refundInEthers = Number(ethers.utils.formatEther(refundAmount));
+      const refundInEthers = Number(formatEther(refundAmount));
 
       return getRoundedAmountString(refundInEthers, 3, {
         roundingFunction: Math.round,
@@ -346,7 +363,7 @@ export const WithdrawConfirmContainer = forwardRef<
     }, [refundAmount]);
 
     const remainingAmount = useMemo(() => {
-      const amountInEthers = Number(ethers.utils.formatEther(amountAfterFee));
+      const amountInEthers = Number(formatEther(amountAfterFee));
 
       return getRoundedAmountString(amountInEthers, 3, {
         roundingFunction: Math.round,
@@ -361,11 +378,11 @@ export const WithdrawConfirmContainer = forwardRef<
         activeChains={activeChains}
         sourceChain={{
           name: chainsPopulated[sourceTypedChainId].name,
-          type: chainsPopulated[sourceTypedChainId].base ?? 'webb-dev',
+          type: chainsPopulated[sourceTypedChainId].group ?? 'webb-dev',
         }}
         destChain={{
           name: chainsPopulated[targetTypedChainId].name,
-          type: chainsPopulated[targetTypedChainId].base ?? 'webb-dev',
+          type: chainsPopulated[targetTypedChainId].group ?? 'webb-dev',
         }}
         actionBtnProps={{
           isDisabled: withdrawTxInProgress
diff --git a/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawContainer.tsx b/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawContainer.tsx
index 9a45c5ac31..c4f97ed141 100644
--- a/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawContainer.tsx
+++ b/apps/bridge-dapp/src/containers/WithdrawContainer/WithdrawContainer.tsx
@@ -1,5 +1,10 @@
+import { utxoFromVAnchorNote } from '@webb-tools/abstract-api-provider';
 import { useWebContext } from '@webb-tools/api-provider-environment';
-import { getNativeCurrencyFromConfig } from '@webb-tools/dapp-config';
+import {
+  ZERO_BIG_INT,
+  getNativeCurrencyFromConfig,
+} from '@webb-tools/dapp-config';
+import { isValidAddress } from '@webb-tools/dapp-types';
 import { NoteManager } from '@webb-tools/note-manager';
 import {
   useBalancesFromNotes,
@@ -26,7 +31,6 @@ import {
   AssetType,
   RelayerType,
 } from '@webb-tools/webb-ui-components/components/ListCard/types';
-import { BigNumber, ethers } from 'ethers';
 import {
   ComponentProps,
   forwardRef,
@@ -35,20 +39,19 @@ import {
   useMemo,
   useState,
 } from 'react';
-import { utxoFromVAnchorNote } from '@webb-tools/abstract-api-provider';
-import { isValidAddress } from '@webb-tools/dapp-types';
+import { formatEther, formatUnits, parseEther, parseUnits } from 'viem';
 import {
   WalletState,
   useAddCurrency,
   useConnectWallet,
   useMaxFeeInfo,
 } from '../../hooks';
+import { isTokenAddedToMetamask } from '../../hooks/useAddCurrency';
 import { useEducationCardStep } from '../../hooks/useEducationCardStep';
 import useStatesFromNotes from '../../hooks/useStatesFromNotes';
+import { WithdrawConfirmContainer } from './WithdrawConfirmContainer';
 import { ExchangeRateInfo, TransactionFeeInfo } from './shared';
 import { WithdrawContainerProps } from './types';
-import { WithdrawConfirmContainer } from './WithdrawConfirmContainer';
-import { isTokenAddedToMetamask } from '../../hooks/useAddCurrency';
 
 const DEFAULT_FIXED_AMOUNTS = [0.1, 0.25, 0.5, 1.0];
 
@@ -179,18 +182,18 @@ export const WithdrawContainer = forwardRef<
 
   const {
     isLoading: isFetchingFeeInfo,
-    feeInfo: feeInfoOrBigNumber,
+    feeInfo: feeInfoOrBigInt,
     fetchFeeInfo,
     resetMaxFeeInfo,
   } = useMaxFeeInfo(maxFeeArgs);
 
   const feeInfo = useMemo(() => {
-    if (!(feeInfoOrBigNumber instanceof BigNumber)) {
-      return feeInfoOrBigNumber;
+    if (typeof feeInfoOrBigInt !== 'bigint') {
+      return feeInfoOrBigInt;
     }
 
     return null;
-  }, [feeInfoOrBigNumber]);
+  }, [feeInfoOrBigInt]);
 
   const currentNativeCurrency = useMemo(() => {
     if (!currentTypedChainId) {
@@ -325,31 +328,42 @@ export const WithdrawContainer = forwardRef<
 
   const [isValidRecipient, setIsValidRecipient] = useState(false);
 
-  const totalFeeInWei = useMemo(() => {
-    if (!feeInfoOrBigNumber || feeInfoOrBigNumber instanceof BigNumber) {
-      return feeInfoOrBigNumber;
+  const [totalFeeInWei, totalFee] = useMemo(() => {
+    if (!feeInfoOrBigInt || typeof feeInfoOrBigInt === 'bigint') {
+      return [null, null];
     }
 
-    let feeWei = feeInfoOrBigNumber.estimatedFee;
+    let feeWei = feeInfoOrBigInt.estimatedFee;
+
+    // If the relayer is active, the fee will be paid in the selected fungible currency.
+    // Otherwise, the fee will be paid in the native currency of the selected chain.
+    const decimals = activeRelayer
+      ? fungibleCurrency?.getDecimals()
+      : currentNativeCurrency?.decimals;
 
     if (refundAmount && isRefund) {
-      const exchangeRate = Number(
-        ethers.utils.formatEther(feeInfoOrBigNumber.refundExchangeRate)
-      );
-      const converted = refundAmount * exchangeRate;
-      const refundAmountWei = ethers.utils.parseEther(converted.toFixed(6));
+      const parsedRefundAmount = decimals
+        ? parseUnits(`${refundAmount}`, decimals)
+        : parseEther(`${refundAmount}`);
 
-      feeWei = feeWei.add(refundAmountWei);
+      feeWei += parsedRefundAmount * feeInfoOrBigInt.refundExchangeRate;
     }
 
-    return feeWei;
-  }, [feeInfoOrBigNumber, isRefund, refundAmount]);
+    const feeFormatted = decimals
+      ? formatUnits(feeWei, decimals)
+      : formatEther(feeWei);
 
-  const isDisabledWithdraw = useMemo(() => {
-    const totalFee = Number(
-      ethers.utils.formatEther(totalFeeInWei ?? ethers.constants.Zero)
-    );
+    return [feeWei, Number(feeFormatted)];
+  }, [
+    feeInfoOrBigInt,
+    activeRelayer,
+    fungibleCurrency,
+    currentNativeCurrency?.decimals,
+    refundAmount,
+    isRefund,
+  ]);
 
+  const isDisabledWithdraw = useMemo(() => {
     return [
       Boolean(fungibleCurrency), // No fungible currency selected
       isUnwrap ? Boolean(wrappableCurrency) : true, // No unwrappable currency selected when unwrapping
@@ -357,11 +371,10 @@ export const WithdrawContainer = forwardRef<
       Boolean(recipient), // No recipient address
       isValidRecipient, // Invalid recipient address
       typeof liquidity === 'number' ? liquidity >= amount : true, // Insufficient liquidity
-      activeRelayer ? amount >= totalFee : true, // When relayer is selected, amount should be greater than fee
-      Boolean(feeInfoOrBigNumber),
+      totalFee ? amount >= totalFee : true, // When relayer is selected, amount should be greater than fee
+      Boolean(feeInfoOrBigInt),
     ].some((value) => value === false);
   }, [
-    totalFeeInWei,
     fungibleCurrency,
     isUnwrap,
     wrappableCurrency,
@@ -370,8 +383,8 @@ export const WithdrawContainer = forwardRef<
     isValidRecipient,
     liquidity,
     amount,
-    activeRelayer,
-    feeInfoOrBigNumber,
+    totalFee,
+    feeInfoOrBigInt,
   ]);
 
   const buttonText = useMemo(() => {
@@ -401,23 +414,38 @@ export const WithdrawContainer = forwardRef<
     selectedUnwrapToken,
   ]);
 
-  const amountAfterFeeWei = useMemo(() => {
-    const amountWei = ethers.utils.parseEther(amount.toString());
+  const [amountAfterFeeWei, amountAfterFeeEther] = useMemo(() => {
+    const decimals =
+      wrappableCurrency?.getDecimals() ?? fungibleCurrency?.getDecimals();
+
+    const amountWei = decimals
+      ? parseUnits(`${amount}`, decimals)
+      : parseEther(`${amount}`);
+
     // If no fee or no active relayer, then return the original amount
     // as the fee is not deducted from the amount
     if (!totalFeeInWei || !activeRelayer) {
-      return amountWei;
+      return [amountWei, amount] as const;
     }
 
-    return amountWei.sub(totalFeeInWei);
-  }, [activeRelayer, amount, totalFeeInWei]);
+    const amountAfterFeeWei = amountWei - totalFeeInWei;
+    const amountAfterFee = decimals
+      ? formatUnits(amountAfterFeeWei, decimals)
+      : formatEther(amountAfterFeeWei);
+
+    return [amountAfterFeeWei, Number(amountAfterFee)] as const;
+  }, [
+    activeRelayer,
+    amount,
+    fungibleCurrency,
+    totalFeeInWei,
+    wrappableCurrency,
+  ]);
 
   // Calculate the info for UI display
   const infoCalculated = useMemo(() => {
-    const amountAfterFee = Number(ethers.utils.formatEther(amountAfterFeeWei));
-
     const receivingAmount = isValidAmount
-      ? getRoundedAmountString(amountAfterFee, 3, {
+      ? getRoundedAmountString(amountAfterFeeEther, 3, {
           roundingFunction: Math.round,
         })
       : undefined;
@@ -440,7 +468,7 @@ export const WithdrawContainer = forwardRef<
     };
   }, [
     amount,
-    amountAfterFeeWei,
+    amountAfterFeeEther,
     availableAmountFromNotes,
     fungibleCurrency?.view.symbol,
     isUnwrap,
@@ -453,7 +481,7 @@ export const WithdrawContainer = forwardRef<
       feeInfo ? (
         <ExchangeRateInfo
           exchangeRate={getRoundedAmountString(
-            +ethers.utils.formatEther(feeInfo.refundExchangeRate),
+            +formatEther(feeInfo.refundExchangeRate),
             6,
             { roundingFunction: Math.round }
           )}
@@ -466,18 +494,15 @@ export const WithdrawContainer = forwardRef<
 
   const transactionFeeInfo = useMemo(() => {
     const estimatedFee = feeInfo
-      ? getRoundedAmountString(
-          Number(ethers.utils.formatEther(feeInfo.estimatedFee)),
-          3,
-          { roundingFunction: Math.round }
-        )
+      ? getRoundedAmountString(Number(formatEther(feeInfo.estimatedFee)), 3, {
+          roundingFunction: Math.round,
+        })
       : undefined;
 
     const refundFee =
       feeInfo && refundAmount && isRefund
         ? getRoundedAmountString(
-            refundAmount *
-              Number(ethers.utils.formatEther(feeInfo.refundExchangeRate))
+            refundAmount * Number(formatEther(feeInfo.refundExchangeRate))
           )
         : undefined;
 
@@ -547,7 +572,7 @@ export const WithdrawContainer = forwardRef<
     // Get the notes that will be spent for this withdraw
     const inputNotes = NoteManager.getNotesFifo(
       availableNotesFromManager ?? [],
-      ethers.utils.parseUnits(amount.toString(), fungibleDecimals)
+      parseUnits(amount.toString() as `${number}`, fungibleDecimals)
     );
 
     if (!inputNotes) {
@@ -555,16 +580,13 @@ export const WithdrawContainer = forwardRef<
     }
 
     // Get the cumulative value of the notes to be spent
-    const sumInputNotes = inputNotes.reduce<ethers.BigNumber>(
-      (currentValue, note) => {
-        return currentValue.add(ethers.BigNumber.from(note.note.amount));
-      },
-      BigNumber.from(0)
-    );
+    const sumInputNotes = inputNotes.reduce<bigint>((currentValue, note) => {
+      return currentValue + BigInt(note.note.amount);
+    }, BigInt(0));
 
-    const changeAmountBigNumber = sumInputNotes.sub(
-      ethers.utils.parseUnits(amount.toString(), fungibleDecimals)
-    );
+    const changeAmountBI =
+      sumInputNotes -
+      parseUnits(amount.toString() as `${number}`, fungibleDecimals);
 
     const keypair = noteManager.getKeypair();
     if (!keypair.privkey) {
@@ -574,12 +596,12 @@ export const WithdrawContainer = forwardRef<
 
     // Formatted the change amount for UI displaying
     const formattedChangeAmount = Number(
-      ethers.utils.formatUnits(changeAmountBigNumber, fungibleDecimals)
+      formatUnits(changeAmountBI, fungibleDecimals)
     );
 
     // Generate the change note based on the change utxo
     let changeNote: Note | undefined;
-    if (changeAmountBigNumber.gt(0)) {
+    if (changeAmountBI > 0) {
       changeNote = await noteManager.generateNote(
         activeApi.backend,
         currentTypedChainId,
@@ -601,7 +623,7 @@ export const WithdrawContainer = forwardRef<
       : await activeApi.generateUtxo({
           curve: noteManager.defaultNoteGenInput.curve,
           backend: activeApi.backend,
-          amount: changeAmountBigNumber.toString(),
+          amount: changeAmountBI.toString(),
           chainId: currentTypedChainId.toString(),
           keypair,
           originChainId: currentTypedChainId.toString(),
@@ -612,9 +634,9 @@ export const WithdrawContainer = forwardRef<
     const sourceTypedChainId = Number(inputNotes[0].note.sourceChainId);
 
     const fee =
-      feeInfoOrBigNumber instanceof BigNumber
-        ? feeInfoOrBigNumber
-        : totalFeeInWei ?? BigNumber.from(0);
+      typeof feeInfoOrBigInt === 'bigint'
+        ? feeInfoOrBigInt
+        : totalFeeInWei ?? ZERO_BIG_INT;
 
     setMainComponent(
       <WithdrawConfirmContainer
@@ -640,7 +662,7 @@ export const WithdrawContainer = forwardRef<
         }
         feeInfo={transactionFeeInfo}
         receivingInfo={refundInfo}
-        refundAmount={ethers.utils.parseEther(refundAmount.toString())}
+        refundAmount={parseEther(`${refundAmount}`)}
         refundToken={currentNativeCurrency?.symbol}
         recipient={recipient}
         onResetState={handleResetState}
@@ -659,7 +681,7 @@ export const WithdrawContainer = forwardRef<
     recipient,
     availableNotesFromManager,
     amount,
-    feeInfoOrBigNumber,
+    feeInfoOrBigInt,
     totalFeeInWei,
     setMainComponent,
     amountAfterFeeWei,
@@ -814,9 +836,7 @@ export const WithdrawContainer = forwardRef<
           .map((relayer) => {
             const relayerData = relayer.capabilities.supportedChains[
               activeChain.chainType === ChainType.EVM ? 'evm' : 'substrate'
-            ].get(
-              calculateTypedChainId(activeChain.chainType, activeChain.chainId)
-            );
+            ].get(calculateTypedChainId(activeChain.chainType, activeChain.id));
 
             if (!relayerData?.beneficiary) {
               return undefined;
@@ -992,7 +1012,7 @@ export const WithdrawContainer = forwardRef<
       }
 
       const relayerMaxRefund = parseFloat(
-        ethers.utils.formatEther(feeInfo?.maxRefund ?? '0')
+        formatEther(feeInfo?.maxRefund ?? ZERO_BIG_INT)
       );
       if (Number.isNaN(relayerMaxRefund) || parsedValue > relayerMaxRefund) {
         setRefundAmountError(
@@ -1017,7 +1037,7 @@ export const WithdrawContainer = forwardRef<
         if (!feeInfo) {
           return;
         }
-        parseRefundAmount(ethers.utils.formatEther(feeInfo.maxRefund));
+        parseRefundAmount(formatEther(feeInfo.maxRefund));
       },
     }),
     [feeInfo, parseRefundAmount, refundAmount, refundAmountError]
@@ -1028,28 +1048,22 @@ export const WithdrawContainer = forwardRef<
       return undefined;
     }
 
-    const receivingAmount = +ethers.utils.formatEther(amountAfterFeeWei);
-    if (Number.isNaN(receivingAmount)) {
-      console.error('Invalid receiving amount');
-      return undefined;
-    }
-
     const unwrapTkSym = selectedUnwrapToken?.symbol ?? '';
 
-    if (receivingAmount > liquidity) {
+    if (amountAfterFeeEther > liquidity) {
       return `Insufficient liquidity. Available liquidity is ${liquidity} ${unwrapTkSym}`;
     }
-  }, [amountAfterFeeWei, isUnwrap, liquidity, selectedUnwrapToken?.symbol]);
+  }, [amountAfterFeeEther, isUnwrap, liquidity, selectedUnwrapToken?.symbol]);
 
   const buttonDesc = useMemo(() => {
-    if (!totalFeeInWei) {
+    if (!totalFee) {
       return liquidityDesc;
     }
 
-    const totalFee = Number(ethers.utils.formatEther(totalFeeInWei));
     const formattedFee = getRoundedAmountString(totalFee, 3, {
       roundingFunction: Math.round,
     });
+
     const tkSymbol = selectedFungibleToken?.symbol ?? '';
     const feeText = `${formattedFee} ${tkSymbol}`.trim();
 
@@ -1063,7 +1077,7 @@ export const WithdrawContainer = forwardRef<
     amount,
     liquidityDesc,
     selectedFungibleToken?.symbol,
-    totalFeeInWei,
+    totalFee,
   ]);
 
   const infoItemProps = useMemo<
@@ -1085,20 +1099,20 @@ export const WithdrawContainer = forwardRef<
         ? `${formattedRefundAmount} ${nativeCurrencySymbol}`
         : '--';
 
-    const feeBN = totalFeeInWei
+    const feeBI = totalFeeInWei
       ? totalFeeInWei
-      : feeInfoOrBigNumber instanceof BigNumber
-      ? feeInfoOrBigNumber
+      : typeof feeInfoOrBigInt === 'bigint'
+      ? feeInfoOrBigInt
       : undefined;
 
     let feeText = '--';
-    if (feeBN) {
-      const fee = Number(ethers.utils.formatEther(feeBN));
+    if (feeBI) {
+      const fee = Number(formatEther(feeBI));
 
       // If feeInfo is instance of BigNumber, it means that the fee is in native currency
       // otherwise it's in fungible token
       const tokenSymbol =
-        feeInfoOrBigNumber instanceof BigNumber
+        typeof feeInfoOrBigInt === 'bigint'
           ? nativeCurrencySymbol
           : fungiCurrencySymbol;
 
@@ -1149,7 +1163,7 @@ export const WithdrawContainer = forwardRef<
     >['infoItemProps'];
   }, [
     currentNativeCurrency?.symbol,
-    feeInfoOrBigNumber,
+    feeInfoOrBigInt,
     infoCalculated,
     isFetchingFeeInfo,
     isRefund,
diff --git a/apps/bridge-dapp/src/containers/WithdrawContainer/types.d.ts b/apps/bridge-dapp/src/containers/WithdrawContainer/types.d.ts
index 14cc8e65f4..2e538a2c50 100644
--- a/apps/bridge-dapp/src/containers/WithdrawContainer/types.d.ts
+++ b/apps/bridge-dapp/src/containers/WithdrawContainer/types.d.ts
@@ -4,7 +4,6 @@ import { Note, Utxo } from '@webb-tools/sdk-core';
 import { TitleWithInfo } from '@webb-tools/webb-ui-components';
 import { TokenType } from '@webb-tools/webb-ui-components/components/BridgeInputs/types';
 import { PropsOf } from '@webb-tools/webb-ui-components/types';
-import { BigNumber } from 'ethers';
 import { ComponentProps } from 'react';
 import { BridgeTabContainerProps } from '../types';
 
@@ -47,12 +46,12 @@ export interface WithdrawConfirmContainerProps extends PropsOf<'div'> {
   /**
    * The fee number
    */
-  fee: BigNumber;
+  fee: bigint;
 
   /**
    * The amount after fee
    */
-  amountAfterFee: BigNumber;
+  amountAfterFee: bigint;
 
   /**
    * Recipient address
@@ -82,7 +81,7 @@ export interface WithdrawConfirmContainerProps extends PropsOf<'div'> {
   /**
    * Refund amount
    */
-  refundAmount?: BigNumber;
+  refundAmount?: bigint;
 
   /**
    * Refund token
diff --git a/apps/bridge-dapp/src/containers/note-account-tables/ShieldedAssetsTableContainer/ShieldedAssetsTableContainer.tsx b/apps/bridge-dapp/src/containers/note-account-tables/ShieldedAssetsTableContainer/ShieldedAssetsTableContainer.tsx
index 2a2d7b9b2c..a21b2a12d5 100644
--- a/apps/bridge-dapp/src/containers/note-account-tables/ShieldedAssetsTableContainer/ShieldedAssetsTableContainer.tsx
+++ b/apps/bridge-dapp/src/containers/note-account-tables/ShieldedAssetsTableContainer/ShieldedAssetsTableContainer.tsx
@@ -134,7 +134,7 @@ export const ShieldedAssetsTableContainer: FC<
       const isSupported =
         activeWallet &&
         activeWallet.supportedChainIds.includes(
-          calculateTypedChainId(chain.chainType, chain.chainId)
+          calculateTypedChainId(chain.chainType, chain.id)
         );
 
       if (isSupported) {
diff --git a/apps/bridge-dapp/src/hooks/useAddCurrency.ts b/apps/bridge-dapp/src/hooks/useAddCurrency.ts
index a85110b173..7d3622ac92 100644
--- a/apps/bridge-dapp/src/hooks/useAddCurrency.ts
+++ b/apps/bridge-dapp/src/hooks/useAddCurrency.ts
@@ -1,10 +1,10 @@
 import { Currency } from '@webb-tools/abstract-api-provider';
 import { useWebContext } from '@webb-tools/api-provider-environment';
-import { ResourceId, calculateTypedChainId } from '@webb-tools/sdk-core';
-import { Web3Provider } from '@webb-tools/web3-api-provider';
 import { Chain } from '@webb-tools/dapp-config';
-import { useCallback } from 'react';
 import { useCurrentResourceId } from '@webb-tools/react-hooks';
+import { ResourceId, calculateTypedChainId } from '@webb-tools/sdk-core';
+import { WebbWeb3Provider } from '@webb-tools/web3-api-provider';
+import { useCallback } from 'react';
 
 const IMAGE_URL_TEMPLATE =
   'https://raw.githubusercontent.com/spothq/cryptocurrency-icons/master/128/color/{symbol}.png';
@@ -63,7 +63,7 @@ export const isTokenAddedToMetamask = (
 
   const typedChainId = calculateTypedChainId(
     activeChain.chainType,
-    activeChain.chainId
+    activeChain.id
   );
 
   const tokenAddress = currency.getAddressOfChain(typedChainId);
@@ -91,22 +91,19 @@ export const useAddCurrency = () => {
 
   return useCallback(
     async (currency: Currency): Promise<boolean> => {
-      if (!activeApi || !activeChain) {
+      if (!activeApi || !activeChain || !activeAccount) {
         return false;
       }
 
-      const provider = activeApi.getProvider();
+      const accountAddress = activeAccount.address;
 
-      const accountAddress = activeAccount?.address;
-
-      // Provider is not a Web3Provider instance so we can't add tokens
-      if (!(provider instanceof Web3Provider)) {
+      if (!(activeApi instanceof WebbWeb3Provider)) {
         return false;
       }
 
       const typedChainId = calculateTypedChainId(
         activeChain.chainType,
-        activeChain.chainId
+        activeChain.id
       );
 
       const address = currency.getAddressOfChain(typedChainId);
@@ -116,22 +113,17 @@ export const useAddCurrency = () => {
         return false;
       }
 
-      // A valid symbol is max 11 characters long
-      const validSymbol = currency.view.symbol.slice(0, 11);
-
       try {
-        const wasAdded = await provider.addToken({
-          address,
-          symbol: validSymbol,
-          decimals: currency.view.decimals,
-          image: await getCurrencyImageUrl(currency.view.symbol),
-        });
-
-        if (wasAdded && accountAddress && currentResourceId && address) {
+        await activeApi.watchAsset(
+          currency,
+          await getCurrencyImageUrl(currency.view.symbol)
+        );
+
+        if (accountAddress && currentResourceId && address) {
           recordAddedToken(accountAddress, currentResourceId, address);
         }
 
-        return Boolean(wasAdded);
+        return true;
       } catch (error) {
         console.error(error);
         return false;
diff --git a/apps/bridge-dapp/src/hooks/useMaxFeeInfo.ts b/apps/bridge-dapp/src/hooks/useMaxFeeInfo.ts
index fdc493a6d3..1765666d8d 100644
--- a/apps/bridge-dapp/src/hooks/useMaxFeeInfo.ts
+++ b/apps/bridge-dapp/src/hooks/useMaxFeeInfo.ts
@@ -1,17 +1,17 @@
+import { fetchFeeData } from '@wagmi/core';
 import {
   ActiveWebbRelayer,
   RelayerFeeInfo,
 } from '@webb-tools/abstract-api-provider';
 import { useWebContext } from '@webb-tools/api-provider-environment';
-import gasLimit from '@webb-tools/dapp-config/gasLimit-config';
+import gasLimit from '@webb-tools/dapp-config/gasLimitConfig';
+import { WebbError, WebbErrorCodes } from '@webb-tools/dapp-types';
+import { PolkadotProvider } from '@webb-tools/polkadot-api-provider';
 import { calculateTypedChainId } from '@webb-tools/sdk-core';
-import { Web3Provider } from '@webb-tools/web3-api-provider';
+import { WebbWeb3Provider } from '@webb-tools/web3-api-provider';
 import { useWebbUI } from '@webb-tools/webb-ui-components';
-import { BigNumber } from 'ethers';
 import { useCallback, useEffect, useState } from 'react';
 import { getErrorMessage } from '../utils';
-import { PolkadotProvider } from '@webb-tools/polkadot-api-provider';
-import { WebbError, WebbErrorCodes } from '@webb-tools/dapp-types';
 
 /**
  * Get the max fee info for the current active chain
@@ -27,7 +27,7 @@ type UseMaxFeeInfoReturnType = {
   /**
    * The max fee info for the current active chain
    */
-  feeInfo: RelayerFeeInfo | BigNumber | null;
+  feeInfo: RelayerFeeInfo | bigint | null;
 
   /**
    * Fetch the max fee info from the relayer if the active relayer is provided
@@ -74,7 +74,7 @@ export type MaxFeeInfoOption = {
  * Get the max fee info for the current active chain
  * @param {MaxFeeInfoOption} opt The option to customize the hook
  * @returns an object with the following properties:
- * - feeInfo: RelayerFeeInfo | BigNumber | null
+ * - feeInfo: RelayerFeeInfo | bigint | null
  * - fetchMaxFeeInfo: () => Promise<void> | never
  * - fetchMaxFeeInfoFromRelayer: (relayer: ActiveWebbRelayer) => Promise<void> | never
  * - resetMaxFeeInfo: () => void
@@ -86,9 +86,7 @@ export const useMaxFeeInfo = (
   const { activeApi, activeChain, apiConfig } = useWebContext();
 
   // State to store the max fee info
-  const [feeInfo, setFeeInfo] = useState<RelayerFeeInfo | BigNumber | null>(
-    null
-  );
+  const [feeInfo, setFeeInfo] = useState<RelayerFeeInfo | bigint | null>(null);
 
   // State to store the loading state
   const [isLoading, setIsLoading] = useState(false);
@@ -116,7 +114,7 @@ export const useMaxFeeInfo = (
 
         const currentTypedChainId = calculateTypedChainId(
           activeChain.chainType,
-          activeChain.chainId
+          activeChain.id
         );
 
         const vanchorId = apiConfig.getAnchorIdentifier(
@@ -161,7 +159,7 @@ export const useMaxFeeInfo = (
 
       const currentTypedChain = calculateTypedChainId(
         activeChain.chainType,
-        activeChain.chainId
+        activeChain.id
       );
 
       if (!gasLimit[currentTypedChain]) {
@@ -175,26 +173,30 @@ export const useMaxFeeInfo = (
         // On Substrate, we use partial fee dirrectly
         setFeeInfo(gasLimit[currentTypedChain]);
         setIsLoading(false);
-        return;
-      } else if (provider instanceof Web3Provider) {
+      } else if (activeApi instanceof WebbWeb3Provider) {
         const gasAmount = gasLimit[currentTypedChain];
-        const etherProvider = provider.intoEthersProvider();
+        const walletClient = activeApi.walletClient;
+        const publicClient = activeApi.publicClient;
+
+        const { maxFeePerGas, gasPrice, maxPriorityFeePerGas } =
+          await fetchFeeData({
+            chainId: walletClient.chain?.id,
+          });
+
+        let actualGasPrice = await publicClient.getGasPrice();
+        if (gasPrice && gasPrice > actualGasPrice) {
+          actualGasPrice = gasPrice;
+        }
 
-        // Get the greatest gas price
-        let gasPrice = await etherProvider.getGasPrice();
-        const feeData = await etherProvider.getFeeData();
-        if (feeData.maxFeePerGas && feeData.maxFeePerGas.gt(gasPrice)) {
-          gasPrice = feeData.maxFeePerGas;
+        if (maxFeePerGas && maxFeePerGas > actualGasPrice) {
+          actualGasPrice = maxFeePerGas;
         }
 
-        if (
-          feeData.maxPriorityFeePerGas &&
-          feeData.maxPriorityFeePerGas.gt(gasPrice)
-        ) {
-          gasPrice = feeData.maxPriorityFeePerGas;
+        if (maxPriorityFeePerGas && maxPriorityFeePerGas > actualGasPrice) {
+          actualGasPrice = maxPriorityFeePerGas;
         }
 
-        setFeeInfo(gasAmount.mul(gasPrice));
+        setFeeInfo(gasAmount * actualGasPrice);
       } else {
         throw WebbError.from(WebbErrorCodes.UnsupportedProvider);
       }
diff --git a/apps/bridge-dapp/src/hooks/useShieldedAssets.ts b/apps/bridge-dapp/src/hooks/useShieldedAssets.ts
index e91bb62838..16287cabfd 100644
--- a/apps/bridge-dapp/src/hooks/useShieldedAssets.ts
+++ b/apps/bridge-dapp/src/hooks/useShieldedAssets.ts
@@ -1,12 +1,11 @@
 import { Currency } from '@webb-tools/abstract-api-provider';
 import { useWebContext } from '@webb-tools/api-provider-environment';
 import { chainsPopulated } from '@webb-tools/dapp-config';
-import { CurrencyRole } from '@webb-tools/dapp-types';
 import { useCurrencies, useNoteAccount } from '@webb-tools/react-hooks';
 import { calculateTypedChainId } from '@webb-tools/sdk-core';
-import { BigNumber, ethers } from 'ethers';
-import React, { useMemo } from 'react';
+import React from 'react';
 
+import { formatUnits, parseUnits } from 'viem';
 import { ShieldedAssetDataType } from '../containers/note-account-tables/ShieldedAssetsTableContainer/types';
 
 export const useShieldedAssets = (): ShieldedAssetDataType[] => {
@@ -21,7 +20,15 @@ export const useShieldedAssets = (): ShieldedAssetDataType[] => {
   const groupedNotes = React.useMemo(() => {
     return Array.from(allNotes.values()).reduce((acc, notes) => {
       notes.forEach((note) => {
-        const { targetChainId, tokenSymbol, amount, denomination } = note.note;
+        const {
+          targetChainId,
+          tokenSymbol,
+          amount: amountStr,
+          denomination: denominationStr,
+        } = note.note;
+
+        const amount = BigInt(amountStr);
+        const denomination = Number(denominationStr);
 
         const chain = chainsPopulated[Number(targetChainId)];
         // This could happen in the case of a chain being removed from the
@@ -41,17 +48,15 @@ export const useShieldedAssets = (): ShieldedAssetDataType[] => {
         );
 
         if (existedChain) {
-          const parsedAvailableBalance = ethers.utils.parseUnits(
-            existedChain.availableBalance.toString(),
+          const parsedAvailableBalance = parseUnits(
+            `${existedChain.availableBalance}`,
             denomination
           );
 
-          const summedBalance = BigNumber.from(amount).add(
-            parsedAvailableBalance
-          );
+          const summedBalance = amount + parsedAvailableBalance;
 
           existedChain.availableBalance = Number(
-            ethers.utils.formatUnits(summedBalance, denomination)
+            formatUnits(summedBalance, denomination)
           );
 
           existedChain.numberOfNotesFound += 1;
@@ -76,9 +81,9 @@ export const useShieldedAssets = (): ShieldedAssetDataType[] => {
         }
 
         let assetsUrl = '#';
-        const explorerUrl = chain.blockExplorerStub;
+        const explorerUrl = chain.blockExplorers?.default.url;
         const address = fungibleCurrency?.getAddressOfChain(
-          calculateTypedChainId(chain.chainType, chain.chainId)
+          calculateTypedChainId(chain.chainType, chain.id)
         );
 
         if (explorerUrl && address) {
@@ -92,9 +97,7 @@ export const useShieldedAssets = (): ShieldedAssetDataType[] => {
           fungibleTokenSymbol: tokenSymbol,
           assetsUrl,
           composition: Array.from(compositionSet),
-          availableBalance: Number(
-            ethers.utils.formatUnits(amount, denomination)
-          ),
+          availableBalance: Number(formatUnits(amount, denomination)),
           numberOfNotesFound: 1,
           rawChain: chain,
           rawFungibleCurrency: fungibleCurrency,
diff --git a/apps/bridge-dapp/src/hooks/useSpendNotes.ts b/apps/bridge-dapp/src/hooks/useSpendNotes.ts
index a153b5601c..13b6e1b823 100644
--- a/apps/bridge-dapp/src/hooks/useSpendNotes.ts
+++ b/apps/bridge-dapp/src/hooks/useSpendNotes.ts
@@ -14,10 +14,10 @@ import {
 } from '@webb-tools/sdk-core';
 import { hexToU8a } from '@webb-tools/utils';
 import { ArrayElement } from '@webb-tools/webb-ui-components/types';
-import { ethers } from 'ethers';
 import { useEffect, useMemo, useState } from 'react';
 
 import { SpendNoteDataType } from '../containers/note-account-tables/SpendNotesTableContainer/types';
+import { formatUnits } from 'viem';
 import { getVAnchorActionClass } from '../utils';
 
 const createdTime = randRecentDate();
@@ -137,9 +137,9 @@ export const useSpendNotes = (): SpendNoteDataType[] => {
 
           // Calculate the assets url
           let assetsUrl = '#';
-          const explorerUrl = chain.blockExplorerStub;
+          const explorerUrl = chain.blockExplorers?.default.url;
           const address = fungibleCurrency?.getAddressOfChain(
-            calculateTypedChainId(chain.chainType, chain.chainId)
+            calculateTypedChainId(chain.chainType, chain.id)
           );
 
           if (explorerUrl && address) {
@@ -156,7 +156,7 @@ export const useSpendNotes = (): SpendNoteDataType[] => {
             composition: Array.from(compositionSet),
             createdTime, // TODO: get the actual created time
             balance: Number(
-              ethers.utils.formatUnits(note.note.amount, note.note.denomination)
+              formatUnits(BigInt(note.note.amount), +note.note.denomination)
             ),
             subsequentDeposits: note.note.index
               ? subsequentDepositsNumber.toString()
diff --git a/apps/bridge-dapp/src/hooks/useStatesFromNotes.tsx b/apps/bridge-dapp/src/hooks/useStatesFromNotes.tsx
index b9138a6625..fec123b127 100644
--- a/apps/bridge-dapp/src/hooks/useStatesFromNotes.tsx
+++ b/apps/bridge-dapp/src/hooks/useStatesFromNotes.tsx
@@ -1,6 +1,7 @@
 import { Bridge, Currency } from '@webb-tools/abstract-api-provider';
 import { useWebContext } from '@webb-tools/api-provider-environment';
 import {
+  ZERO_BIG_INT,
   ensureHex,
   getNativeCurrencyFromConfig,
 } from '@webb-tools/dapp-config';
@@ -13,8 +14,8 @@ import {
 import { Note, ResourceId, calculateTypedChainId } from '@webb-tools/sdk-core';
 import { hexToU8a } from '@webb-tools/utils';
 import { useWebbUI } from '@webb-tools/webb-ui-components';
-import { BigNumber, ethers } from 'ethers';
 import { useCallback, useMemo, useState } from 'react';
+import { formatUnits } from 'viem';
 import { ChainListCardWrapper } from '../components';
 import { useShieldedAssets } from './useShieldedAssets';
 
@@ -60,19 +61,20 @@ const useStatesFromNotes = () => {
       return 0;
     }
 
-    let tokenDecimals: number | undefined;
-    const amountBN = availableNotes.reduce<BigNumber>(
+    let tokenDecimals: number = +availableNotes[0].note.denomination;
+
+    const amountBI = availableNotes.reduce<bigint>(
       (accumulatedBalance, newNote) => {
         if (!tokenDecimals) {
           tokenDecimals = Number(newNote.note.denomination);
         }
 
-        return accumulatedBalance.add(newNote.note.amount);
+        return accumulatedBalance + BigInt(newNote.note.amount);
       },
-      BigNumber.from(0)
+      ZERO_BIG_INT
     );
 
-    return Number(ethers.utils.formatUnits(amountBN, tokenDecimals));
+    return Number(formatUnits(amountBI, tokenDecimals));
   }, [availableNotes]);
 
   const chainsFromNotes = useMemo(() => {
@@ -175,7 +177,7 @@ const useStatesFromNotes = () => {
       symbol:
         getNativeCurrencyFromConfig(
           apiConfig.currencies,
-          calculateTypedChainId(activeChain.chainType, activeChain.chainId)
+          calculateTypedChainId(activeChain.chainType, activeChain.id)
         )?.symbol ?? 'Unknown',
     };
 
@@ -187,7 +189,7 @@ const useStatesFromNotes = () => {
         chains={chainsFromNotes.map((chain) => {
           const currency = getNativeCurrencyFromConfig(
             apiConfig.currencies,
-            calculateTypedChainId(chain.chainType, chain.chainId)
+            calculateTypedChainId(chain.chainType, chain.id)
           );
           if (!currency) {
             console.error('No currency found for chain', chain.name);
diff --git a/apps/bridge-dapp/src/utils/errors.ts b/apps/bridge-dapp/src/utils/errors.ts
index 6ec44ee322..6e3dcbc308 100644
--- a/apps/bridge-dapp/src/utils/errors.ts
+++ b/apps/bridge-dapp/src/utils/errors.ts
@@ -1,7 +1,6 @@
-import { TransactionReceipt } from '@ethersproject/abstract-provider';
 import { WebbError } from '@webb-tools/dapp-types';
 import { SnackBarOpts } from '@webb-tools/webb-ui-components';
-import { Transaction } from 'ethers';
+import { Transaction, TransactionReceipt } from 'viem';
 
 export const DEPOSIT_FAILURE_MSG: Omit<SnackBarOpts, 'close'> = {
   variant: 'error',
diff --git a/apps/bridge-dapp/src/utils/getActiveSourceChains.ts b/apps/bridge-dapp/src/utils/getActiveSourceChains.ts
index 6762cf9479..9240c7e6c1 100644
--- a/apps/bridge-dapp/src/utils/getActiveSourceChains.ts
+++ b/apps/bridge-dapp/src/utils/getActiveSourceChains.ts
@@ -9,7 +9,7 @@ export const getActiveSourceChains = (
   const currentEnv = process.env.NODE_ENV || 'development';
 
   return Object.values(chains).filter((chain) => {
-    const typedChainId = calculateTypedChainId(chain.chainType, chain.chainId);
+    const typedChainId = calculateTypedChainId(chain.chainType, chain.id);
     const anchorConfig = anchorDeploymentBlock[typedChainId];
 
     const env = chain.env;
diff --git a/apps/bridge-dapp/src/utils/getTokenURI.ts b/apps/bridge-dapp/src/utils/getTokenURI.ts
index d453d3d5c8..c04218bd62 100644
--- a/apps/bridge-dapp/src/utils/getTokenURI.ts
+++ b/apps/bridge-dapp/src/utils/getTokenURI.ts
@@ -1,17 +1,11 @@
 import { CurrencyConfig, chainsConfig } from '@webb-tools/dapp-config';
 
 export const getTokenURI = (currency: CurrencyConfig, chainID: string) => {
-  const blockExplorerStub =
-    chainsConfig[Number(chainID)]?.blockExplorerStub ?? '';
+  const explorerUrl =
+    chainsConfig[Number(chainID)]?.blockExplorers?.default.url ?? '';
 
-  let explorerURI;
-
-  explorerURI = blockExplorerStub.endsWith('/')
-    ? blockExplorerStub
-    : blockExplorerStub + '/';
-
-  explorerURI =
-    explorerURI + `address/${currency.addresses.get(Number(chainID)) ?? ''}`;
-
-  return explorerURI;
+  return new URL(
+    `/address/${currency.addresses.get(Number(chainID)) ?? ''}`,
+    explorerUrl
+  ).toString();
 };
diff --git a/apps/faucet/next.config.js b/apps/faucet/next.config.js
index 6997d205d0..d61f8e5dd2 100644
--- a/apps/faucet/next.config.js
+++ b/apps/faucet/next.config.js
@@ -4,7 +4,7 @@ const { createSecureHeaders } = require('next-secure-headers');
 const securityHeaders = createSecureHeaders({
   frameGuard: 'sameorigin',
   xssProtection: 'block-rendering',
-  referrerPolicy: 'origin-when-cross-origin',
+  referrerPolicy: 'no-referrer-when-downgrade',
 }).concat([
   {
     key: 'Content-Security-Policy',
diff --git a/apps/faucet/src/components/ProcessingModal.tsx b/apps/faucet/src/components/ProcessingModal.tsx
index 703f32ab95..3c22861672 100644
--- a/apps/faucet/src/components/ProcessingModal.tsx
+++ b/apps/faucet/src/components/ProcessingModal.tsx
@@ -86,13 +86,18 @@ const ProcessingModal = () => {
       return '';
     }
 
-    if (!chain.blockExplorerStub) {
+    if (!chain.blockExplorers) {
       alert(`Chain ${chain.name} does not have a block explorer url`);
       return '';
     }
 
     if (txReceipt) {
-      return `${chain.blockExplorerStub}/tx/${txReceipt.transactionHash}`;
+      const explorerUrl = chain.blockExplorers.default.url;
+
+      return new URL(
+        `/tx/${txReceipt.transactionHash}`,
+        explorerUrl
+      ).toString();
     } else if (txHash) {
       alert(`Substrate tx hash ${txHash} is not supported yet`);
       return '';
diff --git a/apps/faucet/src/provider/index.tsx b/apps/faucet/src/provider/index.tsx
index 7062bb1c79..08b981442b 100644
--- a/apps/faucet/src/provider/index.tsx
+++ b/apps/faucet/src/provider/index.tsx
@@ -85,7 +85,7 @@ const config = Object.entries(tokens).reduce(
     }
 
     acc[chain.name] = {
-      chainId: chain.chainId,
+      chainId: chain.id,
       name: chain.name,
       tokenAddresses: tokensRecord,
       type: chain.chainType === ChainType.Substrate ? 'Substrate' : 'Evm',
diff --git a/apps/faucet/src/types/index.ts b/apps/faucet/src/types/index.ts
index d489f7cb5e..82592a98ee 100644
--- a/apps/faucet/src/types/index.ts
+++ b/apps/faucet/src/types/index.ts
@@ -1,7 +1,7 @@
 // File contains all shared types used in the app
 
-import { TransactionReceipt } from '@ethersproject/abstract-provider';
 import { UserV2 } from 'twitter-api-v2';
+import { TransactionReceipt } from 'viem';
 
 import FaucetError from '../errors/FaucetError';
 import FaucetErrorCode from '../errors/FaucetErrorCode';
diff --git a/apps/hubble-stats/components/PoolTransactionsTable/types.ts b/apps/hubble-stats/components/PoolTransactionsTable/types.ts
index 1d079ae84f..53af909f70 100644
--- a/apps/hubble-stats/components/PoolTransactionsTable/types.ts
+++ b/apps/hubble-stats/components/PoolTransactionsTable/types.ts
@@ -1,5 +1,4 @@
-import { ChainBase } from '@webb-tools/dapp-config';
-
+import { ChainGroup } from '@webb-tools/dapp-config';
 import { ActivityType } from '../table/types';
 
 export type PoolTransactionType = {
@@ -8,7 +7,7 @@ export type PoolTransactionType = {
   tokenAmount: number;
   tokenSymbol: string;
   source: string;
-  sourceChainType: ChainBase;
+  sourceChainType: ChainGroup;
   destination: string;
   time: number;
 };
diff --git a/apps/stats-dapp/src/pages/Proposals.tsx b/apps/stats-dapp/src/pages/Proposals.tsx
index 3093160f59..9067acf345 100644
--- a/apps/stats-dapp/src/pages/Proposals.tsx
+++ b/apps/stats-dapp/src/pages/Proposals.tsx
@@ -2,10 +2,9 @@ import {
   ColumnDef,
   createColumnHelper,
   getCoreRowModel,
-  Table as RTTable,
   useReactTable,
 } from '@tanstack/react-table';
-import { useStatsContext } from '../provider/stats-provider';
+import { ExternalLinkLine, TokenIcon } from '@webb-tools/icons';
 import {
   Button,
   Card,
@@ -14,20 +13,19 @@ import {
   TitleWithInfo,
 } from '@webb-tools/webb-ui-components/components';
 import { fuzzyFilter } from '@webb-tools/webb-ui-components/components/Filter/utils';
-import { ExternalLinkLine, TokenIcon } from '@webb-tools/icons';
 import { shortenHex } from '@webb-tools/webb-ui-components/utils';
 import { ArcElement, Chart as ChartJS, Legend } from 'chart.js';
-import { BigNumber } from 'ethers';
 import React, { useMemo, useState } from 'react';
 import { Link, Outlet } from 'react-router-dom';
 import { ProposalsTable, TimeRange } from '../containers';
+import { StackedAreaChartContainer } from '../containers/StackedAreaChartContainer';
 import {
   ProposalListItem,
   ProposalStatus,
   useProposalsOverview,
 } from '../provider/hooks';
+import { useStatsContext } from '../provider/stats-provider';
 import { mapChainIdToLogo } from '../utils';
-import { StackedAreaChartContainer } from '../containers/StackedAreaChartContainer';
 
 const columnHelper = createColumnHelper<ProposalListItem>();
 
@@ -35,10 +33,7 @@ const columns: ColumnDef<ProposalListItem, any>[] = [
   columnHelper.accessor('height', {
     header: 'Height',
     cell: (props) =>
-      BigNumber.from(props.getValue<string>())
-        .div(1000)
-        .toBigInt()
-        .toLocaleString(),
+      (BigInt(props.getValue<string>()) / BigInt(1000)).toLocaleString(),
   }),
 
   columnHelper.accessor('type', {
diff --git a/apps/tangle-website/next.config.js b/apps/tangle-website/next.config.js
index bc673a968f..ec506cfcd8 100644
--- a/apps/tangle-website/next.config.js
+++ b/apps/tangle-website/next.config.js
@@ -4,7 +4,7 @@ const { createSecureHeaders } = require('next-secure-headers');
 const securityHeaders = createSecureHeaders({
   frameGuard: 'sameorigin',
   xssProtection: 'block-rendering',
-  referrerPolicy: 'origin-when-cross-origin',
+  referrerPolicy: 'no-referrer-when-downgrade',
 }).concat([
   {
     key: 'Content-Security-Policy',
diff --git a/apps/webbsite/next.config.js b/apps/webbsite/next.config.js
index bc673a968f..ec506cfcd8 100644
--- a/apps/webbsite/next.config.js
+++ b/apps/webbsite/next.config.js
@@ -4,7 +4,7 @@ const { createSecureHeaders } = require('next-secure-headers');
 const securityHeaders = createSecureHeaders({
   frameGuard: 'sameorigin',
   xssProtection: 'block-rendering',
-  referrerPolicy: 'origin-when-cross-origin',
+  referrerPolicy: 'no-referrer-when-downgrade',
 }).concat([
   {
     key: 'Content-Security-Policy',
diff --git a/libs/abstract-api-provider/src/chain-query/index.ts b/libs/abstract-api-provider/src/chain-query/index.ts
index f342b326bf..d0d66df3c7 100644
--- a/libs/abstract-api-provider/src/chain-query/index.ts
+++ b/libs/abstract-api-provider/src/chain-query/index.ts
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
 export abstract class ChainQuery<Provider> {
   constructor(protected inner: Provider) {}
 
-  abstract currentBlock(): Promise<number>;
+  abstract currentBlock(): Promise<bigint>;
 
   abstract tokenBalanceByCurrencyId(
     typedChainId: number,
diff --git a/libs/abstract-api-provider/src/relayer/webb-relayer-manager.ts b/libs/abstract-api-provider/src/relayer/webb-relayer-manager.ts
index d1617e284d..832e675935 100644
--- a/libs/abstract-api-provider/src/relayer/webb-relayer-manager.ts
+++ b/libs/abstract-api-provider/src/relayer/webb-relayer-manager.ts
@@ -1,13 +1,13 @@
 // Copyright 2022 @webb-tools/
 // SPDX-License-Identifier: Apache-2.0
 
-import { Note } from '@webb-tools/sdk-core';
-import { BehaviorSubject, Observable, Subject } from 'rxjs';
-
 import { ApiPromise } from '@polkadot/api';
-import { VAnchor } from '@webb-tools/anchors';
 import { BridgeStorage, LoggerService } from '@webb-tools/browser-utils';
+import { VAnchor__factory } from '@webb-tools/contracts';
 import Storage from '@webb-tools/dapp-types/Storage';
+import { Note } from '@webb-tools/sdk-core';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { GetContractReturnType, PublicClient } from 'viem';
 import {
   NewNotesTxResult,
   Transaction,
@@ -83,7 +83,7 @@ export abstract class WebbRelayerManager<Provider extends WebbProviderType> {
     api: Provider extends 'polkadot'
       ? ApiPromise
       : Provider extends 'web3'
-      ? VAnchor
+      ? GetContractReturnType<typeof VAnchor__factory.abi, PublicClient>
       : never,
     storage: Storage<BridgeStorage>,
     options: {
diff --git a/libs/abstract-api-provider/src/relayer/webb-relayer.ts b/libs/abstract-api-provider/src/relayer/webb-relayer.ts
index 69fc40e207..fcc16fad9b 100644
--- a/libs/abstract-api-provider/src/relayer/webb-relayer.ts
+++ b/libs/abstract-api-provider/src/relayer/webb-relayer.ts
@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ChainType, parseTypedChainId } from '@webb-tools/sdk-core';
-import { BigNumber } from 'ethers';
-import { Observable, Subject } from 'rxjs';
+import { Observable, Subject, firstValueFrom } from 'rxjs';
 import { filter } from 'rxjs/operators';
 
 import { LoggerService } from '@webb-tools/browser-utils';
@@ -48,19 +47,19 @@ type RelayerLeaves = {
 };
 
 export interface RelayerFeeInfo {
-  estimatedFee: BigNumber;
-  gasPrice?: BigNumber;
-  refundExchangeRate: BigNumber;
-  maxRefund: BigNumber;
+  estimatedFee: bigint;
+  gasPrice: bigint;
+  refundExchangeRate: bigint;
+  maxRefund: bigint;
   timestamp: Date;
 }
 
 export const parseRelayerFeeInfo = (data: any): RelayerFeeInfo | never => {
   return {
-    estimatedFee: BigNumber.from(data.estimatedFee),
-    gasPrice: data.gasPrice ? BigNumber.from(data.gasPrice) : undefined,
-    refundExchangeRate: BigNumber.from(data.refundExchangeRate),
-    maxRefund: BigNumber.from(data.maxRefund),
+    estimatedFee: BigInt(data.estimatedFee),
+    gasPrice: BigInt(data.gasPrice),
+    refundExchangeRate: BigInt(data.refundExchangeRate),
+    maxRefund: BigInt(data.maxRefund),
     timestamp: new Date(data.timestamp),
   };
 };
@@ -179,9 +178,9 @@ class RelayedWithdraw {
     this.ws.send(JSON.stringify(withdrawRequest));
   }
 
-  await() {
-    return this.watcher
-      .pipe(
+  await(): Promise<[RelayedWithdrawResult, string | undefined]> {
+    return firstValueFrom(
+      this.watcher.pipe(
         filter(([next]) => {
           return (
             next === RelayedWithdrawResult.CleanExit ||
@@ -189,7 +188,7 @@ class RelayedWithdraw {
           );
         })
       )
-      .toPromise();
+    );
   }
 
   get currentStatus() {
@@ -247,9 +246,6 @@ export class WebbRelayer {
       | { treeId: number; palletId: number },
     abortSignal?: AbortSignal
   ): Promise<RelayerLeaves> {
-    console.group(`getLeaves() for ${this.endpoint}`);
-    console.log('On chain: ', chainsPopulated[typedChainId]?.name);
-
     const { chainId, chainType } = parseTypedChainId(typedChainId);
     const baseUrl = `${this.endpoint}/api/v1/leaves`;
     let path = '';
@@ -285,18 +281,19 @@ export class WebbRelayer {
 
     if (req.ok) {
       const jsonResponse = await req.json();
-      console.log('response: ', jsonResponse);
+      console.log(
+        `Response from ${this.endpoint} for chain ${chainsPopulated[typedChainId]?.name}: `,
+        jsonResponse
+      );
       const fetchedLeaves: `0x${string}`[] = jsonResponse.leaves;
       const lastQueriedBlock: string = jsonResponse.lastQueriedBlock;
       const lastQueriedBlockNumber: number = parseInt(lastQueriedBlock);
 
-      console.groupEnd();
       return {
         lastQueriedBlock: lastQueriedBlockNumber,
         leaves: fetchedLeaves,
       };
     } else {
-      console.groupEnd();
       throw new Error('network error');
     }
   }
@@ -304,7 +301,7 @@ export class WebbRelayer {
   public async getFeeInfo(
     typedChainId: number,
     vanchor: string,
-    gasAmount: BigNumber,
+    gasAmount: bigint,
     abortSignal?: AbortSignal
   ): Promise<RelayerFeeInfo> | never {
     const { chainId, chainType } = parseTypedChainId(typedChainId);
diff --git a/libs/abstract-api-provider/src/utils/generateCircomCommitment.ts b/libs/abstract-api-provider/src/utils/generateCircomCommitment.ts
index 74d3e8bb4b..e96cd56619 100644
--- a/libs/abstract-api-provider/src/utils/generateCircomCommitment.ts
+++ b/libs/abstract-api-provider/src/utils/generateCircomCommitment.ts
@@ -1,7 +1,6 @@
 import { poseidon } from 'circomlibjs';
 import { Keypair } from '@webb-tools/sdk-core';
 import { JsNote } from '@webb-tools/wasm-utils';
-import { BigNumber } from 'ethers';
 
 /**
  * Generate the commitment of the note
@@ -10,8 +9,8 @@ import { BigNumber } from 'ethers';
  */
 const generateCircomCommitment = (note: JsNote): bigint => {
   const noteSecretParts = note.secrets.split(':');
-  const chainId = BigNumber.from('0x' + noteSecretParts[0]).toString();
-  const amount = BigNumber.from('0x' + noteSecretParts[1]).toString();
+  const chainId = BigInt('0x' + noteSecretParts[0]).toString();
+  const amount = BigInt('0x' + noteSecretParts[1]).toString();
   const secretKey = '0x' + noteSecretParts[2];
   const blinding = '0x' + noteSecretParts[3];
 
@@ -19,7 +18,7 @@ const generateCircomCommitment = (note: JsNote): bigint => {
 
   const hash = poseidon([chainId, amount, keypair.getPubKey(), blinding]);
 
-  return BigNumber.from(hash).toBigInt();
+  return BigInt(hash);
 };
 
 export default generateCircomCommitment;
diff --git a/libs/abstract-api-provider/src/utils/utxoFromVAnchorNote.ts b/libs/abstract-api-provider/src/utils/utxoFromVAnchorNote.ts
index 388df26173..2695d4b2e4 100644
--- a/libs/abstract-api-provider/src/utils/utxoFromVAnchorNote.ts
+++ b/libs/abstract-api-provider/src/utils/utxoFromVAnchorNote.ts
@@ -1,12 +1,11 @@
 import { CircomUtxo, Keypair, Utxo, UtxoGenInput } from '@webb-tools/sdk-core';
 import { hexToU8a } from '@webb-tools/utils';
 import { JsNote } from '@webb-tools/wasm-utils';
-import { BigNumber } from 'ethers';
 
 async function utxoFromVAnchorNote(note: JsNote, leafIndex = 0): Promise<Utxo> {
   const noteSecretParts = note.secrets.split(':');
   const chainId = note.targetChainId;
-  const amount = BigNumber.from('0x' + noteSecretParts[1]).toString();
+  const amount = BigInt('0x' + noteSecretParts[1]).toString();
   const secretKey = '0x' + noteSecretParts[2];
   const blinding = '0x' + noteSecretParts[3];
   const originChainId = note.sourceChainId;
diff --git a/libs/abstract-api-provider/src/vanchor/vanchor-actions.ts b/libs/abstract-api-provider/src/vanchor/vanchor-actions.ts
index ff4de029d9..fbace16df8 100644
--- a/libs/abstract-api-provider/src/vanchor/vanchor-actions.ts
+++ b/libs/abstract-api-provider/src/vanchor/vanchor-actions.ts
@@ -1,7 +1,6 @@
 // Copyright 2022 @webb-tools/
 // SPDX-License-Identifier: Apache-2.0
 
-import { TransactionReceipt } from '@ethersproject/abstract-provider';
 import { EventBus, LoggerService } from '@webb-tools/app-util';
 import {
   ChainType,
@@ -10,9 +9,7 @@ import {
   ResourceId,
   Utxo,
 } from '@webb-tools/sdk-core';
-import BN from 'bn.js';
-import { BigNumber, ContractReceipt, Overrides } from 'ethers';
-
+import { Address, Hash } from 'viem';
 import { CancellationToken } from '../cancelation-token';
 import { ActiveWebbRelayer } from '../relayer';
 import {
@@ -41,7 +38,7 @@ export type TransferTransactionPayloadType = {
   notes: Note[];
   changeUtxo: Utxo;
   transferUtxo: Utxo;
-  feeAmount: BigNumber;
+  feeAmount: bigint;
 };
 
 // Union type of all the payloads that can be used in a transaction (Deposit, Transfer, Withdraw)
@@ -110,7 +107,9 @@ export const isVAnchorTransferPayload = (
     'changeUtxo' in payload &&
     payload['changeUtxo'] instanceof Utxo &&
     'transferUtxo' in payload &&
-    payload['transferUtxo'] instanceof Utxo
+    payload['transferUtxo'] instanceof Utxo &&
+    'feeAmount' in payload &&
+    typeof payload['feeAmount'] === 'bigint'
   );
 };
 
@@ -160,8 +159,9 @@ export abstract class VAnchorActions<
    * A function to get the leaf index of a leaf in the tree
    */
   abstract getLeafIndex(
-    contractReceiptOrLeaf: ContractReceipt | Uint8Array,
-    noteOrIndexBeforeInsertion: Note | number,
+    txHashOrLeaf: Hash,
+    noteOrIndexBeforeInsertion: Note,
+    indexBeforeInsertion: number,
     vAnchorAddressOrTreeId: string
   ): Promise<bigint>;
 
@@ -213,15 +213,14 @@ export abstract class VAnchorActions<
    */
   abstract transact(
     tx: Transaction<NewNotesTxResult>,
-    contractAddress: string,
+    contractAddress: ProviderType extends 'web3' ? Address : string,
     inputs: Utxo[],
     outputs: Utxo[],
-    fee: BigNumber | BN,
-    refund: BigNumber | BN,
-    recipient: string,
-    relayer: string,
+    fee: bigint,
+    refund: bigint,
+    recipient: ProviderType extends 'web3' ? Address : string,
+    relayer: ProviderType extends 'web3' ? Address : string,
     wrapUnwrapToken: string,
-    leavesMap: Record<string, Uint8Array[]>,
-    overridesTransaction?: Overrides
-  ): Promise<{ transactionHash: string; receipt?: TransactionReceipt }>;
+    leavesMap: Record<string, Uint8Array[]>
+  ): Promise<Hash>;
 }
diff --git a/libs/abstract-api-provider/src/webb-provider.interface.ts b/libs/abstract-api-provider/src/webb-provider.interface.ts
index e322492377..d625fd7718 100644
--- a/libs/abstract-api-provider/src/webb-provider.interface.ts
+++ b/libs/abstract-api-provider/src/webb-provider.interface.ts
@@ -3,18 +3,16 @@
 
 import { ApiPromise } from '@polkadot/api';
 import { EventBus } from '@webb-tools/app-util';
+import { BridgeStorage } from '@webb-tools/browser-utils';
+import { VAnchor__factory } from '@webb-tools/contracts';
 import { ApiConfig } from '@webb-tools/dapp-config';
-import { InteractiveFeedback } from '@webb-tools/dapp-types';
+import { InteractiveFeedback, Storage } from '@webb-tools/dapp-types';
 import { NoteManager } from '@webb-tools/note-manager';
+import { Utxo, UtxoGenInput } from '@webb-tools/sdk-core';
 import { ZkComponents } from '@webb-tools/utils';
 import { Backend } from '@webb-tools/wasm-utils';
-import { providers } from 'ethers';
 import { BehaviorSubject, Observable } from 'rxjs';
-
-import { VAnchor } from '@webb-tools/anchors';
-import { BridgeStorage } from '@webb-tools/browser-utils';
-import Storage from '@webb-tools/dapp-types/Storage';
-import { Utxo, UtxoGenInput } from '@webb-tools/sdk-core';
+import { GetContractReturnType, PublicClient } from 'viem';
 import { AccountsAdapter } from './account/Accounts.adapter';
 import { ChainQuery } from './chain-query';
 import { ContributePayload, Crowdloan, CrowdloanEvent } from './crowdloan';
@@ -190,11 +188,6 @@ export type NotificationHandler = ((
   // remove the notification programmatically
   remove(key: string | number): void;
 };
-/**
- * Wasm factory
- * @param name - optional name to map an action to a worker currently there's only sdk-core
- **/
-export type WasmFactory = (name?: string) => Worker | null;
 
 export type WebbProviderType = 'web3' | 'polkadot';
 
@@ -211,7 +204,6 @@ export type WebbProviderType = 'web3' | 'polkadot';
  * @param {WebbRelayerManager} relayingManager - Object used by the provider for sending transactions or queries to a compatible relayer.
  * @param {any} getProvider - A getter method for getting the underlying provider
  * @param {NotificationHandler} notificationHandler - Function for emitting notification of the current provider process
- * @param {WasmFactory} wasmFactory - Provider of the wasm workers
  *
  **/
 export interface WebbApiProvider<T> extends EventBus<WebbProviderEvents> {
@@ -247,11 +239,8 @@ export interface WebbApiProvider<T> extends EventBus<WebbProviderEvents> {
   // Notification handler
   notificationHandler: NotificationHandler;
 
-  // wasm-utils workers factory
-  wasmFactory: WasmFactory;
-
   // new block observable
-  newBlock: Observable<unknown>;
+  newBlock: Observable<bigint | null>;
 
   // get zk fixtures
   getZkFixtures: (maxEdges: number, isSmall?: boolean) => Promise<ZkComponents>;
@@ -259,20 +248,22 @@ export interface WebbApiProvider<T> extends EventBus<WebbProviderEvents> {
   // get vanchor max edges
   getVAnchorMaxEdges: (
     vAnchorAddress: string,
-    provider?: ApiPromise | providers.Web3Provider
+    provider?: PublicClient | ApiPromise
   ) => Promise<number>;
 
   // get vanchor levels
   getVAnchorLevels: (
     vAnchorAddressOrTreeId: string,
-    providerOrApi?: ApiPromise | providers.Web3Provider
+    providerOrApi?: PublicClient | ApiPromise
   ) => Promise<number>;
 
   // generate utxo
   generateUtxo: (input: UtxoGenInput) => Promise<Utxo>;
 
   getVAnchorLeaves(
-    vanchor: VAnchor | ApiPromise,
+    vanchor:
+      | GetContractReturnType<typeof VAnchor__factory.abi, PublicClient>
+      | ApiPromise,
     storage: Storage<BridgeStorage>,
     options: {
       treeHeight: number;
diff --git a/libs/api-provider-environment/src/WebbProvider.tsx b/libs/api-provider-environment/src/WebbProvider.tsx
index bfa2d3c18d..abbaf3a646 100644
--- a/libs/api-provider-environment/src/WebbProvider.tsx
+++ b/libs/api-provider-environment/src/WebbProvider.tsx
@@ -1,4 +1,3 @@
-import WalletConnectProvider from '@walletconnect/web3-provider';
 import {
   Account,
   Currency,
@@ -23,11 +22,10 @@ import {
   parseOnChainData,
   walletsConfig,
 } from '@webb-tools/dapp-config';
+import wagmiConfig from '@webb-tools/dapp-config/wagmi-config';
 import {
   BareProps,
   CurrencyRole,
-  CurrencyType,
-  EVMChainId,
   InteractiveFeedback,
   WalletId,
   WebbError,
@@ -43,21 +41,21 @@ import {
   calculateTypedChainId,
 } from '@webb-tools/sdk-core';
 import {
-  Web3Provider,
   Web3RelayerManager,
   WebbWeb3Provider,
+  isViemError,
 } from '@webb-tools/web3-api-provider';
 import { Typography, notificationApi } from '@webb-tools/webb-ui-components';
-import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
-
+import { FC, useCallback, useEffect, useMemo, useState } from 'react';
+import { WagmiConfig } from 'wagmi';
 import { TAppEvent } from './app-event';
 import constants from './constants';
-import { parseError, unsupportedChain } from './error';
+import { unsupportedChain } from './error';
 import { insufficientApiInterface } from './error/interactive-errors/insufficient-api-interface';
-import { useTxApiQueue } from './transaction';
-import { WebbContext } from './webb-context';
 import onChainDataJson from './generated/on-chain-config.json';
 import { StoreProvider } from './store';
+import { useTxApiQueue } from './transaction';
+import { WebbContext } from './webb-context';
 
 interface WebbProviderProps extends BareProps {
   appEvent: TAppEvent;
@@ -154,7 +152,7 @@ notificationHandler.remove = (key: string | number) => {
   notificationApi.remove(key);
 };
 
-export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
+const WebbProviderInner: FC<WebbProviderProps> = ({ children, appEvent }) => {
   const [activeWallet, setActiveWallet] = useState<Wallet | undefined>(
     undefined
   );
@@ -215,7 +213,7 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
   /// it will store on the provider and the storage of the network
   const setActiveAccount = useCallback(
     async (
-      account: Account<any>,
+      account: Account,
       options: {
         networkStorage?: NetworkStorage | undefined | null;
         chain?: Chain | undefined;
@@ -229,7 +227,7 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
       if (innerNetworkStorage && innerChain) {
         const typedChainId = calculateTypedChainId(
           innerChain.chainType,
-          innerChain.chainId
+          innerChain.id
         );
 
         const networksConfig = await innerNetworkStorage.get('networksConfig');
@@ -248,7 +246,7 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
 
       _setActiveAccount(account);
       // TODO resolve the account inner type issue
-      await innerActiveApi.accounts.setActiveAccount(account as any);
+      await innerActiveApi.accounts.setActiveAccount(account);
     },
     [activeApi, activeChain, networkStorage]
   );
@@ -264,10 +262,7 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
         let hasSetFromStorage = false;
         const accounts = await nextActiveApi.accounts.accounts();
 
-        const typedChainId = calculateTypedChainId(
-          chain.chainType,
-          chain.chainId
-        );
+        const typedChainId = calculateTypedChainId(chain.chainType, chain.id);
 
         // TODO resolve the account inner type issue
         setAccounts(accounts as any);
@@ -431,14 +426,11 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
     ) => {
       const wallet = _wallet || activeWallet;
 
-      const nextTypedChainId = calculateTypedChainId(
-        chain.chainType,
-        chain.chainId
-      );
+      const nextTypedChainId = calculateTypedChainId(chain.chainType, chain.id);
 
       const sharedWalletConnectionPayload = {
         walletId: wallet.id,
-        typedChainId: { chainId: chain.chainId, chainType: chain.chainType },
+        typedChainId: { chainId: chain.id, chainType: chain.chainType },
       };
 
       // wallet cleanup
@@ -466,11 +458,16 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
             {
               const relayerManager =
                 await relayerManagerFactory.getRelayerManager('substrate');
-              const url = chain.url;
+              const webSocketUrls = chain.rpcUrls.default.webSocket;
+              if (!webSocketUrls || webSocketUrls.length === 0) {
+                throw new Error(
+                  `No websocket urls found for chain ${chain.name}`
+                );
+              }
 
               const webbPolkadot = await WebbPolkadot.init(
                 constants.APP_NAME,
-                [url],
+                Array.from(webSocketUrls),
                 {
                   onError: (feedback: InteractiveFeedback) => {
                     registerInteractiveFeedback(
@@ -486,13 +483,6 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
                 relayerManager,
                 apiConfig,
                 notificationHandler,
-                () =>
-                  new Worker(
-                    new URL(
-                      './arkworks-proving-manager.worker',
-                      import.meta.url
-                    )
-                  ),
                 nextTypedChainId,
                 wallet
               );
@@ -518,55 +508,14 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
             break;
 
           case WalletId.MetaMask:
-          case WalletId.WalletConnectV1:
+          case WalletId.WalletConnectV2:
             {
-              let web3Provider: Web3Provider;
-              if (wallet?.id === WalletId.WalletConnectV1) {
-                // Get rpcs from evm chains
-                const rpc = Object.values(chains).reduce((acc, chain) => {
-                  if (
-                    chain.chainType === ChainType.EVM &&
-                    chain.evmRpcUrls?.length
-                  ) {
-                    acc[chain.chainId] = chain.evmRpcUrls[0];
-                  }
-                  return acc;
-                }, {} as Record<number, string>);
-
-                const provider = new WalletConnectProvider({
-                  rpc: {
-                    ...rpc,
-
-                    //default on metamask
-                    [EVMChainId.HarmonyTestnet1]: 'https://api.s1.b.hmny.io',
-
-                    [EVMChainId.EthereumMainNet]:
-                      'https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161',
-                  },
-                  chainId: chain.chainId,
-                });
-
-                web3Provider = await Web3Provider.fromWalletConnectProvider(
-                  provider
-                );
-              } else {
-                /// init provider from the extension
-                web3Provider = await Web3Provider.fromExtension();
+              const connector = walletsConfig[wallet.id].connector;
+              if (!connector) {
+                throw WebbError.from(WebbErrorCodes.NoConnectorConfigured);
               }
 
-              const clientInfo = web3Provider.clientMeta;
-              if (clientInfo) {
-                notificationApi({
-                  message: 'Connected to EVM wallet',
-                  secondaryMessage: `Connected to ${clientInfo.name}`,
-                  variant: 'success',
-                  key: 'network-connect',
-                  Icon: React.cloneElement(wallet.Logo, { size: 'xl' }),
-                });
-              }
-              /// get the current active chain from metamask
-              const network = await web3Provider.network;
-              const chainId = network.chainId;
+              const chainId = chain.id;
 
               const relayerManager =
                 (await relayerManagerFactory.getRelayerManager(
@@ -574,23 +523,19 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
                 )) as Web3RelayerManager;
 
               const webbWeb3Provider = await WebbWeb3Provider.init(
-                web3Provider,
+                connector,
                 chainId,
                 relayerManager,
                 noteManager,
                 apiConfig,
-                notificationHandler,
-                () =>
-                  new Worker(
-                    new URL('./circom-proving-manager.worker', import.meta.url)
-                  )
+                notificationHandler
               );
 
               const providerUpdateHandler = async ([
                 updatedChainId,
               ]: number[]) => {
                 const nextChain = Object.values(chains).find(
-                  (chain) => chain.chainId === updatedChainId
+                  (chain) => chain.id === updatedChainId
                 );
 
                 try {
@@ -667,51 +612,22 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
               // Listen for chain updates when user switches chains in the extension
               webbWeb3Provider.on('providerUpdate', providerUpdateHandler);
 
-              await webbWeb3Provider.setChainListener();
-              await webbWeb3Provider.setAccountListener();
+              webbWeb3Provider.setChainListener();
+              webbWeb3Provider.setAccountListener();
 
-              if (chainId !== chain.chainId) {
-                const currency = Object.values(apiConfig.currencies).find(
-                  (c) =>
-                    c.type === CurrencyType.NATIVE &&
-                    Array.from(c.addresses.keys()).includes(nextTypedChainId)
-                );
-                if (!currency) {
-                  throw new Error('Native token not found');
-                }
+              // Get the new chain id after the initialization of webb provider
+              const currentChainId = await webbWeb3Provider.getChainId();
 
-                // Switch to the chain
-                await web3Provider.switchAndAddChain({
-                  chainId: `0x${chain.chainId.toString(16)}`,
-                  chainName: chain.name,
-                  rpcUrls: chain.evmRpcUrls ?? [],
-                  nativeCurrency: {
-                    decimals: 18,
-                    name: currency.name,
-                    symbol: currency.symbol,
-                  },
-                  blockExplorerUrls: chain.blockExplorerStub
-                    ? [chain.blockExplorerStub]
-                    : undefined,
-                });
-
-                // add network will prompt the switch, check evmId again and throw if user rejected
-                const newNetwork = await web3Provider.network;
-                const newChainId = newNetwork.chainId;
-
-                if (newChainId != chain.chainId) {
-                  throw new Error('User rejected network switch');
-                }
+              if (currentChainId !== chain.id) {
+                await webbWeb3Provider.switchOrAddChain(chain.id);
 
                 // Emit events
                 appEvent.send('networkSwitched', [
                   {
                     chainType: chain.chainType,
-                    chainId: chain.chainId,
+                    chainId: chain.id,
                   },
-                  web3Provider instanceof WalletConnectProvider
-                    ? WalletId.WalletConnectV1
-                    : WalletId.MetaMask,
+                  wallet.id,
                 ]);
               }
 
@@ -753,11 +669,18 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
           err = e;
         } else {
           // Parse and display error
-          const parsedError = parseError(e);
+          let errorMessage = WebbError.getErrorMessage(
+            WebbErrorCodes.SwitchChainFailed
+          ).message;
+
+          if (isViemError(e)) {
+            errorMessage = e.shortMessage;
+          }
+
           notificationApi({
             variant: 'error',
             message: 'Web3: Switch Chain Error',
-            secondaryMessage: parsedError.message,
+            secondaryMessage: errorMessage,
           });
         }
 
@@ -797,7 +720,7 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
           await Promise.all([
             _networkStorage.set(
               'defaultNetwork',
-              calculateTypedChainId(chain.chainType, chain.chainId)
+              calculateTypedChainId(chain.chainType, chain.id)
             ),
             _networkStorage.set('defaultWallet', wallet.id),
           ]);
@@ -844,14 +767,32 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
         return;
       }
 
+      let walletCfg: Wallet;
+
       // wallet config by chain
-      const walletConfig =
-        chainConfig.wallets[wallet] || Object.values(chainConfig)[0];
+      if (Array.isArray(chainConfig.wallets)) {
+        if (!chainConfig.wallets.length) {
+          return;
+        }
+
+        // The new API with array of wallet ids
+        if (chainConfig.wallets.includes(wallet)) {
+          walletCfg = apiConfig.wallets[wallet];
+        } else {
+          walletCfg = apiConfig.wallets[chainConfig.wallets[0]];
+        }
+      } else {
+        // The old API with Record of wallet ids and wallet configs
+        walletCfg =
+          chainConfig.wallets[wallet] || Object.values(chainConfig)[0];
+      }
+
       const activeApi = await switchChain(
         chainConfig,
-        walletConfig,
+        walletCfg,
         _networkStorage
       );
+
       const networkDefaultConfig = await _networkStorage.get('networksConfig');
 
       if (activeApi) {
@@ -961,3 +902,11 @@ export const WebbProvider: FC<WebbProviderProps> = ({ children, appEvent }) => {
     </WebbContext.Provider>
   );
 };
+
+export const WebbProvider: FC<WebbProviderProps> = (props) => {
+  return (
+    <WagmiConfig config={wagmiConfig}>
+      <WebbProviderInner {...props} />
+    </WagmiConfig>
+  );
+};
diff --git a/libs/api-provider-environment/src/app-event/app-events.class.ts b/libs/api-provider-environment/src/app-event/app-events.class.ts
index ecbf68835b..40f8f5ae17 100644
--- a/libs/api-provider-environment/src/app-event/app-events.class.ts
+++ b/libs/api-provider-environment/src/app-event/app-events.class.ts
@@ -1,12 +1,7 @@
 import { Account } from '@webb-tools/abstract-api-provider';
-import { Chain, Wallet } from '@webb-tools/dapp-config';
-import {
-  InteractiveFeedback,
-  TypedChainId,
-  WalletId,
-  WebbError,
-} from '@webb-tools/dapp-types';
 import { EventBus } from '@webb-tools/app-util';
+import { Chain, Wallet } from '@webb-tools/dapp-config';
+import { TypedChainId, WalletId, WebbError } from '@webb-tools/dapp-types';
 
 type WalletConnectionStatus = 'idle' | 'loading' | 'sucess' | 'failed';
 
diff --git a/libs/api-provider-environment/src/arkworks-proving-manager.worker.ts b/libs/api-provider-environment/src/arkworks-proving-manager.worker.ts
deleted file mode 100644
index 458e3c6750..0000000000
--- a/libs/api-provider-environment/src/arkworks-proving-manager.worker.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { ArkworksProvingManagerThread } from '@webb-tools/sdk-core';
-
-new ArkworksProvingManagerThread('worker');
diff --git a/libs/api-provider-environment/src/circom-proving-manager.worker.ts b/libs/api-provider-environment/src/circom-proving-manager.worker.ts
deleted file mode 100644
index ffde5a9eaa..0000000000
--- a/libs/api-provider-environment/src/circom-proving-manager.worker.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { CircomProvingManagerThread } from '@webb-tools/sdk-core';
-
-new CircomProvingManagerThread(null, 0, 'worker');
diff --git a/libs/api-provider-environment/src/error/index.ts b/libs/api-provider-environment/src/error/index.ts
index fb4f9fcd11..2aa3e3d7c2 100644
--- a/libs/api-provider-environment/src/error/index.ts
+++ b/libs/api-provider-environment/src/error/index.ts
@@ -1,2 +1 @@
 export * from './interactive-errors';
-export * from './parseError';
diff --git a/libs/api-provider-environment/src/error/parseError.ts b/libs/api-provider-environment/src/error/parseError.ts
deleted file mode 100644
index ee78cb3715..0000000000
--- a/libs/api-provider-environment/src/error/parseError.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { serializeError } from 'eth-rpc-errors';
-
-const DEFAULT_ERROR_CODE = 4000;
-const DEFAULT_ERROR_MESSAGE = 'Unknown error';
-
-const DEFAULT_FALLBACK_ERROR = {
-  code: DEFAULT_ERROR_CODE,
-  message: DEFAULT_ERROR_MESSAGE,
-};
-
-export const parseError = <T = unknown>(
-  error: unknown
-): { code: number; message: string; extraInfo?: T } => {
-  // Maybe metaMask error
-  const err = serializeError(error, {
-    fallbackError: DEFAULT_FALLBACK_ERROR,
-  });
-
-  // If error is not a MetaMask error, return it as is
-  if (err.code !== DEFAULT_ERROR_CODE) {
-    return err;
-  }
-
-  // Handle other errors
-
-  // If error is an instance of Error, return the error message
-  // with the default error code
-  if (error instanceof Error) {
-    return {
-      code: DEFAULT_ERROR_CODE,
-      message: error.message,
-      extraInfo: error as T,
-    };
-  }
-
-  return DEFAULT_FALLBACK_ERROR;
-};
diff --git a/libs/api-provider-environment/src/transaction/useTransactionQueue.tsx b/libs/api-provider-environment/src/transaction/useTransactionQueue.tsx
index 425edb1ade..300b4e2fa9 100644
--- a/libs/api-provider-environment/src/transaction/useTransactionQueue.tsx
+++ b/libs/api-provider-environment/src/transaction/useTransactionQueue.tsx
@@ -45,9 +45,9 @@ function mapTxToPayload(
   let explorerUri = '';
 
   if (tx.name === 'Deposit') {
-    explorerUri = chainConfig[wallets.src]?.blockExplorerStub ?? '';
+    explorerUri = chainConfig[wallets.src]?.blockExplorers?.default.url ?? '';
   } else {
-    explorerUri = chainConfig[wallets.dest]?.blockExplorerStub ?? '';
+    explorerUri = chainConfig[wallets.dest]?.blockExplorers?.default.url ?? '';
   }
 
   const srcChainName = chainConfig[wallets.src]?.name;
diff --git a/libs/api-provider-environment/src/webb-context/webb-context.ts b/libs/api-provider-environment/src/webb-context/webb-context.ts
index c7ff0b742d..8a3aeef0bb 100644
--- a/libs/api-provider-environment/src/webb-context/webb-context.ts
+++ b/libs/api-provider-environment/src/webb-context/webb-context.ts
@@ -3,7 +3,6 @@ import {
   Bridge,
   Transaction,
   WebbApiProvider,
-  WebbProviderType,
 } from '@webb-tools/abstract-api-provider';
 import { ApiConfig, Chain, Wallet } from '@webb-tools/dapp-config';
 import { InteractiveFeedback } from '@webb-tools/dapp-types';
@@ -11,8 +10,6 @@ import { NoteManager } from '@webb-tools/note-manager';
 import React from 'react';
 import { AppEvent, TAppEvent } from '../app-event';
 import { TransactionQueueApi } from '../transaction';
-import { WebbPolkadot } from '@webb-tools/polkadot-api-provider';
-import { WebbWeb3Provider } from '@webb-tools/web3-api-provider';
 
 export interface WebbContextState<T = unknown> {
   loading: boolean;
diff --git a/libs/dapp-config/src/api-config.ts b/libs/dapp-config/src/api-config.ts
index 9df539c635..b869700ed2 100644
--- a/libs/dapp-config/src/api-config.ts
+++ b/libs/dapp-config/src/api-config.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ApiPromise } from '@polkadot/api';
+import { isEthereumAddress } from '@polkadot/util-crypto';
 import { CurrencyRole, CurrencyType } from '@webb-tools/dapp-types';
 import { TypedChainId } from '@webb-tools/dapp-types/ChainId';
 import { WebbError, WebbErrorCodes } from '@webb-tools/dapp-types/WebbError';
@@ -9,7 +10,10 @@ import {
   ChainType,
   calculateTypedChainId,
 } from '@webb-tools/sdk-core/typed-chain-id';
-import { ethers } from 'ethers';
+import { u8aToHex } from '@webb-tools/utils';
+import assert from 'assert';
+import { PublicClient } from 'viem';
+import { parsedAnchorConfig } from './anchors';
 import { AnchorConfigEntry } from './anchors/anchor-config.interface';
 import { getBridgeConfigByAsset } from './bridges';
 import { BridgeConfigEntry } from './bridges/bridge-config.interface';
@@ -21,13 +25,9 @@ import {
   parseSubstrateTargetSystem,
 } from './utils';
 import { WalletConfig } from './wallets/wallet-config.interface';
-import { parsedAnchorConfig } from './anchors';
-import assert from 'assert';
-import { isEthereumAddress } from '@polkadot/util-crypto';
-import { u8aToHex } from '@webb-tools/utils';
 
 export type Chain = ChainConfig & {
-  wallets: Record<number, Wallet>;
+  wallets: Array<Wallet['id']>;
 };
 
 export type Wallet = WalletConfig;
@@ -71,9 +71,7 @@ export class ApiConfig {
 
   static initFromApi = async (
     config: Pick<ApiConfigInput, 'chains' | 'wallets'>,
-    evmProviderFactory: (
-      typedChainId: number
-    ) => Promise<ethers.providers.Web3Provider>,
+    evmProviderFactory: (typedChainId: number) => Promise<PublicClient>,
     substrateProviderFactory: (typedChainId: number) => Promise<ApiPromise>
   ) => {
     const evmOnChainConfig = EVMOnChainConfig.getInstance();
@@ -114,7 +112,7 @@ export class ApiConfig {
 
   getEVMChainName(evmId: number): string {
     const chain = Object.values(this.chains).find(
-      (chainsConfig) => chainsConfig.chainId === evmId
+      (chainsConfig) => chainsConfig.id === evmId
     );
 
     if (chain) {
diff --git a/libs/dapp-config/src/chains/chain-config.interface.ts b/libs/dapp-config/src/chains/chain-config.interface.ts
index 3b77adefe6..cb163032b7 100644
--- a/libs/dapp-config/src/chains/chain-config.interface.ts
+++ b/libs/dapp-config/src/chains/chain-config.interface.ts
@@ -2,10 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ChainType } from '@webb-tools/sdk-core';
+import type { Chain } from '@wagmi/chains';
 
 import { AppEnvironment } from '../types';
 
-export type ChainBase =
+export type ChainGroup =
   | 'arbitrum'
   | 'athena'
   | 'avalanche'
@@ -21,25 +22,34 @@ export type ChainBase =
   | 'orbit'
   | 'webb-dev';
 
-export interface ChainConfig {
+/**
+ * The extended chain interface that includes the chain type and group
+ */
+export type WebbExtendedChain = {
+  /**
+   * The type of chain (e.g EVM, Substrate, etc)
+   */
   chainType: ChainType;
-  name: string;
-  base?: ChainBase;
-  group: string;
-  chainId: number;
+
+  /**
+   * The group of the chain (e.g Ethereum, Polkadot, etc)
+   */
+  group?: ChainGroup;
+
+  /**
+   * The tag indicating the network (e.g dev, test, live)
+   */
   tag: 'dev' | 'test' | 'live';
-  url: string;
-  evmRpcUrls?: string[];
-  blockExplorerStub?: string;
-  logo: React.ComponentType | React.ElementType;
 
   /**
    * The supported environments for this chain (defaults to all)
    */
   env?: AppEnvironment[];
 
-  multicall3?: {
-    address: `0x${string}`;
-    deployedAt: number;
-  };
-}
+  /**
+   * The contracts for this chain
+   */
+  contracts?: Chain['contracts'];
+};
+
+export type ChainConfig = Chain & WebbExtendedChain;
diff --git a/libs/dapp-config/src/chains/evm/index.tsx b/libs/dapp-config/src/chains/evm/index.tsx
index d9fb04f3fe..4ba0ef0b74 100644
--- a/libs/dapp-config/src/chains/evm/index.tsx
+++ b/libs/dapp-config/src/chains/evm/index.tsx
@@ -1,18 +1,22 @@
 // Copyright 2022 @webb-tools/
 // SPDX-License-Identifier: Apache-2.0
 
-// The extra evm rpc urls are from https://github.com/DefiLlama/chainlist
-
+import {
+  arbitrumGoerli,
+  avalancheFuji,
+  goerli,
+  moonbaseAlpha,
+  optimismGoerli,
+  polygonMumbai,
+  scrollTestnet,
+  sepolia,
+  type Chain,
+} from '@wagmi/chains';
 import { EVMChainId, PresetTypedChainId } from '@webb-tools/dapp-types';
-import ArbitrumLogo from '@webb-tools/logos/chains/ArbitrumLogo';
-import GanacheLogo from '@webb-tools/logos/chains/GanacheLogo';
-import { MoonbeamLogo } from '@webb-tools/logos/chains/MoonbeamLogo';
-import OptimismLogo from '@webb-tools/logos/chains/OptimismLogo';
-import PolygonLogo from '@webb-tools/logos/chains/PolygonLogo';
-import EtherLogo from '@webb-tools/logos/Eth';
 import { ChainType } from '@webb-tools/sdk-core/typed-chain-id';
-
-import { ChainConfig } from '../chain-config.interface';
+import merge from 'lodash/merge';
+import { DEFAULT_EVM_CURRENCY } from '../../currencies';
+import { ChainConfig, WebbExtendedChain } from '../chain-config.interface';
 
 const hostedOrbitMulticall3Address =
   process.env.HOSTED_ORBIT_MULTLICALL3_ADDRESS;
@@ -51,250 +55,250 @@ const localDemeterMulticall3DeploymentBlock = process.env
 
 export const chainsConfig: Record<number, ChainConfig> = {
   // Testnet
-  [PresetTypedChainId.Goerli]: {
-    chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.Goerli,
-    name: 'Goerli',
-    base: 'ethereum',
-    url: 'https://ethereum-goerli.publicnode.com',
-    evmRpcUrls: [
-      'https://ethereum-goerli.publicnode.com',
-      'https://goerli.infura.io/v3',
-      'https://rpc.ankr.com/eth_goerli',
-      'https://eth-goerli.g.alchemy.com/v2',
-    ],
-    blockExplorerStub: 'https://goerli.etherscan.io',
-    logo: EtherLogo,
-    tag: 'test',
-  },
-  [PresetTypedChainId.OptimismTestnet]: {
-    chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.OptimismTestnet,
-    name: 'Optimism Goerli',
-    base: 'optimism',
-    url: 'https://goerli.optimism.io',
-    evmRpcUrls: [
-      'https://goerli.optimism.io',
-      'https://endpoints.omniatech.io/v1/op/goerli/public',
-      'https://optimism-goerli.infura.io/v3',
-      'https://opt-goerli.g.alchemy.com/v2/demo',
-    ],
-    blockExplorerStub: 'https://blockscout.com/optimism/goerli',
-    logo: OptimismLogo,
-    tag: 'test',
-  },
-  [PresetTypedChainId.ArbitrumTestnet]: {
-    chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.ArbitrumTestnet,
-    name: 'Arbitrum Goerli',
-    base: 'arbitrum',
-    url: 'https://goerli-rollup.arbitrum.io/rpc',
-    evmRpcUrls: [
-      'https://goerli-rollup.arbitrum.io/rpc',
-      'https://arbitrum-goerli.infura.io/v3',
-      'https://arb-goerli.g.alchemy.com/v2',
-    ],
-    blockExplorerStub: 'https://goerli.arbiscan.io/',
-    logo: ArbitrumLogo,
-    tag: 'test',
-  },
-  [PresetTypedChainId.PolygonTestnet]: {
+  [PresetTypedChainId.Goerli]: merge<Chain, WebbExtendedChain>(goerli, {
     chainType: ChainType.EVM,
-    group: 'matic',
-    chainId: EVMChainId.PolygonTestnet,
-    name: 'Polygon Mumbai',
-    base: 'polygon',
+    group: 'ethereum',
     tag: 'test',
-    url: 'https://endpoints.omniatech.io/v1/matic/mumbai/public	',
-    evmRpcUrls: [
-      'https://endpoints.omniatech.io/v1/matic/mumbai/public	',
-      'https://polygon-mumbai.infura.io/v3',
-      'https://polygon-mumbai.g.alchemy.com/v2',
-    ],
-    blockExplorerStub: 'https://mumbai.polygonscan.com/',
-    logo: PolygonLogo,
-  },
-  [PresetTypedChainId.MoonbaseAlpha]: {
-    chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.MoonbaseAlpha,
-    name: 'Moonbase Alpha',
-    base: 'moonbeam',
-    tag: 'test',
-    url: 'https://moonbeam-alpha.api.onfinality.io/public',
-    evmRpcUrls: [
-      'https://moonbeam-alpha.api.onfinality.io/public',
-      'https://rpc.api.moonbase.moonbeam.network',
-      'https://rpc.testnet.moonbeam.network	',
-    ],
-    blockExplorerStub: 'https://moonbase.moonscan.io/',
-    logo: MoonbeamLogo,
-  },
-  [PresetTypedChainId.Sepolia]: {
-    chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.Sepolia,
-    name: 'Sepolia',
-    base: 'ethereum',
-    tag: 'test',
-    url: 'https://rpc.sepolia.org',
-    blockExplorerStub: 'https://sepolia.etherscan.io/',
-    evmRpcUrls: [
-      'https://rpc.sepolia.org',
-      'https://sepolia.infura.io/v3',
-      'https://endpoints.omniatech.io/v1/eth/sepolia/public',
-      'https://ethereum-sepolia.blockpi.network/v1/rpc/public',
-    ],
-    logo: EtherLogo,
-  },
-  [PresetTypedChainId.AvalancheFuji]: {
-    chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.AvalancheFuji,
-    name: 'Avalanche Fuji',
-    base: 'avalanche',
-    tag: 'test',
-    url: 'https://api.avax-test.network/ext/bc/C/rpc',
-    blockExplorerStub: 'https://testnet.snowtrace.io/',
-    evmRpcUrls: [
-      'https://api.avax-test.network/ext/bc/C/rpc',
-      'https://rpc.ankr.com/avalanche_fuji',
-      'https://ava-testnet.public.blastapi.io/ext/bc/C/rpc',
-    ],
-    logo: EtherLogo,
-  },
-  [PresetTypedChainId.ScrollAlpha]: {
+  }),
+  [PresetTypedChainId.OptimismTestnet]: merge<Chain, WebbExtendedChain>(
+    optimismGoerli,
+    {
+      chainType: ChainType.EVM,
+      group: 'optimism',
+      tag: 'test',
+    }
+  ),
+  [PresetTypedChainId.ArbitrumTestnet]: merge<Chain, WebbExtendedChain>(
+    arbitrumGoerli,
+    {
+      chainType: ChainType.EVM,
+      group: 'arbitrum',
+      tag: 'test',
+    }
+  ),
+  [PresetTypedChainId.PolygonTestnet]: merge<Chain, WebbExtendedChain>(
+    polygonMumbai,
+    {
+      chainType: ChainType.EVM,
+      group: 'polygon',
+      tag: 'test',
+    }
+  ),
+  [PresetTypedChainId.MoonbaseAlpha]: merge<Chain, WebbExtendedChain>(
+    moonbaseAlpha,
+    {
+      chainType: ChainType.EVM,
+      group: 'moonbeam',
+      tag: 'test',
+    }
+  ),
+  [PresetTypedChainId.Sepolia]: merge<Chain, WebbExtendedChain>(sepolia, {
     chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.ScrollAlpha,
-    name: 'Scroll Alpha',
-    base: 'scroll',
+    group: 'ethereum',
     tag: 'test',
-    url: 'https://alpha-rpc.scroll.io/l2',
-    blockExplorerStub: 'https://blockscout.scroll.io/',
-    evmRpcUrls: ['https://alpha-rpc.scroll.io/l2'],
-    logo: EtherLogo,
-    multicall3: {
-      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
-      deployedAt: 2745641,
-    },
-  },
+  }),
+  [PresetTypedChainId.AvalancheFuji]: merge<Chain, WebbExtendedChain>(
+    avalancheFuji,
+    {
+      chainType: ChainType.EVM,
+      group: 'avalanche',
+      tag: 'test',
+    }
+  ),
+  [PresetTypedChainId.ScrollAlpha]: merge<Chain, WebbExtendedChain>(
+    scrollTestnet,
+    {
+      chainType: ChainType.EVM,
+      group: 'scroll',
+      tag: 'test',
+      contracts: {
+        multicall3: {
+          address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+          blockCreated: 2745641,
+        },
+      },
+    }
+  ),
 
   // Self hosted chains
   [PresetTypedChainId.HermesOrbit]: {
     chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.HermesOrbit,
+    id: EVMChainId.HermesOrbit,
     name: 'Hermes Orbit',
-    base: 'orbit',
+    network: 'Orbit',
+    group: 'orbit',
     tag: 'test',
-    url: 'https://hermes-testnet.webb.tools',
-    evmRpcUrls: ['https://hermes-testnet.webb.tools'],
-    blockExplorerStub: 'https://hermes-explorer.webb.tools',
-    logo: GanacheLogo,
+    nativeCurrency: DEFAULT_EVM_CURRENCY,
+    blockExplorers: {
+      default: {
+        name: 'Hermes Orbit Explorer',
+        url: 'https://hermes-explorer.webb.tools',
+      },
+    },
+    rpcUrls: {
+      default: {
+        http: ['https://hermes-testnet.webb.tools'],
+      },
+      public: {
+        http: ['https://hermes-testnet.webb.tools'],
+      },
+    },
     env: ['development', 'test'],
-    multicall3: hostedOrbitMulticall3Address
-      ? {
-          address: `0x${hostedOrbitMulticall3Address.replace(/^0x/, '')}`,
-          deployedAt: hermesOrbitMulticall3DeploymentBlock,
-        }
-      : undefined,
+    contracts: {
+      multicall3: hostedOrbitMulticall3Address
+        ? {
+            address: `0x${hostedOrbitMulticall3Address.replace(/^0x/, '')}`,
+            blockCreated: hermesOrbitMulticall3DeploymentBlock,
+          }
+        : undefined,
+    },
   },
+
   [PresetTypedChainId.AthenaOrbit]: {
     chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.AthenaOrbit,
+    id: EVMChainId.AthenaOrbit,
     name: 'Athena Orbit',
-    base: 'orbit',
+    network: 'Orbit',
+    group: 'orbit',
     tag: 'test',
-    url: 'https://athena-testnet.webb.tools',
-    evmRpcUrls: ['https://athena-testnet.webb.tools'],
-    blockExplorerStub: 'https://athena-explorer.webb.tools',
-    logo: GanacheLogo,
+    nativeCurrency: DEFAULT_EVM_CURRENCY,
+    blockExplorers: {
+      default: {
+        name: 'Athena Orbit Explorer',
+        url: 'https://athena-explorer.webb.tools',
+      },
+    },
+    rpcUrls: {
+      default: {
+        http: ['https://athena-testnet.webb.tools'],
+      },
+      public: {
+        http: ['https://athena-testnet.webb.tools'],
+      },
+    },
     env: ['development', 'test'],
-    multicall3: hostedOrbitMulticall3Address
-      ? {
-          address: `0x${hostedOrbitMulticall3Address.replace(/^0x/, '')}`,
-          deployedAt: athenaOrbitMulticall3DeploymentBlock,
-        }
-      : undefined,
+    contracts: {
+      multicall3: hostedOrbitMulticall3Address
+        ? {
+            address: `0x${hostedOrbitMulticall3Address.replace(/^0x/, '')}`,
+            blockCreated: athenaOrbitMulticall3DeploymentBlock,
+          }
+        : undefined,
+    },
   },
+
   [PresetTypedChainId.DemeterOrbit]: {
     chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.DemeterOrbit,
+    id: EVMChainId.DemeterOrbit,
     name: 'Demeter Orbit',
-    base: 'orbit',
+    network: 'Orbit',
+    group: 'orbit',
     tag: 'test',
-    url: 'https://demeter-testnet.webb.tools',
-    evmRpcUrls: ['https://demeter-testnet.webb.tools'],
-    blockExplorerStub: 'https://demeter-explorer.webb.tools',
-    logo: GanacheLogo,
+    nativeCurrency: DEFAULT_EVM_CURRENCY,
+    blockExplorers: {
+      default: {
+        name: 'Demeter Orbit Explorer',
+        url: 'https://demeter-explorer.webb.tools',
+      },
+    },
+    rpcUrls: {
+      default: {
+        http: ['https://demeter-testnet.webb.tools'],
+      },
+      public: {
+        http: ['https://demeter-testnet.webb.tools'],
+      },
+    },
     env: ['development', 'test'],
-    multicall3: hostedOrbitMulticall3Address
-      ? {
-          address: `0x${hostedOrbitMulticall3Address.replace(/^0x/, '')}`,
-          deployedAt: demeterOrbitMulticall3DeploymentBlock,
-        }
-      : undefined,
+    contracts: {
+      multicall3: hostedOrbitMulticall3Address
+        ? {
+            address: `0x${hostedOrbitMulticall3Address.replace(/^0x/, '')}`,
+            blockCreated: demeterOrbitMulticall3DeploymentBlock,
+          }
+        : undefined,
+    },
   },
 
   // Localnet
   [PresetTypedChainId.HermesLocalnet]: {
     chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.HermesLocalnet,
+    id: EVMChainId.HermesLocalnet,
     name: 'Hermes',
-    base: 'webb-dev',
+    network: 'Orbit',
+    group: 'webb-dev',
     tag: 'dev',
-    url: 'http://127.0.0.1:5004',
-    evmRpcUrls: ['http://127.0.0.1:5004'],
-    logo: GanacheLogo,
+    nativeCurrency: DEFAULT_EVM_CURRENCY,
+    rpcUrls: {
+      default: {
+        http: [`http://127.0.0.1:${EVMChainId.HermesLocalnet}`],
+      },
+      public: {
+        http: [`http://127.0.0.1:${EVMChainId.HermesLocalnet}`],
+      },
+    },
     env: ['development'],
-    multicall3: localOrbitMulticall3Address
-      ? {
-          address: `0x${localOrbitMulticall3Address.replace(/^0x/, '')}`,
-          deployedAt: localHermesMulticall3DeploymentBlock,
-        }
-      : undefined,
+    contracts: {
+      multicall3: localOrbitMulticall3Address
+        ? {
+            address: `0x${localOrbitMulticall3Address.replace(/^0x/, '')}`,
+            blockCreated: localHermesMulticall3DeploymentBlock,
+          }
+        : undefined,
+    },
   },
+
   [PresetTypedChainId.AthenaLocalnet]: {
     chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.AthenaLocalnet,
+    id: EVMChainId.AthenaLocalnet,
     name: 'Athena',
-    base: 'webb-dev',
+    network: 'Orbit',
+    group: 'webb-dev',
     tag: 'dev',
-    url: 'http://127.0.0.1:5005',
-    evmRpcUrls: ['http://127.0.0.1:5005'],
-    logo: GanacheLogo,
+    nativeCurrency: DEFAULT_EVM_CURRENCY,
+    rpcUrls: {
+      default: {
+        http: [`http://127.0.0.1:${EVMChainId.AthenaLocalnet}`],
+      },
+      public: {
+        http: [`http://127.0.0.1:${EVMChainId.AthenaLocalnet}`],
+      },
+    },
     env: ['development'],
-    multicall3: localOrbitMulticall3Address
-      ? {
-          address: `0x${localOrbitMulticall3Address.replace(/^0x/, '')}`,
-          deployedAt: localAthenaMulticall3DeploymentBlock,
-        }
-      : undefined,
+    contracts: {
+      multicall3: localOrbitMulticall3Address
+        ? {
+            address: `0x${localOrbitMulticall3Address.replace(/^0x/, '')}`,
+            blockCreated: localAthenaMulticall3DeploymentBlock,
+          }
+        : undefined,
+    },
   },
+
   [PresetTypedChainId.DemeterLocalnet]: {
     chainType: ChainType.EVM,
-    group: 'eth',
-    chainId: EVMChainId.DemeterLocalnet,
+    id: EVMChainId.DemeterLocalnet,
     name: 'Demeter',
-    base: 'webb-dev',
+    network: 'Orbit',
+    group: 'webb-dev',
     tag: 'dev',
-    url: 'http://127.0.0.1:5006',
-    evmRpcUrls: ['http://127.0.0.1:5006'],
-    logo: GanacheLogo,
+    nativeCurrency: DEFAULT_EVM_CURRENCY,
+    rpcUrls: {
+      default: {
+        http: [`http://127.0.0.1:${EVMChainId.DemeterLocalnet}`],
+      },
+      public: {
+        http: [`http://127.0.0.1:${EVMChainId.DemeterLocalnet}`],
+      },
+    },
     env: ['development'],
-    multicall3: localOrbitMulticall3Address
-      ? {
-          address: `0x${localOrbitMulticall3Address.replace(/^0x/, '')}`,
-          deployedAt: localDemeterMulticall3DeploymentBlock,
-        }
-      : undefined,
+    contracts: {
+      multicall3: localOrbitMulticall3Address
+        ? {
+            address: `0x${localOrbitMulticall3Address.replace(/^0x/, '')}`,
+            blockCreated: localDemeterMulticall3DeploymentBlock,
+          }
+        : undefined,
+    },
   },
 };
diff --git a/libs/dapp-config/src/chains/substrate/index.tsx b/libs/dapp-config/src/chains/substrate/index.tsx
index 28acf0e7f3..b0e69712a7 100644
--- a/libs/dapp-config/src/chains/substrate/index.tsx
+++ b/libs/dapp-config/src/chains/substrate/index.tsx
@@ -1,9 +1,5 @@
 import { PresetTypedChainId, SubstrateChainId } from '@webb-tools/dapp-types';
-import KSMLogo from '@webb-tools/logos/chains/KusamaLogo';
-import DOTLogo from '@webb-tools/logos/chains/PolkadotLogo';
-import WEBBLogo from '@webb-tools/logos/chains/WebbLogo';
 import { ChainType } from '@webb-tools/sdk-core/typed-chain-id';
-
 import { ChainConfig } from '../chain-config.interface';
 
 function populateBlockExplorerStub(connString: string): string {
@@ -21,24 +17,62 @@ function populateBlockExplorerStub(connString: string): string {
 export const chainsConfig: Record<number, ChainConfig> = {
   [PresetTypedChainId.ProtocolSubstrateStandalone]: {
     chainType: ChainType.Substrate,
-    group: 'webb',
-    tag: 'dev',
-    chainId: SubstrateChainId.ProtocolSubstrateStandalone,
-    logo: WEBBLogo,
-    url: 'ws://127.0.0.1:9944',
-    blockExplorerStub: populateBlockExplorerStub('ws://127.0.0.1:9944'),
+    id: SubstrateChainId.ProtocolSubstrateStandalone,
     name: 'Substrate',
+    network: 'Substrate',
+    group: 'webb-dev',
+    tag: 'dev',
+    nativeCurrency: {
+      name: 'Webb Substrate',
+      symbol: 'WEBB',
+      decimals: 18,
+    },
+    blockExplorers: {
+      default: {
+        name: 'Substrate Explorer',
+        url: populateBlockExplorerStub('ws://127.0.0.1:9944'),
+      },
+    },
+    rpcUrls: {
+      default: {
+        http: [],
+        webSocket: ['ws://127.0.0.1:9944'],
+      },
+      public: {
+        http: [],
+        webSocket: ['ws://127.0.0.1:9944'],
+      },
+    },
     env: ['development'],
   },
   [PresetTypedChainId.LocalTangleStandalone]: {
     chainType: ChainType.Substrate,
-    group: 'webb',
-    tag: 'dev',
-    chainId: SubstrateChainId.LocalTangleStandalone,
-    logo: WEBBLogo,
-    url: 'ws://127.0.0.1:9944',
-    blockExplorerStub: populateBlockExplorerStub('ws://127.0.0.1:9944'),
+    id: SubstrateChainId.LocalTangleStandalone,
     name: 'Tangle',
+    network: 'Substrate',
+    group: 'tangle',
+    tag: 'dev',
+    nativeCurrency: {
+      name: 'Tangle',
+      symbol: 'TNT',
+      decimals: 18,
+    },
+    blockExplorers: {
+      default: {
+        name: 'Tangle Explorer',
+        url: populateBlockExplorerStub('ws://127.0.0.1:9944'),
+      },
+    },
+    rpcUrls: {
+      default: {
+        http: [],
+        webSocket: ['ws://127.0.0.1:9944'],
+      },
+      public: {
+        http: [],
+        webSocket: ['ws://127.0.0.1:9944'],
+      },
+    },
     env: ['development'],
   },
   /*   [PresetTypedChainId.TangleStandaloneTestnet]: {
@@ -56,26 +90,62 @@ export const chainsConfig: Record<number, ChainConfig> = {
   }, */
   [PresetTypedChainId.Kusama]: {
     chainType: ChainType.KusamaRelayChain,
-    group: 'webb',
-    tag: 'live',
-    chainId: SubstrateChainId.Kusama,
-    logo: KSMLogo,
-    url: 'wss://kusama-rpc.polkadot.io',
-    blockExplorerStub: populateBlockExplorerStub(
-      'wss://kusama-rpc.polkadot.io'
-    ),
+    id: SubstrateChainId.Kusama,
     name: 'Kusama',
+    network: 'Kusama',
+    group: 'kusama',
+    tag: 'live',
+    nativeCurrency: {
+      name: 'Kusama',
+      symbol: 'KSM',
+      decimals: 12,
+    },
+    blockExplorers: {
+      default: {
+        name: 'Kusama Explorer',
+        url: populateBlockExplorerStub('wss://kusama-rpc.polkadot.io'),
+      },
+    },
+    rpcUrls: {
+      default: {
+        http: [],
+        webSocket: ['wss://kusama-rpc.polkadot.io'],
+      },
+      public: {
+        http: [],
+        webSocket: ['wss://kusama-rpc.polkadot.io'],
+      },
+    },
     env: ['development'],
   },
   [PresetTypedChainId.Polkadot]: {
     chainType: ChainType.PolkadotRelayChain,
-    group: 'webb',
-    tag: 'live',
-    chainId: SubstrateChainId.Polkadot,
-    logo: DOTLogo,
-    url: 'wss://rpc.polkadot.io',
-    blockExplorerStub: populateBlockExplorerStub('wss://rpc.polkadot.io'),
+    id: SubstrateChainId.Polkadot,
     name: 'Polkadot',
+    network: 'Polkadot',
+    group: 'polkadot',
+    tag: 'live',
+    nativeCurrency: {
+      name: 'Polkadot',
+      symbol: 'DOT',
+      decimals: 10,
+    },
+    blockExplorers: {
+      default: {
+        name: 'Kusama Explorer',
+        url: populateBlockExplorerStub('wss://rpc.polkadot.io'),
+      },
+    },
+    rpcUrls: {
+      default: {
+        http: [],
+        webSocket: ['wss://rpc.polkadot.io'],
+      },
+      public: {
+        http: [],
+        webSocket: ['wss://rpc.polkadot.io'],
+      },
+    },
     env: ['development'],
   },
 };
diff --git a/libs/dapp-config/src/constants.ts b/libs/dapp-config/src/constants.ts
index e9a2bdcbd8..6d8973bcba 100644
--- a/libs/dapp-config/src/constants.ts
+++ b/libs/dapp-config/src/constants.ts
@@ -3,3 +3,5 @@ export const DEFAULT_NATIVE_INDEX = 0;
 
 // the default decimals
 export const DEFAULT_DECIMALS = 18;
+
+export const ZERO_BIG_INT = BigInt(0);
diff --git a/libs/dapp-config/src/currencies/index.ts b/libs/dapp-config/src/currencies/index.ts
index abd705692a..eac8a3321e 100644
--- a/libs/dapp-config/src/currencies/index.ts
+++ b/libs/dapp-config/src/currencies/index.ts
@@ -1,10 +1,10 @@
-import { ZERO_ADDRESS } from '@webb-tools/utils';
+import { zeroAddress } from 'viem';
 
 export * from './currency-config.interface';
 
 export const DEFAULT_EVM_CURRENCY = {
-  name: 'Webb Ether',
+  name: 'Ether',
   symbol: 'ETH',
   decimals: 18,
-  address: ZERO_ADDRESS,
+  address: zeroAddress,
 } as const;
diff --git a/libs/dapp-config/src/gasLimit-config.ts b/libs/dapp-config/src/gasLimit-config.ts
deleted file mode 100644
index 9ac93ac807..0000000000
--- a/libs/dapp-config/src/gasLimit-config.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { PresetTypedChainId } from '@webb-tools/dapp-types';
-import { BigNumber } from 'ethers';
-
-export type GasLimitConfigType = {
-  [typedChainId: number]: BigNumber;
-};
-
-export const DEFAULT_GAS_LIMIT = BigNumber.from(20000000);
-
-const gasLimitConfig: GasLimitConfigType = {
-  // EVM
-  [PresetTypedChainId.OptimismTestnet]: BigNumber.from(2000000),
-  [PresetTypedChainId.PolygonTestnet]: BigNumber.from(2000000),
-  [PresetTypedChainId.ArbitrumTestnet]: BigNumber.from(20000000),
-  [PresetTypedChainId.Sepolia]: BigNumber.from(2000000),
-  [PresetTypedChainId.MoonbaseAlpha]: BigNumber.from(2000000),
-  [PresetTypedChainId.Goerli]: BigNumber.from(2000000),
-  [PresetTypedChainId.AvalancheFuji]: BigNumber.from(2000000),
-  [PresetTypedChainId.ScrollAlpha]: BigNumber.from(2000000),
-
-  // Orbit
-  [PresetTypedChainId.HermesOrbit]: BigNumber.from(2000000), // TODO: benchmark gas limit
-  [PresetTypedChainId.AthenaOrbit]: BigNumber.from(2000000), // TODO: benchmark gas limit
-  [PresetTypedChainId.DemeterOrbit]: BigNumber.from(2000000), // TODO: benchmark gas limit
-
-  // Substrate
-  // On substrate we don't use the gas amount, we use the partial fee instead
-  [PresetTypedChainId.ProtocolSubstrateStandalone]: BigNumber.from(
-    '10840000100000000000'
-  ),
-  [PresetTypedChainId.LocalTangleStandalone]: BigNumber.from(
-    '10840000100000000000'
-  ),
-};
-
-export default gasLimitConfig;
diff --git a/libs/dapp-config/src/gasLimitConfig.ts b/libs/dapp-config/src/gasLimitConfig.ts
new file mode 100644
index 0000000000..d011c42766
--- /dev/null
+++ b/libs/dapp-config/src/gasLimitConfig.ts
@@ -0,0 +1,33 @@
+import { PresetTypedChainId } from '@webb-tools/dapp-types';
+
+export type GasLimitConfigType = {
+  [typedChainId: number]: bigint;
+};
+
+export const DEFAULT_GAS_LIMIT = BigInt(20000000);
+
+const gasLimitConfig: GasLimitConfigType = {
+  // EVM
+  [PresetTypedChainId.OptimismTestnet]: BigInt(2000000),
+  [PresetTypedChainId.PolygonTestnet]: BigInt(2000000),
+  [PresetTypedChainId.ArbitrumTestnet]: BigInt(20000000),
+  [PresetTypedChainId.Sepolia]: BigInt(2000000),
+  [PresetTypedChainId.MoonbaseAlpha]: BigInt(2000000),
+  [PresetTypedChainId.Goerli]: BigInt(2000000),
+  [PresetTypedChainId.AvalancheFuji]: BigInt(2000000),
+  [PresetTypedChainId.ScrollAlpha]: BigInt(2000000),
+
+  // Orbit
+  [PresetTypedChainId.HermesOrbit]: BigInt(2000000), // TODO: benchmark gas limit
+  [PresetTypedChainId.AthenaOrbit]: BigInt(2000000), // TODO: benchmark gas limit
+  [PresetTypedChainId.DemeterOrbit]: BigInt(2000000), // TODO: benchmark gas limit
+
+  // Substrate
+  // On substrate we don't use the gas amount, we use the partial fee instead
+  [PresetTypedChainId.ProtocolSubstrateStandalone]: BigInt(
+    '10840000100000000000'
+  ), // Temporary
+  [PresetTypedChainId.LocalTangleStandalone]: BigInt('10840000100000000000'), // Temporary
+};
+
+export default gasLimitConfig;
diff --git a/libs/dapp-config/src/index.ts b/libs/dapp-config/src/index.ts
index d82711c6de..bc33cfddd3 100644
--- a/libs/dapp-config/src/index.ts
+++ b/libs/dapp-config/src/index.ts
@@ -8,7 +8,7 @@ export const chainsPopulated = Object.values(chainsConfig).reduce(
   (acc, chainsConfig) => {
     const typedChainId = calculateTypedChainId(
       chainsConfig.chainType,
-      chainsConfig.chainId
+      chainsConfig.id
     );
 
     return {
@@ -19,15 +19,9 @@ export const chainsPopulated = Object.values(chainsConfig).reduce(
           .filter(({ supportedChainIds }) =>
             supportedChainIds.includes(typedChainId)
           )
-          .reduce(
-            (acc, walletsConfig) => ({
-              ...acc,
-              [walletsConfig.id]: {
-                ...walletsConfig,
-              },
-            }),
-            {} as Record<number, Wallet>
-          ),
+          .reduce((acc, walletsConfig) => {
+            return Array.from(new Set([...acc, walletsConfig.id])); // dedupe
+          }, [] as Array<Wallet['id']>),
       },
     };
   },
@@ -38,6 +32,7 @@ export * from './anchors';
 export * from './api-config';
 export * from './bridges';
 export * from './chains';
+export * from './constants';
 export * from './currencies';
 export * from './utils';
 export * from './wallets';
diff --git a/libs/dapp-config/src/maxBlockStepConfig.ts b/libs/dapp-config/src/maxBlockStepConfig.ts
new file mode 100644
index 0000000000..9f46b2b1bc
--- /dev/null
+++ b/libs/dapp-config/src/maxBlockStepConfig.ts
@@ -0,0 +1,36 @@
+import { PresetTypedChainId } from '@webb-tools/dapp-types/ChainId';
+
+export type MaxBlockStepConfigType = {
+  default: number;
+  [typedChainId: number]: number;
+};
+
+/**
+ * The max block step is used to determine
+ * the maximum number of blocks to fetch per request.
+ */
+const maxBlockStepCfg: MaxBlockStepConfigType = {
+  default: 2 ** 11,
+
+  [PresetTypedChainId.ArbitrumTestnet]: 2 ** 24,
+
+  [PresetTypedChainId.Goerli]: 2 ** 11,
+
+  [PresetTypedChainId.MoonbaseAlpha]: 2 ** 13,
+
+  [PresetTypedChainId.PolygonTestnet]: 2 ** 17,
+
+  [PresetTypedChainId.Sepolia]: 2 ** 15,
+
+  [PresetTypedChainId.AvalancheFuji]: 2 ** 11,
+
+  [PresetTypedChainId.ScrollAlpha]: 2 ** 20,
+
+  [PresetTypedChainId.HermesOrbit]: 2 ** 20,
+
+  [PresetTypedChainId.AthenaOrbit]: 2 ** 20,
+
+  [PresetTypedChainId.DemeterOrbit]: 2 ** 20,
+};
+
+export default maxBlockStepCfg;
diff --git a/libs/dapp-config/src/on-chain-config/evm/on-chain-config.ts b/libs/dapp-config/src/on-chain-config/evm/on-chain-config.ts
index 093a17df0d..7205bb4ec3 100644
--- a/libs/dapp-config/src/on-chain-config/evm/on-chain-config.ts
+++ b/libs/dapp-config/src/on-chain-config/evm/on-chain-config.ts
@@ -1,36 +1,21 @@
-import { retryPromise } from '@webb-tools/browser-utils';
 import {
   ERC20__factory,
   FungibleTokenWrapper__factory,
   VAnchor__factory,
 } from '@webb-tools/contracts';
-import { zeroAddress } from '@webb-tools/dapp-types';
 import { ChainType, parseTypedChainId } from '@webb-tools/sdk-core';
-
-import { providers } from 'ethers';
+import { ZERO_ADDRESS } from '@webb-tools/utils';
+import { getContract, type PublicClient } from 'viem';
 import { ChainAddressConfig } from '../../anchors';
-import {
-  LOCALNET_CHAIN_IDS,
-  SELF_HOSTED_CHAIN_IDS,
-  chainsConfig,
-} from '../../chains';
-import { CurrencyConfig, DEFAULT_EVM_CURRENCY } from '../../currencies';
+import { chainsConfig } from '../../chains';
+import { ZERO_BIG_INT } from '../../constants';
+import { CurrencyConfig } from '../../currencies';
 import { ICurrency } from '../../types';
 import { CurrencyResponse, OnChainConfigBase } from '../on-chain-config-base';
 
-// The chain info is retrieved from https://github.com/ethereum-lists/chains
-const CHAIN_URL = 'https://chainid.network/chains.json';
-
 // the singleton instance of the EVM on-chain config with lazy initialization
 let EVMOnChainConfigInstance: EVMOnChainConfig;
 
-// Cache the chain data
-let chainData: Array<{
-  // The native currencies response doesn't include the address
-  nativeCurrency: Omit<ICurrency, 'address'>;
-  chainId: number;
-}> = [];
-
 // Cache the currencies config
 let cachedCurrenciesConfig: {
   currenciesConfig: Record<number, CurrencyConfig>;
@@ -50,67 +35,10 @@ export class EVMOnChainConfig extends OnChainConfigBase {
     return EVMOnChainConfigInstance;
   }
 
-  async fetchNativeCurrency(
-    typedChainId: number,
-    _?: providers.Web3Provider
-  ): Promise<ICurrency | null> {
-    // First check if the native currency is already cached
-    const cachedNativeCurrency = this.nativeCurrencyCache.get(typedChainId);
-    if (cachedNativeCurrency) {
-      return cachedNativeCurrency;
-    }
-
-    // Validate the chainType is EVM and get the chaindId
-    const { chainId } = this.assertChainType(typedChainId, ChainType.EVM);
-
-    // Maybe evn localnet or self hosted
-    const customChainIds = LOCALNET_CHAIN_IDS.concat(SELF_HOSTED_CHAIN_IDS);
-    if (customChainIds.includes(chainId)) {
-      this.nativeCurrencyCache.set(typedChainId, DEFAULT_EVM_CURRENCY);
-      return DEFAULT_EVM_CURRENCY;
-    }
-
-    if (!chainData.length) {
-      try {
-        const resp = await fetch(CHAIN_URL);
-        if (!resp.ok) {
-          throw new Error(`Failed to fetch chain data from ${CHAIN_URL}`);
-        }
-
-        chainData = await resp.json();
-      } catch (error) {
-        console.error(
-          'Unable to retrieve native token information, fallback to default',
-          error
-        );
-        return DEFAULT_EVM_CURRENCY;
-      }
-    }
-
-    const chain = chainData.find((chain) => chain.chainId === chainId);
-    if (!chain) {
-      console.error(
-        `Found unsupported chainId ${chainId} for EVM, fallback to default`
-      );
-      return DEFAULT_EVM_CURRENCY;
-    }
-
-    // Parse the native currency
-    const nativeCurrency = {
-      ...chain.nativeCurrency,
-      address: zeroAddress, // EVM native currency doesn't have an address
-    };
-
-    // Cache the native currency
-    this.nativeCurrencyCache.set(typedChainId, nativeCurrency);
-
-    return nativeCurrency;
-  }
-
   async fetchFungibleCurrency(
     typedChainId: number,
     anchorAddress: string,
-    provider: providers.Web3Provider
+    provider: PublicClient
   ): Promise<ICurrency | null> {
     // First check if the fungible currency is already cached
     const cachedFungibleCurrency = this.fungibleCurrencyCache.get(typedChainId);
@@ -126,17 +54,25 @@ export class EVMOnChainConfig extends OnChainConfigBase {
     this.assertChainType(typedChainId, ChainType.EVM);
 
     try {
-      const vAcnhorContract = VAnchor__factory.connect(anchorAddress, provider);
-      const fungibleCurrencyAddress = await retryPromise(vAcnhorContract.token);
-      const fungibleCurrencyContract = ERC20__factory.connect(
-        fungibleCurrencyAddress,
-        provider
-      );
+      const vAcnhorContract = getContract({
+        address: `0x${anchorAddress.replace('0x', '')}`,
+        abi: VAnchor__factory.abi,
+        publicClient: provider,
+      });
+
+      const fungibleCurrencyAddress = await vAcnhorContract.read.token();
+
+      const fungibleCurrencyContract = getContract({
+        address: fungibleCurrencyAddress,
+        abi: ERC20__factory.abi,
+        publicClient: provider,
+      });
 
+      // This will be batched in one call
       const [name, symbol, decimals] = await Promise.all([
-        retryPromise(fungibleCurrencyContract.name),
-        retryPromise(fungibleCurrencyContract.symbol),
-        retryPromise(fungibleCurrencyContract.decimals),
+        fungibleCurrencyContract.read.name(),
+        fungibleCurrencyContract.read.symbol(),
+        fungibleCurrencyContract.read.decimals(),
       ]);
       const fungibleCurrency = {
         address: fungibleCurrencyAddress,
@@ -164,7 +100,7 @@ export class EVMOnChainConfig extends OnChainConfigBase {
   async fetchWrappableCurrencies(
     fungibleCurrency: ICurrency,
     typedChainId: number,
-    provider: providers.Web3Provider
+    provider: PublicClient
   ): Promise<ICurrency[]> {
     // First check if the wrappable currencies are already cached
     const cachedCurrencies = this.wrappableCurrenciesCache.get(typedChainId);
@@ -179,31 +115,44 @@ export class EVMOnChainConfig extends OnChainConfigBase {
     // Validate the chainType is EVM and get the chaindId
     this.assertChainType(typedChainId, ChainType.EVM);
 
-    const fungibleTokenWrapperContract = FungibleTokenWrapper__factory.connect(
-      fungibleCurrency.address,
-      provider
-    );
+    const fungibleTokenWrapperContract = getContract({
+      address: `0x${fungibleCurrency.address.replace('0x', '')}`,
+      abi: FungibleTokenWrapper__factory.abi,
+      publicClient: provider,
+    });
 
     try {
+      // This will be batched in one call
+      const [addressesWithNative, isNativeAllowed] = await Promise.all([
+        fungibleTokenWrapperContract.read.getTokens(),
+        fungibleTokenWrapperContract.read.isNativeAllowed(),
+      ]);
+
       // Filter the zero addresses because they are not ERC20 tokens
       // and we use the isNativeAllowed flag to determine if native currency is allowed
-      const addresses = (
-        await retryPromise(fungibleTokenWrapperContract.getTokens)
-      ).filter((address) => address !== zeroAddress);
+      const addresses = addressesWithNative.filter(
+        (address) => BigInt(address) !== ZERO_BIG_INT
+      );
 
       const wrappableERC20Contracts = addresses.map((address) =>
-        ERC20__factory.connect(address, provider)
+        getContract({
+          address,
+          abi: ERC20__factory.abi,
+          publicClient: provider,
+        })
       );
 
       const wrappableCurrenciesResponse = await Promise.allSettled<ICurrency>(
-        wrappableERC20Contracts.map(async (ERC20Contract) => {
+        wrappableERC20Contracts.map(async (contractInstance) => {
+          // This will be batched in one call
           const [name, symbol, decimals] = await Promise.all([
-            retryPromise(ERC20Contract.name),
-            retryPromise(ERC20Contract.symbol),
-            retryPromise(ERC20Contract.decimals),
+            contractInstance.read.name(),
+            contractInstance.read.symbol(),
+            contractInstance.read.decimals(),
           ]);
+
           return {
-            address: ERC20Contract.address,
+            address: contractInstance.address,
             decimals,
             symbol,
             name,
@@ -215,14 +164,13 @@ export class EVMOnChainConfig extends OnChainConfigBase {
         .map((resp) => (resp.status === 'fulfilled' ? resp.value : null))
         .filter((currency): currency is ICurrency => Boolean(currency));
 
-      // Check if  is allowed
-      const isNativeAllowed = await retryPromise(
-        fungibleTokenWrapperContract.isNativeAllowed
-      );
       if (isNativeAllowed) {
-        const nativeCurrency = await this.fetchNativeCurrency(typedChainId);
+        const nativeCurrency = await chainsConfig[typedChainId]?.nativeCurrency;
         if (nativeCurrency) {
-          wrappableCurrencies.push(nativeCurrency);
+          wrappableCurrencies.push({
+            ...nativeCurrency,
+            address: ZERO_ADDRESS,
+          });
         }
       }
 
@@ -240,7 +188,7 @@ export class EVMOnChainConfig extends OnChainConfigBase {
 
   async fetchCurrenciesConfig(
     anchorConfig: Record<number, string[]>,
-    providerFactory: (typedChainId: number) => Promise<providers.Web3Provider>,
+    providerFactory: (typedChainId: number) => Promise<PublicClient>,
     existedCurreniciesConfig: Record<number, CurrencyConfig> = {},
     // prettier-ignore
     existedFungibleToWrappableMap: Map<number, Map<number, Set<number>>> = new Map(),
@@ -263,7 +211,7 @@ export class EVMOnChainConfig extends OnChainConfigBase {
       evmTypedChainIds.map(async (typedChainId) => {
         try {
           const provider = await providerFactory(+typedChainId);
-          await provider.getNetwork();
+          await provider.getChainId();
           return true;
         } catch (error) {
           return false;
@@ -282,22 +230,13 @@ export class EVMOnChainConfig extends OnChainConfigBase {
       };
     }
 
-    // Fetch all native currencies (not in try catch because it not call any contract)
-    const nativeCurrenciesWithNull = await Promise.all(
-      evmTypedChainIds.map(async (typedChainId) => ({
-        typedChainId: +typedChainId,
-        nativeCurrency: await this.fetchNativeCurrency(+typedChainId),
-      }))
-    );
-
-    const nativeCurrencies = nativeCurrenciesWithNull.filter(
-      (
-        currency
-      ): currency is Pick<
-        CurrencyResponse,
-        'typedChainId' | 'nativeCurrency'
-      > => Boolean(currency.nativeCurrency)
-    );
+    const nativeCurrencies = evmTypedChainIds.map((typedChainId) => ({
+      typedChainId: +typedChainId,
+      nativeCurrency: {
+        address: ZERO_ADDRESS,
+        ...chainsConfig[+typedChainId]?.nativeCurrency,
+      } satisfies ICurrency,
+    }));
 
     // Fetch all fungible currencies
     const fungibleCurrenciesWithNull = await Promise.allSettled(
diff --git a/libs/dapp-config/src/on-chain-config/on-chain-config-base.ts b/libs/dapp-config/src/on-chain-config/on-chain-config-base.ts
index 157630f19b..83f5a74d1c 100644
--- a/libs/dapp-config/src/on-chain-config/on-chain-config-base.ts
+++ b/libs/dapp-config/src/on-chain-config/on-chain-config-base.ts
@@ -2,7 +2,7 @@ import { ApiPromise } from '@polkadot/api';
 import { CurrencyRole, CurrencyType } from '@webb-tools/dapp-types';
 import { ChainType, parseTypedChainId } from '@webb-tools/sdk-core';
 import assert from 'assert';
-import { ethers } from 'ethers';
+import type { PublicClient } from 'viem';
 
 import { ChainAddressConfig } from '../anchors';
 import { CurrencyConfig } from '../currencies';
@@ -17,10 +17,6 @@ export interface CurrencyResponse {
 }
 
 export abstract class OnChainConfigBase {
-  // Cache the native currencies to avoid finding the chain data multiple times
-  // typedChainId -> nativeCurrency
-  protected nativeCurrencyCache = new Map<number, ICurrency>();
-
   // Cache the fungible currencies
   // typedChainId -> fungibleCurrency | Error
   protected fungibleCurrencyCache = new Map<number, ICurrency | Error>();
@@ -36,17 +32,6 @@ export abstract class OnChainConfigBase {
     // empty
   }
 
-  /**
-   * Retrieves the native token info for the given chain id
-   * @param typedChainId the typed chain id to get the native token info for
-   * @param provider the provider to use (optional on evm but required on substrate)
-   * @returns the native token info for the given chain id
-   */
-  abstract fetchNativeCurrency(
-    typedChainId: number,
-    provider?: ethers.providers.Web3Provider | ApiPromise
-  ): Promise<ICurrency | null>;
-
   /**
    * Get the fungible currency config for a given typed chain id,
    * this function depends on the hardcoded anchor config
@@ -55,7 +40,7 @@ export abstract class OnChainConfigBase {
   abstract fetchFungibleCurrency(
     typedChainId: number,
     anchorAddress: string,
-    provider: ethers.providers.Web3Provider | ApiPromise
+    provider: PublicClient | ApiPromise
   ): Promise<ICurrency | null>;
 
   /**
@@ -68,7 +53,7 @@ export abstract class OnChainConfigBase {
   abstract fetchWrappableCurrencies(
     fungibleCurrency: ICurrency,
     typedChainId: number,
-    provider: ethers.providers.Web3Provider | ApiPromise
+    provider: PublicClient | ApiPromise
   ): Promise<ICurrency[]>;
 
   /**
@@ -84,7 +69,7 @@ export abstract class OnChainConfigBase {
     anchorConfig: Record<number, string[]>,
     providerFactory: (
       typedChainId: number
-    ) => Promise<ethers.providers.Web3Provider | ApiPromise>,
+    ) => Promise<PublicClient | ApiPromise>,
     existedCurreniciesConfig?: Record<number, CurrencyConfig>,
     existedFungibleToWrappableMap?: Map<number, Map<number, Set<number>>>,
     existedAnchorConfig?: Record<number, ChainAddressConfig>
diff --git a/libs/dapp-config/src/on-chain-config/substrate/on-chain-config.ts b/libs/dapp-config/src/on-chain-config/substrate/on-chain-config.ts
index 7bb8ac4ea5..12ba3f7683 100644
--- a/libs/dapp-config/src/on-chain-config/substrate/on-chain-config.ts
+++ b/libs/dapp-config/src/on-chain-config/substrate/on-chain-config.ts
@@ -9,6 +9,7 @@ import {
 import { ChainType, parseTypedChainId } from '@webb-tools/sdk-core';
 
 import { ChainAddressConfig } from '../../anchors';
+import { chainsConfig } from '../../chains';
 import { DEFAULT_DECIMALS, DEFAULT_NATIVE_INDEX } from '../../constants';
 import { CurrencyConfig } from '../../currencies';
 import { ICurrency } from '../../types';
@@ -36,46 +37,6 @@ export class SubstrateOnChainConfig extends OnChainConfigBase {
     return SubstrateOnChainConfigInstance;
   }
 
-  async fetchNativeCurrency(
-    typedChainId: number,
-    provider?: ApiPromise
-  ): Promise<ICurrency | null> {
-    if (!provider) {
-      console.error(
-        'The provider is required for fetching the native currency on Substrate'
-      );
-      return null;
-    }
-
-    this.assertChainType(typedChainId, ChainType.Substrate);
-
-    // First check if the native currency is already cached
-    const cachedNativeCurrency = this.nativeCurrencyCache.get(typedChainId);
-    if (cachedNativeCurrency) {
-      if (cachedNativeCurrency instanceof Error) {
-        return null;
-      }
-
-      return Promise.resolve(cachedNativeCurrency);
-    }
-
-    const name = provider.registry.chainTokens[DEFAULT_NATIVE_INDEX];
-    const decimals = provider.registry.chainDecimals[DEFAULT_NATIVE_INDEX];
-    // The native currency is always at index 0 in the asset registry pallet
-    const address = DEFAULT_NATIVE_INDEX.toString();
-
-    const native: ICurrency = {
-      name,
-      symbol: name,
-      decimals,
-      address,
-    };
-
-    // Cache the native currency
-    this.nativeCurrencyCache.set(typedChainId, native);
-    return native;
-  }
-
   async fetchFungibleCurrency(
     typedChainId: number,
     treeId: string,
@@ -182,17 +143,17 @@ export class SubstrateOnChainConfig extends OnChainConfigBase {
       );
       const wrappable: ICurrency[] = await Promise.all(
         wrappableAssetIds.map(async (assetId) => {
-          if (assetId === '0') {
-            const native = await this.fetchNativeCurrency(
-              typedChainId,
-              provider
-            );
+          if (assetId === `${DEFAULT_NATIVE_INDEX}`) {
+            const native = chainsConfig[typedChainId].nativeCurrency;
 
             if (!native) {
               throw new Error('Native currency not found');
             }
 
-            return native;
+            return {
+              ...native,
+              address: `${DEFAULT_NATIVE_INDEX}`,
+            };
           }
           const asset = await provider.query.assetRegistry.assets(assetId);
           if (asset.isNone) {
@@ -266,30 +227,13 @@ export class SubstrateOnChainConfig extends OnChainConfigBase {
       };
     }
 
-    // Fetch all native currencies (not in try catch because it not call any contract)
-    const nativeCurrenciesWithNull = await Promise.all(
-      substrateTypedChainIds.map(async (typedChainId) => {
-        const provider = await providerFactory(+typedChainId);
-
-        return {
-          typedChainId: +typedChainId,
-          nativeCurrency: await this.fetchNativeCurrency(
-            +typedChainId,
-            provider
-          ),
-        };
-      })
-    );
-
-    // Fetch all native currencies
-    const nativeCurrencies = nativeCurrenciesWithNull.filter(
-      (
-        currency
-      ): currency is Pick<
-        CurrencyResponse,
-        'typedChainId' | 'nativeCurrency'
-      > => Boolean(currency.nativeCurrency)
-    );
+    const nativeCurrencies = substrateTypedChainIds.map((typedChainId) => ({
+      typedChainId: +typedChainId,
+      nativeCurrency: {
+        ...chainsConfig[+typedChainId].nativeCurrency,
+        address: `${DEFAULT_NATIVE_INDEX}`,
+      } satisfies ICurrency,
+    }));
 
     // Fetch all fungible currencies
     const fungibleCurrenciesWithNull = await Promise.allSettled(
diff --git a/libs/dapp-config/src/wagmi-config.ts b/libs/dapp-config/src/wagmi-config.ts
new file mode 100644
index 0000000000..a5b172801b
--- /dev/null
+++ b/libs/dapp-config/src/wagmi-config.ts
@@ -0,0 +1,28 @@
+import { configureChains, createConfig } from 'wagmi';
+import { publicProvider } from 'wagmi/providers/public';
+import { chainsConfig } from './chains/evm';
+import { SupportedConnector } from './wallets/wallet-config.interface';
+import { walletsConfig } from './wallets/wallets-config';
+
+if (!process.env['WALLET_CONNECT_PROJECT_ID']) {
+  throw new Error('Missing WALLET_CONNECT_PROJECT_ID');
+}
+
+const { publicClient, webSocketPublicClient } = configureChains(
+  Object.values(chainsConfig),
+  [publicProvider()],
+  { batch: { multicall: true }, stallTimeout: 30_000 }
+);
+
+const connectors = Object.values(walletsConfig)
+  .map((wallet) => wallet.connector)
+  .filter((connector): connector is SupportedConnector => !!connector);
+
+const config = createConfig({
+  autoConnect: true,
+  connectors,
+  publicClient,
+  webSocketPublicClient,
+});
+
+export default config;
diff --git a/libs/dapp-config/src/wallets/wallet-config.interface.ts b/libs/dapp-config/src/wallets/wallet-config.interface.ts
index 0092ac42b5..960d44a896 100644
--- a/libs/dapp-config/src/wallets/wallet-config.interface.ts
+++ b/libs/dapp-config/src/wallets/wallet-config.interface.ts
@@ -1,8 +1,11 @@
-// Copyright 2022 @webb-tools/
+// Copyright 2023 @webb-tools/
 // SPDX-License-Identifier: Apache-2.0
 
+import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
+import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
 import { SupportedBrowsers } from '@webb-tools/browser-utils/platform';
-import { PresetTypedChainId } from '@webb-tools/dapp-types';
+
+export type SupportedConnector = MetaMaskConnector | WalletConnectConnector;
 
 export interface WalletConfig {
   id: number;
@@ -24,6 +27,8 @@ export interface WalletConfig {
   detect?(): boolean | Promise<boolean>;
 
   supportedChainIds: number[];
+
+  connector?: SupportedConnector;
 }
 
 export type ManagedWallet = {
diff --git a/libs/dapp-config/src/wallets/wallets-config.tsx b/libs/dapp-config/src/wallets/wallets-config.tsx
index 5a1698748b..694a612ef4 100644
--- a/libs/dapp-config/src/wallets/wallets-config.tsx
+++ b/libs/dapp-config/src/wallets/wallets-config.tsx
@@ -1,7 +1,6 @@
 import { SupportedBrowsers } from '@webb-tools/browser-utils/platform';
 import { PresetTypedChainId } from '@webb-tools/dapp-types';
 import { WalletId } from '@webb-tools/dapp-types/WalletId';
-
 import {
   MetaMaskIcon,
   PolkadotJsIcon,
@@ -9,7 +8,11 @@ import {
   TalismanIcon,
   WalletConnectIcon,
 } from '@webb-tools/icons';
-import { WalletConfig } from '.';
+import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
+import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
+
+import { chainsConfig as evmChainsConfig } from '../chains/evm';
+import { WalletConfig } from './wallet-config.interface';
 
 const ANY_EVM = [
   PresetTypedChainId.EthereumMainNet,
@@ -46,7 +49,13 @@ const ANY_SUBSTRATE = [
   PresetTypedChainId.Polkadot,
 ];
 
+if (!process.env['WALLET_CONNECT_PROJECT_ID']) {
+  throw new Error('Missing WALLET_CONNECT_PROJECT_ID env variable.');
+}
+
 export const walletsConfig: Record<number, WalletConfig> = {
+  // TODO: Should move all hardcoded wallet configs to connectors
+  // https://wagmi.sh/examples/custom-connector
   [WalletId.Polkadot]: {
     id: WalletId.Polkadot,
     Logo: <PolkadotJsIcon />,
@@ -88,9 +97,12 @@ export const walletsConfig: Record<number, WalletConfig> = {
       [SupportedBrowsers.Chrome]:
         'https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn?hl=en',
     },
+    connector: new MetaMaskConnector({
+      chains: Object.values(evmChainsConfig),
+    }),
   },
-  [WalletId.WalletConnectV1]: {
-    id: WalletId.WalletConnectV1,
+  [WalletId.WalletConnectV2]: {
+    id: WalletId.WalletConnectV2,
     Logo: <WalletConnectIcon />,
     name: 'wallet connect',
     title: `Wallet Connect`,
@@ -101,6 +113,11 @@ export const walletsConfig: Record<number, WalletConfig> = {
     },
     supportedChainIds: [...ANY_EVM],
     homeLink: 'https://walletconnect.com/',
+    connector: new WalletConnectConnector({
+      options: {
+        projectId: process.env['WALLET_CONNECT_PROJECT_ID'],
+      },
+    }),
   },
   [WalletId.Talisman]: {
     id: WalletId.Talisman,
diff --git a/libs/dapp-types/src/WalletId.ts b/libs/dapp-types/src/WalletId.ts
index bcd17a9e03..d156c7490f 100644
--- a/libs/dapp-types/src/WalletId.ts
+++ b/libs/dapp-types/src/WalletId.ts
@@ -1,7 +1,7 @@
 export enum WalletId {
   Polkadot = 1,
   MetaMask,
-  WalletConnectV1,
+  WalletConnectV2,
   OneWallet,
   Talisman,
   SubWallet,
diff --git a/libs/dapp-types/src/WebbError.ts b/libs/dapp-types/src/WebbError.ts
index d9b06006ab..1fb5ad7768 100644
--- a/libs/dapp-types/src/WebbError.ts
+++ b/libs/dapp-types/src/WebbError.ts
@@ -13,12 +13,16 @@ export enum WebbErrorCodes {
   UnsupportedProvider,
   // Unsupported chain is switch via the extension
   UnsupportedChain,
+  // Unsupported wallet
+  UnsupportedWallet,
   // Unselected chain is a mismatch between provider and application
   UnselectedChain,
   // No accounts are available
   NoAccountAvailable,
   // No active bridge
   NoActiveBridge,
+  // Missing endpoints in the configuration
+  NoEndpointsConfigured,
   // Failed to parse deposit note
   NoteParsingFailure,
   // PolkaDot extension not installed
@@ -55,6 +59,14 @@ export enum WebbErrorCodes {
   InsufficientDiskSpace,
   // Invalid arguments
   InvalidArguments,
+  // No connector configured for the wallet
+  NoConnectorConfigured,
+  // Relayer has not yet relayed the commitment to the destination chain
+  CommitmentNotInTree,
+  // Switch account failed
+  SwitchAccountFailed,
+  // Switch chain failed
+  SwitchChainFailed,
 }
 
 // An Error message with error metadata
@@ -117,7 +129,13 @@ export class WebbError extends Error {
       case WebbErrorCodes.UnsupportedChain:
         return {
           code,
-          message: 'you have switched to unsupported chain',
+          message: 'You have switched to unsupported chain',
+        };
+
+      case WebbErrorCodes.UnsupportedWallet:
+        return {
+          code,
+          message: 'You have selected unsupported wallet',
         };
 
       case WebbErrorCodes.UnselectedChain:
@@ -230,6 +248,12 @@ export class WebbError extends Error {
           message: `No currency is available`,
         };
 
+      case WebbErrorCodes.NoEndpointsConfigured:
+        return {
+          code,
+          message: `Missing endpoints in the configuration`,
+        };
+
       case WebbErrorCodes.TreeNotFound:
         return {
           code,
@@ -254,6 +278,30 @@ export class WebbError extends Error {
           message: `Invalid arguments`,
         };
 
+      case WebbErrorCodes.NoConnectorConfigured:
+        return {
+          code,
+          message: `No connector configured for the wallet`,
+        };
+
+      case WebbErrorCodes.CommitmentNotInTree:
+        return {
+          code,
+          message: `Relayer has not yet relayed the commitment to the destination chain`,
+        };
+
+      case WebbErrorCodes.SwitchAccountFailed:
+        return {
+          code,
+          message: 'Failed to switch account',
+        };
+
+      case WebbErrorCodes.SwitchChainFailed:
+        return {
+          code,
+          message: 'Failed to switch chain',
+        };
+
       default:
         return {
           code,
diff --git a/libs/dapp-types/src/index.ts b/libs/dapp-types/src/index.ts
index be53835738..98f9e7704f 100644
--- a/libs/dapp-types/src/index.ts
+++ b/libs/dapp-types/src/index.ts
@@ -6,7 +6,7 @@ export * from './Currency';
 export * from './InteractiveFeedback';
 export * from './Props';
 export * from './Storage';
-export { default as Storagge } from './Storage';
+export { default as Storage } from './Storage';
 export * from './WalletId';
 export * from './WebbError';
 export * from './appMode';
diff --git a/libs/icons/src/Spinner.tsx b/libs/icons/src/Spinner.tsx
index de72c98ce4..f6a487285a 100644
--- a/libs/icons/src/Spinner.tsx
+++ b/libs/icons/src/Spinner.tsx
@@ -4,7 +4,7 @@ import { twMerge } from 'tailwind-merge';
 import { createIcon } from './create-icon';
 import { IconBase } from './types';
 
-export const Spinner: React.FC<IconBase> = (props) => {
+export const Spinner = React.memo<IconBase>((props) => {
   // Spin animation attach to className
   const className = twMerge(
     props.className,
@@ -31,4 +31,4 @@ export const Spinner: React.FC<IconBase> = (props) => {
     displayName: 'Spinner',
     viewBox: '0 0 20 20',
   });
-};
+});
diff --git a/libs/icons/src/chains/scroll-alpha.svg b/libs/icons/src/chains/scroll-testnet.svg
similarity index 100%
rename from libs/icons/src/chains/scroll-alpha.svg
rename to libs/icons/src/chains/scroll-testnet.svg
diff --git a/libs/logos/.babelrc b/libs/logos/.babelrc
deleted file mode 100644
index fd4cbcdef1..0000000000
--- a/libs/logos/.babelrc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "presets": [
-    [
-      "@nx/js/babel",
-      {
-        "useBuiltIns": "usage"
-      }
-    ]
-  ]
-}
diff --git a/libs/logos/.eslintrc.json b/libs/logos/.eslintrc.json
deleted file mode 100644
index 9d9c0db55b..0000000000
--- a/libs/logos/.eslintrc.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}
diff --git a/libs/logos/README.md b/libs/logos/README.md
deleted file mode 100644
index 3516fd4110..0000000000
--- a/libs/logos/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# logos
-
-This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test logos` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/logos/jest.config.ts b/libs/logos/jest.config.ts
deleted file mode 100644
index 25d530e426..0000000000
--- a/libs/logos/jest.config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'logos',
-  preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
-  transform: {
-    '^.+\\.[tj]s$': 'ts-jest',
-  },
-  moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/libs/logos',
-};
diff --git a/libs/logos/package.json b/libs/logos/package.json
deleted file mode 100644
index fdec69aa3e..0000000000
--- a/libs/logos/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "@webb-tools/logos",
-  "version": "0.0.1",
-  "main": "./src/index.js"
-}
diff --git a/libs/logos/project.json b/libs/logos/project.json
deleted file mode 100644
index bd331951cc..0000000000
--- a/libs/logos/project.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "logos",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/logos/src",
-  "projectType": "library",
-  "targets": {
-    "build": {
-      "executor": "@nx/js:tsc",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/libs/logos",
-        "main": "libs/logos/src/index.ts",
-        "tsConfig": "libs/logos/tsconfig.lib.json",
-        "assets": ["libs/logos/*.md"]
-      }
-    },
-    "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/logos/**/*.ts"]
-      }
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "libs/logos/jest.config.ts",
-        "passWithNoTests": true
-      }
-    }
-  },
-  "tags": []
-}
diff --git a/libs/logos/src/ChromeLogo.tsx b/libs/logos/src/ChromeLogo.tsx
deleted file mode 100644
index a681e4a261..0000000000
--- a/libs/logos/src/ChromeLogo.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import * as React from 'react';
-
-function ChromeLogo() {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
-      viewBox="1 1 176 176"
-    >
-      <style>
-        {
-          '.prefix__B{clip-path:url(#prefix__C)}.prefix__C{fill:#3e2723}.prefix__D{fillOpacity:.15}.prefix__E{fillOpacity:.2}'
-        }
-      </style>
-      <defs>
-        <circle id="prefix__A" cx={96} cy={96} r={88} />
-        <path id="prefix__B" d="M8 184h83.77l38.88-38.88V116h-69.3L8 24.48z" />
-      </defs>
-      <clipPath id="prefix__C">
-        <use xlinkHref="#prefix__A" />
-      </clipPath>
-      <g className="prefix__B" transform="translate(-7 -7)">
-        <path d="M21.97 8v108h39.4L96 56h88V8z" fill="#db4437" />
-        <linearGradient
-          id="prefix__D"
-          x1={29.34}
-          x2={81.84}
-          y1={75.02}
-          y2={44.35}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#a52714" stopOpacity={0.6} offset={0} />
-          <stop stopColor="#a52714" stopOpacity={0} offset={0.66} />
-        </linearGradient>
-        <path d="M21.97 8v108h39.4L96 56h88V8z" fill="url(#prefix__D)" />
-        <path
-          d="M62.3 115.6L22.48 47.3l-.58 1 39.54 67.8z"
-          className="prefix__C prefix__D"
-        />
-        <use xlinkHref="#prefix__B" fill="#0f9d58" />
-        <linearGradient
-          id="prefix__E"
-          x1={110.9}
-          x2={52.54}
-          y1={164.5}
-          y2={130.3}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#055524" stopOpacity={0.4} offset={0} />
-          <stop stopColor="#055524" stopOpacity={0} offset={0.33} />
-        </linearGradient>
-        <path
-          d="M8 184h83.77l38.88-38.88V116h-69.3L8 24.48z"
-          fill="url(#prefix__E)"
-        />
-        <path
-          d="M129.8 117.3l-.83-.48-38.4 67.15h1.15l38.1-66.64z"
-          fill="#263238"
-          className="prefix__D"
-        />
-        <defs>
-          <path
-            id="prefix__F"
-            d="M8 184h83.77l38.88-38.88V116h-69.3L8 24.48z"
-          />
-        </defs>
-        <clipPath id="prefix__G">
-          <use xlinkHref="#prefix__F" />
-        </clipPath>
-        <g clipPath="url(#prefix__G)">
-          <path d="M96 56l34.65 60-38.88 68H184V56z" fill="#ffcd40" />
-          <linearGradient
-            id="prefix__H"
-            x1={121.9}
-            x2={136.6}
-            y1={49.8}
-            y2={114.1}
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#ea6100" stopOpacity={0.3} offset={0} />
-            <stop stopColor="#ea6100" stopOpacity={0} offset={0.66} />
-          </linearGradient>
-          <path d="M96 56l34.65 60-38.88 68H184V56z" fill="url(#prefix__H)" />
-        </g>
-        <path d="M96 56l34.65 60-38.88 68H184V56z" fill="#ffcd40" />
-        <path d="M96 56l34.65 60-38.88 68H184V56z" fill="url(#prefix__H)" />
-        <defs>
-          <path id="prefix__I" d="M96 56l34.65 60-38.88 68H184V56z" />
-        </defs>
-        <clipPath id="prefix__J">
-          <use xlinkHref="#prefix__I" />
-        </clipPath>
-        <g clipPath="url(#prefix__J)">
-          <path d="M21.97 8v108h39.4L96 56h88V8z" fill="#db4437" />
-          <path d="M21.97 8v108h39.4L96 56h88V8z" fill="url(#prefix__D)" />
-        </g>
-      </g>
-      <radialGradient
-        id="prefix__K"
-        cx={668.2}
-        cy={55.95}
-        r={84.08}
-        gradientTransform="translate(-576)"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stopColor="#3e2723" stopOpacity={0.2} offset={0} />
-        <stop stopColor="#3e2723" stopOpacity={0} offset={1} />
-      </radialGradient>
-      <path
-        d="M96 56v20.95L174.4 56z"
-        fill="url(#prefix__K)"
-        className="prefix__B"
-        transform="translate(-7 -7)"
-      />
-      <g className="prefix__B" transform="translate(-7 -7)">
-        <defs>
-          <path id="prefix__L" d="M21.97 8v40.34L61.36 116 96 56h88V8z" />
-        </defs>
-        <clipPath id="prefix__M">
-          <use xlinkHref="#prefix__L" />
-        </clipPath>
-        <g clipPath="url(#prefix__M)">
-          <use xlinkHref="#prefix__B" fill="#0f9d58" />
-          <path
-            d="M8 184h83.77l38.88-38.88V116h-69.3L8 24.48z"
-            fill="url(#prefix__E)"
-          />
-        </g>
-      </g>
-      <radialGradient
-        id="prefix__N"
-        cx={597.9}
-        cy={48.52}
-        r={78.04}
-        gradientTransform="translate(-576)"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stopColor="#3e2723" stopOpacity={0.2} offset={0} />
-        <stop stopColor="#3e2723" stopOpacity={0} offset={1} />
-      </radialGradient>
-      <path
-        transform="translate(-7 -7)"
-        d="M21.97 48.45l57.25 57.24L61.36 116z"
-        fill="url(#prefix__N)"
-        className="prefix__B"
-      />
-      <radialGradient
-        id="prefix__O"
-        cx={671.8}
-        cy={96.14}
-        r={87.87}
-        gradientTransform="translate(-576)"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stopColor="#263238" stopOpacity={0.2} offset={0} />
-        <stop stopColor="#263238" stopOpacity={0} offset={1} />
-      </radialGradient>
-      <g>
-        <path
-          d="M91.83 183.9l20.96-78.2 17.86 10.3z"
-          fill="url(#prefix__O)"
-          className="prefix__B"
-          transform="translate(-7 -7)"
-        />
-        <g className="prefix__B" transform="translate(-7 -7)">
-          <circle cx={96} cy={96} r={40} fill="#f1f1f1" />
-          <circle cx={96} cy={96} r={32} fill="#4285f4" />
-          <path
-            d="M96 55c-22.1 0-40 17.9-40 40v1c0-22.1 17.9-40 40-40h88v-1H96z"
-            className="prefix__C prefix__E"
-          />
-          <path
-            d="M130.6 116c-6.92 11.94-19.8 20-34.6 20s-27.7-8.06-34.6-20h-.04L8 24.48v1L61.4 117c6.92 11.94 19.8 20 34.6 20s27.68-8.05 34.6-20h.05v-1h-.06z"
-            fill="#fff"
-            fillOpacity={0.1}
-          />
-          <path
-            d="M97 56c-.17 0-.33.02-.5.03C118.36 56.3 136 74.08 136 96s-17.64 39.7-39.5 39.97c.17 0 .33.03.5.03 22.1 0 40-17.9 40-40s-17.9-40-40-40z"
-            opacity={0.1}
-            className="prefix__C"
-          />
-          <path
-            d="M131 117.3c3.4-5.88 5.37-12.68 5.37-19.96a39.87 39.87 0 00-1.87-12.09c.95 3.42 1.5 7 1.5 10.73 0 7.28-1.97 14.08-5.37 19.96l.02.04-38.88 68h1.16L131 117.3z"
-            fill="#fff"
-            className="prefix__E"
-          />
-          <path
-            d="M96 9c48.43 0 87.72 39.13 88 87.5 0-.17.01-.33.01-.5 0-48.6-39.4-88-88-88S8 47.4 8 96c0 .17.01.33.01.5C8.28 48.13 47.57 9 96 9z"
-            fill="#fff"
-            className="prefix__E"
-          />
-          <path
-            d="M96 183c48.43 0 87.72-39.13 88-87.5 0 .17.01.33.01.5 0 48.6-39.4 88-88 88S8 144.6 8 96c0-.17.01-.33.01-.5.27 48.37 39.56 87.5 88 87.5z"
-            className="prefix__C prefix__D"
-          />
-        </g>
-      </g>
-    </svg>
-  );
-}
-
-export default ChromeLogo;
diff --git a/libs/logos/src/Eth.tsx b/libs/logos/src/Eth.tsx
deleted file mode 100644
index 2f281b6097..0000000000
--- a/libs/logos/src/Eth.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-function EtherLogo() {
-  return (
-    <svg width={'100%'} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-      <g fill="none" fillRule="evenodd">
-        <circle cx="16" cy="16" r="16" fill="#627EEA" />
-        <g fill="#FFF" fillRule="nonzero">
-          <path fillOpacity=".602" d="M16.498 4v8.87l7.497 3.35z" />
-          <path d="M16.498 4L9 16.22l7.498-3.35z" />
-          <path fillOpacity=".602" d="M16.498 21.968v6.027L24 17.616z" />
-          <path d="M16.498 27.995v-6.028L9 17.616z" />
-          <path fillOpacity=".2" d="M16.498 20.573l7.497-4.353-7.497-3.348z" />
-          <path fillOpacity=".602" d="M9 16.22l7.498 4.353v-7.701z" />
-        </g>
-      </g>
-    </svg>
-  );
-}
-
-export default EtherLogo;
diff --git a/libs/logos/src/FireFoxLogo.tsx b/libs/logos/src/FireFoxLogo.tsx
deleted file mode 100644
index ba00f5ad08..0000000000
--- a/libs/logos/src/FireFoxLogo.tsx
+++ /dev/null
@@ -1,237 +0,0 @@
-import * as React from 'react';
-
-function FireFoxLogo() {
-  return (
-    <svg viewBox="0 0 77.42 79.97" xmlns="http://www.w3.org/2000/svg">
-      <title>{'Firefox Browser logo'}</title>
-      <defs>
-        <radialGradient
-          id="prefix__b"
-          cx={-7907}
-          cy={-8515}
-          r={80.8}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#ffbd4f" offset={0.129} />
-          <stop stopColor="#ffac31" offset={0.186} />
-          <stop stopColor="#ff9d17" offset={0.247} />
-          <stop stopColor="#ff980e" offset={0.283} />
-          <stop stopColor="#ff563b" offset={0.403} />
-          <stop stopColor="#ff3750" offset={0.467} />
-          <stop stopColor="#f5156c" offset={0.71} />
-          <stop stopColor="#eb0878" offset={0.782} />
-          <stop stopColor="#e50080" offset={0.86} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__c"
-          cx={-7937}
-          cy={-8482}
-          r={80.8}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#960e18" offset={0.3} />
-          <stop stopColor="#b11927" stopOpacity={0.74} offset={0.351} />
-          <stop stopColor="#db293d" stopOpacity={0.343} offset={0.435} />
-          <stop stopColor="#f5334b" stopOpacity={0.094} offset={0.497} />
-          <stop stopColor="#ff3750" stopOpacity={0} offset={0.53} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__d"
-          cx={-7927}
-          cy={-8533}
-          r={58.53}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#fff44f" offset={0.132} />
-          <stop stopColor="#ffdc3e" offset={0.252} />
-          <stop stopColor="#ff9d12" offset={0.506} />
-          <stop stopColor="#ff980e" offset={0.526} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__e"
-          cx={-7946}
-          cy={-8461}
-          r={38.47}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#3a8ee6" offset={0.353} />
-          <stop stopColor="#5c79f0" offset={0.472} />
-          <stop stopColor="#9059ff" offset={0.669} />
-          <stop stopColor="#c139e6" offset={1} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__f"
-          cx={-7936}
-          cy={-8492}
-          r={20.4}
-          gradientTransform="matrix(.972 -.235 .275 1.138 10090 7834)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#9059ff" stopOpacity={0} offset={0.206} />
-          <stop stopColor="#8c4ff3" stopOpacity={0.064} offset={0.278} />
-          <stop stopColor="#7716a8" stopOpacity={0.45} offset={0.747} />
-          <stop stopColor="#6e008b" stopOpacity={0.6} offset={0.975} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__g"
-          cx={-7938}
-          cy={-8518}
-          r={27.68}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#ffe226" offset={0} />
-          <stop stopColor="#ffdb27" offset={0.121} />
-          <stop stopColor="#ffc82a" offset={0.295} />
-          <stop stopColor="#ffa930" offset={0.502} />
-          <stop stopColor="#ff7e37" offset={0.732} />
-          <stop stopColor="#ff7139" offset={0.792} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__h"
-          cx={-7916}
-          cy={-8536}
-          r={118.1}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#fff44f" offset={0.113} />
-          <stop stopColor="#ff980e" offset={0.456} />
-          <stop stopColor="#ff5634" offset={0.622} />
-          <stop stopColor="#ff3647" offset={0.716} />
-          <stop stopColor="#e31587" offset={0.904} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__i"
-          cx={-7927}
-          cy={-8523}
-          r={86.5}
-          gradientTransform="matrix(.105 .995 -.653 .069 -4685 8470)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#fff44f" offset={0} />
-          <stop stopColor="#ffe847" offset={0.06} />
-          <stop stopColor="#ffc830" offset={0.168} />
-          <stop stopColor="#ff980e" offset={0.304} />
-          <stop stopColor="#ff8b16" offset={0.356} />
-          <stop stopColor="#ff672a" offset={0.455} />
-          <stop stopColor="#ff3647" offset={0.57} />
-          <stop stopColor="#e31587" offset={0.737} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__j"
-          cx={-7938}
-          cy={-8508}
-          r={73.72}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#fff44f" offset={0.137} />
-          <stop stopColor="#ff980e" offset={0.48} />
-          <stop stopColor="#ff5634" offset={0.592} />
-          <stop stopColor="#ff3647" offset={0.655} />
-          <stop stopColor="#e31587" offset={0.904} />
-        </radialGradient>
-        <radialGradient
-          id="prefix__k"
-          cx={-7919}
-          cy={-8504}
-          r={80.69}
-          gradientTransform="translate(7974 8524)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#fff44f" offset={0.094} />
-          <stop stopColor="#ffe141" offset={0.231} />
-          <stop stopColor="#ffaf1e" offset={0.509} />
-          <stop stopColor="#ff980e" offset={0.626} />
-        </radialGradient>
-        <linearGradient
-          id="prefix__a"
-          x1={70.79}
-          x2={6.447}
-          y1={12.39}
-          y2={74.47}
-          gradientTransform="translate(-1.3 -.004)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#fff44f" offset={0.048} />
-          <stop stopColor="#ffe847" offset={0.111} />
-          <stop stopColor="#ffc830" offset={0.225} />
-          <stop stopColor="#ff980e" offset={0.368} />
-          <stop stopColor="#ff8b16" offset={0.401} />
-          <stop stopColor="#ff672a" offset={0.462} />
-          <stop stopColor="#ff3647" offset={0.534} />
-          <stop stopColor="#e31587" offset={0.705} />
-        </linearGradient>
-        <linearGradient
-          id="prefix__l"
-          x1={70.01}
-          x2={15.27}
-          y1={12.06}
-          y2={66.81}
-          gradientTransform="translate(-1.3 -.004)"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#fff44f" stopOpacity={0.8} offset={0.167} />
-          <stop stopColor="#fff44f" stopOpacity={0.634} offset={0.266} />
-          <stop stopColor="#fff44f" stopOpacity={0.217} offset={0.489} />
-          <stop stopColor="#fff44f" stopOpacity={0} offset={0.6} />
-        </linearGradient>
-      </defs>
-      <path
-        d="M74.62 26.83c-1.684-4.052-5.1-8.427-7.775-9.81a40.27 40.27 0 013.925 11.76l.007.065c-4.382-10.92-11.81-15.33-17.88-24.92a47.099 47.099 0 01-.913-1.484 12.24 12.24 0 01-.427-.8 7.053 7.053 0 01-.578-1.535.1.1 0 00-.088-.1.138.138 0 00-.073 0c-.005 0-.013.009-.019.011s-.019.011-.028.015l.015-.026c-9.735 5.7-13.04 16.25-13.34 21.53a19.39 19.39 0 00-10.67 4.111 11.59 11.59 0 00-1-.758 17.97 17.97 0 01-.109-9.473 28.7 28.7 0 00-9.329 7.21h-.018c-1.536-1.947-1.428-8.367-1.34-9.708a6.928 6.928 0 00-1.294.687 28.22 28.22 0 00-3.788 3.245 33.84 33.84 0 00-3.623 4.347v.006-.007a32.73 32.73 0 00-5.2 11.74l-.052.256a61.89 61.89 0 00-.381 2.42c0 .029-.006.056-.009.085a36.94 36.94 0 00-.629 5.343v.2a38.76 38.76 0 0076.95 6.554c.065-.5.118-.995.176-1.5a39.86 39.86 0 00-2.514-19.47zM29.95 57.17c.181.087.351.181.537.264l.027.017q-.282-.135-.564-.281zm40.828-28.314v-.037l.007.041z"
-        fill="url(#prefix__a)"
-      />
-      <path
-        d="M74.62 26.83c-1.684-4.052-5.1-8.427-7.775-9.81a40.27 40.27 0 013.925 11.76v.037l.007.041a35.1 35.1 0 01-1.206 26.16c-4.442 9.531-15.19 19.3-32.02 18.82-18.18-.515-34.2-14.01-37.19-31.68-.545-2.787 0-4.2.274-6.465a28.88 28.88 0 00-.623 5.348v.2a38.76 38.76 0 0076.95 6.554c.065-.5.118-.995.176-1.5a39.86 39.86 0 00-2.514-19.47z"
-        fill="url(#prefix__b)"
-      />
-      <path
-        d="M74.62 26.83c-1.684-4.052-5.1-8.427-7.775-9.81a40.27 40.27 0 013.925 11.76v.037l.007.041a35.1 35.1 0 01-1.206 26.16c-4.442 9.531-15.19 19.3-32.02 18.82-18.18-.515-34.2-14.01-37.19-31.68-.545-2.787 0-4.2.274-6.465a28.88 28.88 0 00-.623 5.348v.2a38.76 38.76 0 0076.95 6.554c.065-.5.118-.995.176-1.5a39.86 39.86 0 00-2.514-19.47z"
-        fill="url(#prefix__c)"
-      />
-      <path
-        d="M55.78 31.38c.084.059.162.118.241.177a21.1 21.1 0 00-3.6-4.695C40.371 14.812 49.264.742 50.763.022L50.778 0c-9.735 5.7-13.04 16.25-13.34 21.53.452-.031.9-.069 1.362-.069a19.56 19.56 0 0116.98 9.917z"
-        fill="url(#prefix__d)"
-      />
-      <path
-        d="M38.82 33.79c-.064.964-3.47 4.289-4.661 4.289-11.02 0-12.81 6.667-12.81 6.667.488 5.614 4.4 10.24 9.129 12.68.216.112.435.213.654.312q.569.252 1.138.466a17.24 17.24 0 005.043.973c19.32.906 23.06-23.1 9.119-30.07a13.38 13.38 0 019.345 2.269 19.56 19.56 0 00-16.98-9.917c-.46 0-.91.038-1.362.069a19.39 19.39 0 00-10.67 4.111c.591.5 1.258 1.168 2.663 2.553 2.63 2.591 9.375 5.275 9.39 5.59z"
-        fill="url(#prefix__e)"
-      />
-      <path
-        d="M38.82 33.79c-.064.964-3.47 4.289-4.661 4.289-11.02 0-12.81 6.667-12.81 6.667.488 5.614 4.4 10.24 9.129 12.68.216.112.435.213.654.312q.569.252 1.138.466a17.24 17.24 0 005.043.973c19.32.906 23.06-23.1 9.119-30.07a13.38 13.38 0 019.345 2.269 19.56 19.56 0 00-16.98-9.917c-.46 0-.91.038-1.362.069a19.39 19.39 0 00-10.67 4.111c.591.5 1.258 1.168 2.663 2.553 2.63 2.591 9.375 5.275 9.39 5.59z"
-        fill="url(#prefix__f)"
-      />
-      <path
-        d="M24.96 24.36c.314.2.573.374.8.531a17.97 17.97 0 01-.109-9.473 28.7 28.7 0 00-9.329 7.21c.189-.005 5.811-.106 8.638 1.732z"
-        fill="url(#prefix__g)"
-      />
-      <path
-        d="M.354 42.16c2.991 17.67 19.01 31.17 37.19 31.68 16.83.476 27.58-9.294 32.02-18.82a35.1 35.1 0 001.206-26.16v-.037c0-.029-.006-.046 0-.037l.007.065c1.375 8.977-3.191 17.67-10.33 23.56l-.022.05c-13.91 11.33-27.22 6.834-29.91 5q-.282-.135-.564-.281c-8.109-3.876-11.46-11.26-10.74-17.6a9.953 9.953 0 01-9.181-5.775 14.62 14.62 0 0114.25-.572 19.3 19.3 0 0014.55.572c-.015-.315-6.76-3-9.39-5.59-1.405-1.385-2.072-2.052-2.663-2.553a11.59 11.59 0 00-1-.758c-.23-.157-.489-.327-.8-.531-2.827-1.838-8.449-1.737-8.635-1.732h-.018c-1.536-1.947-1.428-8.367-1.34-9.708a6.928 6.928 0 00-1.294.687 28.22 28.22 0 00-3.788 3.245 33.84 33.84 0 00-3.638 4.337v.006-.007a32.73 32.73 0 00-5.2 11.74c-.019.079-1.396 6.099-.717 9.221z"
-        fill="url(#prefix__h)"
-      />
-      <path
-        d="M52.42 26.86a21.1 21.1 0 013.6 4.7c.213.161.412.321.581.476 8.787 8.1 4.183 19.55 3.84 20.36 7.138-5.881 11.7-14.58 10.33-23.56-4.384-10.93-11.82-15.34-17.88-24.93a47.099 47.099 0 01-.913-1.484 12.24 12.24 0 01-.427-.8 7.053 7.053 0 01-.578-1.535.1.1 0 00-.088-.1.138.138 0 00-.073 0c-.005 0-.013.009-.019.011s-.019.011-.028.015c-1.499.711-10.39 14.79 1.66 26.83z"
-        fill="url(#prefix__i)"
-      />
-      <path
-        d="M56.6 32.04a8.083 8.083 0 00-.581-.476c-.079-.059-.157-.118-.241-.177a13.38 13.38 0 00-9.345-2.269c13.94 6.97 10.2 30.97-9.119 30.07a17.24 17.24 0 01-5.043-.973q-.569-.213-1.138-.466c-.219-.1-.438-.2-.654-.312l.027.017c2.694 1.839 16 6.332 29.91-5l.022-.05c.347-.81 4.951-12.26-3.84-20.36z"
-        fill="url(#prefix__j)"
-      />
-      <path
-        d="M21.35 44.74s1.789-6.667 12.81-6.667c1.191 0 4.6-3.325 4.661-4.289a19.3 19.3 0 01-14.55-.572 14.62 14.62 0 00-14.25.572 9.953 9.953 0 009.181 5.775c-.718 6.337 2.632 13.72 10.74 17.6.181.087.351.181.537.264-4.733-2.445-8.641-7.069-9.129-12.68z"
-        fill="url(#prefix__k)"
-      />
-      <path
-        d="M74.62 26.83c-1.684-4.052-5.1-8.427-7.775-9.81a40.27 40.27 0 013.925 11.76l.007.065c-4.382-10.92-11.81-15.33-17.88-24.92a47.099 47.099 0 01-.913-1.484 12.24 12.24 0 01-.427-.8 7.053 7.053 0 01-.578-1.535.1.1 0 00-.088-.1.138.138 0 00-.073 0c-.005 0-.013.009-.019.011s-.019.011-.028.015l.015-.026c-9.735 5.7-13.04 16.25-13.34 21.53.452-.031.9-.069 1.362-.069a19.56 19.56 0 0116.98 9.917 13.38 13.38 0 00-9.345-2.269c13.94 6.97 10.2 30.97-9.119 30.07a17.24 17.24 0 01-5.043-.973q-.569-.213-1.138-.466c-.219-.1-.438-.2-.654-.312l.027.017q-.282-.135-.564-.281c.181.087.351.181.537.264-4.733-2.446-8.641-7.07-9.129-12.68 0 0 1.789-6.667 12.81-6.667 1.191 0 4.6-3.325 4.661-4.289-.015-.315-6.76-3-9.39-5.59-1.405-1.385-2.072-2.052-2.663-2.553a11.59 11.59 0 00-1-.758 17.97 17.97 0 01-.109-9.473 28.7 28.7 0 00-9.329 7.21h-.018c-1.536-1.947-1.428-8.367-1.34-9.708a6.928 6.928 0 00-1.294.687A28.22 28.22 0 009.9 16.858a33.84 33.84 0 00-3.623 4.347v.006-.007a32.73 32.73 0 00-5.2 11.74l-.052.256c-.073.341-.4 2.073-.447 2.445a45.09 45.09 0 00-.572 5.403v.2a38.76 38.76 0 0076.95 6.554c.065-.5.118-.995.176-1.5a39.86 39.86 0 00-2.514-19.47zm-3.845 1.991l.007.041z"
-        fill="url(#prefix__l)"
-      />
-    </svg>
-  );
-}
-
-export default FireFoxLogo;
diff --git a/libs/logos/src/LocationLogo.tsx b/libs/logos/src/LocationLogo.tsx
deleted file mode 100644
index a6b9f33a71..0000000000
--- a/libs/logos/src/LocationLogo.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-
-export const LocationLogo: React.FC = () => {
-  return (
-    <svg
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <circle cx="12" cy="12" r="12" fill="#DDFB54" />
-      <path
-        d="M18 10.667C18 15.3337 12 19.3337 12 19.3337C12 19.3337 6 15.3337 6 10.667C6 9.07569 6.63214 7.54957 7.75736 6.42435C8.88258 5.29913 10.4087 4.66699 12 4.66699C13.5913 4.66699 15.1174 5.29913 16.2426 6.42435C17.3679 7.54957 18 9.07569 18 10.667Z"
-        stroke="black"
-        strokeWidth="1.5"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      />
-      <path
-        d="M12 12.667C13.1046 12.667 14 11.7716 14 10.667C14 9.56242 13.1046 8.66699 12 8.66699C10.8954 8.66699 10 9.56242 10 10.667C10 11.7716 10.8954 12.667 12 12.667Z"
-        stroke="black"
-        strokeWidth="1.5"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      />
-    </svg>
-  );
-};
diff --git a/libs/logos/src/WebbFullNameLogo.tsx b/libs/logos/src/WebbFullNameLogo.tsx
deleted file mode 100644
index 0387eae126..0000000000
--- a/libs/logos/src/WebbFullNameLogo.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-export function WebbFullNameLogo(fillColor: string) {
-  return (
-    <svg
-      width="97.2"
-      height="42.3"
-      viewBox="0 0 108 47"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M80.7428 23.5745C81.0852 23.5745 81.3309 23.6486 81.4801 23.7968C81.6437 23.9449 81.7258 24.1375 81.7258 24.3745C81.7258 24.7597 81.6069 25.1005 81.3684 25.3968C81.1449 25.693 80.7875 25.8486 80.296 25.8634C79.1191 25.8783 78.0618 25.7894 77.1235 25.5968C76.0807 27.8041 74.8223 29.6412 73.3478 31.1079C71.8883 32.5597 70.4434 33.2856 69.0135 33.2856C67.7028 33.2856 66.7198 32.5968 66.0644 31.219C65.4091 29.8264 65.0367 27.9671 64.9473 25.6412C64.0537 28.219 63.0409 30.1375 61.9089 31.3968C60.7918 32.656 59.6003 33.2856 58.3343 33.2856C56.9044 33.2856 55.8246 32.4041 55.0947 30.6412C54.3649 28.8634 54 26.4783 54 23.4856C54 21.3079 54.1936 18.9153 54.5809 16.3079C54.6852 15.5671 54.8713 15.056 55.1394 14.7745C55.4224 14.4783 55.8618 14.3301 56.4576 14.3301C56.9044 14.3301 57.247 14.4264 57.4853 14.619C57.7385 14.8116 57.8651 15.1671 57.8651 15.6856C57.8651 15.7894 57.8502 15.9894 57.8204 16.2856C57.3736 19.3227 57.1502 21.9079 57.1502 24.0412C57.1502 26.0264 57.3215 27.5597 57.664 28.6412C58.0066 29.7227 58.4683 30.2634 59.0492 30.2634C59.5705 30.2634 60.196 29.7227 60.9259 28.6412C61.6706 27.5449 62.4078 25.9301 63.1377 23.7968C63.8675 21.6486 64.4856 19.093 64.992 16.1301C65.1112 15.4486 65.3272 14.9819 65.6399 14.7301C65.9676 14.4634 66.407 14.3301 66.9581 14.3301C67.4198 14.3301 67.7549 14.4338 67.9634 14.6412C68.1869 14.8338 68.2986 15.1301 68.2986 15.5301C68.2986 15.7671 68.2837 15.9523 68.2539 16.0856C67.8368 18.5005 67.6283 20.9153 67.6283 23.3301C67.6283 24.9745 67.6804 26.2856 67.7847 27.2634C67.9039 28.2412 68.1198 28.9894 68.4326 29.5079C68.7603 30.0116 69.2295 30.2634 69.8401 30.2634C70.5551 30.2634 71.3519 29.7301 72.2307 28.6634C73.1093 27.5819 73.9136 26.2412 74.6436 24.6412C73.7348 24.0783 73.0501 23.3523 72.5881 22.4634C72.1262 21.5597 71.8956 20.5227 71.8956 19.3523C71.8956 18.1819 72.0743 17.1968 72.4318 16.3968C72.8043 15.5819 73.3031 14.9745 73.9286 14.5745C74.5693 14.1745 75.2764 13.9745 76.0511 13.9745C77.0045 13.9745 77.7563 14.3153 78.3076 14.9968C78.8734 15.6783 79.1565 16.6116 79.1565 17.7968C79.1565 19.4708 78.7918 21.3301 78.0618 23.3745C78.8214 23.5079 79.7151 23.5745 80.7428 23.5745ZM74.152 19.1968C74.152 20.6486 74.6212 21.7227 75.5596 22.419C76.1404 20.7597 76.4309 19.3894 76.4309 18.3079C76.4309 17.6856 76.3488 17.2338 76.1851 16.9523C76.0215 16.656 75.7981 16.5079 75.5149 16.5079C75.1127 16.5079 74.7849 16.7449 74.5319 17.219C74.2788 17.6783 74.152 18.3375 74.152 19.1968ZM89.5185 28.219C89.7124 28.219 89.8609 28.3079 89.9654 28.4856C90.0843 28.6634 90.1441 28.9079 90.1441 29.219C90.1441 29.8116 90.0028 30.2708 89.7196 30.5968C89.1683 31.2634 88.3864 31.8783 87.3738 32.4412C86.3756 33.0041 85.3033 33.2856 84.1566 33.2856C82.5927 33.2856 81.379 32.8634 80.5149 32.019C79.6509 31.1745 79.2191 30.019 79.2191 28.5523C79.2191 27.5301 79.4353 26.5819 79.867 25.7079C80.2988 24.819 80.8947 24.1153 81.6543 23.5968C82.429 23.0783 83.3003 22.819 84.2683 22.819C85.1323 22.819 85.8249 23.0783 86.346 23.5968C86.8672 24.1005 87.128 24.7894 87.128 25.6634C87.128 26.6856 86.7555 27.5671 86.0109 28.3079C85.2809 29.0338 84.0376 29.6116 82.2799 30.0412C82.6524 30.7227 83.3595 31.0634 84.4023 31.0634C85.0726 31.0634 85.8322 30.8338 86.6812 30.3745C87.5452 29.9005 88.2898 29.2856 88.9153 28.5301C89.0941 28.3227 89.2951 28.219 89.5185 28.219ZM83.8885 24.9968C83.3372 24.9968 82.868 25.3153 82.481 25.9523C82.1084 26.5894 81.9224 27.3597 81.9224 28.2634V28.3079C82.801 28.1005 83.4936 27.7894 84.0002 27.3745C84.5068 26.9597 84.7598 26.4783 84.7598 25.9301C84.7598 25.6486 84.6777 25.4264 84.514 25.2634C84.3649 25.0856 84.1566 24.9968 83.8885 24.9968ZM100.211 26.3523C100.404 26.3523 100.553 26.4486 100.657 26.6412C100.762 26.8338 100.814 27.0783 100.814 27.3745C100.814 27.7449 100.762 28.0338 100.657 28.2412C100.553 28.4338 100.389 28.5671 100.166 28.6412C99.2723 28.9523 98.2893 29.1301 97.2169 29.1745C96.9192 30.4041 96.3528 31.3968 95.5189 32.1523C94.6995 32.9079 93.7914 33.2856 92.7933 33.2856C91.2891 33.2856 90.1944 32.7153 89.509 31.5745C88.8237 30.4338 88.4813 28.7819 88.4813 26.619C88.4813 24.7079 88.7198 22.6338 89.1963 20.3968C89.6727 18.1449 90.3653 16.2338 91.274 14.6634C92.1973 13.0783 93.292 12.2856 94.5582 12.2856C95.2436 12.2856 95.7943 12.5819 96.2115 13.1745C96.6287 13.7523 96.8371 14.5079 96.8371 15.4412C96.8371 16.656 96.6064 17.8634 96.1445 19.0634C95.6826 20.2634 94.9157 21.5227 93.8433 22.8412C94.8414 22.9153 95.653 23.3301 96.2785 24.0856C96.9041 24.8264 97.2766 25.7449 97.3956 26.8412C98.0955 26.7968 98.9299 26.6486 99.8979 26.3968C99.9872 26.3671 100.092 26.3523 100.211 26.3523ZM94.0444 14.4856C93.7467 14.4856 93.4188 14.9301 93.0613 15.819C92.719 16.693 92.3984 17.8856 92.1007 19.3968C91.803 20.9079 91.5795 22.5597 91.4304 24.3523C92.4134 22.5597 93.1954 20.9819 93.7763 19.619C94.3722 18.2412 94.6699 17.019 94.6699 15.9523C94.6699 15.4783 94.6102 15.1153 94.4912 14.8634C94.3868 14.6116 94.2382 14.4856 94.0444 14.4856ZM92.8826 30.9301C93.3445 30.9301 93.7539 30.7375 94.1114 30.3523C94.4689 29.9671 94.7074 29.4116 94.8263 28.6856C94.3644 28.3745 94.007 27.9671 93.7539 27.4634C93.5154 26.9597 93.3965 26.4264 93.3965 25.8634C93.3965 25.656 93.4261 25.3745 93.4858 25.019H93.4188C92.8083 25.019 92.2945 25.3227 91.8773 25.9301C91.4751 26.5227 91.274 27.3227 91.274 28.3301C91.274 29.1745 91.4304 29.819 91.7432 30.2634C92.0711 30.7079 92.4509 30.9301 92.8826 30.9301ZM103.308 33.2856C101.819 33.2856 100.732 32.7153 100.046 31.5745C99.3762 30.4338 99.0411 28.7819 99.0411 26.619C99.0411 24.7079 99.2796 22.6338 99.756 20.3968C100.233 18.1449 100.926 16.2338 101.834 14.6634C102.758 13.0783 103.852 12.2856 105.118 12.2856C105.803 12.2856 106.355 12.5819 106.771 13.1745C107.188 13.7523 107.397 14.5079 107.397 15.4412C107.397 16.656 107.166 17.8634 106.704 19.0634C106.243 20.2634 105.475 21.5227 104.403 22.8412C105.133 22.9005 105.766 23.1449 106.302 23.5745C106.853 24.0041 107.271 24.5597 107.553 25.2412C107.851 25.9227 108 26.6634 108 27.4634C108 28.5745 107.777 29.5745 107.33 30.4634C106.898 31.3523 106.324 32.0486 105.609 32.5523C104.895 33.0412 104.128 33.2856 103.308 33.2856ZM101.99 24.3523C102.973 22.5597 103.755 20.9819 104.336 19.619C104.932 18.2412 105.23 17.019 105.23 15.9523C105.23 15.4783 105.17 15.1153 105.051 14.8634C104.947 14.6116 104.798 14.4856 104.604 14.4856C104.306 14.4856 103.979 14.9301 103.621 15.819C103.279 16.693 102.959 17.8856 102.66 19.3968C102.363 20.9079 102.139 22.5597 101.99 24.3523ZM103.398 30.8856C103.904 30.8856 104.329 30.6116 104.671 30.0634C105.029 29.5153 105.207 28.7153 105.207 27.6634C105.207 26.8486 105.059 26.2338 104.76 25.819C104.463 25.4041 104.105 25.1968 103.688 25.1968C103.167 25.1968 102.727 25.4634 102.37 25.9968C102.012 26.5301 101.834 27.3079 101.834 28.3301C101.834 29.219 101.983 29.8708 102.281 30.2856C102.579 30.6856 102.951 30.8856 103.398 30.8856Z"
-        fill={fillColor}
-      />
-      <path
-        d="M23.1407 46.3571C35.921 46.3571 46.2814 35.9797 46.2814 23.1786C46.2814 10.3774 35.921 0 23.1407 0C10.3605 0 0 10.3774 0 23.1786C0 35.9797 10.3605 46.3571 23.1407 46.3571Z"
-        fill={fillColor}
-      />
-      <path
-        d="M38.0761 22.8171C38.437 22.8171 38.6958 22.8957 38.8527 23.0529C39.0253 23.21 39.1116 23.4143 39.1116 23.6657C39.1116 24.0743 38.9861 24.4357 38.7351 24.75C38.4997 25.0643 38.1232 25.2293 37.6055 25.245C36.3661 25.2607 35.2522 25.1664 34.2638 24.9621C33.1656 27.3036 31.8399 29.2521 30.2867 30.8078C28.7493 32.3479 27.2275 33.1179 25.7214 33.1179C24.3408 33.1179 23.3053 32.3871 22.615 30.9257C21.9247 29.4486 21.5325 27.4764 21.4384 25.0093C20.497 27.7436 19.4302 29.7786 18.2379 31.1143C17.0612 32.45 15.8061 33.1179 14.4726 33.1179C12.9665 33.1179 11.8291 32.1829 11.0603 30.3129C10.2916 28.4271 9.90723 25.8971 9.90723 22.7228C9.90723 20.4128 10.1112 17.875 10.5191 15.1093C10.6289 14.3236 10.825 13.7814 11.1074 13.4828C11.4055 13.1686 11.8683 13.0114 12.4958 13.0114C12.9665 13.0114 13.3273 13.1136 13.5784 13.3178C13.8451 13.5221 13.9784 13.8993 13.9784 14.4493C13.9784 14.5593 13.9627 14.7714 13.9314 15.0857C13.4607 18.3071 13.2254 21.0493 13.2254 23.3121C13.2254 25.4178 13.4058 27.0443 13.7666 28.1914C14.1275 29.3386 14.6138 29.9121 15.2257 29.9121C15.7748 29.9121 16.4337 29.3386 17.2024 28.1914C17.9869 27.0286 18.7635 25.3157 19.5322 23.0529C20.3009 20.7743 20.952 18.0636 21.4854 14.9207C21.6109 14.1978 21.8384 13.7028 22.1679 13.4357C22.513 13.1528 22.9759 13.0114 23.5563 13.0114C24.0427 13.0114 24.3957 13.1214 24.6153 13.3414C24.8506 13.5457 24.9683 13.86 24.9683 14.2843C24.9683 14.5357 24.9526 14.7321 24.9212 14.8736C24.482 17.435 24.2623 19.9964 24.2623 22.5578C24.2623 24.3021 24.3172 25.6929 24.427 26.73C24.5526 27.7671 24.78 28.5607 25.1095 29.1107C25.4546 29.645 25.9488 29.9121 26.5921 29.9121C27.3451 29.9121 28.1845 29.3464 29.1101 28.215C30.0357 27.0679 30.8829 25.6457 31.6517 23.9486C30.6946 23.3514 29.973 22.5814 29.4866 21.6386C29.0003 20.68 28.7571 19.58 28.7571 18.3386C28.7571 17.0971 28.9454 16.0521 29.3219 15.2036C29.7141 14.3393 30.2397 13.695 30.8986 13.2707C31.5732 12.8464 32.3184 12.6343 33.1342 12.6343C34.1383 12.6343 34.9306 12.9957 35.5111 13.7186C36.1072 14.4414 36.4053 15.4314 36.4053 16.6886C36.4053 18.4643 36.0209 20.4364 35.2522 22.605C36.0523 22.7464 36.9936 22.8171 38.0761 22.8171ZM31.1339 18.1736C31.1339 19.7136 31.6281 20.8528 32.6165 21.5914C33.2284 19.8314 33.5343 18.3779 33.5343 17.2307C33.5343 16.5707 33.448 16.0914 33.2754 15.7928C33.1029 15.4786 32.8675 15.3214 32.5694 15.3214C32.1458 15.3214 31.8007 15.5728 31.534 16.0757C31.2673 16.5628 31.1339 17.2621 31.1339 18.1736Z"
-        fill="white"
-      />
-    </svg>
-  );
-}
diff --git a/libs/logos/src/WebbWrappedLogo.tsx b/libs/logos/src/WebbWrappedLogo.tsx
deleted file mode 100644
index 0f96eaf1ba..0000000000
--- a/libs/logos/src/WebbWrappedLogo.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-function WebbWrappedLogo(element: JSX.Element): JSX.Element {
-  return (
-    <div
-      style={{
-        width: '100%',
-        height: '100%',
-        position: 'relative',
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
-      }}
-    >
-      <div
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 0,
-          width: '100%',
-          height: '100%',
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
-          padding: 4,
-          color: 'blue',
-        }}
-      >
-        🕸
-      </div>
-      {element}
-    </div>
-  );
-}
-
-export default WebbWrappedLogo;
diff --git a/libs/logos/src/chains/ArbitrumLogo.tsx b/libs/logos/src/chains/ArbitrumLogo.tsx
deleted file mode 100644
index 83b5b73500..0000000000
--- a/libs/logos/src/chains/ArbitrumLogo.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-function ArbitrumLogo() {
-  return (
-    <svg
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
-      x="0px"
-      y="0px"
-      width={'100%'}
-      viewBox="0 0 470.287 514.251"
-      enableBackground="new 0 0 470.287 514.251"
-      xmlSpace="preserve"
-    >
-      <g id="Background"></g>
-      <g id="Logos_and_symbols">
-        <g id="SYMBOL_VER_3"></g>
-        <g id="SYMBOL_VER_3_3_"></g>
-        <g id="SYMBOL_VER_4"></g>
-        <g id="SYMBOL_VER_4_1_">
-          <g id="SYMBOL_VER_4_3_"></g>
-        </g>
-        <g id="SYMBOL_VER_5_1_"></g>
-        <g id="off_2_1_"></g>
-        <g id="VER_3_1_">
-          <g id="SYMBOL_VER_2_1_"></g>
-        </g>
-        <g id="VER_3">
-          <g id="SYMBOL_VER_2"></g>
-        </g>
-        <g id="off_2"></g>
-        <g id="SYMBOL_VER_5"></g>
-        <g id="SYMBOL_VER_1"></g>
-        <g id="SYMBOL_VER_1_1_"></g>
-        <g id="SYMBOL_VER_1-1_3_"></g>
-        <g id="SYMBOL_VER_1-1_2_"></g>
-        <g id="SYMBOL_VER_1-1"></g>
-        <g id="SYMBOL_VER_1-1_1_">
-          <g id="_x31_-3"></g>
-          <g id="Symbol_-_Original_14_">
-            <path
-              fill="#2D374B"
-              d="M291.134,237.469l35.654-60.5l96.103,149.684l0.046,28.727l-0.313-197.672
-              c-0.228-4.832-2.794-9.252-6.887-11.859L242.715,46.324c-4.045-1.99-9.18-1.967-13.22,0.063c-0.546,0.272-1.06,0.57-1.548,0.895
-              l-0.604,0.379L59.399,144.983l-0.651,0.296c-0.838,0.385-1.686,0.875-2.48,1.444c-3.185,2.283-5.299,5.66-5.983,9.448
-              c-0.103,0.574-0.179,1.158-0.214,1.749l0.264,161.083l89.515-138.745c11.271-18.397,35.825-24.323,58.62-24.001l26.753,0.706
-              L67.588,409.765l18.582,10.697L245.692,157.22l70.51-0.256L157.091,426.849l66.306,38.138l7.922,4.556
-              c3.351,1.362,7.302,1.431,10.681,0.21l175.453-101.678l-33.544,19.438L291.134,237.469z M304.736,433.395l-66.969-105.108
-              l40.881-69.371l87.952,138.628L304.736,433.395z"
-            />
-            <polygon
-              fill="#28A0F0"
-              points="237.768,328.286 304.736,433.395 366.601,397.543 278.648,258.915 			"
-            />
-            <path
-              fill="#28A0F0"
-              d="M422.937,355.379l-0.046-28.727l-96.103-149.684l-35.654,60.5l92.774,150.043l33.544-19.438
-              c3.29-2.673,5.281-6.594,5.49-10.825L422.937,355.379z"
-            />
-            <path
-              fill="#FFFFFF"
-              d="M20.219,382.469l47.369,27.296l157.634-252.801l-26.753-0.706c-22.795-0.322-47.35,5.604-58.62,24.001
-              L50.334,319.004l-30.115,46.271V382.469z"
-            />
-            <polygon
-              fill="#FFFFFF"
-              points="316.202,156.964 245.692,157.22 86.17,420.462 141.928,452.565 157.091,426.849 			"
-            />
-            <path
-              fill="#96BEDC"
-              d="M452.65,156.601c-0.59-14.746-8.574-28.245-21.08-36.104L256.28,19.692
-              c-12.371-6.229-27.825-6.237-40.218-0.004c-1.465,0.739-170.465,98.752-170.465,98.752c-2.339,1.122-4.592,2.458-6.711,3.975
-              c-11.164,8.001-17.969,20.435-18.668,34.095v208.765l30.115-46.271L50.07,157.921c0.035-0.589,0.109-1.169,0.214-1.741
-              c0.681-3.79,2.797-7.171,5.983-9.456c0.795-0.569,172.682-100.064,173.228-100.337c4.04-2.029,9.175-2.053,13.22-0.063
-              l173.022,99.523c4.093,2.607,6.659,7.027,6.887,11.859v199.542c-0.209,4.231-1.882,8.152-5.172,10.825l-33.544,19.438
-              l-17.308,10.031l-61.864,35.852l-62.737,36.357c-3.379,1.221-7.33,1.152-10.681-0.21l-74.228-42.693l-15.163,25.717
-              l66.706,38.406c2.206,1.255,4.171,2.367,5.784,3.272c2.497,1.4,4.199,2.337,4.8,2.629c4.741,2.303,11.563,3.643,17.71,3.643
-              c5.636,0,11.132-1.035,16.332-3.072l182.225-105.531c10.459-8.104,16.612-20.325,17.166-33.564V156.601z"
-            />
-          </g>
-          <g id="Symbol_-_Original_13_"></g>
-          <g id="Symbol_-_Original_6_"></g>
-          <g id="Symbol_-_Original_4_"></g>
-          <g id="One_color_version_-_White_3_">
-            <g id="Symbol_-_Original_15_"></g>
-          </g>
-          <g id="One_color_version_-_White">
-            <g id="Symbol_-_Original"></g>
-          </g>
-          <g id="Symbol_-_Monochromatic_3_">
-            <g id="_x33__7_"></g>
-          </g>
-          <g id="Symbol_-_Monochromatic">
-            <g id="_x33__3_"></g>
-          </g>
-          <g id="_x33__2_"></g>
-          <g id="_x33__1_"></g>
-          <g id="_x33_"></g>
-          <g id="Symbol_-_Original_10_"></g>
-          <g id="Symbol_-_Original_1_"></g>
-          <g id="Symbol_-_Original_2_"></g>
-          <g id="_x34__1_"></g>
-          <g id="Symbol_-_Monochromatic_2_">
-            <g id="_x33__6_"></g>
-          </g>
-          <g id="One_color_version_-_White_2_">
-            <g id="Symbol_-_Original_11_"></g>
-          </g>
-          <g id="Symbol_-_Original_5_">
-            <g id="Symbol_-_Original_12_"></g>
-          </g>
-          <g id="One_color_version_-_White_1_">
-            <g id="Symbol_-_Original_9_"></g>
-          </g>
-        </g>
-        <g id="SYMBOL_VER_1_2_">
-          <g id="SYMBOL_VER_2_4_"></g>
-          <g id="SYMBOL_VER_2-1-1_1_"></g>
-          <g id="SYMBOL_VER_2-2-1_1_"></g>
-          <g id="SYMBOL_VER_2-3-1_4_"></g>
-          <g id="New_Symbol_1_">
-            <g id="SYMBOL_VER_2-3-1_3_"></g>
-          </g>
-          <g id="New_Symbol">
-            <g id="SYMBOL_VER_2-3-1_1_"></g>
-          </g>
-        </g>
-        <g id="SYMBOL_VER_2_2_"></g>
-        <g id="SYMBOL_VER_4_2_"></g>
-        <g id="SYMBOL_VER_3_2_"></g>
-        <g id="SYMBOL_VER_3_1_"></g>
-        <g id="SYMBOL_VER_1-1-1_1_"></g>
-        <g id="SYMBOL_VER_1-1-1"></g>
-        <g id="SYMBOL_VER_1-1-1_2_2_"></g>
-        <g id="SYMBOL_VER_1-1-1_2"></g>
-        <g id="SYMBOL_VER_1-1-1_2_1_"></g>
-        <g id="Symbol_-_Original_7_"></g>
-        <g id="Symbol_-_Original_8_"></g>
-        <g id="SYMBOL_VER_2-1-1"></g>
-        <g id="SYMBOL_VER_2-2-1"></g>
-        <g id="SYMBOL_VER_2-3-1"></g>
-        <g id="SYMBOL_VER_5-1_1_"></g>
-        <g id="SYMBOL_VER_5-1"></g>
-        <g id="SYMBOL_VER_5-2_1_"></g>
-        <g id="SYMBOL_VER_5-2"></g>
-        <g id="Symbol_-_Monochromatic_1_">
-          <g id="_x33__4_"></g>
-        </g>
-      </g>
-    </svg>
-  );
-}
-
-export default ArbitrumLogo;
diff --git a/libs/logos/src/chains/EthLogo.tsx b/libs/logos/src/chains/EthLogo.tsx
deleted file mode 100644
index 17cf252e74..0000000000
--- a/libs/logos/src/chains/EthLogo.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-function EthLogo() {
-  return (
-    <svg
-      width="49"
-      height="50"
-      viewBox="0 0 49 50"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <mask id="path-1-inside-1_358_582" fill="white">
-        <path d="M48.9304 24.9652C48.9304 38.477 37.977 49.4304 24.4652 49.4304C10.9534 49.4304 0 38.477 0 24.9652C0 11.4534 10.9534 0.5 24.4652 0.5C37.977 0.5 48.9304 11.4534 48.9304 24.9652Z" />
-      </mask>
-      <path
-        d="M48.9304 24.9652C48.9304 38.477 37.977 49.4304 24.4652 49.4304C10.9534 49.4304 0 38.477 0 24.9652C0 11.4534 10.9534 0.5 24.4652 0.5C37.977 0.5 48.9304 11.4534 48.9304 24.9652Z"
-        fill="url(#paint0_linear_358_582)"
-      />
-      <path
-        d="M48.4304 24.9652C48.4304 38.2008 37.7008 48.9304 24.4652 48.9304V49.9304C38.2531 49.9304 49.4304 38.7531 49.4304 24.9652H48.4304ZM24.4652 48.9304C11.2296 48.9304 0.5 38.2008 0.5 24.9652H-0.5C-0.5 38.7531 10.6773 49.9304 24.4652 49.9304V48.9304ZM0.5 24.9652C0.5 11.7296 11.2296 1 24.4652 1V0C10.6773 0 -0.5 11.1773 -0.5 24.9652H0.5ZM24.4652 1C37.7008 1 48.4304 11.7296 48.4304 24.9652H49.4304C49.4304 11.1773 38.2531 0 24.4652 0V1Z"
-        fill="url(#paint1_radial_358_582)"
-        mask="url(#path-1-inside-1_358_582)"
-      />
-      <path
-        d="M48.4304 24.9652C48.4304 38.2008 37.7008 48.9304 24.4652 48.9304V49.9304C38.2531 49.9304 49.4304 38.7531 49.4304 24.9652H48.4304ZM24.4652 48.9304C11.2296 48.9304 0.5 38.2008 0.5 24.9652H-0.5C-0.5 38.7531 10.6773 49.9304 24.4652 49.9304V48.9304ZM0.5 24.9652C0.5 11.7296 11.2296 1 24.4652 1V0C10.6773 0 -0.5 11.1773 -0.5 24.9652H0.5ZM24.4652 1C37.7008 1 48.4304 11.7296 48.4304 24.9652H49.4304C49.4304 11.1773 38.2531 0 24.4652 0V1Z"
-        fill="url(#paint2_linear_358_582)"
-        fill-opacity="0.35"
-        mask="url(#path-1-inside-1_358_582)"
-      />
-      <circle cx="24.4649" cy="24.9648" r="21.5183" stroke="#DDFB54" />
-      <path
-        d="M23.9553 8.93369L23.7415 9.66006V30.736L23.9553 30.9493L33.7383 25.1665L23.9553 8.93369Z"
-        fill="#FFFEA1"
-      />
-      <path
-        d="M23.9551 8.93369L14.1719 25.1665L23.9551 30.9493V20.7197V8.93369Z"
-        fill="#9C7F47"
-      />
-      <path
-        d="M23.9555 32.8022L23.835 32.9492V40.4568L23.9555 40.8086L33.7445 27.0224L23.9555 32.8022Z"
-        fill="#FFFEA1"
-      />
-      <path
-        d="M23.9551 40.8086V32.8022L14.1719 27.0224L23.9551 40.8086Z"
-        fill="#9C7F47"
-      />
-      <path
-        d="M23.9558 30.9502L33.7388 25.1674L23.9558 20.7205V30.9502Z"
-        fill="#CFAD63"
-      />
-      <path
-        d="M14.1719 25.1674L23.9551 30.9502V20.7205L14.1719 25.1674Z"
-        fill="#CFAD63"
-      />
-      <defs>
-        <linearGradient
-          id="paint0_linear_358_582"
-          x1="49.7829"
-          y1="17.4609"
-          x2="-13.015"
-          y2="35.5135"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#010101" stopOpacity="0" />
-          <stop stopOpacity="0.9" />
-          <stop offset="0.459707" stopColor="#363636" stopOpacity="0.971584" />
-          <stop offset="0.827067" stopColor="#0A0A0A" stopOpacity="0.995031" />
-          <stop offset="1" stopColor="#010101" />
-          <stop offset="1" stopColor="white" stopOpacity="0" />
-        </linearGradient>
-        <radialGradient
-          id="paint1_radial_358_582"
-          cx="0"
-          cy="0"
-          r="1"
-          gradientUnits="userSpaceOnUse"
-          gradientTransform="translate(-10.9229 38.818) rotate(-22.7616) scale(35.804 28.0007)"
-        >
-          <stop stopColor="#343434" />
-          <stop offset="1" stopColor="#A4A4A4" stopOpacity="0" />
-        </radialGradient>
-        <linearGradient
-          id="paint2_linear_358_582"
-          x1="21.6974"
-          y1="24.9656"
-          x2="72.805"
-          y2="51.6178"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#3D3F3E" />
-          <stop offset="1" stopColor="#606261" />
-        </linearGradient>
-      </defs>
-    </svg>
-  );
-}
-
-export default EthLogo;
diff --git a/libs/logos/src/chains/GanacheLogo.tsx b/libs/logos/src/chains/GanacheLogo.tsx
deleted file mode 100644
index 83b1e03ec6..0000000000
--- a/libs/logos/src/chains/GanacheLogo.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-function GanacheLogo() {
-  return (
-    <svg
-      width={'100%'}
-      viewBox="0 0 256 288"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
-      preserveAspectRatio="xMidYMid"
-    >
-      <title>Ganache</title>
-      <g>
-        <path
-          d="M222.483533,215.609119 C225.482797,215.609119 226.518418,214.909739 227.944077,212.475359 C229.369736,210.040979 228.683806,206.086792 228.630007,205.010823 C228.495511,202.64369 227.701984,200.007566 227.594387,198.689503 C227.594387,197.882527 227.594387,192.731324 227.715434,190.619734 C229.517682,157.21089 243.854972,149.262168 247.997453,148.361044 C250.639465,147.582306 253.472773,147.773101 255.986525,148.899028 L255.986525,97.7904908 L255.986525,97.7904908 L255.986525,97.0642116 L255.986525,83.5069996 C255.986525,76.1231609 250.741175,67.0446707 244.339158,63.3325769 L139.620455,2.80930888 C133.164639,-0.929684124 122.633591,-0.929684124 116.285372,2.76896003 L11.6742659,63.2115304 C5.28569874,66.9101745 0.0403488453,75.9886647 0.0537984605,83.385953 L0.0537984605,96.5934751 C0.0484475619,96.6695226 0.0484475619,96.746071 0.0537984605,96.8221185 L0.0537984605,116.108867 C0.659031141,116.445107 1.26426382,116.794797 1.8694965,117.171386 C3.90038838,118.516348 5.90438104,119.256077 7.94872253,120.668286 C13.7741954,124.218153 19.1872446,128.404244 24.0882607,133.149529 C25.0431833,134.064103 28.2307421,138.072088 28.9839206,139.013561 C31.2988063,142.20358 33.900965,145.174903 36.7577981,147.890307 C38.3361007,149.329408 40.0733565,150.583842 41.9358999,151.6293 C45.0158618,153.229804 50.0998163,152.866665 52.695592,151.723447 C72.6279216,143.088795 85.1360637,147.419571 90.9059486,150.889571 C105.17599,159.456976 109.937154,171.440583 111.45696,185.993067 C111.656514,187.877963 111.719443,189.774827 111.645255,191.668804 C111.645255,195.125355 111.524209,200.680046 115.169054,201.60807 C120.400955,202.953031 121.665218,197.357992 122.445296,193.645898 C124.207196,185.239888 135.397275,179.725546 143.588091,183.962175 C149.236929,186.880741 151.550263,188.535044 157.131853,186.073764 C164.112204,182.993803 167.716701,175.152677 170.151081,170.983296 C172.556097,166.923663 176.038162,163.609184 180.211393,161.40717 C191.105581,154.615115 218.488998,156.377014 219.484269,186.557951 C219.484269,188.198804 219.484269,192.395084 219.484269,194.95051 C219.484269,197.828728 219.578416,200.639698 219.390122,203.612063 C219.269075,205.589156 218.919385,207.646947 218.731091,209.677839 C218.677292,209.677839 217.655121,215.58222 222.483533,215.609119 Z"
-          fill="#E4A663"
-        ></path>
-        <path
-          d="M255.959625,148.952827 C255.219896,148.724183 253.067958,147.311974 247.997453,148.414842 C243.841522,149.315966 229.517682,157.264689 227.715434,190.673533 C227.607837,192.731324 227.540589,197.882527 227.594387,198.743302 C227.701984,200.088263 228.495511,202.697489 228.630007,205.064621 C228.630007,206.14059 229.450434,210.040979 227.944077,212.529157 C226.43772,215.017336 225.482797,215.676367 222.483533,215.662918 C217.655121,215.662918 218.677292,209.731637 218.677292,209.731637 C218.865587,207.727645 219.215277,205.696753 219.336323,203.665861 C219.524618,200.693496 219.430471,197.882527 219.430471,195.004309 C219.430471,192.448882 219.430471,188.279501 219.430471,186.611749 C218.435199,156.430813 191.051783,154.668913 180.157594,161.460969 C175.984363,163.662983 172.502299,166.977462 170.097282,171.037095 C167.662902,175.206475 164.058405,183.047601 157.078055,186.127563 C151.496465,188.588842 149.183131,186.93454 143.534293,184.015973 C135.343477,179.779345 124.153397,185.293687 122.391498,193.699696 C121.61142,197.41179 120.347156,202.99338 115.115256,201.661868 C111.47041,200.733845 111.591457,195.179154 111.591457,191.722603 C111.665644,189.828625 111.602715,187.931762 111.403162,186.046865 C109.883356,171.494382 105.122192,159.510775 90.8521501,150.94337 C85.0822652,147.473369 72.5741232,143.142593 52.6417936,151.777246 C49.9518705,152.920463 44.9217145,153.283603 41.8821015,151.683099 C40.0195581,150.637641 38.2823023,149.383206 36.7039997,147.944106 C33.8471665,145.228701 31.2450078,142.257378 28.9301221,139.06736 C28.1769437,138.125887 24.9893849,134.117901 24.0344622,133.203327 C19.1334462,128.458043 13.7203969,124.271951 7.89492407,120.722085 C5.85058258,119.377123 3.86003954,118.516348 1.81569804,117.225185 C1.21046536,116.848595 0.60523268,116.498905 0,116.162665 L0,204.351791 C0,211.74908 5.2453499,220.82757 11.6473667,224.526214 L116.36607,285.049482 C122.768087,288.761576 133.245337,288.761576 139.647354,285.049482 L244.379507,224.606912 C250.781523,220.908268 256.013424,211.829777 256,204.432489 L255.959625,148.952827 Z"
-          fill="#5E464D"
-        ></path>
-        <path
-          d="M141.301656,134.131351 C134.065763,138.314181 122.216653,138.314181 114.98076,134.131351 L7.89492407,77.6429674 C9.10538943,78.8399831 116.487117,141.219298 116.487117,141.219298 C122.889133,144.931392 133.366383,144.931392 139.7684,141.219298 C139.7684,141.219298 247.002182,79.0282777 248.212647,77.831262 L141.301656,134.131351 Z"
-          fill="#FFFFFF"
-        ></path>
-        <path
-          d="M114.805915,10.8656283 C122.055257,6.72314688 133.890918,6.72314688 141.140261,10.8790779 L154.11914,16.258924 C152.908674,15.0619082 139.620455,6.45415458 139.620455,6.45415458 C133.218438,2.75551042 122.754637,2.7420608 116.35262,6.45415458 C116.35262,6.45415458 95.1291277,18.9219478 93.932112,20.1055139 L114.805915,10.8656283 Z"
-          fill="#FFFFFF"
-        ></path>
-      </g>
-    </svg>
-  );
-}
-
-export default GanacheLogo;
diff --git a/libs/logos/src/chains/HarmonyLogo.tsx b/libs/logos/src/chains/HarmonyLogo.tsx
deleted file mode 100644
index 30e851372b..0000000000
--- a/libs/logos/src/chains/HarmonyLogo.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-function HarmonyLogo() {
-  return (
-    <svg
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M15.7302 0.809509C13.4656 0.809509 11.6243 2.65078 11.6243 4.91533V9.4656C11.2011 9.48676 10.7778 9.50792 10.3122 9.50792C9.86773 9.50792 9.42328 9.52909 9 9.55025V4.89417C8.95767 2.62962 7.09524 0.809509 4.83069 0.851837C2.60846 0.894165 0.830689 2.67194 0.788361 4.89417V15.7513C0.830689 18.0159 2.69312 19.836 4.95767 19.7936C7.17989 19.7513 8.95767 17.9735 9 15.7513V11.2222C9.42328 11.201 9.84656 11.1799 10.3122 11.1799C10.7566 11.1799 11.2011 11.1587 11.6243 11.1376V15.7725C11.6667 18.037 13.5291 19.8571 15.7937 19.8148C18.0159 19.7725 19.7937 17.9947 19.836 15.7725V4.89417C19.836 2.62962 17.9947 0.809509 15.7302 0.809509ZM4.89418 2.48147C6.22752 2.48147 7.30688 3.56083 7.32804 4.89417V9.71956C6.1217 9.88888 4.95767 10.2275 3.83598 10.7143C3.34921 10.9259 2.90477 11.201 2.48149 11.5185V4.89417C2.48149 3.56083 3.56085 2.48147 4.89418 2.48147ZM7.32804 15.7513C7.32804 17.0846 6.24868 18.1852 4.89418 18.1852C3.56085 18.1852 2.46032 17.1058 2.46032 15.7513V14.6719C2.46032 13.7196 3.22223 12.7883 4.49207 12.2381C5.40212 11.8571 6.33333 11.582 7.30688 11.4127V15.7513H7.32804ZM15.7302 18.1852C14.3968 18.1852 13.3175 17.1058 13.2963 15.7725V10.9471C14.5026 10.7778 15.6667 10.4391 16.7884 9.95237C17.2751 9.74073 17.7196 9.4656 18.1429 9.14814V15.7513C18.1429 17.0846 17.0635 18.1852 15.7302 18.1852ZM16.1111 8.42856C15.2011 8.80951 14.2698 9.08464 13.2963 9.25396V4.89417C13.2963 3.56083 14.3757 2.4603 15.7302 2.4603C17.0635 2.4603 18.164 3.53967 18.164 4.89417V5.97353C18.164 6.94708 17.4021 7.85713 16.1111 8.42856Z"
-        fill="url(#paint0_linear)"
-      />
-      <defs>
-        <linearGradient
-          id="paint0_linear"
-          x1="2.02523"
-          y1="18.6255"
-          x2="18.6406"
-          y2="2.01012"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#00ADE8" />
-          <stop offset="1" stopColor="#69FABC" />
-        </linearGradient>
-      </defs>
-    </svg>
-  );
-}
-
-export default HarmonyLogo;
diff --git a/libs/logos/src/chains/KusamaLogo.tsx b/libs/logos/src/chains/KusamaLogo.tsx
deleted file mode 100644
index ed1e335111..0000000000
--- a/libs/logos/src/chains/KusamaLogo.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-function KusamaLogo() {
-  return (
-    <svg width={'100%'} viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-      <g fill="none">
-        <circle fill="#000" cx="16" cy="16" r="16" />
-        <path
-          d="M25.847 9.448c-.36-.272-.791-.643-1.576-.736-.736-.093-1.486.378-1.993.69-.507.311-1.465 1.227-1.861 1.505-.396.279-1.41.538-3.042 1.473S9.34 17.24 9.34 17.24l1.667.02-7.43 3.655h.742l-1.069.776s.944.239 1.736-.239v.219s8.847-3.33 10.556-2.467l-1.042.291c.09 0 1.77.107 1.77.107s.056 1.001 1.07 1.644c1.014.637 1.035.989 1.035.989s-.528.205-.528.464c0 0 .778-.226 1.5-.206.722.02 1.354.206 1.354.206s-.055-.279-.757-.464c-.708-.193-1.395-.916-1.736-1.314a1.793 1.793 0 01-.284-1.817c.243-.603 1.09-.935 2.84-1.797 2.062-1.022 2.535-1.778 2.826-2.368.292-.59.722-1.764.966-2.315.305-.71.68-1.088.993-1.313.305-.226 1.701-.723 1.701-.723s-1.063-.882-1.403-1.14z"
-          fill="#FFF"
-        />
-      </g>
-    </svg>
-  );
-}
-
-export default KusamaLogo;
diff --git a/libs/logos/src/chains/MoonbeamLogo.tsx b/libs/logos/src/chains/MoonbeamLogo.tsx
deleted file mode 100644
index 81c6aee7c2..0000000000
--- a/libs/logos/src/chains/MoonbeamLogo.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-export function MoonbeamLogo() {
-  return (
-    <svg
-      version="1.1"
-      id="Layer_1"
-      xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
-      x="0px"
-      y="0px"
-      width="100%"
-      viewBox="0 0 144 144"
-      enableBackground="new 0 0 144 144"
-      xmlSpace="preserve"
-    >
-      <path
-        fill="#F1EFF4"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M98.000000,145.000000 
-        C65.333336,145.000000 33.166668,145.000000 1.000000,145.000000 
-        C1.000000,97.000000 1.000000,49.000000 1.000000,1.000000 
-        C49.000000,1.000000 97.000000,1.000000 145.000000,1.000000 
-        C145.000000,49.000000 145.000000,97.000000 145.000000,145.000000 
-        C129.500000,145.000000 114.000000,145.000000 98.000000,145.000000 
-      M93.547813,24.792112 
-        C88.293533,24.526899 82.957321,23.542934 77.800270,24.130737 
-        C62.095921,25.920727 48.358395,41.436008 47.877148,56.883160 
-        C47.760860,60.615635 48.979179,61.854481 52.679825,61.833687 
-        C73.654137,61.715824 94.629662,61.729290 115.604225,61.822449 
-        C119.068100,61.837833 120.224815,60.615520 120.151360,57.122879 
-        C119.855362,43.049145 109.659218,30.211901 93.547813,24.792112 
-      M66.500008,67.986877 
-        C59.174515,67.987251 51.845718,67.872871 44.526295,68.083824 
-        C43.044422,68.126534 41.597977,69.398605 40.135201,70.103920 
-        C41.541157,70.854210 42.925541,71.650566 44.366776,72.325523 
-        C44.776669,72.517471 45.352001,72.356766 45.851463,72.356766 
-        C71.324196,72.356834 96.796928,72.357971 122.269661,72.352951 
-        C123.433815,72.352722 124.704475,72.574799 125.729378,72.181808 
-        C126.594131,71.850220 127.472900,70.867973 127.746941,69.987442 
-        C127.874405,69.577927 126.679901,68.363983 125.912102,68.158081 
-        C124.663162,67.823158 123.272552,67.991234 121.941719,67.990814 
-        C103.794479,67.985085 85.647240,67.986893 66.500008,67.986877 
-      M77.499908,92.365341 
-        C89.465569,92.364998 101.432549,92.448914 113.395241,92.260422 
-        C114.935661,92.236153 116.453827,90.799232 117.982307,90.016708 
-        C116.512680,89.348602 115.046143,88.106247 113.572968,88.098320 
-        C90.639465,87.975029 67.704819,87.966637 44.771557,88.110329 
-        C43.218567,88.120056 41.674492,89.552551 40.126270,90.323349 
-        C41.780865,91.003777 43.425781,92.244507 45.091637,92.273293 
-        C55.558460,92.454147 66.029945,92.365326 77.499908,92.365341 
-      M75.573914,97.976677 
-        C72.908882,97.999115 70.224617,97.850578 67.590370,98.146782 
-        C66.786125,98.237221 66.119385,99.550468 65.389679,100.303711 
-        C66.054703,100.946327 66.618553,101.895027 67.409569,102.156487 
-        C68.472801,102.507912 69.711342,102.370659 70.874672,102.371246 
-        C89.035973,102.380455 107.197777,102.437874 125.357796,102.285515 
-        C127.168129,102.270332 128.967606,100.962029 130.772125,100.253883 
-        C129.026947,99.494820 127.288399,98.094635 125.535568,98.076523 
-        C109.208794,97.907799 92.879578,97.976578 75.573914,97.976677 
-      M81.412743,82.316017 
-        C81.745186,82.315918 82.107986,82.403885 82.405144,82.301437 
-        C84.349670,81.631081 86.279999,80.919533 88.214958,80.221436 
-        C86.316216,79.482330 84.423172,78.118629 82.517853,78.101265 
-        C64.567894,77.937714 46.615845,78.002670 28.664398,78.006714 
-        C27.501541,78.006973 26.223932,77.758705 25.210751,78.159531 
-        C24.340164,78.503944 23.771601,79.611794 23.069485,80.382057 
-        C23.740496,80.993317 24.325859,81.942078 25.102009,82.139046 
-        C26.357931,82.457756 27.739187,82.311058 29.067541,82.311577 
-        C46.187901,82.318260 63.308258,82.316200 81.412743,82.316017 
-      M80.490280,122.652611 
-        C84.488945,122.650261 88.508385,122.878059 92.474976,122.520203 
-        C93.855019,122.395699 95.104393,120.822800 96.413437,119.911407 
-        C95.084221,119.258835 93.762497,118.058266 92.424622,118.039986 
-        C81.263718,117.887535 70.098740,117.877670 58.938179,118.041550 
-        C57.440266,118.063545 55.960098,119.293839 54.471714,119.964607 
-        C55.981194,120.859657 57.461216,122.463356 59.005238,122.527534 
-        C65.824562,122.811005 72.662308,122.651352 80.490280,122.652611 
-      M86.564117,107.984749 
-        C85.069649,107.985306 83.506592,107.710503 82.099274,108.060989 
-        C80.578659,108.439697 79.203560,109.402657 77.764984,110.110771 
-        C79.175034,110.835953 80.575592,112.167877 81.996628,112.190086 
-        C93.119415,112.363960 104.247475,112.367546 115.369911,112.182968 
-        C116.741203,112.160210 118.088982,110.720306 119.447655,109.937103 
-        C118.114182,109.286911 116.790298,108.097275 115.445686,108.073349 
-        C106.149689,107.907974 96.849373,107.985489 86.564117,107.984749 
-      M59.708309,101.916313 
-        C62.223999,98.329712 59.689693,98.012772 57.069939,97.996361 
-        C48.406670,97.942070 39.740768,97.884033 31.081566,98.079498 
-        C29.845266,98.107399 28.640371,99.526543 27.420942,100.301811 
-        C28.745478,100.992783 30.062149,102.263260 31.395817,102.281364 
-        C40.553299,102.405640 49.714336,102.267746 59.708309,101.916313 
-      z"
-      />
-      <path
-        fill="#56CCC9"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M93.940460,24.894964 
-        C109.659218,30.211901 119.855362,43.049145 120.151360,57.122879 
-        C120.224815,60.615520 119.068100,61.837833 115.604225,61.822449 
-        C94.629662,61.729290 73.654137,61.715824 52.679825,61.833687 
-        C48.979179,61.854481 47.760860,60.615635 47.877148,56.883160 
-        C48.358395,41.436008 62.095921,25.920727 77.800270,24.130737 
-        C82.957321,23.542934 88.293533,24.526899 93.940460,24.894964 
-      z"
-      />
-      <path
-        fill="#E1167D"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M67.000000,67.986862 
-        C85.647240,67.986893 103.794479,67.985085 121.941719,67.990814 
-        C123.272552,67.991234 124.663162,67.823158 125.912102,68.158081 
-        C126.679901,68.363983 127.874405,69.577927 127.746941,69.987442 
-        C127.472900,70.867973 126.594131,71.850220 125.729378,72.181808 
-        C124.704475,72.574799 123.433815,72.352722 122.269661,72.352951 
-        C96.796928,72.357971 71.324196,72.356834 45.851463,72.356766 
-        C45.352001,72.356766 44.776669,72.517471 44.366776,72.325523 
-        C42.925541,71.650566 41.541157,70.854210 40.135201,70.103920 
-        C41.597977,69.398605 43.044422,68.126534 44.526295,68.083824 
-        C51.845718,67.872871 59.174515,67.987251 67.000000,67.986862 
-      z"
-      />
-      <path
-        fill="#E1167C"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M76.999901,92.365509 
-        C66.029945,92.365326 55.558460,92.454147 45.091637,92.273293 
-        C43.425781,92.244507 41.780865,91.003777 40.126270,90.323349 
-        C41.674492,89.552551 43.218567,88.120056 44.771557,88.110329 
-        C67.704819,87.966637 90.639465,87.975029 113.572968,88.098320 
-        C115.046143,88.106247 116.512680,89.348602 117.982307,90.016708 
-        C116.453827,90.799232 114.935661,92.236153 113.395241,92.260422 
-        C101.432549,92.448914 89.465569,92.364998 76.999901,92.365509 
-      z"
-      />
-      <path
-        fill="#E1177D"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M76.062485,97.976593 
-        C92.879578,97.976578 109.208794,97.907799 125.535568,98.076523 
-        C127.288399,98.094635 129.026947,99.494820 130.772125,100.253883 
-        C128.967606,100.962029 127.168129,102.270332 125.357796,102.285515 
-        C107.197777,102.437874 89.035973,102.380455 70.874672,102.371246 
-        C69.711342,102.370659 68.472801,102.507912 67.409569,102.156487 
-        C66.618553,101.895027 66.054703,100.946327 65.389679,100.303711 
-        C66.119385,99.550468 66.786125,98.237221 67.590370,98.146782 
-        C70.224617,97.850578 72.908882,97.999115 76.062485,97.976593 
-      z"
-      />
-      <path
-        fill="#E1187D"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M80.920685,82.316193 
-        C63.308258,82.316200 46.187901,82.318260 29.067541,82.311577 
-        C27.739187,82.311058 26.357931,82.457756 25.102009,82.139046 
-        C24.325859,81.942078 23.740496,80.993317 23.069485,80.382057 
-        C23.771601,79.611794 24.340164,78.503944 25.210751,78.159531 
-        C26.223932,77.758705 27.501541,78.006973 28.664398,78.006714 
-        C46.615845,78.002670 64.567894,77.937714 82.517853,78.101265 
-        C84.423172,78.118629 86.316216,79.482330 88.214958,80.221436 
-        C86.279999,80.919533 84.349670,81.631081 82.405144,82.301437 
-        C82.107986,82.403885 81.745186,82.315918 80.920685,82.316193 
-      z"
-      />
-      <path
-        fill="#E32F8A"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M79.991829,122.652382 
-        C72.662308,122.651352 65.824562,122.811005 59.005238,122.527534 
-        C57.461216,122.463356 55.981194,120.859657 54.471714,119.964607 
-        C55.960098,119.293839 57.440266,118.063545 58.938179,118.041550 
-        C70.098740,117.877670 81.263718,117.887535 92.424622,118.039986 
-        C93.762497,118.058266 95.084221,119.258835 96.413437,119.911407 
-        C95.104393,120.822800 93.855019,122.395699 92.474976,122.520203 
-        C88.508385,122.878059 84.488945,122.650261 79.991829,122.652382 
-      z"
-      />
-      <path
-        fill="#E11A7F"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M87.057281,107.984856 
-        C96.849373,107.985489 106.149689,107.907974 115.445686,108.073349 
-        C116.790298,108.097275 118.114182,109.286911 119.447655,109.937103 
-        C118.088982,110.720306 116.741203,112.160210 115.369911,112.182968 
-        C104.247475,112.367546 93.119415,112.363960 81.996628,112.190086 
-        C80.575592,112.167877 79.175034,110.835953 77.764984,110.110771 
-        C79.203560,109.402657 80.578659,108.439697 82.099274,108.060989 
-        C83.506592,107.710503 85.069649,107.985306 87.057281,107.984856 
-      z"
-      />
-      <path
-        fill="#E1197E"
-        opacity="1.000000"
-        stroke="none"
-        d="
-      M59.291267,102.065292 
-        C49.714336,102.267746 40.553299,102.405640 31.395817,102.281364 
-        C30.062149,102.263260 28.745478,100.992783 27.420942,100.301804 
-        C28.640371,99.526543 29.845266,98.107399 31.081566,98.079498 
-        C39.740768,97.884033 48.406670,97.942070 57.069939,97.996361 
-        C59.689693,98.012772 62.223999,98.329712 59.291267,102.065292 
-      z"
-      />
-    </svg>
-  );
-}
diff --git a/libs/logos/src/chains/OptimismLogo.tsx b/libs/logos/src/chains/OptimismLogo.tsx
deleted file mode 100644
index 587cf4806c..0000000000
--- a/libs/logos/src/chains/OptimismLogo.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-function OptimismLogo() {
-  return (
-    <svg
-      width={'100%'}
-      viewBox="0 0 500 500"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <circle cx="250" cy="250" r="250" fill="#FF0420" />
-      <path
-        d="M177.133 316.446C162.247 316.446 150.051 312.943 140.544 305.938C131.162 298.808 126.471 288.676 126.471 275.541C126.471 272.789 126.784 269.411 127.409 265.408C129.036 256.402 131.35 245.581 134.352 232.947C142.858 198.547 164.812 181.347 200.213 181.347C209.845 181.347 218.476 182.973 226.107 186.225C233.738 189.352 239.742 194.106 244.12 200.486C248.498 206.74 250.688 214.246 250.688 223.002C250.688 225.629 250.375 228.944 249.749 232.947C247.873 244.08 245.621 254.901 242.994 265.408C238.616 282.546 231.048 295.368 220.29 303.874C209.532 312.255 195.147 316.446 177.133 316.446ZM179.76 289.426C186.766 289.426 192.707 287.362 197.586 283.234C202.59 279.106 206.155 272.789 208.281 264.283C211.158 252.524 213.348 242.266 214.849 233.51C215.349 230.883 215.599 228.194 215.599 225.441C215.599 214.058 209.657 208.366 197.774 208.366C190.768 208.366 184.764 210.43 179.76 214.558C174.882 218.687 171.379 225.004 169.253 233.51C167.001 241.891 164.749 252.149 162.498 264.283C161.997 266.784 161.747 269.411 161.747 272.163C161.747 283.672 167.752 289.426 179.76 289.426Z"
-        fill="white"
-      />
-      <path
-        d="M259.303 314.57C257.927 314.57 256.863 314.132 256.113 313.256C255.487 312.255 255.3 311.13 255.55 309.879L281.444 187.914C281.694 186.538 282.382 185.412 283.508 184.536C284.634 183.661 285.822 183.223 287.073 183.223H336.985C350.87 183.223 362.003 186.1 370.384 191.854C378.891 197.609 383.144 205.927 383.144 216.81C383.144 219.937 382.769 223.19 382.018 226.567C378.891 240.953 372.574 251.586 363.067 258.466C353.685 265.346 340.8 268.786 324.413 268.786H299.082L290.451 309.879C290.2 311.255 289.512 312.38 288.387 313.256C287.261 314.132 286.072 314.57 284.822 314.57H259.303ZM325.727 242.892C330.98 242.892 335.546 241.453 339.424 238.576C343.427 235.699 346.054 231.571 347.305 226.192C347.68 224.065 347.868 222.189 347.868 220.563C347.868 216.935 346.805 214.183 344.678 212.307C342.551 210.305 338.924 209.305 333.795 209.305H311.278L304.148 242.892H325.727Z"
-        fill="white"
-      />
-    </svg>
-  );
-}
-
-export default OptimismLogo;
diff --git a/libs/logos/src/chains/PolkadotLogo.tsx b/libs/logos/src/chains/PolkadotLogo.tsx
deleted file mode 100644
index 878993acbc..0000000000
--- a/libs/logos/src/chains/PolkadotLogo.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-function PolkadotLogo() {
-  return (
-    <svg
-      version="1.1"
-      id="Logo"
-      xmlns="http://www.w3.org/2000/svg"
-      x="0px"
-      y="0px"
-      viewBox="0 0 1326.1 1410.3"
-      fill="#E6007A"
-      width={'100%'}
-    >
-      <ellipse cx="663" cy="147.9" rx="254.3" ry="147.9" />
-      <ellipse cx="663" cy="1262.3" rx="254.3" ry="147.9" />
-      <ellipse
-        transform="matrix(0.5 -0.866 0.866 0.5 -279.1512 369.5916)"
-        cx="180.5"
-        cy="426.5"
-        rx="254.3"
-        ry="148"
-      />
-      <ellipse
-        transform="matrix(0.5 -0.866 0.866 0.5 -279.1552 1483.9517)"
-        cx="1145.6"
-        cy="983.7"
-        rx="254.3"
-        ry="147.9"
-      />
-      <ellipse
-        transform="matrix(0.866 -0.5 0.5 0.866 -467.6798 222.044)"
-        cx="180.5"
-        cy="983.7"
-        rx="148"
-        ry="254.3"
-      />
-      <ellipse
-        transform="matrix(0.866 -0.5 0.5 0.866 -59.8007 629.9254)"
-        cx="1145.6"
-        cy="426.6"
-        rx="147.9"
-        ry="254.3"
-      />
-    </svg>
-  );
-}
-
-export default PolkadotLogo;
diff --git a/libs/logos/src/chains/PolygonLogo.tsx b/libs/logos/src/chains/PolygonLogo.tsx
deleted file mode 100644
index 48539ca028..0000000000
--- a/libs/logos/src/chains/PolygonLogo.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-function PolygonLogo() {
-  return (
-    <svg
-      width={'100%'}
-      viewBox="0 0 1024 1024"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <circle cx="512" cy="512" r="512" fill="#8247E5" />
-      <path
-        d="M681.469 402.456C669.189 395.312 653.224 395.312 639.716 402.456L543.928 457.228L478.842 492.949L383.055 547.721C370.774 554.865 354.81 554.865 341.301 547.721L265.162 504.856C252.882 497.712 244.286 484.614 244.286 470.325V385.786C244.286 371.498 251.654 358.4 265.162 351.256L340.073 309.581C352.353 302.437 368.318 302.437 381.827 309.581L456.737 351.256C469.018 358.4 477.614 371.498 477.614 385.786V440.558L542.7 403.646V348.874C542.7 334.586 535.332 321.488 521.824 314.344L383.055 235.758C370.774 228.614 354.81 228.614 341.301 235.758L200.076 314.344C186.567 321.488 179.199 334.586 179.199 348.874V507.237C179.199 521.525 186.567 534.623 200.076 541.767L341.301 620.353C353.582 627.498 369.546 627.498 383.055 620.353L478.842 566.772L543.928 529.86L639.716 476.279C651.996 469.135 667.961 469.135 681.469 476.279L756.38 517.953C768.66 525.098 777.257 538.195 777.257 552.484V637.023C777.257 651.312 769.888 664.409 756.38 671.553L681.469 714.419C669.189 721.563 653.224 721.563 639.716 714.419L564.805 672.744C552.525 665.6 543.928 652.502 543.928 638.214V583.442L478.842 620.353V675.125C478.842 689.414 486.21 702.512 499.719 709.656L640.944 788.242C653.224 795.386 669.189 795.386 682.697 788.242L823.922 709.656C836.203 702.512 844.799 689.414 844.799 675.125V516.763C844.799 502.474 837.431 489.377 823.922 482.232L681.469 402.456Z"
-        fill="white"
-      />
-    </svg>
-  );
-}
-
-export default PolygonLogo;
diff --git a/libs/logos/src/chains/ShidenLogo.tsx b/libs/logos/src/chains/ShidenLogo.tsx
deleted file mode 100644
index 724e0af276..0000000000
--- a/libs/logos/src/chains/ShidenLogo.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-function ShidenLogo() {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="500"
-      height="500"
-      viewBox="0 0 500 500"
-    >
-      <g
-        transform="translate(140.20001983642578,303.5645964947197)translate(109.79998016357422,32.5)rotate(0)translate(-109.79998016357422,-32.5)"
-        opacity="1"
-      >
-        <path
-          transform="translate(6,49.3359375)rotate(0)"
-          d="M35.84-9.89L35.84-9.89L35.84-9.89Q35.84-8.09 35.38-6.64L35.38-6.64L35.38-6.64Q34.92-5.20 34.17-4.10L34.17-4.10L34.17-4.10Q33.42-3 32.41-2.23L32.41-2.23L32.41-2.23Q31.41-1.45 30.33-0.96L30.33-0.96L30.33-0.96Q29.25-0.47 28.14-0.23L28.14-0.23L28.14-0.23Q27.02 0 26.04 0L26.04 0L2.53 0L2.53-6.09L26.04-6.09L26.04-6.09Q27.80-6.09 28.77-7.13L28.77-7.13L28.77-7.13Q29.74-8.16 29.74-9.89L29.74-9.89L29.74-9.89Q29.74-10.73 29.48-11.44L29.48-11.44L29.48-11.44Q29.23-12.14 28.75-12.66L28.75-12.66L28.75-12.66Q28.27-13.17 27.57-13.45L27.57-13.45L27.57-13.45Q26.88-13.73 26.04-13.73L26.04-13.73L12.02-13.73L12.02-13.73Q10.55-13.73 8.84-14.26L8.84-14.26L8.84-14.26Q7.13-14.79 5.66-15.96L5.66-15.96L5.66-15.96Q4.20-17.13 3.22-19.03L3.22-19.03L3.22-19.03Q2.25-20.93 2.25-23.67L2.25-23.67L2.25-23.67Q2.25-26.41 3.22-28.30L3.22-28.30L3.22-28.30Q4.20-30.19 5.66-31.37L5.66-31.37L5.66-31.37Q7.13-32.55 8.84-33.08L8.84-33.08L8.84-33.08Q10.55-33.61 12.02-33.61L12.02-33.61L32.77-33.61L32.77-27.52L12.02-27.52L12.02-27.52Q10.29-27.52 9.32-26.46L9.32-26.46L9.32-26.46Q8.34-25.41 8.34-23.67L8.34-23.67L8.34-23.67Q8.34-21.91 9.32-20.89L9.32-20.89L9.32-20.89Q10.29-19.88 12.02-19.88L12.02-19.88L26.04-19.88L26.09-19.88L26.09-19.88Q27.07-19.85 28.17-19.61L28.17-19.61L28.17-19.61Q29.27-19.36 30.36-18.84L30.36-18.84L30.36-18.84Q31.45-18.33 32.44-17.54L32.44-17.54L32.44-17.54Q33.42-16.76 34.18-15.66L34.18-15.66L34.18-15.66Q34.95-14.55 35.39-13.13L35.39-13.13L35.39-13.13Q35.84-11.70 35.84-9.89ZM47.04-33.61L47.04-19.88L68.44-19.88L68.44-33.61L74.53-33.61L74.53 0L68.44 0L68.44-13.73L47.04-13.73L47.04 0L40.95 0L40.95-33.61L47.04-33.61ZM87.80-33.61L87.80 0L81.70 0L81.70-33.61L87.80-33.61ZM128.46-19.55L128.46-14.06L128.46-14.06Q128.46-10.99 127.39-8.41L127.39-8.41L127.39-8.41Q126.33-5.84 124.45-3.97L124.45-3.97L124.45-3.97Q122.58-2.11 120-1.05L120-1.05L120-1.05Q117.42 0 114.40 0L114.40 0L97.95 0L97.95 0Q97.29 0 96.73-0.23L96.73-0.23L96.73-0.23Q96.16-0.47 95.75-0.88L95.75-0.88L95.75-0.88Q95.34-1.29 95.11-1.85L95.11-1.85L95.11-1.85Q94.88-2.41 94.88-3.07L94.88-3.07L94.88-30.54L94.88-30.54Q94.88-31.17 95.11-31.73L95.11-31.73L95.11-31.73Q95.34-32.30 95.75-32.72L95.75-32.72L95.75-32.72Q96.16-33.14 96.73-33.38L96.73-33.38L96.73-33.38Q97.29-33.61 97.95-33.61L97.95-33.61L114.40-33.61L114.40-33.61Q117.42-33.61 120-32.55L120-32.55L120-32.55Q122.58-31.50 124.45-29.64L124.45-29.64L124.45-29.64Q126.33-27.77 127.39-25.18L127.39-25.18L127.39-25.18Q128.46-22.59 128.46-19.55L128.46-19.55ZM122.37-14.06L122.37-19.55L122.37-19.55Q122.37-21.33 121.79-22.80L121.79-22.80L121.79-22.80Q121.22-24.28 120.16-25.32L120.16-25.32L120.16-25.32Q119.11-26.37 117.64-26.94L117.64-26.94L117.64-26.94Q116.18-27.52 114.40-27.52L114.40-27.52L100.97-27.52L100.97-6.09L114.40-6.09L114.40-6.09Q116.18-6.09 117.64-6.67L117.64-6.67L117.64-6.67Q119.11-7.24 120.16-8.29L120.16-8.29L120.16-8.29Q121.22-9.33 121.79-10.79L121.79-10.79L121.79-10.79Q122.37-12.26 122.37-14.06L122.37-14.06ZM162.07-19.88L162.07-13.73L142.83-13.73L142.83-19.88L162.07-19.88ZM164.81-6.09L164.81 0L142.83 0L142.83 0Q141.56 0 140.06-0.45L140.06-0.45L140.06-0.45Q138.56-0.89 137.29-1.91L137.29-1.91L137.29-1.91Q136.01-2.93 135.15-4.56L135.15-4.56L135.15-4.56Q134.30-6.19 134.30-8.55L134.30-8.55L134.30-30.54L134.30-30.54Q134.30-31.17 134.53-31.73L134.53-31.73L134.53-31.73Q134.77-32.30 135.18-32.72L135.18-32.72L135.18-32.72Q135.59-33.14 136.15-33.38L136.15-33.38L136.15-33.38Q136.71-33.61 137.37-33.61L137.37-33.61L164.81-33.61L164.81-27.52L140.39-27.52L140.39-8.55L140.39-8.55Q140.39-7.36 141.02-6.73L141.02-6.73L141.02-6.73Q141.66-6.09 142.88-6.09L142.88-6.09L164.81-6.09ZM204.28-33.61L204.28-2.60L204.28-2.60Q204.28-1.95 204.04-1.38L204.04-1.38L204.04-1.38Q203.79-0.82 203.38-0.41L203.38-0.41L203.38-0.41Q202.97 0 202.41 0.23L202.41 0.23L202.41 0.23Q201.84 0.47 201.21 0.47L201.21 0.47L201.21 0.47Q200.65 0.47 200.07 0.26L200.07 0.26L200.07 0.26Q199.50 0.05 199.05-0.42L199.05-0.42L176.79-23.67L176.79 0L170.70 0L170.70-31.01L170.70-31.01Q170.70-31.95 171.22-32.71L171.22-32.71L171.22-32.71Q171.75-33.47 172.57-33.84L172.57-33.84L172.57-33.84Q173.44-34.20 174.35-34.02L174.35-34.02L174.35-34.02Q175.27-33.84 175.92-33.16L175.92-33.16L198.19-9.94L198.19-33.61L204.28-33.61Z"
-          fill="#5928B1"
-        />
-      </g>
-      <g
-        transform="translate(203.90917691579924,113.15405493431763)translate(56,51.40983606557378)rotate(0)translate(-56,-51.40983606557378) scale(0.9186653105416844,0.9186653105416844)"
-        opacity="1"
-      >
-        <defs className="defs" />
-        <g>
-          <path
-            fill="#5928B1"
-            d="M92.376,39.274c-15.193,4.284-37.611,13.244-58.146,31.61c-20.637,19.223-6.627,36.367-6.482,36.537&#10;&#9;&#9;c0,0-7.563-13.805,10.729-30.814c0.232-0.201,23.582-20.16,57.541-29.734c4.33-1.221,8.707-2.237,13.01-3.02l0.299-0.054&#10;&#9;&#9;l5.467-8.77l-1.342,0.094C113.367,35.13,104.835,35.761,92.376,39.274z"
-            className="color c1"
-          />
-          <path
-            fill="#764BC4"
-            d="M115.748,14.696c-3.498-2.914-6.992-5.22-7.027-5.243l-0.211-0.136l-0.248,0.029&#10;&#9;&#9;c-0.094,0.012-9.521,1.16-22.504,4.821C62.529,20.715,31.289,34.145,14.373,60.92c-8.035,12.163-1.568,26.716-1.568,26.716&#10;&#9;&#9;l-0.195-3.704c-0.021-0.393-1.131-39.629,80.129-62.542c7.113-2.006,14.752-3.854,22.709-5.498l1.393-0.287L115.748,14.696z"
-            className="color c2"
-          />
-          <path
-            fill="#764BC4"
-            d="M120.66,19.819c-0.105,0.011-10.795,1.137-25.688,5.335C79.21,29.599,56.259,38.218,36.441,54.03&#10;&#9;&#9;c-11.686,8.985-19.082,19.825-20.293,29.742c-0.594,4.84,5.137,15.113,5.137,15.113l-1.205-3.649&#10;&#9;&#9;c-0.055-0.166-5.176-16.787,20.775-36.072C55.396,48.356,70.55,40.959,88.541,35.887c9.275-2.615,18.162-4.333,27.986-6.15&#10;&#9;&#9;l0.346-0.064l0.15-0.317c0.742-1.575,4.281-8.472,4.318-8.541l0.574-1.123L120.66,19.819z"
-            className="color c3"
-          />
-          <path
-            fill="#BBA5E1"
-            d="M7.085,70.281C8.064,54.708,19.98,40.319,42.529,27.5c11.883-7.343,25.166-13.112,39.479-17.148&#10;&#9;&#9;c12.139-3.423,22.4-4.445,22.4-4.445L96.156,0c-0.076,0.009-7.682,0.934-18.551,3.999C7.91,23.65-0.727,57.508,0.044,71.118&#10;&#9;&#9;c1.35,23.729,29.582,40.604,29.582,40.604S5.628,93.485,7.085,70.281z"
-            className="color c4"
-          />
-        </g>
-      </g>
-      <g
-        transform="translate(296.0747398297067,279.74856150255147)translate(-56,-51.40983606557378)rotate(0)translate(56,51.40983606557378) scale(-0.9186653105416844,-0.9186653105416844)"
-        opacity="1"
-      >
-        <defs className="defs" />
-        <g>
-          <path
-            fill="#5928B1"
-            d="M92.376,39.274c-15.193,4.284-37.611,13.244-58.146,31.61c-20.637,19.223-6.627,36.367-6.482,36.537&#10;&#9;&#9;c0,0-7.563-13.805,10.729-30.814c0.232-0.201,23.582-20.16,57.541-29.734c4.33-1.221,8.707-2.237,13.01-3.02l0.299-0.054&#10;&#9;&#9;l5.467-8.77l-1.342,0.094C113.367,35.13,104.835,35.761,92.376,39.274z"
-            className="color c1"
-          />
-          <path
-            fill="#764BC4"
-            d="M115.748,14.696c-3.498-2.914-6.992-5.22-7.027-5.243l-0.211-0.136l-0.248,0.029&#10;&#9;&#9;c-0.094,0.012-9.521,1.16-22.504,4.821C62.529,20.715,31.289,34.145,14.373,60.92c-8.035,12.163-1.568,26.716-1.568,26.716&#10;&#9;&#9;l-0.195-3.704c-0.021-0.393-1.131-39.629,80.129-62.542c7.113-2.006,14.752-3.854,22.709-5.498l1.393-0.287L115.748,14.696z"
-            className="color c2"
-          />
-          <path
-            fill="#764BC4"
-            d="M120.66,19.819c-0.105,0.011-10.795,1.137-25.688,5.335C79.21,29.599,56.259,38.218,36.441,54.03&#10;&#9;&#9;c-11.686,8.985-19.082,19.825-20.293,29.742c-0.594,4.84,5.137,15.113,5.137,15.113l-1.205-3.649&#10;&#9;&#9;c-0.055-0.166-5.176-16.787,20.775-36.072C55.396,48.356,70.55,40.959,88.541,35.887c9.275-2.615,18.162-4.333,27.986-6.15&#10;&#9;&#9;l0.346-0.064l0.15-0.317c0.742-1.575,4.281-8.472,4.318-8.541l0.574-1.123L120.66,19.819z"
-            className="color c3"
-          />
-          <path
-            fill="#BBA5E1"
-            d="M7.085,70.281C8.064,54.708,19.98,40.319,42.529,27.5c11.883-7.343,25.166-13.112,39.479-17.148&#10;&#9;&#9;c12.139-3.423,22.4-4.445,22.4-4.445L96.156,0c-0.076,0.009-7.682,0.934-18.551,3.999C7.91,23.65-0.727,57.508,0.044,71.118&#10;&#9;&#9;c1.35,23.729,29.582,40.604,29.582,40.604S5.628,93.485,7.085,70.281z"
-            className="color c4"
-          />
-        </g>
-      </g>
-    </svg>
-  );
-}
-
-export default ShidenLogo;
diff --git a/libs/logos/src/chains/WebbLogo.tsx b/libs/logos/src/chains/WebbLogo.tsx
deleted file mode 100644
index 356d3ce58d..0000000000
--- a/libs/logos/src/chains/WebbLogo.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-function WEBBLogo() {
-  return (
-    <svg
-      width={'100%'}
-      viewBox="0 0 47 47"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M23.1407 46.3571C35.921 46.3571 46.2814 35.9797 46.2814 23.1786C46.2814 10.3774 35.921 0 23.1407 0C10.3605 0 0 10.3774 0 23.1786C0 35.9797 10.3605 46.3571 23.1407 46.3571Z"
-        fill="#3351F2"
-      />
-      <path
-        d="M38.0764 22.8171C38.4372 22.8171 38.6961 22.8957 38.853 23.0529C39.0256 23.21 39.1118 23.4143 39.1118 23.6657C39.1118 24.0743 38.9863 24.4357 38.7353 24.75C38.5 25.0643 38.1235 25.2293 37.6057 25.245C36.3663 25.2607 35.2524 25.1664 34.2641 24.9621C33.1659 27.3036 31.8402 29.2521 30.287 30.8078C28.7495 32.3479 27.2277 33.1179 25.7216 33.1179C24.341 33.1179 23.3056 32.3871 22.6153 30.9257C21.925 29.4486 21.5327 27.4764 21.4386 25.0093C20.4973 27.7436 19.4305 29.7786 18.2381 31.1143C17.0615 32.45 15.8064 33.1179 14.4729 33.1179C12.9668 33.1179 11.8293 32.1829 11.0606 30.3129C10.2918 28.4271 9.90747 25.8971 9.90747 22.7228C9.90747 20.4128 10.1114 17.875 10.5193 15.1093C10.6291 14.3236 10.8253 13.7814 11.1077 13.4828C11.4057 13.1686 11.8685 13.0114 12.4961 13.0114C12.9668 13.0114 13.3276 13.1136 13.5786 13.3178C13.8453 13.5221 13.9787 13.8993 13.9787 14.4493C13.9787 14.5593 13.963 14.7714 13.9316 15.0857C13.4609 18.3071 13.2256 21.0493 13.2256 23.3121C13.2256 25.4178 13.406 27.0443 13.7669 28.1914C14.1277 29.3386 14.6141 29.9121 15.2259 29.9121C15.775 29.9121 16.4339 29.3386 17.2027 28.1914C17.9871 27.0286 18.7637 25.3157 19.5324 23.0529C20.3012 20.7743 20.9523 18.0636 21.4857 14.9207C21.6112 14.1978 21.8387 13.7028 22.1681 13.4357C22.5133 13.1528 22.9761 13.0114 23.5566 13.0114C24.0429 13.0114 24.3959 13.1214 24.6156 13.3414C24.8509 13.5457 24.9685 13.86 24.9685 14.2843C24.9685 14.5357 24.9529 14.7321 24.9215 14.8736C24.4822 17.435 24.2626 19.9964 24.2626 22.5578C24.2626 24.3021 24.3175 25.6929 24.4273 26.73C24.5528 27.7671 24.7803 28.5607 25.1097 29.1107C25.4549 29.645 25.9491 29.9121 26.5923 29.9121C27.3454 29.9121 28.1847 29.3464 29.1103 28.215C30.036 27.0679 30.8832 25.6457 31.6519 23.9486C30.6949 23.3514 29.9732 22.5814 29.4869 21.6386C29.0005 20.68 28.7573 19.58 28.7573 18.3386C28.7573 17.0971 28.9456 16.0521 29.3221 15.2036C29.7144 14.3393 30.2399 13.695 30.8988 13.2707C31.5735 12.8464 32.3187 12.6343 33.1345 12.6343C34.1385 12.6343 34.9308 12.9957 35.5113 13.7186C36.1075 14.4414 36.4056 15.4314 36.4056 16.6886C36.4056 18.4643 36.0212 20.4364 35.2524 22.605C36.0526 22.7464 36.9939 22.8171 38.0764 22.8171ZM31.1342 18.1736C31.1342 19.7136 31.6284 20.8528 32.6168 21.5914C33.2286 19.8314 33.5345 18.3779 33.5345 17.2307C33.5345 16.5707 33.4482 16.0914 33.2757 15.7928C33.1031 15.4786 32.8678 15.3214 32.5697 15.3214C32.1461 15.3214 31.8009 15.5728 31.5342 16.0757C31.2675 16.5628 31.1342 17.2621 31.1342 18.1736Z"
-        fill="white"
-      />
-    </svg>
-  );
-}
-
-export default WEBBLogo;
diff --git a/libs/logos/src/chains/index.ts b/libs/logos/src/chains/index.ts
deleted file mode 100644
index 8c21ee2080..0000000000
--- a/libs/logos/src/chains/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export * from './ArbitrumLogo';
-export * from './EthLogo';
-export * from './GanacheLogo';
-export * from './HarmonyLogo';
-export * from './KusamaLogo';
-export * from './MoonbeamLogo';
-export * from './OptimismLogo';
-export * from './PolkadotLogo';
-export * from './PolygonLogo';
-export * from './ShidenLogo';
-export * from './WebbLogo';
diff --git a/libs/logos/src/index.ts b/libs/logos/src/index.ts
deleted file mode 100644
index 4134f3321b..0000000000
--- a/libs/logos/src/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export * from './chains';
-export * from './misc';
-export * from './pages';
-export * from './socials';
-export * from './wallets';
-export * from './Eth';
-export * from './ChromeLogo';
-export * from './FireFoxLogo';
-export * from './LocationLogo';
-export * from './WebbFullNameLogo';
-export * from './WebbWrappedLogo';
diff --git a/libs/logos/src/misc/WebbTextLogo.tsx b/libs/logos/src/misc/WebbTextLogo.tsx
deleted file mode 100644
index 5cab15cd73..0000000000
--- a/libs/logos/src/misc/WebbTextLogo.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-function WebbTextLogo(fillColor: string) {
-  return (
-    <svg
-      width="54"
-      height="21"
-      viewBox="0 0 54 21"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M26.7428 11.2889C27.0852 11.2889 27.3309 11.3629 27.4801 11.5111C27.6437 11.6593 27.7258 11.8518 27.7258 12.0889C27.7258 12.4741 27.6069 12.8148 27.3684 13.1111C27.1449 13.4074 26.7875 13.5629 26.296 13.5778C25.1191 13.5926 24.0618 13.5037 23.1235 13.3111C22.0807 15.5185 20.8223 17.3556 19.3478 18.8222C17.8883 20.2741 16.4434 21 15.0135 21C13.7028 21 12.7198 20.3111 12.0644 18.9333C11.4091 17.5407 11.0367 15.6815 10.9473 13.3556C10.0537 15.9333 9.04089 17.8518 7.9089 19.1111C6.79182 20.3704 5.60029 21 4.33426 21C2.9044 21 1.82458 20.1185 1.09474 18.3556C0.364897 16.5778 0 14.1926 0 11.2C0 9.02222 0.193646 6.62961 0.58088 4.02222C0.685159 3.2815 0.87132 2.77039 1.13942 2.48889C1.42243 2.19261 1.86178 2.04444 2.45757 2.04444C2.9044 2.04444 3.24695 2.14072 3.48528 2.33333C3.73846 2.52594 3.86509 2.8815 3.86509 3.4C3.86509 3.50372 3.85017 3.70372 3.8204 4C3.37357 7.03706 3.15016 9.62222 3.15016 11.7556C3.15016 13.7407 3.32146 15.2741 3.66401 16.3556C4.00656 17.4371 4.4683 17.9778 5.04918 17.9778C5.57047 17.9778 6.19603 17.4371 6.92587 16.3556C7.67057 15.2593 8.40784 13.6444 9.13768 11.5111C9.86752 9.36294 10.4856 6.80739 10.992 3.84444C11.1112 3.16294 11.3272 2.69628 11.6399 2.44444C11.9676 2.17778 12.407 2.04444 12.9581 2.04444C13.4198 2.04444 13.7549 2.14817 13.9634 2.35556C14.1869 2.54817 14.2986 2.84444 14.2986 3.24444C14.2986 3.4815 14.2837 3.66667 14.2539 3.8C13.8368 6.21483 13.6283 8.62961 13.6283 11.0444C13.6283 12.6889 13.6804 14 13.7847 14.9778C13.9039 15.9556 14.1198 16.7037 14.4326 17.2222C14.7603 17.7259 15.2295 17.9778 15.8401 17.9778C16.5551 17.9778 17.3519 17.4444 18.2307 16.3778C19.1093 15.2963 19.9136 13.9556 20.6436 12.3556C19.7348 11.7926 19.0501 11.0667 18.5881 10.1778C18.1262 9.27406 17.8956 8.23706 17.8956 7.06667C17.8956 5.89628 18.0743 4.91111 18.4318 4.11111C18.8043 3.29628 19.3031 2.68889 19.9286 2.28889C20.5693 1.88889 21.2764 1.68889 22.0511 1.68889C23.0045 1.68889 23.7563 2.02961 24.3076 2.71111C24.8734 3.39261 25.1565 4.32594 25.1565 5.51111C25.1565 7.18517 24.7918 9.04445 24.0618 11.0889C24.8214 11.2222 25.7151 11.2889 26.7428 11.2889ZM20.152 6.91111C20.152 8.36294 20.6212 9.43705 21.5596 10.1333C22.1404 8.47405 22.4309 7.10372 22.4309 6.02222C22.4309 5.4 22.3488 4.94817 22.1851 4.66667C22.0215 4.37039 21.7981 4.22222 21.5149 4.22222C21.1127 4.22222 20.7849 4.45928 20.5319 4.93333C20.2788 5.39261 20.152 6.05183 20.152 6.91111ZM35.5185 15.9333C35.7124 15.9333 35.8609 16.0222 35.9654 16.2C36.0843 16.3778 36.1441 16.6222 36.1441 16.9333C36.1441 17.5259 36.0028 17.9852 35.7196 18.3111C35.1683 18.9778 34.3864 19.5926 33.3738 20.1556C32.3756 20.7185 31.3033 21 30.1566 21C28.5927 21 27.379 20.5778 26.5149 19.7333C25.6509 18.8889 25.2191 17.7333 25.2191 16.2667C25.2191 15.2444 25.4353 14.2963 25.867 13.4222C26.2988 12.5333 26.8947 11.8296 27.6543 11.3111C28.429 10.7926 29.3003 10.5333 30.2683 10.5333C31.1323 10.5333 31.8249 10.7926 32.346 11.3111C32.8672 11.8148 33.128 12.5037 33.128 13.3778C33.128 14.4 32.7555 15.2815 32.0109 16.0222C31.2809 16.7482 30.0376 17.3259 28.2799 17.7556C28.6524 18.4371 29.3595 18.7778 30.4023 18.7778C31.0726 18.7778 31.8322 18.5482 32.6812 18.0889C33.5452 17.6148 34.2898 17 34.9153 16.2444C35.0941 16.0371 35.2951 15.9333 35.5185 15.9333ZM29.8885 12.7111C29.3372 12.7111 28.868 13.0296 28.481 13.6667C28.1084 14.3037 27.9224 15.0741 27.9224 15.9778V16.0222C28.801 15.8148 29.4936 15.5037 30.0002 15.0889C30.5068 14.6741 30.7598 14.1926 30.7598 13.6444C30.7598 13.3629 30.6777 13.1407 30.514 12.9778C30.3649 12.8 30.1566 12.7111 29.8885 12.7111ZM46.2106 14.0667C46.4044 14.0667 46.553 14.1629 46.6575 14.3556C46.7619 14.5482 46.8139 14.7926 46.8139 15.0889C46.8139 15.4593 46.7619 15.7482 46.6575 15.9556C46.553 16.1482 46.3894 16.2815 46.166 16.3556C45.2723 16.6667 44.2893 16.8444 43.2169 16.8889C42.9192 18.1185 42.3528 19.1111 41.5189 19.8667C40.6995 20.6222 39.7914 21 38.7933 21C37.2891 21 36.1944 20.4296 35.509 19.2889C34.8237 18.1482 34.4813 16.4963 34.4813 14.3333C34.4813 12.4222 34.7198 10.3482 35.1963 8.11111C35.6727 5.85928 36.3653 3.94817 37.274 2.37778C38.1973 0.792611 39.292 0 40.5582 0C41.2436 0 41.7943 0.296278 42.2115 0.888889C42.6287 1.46667 42.8371 2.22222 42.8371 3.15556C42.8371 4.37039 42.6064 5.57778 42.1445 6.77778C41.6826 7.97778 40.9157 9.23706 39.8433 10.5556C40.8414 10.6296 41.653 11.0444 42.2785 11.8C42.9041 12.5407 43.2766 13.4593 43.3956 14.5556C44.0955 14.5111 44.9299 14.3629 45.8979 14.1111C45.9872 14.0815 46.0917 14.0667 46.2106 14.0667ZM40.0444 2.2C39.7467 2.2 39.4188 2.64444 39.0613 3.53333C38.719 4.40739 38.3984 5.6 38.1007 7.11111C37.803 8.62222 37.5795 10.2741 37.4304 12.0667C38.4134 10.2741 39.1954 8.69628 39.7763 7.33333C40.3722 5.95556 40.6699 4.73333 40.6699 3.66667C40.6699 3.19261 40.6102 2.82961 40.4912 2.57778C40.3868 2.32594 40.2382 2.2 40.0444 2.2ZM38.8826 18.6444C39.3445 18.6444 39.7539 18.4518 40.1114 18.0667C40.4689 17.6815 40.7074 17.1259 40.8263 16.4C40.3644 16.0889 40.007 15.6815 39.7539 15.1778C39.5154 14.6741 39.3965 14.1407 39.3965 13.5778C39.3965 13.3704 39.4261 13.0889 39.4858 12.7333H39.4188C38.8083 12.7333 38.2945 13.0371 37.8773 13.6444C37.4751 14.2371 37.274 15.0371 37.274 16.0444C37.274 16.8889 37.4304 17.5333 37.7432 17.9778C38.0711 18.4222 38.4509 18.6444 38.8826 18.6444ZM49.3083 21C47.8192 21 46.7318 20.4296 46.0464 19.2889C45.3762 18.1482 45.0411 16.4963 45.0411 14.3333C45.0411 12.4222 45.2796 10.3482 45.756 8.11111C46.233 5.85928 46.9256 3.94817 47.8337 2.37778C48.7576 0.792611 49.8523 0 51.1179 0C51.8033 0 52.3546 0.296278 52.7712 0.888889C53.1884 1.46667 53.3968 2.22222 53.3968 3.15556C53.3968 4.37039 53.1661 5.57778 52.7042 6.77778C52.2428 7.97778 51.4754 9.23706 50.403 10.5556C51.133 10.6148 51.7659 10.8593 52.3021 11.2889C52.8533 11.7185 53.2705 12.2741 53.5532 12.9556C53.8514 13.6371 54 14.3778 54 15.1778C54 16.2889 53.7766 17.2889 53.3298 18.1778C52.898 19.0667 52.3244 19.7629 51.6095 20.2667C50.8945 20.7556 50.1277 21 49.3083 21ZM47.9901 12.0667C48.9732 10.2741 49.7551 8.69628 50.336 7.33333C50.932 5.95556 51.2297 4.73333 51.2297 3.66667C51.2297 3.19261 51.1704 2.82961 51.0509 2.57778C50.947 2.32594 50.7979 2.2 50.6041 2.2C50.3064 2.2 49.9785 2.64444 49.6211 3.53333C49.2787 4.40739 48.9586 5.6 48.6604 7.11111C48.3627 8.62222 48.1393 10.2741 47.9901 12.0667ZM49.3977 18.6C49.9043 18.6 50.3287 18.3259 50.6711 17.7778C51.0286 17.2296 51.2073 16.4296 51.2073 15.3778C51.2073 14.5629 51.0587 13.9482 50.7605 13.5333C50.4628 13.1185 50.1053 12.9111 49.6881 12.9111C49.167 12.9111 48.7274 13.1778 48.3699 13.7111C48.0125 14.2444 47.8337 15.0222 47.8337 16.0444C47.8337 16.9333 47.9829 17.5852 48.2806 18C48.5788 18.4 48.9508 18.6 49.3977 18.6Z"
-        fill={fillColor}
-      />
-    </svg>
-  );
-}
-
-export default WebbTextLogo;
diff --git a/libs/logos/src/misc/index.ts b/libs/logos/src/misc/index.ts
deleted file mode 100644
index 2cf7921765..0000000000
--- a/libs/logos/src/misc/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './WebbTextLogo';
diff --git a/libs/logos/src/pages/BridgePageLogo.tsx b/libs/logos/src/pages/BridgePageLogo.tsx
deleted file mode 100644
index a8852d3013..0000000000
--- a/libs/logos/src/pages/BridgePageLogo.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-function BridgePageLogo() {
-  return (
-    <svg
-      width="20"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M21 8V6H3v14H2v2h6v-7c0-.163.046-4 4-4 3.821 0 3.993 3.602 4 4v7h6v-2h-1V8zM2 2h20v2H2z"
-        fill="#B6B6B6"
-      />
-    </svg>
-  );
-}
-
-export default BridgePageLogo;
diff --git a/libs/logos/src/pages/index.ts b/libs/logos/src/pages/index.ts
deleted file mode 100644
index 9bbd4b203c..0000000000
--- a/libs/logos/src/pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './BridgePageLogo';
diff --git a/libs/logos/src/socials/CommonWealthLogo.tsx b/libs/logos/src/socials/CommonWealthLogo.tsx
deleted file mode 100644
index 36ce95a505..0000000000
--- a/libs/logos/src/socials/CommonWealthLogo.tsx
+++ /dev/null
@@ -1,273 +0,0 @@
-export function CommonWealthLogo() {
-  return (
-    <svg viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <g clipPath="url(#prefix__clip0)">
-        <path
-          d="M4.078 8.396a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint0_linear)"
-        />
-        <path
-          d="M13.866 8.396a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint1_linear)"
-        />
-        <path
-          d="M23.654 8.396a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint2_linear)"
-        />
-        <path
-          d="M33.442 8.396a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint3_linear)"
-        />
-        <path
-          d="M4.078 18.184a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint4_linear)"
-        />
-        <path
-          d="M23.654 18.184a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint5_linear)"
-        />
-        <path
-          d="M33.442 18.184a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint6_linear)"
-        />
-        <path
-          d="M4.078 27.972a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint7_linear)"
-        />
-        <path
-          d="M13.866 27.972a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint8_linear)"
-        />
-        <path
-          d="M33.442 27.972a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint9_linear)"
-        />
-        <path
-          d="M4.078 37.76a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint10_linear)"
-        />
-        <path
-          d="M13.866 37.76a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint11_linear)"
-        />
-        <path
-          d="M23.654 37.76a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint12_linear)"
-        />
-        <path
-          d="M33.442 37.76a4.078 4.078 0 100-8.156 4.078 4.078 0 000 8.156z"
-          fill="url(#prefix__paint13_linear)"
-        />
-        <path
-          d="M13.866 9.826l-4.28 4.28 4.28 4.28 4.28-4.28-4.28-4.28zM23.654 19.614l-4.28 4.28 4.28 4.28 4.28-4.28-4.28-4.28z"
-          fill="#000"
-        />
-      </g>
-      <defs>
-        <linearGradient
-          id="prefix__paint0_linear"
-          x1={19.212}
-          y1={-13.047}
-          x2={-12.156}
-          y2={22.945}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint1_linear"
-          x1={24.775}
-          y1={-8.199}
-          x2={-6.593}
-          y2={27.793}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint2_linear"
-          x1={30.338}
-          y1={-3.35}
-          x2={-1.03}
-          y2={32.641}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint3_linear"
-          x1={35.9}
-          y1={1.498}
-          x2={4.532}
-          y2={37.489}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint4_linear"
-          x1={24.061}
-          y1={-8.821}
-          x2={-7.308}
-          y2={27.171}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint5_linear"
-          x1={35.186}
-          y1={0.875}
-          x2={3.818}
-          y2={36.867}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint6_linear"
-          x1={40.748}
-          y1={5.723}
-          x2={9.38}
-          y2={41.715}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint7_linear"
-          x1={28.909}
-          y1={-4.596}
-          x2={-2.46}
-          y2={31.396}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint8_linear"
-          x1={34.471}
-          y1={0.252}
-          x2={3.103}
-          y2={36.244}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint9_linear"
-          x1={45.597}
-          y1={9.948}
-          x2={14.228}
-          y2={45.94}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint10_linear"
-          x1={33.757}
-          y1={-0.371}
-          x2={2.388}
-          y2={35.621}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint11_linear"
-          x1={39.319}
-          y1={4.477}
-          x2={7.951}
-          y2={40.469}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint12_linear"
-          x1={44.882}
-          y1={9.325}
-          x2={13.514}
-          y2={45.317}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <linearGradient
-          id="prefix__paint13_linear"
-          x1={50.445}
-          y1={14.174}
-          x2={19.076}
-          y2={50.165}
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#79E0E8" />
-          <stop offset={0.245} stopColor="#BF8E60" />
-          <stop offset={0.515} stopColor="#D69FCC" />
-          <stop offset={0.79} stopColor="#6086D1" />
-          <stop offset={1} stopColor="#B37DBA" />
-        </linearGradient>
-        <clipPath id="prefix__clip0">
-          <path
-            fill="#fff"
-            transform="translate(0 .24)"
-            d="M0 0h37.521v37.521H0z"
-          />
-        </clipPath>
-      </defs>
-    </svg>
-  );
-}
diff --git a/libs/logos/src/socials/DiscordLogo.tsx b/libs/logos/src/socials/DiscordLogo.tsx
deleted file mode 100644
index 508810d9e3..0000000000
--- a/libs/logos/src/socials/DiscordLogo.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-export function DiscordLogo() {
-  return (
-    <svg viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <g clipPath="url(#prefix__clip0)">
-        <path
-          d="M60.105 4.898A58.55 58.55 0 0045.653.415a.22.22 0 00-.233.11 40.784 40.784 0 00-1.8 3.697c-5.456-.817-10.886-.817-16.23 0-.485-1.164-1.201-2.587-1.828-3.697a.228.228 0 00-.233-.11 58.386 58.386 0 00-14.451 4.483.207.207 0 00-.095.082C1.578 18.73-.944 32.144.293 45.39a.244.244 0 00.093.167c6.073 4.46 11.955 7.167 17.729 8.962a.23.23 0 00.249-.082 42.08 42.08 0 003.627-5.9.225.225 0 00-.123-.312 38.772 38.772 0 01-5.539-2.64.228.228 0 01-.022-.378c.372-.279.744-.569 1.1-.862a.22.22 0 01.23-.03c11.619 5.304 24.198 5.304 35.68 0a.219.219 0 01.233.027c.356.293.728.586 1.103.865a.228.228 0 01-.02.378 36.384 36.384 0 01-5.54 2.637.227.227 0 00-.121.315 47.249 47.249 0 003.624 5.897.225.225 0 00.249.084c5.801-1.794 11.684-4.502 17.757-8.961a.228.228 0 00.092-.164c1.48-15.315-2.48-28.618-10.497-40.412a.18.18 0 00-.093-.084zm-36.38 32.427c-3.497 0-6.38-3.211-6.38-7.156 0-3.944 2.827-7.156 6.38-7.156 3.583 0 6.438 3.24 6.382 7.156 0 3.945-2.827 7.156-6.381 7.156zm23.593 0c-3.498 0-6.38-3.211-6.38-7.156 0-3.944 2.826-7.156 6.38-7.156 3.582 0 6.437 3.24 6.38 7.156 0 3.945-2.798 7.156-6.38 7.156z"
-          fill="#fff"
-        />
-      </g>
-      <defs>
-        <clipPath id="prefix__clip0">
-          <path fill="#fff" d="M0 0h71v55H0z" />
-        </clipPath>
-      </defs>
-    </svg>
-  );
-}
diff --git a/libs/logos/src/socials/GithubLogo.tsx b/libs/logos/src/socials/GithubLogo.tsx
deleted file mode 100644
index d466935afd..0000000000
--- a/libs/logos/src/socials/GithubLogo.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export function GithubLogo() {
-  return (
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 999.937 999.937">
-      <path d="M0 499.968c0-138.012 48.825-255.843 146.476-353.493C244.125 48.825 361.956 0 499.969 0 637.98 0 755.811 48.825 853.462 146.475c97.649 97.65 146.475 215.481 146.475 353.493s-48.825 255.843-146.475 353.493c-97.65 97.65-215.481 146.476-353.493 146.476-138.013 0-255.844-48.825-353.493-146.476C48.825 755.812 0 637.979 0 499.968zm54.684 0c0 122.389 43.617 227.199 130.851 314.434 87.234 87.233 192.045 130.851 314.434 130.851 122.388 0 227.199-43.617 314.433-130.851 87.234-87.234 130.851-192.045 130.851-314.434 0-122.388-43.616-227.199-130.851-314.433C727.168 98.301 622.356 54.684 499.969 54.684c-122.389 0-227.199 43.617-314.434 130.851C98.301 272.769 54.684 377.58 54.684 499.968zm140.617 107.415c-2.604-2.604-2.604-5.208 0-7.812 5.207-5.208 11.718-7.161 19.529-5.859 7.812 1.302 12.369 2.604 13.671 3.906 9.114 3.906 19.205 12.694 30.271 26.366 11.066 13.671 19.855 23.11 26.366 28.318 31.248 26.04 63.146 27.993 95.696 5.859 2.604-9.114 6.836-16.926 12.694-23.437 5.858-6.51 11.393-11.066 16.601-13.671 5.209-2.604 14.323-6.51 27.343-11.718-42.967-3.906-77.795-11.393-104.486-22.46s-47.849-25.063-63.473-41.989c-20.832-23.436-33.527-54.033-38.084-91.791-4.558-37.758-1.628-72.261 8.789-103.509 7.812-19.53 18.879-37.106 33.2-52.731-10.416-32.55-8.463-69.657 5.859-111.321 41.664 2.604 79.422 16.926 113.274 42.966 65.1-16.926 132.804-17.577 203.111-1.953 9.114-6.51 23.111-14.647 41.989-24.413 18.879-9.765 42.641-15.299 71.285-16.601 5.208 14.322 8.789 31.248 10.742 50.778s.977 37.758-2.929 54.684c29.945 31.248 45.569 72.912 46.871 124.992 0 41.664-7.16 76.167-21.482 103.509s-39.711 50.127-76.167 68.354c-24.738 11.719-57.288 18.879-97.65 21.483 18.229 9.114 31.574 18.554 40.037 28.319 8.464 9.765 13.997 25.063 16.602 45.895v61.521l1.952 59.566c3.906 6.511 8.464 12.044 13.672 16.602 5.208 4.557 9.765 7.812 13.671 9.765 3.905 1.953 5.208 4.883 3.905 8.789-1.302 3.906-6.51 5.859-15.623 5.859-22.135 0-39.711-7.812-52.731-23.437-3.906-6.51-5.859-14.321-5.859-23.436v-93.744c0-10.416-2.604-17.903-7.812-22.46-5.208-4.558-10.416-7.487-15.624-8.789v123.039c0 22.134 2.604 36.456 7.812 42.966s8.463 13.021 9.766 19.53c1.302 1.302.325 2.278-2.93 2.929-3.254.65-8.788-.325-16.601-2.929-16.926-3.906-28.644-12.695-35.154-26.366-6.51-13.671-9.765-28.319-9.765-43.943V667.926H488.25v121.086c0 15.624-3.256 30.598-9.766 44.919-9.113 18.229-26.04 27.993-50.777 29.295-3.906-1.302-5.859-2.604-5.859-3.905 1.302-1.303 5.208-7.812 11.718-19.53 1.302-2.604 2.93-7.812 4.883-15.624 1.954-7.812 2.93-16.926 2.93-27.342v-123.04c-5.208 1.302-10.091 4.231-14.648 8.789s-6.836 12.044-6.836 22.46v93.744c0 9.113-1.953 16.926-5.859 23.436-11.718 15.624-29.295 23.437-52.73 23.437-9.114 0-14.322-1.953-15.624-5.859-1.303-2.604-.977-4.883.977-6.836s4.883-4.232 8.789-6.836c3.906-2.604 6.51-4.558 7.812-5.859 5.208-3.906 9.113-9.114 11.718-15.624 3.906-5.208 4.882-18.879 2.929-41.013s-2.279-36.456-.977-42.966c-33.853 11.718-68.355 5.858-103.51-17.577-10.416-10.416-20.832-25.39-31.248-44.919-7.812-14.323-23.436-31.249-46.871-50.779z" />
-    </svg>
-  );
-}
diff --git a/libs/logos/src/socials/TelegramLogo.tsx b/libs/logos/src/socials/TelegramLogo.tsx
deleted file mode 100644
index f540275e40..0000000000
--- a/libs/logos/src/socials/TelegramLogo.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-export function TelegramLogo() {
-  return (
-    <svg
-      width="28px"
-      height="28px"
-      viewBox="0 0 32 32"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path d="M29.919 6.163l-4.225 19.925c-0.319 1.406-1.15 1.756-2.331 1.094l-6.438-4.744-3.106 2.988c-0.344 0.344-0.631 0.631-1.294 0.631l0.463-6.556 11.931-10.781c0.519-0.462-0.113-0.719-0.806-0.256l-14.75 9.288-6.35-1.988c-1.381-0.431-1.406-1.381 0.288-2.044l24.837-9.569c1.15-0.431 2.156 0.256 1.781 2.013z" />
-    </svg>
-  );
-}
diff --git a/libs/logos/src/socials/TwitterLogo.tsx b/libs/logos/src/socials/TwitterLogo.tsx
deleted file mode 100644
index eef950676c..0000000000
--- a/libs/logos/src/socials/TwitterLogo.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export function TwitterLogo() {
-  return (
-    <svg viewBox="-21 -81 681.335 681" xmlns="http://www.w3.org/2000/svg">
-      <path d="M200.965 515.293c241.05 0 372.87-199.703 372.87-372.871 0-5.672-.116-11.32-.37-16.938a266.692 266.692 0 0065.37-67.863c-23.48 10.441-48.753 17.461-75.257 20.637 27.055-16.23 47.828-41.895 57.625-72.488a262.838 262.838 0 01-83.215 31.808c-23.914-25.473-57.965-41.402-95.664-41.402-72.367 0-131.058 58.687-131.058 131.031 0 10.29 1.152 20.29 3.398 29.883C205.746 151.61 109.16 99.465 44.531 20.168 33.281 39.531 26.79 62.031 26.79 86.039c0 45.461 23.137 85.606 58.316 109.082-21.5-.66-41.695-6.562-59.351-16.387-.02.551-.02 1.086-.02 1.672 0 63.469 45.172 116.461 105.145 128.469a131.531 131.531 0 01-34.559 4.61c-8.43 0-16.648-.829-24.632-2.364 16.683 52.07 65.066 89.961 122.425 91.024-44.855 35.156-101.36 56.097-162.77 56.097-10.562 0-21.003-.605-31.261-1.816 58 37.176 126.871 58.87 200.887 58.87" />
-    </svg>
-  );
-}
diff --git a/libs/logos/src/socials/index.ts b/libs/logos/src/socials/index.ts
deleted file mode 100644
index 03fd288bd5..0000000000
--- a/libs/logos/src/socials/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './CommonWealthLogo';
-export * from './DiscordLogo';
-export * from './GithubLogo';
-export * from './TelegramLogo';
-export * from './TwitterLogo';
diff --git a/libs/logos/src/wallets/MetaMaskLogo.tsx b/libs/logos/src/wallets/MetaMaskLogo.tsx
deleted file mode 100644
index d856832151..0000000000
--- a/libs/logos/src/wallets/MetaMaskLogo.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-export const MetaMaskLogo = () => {
-  return (
-    <svg
-      id="prefix__Layer_1"
-      xmlns="http://www.w3.org/2000/svg"
-      x={0}
-      y={0}
-      viewBox="0 0 318.6 318.6"
-      xmlSpace="preserve"
-    >
-      <style>
-        {
-          '.prefix__st1,.prefix__st2,.prefix__st3,.prefix__st4,.prefix__st5,.prefix__st6,.prefix__st9{fill:#e4761b;stroke:#e4761b;strokeLinecap:round;strokeLinejoin:round}.prefix__st2,.prefix__st3,.prefix__st4,.prefix__st5,.prefix__st6,.prefix__st9{fill:#d7c1b3;stroke:#d7c1b3}.prefix__st3,.prefix__st4,.prefix__st5,.prefix__st6,.prefix__st9{fill:#233447;stroke:#233447}.prefix__st4,.prefix__st5,.prefix__st6,.prefix__st9{fill:#cd6116;stroke:#cd6116}.prefix__st5,.prefix__st6,.prefix__st9{fill:#e4751f;stroke:#e4751f}.prefix__st6,.prefix__st9{fill:#f6851b;stroke:#f6851b}.prefix__st9{fill:#763d16;stroke:#763d16}'
-        }
-      </style>
-      <path
-        fill="#e2761b"
-        stroke="#e2761b"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        d="M274.1 35.5l-99.5 73.9L193 65.8z"
-      />
-      <path
-        className="prefix__st1"
-        d="M44.4 35.5l98.7 74.6-17.5-44.3zM238.3 206.8l-26.5 40.6 56.7 15.6 16.3-55.3zM33.9 207.7L50.1 263l56.7-15.6-26.5-40.6z"
-      />
-      <path
-        className="prefix__st1"
-        d="M103.6 138.2l-15.8 23.9 56.3 2.5-2-60.5zM214.9 138.2l-39-34.8-1.3 61.2 56.2-2.5zM106.8 247.4l33.8-16.5-29.2-22.8zM177.9 230.9l33.9 16.5-4.7-39.3z"
-      />
-      <path
-        className="prefix__st2"
-        d="M211.8 247.4l-33.9-16.5 2.7 22.1-.3 9.3zM106.8 247.4l31.5 14.9-.2-9.3 2.5-22.1z"
-      />
-      <path
-        className="prefix__st3"
-        d="M138.8 193.5l-28.2-8.3 19.9-9.1zM179.7 193.5l8.3-17.4 20 9.1z"
-      />
-      <path
-        className="prefix__st4"
-        d="M106.8 247.4l4.8-40.6-31.3.9zM207 206.8l4.8 40.6 26.5-39.7zM230.8 162.1l-56.2 2.5 5.2 28.9 8.3-17.4 20 9.1zM110.6 185.2l20-9.1 8.2 17.4 5.3-28.9-56.3-2.5z"
-      />
-      <g>
-        <path
-          className="prefix__st5"
-          d="M87.8 162.1l23.6 46-.8-22.9zM208.1 185.2l-1 22.9 23.7-46zM144.1 164.6l-5.3 28.9 6.6 34.1 1.5-44.9zM174.6 164.6l-2.7 18 1.2 45 6.7-34.1z"
-        />
-      </g>
-      <path
-        className="prefix__st6"
-        d="M179.8 193.5l-6.7 34.1 4.8 3.3 29.2-22.8 1-22.9zM110.6 185.2l.8 22.9 29.2 22.8 4.8-3.3-6.6-34.1z"
-      />
-      <path
-        fill="#c0ad9e"
-        stroke="#c0ad9e"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        d="M180.3 262.3l.3-9.3-2.5-2.2h-37.7l-2.3 2.2.2 9.3-31.5-14.9 11 9 22.3 15.5h38.3l22.4-15.5 11-9z"
-      />
-      <path
-        fill="#161616"
-        stroke="#161616"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        d="M177.9 230.9l-4.8-3.3h-27.7l-4.8 3.3-2.5 22.1 2.3-2.2h37.7l2.5 2.2z"
-      />
-      <g>
-        <path
-          className="prefix__st9"
-          d="M278.3 114.2l8.5-40.8-12.7-37.9-96.2 71.4 37 31.3 52.3 15.3 11.6-13.5-5-3.6 8-7.3-6.2-4.8 8-6.1zM31.8 73.4l8.5 40.8-5.4 4 8 6.1-6.1 4.8 8 7.3-5 3.6 11.5 13.5 52.3-15.3 37-31.3-96.2-71.4z"
-        />
-      </g>
-      <path
-        className="prefix__st6"
-        d="M267.2 153.5l-52.3-15.3 15.9 23.9-23.7 46 31.2-.4h46.5zM103.6 138.2l-52.3 15.3-17.4 54.2h46.4l31.1.4-23.6-46zM174.6 164.6l3.3-57.7 15.2-41.1h-67.5l15 41.1 3.5 57.7 1.2 18.2.1 44.8h27.7l.2-44.8z"
-      />
-    </svg>
-  );
-};
diff --git a/libs/logos/src/wallets/PolkaLogo.tsx b/libs/logos/src/wallets/PolkaLogo.tsx
deleted file mode 100644
index 7f7ea35dad..0000000000
--- a/libs/logos/src/wallets/PolkaLogo.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-export const PolkaLogo = () => {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="15 15 140 140"
-      style={{
-        zoom: 1,
-      }}
-    >
-      <circle cx={85} cy={85} r={70} fill="#ff8c00" />
-      <path
-        d="M85 34.7c-20.8 0-37.8 16.9-37.8 37.8 0 4.2.7 8.3 2 12.3.9 2.7 3.9 4.2 6.7 3.3 2.7-.9 4.2-3.9 3.3-6.7-1.1-3.1-1.6-6.4-1.5-9.7.4-14.1 11.8-25.7 25.9-26.4 15.7-.8 28.7 11.7 28.7 27.2 0 14.5-11.4 26.4-25.7 27.2 0 0-5.3.3-7.9.7-1.3.2-2.3.4-3 .5-.3.1-.6-.2-.5-.5l.9-4.4L81 73.4c.6-2.8-1.2-5.6-4-6.2-2.8-.6-5.6 1.2-6.2 4 0 0-11.8 55-11.9 55.6-.6 2.8 1.2 5.6 4 6.2 2.8.6 5.6-1.2 6.2-4 .1-.6 1.7-7.9 1.7-7.9 1.2-5.6 5.8-9.7 11.2-10.4 1.2-.2 5.9-.5 5.9-.5 19.5-1.5 34.9-17.8 34.9-37.7 0-20.9-17-37.8-37.8-37.8zm2.7 87c-3.4-.7-6.8 1.4-7.5 4.9-.7 3.4 1.4 6.8 4.9 7.5 3.4.7 6.8-1.4 7.5-4.9.7-3.5-1.4-6.8-4.9-7.5z"
-        fill="#fff"
-      />
-    </svg>
-  );
-};
diff --git a/libs/logos/src/wallets/SubWalletLogo.tsx b/libs/logos/src/wallets/SubWalletLogo.tsx
deleted file mode 100644
index 21f7861246..0000000000
--- a/libs/logos/src/wallets/SubWalletLogo.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import React from 'react';
-
-export const SubWalletLogo: React.FC<React.SVGProps<SVGSVGElement>> = () => {
-  return (
-    <svg
-      width="134"
-      height="134"
-      viewBox="0 0 134 134"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <mask
-        id="mask0_699_5101"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="134"
-        height="134"
-      >
-        <rect width="134" height="134" fill="#C4C4C4" />
-      </mask>
-      <g mask="url(#mask0_699_5101)">
-        <path
-          d="M87.9615 64.3201L87.9456 47.7455L27.1191 16.2236V64.3041L66.0589 85.106L80.2884 78.8367L37.4403 56.1046L37.4722 37.887L87.9615 64.3201Z"
-          fill="url(#paint0_linear_699_5101)"
-        />
-        <path
-          d="M50.7607 44.8421V50.5052L37.3926 56.2321L37.4883 37.6636L50.7607 44.8421Z"
-          fill="url(#paint1_linear_699_5101)"
-        />
-        <path
-          d="M50.8095 91.822L80.2895 78.8368L37.4414 56.2163L50.6819 50.5054L105.765 79.2835L50.9212 103.212L50.8095 91.822Z"
-          fill="url(#paint2_linear_699_5101)"
-        />
-        <path
-          d="M37.4886 87.9773L50.6493 82.2982L50.9365 103.196L105.765 79.2832V97.118L37.377 127.077L37.4886 87.9773Z"
-          fill="url(#paint3_linear_699_5101)"
-        />
-        <path
-          d="M27.1191 82.5857L37.4403 87.9776L37.3765 127.013L27.1191 121.86V82.5857Z"
-          fill="url(#paint4_linear_699_5101)"
-        />
-        <path
-          d="M40.1522 76.7791L50.6489 82.2986L37.4403 87.9776L27.1191 82.5857L40.1522 76.7791Z"
-          fill="url(#paint5_linear_699_5101)"
-        />
-        <path
-          d="M105.765 56.5993L105.702 39.9131L87.9785 47.7457V64.3362L105.765 56.5993Z"
-          fill="url(#paint6_linear_699_5101)"
-        />
-        <path
-          d="M27.1191 16.2237L45.0337 7.97632L105.732 39.8811L87.9775 47.7456L27.1191 16.2237Z"
-          fill="url(#paint7_linear_699_5101)"
-        />
-      </g>
-      <defs>
-        <linearGradient
-          id="paint0_linear_699_5101"
-          x1="11.9006"
-          y1="50.6648"
-          x2="119.372"
-          y2="50.6648"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#FFD4B2" />
-          <stop offset="0.36" stopColor="#9ACEB7" />
-          <stop offset="0.67" stopColor="#47C8BB" />
-          <stop offset="0.89" stopColor="#14C5BE" />
-          <stop offset="1" stopColor="#00C4BF" />
-        </linearGradient>
-        <linearGradient
-          id="paint1_linear_699_5101"
-          x1="44.0766"
-          y1="62.8524"
-          x2="44.0766"
-          y2="21.2167"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#00FECF" />
-          <stop offset="0.08" stopColor="#00E5D0" />
-          <stop offset="0.24" stopColor="#00A5D1" />
-          <stop offset="0.48" stopColor="#0040D4" />
-          <stop offset="0.54" stopColor="#0025D5" />
-          <stop offset="1" />
-        </linearGradient>
-        <linearGradient
-          id="paint2_linear_699_5101"
-          x1="37.4414"
-          y1="76.8587"
-          x2="146.891"
-          y2="76.8587"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#FDEC9F" />
-          <stop offset="0.08" stopColor="#E4D8A4" />
-          <stop offset="0.24" stopColor="#A4A6B2" />
-          <stop offset="0.47" stopColor="#3F57C8" />
-          <stop offset="0.61" stopColor="#0025D5" />
-          <stop offset="1" />
-        </linearGradient>
-        <linearGradient
-          id="paint3_linear_699_5101"
-          x1="15.0596"
-          y1="103.18"
-          x2="155.01"
-          y2="103.18"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop offset="0.05" stopColor="#62A5FF" />
-          <stop offset="0.45" stopColor="#1032D1" />
-          <stop offset="1" />
-        </linearGradient>
-        <linearGradient
-          id="paint4_linear_699_5101"
-          x1="628.741"
-          y1="3244.93"
-          x2="797.782"
-          y2="3247.12"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#FFD4B2" />
-          <stop offset="0.36" stopColor="#9ACEB7" />
-          <stop offset="0.67" stopColor="#47C8BB" />
-          <stop offset="0.89" stopColor="#14C5BE" />
-          <stop offset="1" stopColor="#00C4BF" />
-        </linearGradient>
-        <linearGradient
-          id="paint5_linear_699_5101"
-          x1="24.5987"
-          y1="82.3783"
-          x2="72.5834"
-          y2="82.3783"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#00FECF" />
-          <stop offset="0.08" stopColor="#00E5D0" />
-          <stop offset="0.25" stopColor="#00A5D1" />
-          <stop offset="0.49" stopColor="#0040D4" />
-          <stop offset="0.56" stopColor="#0025D5" />
-        </linearGradient>
-        <linearGradient
-          id="paint6_linear_699_5101"
-          x1="70.9573"
-          y1="52.5952"
-          x2="189.069"
-          y2="50.4576"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#00FECF" />
-          <stop offset="0.05" stopColor="#00E5D0" />
-          <stop offset="0.15" stopColor="#00A5D1" />
-          <stop offset="0.29" stopColor="#0040D4" />
-          <stop offset="0.33" stopColor="#0025D5" />
-        </linearGradient>
-        <linearGradient
-          id="paint7_linear_699_5101"
-          x1="27.1191"
-          y1="27.8689"
-          x2="173.642"
-          y2="27.8689"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#FFD4AF" />
-          <stop offset="0.1" stopColor="#E6D5BA" />
-          <stop offset="0.31" stopColor="#A7D6D5" />
-          <stop offset="0.61" stopColor="#43D9FF" />
-          <stop offset="0.63" stopColor="#37B1D0" />
-          <stop offset="0.65" stopColor="#2B8CA5" />
-          <stop offset="0.67" stopColor="#216B7D" />
-          <stop offset="0.7" stopColor="#184E5B" />
-          <stop offset="0.72" stopColor="#10353F" />
-          <stop offset="0.75" stopColor="#0A2228" />
-          <stop offset="0.78" stopColor="#061316" />
-          <stop offset="0.82" stopColor="#020809" />
-          <stop offset="0.88" stopColor="#010202" />
-          <stop offset="1" />
-        </linearGradient>
-      </defs>
-    </svg>
-  );
-};
diff --git a/libs/logos/src/wallets/TalismanLogo.tsx b/libs/logos/src/wallets/TalismanLogo.tsx
deleted file mode 100644
index 607a878fca..0000000000
--- a/libs/logos/src/wallets/TalismanLogo.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-
-export const TalismanLogo: React.FC<React.SVGProps<SVGSVGElement>> = (
-  props
-) => {
-  return (
-    <svg
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      {...props}
-    >
-      <rect width="24" height="24" rx="4" fill="#D5FF5C" />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M16.5349 12.9159C16.6871 13.2472 17.135 13.3643 17.3929 13.1065L17.8651 12.6345C18.3535 12.1464 19.1453 12.1464 19.6337 12.6345C20.1221 13.1227 20.1221 13.9141 19.6337 14.4023L15.8097 18.2246C14.8921 19.3104 13.5198 20 11.9865 20C10.3851 20 8.95942 19.2478 8.04385 18.0777L4.36629 14.4018C3.87791 13.9136 3.87791 13.1222 4.36629 12.634C4.85467 12.1459 5.64649 12.1459 6.13487 12.634L6.60044 13.0994C6.85253 13.3514 7.29002 13.238 7.43894 12.9141V12.9141C7.46838 12.8501 7.48439 12.7814 7.48439 12.711L7.48438 7.00059C7.48438 6.30991 8.04428 5.75001 8.73496 5.75001C9.42563 5.75001 9.98553 6.30991 9.98553 7.00058L9.98553 9.88892C9.98553 10.1376 10.2403 10.3065 10.4774 10.2315V10.2315C10.6276 10.1841 10.736 10.0474 10.736 9.89001L10.736 5.25041C10.736 4.55974 11.2959 3.99984 11.9866 3.99984C12.6773 3.99984 13.2372 4.55974 13.2372 5.25041L13.2372 9.89018C13.2372 10.0476 13.3456 10.1842 13.4957 10.2316V10.2316C13.7327 10.3065 13.9874 10.1377 13.9874 9.88909L13.9874 7.00059C13.9874 6.30991 14.5473 5.75001 15.2379 5.75001C15.9286 5.75001 16.4885 6.30991 16.4885 7.00058L16.4885 12.7086C16.4885 12.7805 16.5049 12.8506 16.5349 12.9159V12.9159Z"
-        fill="#FD4848"
-      />
-      <path
-        d="M15.9885 15.5C15.9885 15.5 14.1969 18 11.9867 18C9.77655 18 7.98486 15.5 7.98486 15.5C7.98486 15.5 9.77655 13 11.9867 13C14.1969 13 15.9885 15.5 15.9885 15.5Z"
-        fill="#D5FF5C"
-      />
-      <path
-        d="M13.8543 15.5C13.8543 16.5311 13.018 17.3671 11.9863 17.3671C10.9545 17.3671 10.1183 16.5311 10.1183 15.5C10.1183 14.4689 10.9545 13.6329 11.9863 13.6329C13.018 13.6329 13.8543 14.4689 13.8543 15.5Z"
-        stroke="#FD4848"
-        strokeWidth="0.265831"
-      />
-      <path
-        d="M13.1041 15.5C13.1041 16.1169 12.6037 16.6171 11.9864 16.6171C11.3691 16.6171 10.8688 16.1169 10.8688 15.5C10.8688 14.8831 11.3691 14.3829 11.9864 14.3829C12.6037 14.3829 13.1041 14.8831 13.1041 15.5Z"
-        stroke="#FD4848"
-        strokeWidth="0.265831"
-      />
-      <path
-        d="M14.605 15.5C14.605 16.9453 13.4327 18.1171 11.9866 18.1171C10.5405 18.1171 9.36827 16.9453 9.36827 15.5C9.36827 14.0547 10.5405 12.8829 11.9866 12.8829C13.4327 12.8829 14.605 14.0547 14.605 15.5Z"
-        stroke="#FD4848"
-        strokeWidth="0.265831"
-      />
-      <path
-        d="M15.3552 15.5C15.3552 17.3595 13.847 18.8671 11.9865 18.8671C10.1259 18.8671 8.61778 17.3595 8.61778 15.5C8.61778 13.6405 10.1259 12.1329 11.9865 12.1329C13.847 12.1329 15.3552 13.6405 15.3552 15.5Z"
-        stroke="#FD4848"
-        strokeWidth="0.265831"
-      />
-      <path
-        d="M12.3534 15.5C12.3534 15.7027 12.1891 15.8671 11.9863 15.8671C11.7836 15.8671 11.6192 15.7027 11.6192 15.5C11.6192 15.2973 11.7836 15.1329 11.9863 15.1329C12.1891 15.1329 12.3534 15.2973 12.3534 15.5Z"
-        fill="#162BEB"
-        stroke="#FD4848"
-        strokeWidth="0.265831"
-      />
-      <ellipse cx="11.9863" cy="15.5" rx="0.5" ry="0.5" fill="#FD4848" />
-      <mask id="path-10-inside-1_4684_17034" fill="white">
-        <path d="M15.9885 15.5C15.9885 15.5 14.1969 18 11.9867 18C9.77655 18 7.98486 15.5 7.98486 15.5C7.98486 15.5 9.77655 13 11.9867 13C14.1969 13 15.9885 15.5 15.9885 15.5Z" />
-      </mask>
-      <path
-        d="M15.9885 15.5C15.9885 15.5 14.1969 18 11.9867 18C9.77655 18 7.98486 15.5 7.98486 15.5C7.98486 15.5 9.77655 13 11.9867 13C14.1969 13 15.9885 15.5 15.9885 15.5Z"
-        stroke="#D5FF5C"
-        strokeWidth="0.531663"
-        mask="url(#path-10-inside-1_4684_17034)"
-      />
-    </svg>
-  );
-};
diff --git a/libs/logos/src/wallets/WalletConnectLogo.tsx b/libs/logos/src/wallets/WalletConnectLogo.tsx
deleted file mode 100644
index b04e7088d6..0000000000
--- a/libs/logos/src/wallets/WalletConnectLogo.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-export const WalletConnectLogo = () => {
-  return (
-    <svg viewBox="0 0 300 185" version="1.1">
-      <g
-        id="Page-1"
-        stroke="none"
-        strokeWidth="1"
-        fill="none"
-        fillRule="evenodd"
-      >
-        <g id="walletconnect-logo-alt" fill="#3B99FC" fillRule="nonzero">
-          <path
-            d="M61.4385429,36.2562612 C110.349767,-11.6319051 189.65053,-11.6319051 238.561752,36.2562612 L244.448297,42.0196786 C246.893858,44.4140867 246.893858,48.2961898 244.448297,50.690599 L224.311602,70.406102 C223.088821,71.6033071 221.106302,71.6033071 219.883521,70.406102 L211.782937,62.4749541 C177.661245,29.0669724 122.339051,29.0669724 88.2173582,62.4749541 L79.542302,70.9685592 C78.3195204,72.1657633 76.337001,72.1657633 75.1142214,70.9685592 L54.9775265,51.2530561 C52.5319653,48.8586469 52.5319653,44.9765439 54.9775265,42.5821357 L61.4385429,36.2562612 Z M280.206339,77.0300061 L298.128036,94.5769031 C300.573585,96.9713 300.573599,100.85338 298.128067,103.247793 L217.317896,182.368927 C214.872352,184.763353 210.907314,184.76338 208.461736,182.368989 C208.461726,182.368979 208.461714,182.368967 208.461704,182.368957 L151.107561,126.214385 C150.496171,125.615783 149.504911,125.615783 148.893521,126.214385 C148.893517,126.214389 148.893514,126.214393 148.89351,126.214396 L91.5405888,182.368927 C89.095052,184.763359 85.1300133,184.763399 82.6844276,182.369014 C82.6844133,182.369 82.684398,182.368986 82.6843827,182.36897 L1.87196327,103.246785 C-0.573596939,100.852377 -0.573596939,96.9702735 1.87196327,94.5758653 L19.7936929,77.028998 C22.2392531,74.6345898 26.2042918,74.6345898 28.6498531,77.028998 L86.0048306,133.184355 C86.6162214,133.782957 87.6074796,133.782957 88.2188704,133.184355 C88.2188796,133.184346 88.2188878,133.184338 88.2188969,133.184331 L145.571,77.028998 C148.016505,74.6345347 151.981544,74.6344449 154.427161,77.028798 C154.427195,77.0288316 154.427229,77.0288653 154.427262,77.028899 L211.782164,133.184331 C212.393554,133.782932 213.384814,133.782932 213.996204,133.184331 L271.350179,77.0300061 C273.79574,74.6355969 277.760778,74.6355969 280.206339,77.0300061 Z"
-            id="WalletConnect"
-          ></path>
-        </g>
-      </g>
-    </svg>
-  );
-};
diff --git a/libs/logos/src/wallets/index.ts b/libs/logos/src/wallets/index.ts
deleted file mode 100644
index 8019e94cd5..0000000000
--- a/libs/logos/src/wallets/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './SubWalletLogo';
-export * from './TalismanLogo';
-export * from './MetaMaskLogo';
-export * from './PolkaLogo';
-export * from './WalletConnectLogo';
diff --git a/libs/logos/tsconfig.json b/libs/logos/tsconfig.json
deleted file mode 100644
index 766824cfd3..0000000000
--- a/libs/logos/tsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "esModuleInterop": false,
-    "allowJs": true,
-    "skipLibCheck": true,
-    "jsx": "react-jsx",
-    "downlevelIteration": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/libs/logos/tsconfig.lib.json b/libs/logos/tsconfig.lib.json
deleted file mode 100644
index 7bfc80f73e..0000000000
--- a/libs/logos/tsconfig.lib.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "declaration": true,
-    "types": ["node"]
-  },
-  "include": ["**/*.ts"],
-  "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
-}
diff --git a/libs/logos/tsconfig.spec.json b/libs/logos/tsconfig.spec.json
deleted file mode 100644
index 546f12877f..0000000000
--- a/libs/logos/tsconfig.spec.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
-  },
-  "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
-}
diff --git a/libs/note-manager/src/note-manager.ts b/libs/note-manager/src/note-manager.ts
index 47f50c8143..a8ddbb31e5 100644
--- a/libs/note-manager/src/note-manager.ts
+++ b/libs/note-manager/src/note-manager.ts
@@ -5,6 +5,8 @@ import {
   NoteStorage,
   resetNoteStorage,
 } from '@webb-tools/browser-utils/storage';
+import { ZERO_BIG_INT } from '@webb-tools/dapp-config';
+import { parseUnits } from 'viem';
 import Storage from '@webb-tools/dapp-types/Storage';
 import {
   CircomUtxo,
@@ -17,7 +19,6 @@ import {
 } from '@webb-tools/sdk-core';
 import { hexToU8a } from '@webb-tools/utils';
 import { Backend } from '@webb-tools/wasm-utils';
-import { ethers } from 'ethers';
 import { BehaviorSubject } from 'rxjs';
 
 type DefaultNoteGenInput = Pick<
@@ -41,6 +42,13 @@ export class NoteManager {
 
   private isSyncingNoteSubject = new BehaviorSubject(false);
 
+  /**
+   * A subject that emits the progress of syncing notes.
+   * The value is a 2-decimal point percentage of the progress
+   * or NaN if the progress is not started.
+   */
+  private static syncNotesProgressSubject = new BehaviorSubject(NaN);
+
   static readonly defaultNoteGenInput: DefaultNoteGenInput = {
     curve: 'Bn254',
     denomination: '18',
@@ -137,23 +145,20 @@ export class NoteManager {
 
   // Trim the available notes to get the notes needed for a target amount.
   // It is assumed the notes passed are grouped for the same target and asset.
-  static getNotesFifo(
-    notes: Note[],
-    targetAmount: ethers.BigNumber
-  ): Note[] | null {
-    let currentAmount = ethers.BigNumber.from(0);
+  static getNotesFifo(notes: Note[], targetAmount: bigint): Note[] | null {
+    let currentAmount = ZERO_BIG_INT;
     const currentNotes: Note[] = [];
 
     for (const note of notes) {
-      if (currentAmount.gte(targetAmount)) {
+      if (currentAmount >= targetAmount) {
         break;
       }
 
-      currentAmount = currentAmount.add(note.note.amount);
+      currentAmount += BigInt(note.note.amount);
       currentNotes.push(note);
     }
 
-    return currentAmount.gte(targetAmount) ? currentNotes : null;
+    return currentAmount >= targetAmount ? currentNotes : null;
   }
 
   static keypairFromNote(note: Note): Keypair {
@@ -185,6 +190,18 @@ export class NoteManager {
     return NoteManager.defaultNoteGenInput;
   }
 
+  static get $syncNotesProgress() {
+    return this.syncNotesProgressSubject.asObservable();
+  }
+
+  static get syncNotesProgress() {
+    return this.syncNotesProgressSubject.getValue();
+  }
+
+  static set syncNotesProgress(value: number) {
+    this.syncNotesProgressSubject.next(value);
+  }
+
   getKeypair() {
     return this.keypair;
   }
@@ -199,11 +216,8 @@ export class NoteManager {
 
   // Return enough notes to satisfy the amount
   // Returns null if it cannot satisfy
-  getNotesForTransact(
-    resourceId: string,
-    amount: ethers.BigNumber
-  ): Note[] | null {
-    const currentAmount = ethers.BigNumber.from(0);
+  getNotesForTransact(resourceId: string, amount: bigint): Note[] | null {
+    let currentAmount = ZERO_BIG_INT;
     const currentNotes: Note[] = [];
 
     const availableNotes = this.notesMap.get(resourceId);
@@ -212,31 +226,28 @@ export class NoteManager {
       return null;
     }
 
-    while (currentAmount.lt(amount)) {
+    while (currentAmount < amount) {
       const currentNote = availableNotes.pop();
 
       if (!currentNote) {
         return null;
       }
 
-      currentAmount.add(currentNote.note.amount);
+      currentAmount += BigInt(currentNote.note.amount);
       currentNotes.push(currentNote);
     }
 
     return currentNotes;
   }
 
-  getWithdrawableAmount(
-    resourceId: string,
-    tokenName: string
-  ): ethers.BigNumber {
+  getWithdrawableAmount(resourceId: string, tokenName: string): bigint {
     const availableChainNotes = this.notesMap.get(resourceId);
-    const amount: ethers.BigNumber = ethers.BigNumber.from(0);
+    let amount = ZERO_BIG_INT;
 
     availableChainNotes
       ?.filter((note) => note.note.tokenSymbol === tokenName)
       .map((note) => {
-        amount.add(note.note.amount);
+        amount += BigInt(note.note.amount);
       });
 
     return amount;
@@ -338,16 +349,20 @@ export class NoteManager {
     destAnchorAddress: string,
     tokenSymbol: string,
     tokenDecimals: number,
-    amount: number
+    amount: number | bigint
   ): Promise<Note> {
-    const amountBigNumber = ethers.utils
-      .parseUnits(amount.toString(), tokenDecimals)
-      .toString();
+    let amountStr: string;
+
+    if (typeof amount === 'number') {
+      amountStr = parseUnits(amount.toString(), tokenDecimals).toString();
+    } else {
+      amountStr = amount.toString();
+    }
 
     const input: UtxoGenInput = {
       curve: this.defaultNoteGenInput.curve,
       backend,
-      amount: amountBigNumber,
+      amount: amountStr,
       originChainId: sourceTypedChainId.toString(),
       chainId: destTypedChainId.toString(),
       keypair: this.keypair,
@@ -359,7 +374,7 @@ export class NoteManager {
 
     const noteInput: NoteGenInput = {
       ...this.defaultNoteGenInput,
-      amount: amountBigNumber,
+      amount: amountStr,
       backend,
       secrets: [
         toFixedHex(destTypedChainId, 8).substring(2),
diff --git a/libs/polkadot-api-provider/src/types.ts b/libs/polkadot-api-provider/src/types.ts
index 59481fa0ee..df0858c2db 100644
--- a/libs/polkadot-api-provider/src/types.ts
+++ b/libs/polkadot-api-provider/src/types.ts
@@ -11,9 +11,9 @@ export interface IVAnchorPublicInputs {
 
 export interface Groth16Proof {
   proof: {
-    pi_a: string[];
-    pi_b: string[][];
-    pi_c: string[];
+    pi_a: [HexString, HexString];
+    pi_b: [[HexString, HexString], [HexString, HexString]];
+    pi_c: [HexString, HexString];
     curve: string;
     prococol: 'groth16';
   };
diff --git a/libs/polkadot-api-provider/src/utils/getVAnchorExtDataHash.ts b/libs/polkadot-api-provider/src/utils/getVAnchorExtDataHash.ts
index af120f4308..7d438f5461 100644
--- a/libs/polkadot-api-provider/src/utils/getVAnchorExtDataHash.ts
+++ b/libs/polkadot-api-provider/src/utils/getVAnchorExtDataHash.ts
@@ -1,30 +1,34 @@
 import { BN, u8aToHex } from '@polkadot/util';
-import { ensureHex } from '@webb-tools/dapp-config';
 import { IVariableAnchorExtData } from '@webb-tools/interfaces';
-import { FIELD_SIZE } from '@webb-tools/sdk-core';
-import { ethers } from 'ethers';
+import { FIELD_SIZE } from '@webb-tools/utils';
+import { encodeAbiParameters, keccak256, parseAbiParameters } from 'viem';
 
 const getVAnchorExtDataHash = (extData: IVariableAnchorExtData): bigint => {
   const tokenIdLE = new Uint8Array(
     new BN(BigInt(extData.token).toString()).toArray('le', 4) // 4 bytes
   );
 
-  const abi = new ethers.utils.AbiCoder();
-  const encodedData = abi.encode(
-    [
-      '(bytes recipient,int256 extAmount,bytes relayer,uint256 fee,uint256 refund,bytes token,bytes encryptedOutput1,bytes encryptedOutput2)',
-    ],
+  const encodedData = encodeAbiParameters(
+    parseAbiParameters(
+      '(bytes recipient,int256 extAmount,bytes relayer,uint256 fee,uint256 refund,bytes token,bytes encryptedOutput1,bytes encryptedOutput2)'
+    ),
     [
       {
-        ...extData,
+        recipient: `0x${extData.recipient.replace(/^0x/, '')}`,
+        extAmount: BigInt(extData.extAmount),
+        relayer: `0x${extData.relayer.replace(/^0x/, '')}`,
+        fee: BigInt(extData.fee),
+        refund: BigInt(extData.refund),
         token: u8aToHex(tokenIdLE), // AbiCoder encode bytes as little endian
+        encryptedOutput1: `0x${extData.encryptedOutput1.replace(/^0x/, '')}`,
+        encryptedOutput2: `0x${extData.encryptedOutput2.replace(/^0x/, '')}`,
       },
     ]
   );
 
-  const hash = ethers.utils.keccak256(encodedData);
+  const hash = keccak256(encodedData);
 
-  return BigInt(ensureHex(hash)) % FIELD_SIZE.toBigInt();
+  return BigInt(hash) % FIELD_SIZE.toBigInt();
 };
 
 export default getVAnchorExtDataHash;
diff --git a/libs/polkadot-api-provider/src/utils/groth16ProofToBytes.ts b/libs/polkadot-api-provider/src/utils/groth16ProofToBytes.ts
index 7004a61c02..1b597bcdba 100644
--- a/libs/polkadot-api-provider/src/utils/groth16ProofToBytes.ts
+++ b/libs/polkadot-api-provider/src/utils/groth16ProofToBytes.ts
@@ -1,7 +1,7 @@
-import { ethers } from 'ethers';
-import { Groth16Proof } from '../types';
-import * as snarkjs from 'snarkjs';
 import { hexToU8a } from '@webb-tools/utils';
+import * as snarkjs from 'snarkjs';
+import { encodeAbiParameters, parseAbiParameters } from 'viem';
+import { Groth16Proof } from '../types';
 
 async function groth16ProofToBytes(proof: Groth16Proof): Promise<Uint8Array> {
   const callData = await snarkjs.groth16.exportSolidityCallData(
@@ -14,18 +14,18 @@ async function groth16ProofToBytes(proof: Groth16Proof): Promise<Uint8Array> {
   const pi_b = parsedCalldata[1] as Groth16Proof['proof']['pi_b'];
   const pi_c = parsedCalldata[2] as Groth16Proof['proof']['pi_c'];
 
-  const abi = new ethers.utils.AbiCoder();
   const fnAbi = '(uint[2] a,uint[2][2] b,uint[2] c)';
-  const encodedData = abi.encode(
-    [fnAbi],
-    [
-      {
-        a: pi_a,
-        b: pi_b,
-        c: pi_c,
-      },
-    ]
-  );
+  const encodedData = encodeAbiParameters(parseAbiParameters(fnAbi), [
+    {
+      a: [BigInt(pi_a[0]), BigInt(pi_a[1])],
+      b: [
+        [BigInt(pi_b[0][0]), BigInt(pi_b[0][1])],
+        [BigInt(pi_b[1][0]), BigInt(pi_b[1][1])],
+      ],
+      c: [BigInt(pi_c[0]), BigInt(pi_c[1])],
+    },
+  ]);
+
   return hexToU8a(encodedData);
 }
 
diff --git a/libs/polkadot-api-provider/src/utils/substrateProviderFactory.ts b/libs/polkadot-api-provider/src/utils/substrateProviderFactory.ts
index ee6aa675b0..1e12c64ebd 100644
--- a/libs/polkadot-api-provider/src/utils/substrateProviderFactory.ts
+++ b/libs/polkadot-api-provider/src/utils/substrateProviderFactory.ts
@@ -1,6 +1,6 @@
 import { ApiPromise } from '@polkadot/api';
 import { executorWithTimeout } from '@webb-tools/browser-utils';
-import { chainsPopulated } from '@webb-tools/dapp-config';
+import { chainsConfig } from '@webb-tools/dapp-config/chains';
 import { PolkadotProvider } from '../ext-provider/polkadot-provider';
 
 const substrateProviderCache: { [typedChainId: number]: ApiPromise } = {};
@@ -13,7 +13,7 @@ const substrateProviderFactory = async (
     return cached;
   }
 
-  const chain = chainsPopulated[typedChainId];
+  const chain = chainsConfig[typedChainId];
   if (!chain) {
     throw new Error(`Chain not found for ${typedChainId}`); // Development error
   }
@@ -22,7 +22,7 @@ const substrateProviderFactory = async (
     new Promise<ApiPromise>((res, rej) => {
       PolkadotProvider.getApiPromise(
         '',
-        [chain.url],
+        Array.from(chain.rpcUrls.default.webSocket ?? []),
         (error) => {
           error.cancel();
           rej(error);
diff --git a/libs/polkadot-api-provider/src/webb-provider.ts b/libs/polkadot-api-provider/src/webb-provider.ts
index 0158648d5b..ee2c2aa0a5 100644
--- a/libs/polkadot-api-provider/src/webb-provider.ts
+++ b/libs/polkadot-api-provider/src/webb-provider.ts
@@ -12,7 +12,6 @@ import {
   RelayChainMethods,
   Transaction,
   TransactionState,
-  WasmFactory,
   WebbApiProvider,
   WebbMethods,
   WebbProviderEvents,
@@ -52,14 +51,13 @@ import { ZERO_BYTES32, ZkComponents, u8aToHex } from '@webb-tools/utils';
 import type { Backend } from '@webb-tools/wasm-utils';
 import { BehaviorSubject, Observable } from 'rxjs';
 
-import { VAnchor } from '@webb-tools/anchors';
 import {
   BridgeStorage,
   fetchVAnchorKeyFromAws,
   fetchVAnchorWasmFromAws,
 } from '@webb-tools/browser-utils';
 import Storage from '@webb-tools/dapp-types/Storage';
-import { providers } from 'ethers';
+import { PublicClient } from 'viem';
 import { PolkadotProvider } from './ext-provider';
 import { getLeaves } from './mt-utils';
 import { PolkaTXBuilder } from './transaction';
@@ -93,7 +91,7 @@ export class WebbPolkadot
 
   readonly backend: Backend = 'Circom';
 
-  private _newBlock = new BehaviorSubject<null | number>(null);
+  private _newBlock = new BehaviorSubject<null | bigint>(null);
 
   // Map to store the max edges for each tree id
   private readonly vAnchorMaxEdges = new Map<string, number>();
@@ -113,8 +111,7 @@ export class WebbPolkadot
     public readonly config: ApiConfig,
     readonly notificationHandler: NotificationHandler,
     private readonly provider: PolkadotProvider,
-    readonly accounts: AccountsAdapter<InjectedExtension, InjectedAccount>,
-    readonly wasmFactory: WasmFactory
+    readonly accounts: AccountsAdapter<InjectedExtension, InjectedAccount>
   ) {
     super();
 
@@ -267,7 +264,6 @@ export class WebbPolkadot
     relayerBuilder: PolkadotRelayerManager, // Webb Relayer builder for relaying withdraw
     apiConfig: ApiConfig, // The whole and current app configuration
     notification: NotificationHandler, // Notification handler that will be used for the provider
-    wasmFactory: WasmFactory, // A Factory Fn that wil return wasm worker that would be supplied eventually to the `sdk-core`
     typedChainId: number,
     wallet: Wallet // Current wallet to initialize
   ): Promise<WebbPolkadot> {
@@ -291,8 +287,7 @@ export class WebbPolkadot
       apiConfig,
       notification,
       provider,
-      accounts,
-      wasmFactory
+      accounts
     );
     /// check metadata update
     await instance.awaitMetaDataCheck();
@@ -314,8 +309,7 @@ export class WebbPolkadot
     notification: NotificationHandler, // Notification handler that will be used for the provider
     accounts: AccountsAdapter<InjectedExtension, InjectedAccount>,
     apiPromise: ApiPromise,
-    injectedExtension: InjectedExtension,
-    wasmFactory: WasmFactory
+    injectedExtension: InjectedExtension
   ): Promise<WebbPolkadot> {
     const provider = new PolkadotProvider(
       apiPromise,
@@ -336,8 +330,7 @@ export class WebbPolkadot
       ApiConfig,
       notification,
       provider,
-      accounts,
-      wasmFactory
+      accounts
     );
 
     await instance.ensureApiInterface();
@@ -366,16 +359,16 @@ export class WebbPolkadot
 
   private async listenerBlocks() {
     const block = await this.provider.api.query.system.number();
-    this._newBlock.next(block.toNumber());
+    this._newBlock.next(block.toBigInt());
     const sub = await this.provider.api.rpc.chain.subscribeFinalizedHeads(
       (header) => {
-        this._newBlock.next(header.number.toNumber());
+        this._newBlock.next(header.number.toBigInt());
       }
     );
     return sub;
   }
 
-  get newBlock(): Observable<number | null> {
+  get newBlock(): Observable<bigint | null> {
     return this._newBlock.asObservable();
   }
 
@@ -384,7 +377,7 @@ export class WebbPolkadot
   }
 
   async getVAnchorLeaves(
-    api: VAnchor | ApiPromise,
+    api: ApiPromise,
     storage: Storage<BridgeStorage>,
     options: {
       treeHeight: number;
@@ -398,10 +391,6 @@ export class WebbPolkadot
     provingLeaves: string[];
     commitmentIndex: number;
   }> {
-    if (api instanceof VAnchor) {
-      throw WebbError.from(WebbErrorCodes.UnsupportedProvider);
-    }
-
     const { treeHeight, targetRoot, commitment, treeId, palletId, tx } =
       options;
 
@@ -552,10 +541,14 @@ export class WebbPolkadot
 
   async getVAnchorMaxEdges(
     treeId: string,
-    provider?: ApiPromise | providers.Web3Provider
+    provider?: PublicClient | ApiPromise
   ): Promise<number> {
-    if (provider instanceof providers.Web3Provider) {
-      throw WebbError.from(WebbErrorCodes.UnsupportedProvider);
+    // If provider is not instance of ApiPromise, display error and use `this.api` instead
+    if (!(provider instanceof ApiPromise)) {
+      console.error(
+        '`provider` of the type `providers.Provider` is not supported in polkadot provider overriding to `this.api`'
+      );
+      provider = this.api;
     }
 
     const storedMaxEdges = this.vAnchorMaxEdges.get(treeId);
@@ -576,10 +569,13 @@ export class WebbPolkadot
 
   async getVAnchorLevels(
     treeId: string,
-    provider?: ApiPromise | providers.Web3Provider
+    provider?: PublicClient | ApiPromise
   ): Promise<number> {
-    if (provider instanceof providers.Web3Provider) {
-      throw WebbError.from(WebbErrorCodes.UnsupportedProvider);
+    if (!(provider instanceof ApiPromise)) {
+      console.error(
+        '`provider` of the type `providers.Provider` is not supported in polkadot provider overriding to `this.api`'
+      );
+      provider = this.api;
     }
 
     const storedLevels = this.vAnchorLevels.get(treeId);
diff --git a/libs/polkadot-api-provider/src/webb-provider/chain-query.ts b/libs/polkadot-api-provider/src/webb-provider/chain-query.ts
index 148ea0ebf5..1c748d59ef 100644
--- a/libs/polkadot-api-provider/src/webb-provider/chain-query.ts
+++ b/libs/polkadot-api-provider/src/webb-provider/chain-query.ts
@@ -16,9 +16,9 @@ export class PolkadotChainQuery extends ChainQuery<WebbPolkadot> {
     super(inner);
   }
 
-  async currentBlock(): Promise<number> {
+  async currentBlock(): Promise<bigint> {
     const block: SignedBlock = await this.inner.api.rpc.chain.getBlock();
-    return block.block.header.number.toNumber();
+    return block.block.header.number.toBigInt();
   }
 
   private getTokenBalanceByAssetId(assetId: string): Observable<string> {
diff --git a/libs/polkadot-api-provider/src/webb-provider/vanchor-actions.ts b/libs/polkadot-api-provider/src/webb-provider/vanchor-actions.ts
index 03e4da6975..8ca1bc69ec 100644
--- a/libs/polkadot-api-provider/src/webb-provider/vanchor-actions.ts
+++ b/libs/polkadot-api-provider/src/webb-provider/vanchor-actions.ts
@@ -32,28 +32,26 @@ import {
   ChainType,
   FIELD_SIZE,
   Keypair,
-  MerkleProof,
   MerkleTree,
   Note,
   ResourceId,
   Utxo,
   buildVariableWitnessCalculator,
-  generateVariableWitnessInput,
   parseTypedChainId,
   randomBN,
   toFixedHex,
 } from '@webb-tools/sdk-core';
 import { ZERO_ADDRESS, hexToU8a, u8aToHex } from '@webb-tools/utils';
 import BN from 'bn.js';
-import { formatUnits } from 'ethers/lib/utils';
 import { firstValueFrom } from 'rxjs';
 import * as snarkjs from 'snarkjs';
 
 import { ApiPromise } from '@polkadot/api';
 import { bridgeStorageFactory } from '@webb-tools/browser-utils';
+import { ZERO_BIG_INT } from '@webb-tools/dapp-config';
 import { IVariableAnchorExtData } from '@webb-tools/interfaces';
 import assert from 'assert';
-import { BigNumber } from 'ethers';
+import { formatUnits } from 'viem';
 import { getLeafIndex } from '../mt-utils';
 import { Groth16Proof, IVAnchorPublicInputs } from '../types';
 import { getVAnchorExtDataHash, groth16ProofToBytes } from '../utils';
@@ -78,7 +76,12 @@ export class PolkadotVAnchorActions extends VAnchorActions<
       throw WebbError.from(WebbErrorCodes.NoFungibleTokenAvailable);
     }
 
-    const api = await WebbPolkadot.getApiPromise(chain.url);
+    const endpoints = chain.rpcUrls.default.webSocket;
+    if (!endpoints || endpoints.length === 0) {
+      throw WebbError.from(WebbErrorCodes.NoEndpointsConfigured);
+    }
+
+    const api = await WebbPolkadot.getApiPromise(endpoints[0]);
     const treeId = Number(treeIdStr);
     if (isNaN(treeId)) {
       throw WebbError.from(WebbErrorCodes.NoFungibleTokenAvailable);
@@ -240,8 +243,8 @@ export class PolkadotVAnchorActions extends VAnchorActions<
     treeId: string,
     inputs: Utxo[],
     outputs: Utxo[],
-    fee: BN,
-    refund: BN,
+    fee: bigint,
+    refund: bigint,
     recipient: string,
     relayer: string,
     wrapUnwrapAssetId: string,
@@ -300,9 +303,7 @@ export class PolkadotVAnchorActions extends VAnchorActions<
 
     const txHash = await polkadotTx.call(activeAccount.address);
 
-    return {
-      transactionHash: txHash,
-    };
+    return ensureHex(txHash);
   }
 
   async isPairRegistered(
@@ -335,10 +336,12 @@ export class PolkadotVAnchorActions extends VAnchorActions<
    * @param addressOrTreeId the address or tree id of the tree
    */
   async getLeafIndex(
-    leaf: Uint8Array,
+    txHash: string,
+    note: Note,
     indexBeforeInsertion: number,
     addressOrTreeId: string
   ): Promise<bigint> {
+    const leaf = note.getLeaf();
     const treeId = Number(addressOrTreeId);
     const idx = await getLeafIndex(
       this.inner.api,
@@ -435,7 +438,6 @@ export class PolkadotVAnchorActions extends VAnchorActions<
     await this.checkHasBalance(payload, wrapUnwrapAssetId);
 
     const address = activeAccount.address;
-    const zeroBN = new BN(0);
 
     const depositUtxo = await utxoFromVAnchorNote(
       payload.note,
@@ -452,8 +454,8 @@ export class PolkadotVAnchorActions extends VAnchorActions<
       payload.note.sourceIdentifyingData,
       inputUtxos,
       [depositUtxo],
-      zeroBN,
-      zeroBN,
+      ZERO_BIG_INT,
+      ZERO_BIG_INT,
       address,
       address,
       wrapUnwrapAssetId,
@@ -474,14 +476,10 @@ export class PolkadotVAnchorActions extends VAnchorActions<
       this.inner.relayerManager.activeRelayer?.beneficiary ?? ZERO_ADDRESS;
 
     // Fee only applies if relayer is set
-    const actualFee = new BN(
-      relayer === ZERO_ADDRESS ? '0' : feeAmount.toString()
-    );
+    const actualFee = relayer === ZERO_ADDRESS ? ZERO_BIG_INT : feeAmount;
 
     // Refund only applies if relayer is set
-    const actualRefund = new BN(
-      relayer === ZERO_ADDRESS ? '0' : refundAmount.toString()
-    );
+    const actualRefund = relayer === ZERO_ADDRESS ? ZERO_BIG_INT : refundAmount;
 
     return Promise.resolve([
       tx, // tx
@@ -510,17 +508,14 @@ export class PolkadotVAnchorActions extends VAnchorActions<
       this.inner.relayerManager.activeRelayer?.beneficiary ?? ZERO_ADDRESS;
 
     // Fee only applies if relayer is set
-    const actualFee = new BN(
-      relayer === ZERO_ADDRESS ? '0' : feeAmount.toString()
-    );
-
+    const actualFee = relayer === ZERO_ADDRESS ? ZERO_BIG_INT : feeAmount;
     return Promise.resolve([
       tx, // tx
       notes[0].note.targetIdentifyingData, // contractAddress
       inputUtxos, // inputs
       [changeUtxo, transferUtxo], // outputs
       actualFee, // fee
-      new BN(0), // refund
+      ZERO_BIG_INT, // refund
       ZERO_ADDRESS, // recipient
       relayer, // relayer
       wrapUnwrapAssetId, // wrapUnwrapAssetId
@@ -534,7 +529,10 @@ export class PolkadotVAnchorActions extends VAnchorActions<
       this.inner.methods.chainQuery.tokenBalanceByAddress(wrapUnwrapAssetId)
     );
 
-    const amount = formatUnits(payload.note.amount, payload.note.denomination);
+    const amount = formatUnits(
+      BigInt(payload.note.amount),
+      +payload.note.denomination
+    );
 
     if (Number(balance) < Number(amount)) {
       const { chainId, chainType } = parseTypedChainId(
@@ -568,8 +566,8 @@ export class PolkadotVAnchorActions extends VAnchorActions<
     tx: Transaction<NewNotesTxResult>,
     inputs: Utxo[],
     outputs: Utxo[],
-    fee: BN,
-    refund: BN,
+    fee: bigint,
+    refund: bigint,
     recipient: string,
     relayer: string,
     wrapUnwrapAssetId: string,
@@ -748,11 +746,11 @@ export class PolkadotVAnchorActions extends VAnchorActions<
     levels: number,
     input: Utxo,
     leavesMap?: Uint8Array[]
-  ): MerkleProof {
+  ) {
     const tree = new MerkleTree(levels, leavesMap);
 
     let inputMerklePathIndices: number[];
-    let inputMerklePathElements: BigNumber[];
+    let inputMerklePathElements: bigint[];
 
     if (Number(input.amount) > 0) {
       if (input.index === undefined) {
@@ -768,12 +766,12 @@ export class PolkadotVAnchorActions extends VAnchorActions<
       if (leavesMap === undefined) {
         const path = tree.path(input.index);
         inputMerklePathIndices = path.pathIndices;
-        inputMerklePathElements = path.pathElements;
+        inputMerklePathElements = path.pathElements.map((x) => x.toBigInt());
       } else {
         const mt = new MerkleTree(levels, leavesMap);
         const path = mt.path(input.index);
         inputMerklePathIndices = path.pathIndices;
-        inputMerklePathElements = path.pathElements;
+        inputMerklePathElements = path.pathElements.map((x) => x.toBigInt());
       }
     } else {
       inputMerklePathIndices = new Array(tree.levels).fill(0);
@@ -781,10 +779,10 @@ export class PolkadotVAnchorActions extends VAnchorActions<
     }
 
     return {
-      element: BigNumber.from(u8aToHex(input.commitment)), // Temporary use of BigNumber
+      element: BigInt(u8aToHex(input.commitment)),
       pathElements: inputMerklePathElements,
       pathIndices: inputMerklePathIndices,
-      merkleRoot: tree.root(),
+      merkleRoot: tree.root().toBigInt(),
     };
   }
 
@@ -801,7 +799,7 @@ export class PolkadotVAnchorActions extends VAnchorActions<
   ) {
     const levels = await this.inner.getVAnchorLevels(treeId);
 
-    let vanchorMerkleProof: MerkleProof[];
+    let vanchorMerkleProof: Array<ReturnType<typeof this.getMerkleProof>>;
     if (Object.keys(leavesMap).length === 0) {
       vanchorMerkleProof = inputUtxos.map((u) =>
         this.getMerkleProof(levels, u)
@@ -813,18 +811,42 @@ export class PolkadotVAnchorActions extends VAnchorActions<
       );
     }
 
-    const witnessInput = generateVariableWitnessInput(
-      roots.map((r) => BigNumber.from(r)), // Temporary use of `BigNumber`, need to change to `BigInt`
-      typedChainId,
-      inputUtxos,
-      outputUtxos,
-      extAmount,
-      fee,
-      BigNumber.from(extDataHash), // Temporary use of `BigNumber`, need to change to `BigInt`
-      vanchorMerkleProof
-    );
+    const vanchorMerkleProofs = vanchorMerkleProof.map((proof) => ({
+      pathIndex: MerkleTree.calculateIndexFromPathIndices(proof.pathIndices),
+      pathElements: proof.pathElements,
+    }));
 
-    return witnessInput;
+    const fieldSize = FIELD_SIZE.toBigInt();
+
+    const input = {
+      roots: roots.map((x) => x.toString()),
+      chainID: typedChainId.toString(),
+      inputNullifier: inputUtxos.map((x) => ensureHex(x.nullifier)),
+      outputCommitment: outputUtxos.map((x) =>
+        BigInt(u8aToHex(x.commitment)).toString()
+      ),
+      publicAmount: ((extAmount - fee + fieldSize) % fieldSize).toString(),
+      extDataHash: extDataHash.toString(),
+      // data for 2 transaction inputs
+      inAmount: inputUtxos.map((x) => x.amount.toString()),
+      inPrivateKey: inputUtxos.map((x) => ensureHex(x.secret_key)),
+      inBlinding: inputUtxos.map((x) =>
+        BigInt(ensureHex(x.blinding)).toString()
+      ),
+      inPathIndices: vanchorMerkleProofs.map((x) => x.pathIndex),
+      inPathElements: vanchorMerkleProofs.map((x) => x.pathElements),
+      // data for 2 transaction outputs
+      outChainID: outputUtxos.map((x) => x.chainId),
+      outAmount: outputUtxos.map((x) => x.amount.toString()),
+      outPubkey: outputUtxos.map((x) =>
+        BigInt(x.getKeypair().getPubKey()).toString()
+      ),
+      outBlinding: outputUtxos.map((x) =>
+        BigInt(ensureHex(x.blinding)).toString()
+      ),
+    };
+
+    return input;
   }
 
   private async getSnarkJsWitness(
@@ -914,7 +936,12 @@ export class PolkadotVAnchorActions extends VAnchorActions<
     // Fetch leaves of the source chain if not already fetched
     if (!leavesMap[sourceTypedChainId]) {
       const sourceChainConfig = this.inner.config.chains[+sourceTypedChainId];
-      const sourceChainEndpoint = sourceChainConfig.url;
+      const sourceChainEndpoint =
+        sourceChainConfig.rpcUrls.default.webSocket?.[0];
+
+      if (!sourceChainEndpoint) {
+        throw WebbError.from(WebbErrorCodes.NoEndpointsConfigured);
+      }
 
       const api =
         String(this.inner.typedChainId) === sourceTypedChainId
@@ -999,11 +1026,11 @@ export class PolkadotVAnchorActions extends VAnchorActions<
   private getExtAmount(inputs: Utxo[], outputs: Utxo[], fee: bigint) {
     const outAmount = outputs.reduce(
       (sum, x) => sum + BigInt(x.amount),
-      BigInt(0)
+      ZERO_BIG_INT
     );
     const inAmount = inputs.reduce(
       (sum, x) => sum + BigInt(x.amount),
-      BigInt(0)
+      ZERO_BIG_INT
     );
 
     return fee + outAmount - inAmount;
diff --git a/libs/polkadot-api-provider/src/webb-provider/wrap-unwrap.ts b/libs/polkadot-api-provider/src/webb-provider/wrap-unwrap.ts
index 3370c3ecb2..96ec56fb5f 100644
--- a/libs/polkadot-api-provider/src/webb-provider/wrap-unwrap.ts
+++ b/libs/polkadot-api-provider/src/webb-provider/wrap-unwrap.ts
@@ -1,8 +1,8 @@
 // Copyright 2022 @webb-tools/
 // SPDX-License-Identifier: Apache-2.0
 
-import '@webb-tools/protocol-substrate-types';
 import '@webb-tools/api-derive';
+import '@webb-tools/protocol-substrate-types';
 
 import {
   Amount,
@@ -10,9 +10,8 @@ import {
   WrapUnwrap,
 } from '@webb-tools/abstract-api-provider/wrap-unwrap';
 import { WebbError, WebbErrorCodes } from '@webb-tools/dapp-types';
-import { BigNumber, ethers } from 'ethers';
 import { BehaviorSubject, lastValueFrom, Observable, Subject } from 'rxjs';
-
+import { parseUnits } from 'viem';
 import { WebbPolkadot } from '../webb-provider';
 
 export type PolkadotWrapPayload = Amount;
@@ -36,7 +35,7 @@ export class PolkadotWrapUnwrap extends WrapUnwrap<WebbPolkadot> {
       return false;
     }
 
-    const bnAmount = ethers.utils.parseUnits(
+    const bnAmount = parseUnits(
       amountNumber.toString(),
       wrappableToken.getDecimals()
     );
@@ -61,16 +60,16 @@ export class PolkadotWrapUnwrap extends WrapUnwrap<WebbPolkadot> {
     const userBalance = await lastValueFrom(
       this.inner.methods.chainQuery.tokenBalanceByAddress(wrappableTokenId)
     );
-    const enoughBalance = bnAmount.lte(BigNumber.from(userBalance));
+    const enoughBalance = bnAmount <= BigInt(userBalance);
     if (!enoughBalance) {
       return false;
     }
     const balance = await lastValueFrom(
       this.inner.methods.chainQuery.tokenBalanceByAddress(fungibleTokenId)
     );
-    const validBalanceAfterDeposit = bnAmount
-      .add(BigNumber.from(balance))
-      .gt(BigNumber.from(poolShareExistentialBalance));
+
+    const validBalanceAfterDeposit =
+      bnAmount + BigInt(balance) > BigInt(poolShareExistentialBalance);
     return validBalanceAfterDeposit;
   }
 
@@ -84,7 +83,7 @@ export class PolkadotWrapUnwrap extends WrapUnwrap<WebbPolkadot> {
       throw WebbError.from(WebbErrorCodes.NoFungibleTokenAvailable);
     }
 
-    const bnAmount = ethers.utils.parseUnits(
+    const bnAmount = parseUnits(
       amountNumber.toString(),
       wrappableToken.getDecimals()
     );
@@ -122,7 +121,7 @@ export class PolkadotWrapUnwrap extends WrapUnwrap<WebbPolkadot> {
       throw WebbError.from(WebbErrorCodes.NoFungibleTokenAvailable);
     }
 
-    const bnAmount = ethers.utils.parseUnits(
+    const bnAmount = parseUnits(
       amountNumber.toString(),
       wrappableToken.getDecimals()
     );
@@ -165,7 +164,7 @@ export class PolkadotWrapUnwrap extends WrapUnwrap<WebbPolkadot> {
       return false;
     }
 
-    const bnAmount = ethers.utils.parseUnits(
+    const bnAmount = parseUnits(
       amountNumber.toString(),
       wrappableToken.getDecimals()
     );
@@ -199,7 +198,7 @@ export class PolkadotWrapUnwrap extends WrapUnwrap<WebbPolkadot> {
     const userBalance = await lastValueFrom(
       this.inner.methods.chainQuery.tokenBalanceByAddress(fungibleTokenId)
     );
-    const enoughBalance = bnAmount.lte(BigNumber.from(userBalance));
+    const enoughBalance = bnAmount <= BigInt(userBalance);
     // User have enough balance to unwrap
     if (!enoughBalance) {
       return false;
@@ -208,9 +207,9 @@ export class PolkadotWrapUnwrap extends WrapUnwrap<WebbPolkadot> {
     const balance = await lastValueFrom(
       this.inner.methods.chainQuery.tokenBalanceByAddress(wrappableTokenId)
     );
-    const validBalanceAfterDeposit = bnAmount
-      .add(BigNumber.from(balance))
-      .gte(BigNumber.from(assetExistentialBalance));
+
+    const validBalanceAfterDeposit =
+      bnAmount + BigInt(balance) > BigInt(assetExistentialBalance);
     return validBalanceAfterDeposit;
   }
 
diff --git a/libs/react-hooks/src/currency/useBalancesFromNotes.tsx b/libs/react-hooks/src/currency/useBalancesFromNotes.tsx
index eaacfb1a85..861bbbcc1c 100644
--- a/libs/react-hooks/src/currency/useBalancesFromNotes.tsx
+++ b/libs/react-hooks/src/currency/useBalancesFromNotes.tsx
@@ -1,12 +1,11 @@
+import { Currency } from '@webb-tools/abstract-api-provider';
 import { useWebContext } from '@webb-tools/api-provider-environment';
+import { ensureHex } from '@webb-tools/dapp-config';
+import { CurrencyRole } from '@webb-tools/dapp-types';
 import { ResourceId, calculateTypedChainId } from '@webb-tools/sdk-core';
 import { hexToU8a } from '@webb-tools/utils';
-import { ethers } from 'ethers';
 import { useMemo } from 'react';
-
-import { Currency } from '@webb-tools/abstract-api-provider';
-import { ensureHex } from '@webb-tools/dapp-config';
-import { CurrencyRole } from '@webb-tools/dapp-types';
+import { formatUnits } from 'viem';
 import { useNoteAccount } from '../useNoteAccount';
 
 /**
@@ -75,9 +74,9 @@ export const useBalancesFromNotes = (): UseBalancesFromNotesReturnType => {
             // then create a new record with the amount of the note
             // on the current chain and return
             if (!existedRecord) {
-              const amount = +ethers.utils.formatUnits(
-                note.amount,
-                note.denomination
+              const amount = +formatUnits(
+                BigInt(note.amount),
+                +note.denomination
               );
 
               acc[fungible.id] = {
@@ -95,9 +94,9 @@ export const useBalancesFromNotes = (): UseBalancesFromNotesReturnType => {
             // then add the amount of the note to the existed amount
             // and return
             if (existedAmount) {
-              const amount = +ethers.utils.formatUnits(
-                note.amount,
-                note.denomination
+              const amount = +formatUnits(
+                BigInt(note.amount),
+                +note.denomination
               );
 
               acc[fungible.id] = {
@@ -111,9 +110,9 @@ export const useBalancesFromNotes = (): UseBalancesFromNotesReturnType => {
             // If the amount on the current chain does not exist
             // then create a new record with the amount of the note
             // on the current chain and return
-            const amount = +ethers.utils.formatUnits(
-              note.amount,
-              note.denomination
+            const amount = +formatUnits(
+              BigInt(note.amount),
+              +note.denomination
             );
 
             acc[fungible.id] = {
diff --git a/libs/react-hooks/src/currency/useCurrencies.tsx b/libs/react-hooks/src/currency/useCurrencies.tsx
index e9135730ff..bab740d6a9 100644
--- a/libs/react-hooks/src/currency/useCurrencies.tsx
+++ b/libs/react-hooks/src/currency/useCurrencies.tsx
@@ -22,7 +22,7 @@ export const useCurrencies = () => {
 
     const currentTypedChainId = calculateTypedChainId(
       activeChain.chainType,
-      activeChain.chainId
+      activeChain.id
     );
     const currencies = apiConfig.currencies ?? [];
 
@@ -52,7 +52,7 @@ export const useCurrencies = () => {
 
     const typedChainId = calculateTypedChainId(
       activeChain.chainType,
-      activeChain.chainId
+      activeChain.id
     );
 
     return Array.from(apiConfig.fungibleToWrappableMap.entries()).reduce(
diff --git a/libs/react-hooks/src/currency/useCurrenciesBalances.tsx b/libs/react-hooks/src/currency/useCurrenciesBalances.tsx
index 1e966837b8..b165b394ec 100644
--- a/libs/react-hooks/src/currency/useCurrenciesBalances.tsx
+++ b/libs/react-hooks/src/currency/useCurrenciesBalances.tsx
@@ -26,7 +26,7 @@ export const useCurrenciesBalances = (
     const subscriptions = currencies.map((currency) => {
       return activeApi.methods.chainQuery
         .tokenBalanceByCurrencyId(
-          calculateTypedChainId(activeChain.chainType, activeChain.chainId),
+          calculateTypedChainId(activeChain.chainType, activeChain.id),
           currency.id
         )
         .subscribe((currencyBalance) => {
diff --git a/libs/react-hooks/src/currency/useCurrencyBalance.tsx b/libs/react-hooks/src/currency/useCurrencyBalance.tsx
index d6e74cb572..aaf8ee2ed9 100644
--- a/libs/react-hooks/src/currency/useCurrencyBalance.tsx
+++ b/libs/react-hooks/src/currency/useCurrencyBalance.tsx
@@ -17,7 +17,7 @@ export const useCurrencyBalance = (
 
     const subscription = activeApi.methods.chainQuery
       .tokenBalanceByCurrencyId(
-        calculateTypedChainId(activeChain.chainType, activeChain.chainId),
+        calculateTypedChainId(activeChain.chainType, activeChain.id),
         currency.id,
         address
       )
diff --git a/libs/react-hooks/src/currency/useNativeCurrencyBalance.tsx b/libs/react-hooks/src/currency/useNativeCurrencyBalance.tsx
index 9a5fcc136a..2c819153e2 100644
--- a/libs/react-hooks/src/currency/useNativeCurrencyBalance.tsx
+++ b/libs/react-hooks/src/currency/useNativeCurrencyBalance.tsx
@@ -16,7 +16,7 @@ export const useNativeCurrencyBalance = () => {
 
     const typedChainId = calculateTypedChainId(
       activeChain.chainType,
-      activeChain.chainId
+      activeChain.id
     );
 
     const nativeCurrency = getNativeCurrencyFromConfig(
diff --git a/libs/react-hooks/src/currency/useNativeCurrencySymbol.tsx b/libs/react-hooks/src/currency/useNativeCurrencySymbol.tsx
index 7fa3075eec..3e8ec0d1d3 100644
--- a/libs/react-hooks/src/currency/useNativeCurrencySymbol.tsx
+++ b/libs/react-hooks/src/currency/useNativeCurrencySymbol.tsx
@@ -9,6 +9,6 @@ export const useNativeCurrencySymbol = () => {
       return '';
     }
 
-    return apiConfig.getNativeCurrencySymbol(activeChain.chainId);
+    return apiConfig.getNativeCurrencySymbol(activeChain.id);
   }, [activeChain, apiConfig]);
 };
diff --git a/libs/react-hooks/src/useNoteAccount.tsx b/libs/react-hooks/src/useNoteAccount.tsx
index 65c86d472f..b6605d1c18 100644
--- a/libs/react-hooks/src/useNoteAccount.tsx
+++ b/libs/react-hooks/src/useNoteAccount.tsx
@@ -1,10 +1,13 @@
 import { useWebContext } from '@webb-tools/api-provider-environment';
+import { NoteManager } from '@webb-tools/note-manager';
 import {
   calculateTypedChainId,
   Note,
   parseTypedChainId,
 } from '@webb-tools/sdk-core';
+import { isViemError } from '@webb-tools/web3-api-provider';
 import { Button, Typography, useWebbUI } from '@webb-tools/webb-ui-components';
+import { useObservableState } from 'observable-hooks';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { BehaviorSubject } from 'rxjs';
 
@@ -32,6 +35,11 @@ export type UseNoteAccountReturnType = {
    */
   isSyncingNote: boolean;
 
+  /**
+   * The sync notes progress
+   */
+  syncNotesProgress: number;
+
   /**
    * The sync notes function
    * @param onNewNotes the callback called when user click the link on the notification
@@ -85,6 +93,11 @@ export const useNoteAccount = (): UseNoteAccountReturnType => {
     setIsSuccessfullyCreatedNoteAccount,
   ] = useState(false);
 
+  const syncNotesProgress = useObservableState(
+    NoteManager.$syncNotesProgress,
+    NaN
+  );
+
   if (!isOpenNoteAccountModalSubject) {
     isOpenNoteAccountModalSubject = new BehaviorSubject(false);
   }
@@ -127,7 +140,7 @@ export const useNoteAccount = (): UseNoteAccountReturnType => {
         const chainNotes =
           await activeApi.methods.variableAnchor.actions.inner.syncNotesForKeypair(
             activeApi.state.activeBridge.targets[
-              calculateTypedChainId(activeChain.chainType, activeChain.chainId)
+              calculateTypedChainId(activeChain.chainType, activeChain.id)
             ],
             noteManager.getKeypair()
           );
@@ -174,10 +187,17 @@ export const useNoteAccount = (): UseNoteAccountReturnType => {
           ),
         });
       } catch (error) {
+        let msg = 'Something went wrong while syncing notes';
+
+        if (isViemError(error)) {
+          msg = error.shortMessage;
+        }
+
         console.error('Error while syncing notes', error);
+        console.dir(error);
         notificationApi.addToQueue({
           variant: 'error',
-          message: 'Something went wrong while syncing notes',
+          message: msg,
         });
       } finally {
         noteManager.isSyncingNote = false;
@@ -262,6 +282,7 @@ export const useNoteAccount = (): UseNoteAccountReturnType => {
     isOpenNoteAccountModal,
     isSuccessfullyCreatedNoteAccount,
     isSyncingNote,
+    syncNotesProgress,
     setOpenNoteAccountModal,
     setSuccessfullyCreatedNoteAccount,
     syncNotes: handleSyncNotes,
diff --git a/libs/react-hooks/src/useWallets.ts b/libs/react-hooks/src/useWallets.ts
index 9d9a4b4720..b57c102762 100644
--- a/libs/react-hooks/src/useWallets.ts
+++ b/libs/react-hooks/src/useWallets.ts
@@ -8,13 +8,17 @@ import { useEffect, useState } from 'react';
 export const useWallets = () => {
   const [wallets, setWallets] = useState<ManagedWallet[]>([]);
 
-  const { activeApi, activeChain, activeWallet, inactivateApi } =
+  const { activeApi, activeChain, activeWallet, apiConfig, inactivateApi } =
     useWebContext();
   useEffect(() => {
     let isSubscribed = true;
 
     const configureSelectedWallets = async () => {
-      const walletsFromActiveChain = Object.values(activeChain?.wallets ?? {});
+      const walletIds = Object.values(activeChain?.wallets ?? {});
+      const walletsFromActiveChain = walletIds.map(
+        (walletId) => apiConfig.wallets[walletId]
+      );
+
       const wallets = await Promise.all(
         walletsFromActiveChain.map(
           async ({ detect, ...walletConfig }): Promise<ManagedWallet> => {
@@ -60,7 +64,7 @@ export const useWallets = () => {
     return () => {
       isSubscribed = false;
     };
-  }, [activeChain, activeWallet, activeApi, inactivateApi]);
+  }, [activeChain, activeWallet, activeApi, inactivateApi, apiConfig.wallets]);
 
   return {
     wallets,
diff --git a/libs/relayer-manager-factory/src/relayer-manager-factory.ts b/libs/relayer-manager-factory/src/relayer-manager-factory.ts
index 5258f57d76..0a0321d48e 100644
--- a/libs/relayer-manager-factory/src/relayer-manager-factory.ts
+++ b/libs/relayer-manager-factory/src/relayer-manager-factory.ts
@@ -125,7 +125,6 @@ export class WebbRelayerManagerFactory {
         info,
         this.chainNameAdapter
       );
-      console.log('capabilities', capabilities);
       return capabilities;
     } catch (error) {
       console.error('Error fetching relayer info: ', error);
diff --git a/libs/web3-api-provider/src/VAnchor.ts b/libs/web3-api-provider/src/VAnchor.ts
new file mode 100644
index 0000000000..e7ad90888f
--- /dev/null
+++ b/libs/web3-api-provider/src/VAnchor.ts
@@ -0,0 +1,688 @@
+import { TransactionOptions, TransactionState } from '@webb-tools/anchors';
+import {
+  ERC20__factory,
+  TokenWrapper__factory,
+  VAnchorTree__factory,
+} from '@webb-tools/contracts';
+import { ZERO_BIG_INT, ensureHex } from '@webb-tools/dapp-config';
+import {
+  WebbError,
+  WebbErrorCodes,
+  checkNativeAddress,
+} from '@webb-tools/dapp-types';
+import {
+  CircomUtxo,
+  Keypair,
+  MerkleTree,
+  Utxo,
+  buildVariableWitnessCalculator,
+  randomBN,
+  toFixedHex,
+} from '@webb-tools/sdk-core';
+import {
+  FIELD_SIZE,
+  Proof,
+  VAnchorProofInputs,
+  ZERO_BYTES32,
+  ZkComponents,
+  getChainIdType,
+  hexToU8a,
+  u8aToHex,
+} from '@webb-tools/utils';
+import assert from 'assert';
+import merge from 'lodash/merge';
+import * as snarkjs from 'snarkjs';
+import {
+  Account,
+  Address,
+  GetContractReturnType,
+  Hash,
+  PublicClient,
+  TransactionRequestBase,
+  WalletClient,
+  encodeAbiParameters,
+  getContract,
+  keccak256,
+  parseAbiParameters,
+} from 'viem';
+
+type FullProof = {
+  proof: Proof;
+  publicSignals: string[11];
+};
+
+/**
+ * This class is mostly copy from the original VAnchor.ts
+ * from protocol-solidity repo and refactor to use viem.sh
+ */
+class VAnchor {
+  public readonly tree: MerkleTree;
+
+  // The depositHistory stores leafIndex => information to create proposals (new root)
+  public readonly depositHistory: Record<number, string>;
+
+  constructor(
+    public readonly publicClient: PublicClient,
+    public readonly contract: GetContractReturnType<
+      typeof VAnchorTree__factory.abi,
+      PublicClient
+    >,
+    public readonly treeHeight: number,
+    public readonly maxEdges: number,
+    public readonly fungibleToken: Address,
+    public readonly smallCircuitZkComponents: ZkComponents,
+    public readonly largeCircuitZkComponents: ZkComponents
+  ) {
+    this.tree = new MerkleTree(treeHeight);
+    this.depositHistory = {};
+  }
+
+  public static async connect(
+    address: Address,
+    smallCircuitZkComponents: ZkComponents,
+    largeCircuitZkComponents: ZkComponents,
+    publicClient: PublicClient
+  ) {
+    const vAnchorContract = getContract({
+      address: address,
+      abi: VAnchorTree__factory.abi,
+      publicClient,
+    });
+
+    const [maxEdges, treeHeight, token] = await Promise.all([
+      vAnchorContract.read.maxEdges(),
+      vAnchorContract.read.levels(),
+      vAnchorContract.read.token(),
+    ]);
+
+    const createdAnchor = new VAnchor(
+      publicClient,
+      vAnchorContract,
+      treeHeight,
+      maxEdges,
+      token,
+      smallCircuitZkComponents,
+      largeCircuitZkComponents
+    );
+
+    return createdAnchor;
+  }
+
+  public async padUtxos(utxos: Utxo[], maxLen: number): Promise<Utxo[]> {
+    const evmId = await this.contract.read.getChainId();
+    const chainId = getChainIdType(+evmId.toString());
+    const randomKeypair = new Keypair();
+
+    while (utxos.length !== 2 && utxos.length < maxLen) {
+      utxos.push(
+        await CircomUtxo.generateUtxo({
+          curve: 'Bn254',
+          backend: 'Circom',
+          chainId: chainId.toString(),
+          originChainId: chainId.toString(),
+          amount: '0',
+          blinding: hexToU8a(randomBN(31).toHexString()),
+          keypair: randomKeypair,
+        })
+      );
+    }
+
+    if (utxos.length !== 2 && utxos.length !== maxLen) {
+      throw new Error('Invalid utxo length');
+    }
+
+    return utxos;
+  }
+
+  public async setupTransaction(
+    inputs: Utxo[],
+    outputs: [Utxo, Utxo],
+    fee: bigint,
+    refund: bigint,
+    recipient: Address,
+    relayer: Address,
+    wrapUnwrapTokenArg: string,
+    leavesMap: Record<string, Uint8Array[]>
+  ) {
+    let wrapUnwrapToken: Address = this.fungibleToken;
+
+    if (wrapUnwrapTokenArg.length !== 0) {
+      wrapUnwrapToken = ensureHex(wrapUnwrapTokenArg);
+    }
+
+    if (!wrapUnwrapToken) {
+      throw new Error('Token address not set');
+    }
+
+    if (outputs.length !== 2) {
+      throw new Error('Only two outputs are supported');
+    }
+
+    const evmId = await this.contract.read.getChainId();
+    const chainId = getChainIdType(+evmId.toString());
+    const roots = await this.populateRootsForProof();
+    const extAmount = this.getExtAmount(inputs, outputs, fee);
+
+    const { extData, extDataHash } = this.generateExtData(
+      recipient,
+      extAmount,
+      relayer,
+      fee,
+      refund,
+      wrapUnwrapToken,
+      ensureHex(outputs[0].encrypt()),
+      ensureHex(outputs[1].encrypt())
+    );
+
+    const vanchorInput: VAnchorProofInputs = await this.generateProofInputs(
+      inputs,
+      outputs,
+      chainId,
+      extAmount,
+      fee,
+      extDataHash,
+      leavesMap
+    );
+
+    const fullProof = await this.generateProof(vanchorInput);
+
+    const zkey =
+      inputs.length === 2
+        ? this.smallCircuitZkComponents.zkey
+        : this.largeCircuitZkComponents.zkey;
+
+    const vKey = await snarkjs.zKey.exportVerificationKey(zkey);
+
+    const isValid: boolean = await snarkjs.groth16.verify(
+      vKey,
+      fullProof.publicSignals,
+      fullProof.proof
+    );
+
+    assert.strictEqual(isValid, true);
+
+    const publicAmount = this.getPublicAmount(extAmount, fee);
+
+    const proof = await this.generateProofCalldata(fullProof);
+
+    const publicInputs = this.generatePublicInputs(
+      proof,
+      roots,
+      inputs,
+      outputs,
+      publicAmount,
+      extDataHash
+    );
+
+    return {
+      extAmount,
+      extData,
+      publicInputs,
+    };
+  }
+
+  public async populateRootsForProof(): Promise<bigint[]> {
+    const [neighborEdges, thisRoot] = await Promise.all([
+      this.contract.read.getLatestNeighborEdges(),
+      this.contract.read.getLastRoot(),
+    ]);
+
+    const neighborRootInfos = neighborEdges.map((rootData) => {
+      return rootData.root;
+    });
+
+    return [thisRoot, ...neighborRootInfos];
+  }
+
+  public async generateProofInputs(
+    inputs: Utxo[],
+    outputs: Utxo[],
+    chainId: number,
+    extAmount: bigint,
+    fee: bigint,
+    extDataHash: bigint,
+    leavesMap: Record<string, Uint8Array[]>
+  ): Promise<VAnchorProofInputs> {
+    const vAnchorRoots = await this.populateRootsForProof();
+    let vanchorMerkleProof: Array<ReturnType<typeof this.getMerkleProof>>;
+
+    if (Object.keys(leavesMap).length === 0) {
+      vanchorMerkleProof = inputs.map((x) => this.getMerkleProof(x));
+    } else {
+      vanchorMerkleProof = inputs.map((utxo) =>
+        this.getMerkleProof(
+          utxo,
+          utxo.originChainId ? leavesMap[utxo.originChainId] : undefined
+        )
+      );
+    }
+
+    const vanchorMerkleProofs = vanchorMerkleProof.map((proof) => ({
+      pathIndex: MerkleTree.calculateIndexFromPathIndices(proof.pathIndices),
+      pathElements: proof.pathElements,
+    }));
+
+    // TODO: fix any type
+    const vAnchorInput: any = {
+      roots: vAnchorRoots.map((x) => x.toString()),
+      chainID: chainId.toString(),
+      inputNullifier: inputs.map((x) => '0x' + x.nullifier),
+      outputCommitment: outputs.map((x) =>
+        BigInt(u8aToHex(x.commitment)).toString()
+      ),
+      publicAmount: this.getPublicAmount(extAmount, fee).toString(),
+      extDataHash: extDataHash.toString(),
+      // data for 2 transaction inputs
+      inAmount: inputs.map((x) => x.amount.toString()),
+      inPrivateKey: inputs.map((x) => ensureHex(x.secret_key)),
+      inBlinding: inputs.map((x) => BigInt(ensureHex(x.blinding)).toString()),
+      inPathIndices: vanchorMerkleProofs.map((x) => x.pathIndex),
+      inPathElements: vanchorMerkleProofs.map((x) => x.pathElements),
+      // data for 2 transaction outputs
+      outChainID: outputs.map((x) => x.chainId),
+      outAmount: outputs.map((x) => x.amount.toString()),
+      outPubkey: outputs.map((x) =>
+        BigInt(x.getKeypair().getPubKey()).toString()
+      ),
+      outBlinding: outputs.map((x) => BigInt(ensureHex(x.blinding)).toString()),
+    };
+
+    return vAnchorInput;
+  }
+
+  public async generateProof(
+    vanchorInputs: VAnchorProofInputs
+  ): Promise<FullProof> {
+    const circuitWasm =
+      vanchorInputs.inAmount.length === 2
+        ? this.smallCircuitZkComponents.wasm
+        : this.largeCircuitZkComponents.wasm;
+    const zkey =
+      vanchorInputs.inAmount.length === 2
+        ? this.smallCircuitZkComponents.zkey
+        : this.largeCircuitZkComponents.zkey;
+
+    const witnessCalculator = await buildVariableWitnessCalculator(
+      circuitWasm,
+      0
+    );
+    const witness = await witnessCalculator.calculateWTNSBin(vanchorInputs, 0);
+
+    const proof = await snarkjs.groth16.prove(zkey, witness);
+
+    return proof;
+  }
+
+  public async generateProofCalldata(fullProof: FullProof) {
+    const calldata = await snarkjs.groth16.exportSolidityCallData(
+      fullProof.proof,
+      fullProof.publicSignals
+    );
+    const proof = JSON.parse('[' + calldata + ']');
+    const pi_a = proof[0];
+    const pi_b = proof[1];
+    const pi_c = proof[2];
+
+    const proofEncoded = [
+      pi_a[0],
+      pi_a[1],
+      pi_b[0][0],
+      pi_b[0][1],
+      pi_b[1][0],
+      pi_b[1][1],
+      pi_c[0],
+      pi_c[1],
+    ]
+      .map((elt) => elt.substr(2))
+      .join('');
+
+    return proofEncoded;
+  }
+
+  public async transact(
+    inputs: Utxo[],
+    outputs: Utxo[],
+    fee: bigint,
+    refund: bigint,
+    recipient: Address,
+    relayer: Address,
+    wrapUnwrapToken: string,
+    leavesMap: Record<string, Uint8Array[]>, // subtree
+    overridesTransaction: TransactionOptions & {
+      walletClient: WalletClient;
+    } & Partial<TransactionRequestBase>
+  ) {
+    const [{ walletClient, ...override }, txOptions] =
+      this.splitTransactionOptions(overridesTransaction);
+
+    if (!walletClient.account) {
+      throw WebbError.from(WebbErrorCodes.NoAccountAvailable);
+    }
+
+    // Default UTXO chain ID will match with the configured signer's chain ID
+    const inputs_ = await this.padUtxos(inputs, 16);
+    const outputs_ = await this.padUtxos(outputs, 2);
+
+    txOptions.onTransactionState?.(
+      TransactionState.GENERATE_ZK_PROOF,
+      undefined
+    );
+    const { extAmount, extData, publicInputs } = await this.setupTransaction(
+      inputs_,
+      [outputs_[0], outputs_[1]],
+      fee,
+      refund,
+      recipient,
+      relayer,
+      wrapUnwrapToken,
+      leavesMap
+    );
+
+    const txValueOption = await this.getWrapUnwrapOptions(
+      extAmount,
+      refund,
+      wrapUnwrapToken
+    );
+
+    txOptions.onTransactionState?.(
+      TransactionState.INITIALIZE_TRANSACTION,
+      undefined
+    );
+
+    const { request } = await this.contract.simulate.transact(
+      [
+        publicInputs.proof,
+        ZERO_BYTES32,
+        {
+          recipient: extData.recipient,
+          extAmount: extData.extAmount,
+          relayer: extData.relayer,
+          fee: extData.fee,
+          refund: extData.refund,
+          token: extData.token,
+        },
+        {
+          roots: publicInputs.roots,
+          // extensionRoots: isForest ? [] :  publicInputs.extensionRoots ,
+          extensionRoots: publicInputs.extensionRoots,
+          inputNullifiers: publicInputs.inputNullifiers,
+          outputCommitments: [
+            publicInputs.outputCommitments[0],
+            publicInputs.outputCommitments[1],
+          ],
+          publicAmount: BigInt(publicInputs.publicAmount),
+          extDataHash: publicInputs.extDataHash,
+        },
+        {
+          encryptedOutput1: extData.encryptedOutput1,
+          encryptedOutput2: extData.encryptedOutput2,
+        },
+      ],
+      merge({ account: walletClient.account }, txValueOption, override)
+    );
+
+    console.log('request', request);
+
+    const txHash = await walletClient.writeContract(request);
+
+    txOptions.onTransactionState?.(
+      TransactionState.WAITING_FOR_FINALIZATION,
+      txHash
+    );
+
+    this.updateTreeOrForestState(outputs);
+
+    return txHash;
+  }
+
+  public async getWrapUnwrapOptions(
+    extAmount: bigint,
+    refund: bigint,
+    wrapUnwrapToken: string
+  ) {
+    if (extAmount > ZERO_BIG_INT && checkNativeAddress(wrapUnwrapToken)) {
+      const tokenWrapperContract = getContract({
+        address: this.fungibleToken,
+        abi: TokenWrapper__factory.abi,
+        publicClient: this.publicClient,
+      });
+
+      const valueToSend = await tokenWrapperContract.read.getAmountToWrap([
+        extAmount,
+      ]);
+
+      return {
+        value: valueToSend,
+      };
+    } else if (extAmount < ZERO_BIG_INT) {
+      return {
+        value: refund,
+      };
+    }
+
+    if (refund > ZERO_BIG_INT && extAmount >= ZERO_BIG_INT) {
+      throw new Error('Refund should be zero');
+    }
+
+    return {
+      value: ZERO_BIG_INT,
+    };
+  }
+
+  public async isWebbTokenApprovalRequired(
+    depositAmount: bigint,
+    account: Account
+  ) {
+    const tokenInstance = this.getWebbToken();
+    const tokenAllowance = await tokenInstance.read.allowance([
+      account.address,
+      this.contract.address,
+    ]);
+
+    if (tokenAllowance < depositAmount) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public async isWrappableTokenApprovalRequired(
+    tokenAddress: Address,
+    depositAmount: bigint,
+    account: Account
+  ) {
+    const userAddress = account.address;
+    const tokenInstance = getContract({
+      address: tokenAddress,
+      abi: ERC20__factory.abi,
+      publicClient: this.publicClient,
+    });
+    const tokenAllowance = await tokenInstance.read.allowance([
+      userAddress,
+      this.contract.address,
+    ]);
+
+    if (tokenAllowance < depositAmount) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public getWebbToken(): GetContractReturnType<
+    typeof ERC20__factory.abi,
+    PublicClient
+  > {
+    return getContract({
+      address: this.fungibleToken,
+      abi: ERC20__factory.abi,
+      publicClient: this.publicClient,
+    });
+  }
+
+  public splitTransactionOptions<T extends object>(
+    options?: T & TransactionOptions
+  ): [T, TransactionOptions] {
+    const {
+      keypair,
+      treeChainId,
+      externalLeaves,
+      onTransactionState,
+      ...rest
+    } = options ?? {};
+
+    return [
+      rest,
+      { keypair, treeChainId, externalLeaves, onTransactionState },
+    ] as [T, TransactionOptions];
+  }
+
+  public getExtAmount(inputs: Utxo[], outputs: Utxo[], fee: bigint) {
+    const sumInAmount = inputs.reduce(
+      (sum, current) => sum + BigInt(current.amount),
+      ZERO_BIG_INT
+    );
+
+    const sumOutAmount = outputs.reduce(
+      (sum, current) => sum + BigInt(current.amount),
+      ZERO_BIG_INT
+    );
+
+    return fee + sumOutAmount - sumInAmount;
+  }
+
+  public getPublicAmount(extAmount: bigint, fee: bigint): bigint {
+    const fieldSize = FIELD_SIZE.toBigInt();
+    return (extAmount - fee + fieldSize) % fieldSize;
+  }
+
+  public generateExtData(
+    recipient: string,
+    extAmount: bigint,
+    relayer: string,
+    fee: bigint,
+    refund: bigint,
+    wrapUnwrapToken: Address,
+    encryptedOutput1: Hash,
+    encryptedOutput2: Hash
+  ) {
+    const extData = {
+      recipient: toFixedHex(recipient, 20) as Hash,
+      extAmount: extAmount,
+      relayer: toFixedHex(relayer, 20) as Hash,
+      fee: fee,
+      refund: refund,
+      token: toFixedHex(wrapUnwrapToken, 20) as Hash,
+      encryptedOutput1,
+      encryptedOutput2,
+    };
+
+    const extDataHash = this.getVAnchorExtDataHash(extData);
+    return { extData, extDataHash };
+  }
+
+  public getVAnchorExtDataHash(
+    extData: ReturnType<VAnchor['generateExtData']>['extData']
+  ): bigint {
+    const encodedData = encodeAbiParameters(
+      parseAbiParameters(
+        '(address recipient,int256 extAmount,address relayer,uint256 fee,uint256 refund,address token,bytes encryptedOutput1,bytes encryptedOutput2)'
+      ),
+      [
+        {
+          recipient: extData.recipient,
+          extAmount: extData.extAmount,
+          relayer: extData.relayer,
+          fee: extData.fee,
+          refund: extData.refund,
+          token: extData.token,
+          encryptedOutput1: extData.encryptedOutput1,
+          encryptedOutput2: extData.encryptedOutput2,
+        },
+      ]
+    );
+
+    const hash = keccak256(encodedData);
+
+    return BigInt(hash) % FIELD_SIZE.toBigInt();
+  }
+
+  public getMerkleProof(input: Utxo, leavesMap?: Uint8Array[]) {
+    let inputMerklePathIndices: number[];
+    let inputMerklePathElements: bigint[];
+
+    if (Number(input.amount) > 0) {
+      if (input.index === undefined) {
+        throw new Error(
+          `Input commitment ${u8aToHex(input.commitment)} index was not set`
+        );
+      }
+
+      if (input.index < 0) {
+        throw new Error(
+          `Input commitment ${u8aToHex(input.commitment)} index should be >= 0`
+        );
+      }
+
+      if (leavesMap === undefined) {
+        const path = this.tree.path(input.index);
+        inputMerklePathIndices = path.pathIndices;
+        inputMerklePathElements = path.pathElements.map((p) => p.toBigInt());
+      } else {
+        const mt = new MerkleTree(this.treeHeight, leavesMap);
+        const path = mt.path(input.index);
+        inputMerklePathIndices = path.pathIndices;
+        inputMerklePathElements = path.pathElements.map((p) => p.toBigInt());
+      }
+    } else {
+      inputMerklePathIndices = new Array(this.tree.levels).fill(0);
+      inputMerklePathElements = new Array(this.tree.levels).fill(0);
+    }
+
+    return {
+      element: BigInt(u8aToHex(input.commitment)),
+      pathElements: inputMerklePathElements,
+      pathIndices: inputMerklePathIndices,
+      merkleRoot: this.tree.root().toBigInt(),
+    };
+  }
+
+  public generatePublicInputs(
+    proof: string,
+    roots: Array<bigint>,
+    inputs: Array<Utxo>,
+    outputs: [Utxo, Utxo],
+    publicAmount: bigint,
+    extDataHash: bigint
+  ) {
+    // public inputs to the contract
+    const args = {
+      proof: `0x${proof}` as Hash,
+      roots: `0x${roots.map((x) => toFixedHex(x).slice(2)).join('')}` as Hash,
+      extensionRoots: '0x' as Hash,
+      inputNullifiers: inputs.map((x) =>
+        BigInt(toFixedHex(ensureHex(x.nullifier)))
+      ),
+      outputCommitments: [
+        BigInt(toFixedHex(u8aToHex(outputs[0].commitment))),
+        BigInt(toFixedHex(u8aToHex(outputs[1].commitment))),
+      ] as const,
+      publicAmount: toFixedHex(publicAmount) as Hash,
+      extDataHash: BigInt(extDataHash),
+    };
+
+    return args;
+  }
+
+  public updateTreeOrForestState(outputs: Utxo[]): void {
+    outputs.forEach((x) => {
+      this.tree.insert(u8aToHex(x.commitment));
+      const numOfElements = this.tree.number_of_elements();
+      this.depositHistory[numOfElements - 1] = toFixedHex(
+        this.tree.root().toString()
+      );
+    });
+  }
+}
+
+export default VAnchor;
diff --git a/libs/web3-api-provider/src/ext-provider/index.ts b/libs/web3-api-provider/src/ext-provider/index.ts
index 61ac1bd8c9..ff9e067fd0 100644
--- a/libs/web3-api-provider/src/ext-provider/index.ts
+++ b/libs/web3-api-provider/src/ext-provider/index.ts
@@ -2,4 +2,3 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export * from './web3-accounts';
-export * from './web3-provider';
diff --git a/libs/web3-api-provider/src/ext-provider/web3-accounts.ts b/libs/web3-api-provider/src/ext-provider/web3-accounts.ts
index 28b04b504b..3f57a5c293 100644
--- a/libs/web3-api-provider/src/ext-provider/web3-accounts.ts
+++ b/libs/web3-api-provider/src/ext-provider/web3-accounts.ts
@@ -6,9 +6,17 @@ import {
   AccountsAdapter,
   PromiseOrT,
 } from '@webb-tools/abstract-api-provider/account';
-import { Eth } from 'web3-eth';
+import { Address, JsonRpcAccount, WalletClient } from 'viem';
+import { getAccount } from 'wagmi/actions';
+
+export class Web3Account extends Account<WalletClient['account']> {
+  constructor(
+    public readonly _inner: WalletClient['account'],
+    public readonly address: Address
+  ) {
+    super(_inner, address);
+  }
 
-export class Web3Account extends Account<Eth> {
   get avatar() {
     return '';
   }
@@ -18,23 +26,41 @@ export class Web3Account extends Account<Eth> {
   }
 }
 
-export class Web3Accounts extends AccountsAdapter<Eth> {
-  providerName = 'Eth';
+export class Web3Accounts extends AccountsAdapter<
+  WalletClient,
+  WalletClient['account']
+> {
+  providerName = 'Web3';
 
   async accounts() {
-    const accounts = await this._inner.getAccounts();
+    const addresses = await this.inner.getAddresses();
 
-    return accounts.map((address) => new Web3Account(this.inner, address));
+    return addresses.map(
+      (address) =>
+        new Web3Account(
+          { type: 'json-rpc', address } satisfies WalletClient['account'],
+          address
+        )
+    );
   }
 
   get activeOrDefault() {
-    const defaultAccount = this.inner.defaultAccount;
+    const defaultAccount = getAccount();
+
+    if (!defaultAccount.address) {
+      return null;
+    }
 
-    return defaultAccount ? new Web3Account(this.inner, defaultAccount) : null;
+    return new Web3Account(
+      {
+        type: 'json-rpc',
+        address: defaultAccount.address,
+      } satisfies WalletClient['account'],
+      defaultAccount.address
+    );
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  setActiveAccount(account: Account): PromiseOrT<void> {
+  setActiveAccount(_: Account): PromiseOrT<void> {
     return undefined;
   }
 }
diff --git a/libs/web3-api-provider/src/ext-provider/web3-provider.spec.ts b/libs/web3-api-provider/src/ext-provider/web3-provider.spec.ts
deleted file mode 100644
index 29c2026af4..0000000000
--- a/libs/web3-api-provider/src/ext-provider/web3-provider.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2022 @webb-tools/
-// SPDX-License-Identifier: Apache-2.0
-
-import { expect } from 'chai';
-
-import { Web3Provider } from './web3-provider';
-
-describe('Initialize Web3', () => {
-  it('Is constructable from HTTP', async () => {
-    const web3Provider = Web3Provider.fromUri(
-      'https://rinkeby.infura.io/v3/e54b7176271840f9ba62e842ff5d6db4'
-    );
-    const isListening = await web3Provider.eth.net.isListening();
-
-    expect(isListening).to.equal(true);
-  });
-});
diff --git a/libs/web3-api-provider/src/ext-provider/web3-provider.ts b/libs/web3-api-provider/src/ext-provider/web3-provider.ts
deleted file mode 100644
index 00647b788d..0000000000
--- a/libs/web3-api-provider/src/ext-provider/web3-provider.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2022 @webb-tools/
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-
-import detectEthereumProvider from '@metamask/detect-provider';
-import WalletConnectProvider from '@walletconnect/web3-provider';
-import { ProvideCapabilities } from '@webb-tools/abstract-api-provider';
-import { WebbError, WebbErrorCodes } from '@webb-tools/dapp-types/WebbError';
-import { ethers, Signer } from 'ethers';
-import Web3 from 'web3';
-import { AbstractProvider, provider as Provider } from 'web3-core';
-
-export type AddToken = {
-  address: string;
-  symbol: string;
-  decimals: number;
-  image: string;
-};
-
-export interface AddEthereumChainParameter {
-  chainId: string; // A 0x-prefixed hexadecimal string
-  chainName: string;
-  nativeCurrency: {
-    name: string;
-    symbol: string; // 2-6 characters long
-    decimals: 18;
-  };
-  rpcUrls: string[];
-  blockExplorerUrls?: string[];
-  iconUrls?: string[]; // Currently ignored.
-}
-
-export interface SwitchEthereumChainParameter {
-  chainId: string; // A 0x-prefixed hexadecimal string
-}
-
-export interface ClientMetaData {
-  description: string;
-  url: string;
-  icons: string[];
-  name: string;
-}
-
-/**
- * Web3Provider a wrapper class for many views of the web3 provider
- * @param helperApi - An api used to do functionalities other than Web3 Ex: WalletConnect.
- **/
-export class Web3Provider<T = unknown> {
-  private helperApi: T | null = null;
-  private _capabilities: ProvideCapabilities = {
-    addNetworkRpc: false,
-    hasSessions: false,
-    listenForAccountChange: false,
-    listenForChainChane: false,
-  };
-
-  private constructor(
-    private _inner: Web3,
-    readonly clientMeta: ClientMetaData | null = null
-  ) {}
-
-  /**
-   * Initialize web3 provider from extension
-   **/
-  static async fromExtension() {
-    const provider = await detectEthereumProvider<AbstractProvider>();
-    if (!provider) {
-      throw WebbError.from(WebbErrorCodes.MetaMaskExtensionNotInstalled);
-    }
-
-    await provider.request?.({ method: 'eth_requestAccounts' });
-
-    const web3Provider = new Web3Provider(new Web3(provider as any), {
-      description: 'MetaMask',
-      icons: [],
-      name: 'MetaMask',
-      url: 'https://https://metamask.io',
-    });
-
-    web3Provider._capabilities = {
-      addNetworkRpc: true,
-      hasSessions: false,
-      listenForAccountChange: true,
-      listenForChainChane: true,
-    };
-
-    return web3Provider;
-  }
-
-  /**
-   * Create a web3 provider from url  consuming `HttpProvider`
-   **/
-  static fromUri(url: string) {
-    const HttpProvider = new Web3.providers.HttpProvider(url);
-    const web3 = new Web3(HttpProvider);
-
-    return new Web3Provider(web3);
-  }
-
-  static async fromWalletConnectProvider(WCProvider: WalletConnectProvider) {
-    await WCProvider.enable();
-    const web3 = new Web3(WCProvider as unknown as any);
-    const web3Provider = new Web3Provider<WalletConnectProvider>(
-      web3,
-      WCProvider.walletMeta
-    );
-
-    web3Provider._capabilities = {
-      addNetworkRpc: false,
-      hasSessions: true,
-      listenForAccountChange: false,
-      listenForChainChane: false,
-    };
-    web3Provider.helperApi = WCProvider;
-
-    return web3Provider;
-  }
-
-  get network() {
-    return this.intoEthersProvider().getNetwork();
-  }
-
-  get eth() {
-    return this._inner.eth;
-  }
-
-  get account() {
-    return this._inner.defaultAccount;
-  }
-
-  get provider() {
-    return this._inner.eth.currentProvider as Provider;
-  }
-
-  public get capabilities() {
-    return this._capabilities;
-  }
-
-  intoEthersProvider() {
-    return new ethers.providers.Web3Provider(this.provider as any, 'any');
-  }
-
-  async endSession() {
-    try {
-      if (this.capabilities.hasSessions) {
-        if (this.helperApi instanceof WalletConnectProvider) {
-          await this.helperApi.connector.killSession({
-            message: 'Session end error',
-          });
-        }
-      }
-    } catch (e) {
-      throw WebbError.from(WebbErrorCodes.EVMSessionAlreadyEnded);
-    }
-  }
-
-  addChain(chainInput: AddEthereumChainParameter) {
-    const provider = this._inner.currentProvider as unknown as AbstractProvider;
-
-    return provider.request?.({
-      method: 'wallet_addEthereumChain',
-      params: [chainInput],
-    });
-  }
-
-  switchChain(chainInput: SwitchEthereumChainParameter) {
-    const provider = this._inner.currentProvider as unknown as AbstractProvider;
-
-    return provider.request?.({
-      method: 'wallet_switchEthereumChain',
-      params: [chainInput],
-    });
-  }
-
-  // Switch to the chain or add it if it doesn't exist
-  async switchAndAddChain(
-    chainInput: AddEthereumChainParameter
-  ): Promise<void> {
-    try {
-      await this.switchChain({ chainId: chainInput.chainId });
-    } catch (error) {
-      // This error code indicates that the chain has not been added to MetaMask.
-      if ((error as any)?.code === 4902) {
-        await this.addChain(chainInput);
-      } else {
-        throw error; // Otherwise, throw the error to be handled by the caller.
-      }
-    }
-  }
-
-  addToken(addTokenInput: AddToken) {
-    return (
-      this._inner.currentProvider as unknown as AbstractProvider
-    ).request?.({
-      method: 'wallet_watchAsset',
-      params: {
-        options: {
-          address: addTokenInput.address, // The address that the token is at.
-          decimals: addTokenInput.decimals, // The number of decimals in the token
-          image: addTokenInput.image, // A string url of the token logo
-          symbol: addTokenInput.symbol, // A ticker symbol or shorthand, up to 5 chars.
-        },
-        type: 'ERC20', // Initially only supports ERC20, but eventually more!
-      },
-    });
-  }
-
-  async getSigner(): Promise<Signer> {
-    return this.intoEthersProvider().getSigner();
-  }
-
-  async sign(message: string, account: string): Promise<string> {
-    const sig = await this._inner.eth.personal.sign(
-      message,
-      account,
-      undefined as any
-    );
-    return sig;
-  }
-}
diff --git a/libs/web3-api-provider/src/utils/evmProviderFactory.ts b/libs/web3-api-provider/src/utils/evmProviderFactory.ts
index c5c937cac9..5aa49cab25 100644
--- a/libs/web3-api-provider/src/utils/evmProviderFactory.ts
+++ b/libs/web3-api-provider/src/utils/evmProviderFactory.ts
@@ -1,10 +1,8 @@
-import { chainsPopulated } from '@webb-tools/dapp-config';
-import { ethers } from 'ethers';
-
-import { Web3Provider } from '../ext-provider/web3-provider';
+import { PublicClient } from 'viem';
+import getViemClient from './getViemClient';
 
 const evmProviderCache: {
-  [typedChainId: number]: ethers.providers.Web3Provider;
+  [typedChainId: number]: PublicClient;
 } = {};
 
 /**
@@ -12,24 +10,17 @@ const evmProviderCache: {
  * @param typedChainId the typed chain id to get the provider for
  * @returns the provider for the given typed chain id
  */
-async function evmProviderFactory(
-  typedChainId: number
-): Promise<ethers.providers.Web3Provider> {
+async function evmProviderFactory(typedChainId: number): Promise<PublicClient> {
   const cached = evmProviderCache[typedChainId];
   if (cached) {
     return cached;
   }
 
-  const chain = chainsPopulated[typedChainId];
-  if (!chain) {
-    throw new Error(`Chain not found for ${typedChainId}`); // Development error
-  }
-
-  const provider = Web3Provider.fromUri(chain.url).intoEthersProvider();
+  const client = getViemClient(typedChainId);
 
-  evmProviderCache[typedChainId] = provider;
+  evmProviderCache[typedChainId] = client;
 
-  return provider;
+  return client;
 }
 
 export default evmProviderFactory;
diff --git a/libs/web3-api-provider/src/utils/getViemChain.ts b/libs/web3-api-provider/src/utils/getViemChain.ts
new file mode 100644
index 0000000000..d9396a34e4
--- /dev/null
+++ b/libs/web3-api-provider/src/utils/getViemChain.ts
@@ -0,0 +1,57 @@
+import {
+  LOCALNET_CHAIN_IDS,
+  chainsConfig,
+} from '@webb-tools/dapp-config/chains';
+import { DEFAULT_EVM_CURRENCY } from '@webb-tools/dapp-config/currencies';
+import { EVMChainId } from '@webb-tools/dapp-types';
+import * as chains from 'viem/chains';
+
+// At the time of writing, Viem does not support multicall for these chains.
+const VIEM_NOT_SUPPORTED_MULTICALL_CHAINS = [EVMChainId.ScrollAlpha].concat(
+  LOCALNET_CHAIN_IDS
+);
+
+/**
+ * Gets the chain object for the given chain id.
+ * @param chainId - Chain id of the target EVM chain.
+ * @returns Viem's chain object.
+ */
+function getViemChain(chainId: number): chains.Chain | undefined {
+  for (const chain of Object.values(chains)) {
+    if (chain.id === chainId) {
+      return chain;
+    }
+  }
+}
+
+/**
+ * Defines the Viem chain object from the org chain config.
+ * @returns Viem's chain object.
+ */
+function defineViemChain(typedChainId: number): chains.Chain {
+  const chain = chainsConfig[typedChainId];
+  if (!chain) {
+    throw new Error('Chain not found in the chainsConfig');
+  }
+
+  if (!chain.group) {
+    throw new Error(`Chain ${chain.name} does not have a base network`);
+  }
+
+  if (!chain.rpcUrls) {
+    throw new Error(`Chain ${chain.name} does not have rpc urls`);
+  }
+
+  return {
+    id: chain.id,
+    name: chain.name,
+    network: chain.group,
+    testnet: true,
+    nativeCurrency: DEFAULT_EVM_CURRENCY,
+    rpcUrls: chain.rpcUrls,
+    blockExplorers: chain.blockExplorers,
+    contracts: chain.contracts,
+  } as const satisfies chains.Chain;
+}
+
+export { VIEM_NOT_SUPPORTED_MULTICALL_CHAINS, defineViemChain, getViemChain };
diff --git a/libs/web3-api-provider/src/utils/getViemClient.ts b/libs/web3-api-provider/src/utils/getViemClient.ts
new file mode 100644
index 0000000000..23b4222d29
--- /dev/null
+++ b/libs/web3-api-provider/src/utils/getViemClient.ts
@@ -0,0 +1,26 @@
+import { parseTypedChainId } from '@webb-tools/sdk-core';
+import { PublicClient, createPublicClient, http } from 'viem';
+import {
+  VIEM_NOT_SUPPORTED_MULTICALL_CHAINS,
+  defineViemChain,
+  getViemChain,
+} from './getViemChain';
+
+function getViemClient(typedChainId: number): PublicClient {
+  const { chainId } = parseTypedChainId(typedChainId);
+
+  let chain = getViemChain(chainId);
+  if (!chain || VIEM_NOT_SUPPORTED_MULTICALL_CHAINS.includes(chainId)) {
+    chain = defineViemChain(typedChainId);
+  }
+
+  return createPublicClient({
+    chain: chain,
+    batch: {
+      multicall: !!chain.contracts?.multicall3,
+    },
+    transport: http(undefined, { timeout: 60_000 }),
+  });
+}
+
+export default getViemClient;
diff --git a/libs/web3-api-provider/src/utils/index.ts b/libs/web3-api-provider/src/utils/index.ts
index c1f58fe762..e09e67fd4d 100644
--- a/libs/web3-api-provider/src/utils/index.ts
+++ b/libs/web3-api-provider/src/utils/index.ts
@@ -1,2 +1,4 @@
 export { default as evmProviderFactory } from './evmProviderFactory';
+export { default as getViemClient } from './getViemClient';
 export { default as handleVAnchorTxState } from './handleVAnchorTxState';
+export { default as isViemError } from './isViemError';
diff --git a/libs/web3-api-provider/src/utils/isViemError.ts b/libs/web3-api-provider/src/utils/isViemError.ts
new file mode 100644
index 0000000000..d8dc080b34
--- /dev/null
+++ b/libs/web3-api-provider/src/utils/isViemError.ts
@@ -0,0 +1,17 @@
+import { BaseError } from 'viem';
+
+/**
+ * Check if an unknown error is a Viem error
+ * with type assertion
+ * @param error the error to check
+ * @param checkFn a function to check the error type more specifically
+ * @returns true if the error is a Viem error
+ */
+const isViemError = <ErrorClass extends BaseError = BaseError>(
+  error: unknown,
+  checkFn?: (error: unknown) => boolean
+): error is ErrorClass => {
+  return error instanceof BaseError && (!checkFn || checkFn(error));
+};
+
+export default isViemError;
diff --git a/libs/web3-api-provider/src/webb-provider.ts b/libs/web3-api-provider/src/webb-provider.ts
index b0182fa91e..222ac51312 100644
--- a/libs/web3-api-provider/src/webb-provider.ts
+++ b/libs/web3-api-provider/src/webb-provider.ts
@@ -2,23 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ApiPromise } from '@polkadot/api';
+import { getConfig } from '@wagmi/core';
 import {
-  AccountsAdapter,
   Bridge,
   Currency,
   NewNotesTxResult,
   NotificationHandler,
+  ProvideCapabilities,
   RelayChainMethods,
   Transaction,
   TransactionState,
-  WasmFactory,
   WebbApiProvider,
   WebbMethods,
   WebbProviderEvents,
   WebbState,
   calculateProvingLeavesAndCommitmentIndex,
 } from '@webb-tools/abstract-api-provider';
-import { VAnchor } from '@webb-tools/anchors';
 import { EventBus } from '@webb-tools/app-util';
 import {
   fetchVAnchorKeyFromAws,
@@ -29,9 +28,12 @@ import { BridgeStorage } from '@webb-tools/browser-utils/storage';
 import { VAnchor__factory } from '@webb-tools/contracts';
 import {
   ApiConfig,
+  SupportedConnector,
+  ZERO_BIG_INT,
+  ensureHex,
   getAnchorDeploymentBlockNumber,
-  getNativeCurrencyFromConfig,
 } from '@webb-tools/dapp-config';
+import maxBlockStepCfg from '@webb-tools/dapp-config/maxBlockStepConfig';
 import {
   CurrencyRole,
   WebbError,
@@ -48,14 +50,35 @@ import {
   UtxoGenInput,
   buildVariableWitnessCalculator,
   calculateTypedChainId,
+  parseTypedChainId,
   toFixedHex,
 } from '@webb-tools/sdk-core';
 import { ZkComponents, hexToU8a } from '@webb-tools/utils';
 import type { Backend } from '@webb-tools/wasm-utils';
-import { Signer, ethers, providers } from 'ethers';
+import flatten from 'lodash/flatten';
+import groupBy from 'lodash/groupBy';
 import { BehaviorSubject } from 'rxjs';
-import { Eth } from 'web3-eth';
-import { Web3Accounts, Web3Provider } from './ext-provider';
+import {
+  GetContractReturnType,
+  GetLogsReturnType,
+  Hash,
+  PublicClient,
+  SwitchChainError,
+  WalletClient,
+  getContract,
+  parseAbiItem,
+} from 'viem';
+import {
+  connect,
+  getPublicClient,
+  watchAccount,
+  watchBlockNumber,
+  watchNetwork,
+} from 'wagmi/actions';
+import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
+import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
+import VAnchor from './VAnchor';
+import { Web3Accounts } from './ext-provider';
 import { Web3BridgeApi } from './webb-provider/bridge-api';
 import { Web3ChainQuery } from './webb-provider/chain-query';
 import { Web3RelayerManager } from './webb-provider/relayer-manager';
@@ -70,7 +93,7 @@ export class WebbWeb3Provider
 
   state: WebbState;
 
-  private readonly _newBlock = new BehaviorSubject<null | number>(null);
+  private readonly _newBlock = new BehaviorSubject<null | bigint>(null);
 
   // Map to store the max edges for each vanchor address
   private readonly vAnchorMaxEdges = new Map<string, number>();
@@ -82,8 +105,6 @@ export class WebbWeb3Provider
 
   private largeFixtures: ZkComponents | null = null;
 
-  private ethersProvider: providers.Web3Provider;
-
   readonly typedChainidSubject: BehaviorSubject<number>;
 
   readonly backend: Backend = 'Circom';
@@ -94,31 +115,36 @@ export class WebbWeb3Provider
     WebbApiProvider<WebbWeb3Provider>
   > | null;
 
+  /**
+   * The current public client instance of the connected chain.
+   */
+  readonly publicClient: PublicClient;
+
   get newBlock() {
     return this._newBlock.asObservable();
   }
 
   private constructor(
-    private web3Provider: Web3Provider,
+    readonly connector: SupportedConnector,
+    readonly walletClient: WalletClient,
     protected chainId: number,
     readonly relayerManager: Web3RelayerManager,
     readonly noteManager: NoteManager | null,
     readonly config: ApiConfig,
     readonly notificationHandler: NotificationHandler,
-    readonly accounts: AccountsAdapter<Eth>,
-    readonly wasmFactory: WasmFactory
+    readonly accounts: Web3Accounts
   ) {
     super();
 
     const typedChainId = calculateTypedChainId(ChainType.EVM, chainId);
     this.typedChainidSubject = new BehaviorSubject<number>(typedChainId);
 
-    this.ethersProvider = web3Provider.intoEthersProvider();
-    this.ethersProvider.on('block', () => {
-      this.ethersProvider.getBlockNumber().then((b) => {
-        this._newBlock.next(b);
-      });
+    this.publicClient = getPublicClient({ chainId });
+
+    watchBlockNumber({ chainId, listen: true }, (nextBlockNumber) => {
+      this._newBlock.next(nextBlockNumber);
     });
+
     // There are no relay chain methods for Web3 chains
     this.relayChainMethods = null;
     this.methods = {
@@ -180,8 +206,59 @@ export class WebbWeb3Provider
     this.state.activeBridge = Object.values(initialSupportedBridges)[0] ?? null;
   }
 
-  getProvider(): Web3Provider {
-    return this.web3Provider;
+  // Init web3 provider with the `Web3Accounts` as the default account provider
+  static async init(
+    requestConnector: SupportedConnector,
+    chainId: number,
+    relayerManager: Web3RelayerManager,
+    noteManager: NoteManager | null,
+    appConfig: ApiConfig,
+    notification: NotificationHandler
+  ) {
+    let connector = requestConnector;
+
+    const cfg = getConfig();
+    if (cfg.connector !== connector) {
+      const { connector: connector_, chain } = await connect({
+        chainId,
+        connector: requestConnector,
+      });
+
+      if (chain.unsupported) {
+        throw WebbError.from(WebbErrorCodes.UnsupportedChain);
+      }
+
+      if (!connector_) {
+        throw WebbError.from(WebbErrorCodes.NoConnectorConfigured);
+      }
+
+      connector = connector_ as SupportedConnector;
+    } else {
+      // If the connector is already configured, we need to make sure it's connected.
+      const { chain } = await connector.connect({ chainId });
+      if (chain.unsupported) {
+        throw WebbError.from(WebbErrorCodes.UnsupportedWallet);
+      }
+    }
+
+    const walletClient = await connector.getWalletClient({ chainId });
+
+    const accounts = new Web3Accounts(walletClient);
+
+    return new WebbWeb3Provider(
+      connector as SupportedConnector, // TODO: Remove the cast
+      walletClient,
+      chainId,
+      relayerManager,
+      noteManager,
+      appConfig,
+      notification,
+      accounts
+    );
+  }
+
+  getProvider(): WalletClient {
+    return this.walletClient;
   }
 
   // Web3 has the evm, so the "api interface" should always be available.
@@ -189,27 +266,20 @@ export class WebbWeb3Provider
     return Promise.resolve(true);
   }
 
-  async setChainListener() {
-    this.ethersProvider = this.web3Provider.intoEthersProvider();
-
-    const handler = async () => {
-      const network = await this.ethersProvider.getNetwork();
-      this.emit('providerUpdate', [network.chainId]);
-    };
+  setChainListener() {
+    return watchNetwork(({ chain }) => {
+      if (!chain) {
+        return;
+      }
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    this.ethersProvider.provider?.on?.('chainChanged', handler);
+      this.emit('providerUpdate', [chain.id]);
+    });
   }
 
-  async setAccountListener() {
-    const handler = async () => {
+  setAccountListener() {
+    return watchAccount(async () => {
       this.emit('newAccounts', this.accounts);
-    };
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    this.ethersProvider.provider?.on?.('accountsChanged', handler);
+    });
   }
 
   async destroy(): Promise<void> {
@@ -221,59 +291,32 @@ export class WebbWeb3Provider
   }
 
   async getChainId(): Promise<number> {
-    const chainId = (await this.ethersProvider.getNetwork()).chainId;
-
-    return chainId;
-  }
-
-  async getBlockNumber(): Promise<number> {
-    const blockNumber = await this.ethersProvider.getBlockNumber();
-
-    return blockNumber;
+    return this.walletClient.getChainId();
   }
 
   // VAnchors require zero knowledge proofs on deposit - Fetch the small and large circuits.
-  getVariableAnchorByAddress(address: string): Promise<VAnchor> {
-    return this.getVariableAnchorByAddressAndProvider(
-      address,
-      this.ethersProvider,
-      this.ethersProvider.getSigner()
-    );
+  getVAnchorContractByAddress(
+    address: string
+  ): GetContractReturnType<typeof VAnchor__factory.abi, PublicClient> {
+    return this.getVAnchorContractByAddressAndProvider(address);
   }
 
-  async getVariableAnchorByAddressAndProvider(
+  getVAnchorContractByAddressAndProvider(
     address: string,
-    provider: providers.Web3Provider,
-    signer?: Signer
-  ): Promise<VAnchor> {
-    const maxEdges = await this.getVAnchorMaxEdges(address, provider);
-
-    const currentActiveSigner = this.ethersProvider.getSigner();
-
-    let signerOrDummySigner: Signer;
-    if (signer) {
-      signerOrDummySigner = signer;
-    } else {
-      signerOrDummySigner = new ethers.VoidSigner(
-        await currentActiveSigner.getAddress(),
-        provider
-      );
-    }
-
-    return VAnchor.connect(
-      address,
-      await this.getZkFixtures(maxEdges, true),
-      await this.getZkFixtures(maxEdges, false),
-      signerOrDummySigner
-    );
-  }
-
-  getEthersProvider(): providers.Web3Provider {
-    return this.ethersProvider;
+    provider?: PublicClient
+  ): GetContractReturnType<typeof VAnchor__factory.abi, PublicClient> {
+    return getContract({
+      abi: VAnchor__factory.abi,
+      address: ensureHex(address),
+      publicClient: provider ?? this.publicClient,
+    });
   }
 
   async getVAnchorLeaves(
-    vanchor: VAnchor,
+    vAnchorContract: GetContractReturnType<
+      typeof VAnchor__factory.abi,
+      PublicClient
+    >,
     storage: Storage<BridgeStorage>,
     options: {
       treeHeight: number;
@@ -286,25 +329,32 @@ export class WebbWeb3Provider
     commitmentIndex: number;
   }> {
     const { tx, commitment, targetRoot, treeHeight } = options;
-    const evmId = (await vanchor.contract.provider.getNetwork()).chainId;
-    const typedChainId = calculateTypedChainId(ChainType.EVM, evmId);
+
+    const evmId = await vAnchorContract.read.getChainId();
+
+    const typedChainId = calculateTypedChainId(
+      ChainType.EVM,
+      +evmId.toString()
+    );
+
+    const anchorId = vAnchorContract.address;
 
     // First, try to fetch the leaves from the supported relayers
     const relayers = await this.relayerManager.getRelayersByChainAndAddress(
       typedChainId,
-      vanchor.contract.address
+      anchorId
     );
 
     const leavesFromRelayers =
       await this.relayerManager.fetchLeavesFromRelayers(
         relayers,
-        vanchor,
+        vAnchorContract,
         storage,
         options
       );
 
     // If unable to fetch leaves from the relayers, get them from chain
-    if (!leavesFromRelayers) {
+    if (!leavesFromRelayers || leavesFromRelayers.commitmentIndex === -1) {
       tx?.next(TransactionState.FetchingLeaves, {
         start: 0, // Dummy values
         currentRange: [0, 0], // Dummy values
@@ -317,21 +367,18 @@ export class WebbWeb3Provider
       const storedContractInfo: BridgeStorage = {
         lastQueriedBlock:
           (lastQueriedBlock ||
-            getAnchorDeploymentBlockNumber(
-              typedChainId,
-              vanchor.contract.address
-            )) ??
+            getAnchorDeploymentBlockNumber(typedChainId, anchorId)) ??
           0,
         leaves: storedLeaves || [],
       };
 
       console.log('Stored contract info: ', storedContractInfo);
 
-      const leavesFromChain = await vanchor.getDepositLeaves(
-        storedContractInfo.lastQueriedBlock + 1,
-        0,
-        retryPromise,
-        tx?.cancelToken.abortSignal
+      const leavesFromChain = await this.getDepositLeaves(
+        BigInt(storedContractInfo.lastQueriedBlock + 1),
+        ZERO_BIG_INT,
+        getPublicClient({ chainId: +evmId.toString() }),
+        vAnchorContract
       );
 
       // Merge the leaves from chain with the stored leaves
@@ -362,7 +409,10 @@ export class WebbWeb3Provider
       }
 
       // Cached all the leaves to re-use them later
-      await storage.set('lastQueriedBlock', leavesFromChain.lastQueriedBlock);
+      await storage.set(
+        'lastQueriedBlock',
+        +leavesFromChain.lastQueriedBlock.toString()
+      );
       await storage.set('leaves', leaves);
 
       // Return the leaves for proving and the commitment index
@@ -376,57 +426,50 @@ export class WebbWeb3Provider
   }
 
   async getVAnchorNotesFromChain(
-    vanchor: VAnchor,
-    owner: Keypair,
-    abortSignal: AbortSignal
+    vAnchorContract: GetContractReturnType<
+      typeof VAnchor__factory.abi,
+      PublicClient
+    >,
+    owner: Keypair
   ): Promise<Note[]> {
-    const evmId = (await vanchor.contract.provider.getNetwork()).chainId;
-    const typedChainId = calculateTypedChainId(ChainType.EVM, evmId);
+    const evmId = await vAnchorContract.read.getChainId();
+    const typedChainId = calculateTypedChainId(
+      ChainType.EVM,
+      +evmId.toString()
+    );
     const tokenSymbol = this.methods.bridgeApi.getCurrency();
     if (!tokenSymbol) {
       throw new Error('Currency not found'); // Development error
     }
 
-    const utxosFromChain = await vanchor.getSpendableUtxosFromChain(
+    const anchorId = vAnchorContract.address;
+
+    const utxos = await this.getSpendableUtxosFromChain(
       owner,
-      getAnchorDeploymentBlockNumber(typedChainId, vanchor.contract.address) ||
-        1,
-      0,
-      retryPromise,
-      abortSignal
-    );
+      BigInt(getAnchorDeploymentBlockNumber(typedChainId, anchorId) || 1),
+      vAnchorContract,
+      (fromBlock, toBlock, currenctBlock) => {
+        const fromBlockNumber = +fromBlock.toString();
+        const toBlockNumber = +toBlock.toString();
+        const currenctBlockNumber = +currenctBlock.toString();
 
-    // Check if the UTXOs are already spent on chain
-    const utxos = (
-      await Promise.all(
-        utxosFromChain.map(async (utxo) => {
-          const typedChainId = Number(utxo.chainId);
-          const chain = this.config.chains[typedChainId];
-          if (!chain) {
-            throw new Error('Chain not found'); // Development error
-          }
-
-          const provider = Web3Provider.fromUri(chain.url);
-          const vAnchorContract = VAnchor__factory.connect(
-            vanchor.contract.address,
-            provider.intoEthersProvider()
-          );
-          const alreadySpent = await retryPromise(() =>
-            vAnchorContract.isSpent(toFixedHex(`0x${utxo.nullifier}`, 32))
-          );
+        const percentage =
+          ((currenctBlockNumber - fromBlockNumber) /
+            (toBlockNumber - fromBlockNumber + 1)) *
+          100;
 
-          return alreadySpent ? null : utxo;
-        })
-      )
-    ).filter((utxo): utxo is Utxo => !!utxo && utxo.amount !== '0');
+        const progress = percentage >= 100 ? 100 : percentage;
+
+        NoteManager.syncNotesProgress = progress;
+      }
+    );
 
     console.log(`Found ${utxos.length} UTXOs on chain`);
 
     const notes = Promise.all(
       utxos.map(async (utxo) => {
-        if (utxo.amount !== '0') {
-          console.log(utxo.serialize());
-        }
+        console.log(utxo.serialize());
+
         const secrets = [
           toFixedHex(utxo.chainId, 8),
           toFixedHex(utxo.amount),
@@ -442,9 +485,9 @@ export class WebbWeb3Provider
           privateKey: hexToU8a(utxo.secret_key),
           secrets,
           sourceChain: typedChainId.toString(),
-          sourceIdentifyingData: vanchor.contract.address,
+          sourceIdentifyingData: anchorId,
           targetChain: utxo.chainId,
-          targetIdentifyingData: vanchor.contract.address,
+          targetIdentifyingData: anchorId,
           tokenSymbol: tokenSymbol.view.symbol,
         });
 
@@ -452,107 +495,96 @@ export class WebbWeb3Provider
       })
     );
 
+    // Reset the progress
+    NoteManager.syncNotesProgress = Number.NaN;
+
     return notes;
   }
 
-  // Init web3 provider with the `Web3Accounts` as the default account provider
-  static async init(
-    web3Provider: Web3Provider,
-    chainId: number,
-    relayerManager: Web3RelayerManager,
-    noteManager: NoteManager | null,
-    appConfig: ApiConfig,
-    notification: NotificationHandler,
-    wasmFactory: WasmFactory // A Factory Fn that wil return wasm worker that would be supplied eventually to the `sdk-core`
-  ) {
-    const accounts = new Web3Accounts(web3Provider.eth);
-
-    return new WebbWeb3Provider(
-      web3Provider,
-      chainId,
-      relayerManager,
-      noteManager,
-      appConfig,
-      notification,
-      accounts,
-      wasmFactory
-    );
+  get typedChainId(): number {
+    return this.typedChainidSubject.getValue();
   }
 
-  // Init web3 provider with a generic account provider
-  static async initWithCustomAccountAdapter(
-    web3Provider: Web3Provider,
-    chainId: number,
-    relayerManager: Web3RelayerManager,
-    noteManager: NoteManager | null,
-    appConfig: ApiConfig,
-    notification: NotificationHandler,
-    web3AccountProvider: AccountsAdapter<Eth>,
-    wasmFactory: WasmFactory // A Factory Fn that wil return wasm worker that would be supplied eventually to the `sdk-core`
-  ) {
-    return new WebbWeb3Provider(
-      web3Provider,
-      chainId,
-      relayerManager,
-      noteManager,
-      appConfig,
-      notification,
-      web3AccountProvider,
-      wasmFactory
+  get capabilities(): ProvideCapabilities {
+    const connector = this.connector;
+
+    if (connector instanceof MetaMaskConnector) {
+      return {
+        addNetworkRpc: true,
+        hasSessions: false,
+        listenForAccountChange: true,
+        listenForChainChane: true,
+      } satisfies ProvideCapabilities;
+    } else if (connector instanceof WalletConnectConnector) {
+      return {
+        addNetworkRpc: false,
+        hasSessions: true,
+        listenForAccountChange: false,
+        listenForChainChane: false,
+      } satisfies ProvideCapabilities;
+    }
+
+    console.error(
+      WebbError.getErrorMessage(WebbErrorCodes.NoConnectorConfigured).message
     );
-  }
 
-  get typedChainId(): number {
-    return this.typedChainidSubject.getValue();
+    // Default to false
+    return {
+      addNetworkRpc: false,
+      hasSessions: false,
+      listenForAccountChange: false,
+      listenForChainChane: false,
+    } satisfies ProvideCapabilities;
   }
 
-  get capabilities() {
-    return this.web3Provider.capabilities;
+  async endSession(): Promise<void> {
+    return this.unsubscribeAll();
   }
 
-  endSession(): Promise<void> {
-    this.unsubscribeAll();
-    return this.web3Provider.endSession();
+  async switchOrAddChain(evmChainId: number) {
+    try {
+      await this.walletClient.switchChain({ id: evmChainId });
+    } catch (error) {
+      // This error code indicates that the chain has not been added to MetaMask.
+      if (error instanceof SwitchChainError) {
+        await this.walletClient.addChain({
+          chain: this.config.chains[this.typedChainId],
+        });
+      } else {
+        throw error; // Otherwise, throw the error to be handled by the caller.
+      }
+    }
+    return;
   }
 
-  switchOrAddChain(evmChainId: number) {
-    const typedChainId = calculateTypedChainId(ChainType.EVM, evmChainId);
-    const chain = this.config.chains[typedChainId];
-
-    const currency = getNativeCurrencyFromConfig(
-      this.config.currencies,
-      typedChainId
-    );
-    if (!chain || !currency) {
-      throw new Error('Chain or currency not found'); // Development error
+  async watchAsset(currency: Currency, imgUrl?: string) {
+    const addr = currency.getAddressOfChain(this.typedChainId);
+    if (!addr) {
+      throw WebbError.from(WebbErrorCodes.NoCurrencyAvailable);
     }
 
-    return this.web3Provider.addChain({
-      chainId: `0x${evmChainId.toString(16)}`,
-      chainName: chain.name,
-      nativeCurrency: {
-        decimals: 18,
-        name: currency.name,
-        symbol: currency.symbol,
+    this.walletClient.watchAsset({
+      type: 'ERC20',
+      options: {
+        address: addr,
+        decimals: currency.getDecimals(),
+        // Slice the symbol to 10 characters to avoid overflow
+        symbol: currency.view.symbol.slice(0, 10),
+        image: imgUrl,
       },
-      rpcUrls: chain.evmRpcUrls ?? [],
     });
   }
 
-  async sign(message: string): Promise<{
-    sig: string;
-    account: string;
-  }> {
-    const acc = this.ethersProvider.getSigner();
-    const address = await acc.getAddress();
-    if (!acc) {
+  async sign(message: string): Promise<string> {
+    const account = this.accounts.activeOrDefault;
+    if (!account) {
       throw WebbError.from(WebbErrorCodes.NoAccountAvailable);
     }
-    const sig = await this.web3Provider.sign(message, address);
-    return {
-      sig,
-      account: address,
-    };
+
+    return this.walletClient.signMessage({
+      account: ensureHex(account.address),
+      message,
+    });
   }
 
   async getZkFixtures(
@@ -608,9 +640,9 @@ export class WebbWeb3Provider
 
   async getVAnchorMaxEdges(
     vAnchorAddress: string,
-    provider?: providers.Web3Provider | ApiPromise
+    provider?: PublicClient | ApiPromise
   ): Promise<number> {
-    if (provider instanceof ApiPromise) {
+    if (provider instanceof ApiPromise || !provider) {
       throw WebbError.from(WebbErrorCodes.UnsupportedProvider);
     }
 
@@ -619,11 +651,13 @@ export class WebbWeb3Provider
       return Promise.resolve(storedMaxEdges);
     }
 
-    const vAnchorContract = VAnchor__factory.connect(
-      vAnchorAddress,
-      provider ?? this.ethersProvider
-    );
-    const maxEdges = await retryPromise(vAnchorContract.maxEdges);
+    const vAnchorContract = getContract({
+      address: `0x${vAnchorAddress.replace(/^0x/, '')}`,
+      abi: VAnchor__factory.abi,
+      publicClient: provider,
+    });
+
+    const maxEdges = await vAnchorContract.read.maxEdges();
 
     this.vAnchorMaxEdges.set(vAnchorAddress, maxEdges);
     return maxEdges;
@@ -631,9 +665,9 @@ export class WebbWeb3Provider
 
   async getVAnchorLevels(
     vAnchorAddressOrTreeId: string,
-    provider?: ApiPromise | ethers.providers.Web3Provider
+    provider?: ApiPromise | PublicClient
   ): Promise<number> {
-    if (provider instanceof ApiPromise) {
+    if (provider instanceof ApiPromise || !provider) {
       throw WebbError.from(WebbErrorCodes.UnsupportedProvider);
     }
 
@@ -642,11 +676,12 @@ export class WebbWeb3Provider
       return Promise.resolve(storedLevels);
     }
 
-    const vAnchorContract = VAnchor__factory.connect(
-      vAnchorAddressOrTreeId,
-      provider ?? this.ethersProvider
-    );
-    const levels = await retryPromise(vAnchorContract.getLevels);
+    const vAnchorContract = getContract({
+      address: `0x${vAnchorAddressOrTreeId.replace(/^0x/, '')}`,
+      abi: VAnchor__factory.abi,
+      publicClient: provider,
+    });
+    const levels = await vAnchorContract.read.getLevels();
 
     this.vAnchorLevels.set(vAnchorAddressOrTreeId, levels);
     return levels;
@@ -655,4 +690,292 @@ export class WebbWeb3Provider
   generateUtxo(input: UtxoGenInput): Promise<Utxo> {
     return CircomUtxo.generateUtxo(input);
   }
+
+  /**
+   * The the VAnchor instance for the the logic inside this class,
+   * we not use this for signing transactions. In the future we will
+   * refactor the VAnchor class itself not require a signer.
+   */
+  async getVAnchorInstance(
+    address: string,
+    provider: PublicClient
+  ): Promise<VAnchor> {
+    const maxEdges = await this.getVAnchorMaxEdges(address, provider);
+
+    return VAnchor.connect(
+      ensureHex(address),
+      await this.getZkFixtures(maxEdges, true),
+      await this.getZkFixtures(maxEdges, false),
+      provider
+    );
+  }
+
+  /**
+   * Get the logs from the vAnchor contract
+   * from `fromBlock` to `toBlock`
+   * or at block (`fromBlock === toBlock`) and filter them
+   * by the `NewCommitment` event.
+   * @param publicClient the public client to use
+   * @param vAnchorAddress the address of the vAnchor contract
+   * @param fromBlock the block to start fetching logs from
+   * @param toBlock the block to stop fetching logs from
+   * @param onCurrentProcessingBlock a callback to call when the current processing block changes
+   * @returns the filtered logs
+   */
+  async getNewCommitmentLogs(
+    publicClient: PublicClient,
+    vAnchorContract: GetContractReturnType<
+      typeof VAnchor__factory.abi,
+      PublicClient
+    >,
+    fromBlock: bigint,
+    toBlock: bigint,
+    onCurrentProcessingBlock?: (block: bigint) => void
+  ) {
+    const isTheSameBlock = fromBlock === toBlock;
+
+    const chainId = await vAnchorContract.read.getChainId();
+    const typedChainId = calculateTypedChainId(
+      ChainType.EVM,
+      +chainId.toString()
+    );
+
+    const maxBlockStep =
+      maxBlockStepCfg[typedChainId] ?? maxBlockStepCfg.default;
+
+    const commonGetLogsProps = {
+      address: vAnchorContract.address,
+      event: parseAbiItem(
+        'event NewCommitment(uint256 commitment, uint256 subTreeIndex,uint256 leafIndex, bytes encryptedOutput)' // TODO: use the abi from the contract
+      ),
+      strict: true,
+    } as const;
+
+    if (isTheSameBlock || toBlock - fromBlock <= maxBlockStep) {
+      onCurrentProcessingBlock?.(fromBlock);
+      // Use getLogs instead of createEventFilter.NewCommitment because
+      // createEventFilter.NewCommitment does not work without wss connection
+      return retryPromise(() =>
+        publicClient.getLogs({
+          ...commonGetLogsProps,
+          fromBlock,
+          toBlock: isTheSameBlock ? toBlock : toBlock - BigInt(1), // toBlock is exclusive to prevent fetching the same block twice
+        })
+      );
+    }
+
+    const logs: GetLogsReturnType<
+      (typeof commonGetLogsProps)['event'],
+      true,
+      'NewCommitment'
+    > = [];
+
+    // We loop through the blocks in chunks to avoid hitting the max block step limit
+    let currentBlock = fromBlock;
+
+    while (currentBlock < toBlock) {
+      onCurrentProcessingBlock?.(currentBlock);
+
+      const logsChunk = await retryPromise(() =>
+        publicClient.getLogs({
+          ...commonGetLogsProps,
+          fromBlock: currentBlock,
+          toBlock: currentBlock + BigInt(maxBlockStep) - BigInt(1),
+        })
+      );
+
+      logs.push(...logsChunk);
+
+      currentBlock += BigInt(maxBlockStep);
+    }
+
+    return logs;
+  }
+
+  // ================== PRIVATE METHODS ===================
+
+  /**
+   * Refactor from https://github.com/webb-tools/protocol-solidity/blob/main/packages/anchors/src/VAnchor.ts#L663
+   * when migrating to wagmi and viem
+   */
+  private async getDepositLeaves(
+    startingBlock: bigint,
+    finalBlockArg: bigint,
+    publicClient: PublicClient,
+    vAnchorContract: GetContractReturnType<
+      typeof VAnchor__factory.abi,
+      PublicClient
+    >
+  ): Promise<{ lastQueriedBlock: bigint; newLeaves: Array<Hash> }> {
+    const latestBlock = finalBlockArg || (await publicClient.getBlockNumber());
+
+    const logs = await this.getNewCommitmentLogs(
+      publicClient,
+      vAnchorContract,
+      startingBlock,
+      latestBlock
+    );
+
+    return {
+      lastQueriedBlock: latestBlock,
+      newLeaves: logs.map((log) => ensureHex(log.args.commitment.toString(16))),
+    };
+  }
+
+  /**
+   * Refactor from https://github.com/webb-tools/protocol-solidity/blob/main/packages/anchors/src/VAnchor.ts#L716
+   * when migrating to wagmi and viem
+   */
+  private async getSpendableUtxosFromChain(
+    owner: Keypair,
+    startingBlock: bigint,
+    vAnchorContract: GetContractReturnType<
+      typeof VAnchor__factory.abi,
+      PublicClient
+    >,
+    onBlockProcessed?: (
+      fromBlock: bigint,
+      toBlock: bigint,
+      currentBlock: bigint
+    ) => void
+  ): Promise<Array<Utxo>> {
+    const chainId = await vAnchorContract.read.getChainId();
+    const publicClient = getPublicClient({
+      chainId: +chainId.toString(),
+    });
+
+    const latestBlock = await publicClient.getBlockNumber();
+
+    const logs = await this.getNewCommitmentLogs(
+      publicClient,
+      vAnchorContract,
+      startingBlock,
+      latestBlock,
+      (currentBlock) =>
+        onBlockProcessed?.(startingBlock, latestBlock, currentBlock)
+    );
+
+    const parsedLogs = logs.map((log) => ({
+      encryptedOutput: log.args.encryptedOutput,
+      leafIndex: log.args.leafIndex,
+    }));
+
+    const utxosWithNull = await Promise.all(
+      parsedLogs.map(({ encryptedOutput, leafIndex }) =>
+        this.validateAmountEncryptedOutput(owner, encryptedOutput, leafIndex)
+      )
+    );
+
+    const filteredUtxos = utxosWithNull.filter(
+      (utxo): utxo is Utxo => utxo !== null
+    );
+
+    const spendableUtxos = await this.validateIsSpent(
+      filteredUtxos,
+      vAnchorContract.address
+    );
+
+    return spendableUtxos;
+  }
+
+  /**
+   * Validates the on-chain encrypted output whether the amount is not `0
+   * @param encryptedOutput the fetched encrypted output from the chain
+   * @param vAnchorContract the vAnchor contract instance
+   * @returns the decrypted output if the validation passes, otherwise `null`
+   */
+  private async validateAmountEncryptedOutput(
+    owner: Keypair,
+    encryptedOutput: Hash,
+    leafIndex: bigint
+  ): Promise<Utxo | null> {
+    try {
+      const decryptedUtxo = await CircomUtxo.decrypt(owner, encryptedOutput);
+
+      // In order to properly calculate the nullifier, an index is required.
+      // The decrypt function generates a utxo without an index, and the index is a readonly property.
+      // So, regenerate the utxo with the proper index.
+      const regeneratedUtxo = await this.generateUtxo({
+        amount: decryptedUtxo.amount,
+        backend: 'Circom',
+        blinding: hexToU8a(decryptedUtxo.blinding),
+        chainId: decryptedUtxo.chainId,
+        curve: 'Bn254',
+        keypair: owner,
+      });
+
+      const idx = decryptedUtxo.index || +leafIndex.toString();
+
+      regeneratedUtxo.setIndex(idx);
+
+      if (BigInt(regeneratedUtxo.amount) === ZERO_BIG_INT) {
+        return null;
+      }
+
+      return regeneratedUtxo;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  /**
+   * Validates the on-chain nullifier whether it is spent or not
+   * @param nullifiers the list of nullifiers to validate
+   * @param vAnchorContract the current connected vAnchor contract
+   * @returns an array of boolean values, where `true` means the nullifier is spent, otherwise `false`
+   */
+  private async validateIsSpent(
+    utxos: ReadonlyArray<Utxo>,
+    vAnchorIdentifier: string
+  ): Promise<Array<Utxo>> {
+    // Get record of chainId -> Utxos
+    const utxosByChainId = groupBy(
+      utxos,
+      (utxo) => parseTypedChainId(+utxo.chainId).chainId
+    );
+
+    // Get record of chainId -> contract instance
+    const vAnchorContractsByChainId = Object.keys(utxosByChainId).reduce(
+      (acc, chainIdStr) => {
+        const chainId = +chainIdStr;
+
+        if (!acc[chainId]) {
+          acc[chainId] = getContract({
+            address: ensureHex(vAnchorIdentifier),
+            abi: VAnchor__factory.abi,
+            publicClient: getPublicClient({ chainId }),
+          });
+        }
+
+        return acc;
+      },
+      {} as Record<
+        number,
+        GetContractReturnType<typeof VAnchor__factory.abi, PublicClient>
+      >
+    );
+
+    // Use the contract instance to validate the nullifiers
+    // by calling isSpentArray and get the non-spent utxos
+    const nonSpentUtxosByChainId = await Promise.all(
+      Object.entries(vAnchorContractsByChainId).map(
+        async ([chainId, vAnchorContract]) => {
+          const nullifiers = utxosByChainId[chainId].map((utxo) =>
+            BigInt(ensureHex(utxo.nullifier))
+          );
+
+          const isSpentArray = await vAnchorContract.read.isSpentArray([
+            nullifiers,
+          ]);
+
+          return utxosByChainId[chainId].filter(
+            (_, index) => !isSpentArray[index]
+          );
+        }
+      )
+    );
+
+    // Flatten the array of arrays
+    return flatten(nonSpentUtxosByChainId);
+  }
 }
diff --git a/libs/web3-api-provider/src/webb-provider/bridge-api.ts b/libs/web3-api-provider/src/webb-provider/bridge-api.ts
index 636c97c2d0..d7c805cf45 100644
--- a/libs/web3-api-provider/src/webb-provider/bridge-api.ts
+++ b/libs/web3-api-provider/src/webb-provider/bridge-api.ts
@@ -1,15 +1,21 @@
 // Copyright 2022 @webb-tools/
 // SPDX-License-Identifier: Apache-2.0
 import { Bridge, BridgeApi, Currency } from '@webb-tools/abstract-api-provider';
-import { ERC20__factory as ERC20Factory } from '@webb-tools/contracts';
+import {
+  ERC20__factory as ERC20Factory,
+  FungibleTokenWrapper__factory,
+} from '@webb-tools/contracts';
+import {
+  ensureHex,
+  getNativeCurrencyFromConfig,
+} from '@webb-tools/dapp-config';
 import {
   CurrencyRole,
   CurrencyType,
   checkNativeAddress,
 } from '@webb-tools/dapp-types';
-
-import { getNativeCurrencyFromConfig } from '@webb-tools/dapp-config';
 import { FungibleTokenWrapper } from '@webb-tools/tokens';
+import { getContract } from 'viem';
 import { WebbWeb3Provider } from '../webb-provider';
 
 export class Web3BridgeApi extends BridgeApi<WebbWeb3Provider> {
@@ -25,26 +31,38 @@ export class Web3BridgeApi extends BridgeApi<WebbWeb3Provider> {
     }
 
     // Get the available token addresses which can wrap into the wrappedToken
-    const fungibleToken = FungibleTokenWrapper.connect(
-      fungibleTokenAddress,
-      this.inner.getEthersProvider().getSigner()
-    );
-    const allTokenAddresses = await fungibleToken.contract.getTokens();
+    const fungibleContract = getContract({
+      address: ensureHex(fungibleTokenAddress),
+      abi: FungibleTokenWrapper__factory.abi,
+      publicClient: this.inner.publicClient,
+    });
+
+    const [allTokenAddresses, isNativeAllowed] = await Promise.all([
+      fungibleContract.read.getTokens(),
+      fungibleContract.read.isNativeAllowed(),
+    ]);
+
     await Promise.all(
       allTokenAddresses.map(async (tokenAddress) => {
         const registeredCurrency = this.inner.state
           .getReverseCurrencyMapWithChainId(typedChainId)
           .get(tokenAddress);
+
         const knownCurrencies = this.inner.state.getCurrencies();
+
         if (!registeredCurrency) {
           // Read data about the new currencyAddress
-          const newERC20Token = ERC20Factory.connect(
-            tokenAddress,
-            this.inner.getEthersProvider()
-          );
-          const decimals = await newERC20Token.decimals();
-          const name = await newERC20Token.name();
-          const symbol = await newERC20Token.symbol();
+          const newERC20Token = getContract({
+            address: tokenAddress,
+            abi: ERC20Factory.abi,
+            publicClient: this.inner.publicClient,
+          });
+
+          const [decimals, name, symbol] = await Promise.all([
+            newERC20Token.read.decimals(),
+            newERC20Token.read.name(),
+            newERC20Token.read.symbol(),
+          ]);
 
           const nextCurrencyId = Object.keys(
             this.inner.config.currencies
@@ -74,7 +92,7 @@ export class Web3BridgeApi extends BridgeApi<WebbWeb3Provider> {
     );
 
     // Add the chain's native currency if the wrappableToken allows native
-    if (await fungibleToken.contract.isNativeAllowed()) {
+    if (isNativeAllowed) {
       const currencyConfig = getNativeCurrencyFromConfig(
         this.inner.config.currencies,
         typedChainId
diff --git a/libs/web3-api-provider/src/webb-provider/chain-query.ts b/libs/web3-api-provider/src/webb-provider/chain-query.ts
index 7a72e16bf4..650cae44bd 100644
--- a/libs/web3-api-provider/src/webb-provider/chain-query.ts
+++ b/libs/web3-api-provider/src/webb-provider/chain-query.ts
@@ -2,23 +2,21 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ChainQuery } from '@webb-tools/abstract-api-provider';
-import { zeroAddress } from '@webb-tools/dapp-types';
-import { ERC20__factory as ERC20Factory } from '@webb-tools/contracts';
-
-import { ethers } from 'ethers';
-
+import { ensureHex } from '@webb-tools/dapp-config';
+import { checkNativeAddress } from '@webb-tools/dapp-types';
+import { parseTypedChainId } from '@webb-tools/sdk-core';
+import { Observable, catchError, of, switchMap } from 'rxjs';
+import { Address, formatEther } from 'viem';
+import { fetchBalance } from 'wagmi/actions';
 import { WebbWeb3Provider } from '../webb-provider';
-import { catchError, Observable, of, switchMap } from 'rxjs';
-import { getNativeCurrencyFromConfig } from '@webb-tools/dapp-config';
 
 export class Web3ChainQuery extends ChainQuery<WebbWeb3Provider> {
   constructor(protected inner: WebbWeb3Provider) {
     super(inner);
   }
 
-  async currentBlock(): Promise<number> {
-    const provider = this.inner.getEthersProvider();
-    return provider.getBlockNumber();
+  currentBlock() {
+    return this.inner.publicClient.getBlockNumber();
   }
 
   // Returns the balance formatted in ETH units.
@@ -27,50 +25,29 @@ export class Web3ChainQuery extends ChainQuery<WebbWeb3Provider> {
     currencyId: number,
     accountAddressArg?: string
   ): Observable<string> {
-    const provider = this.inner.getEthersProvider();
     return this.inner.newBlock.pipe(
       switchMap(async () => {
-        const accountAddress = await this.getAccountAddress(accountAddressArg);
-        if (!accountAddress) {
-          console.error('No account selected');
+        const currency = this.inner.state.getCurrencies()[currencyId];
+        if (!currency) {
           return '';
         }
 
-        const nativeCurrency = getNativeCurrencyFromConfig(
-          this.inner.config.currencies,
-          typedChainId
-        );
-
-        if (!nativeCurrency) {
-          console.error('No native currency found for chain');
+        const account = await this.getAccountAddress(accountAddressArg);
+        if (!account) {
+          console.error('No account selected');
           return '';
         }
 
-        // Return the balance of the account if native currency
-        if (nativeCurrency.id === currencyId) {
-          const tokenBalanceBig = await provider.getBalance(accountAddress);
-          const tokenBalance = ethers.utils.formatEther(tokenBalanceBig);
-
-          return tokenBalance;
-        } else {
-          // Find the currency address on this chain
-          const currency = this.inner.state.getCurrencies()[currencyId];
-          if (!currency) {
-            return '';
-          }
-
-          const currencyOnChain = currency.getAddress(typedChainId);
-          if (!currencyOnChain) {
-            return '';
-          }
+        const accountAddress: Address = ensureHex(account);
+        const tknAddr = currency.getAddressOfChain(typedChainId);
 
-          // Create a token instance for this chain
-          const tokenInstance = ERC20Factory.connect(currencyOnChain, provider);
-          const tokenBalanceBig = await tokenInstance.balanceOf(accountAddress);
-          const tokenBalance = ethers.utils.formatEther(tokenBalanceBig);
+        const balance = await this.fetchAccountBalance(
+          accountAddress,
+          typedChainId,
+          tknAddr ? ensureHex(tknAddr) : undefined
+        );
 
-          return tokenBalance;
-        }
+        return formatEther(balance.value);
       }),
       catchError(() => of('')) // Return empty string when error
     );
@@ -80,30 +57,24 @@ export class Web3ChainQuery extends ChainQuery<WebbWeb3Provider> {
     address: string,
     accountAddressArg?: string
   ): Observable<string> {
-    const provider = this.inner.getEthersProvider();
     return this.inner.newBlock.pipe(
       switchMap(async () => {
-        const accountAddress = await this.getAccountAddress(accountAddressArg);
-
-        if (!accountAddress) {
-          console.log('no account selected');
+        const account = await this.getAccountAddress(accountAddressArg);
+        if (!account) {
+          console.error('no account selected');
           return '';
         }
 
-        // Return the balance of the account if native currency
-        if (address === zeroAddress) {
-          const tokenBalanceBig = await provider.getBalance(accountAddress);
-          const tokenBalance = ethers.utils.formatEther(tokenBalanceBig);
+        const accountAddress: Address = ensureHex(account);
+        const tknAddress: Address = ensureHex(address);
 
-          return tokenBalance;
-        } else {
-          // Create a token instance for this chain
-          const tokenInstance = ERC20Factory.connect(address, provider);
-          const tokenBalanceBig = await tokenInstance.balanceOf(accountAddress);
-          const tokenBalance = ethers.utils.formatEther(tokenBalanceBig);
+        const balance = await this.fetchAccountBalance(
+          accountAddress,
+          this.inner.typedChainId,
+          tknAddress
+        );
 
-          return tokenBalance;
-        }
+        return formatEther(balance.value);
       }),
       catchError(() => of('')) // Return empty string when error
     );
@@ -112,15 +83,21 @@ export class Web3ChainQuery extends ChainQuery<WebbWeb3Provider> {
   private async getAccountAddress(
     accAddr?: string
   ): Promise<string | undefined> {
-    if (accAddr) {
-      return accAddr;
-    }
-
-    const accounts = await this.inner.accounts.accounts();
-    if (!accounts?.length) {
-      return undefined;
-    }
+    return accAddr ?? this.inner.accounts.activeOrDefault?.address;
+  }
 
-    return accounts[0]?.address;
+  private fetchAccountBalance(
+    accountAddress: Address,
+    typedChainId: number,
+    tokenAddress?: Address
+  ) {
+    return fetchBalance({
+      address: accountAddress,
+      chainId: parseTypedChainId(typedChainId).chainId,
+      token:
+        tokenAddress && !checkNativeAddress(tokenAddress)
+          ? tokenAddress
+          : undefined,
+    });
   }
 }
diff --git a/libs/web3-api-provider/src/webb-provider/relayer-manager.ts b/libs/web3-api-provider/src/webb-provider/relayer-manager.ts
index 156d627510..e53c9aeeef 100644
--- a/libs/web3-api-provider/src/webb-provider/relayer-manager.ts
+++ b/libs/web3-api-provider/src/webb-provider/relayer-manager.ts
@@ -9,7 +9,6 @@ import {
   WebbRelayer,
   WebbRelayerManager,
 } from '@webb-tools/abstract-api-provider/relayer';
-import { VAnchor } from '@webb-tools/anchors';
 import { BridgeStorage } from '@webb-tools/browser-utils/storage';
 import Storage from '@webb-tools/dapp-types/Storage';
 import {
@@ -24,6 +23,8 @@ import {
   Transaction,
   TransactionState,
 } from '@webb-tools/abstract-api-provider';
+import { VAnchor__factory } from '@webb-tools/contracts';
+import { GetContractReturnType, PublicClient } from 'viem';
 
 export class Web3RelayerManager extends WebbRelayerManager<'web3'> {
   async mapRelayerIntoActive(
@@ -136,7 +137,10 @@ export class Web3RelayerManager extends WebbRelayerManager<'web3'> {
    */
   async fetchLeavesFromRelayers(
     relayers: WebbRelayer[],
-    vanchor: VAnchor,
+    vanchorContract: GetContractReturnType<
+      typeof VAnchor__factory.abi,
+      PublicClient
+    >,
     storage: Storage<BridgeStorage>,
     options: {
       treeHeight: number;
@@ -150,28 +154,21 @@ export class Web3RelayerManager extends WebbRelayerManager<'web3'> {
   } | null> {
     const { treeHeight, targetRoot, commitment, tx } = options;
 
-    const sourceEvmId = (await vanchor.contract.provider.getNetwork()).chainId;
-    const typedChainId = calculateTypedChainId(ChainType.EVM, sourceEvmId);
+    const sourceEvmId = await vanchorContract.read.getChainId();
+
+    const typedChainId = calculateTypedChainId(
+      ChainType.EVM,
+      +sourceEvmId.toString()
+    );
 
     // loop through the sourceRelayers to fetch leaves
     for (let i = 0; i < relayers.length; i++) {
       try {
         const { leaves, lastQueriedBlock } = await relayers[i].getLeaves(
           typedChainId,
-          vanchor.contract.address,
+          vanchorContract.address,
           tx?.cancelToken.abortSignal
         );
-        const validLatestLeaf = await vanchor.leafCreatedAtBlock(
-          leaves[leaves.length - 1],
-          lastQueriedBlock
-        );
-
-        console.log('validLatestLeaf', validLatestLeaf);
-
-        // leaves from relayer somewhat validated, attempt to build the tree
-        if (!validLatestLeaf) {
-          continue;
-        }
 
         const result = await this.validateRelayerLeaves(
           treeHeight,
@@ -181,7 +178,7 @@ export class Web3RelayerManager extends WebbRelayerManager<'web3'> {
           tx
         );
 
-        if (!result) {
+        if (!result || result.commitmentIndex === -1) {
           continue;
         }
 
diff --git a/libs/web3-api-provider/src/webb-provider/vanchor-actions.ts b/libs/web3-api-provider/src/webb-provider/vanchor-actions.ts
index 9a994444df..2e79be05d1 100644
--- a/libs/web3-api-provider/src/webb-provider/vanchor-actions.ts
+++ b/libs/web3-api-provider/src/webb-provider/vanchor-actions.ts
@@ -1,7 +1,6 @@
 import {
   ActiveWebbRelayer,
   calculateProvingLeavesAndCommitmentIndex,
-  CancellationToken,
   generateCircomCommitment,
   isVAnchorDepositPayload,
   isVAnchorTransferPayload,
@@ -17,15 +16,19 @@ import {
   utxoFromVAnchorNote,
   VAnchorActions,
 } from '@webb-tools/abstract-api-provider';
-import { VAnchor } from '@webb-tools/anchors';
 import {
   bridgeStorageFactory,
   registrationStorageFactory,
 } from '@webb-tools/browser-utils/storage';
-import { ERC20__factory, VAnchor__factory } from '@webb-tools/contracts';
+import {
+  ERC20__factory,
+  FungibleTokenWrapper__factory,
+  VAnchor__factory,
+} from '@webb-tools/contracts';
+import { ApiConfig, ensureHex, ZERO_BIG_INT } from '@webb-tools/dapp-config';
 import gasLimitConfig, {
   DEFAULT_GAS_LIMIT,
-} from '@webb-tools/dapp-config/gasLimit-config';
+} from '@webb-tools/dapp-config/gasLimitConfig';
 import {
   checkNativeAddress,
   WebbError,
@@ -40,7 +43,6 @@ import {
   toFixedHex,
   Utxo,
 } from '@webb-tools/sdk-core';
-import { FungibleTokenWrapper } from '@webb-tools/tokens';
 import {
   hexToU8a,
   u8aToHex,
@@ -48,14 +50,13 @@ import {
   ZERO_BYTES32,
 } from '@webb-tools/utils';
 import {
-  BigNumber,
-  ContractReceipt,
-  ContractTransaction,
-  Overrides,
-} from 'ethers';
-
-import { ApiConfig } from '@webb-tools/dapp-config';
-import { Web3Provider } from '../ext-provider';
+  Address,
+  getContract,
+  GetContractReturnType,
+  Hash,
+  PublicClient,
+} from 'viem';
+import { getPublicClient } from 'wagmi/actions';
 import { handleVAnchorTxState } from '../utils';
 import { WebbWeb3Provider } from '../webb-provider';
 
@@ -68,19 +69,23 @@ export class Web3VAnchorActions extends VAnchorActions<
     typedChainId: number,
     fungibleCurrencyId: number
   ): Promise<bigint> {
-    const chain = apiConfig.chains[typedChainId];
+    const { chainId } = parseTypedChainId(typedChainId);
+
     const anchor = apiConfig.getAnchorIdentifier(
       fungibleCurrencyId,
       typedChainId
     );
-    if (!chain || !anchor) {
+    if (!anchor) {
       throw WebbError.from(WebbErrorCodes.NoFungibleTokenAvailable);
     }
 
-    const provider = Web3Provider.fromUri(chain.url).intoEthersProvider();
-    const vanchor = VAnchor__factory.connect(anchor, provider);
+    const vAnchorContract = getContract({
+      abi: VAnchor__factory.abi,
+      address: ensureHex(anchor),
+      publicClient: getPublicClient({ chainId: chainId }),
+    });
 
-    const nextIdx = await vanchor.getNextIndex();
+    const nextIdx = await vAnchorContract.read.getNextIndex();
 
     return BigInt(nextIdx);
   }
@@ -92,16 +97,10 @@ export class Web3VAnchorActions extends VAnchorActions<
   ): Promise<ParametersOfTransactMethod<'web3'>> | never {
     tx.next(TransactionState.PreparingTransaction, undefined);
 
-    const typedChainId = this.inner.typedChainId;
-    const gasLimit = gasLimitConfig[typedChainId] ?? DEFAULT_GAS_LIMIT;
-
-    const sharedOverride: Overrides = { gasLimit };
-
     if (isVAnchorDepositPayload(payload)) {
       // Get the wrapped token and check the balance and approvals
-      const tokenWrapper = await this.getTokenWrapper(payload);
-      if (wrapUnwrapToken === '')
-        wrapUnwrapToken = tokenWrapper.contract.address;
+      const tokenWrapper = await this.getTokenWrapperContract(payload);
+      if (wrapUnwrapToken === '') wrapUnwrapToken = tokenWrapper.address;
 
       await this.checkHasBalance(payload, wrapUnwrapToken);
 
@@ -118,18 +117,18 @@ export class Web3VAnchorActions extends VAnchorActions<
         blinding: hexToU8a(`0x${secrets[3]}`),
         index: this.inner.state.defaultUtxoIndex.toString(),
       });
+
       return Promise.resolve([
         tx, // tx
-        payload.note.sourceIdentifyingData, // contractAddress
+        ensureHex(payload.note.sourceIdentifyingData), // contractAddress
         [], // inputs
         [depositUtxo], // outputs
-        BigNumber.from(0), // fee
-        BigNumber.from(0), // refund
+        ZERO_BIG_INT, // fee
+        ZERO_BIG_INT, // refund
         ZERO_ADDRESS, // recipient
         ZERO_ADDRESS, // relayer
         wrapUnwrapToken, // wrapUnwrapToken
         {}, // leavesMap,
-        sharedOverride, // Overrides tx options
       ]);
     } else if (isVAnchorWithdrawPayload(payload)) {
       const { changeUtxo, notes, recipient, refundAmount, feeAmount } = payload;
@@ -140,20 +139,19 @@ export class Web3VAnchorActions extends VAnchorActions<
         this.inner.relayerManager.activeRelayer?.beneficiary ?? ZERO_ADDRESS;
 
       // If no relayer is set, then the fee is 0, otherwise it is the fee amount
-      const feeVal = relayer === ZERO_ADDRESS ? BigNumber.from(0) : feeAmount;
+      const feeVal = relayer === ZERO_ADDRESS ? ZERO_BIG_INT : feeAmount;
 
       return Promise.resolve([
         tx, // tx
-        notes[0].note.targetIdentifyingData, // contractAddress
+        ensureHex(notes[0].note.targetIdentifyingData), // contractAddress
         inputUtxos, // inputs
         [changeUtxo], // outputs
-        BigNumber.from(feeVal), // fee
-        BigNumber.from(refundAmount), // refund
-        recipient, // recipient
-        relayer, // relayer
+        feeVal, // fee
+        refundAmount, // refund
+        ensureHex(recipient), // recipient
+        ensureHex(relayer), // relayer
         wrapUnwrapToken, // wrapUnwrapToken
         leavesMap, // leavesMap
-        sharedOverride, // Overrides tx options
       ]);
     } else if (isVAnchorTransferPayload(payload)) {
       const { changeUtxo, transferUtxo, notes, feeAmount } = payload;
@@ -164,21 +162,20 @@ export class Web3VAnchorActions extends VAnchorActions<
         this.inner.relayerManager.activeRelayer?.beneficiary ?? ZERO_ADDRESS;
 
       // If no relayer is set, then the fee is 0, otherwise it is the fee amount
-      const feeVal = relayer === ZERO_ADDRESS ? BigNumber.from(0) : feeAmount;
+      const feeVal = relayer === ZERO_ADDRESS ? ZERO_BIG_INT : feeAmount;
 
       // set the anchor to make the transfer on (where the notes are being spent for the transfer)
       return Promise.resolve([
         tx, // tx
-        notes[0].note.targetIdentifyingData, // contractAddress
+        ensureHex(notes[0].note.targetIdentifyingData), // contractAddress
         inputUtxos, // inputs
         [changeUtxo, transferUtxo], // outputs
         feeVal, // fee
-        BigNumber.from(0), // refund
+        ZERO_BIG_INT, // refund
         ZERO_ADDRESS, // recipient
-        relayer, // relayer
+        ensureHex(relayer), // relayer
         '', // wrapUnwrapToken (not used for transfers)
         leavesMap, // leavesMap,
-        sharedOverride, // Overrides tx options
       ]);
     } else {
       // Handle by outer try/catch
@@ -198,11 +195,10 @@ export class Web3VAnchorActions extends VAnchorActions<
 
     const relayedVAnchorWithdraw = await activeRelayer.initWithdraw('vAnchor');
 
-    const vanchor = await this.inner.getVariableAnchorByAddress(
-      contractAddress
-    );
+    const vAnchorContract =
+      this.inner.getVAnchorContractByAddress(contractAddress);
 
-    const chainId = await vanchor.contract.getChainId();
+    const chainId = await vAnchorContract.read.getChainId();
 
     const chainInfo: RelayedChainInput = {
       baseOn: 'evm',
@@ -211,19 +207,19 @@ export class Web3VAnchorActions extends VAnchorActions<
       name: chainId.toString(),
     };
 
+    const vAnchor = await this.inner.getVAnchorInstance(
+      contractAddress,
+      this.inner.publicClient
+    );
+
     // Pad the input & output utxo
-    const inputUtxos = await vanchor.padUtxos(rawInputUtxos, 16); // 16 is the require number of inputs (for 8-sided bridge)
-    const outputUtxos = await vanchor.padUtxos(rawOutputUtxos, 2); // 2 is the require number of outputs (for 8-sided bridge)
+    const inputUtxos = await vAnchor.padUtxos(rawInputUtxos, 16); // 16 is the require number of inputs (for 8-sided bridge)
+    const outputUtxos = await vAnchor.padUtxos(rawOutputUtxos, 2); // 2 is the require number of outputs (for 8-sided bridge)
 
-    const setupTransactionArgs = [
+    const { extAmount, extData, publicInputs } = await vAnchor.setupTransaction(
       inputUtxos,
-      outputUtxos,
-      // Ignore the override option if provided
-      ...(restArgs.length === 6 ? restArgs : restArgs.slice(0, -1)),
-    ] as Parameters<typeof vanchor.setupTransaction>;
-
-    const { extAmount, extData, publicInputs } = await vanchor.setupTransaction(
-      ...setupTransactionArgs
+      [outputUtxos[0], outputUtxos[1]],
+      ...restArgs
     );
 
     const relayedDepositTxPayload =
@@ -231,29 +227,29 @@ export class Web3VAnchorActions extends VAnchorActions<
         typeof chainInfo,
         'vAnchor'
       >(chainInfo, {
-        chainId: chainId.toNumber(),
+        chainId: +chainId.toString(),
         id: contractAddress,
         extData: {
           recipient: extData.recipient,
           relayer: extData.relayer,
-          extAmount: extAmount.toHexString().replace('0x', ''),
-          fee: extData.fee,
+          extAmount: toFixedHex(extAmount).replace('0x', ''),
+          fee: toFixedHex(extData.fee),
+          refund: toFixedHex(extData.refund),
+          token: extData.token,
           encryptedOutput1: extData.encryptedOutput1,
           encryptedOutput2: extData.encryptedOutput2,
-          refund: extData.refund,
-          token: extData.token,
         },
         proofData: {
           proof: publicInputs.proof,
           extensionRoots: publicInputs.extensionRoots,
-          extDataHash: padHexString(publicInputs.extDataHash.toHexString()),
+          extDataHash: toFixedHex(publicInputs.extDataHash),
           publicAmount: publicInputs.publicAmount,
           roots: publicInputs.roots,
           outputCommitments: publicInputs.outputCommitments.map((output) =>
-            padHexString(output.toHexString())
+            padHexString(ensureHex(output.toString(16)))
           ),
           inputNullifiers: publicInputs.inputNullifiers.map((nullifier) =>
-            padHexString(nullifier.toHexString())
+            padHexString(ensureHex(nullifier.toString(16)))
           ),
         },
       });
@@ -311,31 +307,28 @@ export class Web3VAnchorActions extends VAnchorActions<
 
   async transact(
     tx: Transaction<NewNotesTxResult>,
-    contractAddress: string,
+    contractAddress: Address,
     inputs: Utxo[],
     outputs: Utxo[],
-    fee: BigNumber,
-    refund: BigNumber,
-    recipient: string,
-    relayer: string,
-    wrapUnwrapToken: string,
-    leavesMap: Record<string, Uint8Array[]>,
-    overridesTransaction?: Overrides
+    fee: bigint,
+    refund: bigint,
+    recipient: Address,
+    relayer: Address,
+    wrapUnwrapToken: Address,
+    leavesMap: Record<string, Uint8Array[]>
   ) {
-    const signer = await this.inner.getProvider().getSigner();
-    const maxEdges = await this.inner.getVAnchorMaxEdges(contractAddress);
-
-    const vanchor = await VAnchor.connect(
+    const vAnchor = await this.inner.getVAnchorInstance(
       contractAddress,
-      await this.inner.getZkFixtures(maxEdges, true),
-      await this.inner.getZkFixtures(maxEdges, false),
-      signer
+      this.inner.publicClient
     );
 
     tx.txHash = '';
     tx.next(TransactionState.SendingTransaction, '');
 
-    const receipt = await vanchor.transact(
+    const typedChainId = this.inner.typedChainId;
+    const gasLimit = gasLimitConfig[typedChainId] ?? DEFAULT_GAS_LIMIT;
+
+    const hash = await vAnchor.transact(
       inputs,
       outputs,
       fee,
@@ -345,17 +338,20 @@ export class Web3VAnchorActions extends VAnchorActions<
       wrapUnwrapToken,
       leavesMap,
       {
-        ...overridesTransaction,
+        gas: gasLimit,
+        walletClient: this.inner.walletClient,
         onTransactionState(state, payload) {
           handleVAnchorTxState(tx, state, payload);
         },
       }
     );
 
-    return {
-      transactionHash: receipt.transactionHash,
-      receipt: receipt,
-    };
+    tx.txHash = hash;
+
+    // Wait for the transaction to be finalized.
+    await this.inner.publicClient.waitForTransactionReceipt({ hash });
+
+    return hash;
   }
 
   // Check if the evm address and keyData pairing has already registered.
@@ -379,10 +375,12 @@ export class Web3VAnchorActions extends VAnchorActions<
 
   async register(
     anchorAddress: string,
-    account: string,
-    keyData: string
+    account: Address,
+    keyData: Address
   ): Promise<boolean> {
-    const vanchor = await this.inner.getVariableAnchorByAddress(anchorAddress);
+    const vAnchorContract =
+      this.inner.getVAnchorContractByAddress(anchorAddress);
+
     this.inner.notificationHandler({
       description: 'Registering Account',
       key: 'register',
@@ -392,8 +390,11 @@ export class Web3VAnchorActions extends VAnchorActions<
     });
 
     try {
-      // The user may reject on-chain registration
-      await vanchor.register(account, keyData);
+      const { request } = await vAnchorContract.simulate.register([
+        { owner: account, keyData },
+      ]);
+
+      await this.inner.walletClient.sendTransaction(request);
     } catch (ex) {
       this.inner.notificationHandler({
         description: 'Account Registration Failed',
@@ -402,6 +403,7 @@ export class Web3VAnchorActions extends VAnchorActions<
         message: 'Account Registration Failed',
         name: 'Transaction',
       });
+
       return false;
     }
 
@@ -431,13 +433,14 @@ export class Web3VAnchorActions extends VAnchorActions<
     anchorAddress: string,
     owner: Keypair
   ): Promise<Note[]> {
-    const cancelToken = new CancellationToken();
-    const vanchor = await this.inner.getVariableAnchorByAddress(anchorAddress);
+    const vAnchorContract =
+      this.inner.getVAnchorContractByAddress(anchorAddress);
+
     const notes = await this.inner.getVAnchorNotesFromChain(
-      vanchor,
-      owner,
-      cancelToken.abortSignal
+      vAnchorContract,
+      owner
     );
+
     return notes;
   }
 
@@ -446,40 +449,60 @@ export class Web3VAnchorActions extends VAnchorActions<
     option: {
       inputs: Utxo[];
       outputs: Utxo[];
-      fee: BigNumber;
-      refund: BigNumber;
-      recipient: string;
-      relayer: string;
+      fee: bigint;
+      refund: bigint;
+      recipient: Address;
+      relayer: Address;
       wrapUnwrapToken: string;
       leavesMap: Record<string, Uint8Array[]>;
     }
-  ): Promise<BigNumber> | never {
-    const vanchor = await this.inner.getVariableAnchorByAddress(vAnchorAddress);
+  ): Promise<bigint> | never {
+    const account = this.inner.walletClient.account;
+    if (!account) {
+      throw WebbError.from(WebbErrorCodes.NoAccountAvailable);
+    }
 
-    const { publicInputs, extData, extAmount } = await vanchor.setupTransaction(
-      await vanchor.padUtxos(option.inputs, 16), // 16 is the max number of inputs
-      await vanchor.padUtxos(option.outputs, 2), // 2 is the max number of outputs
-      option.fee,
-      option.refund,
-      option.recipient,
-      option.relayer,
-      option.wrapUnwrapToken,
-      option.leavesMap
+    const vAnchorInstance = await this.inner.getVAnchorInstance(
+      vAnchorAddress,
+      this.inner.publicClient
     );
 
-    const options = await vanchor.getWrapUnwrapOptions(
+    const inUtxos = await vAnchorInstance.padUtxos(option.inputs, 16); // 16 is the max number of inputs
+    const [outUtxo1, outUtxo2] = await vAnchorInstance.padUtxos(
+      option.outputs,
+      2
+    ); // 2 is the max number of outputs
+
+    const { publicInputs, extData, extAmount } =
+      await vAnchorInstance.setupTransaction(
+        inUtxos,
+        [outUtxo1, outUtxo2],
+        option.fee,
+        option.refund,
+        option.recipient,
+        option.relayer,
+        option.wrapUnwrapToken,
+        option.leavesMap
+      );
+
+    const options = await vAnchorInstance.getWrapUnwrapOptions(
       extAmount,
       option.refund,
       option.wrapUnwrapToken
     );
 
-    return vanchor.contract.estimateGas.transact(
-      publicInputs.proof,
-      ZERO_BYTES32,
-      extData,
-      publicInputs,
-      extData,
-      options
+    return vAnchorInstance.contract.estimateGas.transact(
+      [
+        publicInputs.proof,
+        ZERO_BYTES32,
+        extData,
+        { ...publicInputs, publicAmount: BigInt(publicInputs.publicAmount) },
+        extData,
+      ],
+      {
+        account,
+        value: options.value ?? ZERO_BIG_INT,
+      }
     );
   }
 
@@ -490,16 +513,30 @@ export class Web3VAnchorActions extends VAnchorActions<
 
     const payload = notes[0];
     const destVAnchor = await this.getVAnchor(payload, true);
-    const treeHeight = await destVAnchor.contract.getLevels();
+    const treeHeight = await destVAnchor.read.getLevels();
 
     // Loop through the notes and populate the leaves map
     const leavesMap: Record<string, Uint8Array[]> = {};
 
-    const notesLeaves = await Promise.all(
-      notes.map((note) =>
-        this.fetchNoteLeaves(note, leavesMap, destVAnchor, treeHeight, tx)
-      )
-    );
+    const notesLeaves: Array<
+      Awaited<ReturnType<Web3VAnchorActions['fetchNoteLeaves']>>
+    > = [];
+
+    // Fetch the leaves for each note in sequencial order
+    // because if we fetch them in parallel, if one of the
+    // task fails, others will still be running and resolve.
+    // That makes the UI to show the wrong state.
+    for (const note of notes) {
+      const noteLeaves = await this.fetchNoteLeaves(
+        note,
+        leavesMap,
+        destVAnchor,
+        treeHeight,
+        tx
+      );
+
+      notesLeaves.push(noteLeaves);
+    }
 
     // Keep track of the leafindices for each note
     const leafIndices: number[] = [];
@@ -508,10 +545,10 @@ export class Web3VAnchorActions extends VAnchorActions<
     const inputUtxos: Utxo[] = [];
 
     // calculate the sum of input notes (for calculating the change utxo)
-    let sumInputNotes: BigNumber = BigNumber.from(0);
+    let sumInputNotes: bigint = ZERO_BIG_INT;
 
     notesLeaves.forEach(({ amount, leafIndex, utxo }) => {
-      sumInputNotes = sumInputNotes.add(amount);
+      sumInputNotes += BigInt(amount);
       leafIndices.push(leafIndex);
       inputUtxos.push(utxo);
     });
@@ -530,8 +567,9 @@ export class Web3VAnchorActions extends VAnchorActions<
    * @param addressOrTreeId the address of the vanchor or the treeId of the vanchor
    */
   async getLeafIndex(
-    receipt: ContractReceipt,
+    txHash: Hash,
     note: Note,
+    _: number, // Ignore the index before insertion
     addressOrTreeId: string
   ): Promise<bigint> {
     const typedChainId = this.inner.typedChainId;
@@ -540,47 +578,32 @@ export class Web3VAnchorActions extends VAnchorActions<
       throw WebbError.from(WebbErrorCodes.UnsupportedChain);
     }
 
-    const vanchor = VAnchor__factory.connect(
-      addressOrTreeId,
-      Web3Provider.fromUri(chain.url).intoEthersProvider()
-    );
-
-    // Get fragment and topic of the `NewCommitment` event.
-    const eventFragment = vanchor.interface.getEvent('NewCommitment');
-    const topic = vanchor.interface.getEventTopic(eventFragment);
+    const receipt = await this.inner.publicClient.getTransactionReceipt({
+      hash: txHash,
+    });
 
-    // Filter the logs for the event
-    const filteredLogs = receipt.logs.filter((log) =>
-      log.topics.includes(topic)
+    const logs = await this.inner.getNewCommitmentLogs(
+      this.inner.publicClient,
+      getContract({
+        address: ensureHex(addressOrTreeId),
+        abi: VAnchor__factory.abi,
+        publicClient: this.inner.publicClient,
+      }),
+      receipt.blockNumber,
+      receipt.blockNumber
     );
 
-    // Parse the log data
-    const parsedEvents = filteredLogs
-      .map((log) => {
-        const decodedValues = vanchor.interface.decodeEventLog(
-          eventFragment,
-          log.data,
-          log.topics
-        );
-        return decodedValues;
-      })
-      .map((val) => ({
-        leafIndex: BigNumber.from(val.leafIndex),
-        commitment: BigNumber.from(val.commitment),
-      }));
-
     // Get the leaf index of the note
-    const depositedCommitment = generateCircomCommitment(note.note).toString();
-    const event = parsedEvents.find((value) =>
-      value.commitment.eq(depositedCommitment)
-    );
-
-    if (!event) {
-      console.error('Leaf index not found in logs, falling back `0`');
-      return BigInt(0);
+    const depositedCommitment = generateCircomCommitment(note.note);
+    const log = logs.find((log) => log.args.commitment === depositedCommitment);
+    if (!log) {
+      console.error(
+        `Leaf index not found in log ${log}, falling back to \`${ZERO_BIG_INT}\``
+      );
+      return ZERO_BIG_INT;
     }
 
-    return event.leafIndex.toBigInt();
+    return log.args.leafIndex;
   }
 
   async getNextIndex(
@@ -596,10 +619,15 @@ export class Web3VAnchorActions extends VAnchorActions<
       throw WebbError.from(WebbErrorCodes.NoFungibleTokenAvailable);
     }
 
-    const provider = Web3Provider.fromUri(chain.url).intoEthersProvider();
-    const vanchor = VAnchor__factory.connect(anchor, provider);
+    const publicClient = getPublicClient({ chainId: chain.id });
+
+    const vAnchorContract = getContract({
+      abi: VAnchor__factory.abi,
+      address: ensureHex(anchor),
+      publicClient,
+    });
 
-    const nextIdx = await vanchor.getNextIndex();
+    const nextIdx = await vAnchorContract.read.getNextIndex();
 
     return BigInt(nextIdx);
   }
@@ -612,37 +640,41 @@ export class Web3VAnchorActions extends VAnchorActions<
     return new ResourceId(anchorAddress, chainType, chainId);
   }
 
+  // ================== PRIVATE METHODS ===================
+
   private async fetchNoteLeaves(
     note: Note,
     leavesMap: Record<string, Uint8Array[]>,
-    destVAnchor: VAnchor,
+    destVAnchor: GetContractReturnType<
+      typeof VAnchor__factory.abi,
+      PublicClient
+    >,
     treeHeight: number,
     tx?: Transaction<NewNotesTxResult>
-  ): Promise<{ leafIndex: number; utxo: Utxo; amount: BigNumber }> | never {
+  ): Promise<{ leafIndex: number; utxo: Utxo; amount: bigint }> | never {
     if (tx) {
       // Fetching leaves from relayer initially
       tx.next(TransactionState.FetchingLeavesFromRelayer, undefined);
     }
 
     const parsedNote = note.note;
-    const amount = BigNumber.from(parsedNote.amount);
+    const amount = BigInt(parsedNote.amount);
 
-    let destRelayedRoot: string;
+    let destRelayedRootBI: bigint;
 
     // Get the latest root that has been relayed from the source chain to the destination chain
     if (parsedNote.sourceChainId === parsedNote.targetChainId) {
-      const destRoot = await destVAnchor.contract.getLastRoot();
-      destRelayedRoot = destRoot.toHexString();
+      destRelayedRootBI = await destVAnchor.read.getLastRoot();
     } else {
-      const edgeIndex = await destVAnchor.contract.edgeIndex(
-        parsedNote.sourceChainId
-      );
-      const edge = await destVAnchor.contract.edgeList(edgeIndex);
-      destRelayedRoot = edge[1].toHexString();
+      const edgeIndex = await destVAnchor.read.edgeIndex([
+        BigInt(parsedNote.sourceChainId),
+      ]);
+      const edge = await destVAnchor.read.edgeList([edgeIndex]);
+      destRelayedRootBI = edge[1];
     }
 
     // Fixed the root to be 32 bytes
-    destRelayedRoot = toFixedHex(destRelayedRoot);
+    const destRelayedRoot = toFixedHex(destRelayedRootBI);
 
     // The commitment of the note
     const commitment = generateCircomCommitment(parsedNote);
@@ -652,34 +684,38 @@ export class Web3VAnchorActions extends VAnchorActions<
     // If we haven't had any leaves from this chain yet, we need to fetch them
     if (!leavesMap[parsedNote.sourceChainId]) {
       // Set up a provider for the source chain
-      const sourceChainConfig =
-        this.inner.config.chains[Number(parsedNote.sourceChainId)];
-      const sourceHttpProvider = Web3Provider.fromUri(sourceChainConfig.url);
-      const sourceAddress = parsedNote.sourceIdentifyingData;
-      const sourceEthers = sourceHttpProvider.intoEthersProvider();
-
-      const sourceVAnchor =
-        await this.inner.getVariableAnchorByAddressAndProvider(
-          sourceAddress,
-          sourceEthers
-        );
+      const { chainId } = parseTypedChainId(+parsedNote.sourceChainId);
+      const sourceAnchorId = parsedNote.sourceIdentifyingData;
+
+      const sourcePublicClient = getPublicClient({ chainId });
+      const sourceVAnchorContract = getContract({
+        abi: VAnchor__factory.abi,
+        address: ensureHex(sourceAnchorId),
+        publicClient: sourcePublicClient,
+      });
 
-      const chainId = await sourceVAnchor.contract.getChainId();
       const resourceId = ResourceId.newFromContractAddress(
-        sourceVAnchor.contract.address,
+        sourceVAnchorContract.address,
         ChainType.EVM,
-        chainId.toNumber()
+        chainId
       );
 
       const leafStorage = await bridgeStorageFactory(resourceId.toString());
       const { provingLeaves, commitmentIndex: leafIndex } =
-        await this.inner.getVAnchorLeaves(sourceVAnchor, leafStorage, {
+        await this.inner.getVAnchorLeaves(sourceVAnchorContract, leafStorage, {
           treeHeight,
           targetRoot: destRelayedRoot,
           commitment,
           tx,
         });
 
+      // Validate that the commitment is in the tree
+      if (leafIndex === -1) {
+        return Promise.reject(
+          WebbError.from(WebbErrorCodes.CommitmentNotInTree)
+        );
+      }
+
       leavesMap[parsedNote.sourceChainId] = provingLeaves.map((leaf) => {
         return hexToU8a(leaf);
       });
@@ -698,6 +734,14 @@ export class Web3VAnchorActions extends VAnchorActions<
           destRelayedRoot,
           commitment.toString()
         );
+
+      // Validate that the commitment is in the tree
+      if (leafIndex === -1) {
+        return Promise.reject(
+          WebbError.from(WebbErrorCodes.CommitmentNotInTree)
+        );
+      }
+
       tx?.next(TransactionState.ValidatingLeaves, true);
 
       commitmentIndex = leafIndex;
@@ -712,14 +756,6 @@ export class Web3VAnchorActions extends VAnchorActions<
       }
     }
 
-    // Validate that the commitment is in the tree
-    if (commitmentIndex === -1) {
-      // Outer try/catch will handle this
-      throw new Error(
-        'Relayer has not yet relayed the commitment to the destination chain'
-      );
-    }
-
     const utxo = await utxoFromVAnchorNote(parsedNote, commitmentIndex);
 
     return {
@@ -732,7 +768,9 @@ export class Web3VAnchorActions extends VAnchorActions<
   private async getVAnchor(
     payload: Note,
     isDestAnchor = false
-  ): Promise<VAnchor> | never {
+  ):
+    | Promise<GetContractReturnType<typeof VAnchor__factory.abi, PublicClient>>
+    | never {
     const { note } = payload;
     const { sourceChainId, targetChainId } = note;
     const vanchors = await this.inner.methods.bridgeApi.getVAnchors();
@@ -756,44 +794,52 @@ export class Web3VAnchorActions extends VAnchorActions<
       throw new Error(`No Anchor for the chain ${note.targetChainId}`);
     }
 
-    return await this.inner.getVariableAnchorByAddress(vanchorAddress);
+    return this.inner.getVAnchorContractByAddress(vanchorAddress);
   }
 
-  private async getTokenWrapper(
-    payload: Note,
-    isDest = false
-  ): Promise<FungibleTokenWrapper> {
+  private async getTokenWrapperContract(payload: Note, isDest = false) {
     const vAnchor = await this.getVAnchor(payload, isDest);
-    const currentWebbToken = await vAnchor.contract.token();
-    return FungibleTokenWrapper.connect(
-      currentWebbToken,
-      this.inner.getEthersProvider().getSigner()
-    );
+    const currentWebbToken = await vAnchor.read.token();
+    return getContract({
+      abi: FungibleTokenWrapper__factory.abi,
+      address: currentWebbToken,
+      publicClient: this.inner.publicClient,
+    });
   }
 
   private async checkHasBalance(
     payload: Note,
     wrapUnwrapToken: string
   ): Promise<void> | never {
-    const provider = this.inner.getEthersProvider();
-    const signer = await provider.getSigner().getAddress();
+    const account = this.inner.walletClient.account;
+    if (!account) {
+      throw WebbError.from(WebbErrorCodes.NoAccountAvailable);
+    }
+
     // Checking for balance of the wrapUnwrapToken
     let hasBalance: boolean;
     // If the `wrapUnwrapToken` is the `ZERO_ADDRESS`, we are wrapping
     // the native token. Therefore, we must check the native balance.
     if (checkNativeAddress(wrapUnwrapToken)) {
-      const nativeBalance = await provider.getBalance(signer);
-      hasBalance = nativeBalance.gte(payload.note.amount);
+      const nativeBalance = await this.inner.publicClient.getBalance({
+        address: account.address,
+      });
+      hasBalance = nativeBalance >= BigInt(payload.note.amount);
     } else {
       // If the `wrapUnwrapToken` is not the `ZERO_ADDRESS`, we assume that
       // the `wrapUnwrapToken` has been set to either the wrappedToken address
       // of the address of a wrappable ERC20 token. In either case, we can check the
       // balance using the `ERC20` contract.
-      const erc20 = ERC20__factory.connect(wrapUnwrapToken, provider);
-      const balance = await erc20.balanceOf(signer);
+      const erc20Contract = getContract({
+        address: ensureHex(wrapUnwrapToken),
+        abi: ERC20__factory.abi,
+        publicClient: this.inner.publicClient,
+      });
+      const balance = await erc20Contract.read.balanceOf([account.address]);
       console.log('Balance: ', balance);
-      hasBalance = balance.gte(payload.note.amount);
+      hasBalance = balance >= BigInt(payload.note.amount);
     }
+
     // Notification failed transaction if not enough balance
     if (!hasBalance) {
       const { chainId, chainType } = parseTypedChainId(
@@ -815,17 +861,30 @@ export class Web3VAnchorActions extends VAnchorActions<
     tx: Transaction<NewNotesTxResult>,
     payload: Note,
     wrapUnwrapToken: string,
-    tokenWrapper: FungibleTokenWrapper
+    tokenWrapper: GetContractReturnType<
+      typeof FungibleTokenWrapper__factory.abi,
+      PublicClient
+    >
   ): Promise<void> | never {
     const { note } = payload;
     const { amount } = note;
 
-    const srcVAnchor = await this.getVAnchor(payload);
+    const account = this.inner.walletClient.account;
+    if (!account) {
+      throw WebbError.from(WebbErrorCodes.NoAccountAvailable);
+    }
+
+    const srcVAnchor = await this.inner.getVAnchorInstance(
+      ensureHex(payload.note.sourceIdentifyingData),
+      this.inner.publicClient
+    );
+
     const spenderAddress = srcVAnchor.contract.address;
-    const currentWebbToken = await srcVAnchor.getWebbToken();
+    const currentWebbToken = srcVAnchor.getWebbToken();
+
+    const amountBI = BigInt(amount);
 
-    const approvalValue = await tokenWrapper.contract.getAmountToWrap(amount);
-    let approvalTransaction: ContractTransaction | undefined;
+    const approvalValue = await tokenWrapper.read.getAmountToWrap([amountBI]);
 
     const isNative = checkNativeAddress(wrapUnwrapToken);
 
@@ -836,55 +895,58 @@ export class Web3VAnchorActions extends VAnchorActions<
     // Only non-native tokens require approval
     if (!isNative) {
       const isRequiredApproval = !isWrapOrUnwrap
-        ? await srcVAnchor.isWebbTokenApprovalRequired(amount)
+        ? await srcVAnchor.isWebbTokenApprovalRequired(amountBI, account)
         : await srcVAnchor.isWrappableTokenApprovalRequired(
-            wrapUnwrapToken,
-            approvalValue
+            ensureHex(wrapUnwrapToken),
+            approvalValue,
+            account
           );
 
       if (isRequiredApproval) {
+        let approvalHash: string;
+
+        tx.next(TransactionState.Intermediate, {
+          name: 'Approval is required for depositing',
+          data: {
+            tokenAddress: wrapUnwrapToken,
+          },
+        });
+
         if (isWrapOrUnwrap) {
           // approve the wrappable asset
-          const token = ERC20__factory.connect(
-            wrapUnwrapToken,
-            this.inner.getEthersProvider().getSigner()
-          );
-          approvalTransaction = await token.approve(
-            spenderAddress,
-            approvalValue,
+          const tokenContract = getContract({
+            address: ensureHex(wrapUnwrapToken),
+            abi: ERC20__factory.abi,
+            publicClient: this.inner.publicClient,
+          });
+
+          const { request } = await tokenContract.simulate.approve(
+            [spenderAddress, approvalValue],
             {
-              gasLimit: '0x5B8D80',
+              gas: BigInt('0x5B8D80'),
             }
           );
+
+          approvalHash = await this.inner.walletClient.sendTransaction(request);
         } else {
           // approve the token
-          approvalTransaction = await currentWebbToken.approve(
-            spenderAddress,
-            amount,
+          const { request } = await currentWebbToken.simulate.approve(
+            [spenderAddress, amountBI],
             {
-              gasLimit: '0x5B8D80',
+              gas: BigInt('0x5B8D80'),
             }
           );
-        }
-      }
-    }
 
-    if (approvalTransaction) {
-      // Notification Waiting for approval notification
-      tx.next(TransactionState.Intermediate, {
-        name: 'Approval is required for depositing',
-        data: {
-          tokenAddress: wrapUnwrapToken,
-        },
-      });
+          approvalHash = await this.inner.walletClient.sendTransaction(request);
+        }
 
-      await approvalTransaction.wait();
-      tx.next(TransactionState.Intermediate, {
-        name: 'Approved',
-        data: {
-          txHash: approvalTransaction.hash,
-        },
-      });
+        tx.next(TransactionState.Intermediate, {
+          name: 'Approved',
+          data: {
+            txHash: approvalHash,
+          },
+        });
+      }
     }
   }
 }
diff --git a/libs/web3-api-provider/src/webb-provider/wrap-unwrap.ts b/libs/web3-api-provider/src/webb-provider/wrap-unwrap.ts
index 507786b1f3..6eb209803b 100644
--- a/libs/web3-api-provider/src/webb-provider/wrap-unwrap.ts
+++ b/libs/web3-api-provider/src/webb-provider/wrap-unwrap.ts
@@ -7,20 +7,30 @@ import {
   WrappingEvent,
   WrapUnwrap,
 } from '@webb-tools/abstract-api-provider';
-import { CurrencyType, zeroAddress } from '@webb-tools/dapp-types';
 import {
-  ERC20__factory as ERC20Factory,
+  ERC20__factory,
   FungibleTokenWrapper__factory,
 } from '@webb-tools/contracts';
+import { ensureHex } from '@webb-tools/dapp-config';
+import {
+  CurrencyType,
+  WebbError,
+  WebbErrorCodes,
+  zeroAddress,
+} from '@webb-tools/dapp-types';
 import { calculateTypedChainId, ChainType } from '@webb-tools/sdk-core';
-import { BigNumberish, ContractTransaction } from 'ethers';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
-import Web3 from 'web3';
-
+import {
+  Address,
+  getContract,
+  GetContractReturnType,
+  parseEther,
+  PublicClient,
+} from 'viem';
 import { WebbWeb3Provider } from '../webb-provider';
-import { FungibleTokenWrapper } from '@webb-tools/tokens';
 
 export type Web3WrapPayload = Amount;
+
 export type Web3UnwrapPayload = Amount;
 
 export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
@@ -68,50 +78,57 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
     if (!fungibleToken) {
       return false;
     }
+
     const webbFungibleToken = this.fungibleTokenwrapper(fungibleToken);
+    if (!webbFungibleToken) {
+      return false;
+    }
 
-    const account = await this.inner.accounts.accounts();
-    const currentAccount = account[0];
+    const accounts = await this.inner.accounts.accounts();
+    const currentAccount = accounts[0];
+    const amountBI = BigInt(amount);
 
-    const fn = async (account: string, amount: BigNumberish) => {
-      const [currentWrappedLiquidity] = await Promise.all([
-        webbFungibleToken.contract.totalSupply(),
-        webbFungibleToken.contract.provider.getBalance(
-          webbFungibleToken.contract.address
-        ),
+    const fn = async (account: Address, amount: bigint) => {
+      const [totalSupply, currentWrappedLiquidity] = await Promise.all([
+        webbFungibleToken.read.totalSupply(),
+        this.inner.publicClient.getBalance({
+          address: webbFungibleToken.address,
+        }),
       ]);
 
-      if (
-        currentWrappedLiquidity.lt(amount) ||
-        currentWrappedLiquidity.lt(amount)
-      ) {
+      if (totalSupply < amount || currentWrappedLiquidity < amount) {
         // no enough liquidity
         return false;
       }
 
-      const userBalance = await webbFungibleToken.contract.balanceOf(account);
+      const userBalance = await webbFungibleToken.read.balanceOf([account]);
 
-      if (userBalance.gte(amount)) {
+      if (userBalance >= amount) {
         return true;
       }
 
       return false;
     };
 
-    return fn(currentAccount.address, Number(amount));
+    return fn(currentAccount.address, amountBI);
   }
 
   async unwrap(unwrapPayload: Web3UnwrapPayload): Promise<string> {
     const { amount: amountNumber } = unwrapPayload;
 
-    const amount = Web3.utils.toWei(String(amountNumber), 'ether');
+    const amount = parseEther(String(amountNumber));
+
     const fungibleToken = this.inner.methods.bridgeApi.getBridge()?.currency;
+
     const wrappableToken = this.inner.state.wrappableCurrency;
     if (!fungibleToken || !wrappableToken) {
       return '';
     }
 
     const webbFungibleToken = this.fungibleTokenwrapper(fungibleToken);
+    if (!webbFungibleToken) {
+      return '';
+    }
 
     try {
       this.inner.notificationHandler({
@@ -122,7 +139,7 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
         message: 'FungibleTokenwrapper:unwrap',
         name: 'Transaction',
       });
-      const wrappableTokenAddress = await wrappableToken.getAddress(
+      const wrappableTokenAddress = wrappableToken.getAddress(
         await this.inner.getChainId()
       );
 
@@ -131,12 +148,13 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
           `No wrappable token address for ${wrappableToken.view.name} on selected chain`
         );
       }
-      const tx = await webbFungibleToken.contract.unwrap(
-        wrappableTokenAddress,
-        amount
-      );
+      const { request } = await webbFungibleToken.simulate.unwrap([
+        ensureHex(wrappableTokenAddress),
+        amount,
+      ]);
+
+      const txHash = await this.inner.walletClient.sendTransaction(request);
 
-      await tx.wait();
       this.inner.notificationHandler({
         description: `Unwrapping ${amountNumber} of ${fungibleToken.view.name} to
         ${wrappableToken.view.name}`,
@@ -146,7 +164,7 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
         name: 'Transaction',
       });
 
-      return tx.hash;
+      return txHash;
     } catch (e) {
       console.log('error while unwrapping: ', e);
       this.inner.notificationHandler({
@@ -169,13 +187,23 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
       return false;
     }
     const webbFungibleToken = this.fungibleTokenwrapper(fungibleToken);
+    if (!webbFungibleToken) {
+      return false;
+    }
 
     if (wrappableToken.view.type === CurrencyType.NATIVE) {
-      return webbFungibleToken.isNativeAllowed();
+      return webbFungibleToken.read.isNativeAllowed();
     } else {
-      const tokenAddress = wrappableToken.getAddress(this.currentChainId!)!;
+      if (!this.currentChainId) {
+        return false;
+      }
 
-      return webbFungibleToken.canWrap(tokenAddress);
+      const tokenAddress = wrappableToken.getAddress(this.currentChainId);
+      if (!tokenAddress) {
+        return false;
+      }
+
+      return webbFungibleToken.read.isValidToken([ensureHex(tokenAddress)]);
     }
   }
 
@@ -188,7 +216,16 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
     }
 
     const webbFungibleToken = this.fungibleTokenwrapper(fungibleToken);
-    const amount = Web3.utils.toWei(String(amountNumber), 'ether');
+    if (!webbFungibleToken) {
+      return '';
+    }
+
+    const wrappableAddress = this.getAddressFromCurrency(wrappableToken);
+    if (!wrappableAddress) {
+      return '';
+    }
+
+    const amount = parseEther(String(amountNumber));
 
     try {
       this.inner.notificationHandler({
@@ -199,20 +236,27 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
         message: 'FungibleTokenwrapper:wrap',
         name: 'Transaction',
       });
-      let tx: ContractTransaction;
 
       // If wrapping an erc20, check for approvals
-      if (this.getAddressFromCurrency(wrappableToken) !== zeroAddress) {
-        const wrappableTokenInstance = ERC20Factory.connect(
-          this.getAddressFromCurrency(wrappableToken),
-          this.inner.getEthersProvider().getSigner()
-        );
-        const wrappableTokenAllowance = await wrappableTokenInstance.allowance(
-          await this.inner.getEthersProvider().getSigner().getAddress(),
-          wrappableTokenInstance.address
-        );
+      if (wrappableAddress !== zeroAddress) {
+        const wrappableTokenInstance = getContract({
+          address: ensureHex(wrappableAddress),
+          abi: ERC20__factory.abi,
+          publicClient: this.inner.publicClient,
+        });
 
-        if (wrappableTokenAllowance.lt(amount)) {
+        const account = this.inner.walletClient.account;
+        if (!account) {
+          throw WebbError.from(WebbErrorCodes.NoAccountAvailable);
+        }
+
+        const wrappableTokenAllowance =
+          await wrappableTokenInstance.read.allowance([
+            account.address,
+            wrappableTokenInstance.address,
+          ]);
+
+        if (wrappableTokenAllowance < BigInt(amount)) {
           this.inner.notificationHandler({
             description: 'Waiting for token approval',
             key: 'waiting-approval',
@@ -221,20 +265,25 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
             name: 'Transaction',
             persist: true,
           });
-          tx = await wrappableTokenInstance.approve(
-            webbFungibleToken.contract.address,
-            amount
-          );
-          await tx.wait();
+
+          const { request } = await wrappableTokenInstance.simulate.approve([
+            webbFungibleToken.address,
+            amount,
+          ]);
+
+          await this.inner.walletClient.sendTransaction(request);
+
           this.inner.notificationHandler.remove('waiting-approval');
         }
       }
 
-      tx = await webbFungibleToken.contract.wrap(
-        this.getAddressFromCurrency(wrappableToken),
-        amount
-      );
-      await tx.wait();
+      const { request } = await webbFungibleToken.simulate.wrap([
+        wrappableAddress,
+        amount,
+      ]);
+
+      const txHash = await this.inner.walletClient.sendTransaction(request);
+
       this.inner.notificationHandler({
         description: `Wrapping ${amountNumber} of ${wrappableToken.view.name} to
         ${fungibleToken.view.name}`,
@@ -244,7 +293,7 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
         name: 'Transaction',
       });
 
-      return tx.hash;
+      return txHash;
     } catch (e) {
       console.log('error while wrapping: ', e);
       this.inner.notificationHandler({
@@ -260,18 +309,38 @@ export class Web3WrapUnwrap extends WrapUnwrap<WebbWeb3Provider> {
     }
   }
 
-  private getAddressFromCurrency(currency: Currency): string {
-    const currentNetwork = this.currentChainId!;
-    return currency.getAddress(currentNetwork)!;
+  private getAddressFromCurrency(currency: Currency): Address | undefined {
+    const currentNetwork = this.currentChainId;
+    if (!currentNetwork) {
+      return;
+    }
+
+    const addr = currency.getAddress(currentNetwork);
+    if (!addr) {
+      return;
+    }
+
+    return ensureHex(addr);
   }
 
-  fungibleTokenwrapper(currency: Currency): FungibleTokenWrapper {
-    const contractAddress = this.getAddressFromCurrency(currency);
-    const signer = this.inner.getEthersProvider().getSigner();
-    const contract = FungibleTokenWrapper__factory.connect(
-      contractAddress,
-      signer
-    );
-    return new FungibleTokenWrapper(contract, signer);
+  fungibleTokenwrapper(
+    currency: Currency
+  ):
+    | GetContractReturnType<
+        typeof FungibleTokenWrapper__factory.abi,
+        PublicClient
+      >
+    | undefined {
+    const address = this.getAddressFromCurrency(currency);
+
+    if (!address) {
+      return;
+    }
+
+    return getContract({
+      address,
+      abi: FungibleTokenWrapper__factory.abi,
+      publicClient: this.inner.publicClient,
+    });
   }
 }
diff --git a/libs/webb-ui-components/src/components/Avatar/Avatar.tsx b/libs/webb-ui-components/src/components/Avatar/Avatar.tsx
index 6a4bd19628..b90e810c62 100644
--- a/libs/webb-ui-components/src/components/Avatar/Avatar.tsx
+++ b/libs/webb-ui-components/src/components/Avatar/Avatar.tsx
@@ -3,8 +3,8 @@ import * as AvatarPrimitive from '@radix-ui/react-avatar';
 import cx from 'classnames';
 import { twMerge } from 'tailwind-merge';
 
-import { Typography } from '../../typography';
-import { Identicon } from '.';
+import { Typography } from '../../typography/Typography';
+import { Identicon } from './Identicon';
 import { AvatarProps } from './types';
 import { getAvatarSizeInPx, getAvatarClassNames } from './utils';
 
diff --git a/libs/webb-ui-components/src/components/Button/Button.tsx b/libs/webb-ui-components/src/components/Button/Button.tsx
index 28c8d1664a..b27c606626 100644
--- a/libs/webb-ui-components/src/components/Button/Button.tsx
+++ b/libs/webb-ui-components/src/components/Button/Button.tsx
@@ -72,7 +72,7 @@ export const Button = React.forwardRef<HTMLElement, ButtonProps>(
         ref={ref}
       >
         {isLoading && spinnerPlacement === 'start' && (
-          <ButtonSpinner label={loadingText}>{spinner}</ButtonSpinner>
+          <ButtonSpinner hasLabel={!!loadingText}>{spinner}</ButtonSpinner>
         )}
         {isLoading ? (
           loadingText || (
@@ -84,7 +84,7 @@ export const Button = React.forwardRef<HTMLElement, ButtonProps>(
           <ButtonContent {...contentProps} />
         )}
         {isLoading && spinnerPlacement === 'end' && (
-          <ButtonSpinner label={loadingText} placement="end">
+          <ButtonSpinner hasLabel={!!loadingText} placement="end">
             {spinner}
           </ButtonSpinner>
         )}
diff --git a/libs/webb-ui-components/src/components/Button/ButtonSpinner.tsx b/libs/webb-ui-components/src/components/Button/ButtonSpinner.tsx
index 1bdedffd32..bb6817f676 100644
--- a/libs/webb-ui-components/src/components/Button/ButtonSpinner.tsx
+++ b/libs/webb-ui-components/src/components/Button/ButtonSpinner.tsx
@@ -8,14 +8,14 @@ export const ButtonSpinner: React.FC<ButtonSpinnerProps> = (props) => {
   const {
     children = <Spinner darkMode={props.darkMode} className="w-5 h-5" />,
     className,
-    label,
+    hasLabel = false,
     placement = 'start',
   } = props;
 
   const mergedClassName = twMerge(
     'flex items-center',
-    label ? 'relative' : 'absolute',
-    label ? (placement === 'start' ? `mr-2` : `ml-2`) : undefined,
+    hasLabel ? 'relative' : 'absolute',
+    hasLabel ? (placement === 'start' ? `mr-2` : `ml-2`) : undefined,
     className
   );
 
diff --git a/libs/webb-ui-components/src/components/Button/types.ts b/libs/webb-ui-components/src/components/Button/types.ts
index 9e121b336d..a09558d88a 100644
--- a/libs/webb-ui-components/src/components/Button/types.ts
+++ b/libs/webb-ui-components/src/components/Button/types.ts
@@ -131,9 +131,10 @@ export interface ButtonProps extends ButtonBase, IWebbComponentBase {
 
 export interface ButtonSpinnerProps extends WebbComponentBase {
   /**
-   * The label to show when `isLoading` is `true`
+   * Indicates if the button has a label or not
+   * @default false
    */
-  label?: string;
+  hasLabel?: boolean;
   /**
    * It determines the placement of the spinner when `isLoading` is `true`
    */
diff --git a/libs/webb-ui-components/src/components/ChainChip/types.ts b/libs/webb-ui-components/src/components/ChainChip/types.ts
index cd32d79908..ef6a6b90a4 100644
--- a/libs/webb-ui-components/src/components/ChainChip/types.ts
+++ b/libs/webb-ui-components/src/components/ChainChip/types.ts
@@ -1,15 +1,15 @@
 import { WebbComponentBase } from '../../types';
 import React from 'react';
-import { ChainBase } from '@webb-tools/dapp-config/chains';
+import { ChainGroup } from '@webb-tools/dapp-config/chains';
 
 export type ChainChipClassNames = {
-  [key in ChainBase]: {
+  [key in ChainGroup]: {
     default: string;
   };
 };
 
 export interface ChainChipProps extends WebbComponentBase {
-  chainType: ChainBase;
+  chainType: ChainGroup;
   chainName: string;
   title?: string;
   children?: React.ReactNode;
diff --git a/libs/webb-ui-components/src/components/ChainChip/utils.ts b/libs/webb-ui-components/src/components/ChainChip/utils.ts
index afc7bb0841..fa7a904c83 100644
--- a/libs/webb-ui-components/src/components/ChainChip/utils.ts
+++ b/libs/webb-ui-components/src/components/ChainChip/utils.ts
@@ -1,4 +1,4 @@
-import { ChainBase } from '@webb-tools/dapp-config';
+import { ChainGroup } from '@webb-tools/dapp-config';
 import { ChainChipClassNames } from './types';
 
 const classNames: ChainChipClassNames = {
@@ -46,7 +46,7 @@ const classNames: ChainChipClassNames = {
   },
 };
 
-export function getChainChipClassName(chainType: ChainBase) {
+export function getChainChipClassName(chainType: ChainGroup) {
   const { default: className } = classNames[chainType];
   return className;
 }
diff --git a/libs/webb-ui-components/src/components/IconsGroup/IconsGroup.tsx b/libs/webb-ui-components/src/components/IconsGroup/IconsGroup.tsx
index 0ad6fdb63e..f86dbe1d6f 100644
--- a/libs/webb-ui-components/src/components/IconsGroup/IconsGroup.tsx
+++ b/libs/webb-ui-components/src/components/IconsGroup/IconsGroup.tsx
@@ -25,6 +25,7 @@ export const IconsGroup = forwardRef<HTMLDivElement, IconsGroupProps>(
       >
         {icons.map((icon, idx) => (
           <IconWithTooltip
+            key={`${icon}-${idx}`}
             icon={<Icon key={idx} name={icon} size={iconSize} />}
             content={icon}
           />
diff --git a/libs/webb-ui-components/src/components/SideBar/SideBar.tsx b/libs/webb-ui-components/src/components/SideBar/SideBar.tsx
index 3d4542acce..386d20c38e 100644
--- a/libs/webb-ui-components/src/components/SideBar/SideBar.tsx
+++ b/libs/webb-ui-components/src/components/SideBar/SideBar.tsx
@@ -1,17 +1,13 @@
-import React, { useState } from 'react';
+import { ChevronLeft, ChevronRight, ExternalLinkLine } from '@webb-tools/icons';
 import cx from 'classnames';
-import { SidebarProps } from './types';
-import { Item } from './Item';
+import React, { useState } from 'react';
 import { twMerge } from 'tailwind-merge';
-import { ThemeToggle } from '../ThemeToggle';
+import useLocalStorageState from 'use-local-storage-state';
 import { Typography } from '../../typography/Typography';
-import {
-  ChainIcon,
-  ChevronLeft,
-  ChevronRight,
-  ExternalLinkLine,
-} from '@webb-tools/icons';
 import { Link } from '../Link';
+import { ThemeToggle } from '../ThemeToggle';
+import { Item } from './Item';
+import { SidebarProps } from './types';
 
 /**
  * Sidebar Navigation Menu Component
@@ -39,7 +35,13 @@ export const SideBar: React.FC<SidebarProps> = ({
   footer,
   className,
 }) => {
-  const [isSidebarOpen, setIsSidebarOpen] = useState(true);
+  const [isSidebarOpen, setIsSidebarOpen] = useLocalStorageState(
+    'isSidebarOpen',
+    {
+      defaultValue: true,
+    }
+  );
+
   const [activeItem, setActiveItem] = useState<number | null>(0);
   const [isHovering, setIsHovering] = useState(false);
 
@@ -70,7 +72,7 @@ export const SideBar: React.FC<SidebarProps> = ({
             </a>
           </div>
 
-          <div className="mt-11 flex flex-col gap-4">
+          <div className="flex flex-col gap-4 mt-11">
             {items.map((itemProps, index) => (
               <Item
                 key={index}
@@ -94,7 +96,7 @@ export const SideBar: React.FC<SidebarProps> = ({
             isSidebarOpen ? 'p-2' : 'pl-1'
           )}
         >
-          <div className="group flex items-center justify-between">
+          <div className="flex items-center justify-between group">
             <Link href={footer.href} aTagProps={{ target: '_blank' }}>
               <footer.Icon
                 width={24}
@@ -139,12 +141,12 @@ export const SideBar: React.FC<SidebarProps> = ({
 
       {isHovering && (
         <div
-          className="pt-12 px-3 absolute top-0 right-0"
+          className="absolute top-0 right-0 px-3 pt-12"
           style={{ transform: 'translateX(100%)' }}
         >
           <div
             onClick={() => setIsSidebarOpen(!isSidebarOpen)}
-            className="bg-mono-0 dark:bg-mono-180 rounded-full cursor-pointer shadow-lg p-1"
+            className="p-1 rounded-full shadow-lg cursor-pointer bg-mono-0 dark:bg-mono-180"
           >
             {isSidebarOpen ? (
               <ChevronLeft size="md" />
diff --git a/libs/webb-ui-components/src/containers/ConfirmationCard/types.ts b/libs/webb-ui-components/src/containers/ConfirmationCard/types.ts
index 38b037b788..6d113467cf 100644
--- a/libs/webb-ui-components/src/containers/ConfirmationCard/types.ts
+++ b/libs/webb-ui-components/src/containers/ConfirmationCard/types.ts
@@ -2,7 +2,7 @@ import { PropsOf } from '../../types';
 import { ComponentProps } from 'react';
 import { Avatar, Button, CheckBox, TitleWithInfo } from '../../components';
 import { UseCopyableReturnType } from '../../hooks';
-import { ChainBase } from '@webb-tools/dapp-config';
+import { ChainGroup } from '@webb-tools/dapp-config';
 
 export interface ConfirmationCardProps extends PropsOf<'div'> {
   /**
@@ -35,7 +35,7 @@ export interface ConfirmationCardProps extends PropsOf<'div'> {
    * The source chain symbol
    */
   sourceChain?: {
-    type: ChainBase;
+    type: ChainGroup;
     name: string;
   };
 
@@ -43,7 +43,7 @@ export interface ConfirmationCardProps extends PropsOf<'div'> {
    * The destination chain symbol
    */
   destChain?: {
-    type: ChainBase;
+    type: ChainGroup;
     name: string;
   };
 
diff --git a/libs/webb-ui-components/src/containers/TransactionProgressCard/TransactionProgressCard.tsx b/libs/webb-ui-components/src/containers/TransactionProgressCard/TransactionProgressCard.tsx
index 3c8f4192f1..c1ce47ef5d 100644
--- a/libs/webb-ui-components/src/containers/TransactionProgressCard/TransactionProgressCard.tsx
+++ b/libs/webb-ui-components/src/containers/TransactionProgressCard/TransactionProgressCard.tsx
@@ -31,7 +31,7 @@ const sectionPadding = 'py-2  px-4 m-0 mt-0';
  firedAt={new Date()}
  status={'in-progress'}
  tokens={[<TokenIcon size={'lg'} name={'ETH'} />, <TokenIcon size={'lg'} name={'WEBB'} />]}
- wallets={{ src: <PolygonLogo />, dist: <EthLogo /> }}
+ wallets={{ src: <ChainIcon name="polygon mumbai" />, dist: <ChainIcon name="ethereum" /> }}
  label={{
                   tokenURI: 'https://polygon.technology/',
                   amount: '0.999',
@@ -58,7 +58,7 @@ const sectionPadding = 'py-2  px-4 m-0 mt-0';
  status={'in-progress'}
  syncNote={() => {}}
  tokens={[<TokenIcon size={'lg'} name={'ETH'} />]}
- wallets={{ src: <PolygonLogo />, dist: <WalletLine width={16} height={14.6} /> }}
+ wallets={{ src: <ChainIcon name="polygon mumbai" />, dist: <WalletLine width={16} height={14.6} /> }}
  label={{
                   amount: '0.999',
                   nativeValue: '1430',
@@ -80,7 +80,7 @@ const sectionPadding = 'py-2  px-4 m-0 mt-0';
  firedAt={new Date()}
  status={'in-progress'}
  tokens={[<TokenIcon size={'lg'} name={'WEBB'} />, <TokenIcon size={'lg'} name={'ETH'} />]}
- wallets={{ src: <PolygonLogo />, dist: <EthLogo /> }}
+ wallets={{ src: <ChainIcon name="polygon mumbai" />, dist: <ChainIcon name="ethereum" /> }}
  label={{
                     tokenURI: 'https://polygon.technology/',
                     amount: '0.999',
diff --git a/package.json b/package.json
index e4e4fb8e3d..29d1cd11f6 100644
--- a/package.json
+++ b/package.json
@@ -39,46 +39,44 @@
     "libs/**"
   ],
   "resolutions": {
-    "@polkadot/api": "^10.6.1",
-    "@polkadot/api-augment": "^10.6.1",
-    "@polkadot/api-base": "^10.6.1",
-    "@polkadot/api-contract": "^10.6.1",
-    "@polkadot/api-derive": "^10.6.1",
-    "@polkadot/hw-ledger": "^12.1.1",
-    "@polkadot/keyring": "^12.1.2",
-    "@polkadot/networks": "^12.1.1",
-    "@polkadot/phishing": "^0.21.2",
-    "@polkadot/rpc-augment": "^10.6.1",
-    "@polkadot/rpc-core": "^10.6.1",
-    "@polkadot/rpc-provider": "^10.6.1",
-    "@polkadot/types": "^10.6.1",
-    "@polkadot/types-augment": "^10.6.1",
-    "@polkadot/types-codec": "^10.6.1",
-    "@polkadot/types-create": "^10.6.1",
-    "@polkadot/types-known": "^10.6.1",
-    "@polkadot/types-support": "^10.6.1",
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
+    "@polkadot/api": "^10.9.1",
+    "@polkadot/api-augment": "^10.9.1",
+    "@polkadot/api-base": "^10.9.1",
+    "@polkadot/api-contract": "^10.9.1",
+    "@polkadot/api-derive": "^10.9.1",
+    "@polkadot/keyring": "^12.3.2",
+    "@polkadot/networks": "^12.3.2",
+    "@polkadot/phishing": "^0.21.5",
+    "@polkadot/rpc-augment": "^10.9.1",
+    "@polkadot/rpc-core": "^10.9.1",
+    "@polkadot/rpc-provider": "^10.9.1",
+    "@polkadot/types": "^10.9.1",
+    "@polkadot/types-augment": "^10.9.1",
+    "@polkadot/types-codec": "^10.9.1",
+    "@polkadot/types-create": "^10.9.1",
+    "@polkadot/types-known": "^10.9.1",
+    "@polkadot/types-support": "^10.9.1",
+    "@polkadot/util": "^12.3.2",
+    "@polkadot/util-crypto": "^12.3.2",
     "@polkadot/wasm-crypto": "^7.1.2",
-    "typescript": "^5.0.4"
+    "typescript": "^5.1.6"
   },
   "dependencies": {
     "@actions/core": "^1.10.0",
     "@apollo/client": "^3.6.9",
     "@headlessui/react": "^1.7.3",
-    "@metamask/detect-provider": "^2.0.0",
     "@ngneat/falso": "^6.1.0",
     "@notionhq/client": "^2.2.3",
     "@octokit/request": "^6.2.3",
-    "@polkadot/api": "^10.6.1",
-    "@polkadot/extension-dapp": "0.46.3",
-    "@polkadot/extension-inject": "0.46.3",
-    "@polkadot/keyring": "^12.1.2",
-    "@polkadot/networks": "^12.1.1",
-    "@polkadot/react-identicon": "^3.2.2",
-    "@polkadot/types": "^10.6.1",
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
+    "@polkadot/api": "^10.9.1",
+    "@polkadot/extension-dapp": "0.46.5",
+    "@polkadot/extension-inject": "0.46.5",
+    "@polkadot/keyring": "^12.3.2",
+    "@polkadot/networks": "^12.3.2",
+    "@polkadot/react-identicon": "^3.5.1",
+    "@polkadot/types": "^10.9.1",
+    "@polkadot/util": "^12.3.2",
+    "@polkadot/util-crypto": "^12.3.2",
     "@polkadot/wasm-crypto": "^7.1.2",
     "@radix-ui/react-accordion": "^1.0.0",
     "@radix-ui/react-avatar": "^1.0.0",
@@ -98,19 +96,17 @@
     "@radix-ui/react-tooltip": "^1.0.0",
     "@sentry/react": "^7.52.1",
     "@sentry/tracing": "^7.52.1",
-    "@walletconnect/web3-provider": "^1.7.1",
     "chai": "4.3.7",
     "chart.js": "^4.3.0",
     "chromatic": "^6.14.0",
     "circomlibjs": "0.0.8",
     "country-flag-icons": "^1.5.5",
     "detect-browser": "^5.2.0",
-    "eth-rpc-errors": "^4.0.3",
-    "ethers": "^5.7.0",
     "github-markdown-css": "^5.2.0",
     "graphql": "^16.6.0",
     "gridjs": "^6.0.6",
     "gridjs-react": "^6.0.1",
+    "lodash": "^4.17.21",
     "lottie-react": "^2.3.1",
     "neverthrow": "^6.0.0",
     "next": "13.3.0",
@@ -138,8 +134,8 @@
     "tslib": "^2.3.0",
     "twitter-api-v2": "^1.14.2",
     "use-local-storage-state": "^18.3.0",
-    "viem": "^0.3.41",
-    "web3": "^1.3.5"
+    "viem": "^1.2.14",
+    "wagmi": "^1.3.8"
   },
   "devDependencies": {
     "@babel/cli": "7.21.5",
@@ -285,7 +281,7 @@
     "thread-loader": "^4.0.1",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.1.6",
     "webpack": "^5.82.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "5.1.1",
diff --git a/tools/scripts/fetchingOnChainConfig.ts b/tools/scripts/fetchingOnChainConfig.ts
index b36fed3a2b..9634c33123 100644
--- a/tools/scripts/fetchingOnChainConfig.ts
+++ b/tools/scripts/fetchingOnChainConfig.ts
@@ -21,8 +21,9 @@ import { workspaceRoot } from 'nx/src/utils/workspace-root';
 import path from 'path';
 import { ON_CHAIN_CONFIG_PATH } from './constants';
 import fetchAnchorMetadata from './utils/on-chain-utils/fetchAnchorMetadata';
-import fetchNativeCurrency from './utils/on-chain-utils/fetchNative';
 import mergeConfig from './utils/on-chain-utils/mergeConfig';
+import { ZERO_ADDRESS } from '@webb-tools/utils';
+import { DEFAULT_NATIVE_INDEX } from '@webb-tools/dapp-config/src/constants';
 
 const configPath = path.join(workspaceRoot, ON_CHAIN_CONFIG_PATH);
 
@@ -54,7 +55,7 @@ async function filterActiveEVMChains(
         .map(async (typedChainId) => {
           try {
             const provider = await evmProviderFactory(typedChainId);
-            await provider.getNetwork();
+            await provider.getChainId();
             return typedChainId;
           } catch (error) {
             return null;
@@ -90,22 +91,34 @@ async function filterActiveSubstrateChains(
   }, {} as Record<number, ApiPromise>);
 }
 
-async function fetchNativeTask(
-  typedChainIds: number[],
-  substrateProviderRecord?: Record<number, ApiPromise>
-) {
-  const nativeCurrencies = await typedChainIds.reduce(
-    async (acc, typedChainId) => {
-      const native = await acc;
-      const provider = substrateProviderRecord?.[typedChainId];
-      const nativeCurrency = await fetchNativeCurrency(typedChainId, provider);
-      native[typedChainId] = nativeCurrency;
-      return native;
-    },
-    {} as Promise<Record<number, ICurrency>>
-  );
+function fetchNativeTask(typedChainIds: number[]) {
+  return typedChainIds.map((typedChainId) => {
+    const { chainType } = parseTypedChainId(typedChainId);
+    let currencyId: string = '';
+
+    switch (chainType) {
+      case ChainType.EVM: {
+        currencyId = ZERO_ADDRESS;
+        break;
+      }
+
+      case ChainType.Substrate: {
+        currencyId = `${DEFAULT_NATIVE_INDEX}`;
+        break;
+      }
 
-  return nativeCurrencies;
+      default: {
+        throw new Error(
+          `Unsupported chain type ${chainType} for chain ${typedChainId}`
+        );
+      }
+    }
+
+    return {
+      ...chainsConfig[typedChainId].nativeCurrency,
+      address: currencyId,
+    } satisfies ICurrency;
+  });
 }
 
 async function fetchAnchorMetadataTask(
@@ -233,10 +246,7 @@ const tasks = new Listr<Ctx>(
               title: color.cyan(`Fetching native currencies...`),
               options: { persistentOutput: true },
               task: async (ctx, task) => {
-                ctx.nativeRecord = await fetchNativeTask(
-                  ctx.typedChainIds,
-                  ctx.substrateProviderRecord
-                );
+                ctx.nativeRecord = fetchNativeTask(ctx.typedChainIds);
 
                 const symbolsSet = Object.values(ctx.nativeRecord).reduce(
                   (acc, cur) => {
diff --git a/tools/scripts/utils/on-chain-utils/fetchAnchorMetadata.ts b/tools/scripts/utils/on-chain-utils/fetchAnchorMetadata.ts
index 09fb675ed3..db6fa93ecb 100644
--- a/tools/scripts/utils/on-chain-utils/fetchAnchorMetadata.ts
+++ b/tools/scripts/utils/on-chain-utils/fetchAnchorMetadata.ts
@@ -13,14 +13,15 @@ import {
 import {
   DEFAULT_DECIMALS,
   DEFAULT_NATIVE_INDEX,
+  ZERO_BIG_INT,
 } from '@webb-tools/dapp-config/src/constants';
 import { AnchorMetadata, ICurrency } from '@webb-tools/dapp-config/src/types';
 import '@webb-tools/protocol-substrate-types';
 import { ResourceId } from '@webb-tools/sdk-core/proposals/ResourceId.js';
 import { hexToU8a, u8aToHex } from '@webb-tools/utils';
+import getViemClient from '@webb-tools/web3-api-provider/src/utils/getViemClient';
 import assert from 'assert';
 import { getContract } from 'viem';
-import getViemClient from './getViemClient';
 
 async function fetchEVMAnchorMetadata(
   anchorAddress: string,
@@ -189,7 +190,7 @@ async function fetchEVMAnchorMetadata(
   }
 
   const linkableAnchor = neighborEdges
-    .filter((edge) => edge.chainID !== BigInt(0))
+    .filter((edge) => edge.chainID !== ZERO_BIG_INT)
     .reduce((acc, edge) => {
       const chainId = edge.chainID.toString();
       const resourceIdHex = edge.srcResourceID;
diff --git a/tools/scripts/utils/on-chain-utils/fetchNative.ts b/tools/scripts/utils/on-chain-utils/fetchNative.ts
deleted file mode 100644
index dbb3b52414..0000000000
--- a/tools/scripts/utils/on-chain-utils/fetchNative.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { ApiPromise } from '@polkadot/api';
-import {
-  LOCALNET_CHAIN_IDS,
-  SELF_HOSTED_CHAIN_IDS,
-} from '@webb-tools/dapp-config/src/chains';
-import { DEFAULT_NATIVE_INDEX } from '@webb-tools/dapp-config/src/constants';
-import { DEFAULT_EVM_CURRENCY } from '@webb-tools/dapp-config/src/currencies';
-import { ICurrency } from '@webb-tools/dapp-config/src/types';
-import { parseTypedChainId } from '@webb-tools/sdk-core';
-import { ZERO_ADDRESS } from '@webb-tools/utils';
-import chainData from './fixtures/native.json';
-
-/// Private Methods
-
-async function fetchEVMNativeCurrency(
-  typedChainId: number
-): Promise<ICurrency> {
-  const { chainId } = parseTypedChainId(typedChainId);
-
-  // Maybe evn localnet or self hosted
-  const customChainIds = LOCALNET_CHAIN_IDS.concat(SELF_HOSTED_CHAIN_IDS);
-  if (customChainIds.includes(chainId)) {
-    return DEFAULT_EVM_CURRENCY;
-  }
-
-  const chain = chainData.find((currency) => currency.chainId === chainId);
-
-  if (!chain) {
-    console.error('Native currency not found in the fixtures fallback to ETH');
-    return DEFAULT_EVM_CURRENCY;
-  }
-
-  return {
-    ...chain.nativeCurrency,
-    address: ZERO_ADDRESS,
-  };
-}
-
-async function fetchSubstrateNativeCurrency(
-  provider: ApiPromise
-): Promise<ICurrency> {
-  const name = provider.registry.chainTokens[DEFAULT_NATIVE_INDEX];
-  const decimals = provider.registry.chainDecimals[DEFAULT_NATIVE_INDEX];
-  // The native currency is always at index 0 in the asset registry pallet
-  const address = DEFAULT_NATIVE_INDEX.toString();
-
-  return {
-    name,
-    symbol: name,
-    decimals,
-    address,
-  };
-}
-
-// Default method
-
-async function fetchNativeCurrency(
-  typedChainId: number,
-  provider?: ApiPromise
-): Promise<ICurrency> {
-  if (provider instanceof ApiPromise) {
-    return fetchSubstrateNativeCurrency(provider);
-  }
-
-  return fetchEVMNativeCurrency(typedChainId);
-}
-
-export default fetchNativeCurrency;
diff --git a/tools/scripts/utils/on-chain-utils/fixtures/native.json b/tools/scripts/utils/on-chain-utils/fixtures/native.json
deleted file mode 100644
index a3e8b61803..0000000000
--- a/tools/scripts/utils/on-chain-utils/fixtures/native.json
+++ /dev/null
@@ -1,7625 +0,0 @@
-[
-  {
-    "name": "Ethereum Mainnet",
-    "chainId": 1,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Expanse Network",
-    "chainId": 2,
-    "nativeCurrency": {
-      "name": "Expanse Network Ether",
-      "symbol": "EXP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ropsten",
-    "chainId": 3,
-    "nativeCurrency": {
-      "name": "Ropsten Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rinkeby",
-    "chainId": 4,
-    "nativeCurrency": {
-      "name": "Rinkeby Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Goerli",
-    "chainId": 5,
-    "nativeCurrency": {
-      "name": "Goerli Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ethereum Classic Testnet Kotti",
-    "chainId": 6,
-    "nativeCurrency": {
-      "name": "Kotti Ether",
-      "symbol": "KOT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ThaiChain",
-    "chainId": 7,
-    "nativeCurrency": {
-      "name": "ThaiChain Ether",
-      "symbol": "TCH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ubiq",
-    "chainId": 8,
-    "nativeCurrency": {
-      "name": "Ubiq Ether",
-      "symbol": "UBQ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ubiq Network Testnet",
-    "chainId": 9,
-    "nativeCurrency": {
-      "name": "Ubiq Testnet Ether",
-      "symbol": "TUBQ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Optimism",
-    "chainId": 10,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metadium Mainnet",
-    "chainId": 11,
-    "nativeCurrency": {
-      "name": "Metadium Mainnet Ether",
-      "symbol": "META",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metadium Testnet",
-    "chainId": 12,
-    "nativeCurrency": {
-      "name": "Metadium Testnet Ether",
-      "symbol": "KAL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Diode Testnet Staging",
-    "chainId": 13,
-    "nativeCurrency": {
-      "name": "Staging Diodes",
-      "symbol": "sDIODE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flare Mainnet",
-    "chainId": 14,
-    "nativeCurrency": {
-      "name": "Flare",
-      "symbol": "FLR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Diode Prenet",
-    "chainId": 15,
-    "nativeCurrency": {
-      "name": "Diodes",
-      "symbol": "DIODE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flare Testnet Coston",
-    "chainId": 16,
-    "nativeCurrency": {
-      "name": "Coston Flare",
-      "symbol": "CFLR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ThaiChain 2.0 ThaiFi",
-    "chainId": 17,
-    "nativeCurrency": {
-      "name": "Thaifi Ether",
-      "symbol": "TFI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ThunderCore Testnet",
-    "chainId": 18,
-    "nativeCurrency": {
-      "name": "ThunderCore Testnet Token",
-      "symbol": "TST",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Songbird Canary-Network",
-    "chainId": 19,
-    "nativeCurrency": {
-      "name": "Songbird",
-      "symbol": "SGB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Elastos Smart Chain",
-    "chainId": 20,
-    "nativeCurrency": {
-      "name": "Elastos",
-      "symbol": "ELA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Elastos Smart Chain Testnet",
-    "chainId": 21,
-    "nativeCurrency": {
-      "name": "Elastos",
-      "symbol": "tELA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ELA-DID-Sidechain Mainnet",
-    "chainId": 22,
-    "nativeCurrency": {
-      "name": "Elastos",
-      "symbol": "ELA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ELA-DID-Sidechain Testnet",
-    "chainId": 23,
-    "nativeCurrency": {
-      "name": "Elastos",
-      "symbol": "tELA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "KardiaChain Mainnet",
-    "chainId": 24,
-    "nativeCurrency": {
-      "name": "KardiaChain",
-      "symbol": "KAI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Cronos Mainnet Beta",
-    "chainId": 25,
-    "nativeCurrency": {
-      "name": "Cronos",
-      "symbol": "CRO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Genesis L1 testnet",
-    "chainId": 26,
-    "nativeCurrency": {
-      "name": "L1 testcoin",
-      "symbol": "L1test",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ShibaChain",
-    "chainId": 27,
-    "nativeCurrency": {
-      "name": "SHIBA INU COIN",
-      "symbol": "SHIB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Boba Network Rinkeby Testnet",
-    "chainId": 28,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Genesis L1",
-    "chainId": 29,
-    "nativeCurrency": {
-      "name": "L1 coin",
-      "symbol": "L1",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "RSK Mainnet",
-    "chainId": 30,
-    "nativeCurrency": {
-      "name": "Smart Bitcoin",
-      "symbol": "RBTC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "RSK Testnet",
-    "chainId": 31,
-    "nativeCurrency": {
-      "name": "Testnet Smart Bitcoin",
-      "symbol": "tRBTC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GoodData Testnet",
-    "chainId": 32,
-    "nativeCurrency": {
-      "name": "GoodData Testnet Ether",
-      "symbol": "GooD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GoodData Mainnet",
-    "chainId": 33,
-    "nativeCurrency": {
-      "name": "GoodData Mainnet Ether",
-      "symbol": "GooD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dithereum Testnet",
-    "chainId": 34,
-    "nativeCurrency": {
-      "name": "Dither",
-      "symbol": "DTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TBWG Chain",
-    "chainId": 35,
-    "nativeCurrency": {
-      "name": "TBWG Ether",
-      "symbol": "TBG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dxchain Mainnet",
-    "chainId": 36,
-    "nativeCurrency": {
-      "name": "Dxchain",
-      "symbol": "DX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SeedCoin-Network",
-    "chainId": 37,
-    "nativeCurrency": {
-      "name": "SeedCoin",
-      "symbol": "SEED",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Valorbit",
-    "chainId": 38,
-    "nativeCurrency": {
-      "name": "Valorbit",
-      "symbol": "VAL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Unicorn Ultra Testnet",
-    "chainId": 39,
-    "nativeCurrency": {
-      "name": "Unicorn Ultra",
-      "symbol": "U2U",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Telos EVM Mainnet",
-    "chainId": 40,
-    "nativeCurrency": {
-      "name": "Telos",
-      "symbol": "TLOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Telos EVM Testnet",
-    "chainId": 41,
-    "nativeCurrency": {
-      "name": "Telos",
-      "symbol": "TLOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kovan",
-    "chainId": 42,
-    "nativeCurrency": {
-      "name": "Kovan Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Darwinia Pangolin Testnet",
-    "chainId": 43,
-    "nativeCurrency": {
-      "name": "Pangolin Network Native Token",
-      "symbol": "PRING",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Darwinia Crab Network",
-    "chainId": 44,
-    "nativeCurrency": {
-      "name": "Crab Network Native Token",
-      "symbol": "CRAB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Darwinia Pangoro Testnet",
-    "chainId": 45,
-    "nativeCurrency": {
-      "name": "Pangoro Network Native Token",
-      "symbol": "ORING",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Darwinia Network",
-    "chainId": 46,
-    "nativeCurrency": {
-      "name": "Darwinia Network Native Token",
-      "symbol": "RING",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Acria IntelliChain",
-    "chainId": 47,
-    "nativeCurrency": {
-      "name": "ACRIA",
-      "symbol": "ACRIA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ennothem Mainnet Proterozoic",
-    "chainId": 48,
-    "nativeCurrency": {
-      "name": "Ennothem",
-      "symbol": "ETMP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ennothem Testnet Pioneer",
-    "chainId": 49,
-    "nativeCurrency": {
-      "name": "Ennothem",
-      "symbol": "ETMP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "XinFin XDC Network",
-    "chainId": 50,
-    "nativeCurrency": {
-      "name": "XinFin",
-      "symbol": "XDC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "XDC Apothem Network",
-    "chainId": 51,
-    "nativeCurrency": {
-      "name": "XinFin",
-      "symbol": "TXDC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CoinEx Smart Chain Mainnet",
-    "chainId": 52,
-    "nativeCurrency": {
-      "name": "CoinEx Chain Native Token",
-      "symbol": "cet",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CoinEx Smart Chain Testnet",
-    "chainId": 53,
-    "nativeCurrency": {
-      "name": "CoinEx Chain Test Native Token",
-      "symbol": "cett",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Openpiece Mainnet",
-    "chainId": 54,
-    "nativeCurrency": {
-      "name": "Belly",
-      "symbol": "BELLY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zyx Mainnet",
-    "chainId": 55,
-    "nativeCurrency": {
-      "name": "Zyx",
-      "symbol": "ZYX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Binance Smart Chain Mainnet",
-    "chainId": 56,
-    "nativeCurrency": {
-      "name": "Binance Chain Native Token",
-      "symbol": "BNB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Syscoin Mainnet",
-    "chainId": 57,
-    "nativeCurrency": {
-      "name": "Syscoin",
-      "symbol": "SYS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ontology Mainnet",
-    "chainId": 58,
-    "nativeCurrency": {
-      "name": "ONG",
-      "symbol": "ONG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "EOS Mainnet",
-    "chainId": 59,
-    "nativeCurrency": {
-      "name": "EOS",
-      "symbol": "EOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GoChain",
-    "chainId": 60,
-    "nativeCurrency": {
-      "name": "GoChain Ether",
-      "symbol": "GO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ethereum Classic Mainnet",
-    "chainId": 61,
-    "nativeCurrency": {
-      "name": "Ethereum Classic Ether",
-      "symbol": "ETC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ethereum Classic Testnet Morden",
-    "chainId": 62,
-    "nativeCurrency": {
-      "name": "Ethereum Classic Testnet Ether",
-      "symbol": "TETC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ethereum Classic Testnet Mordor",
-    "chainId": 63,
-    "nativeCurrency": {
-      "name": "Mordor Classic Testnet Ether",
-      "symbol": "METC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ellaism",
-    "chainId": 64,
-    "nativeCurrency": {
-      "name": "Ellaism Ether",
-      "symbol": "ELLA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OKExChain Testnet",
-    "chainId": 65,
-    "nativeCurrency": {
-      "name": "OKExChain Global Utility Token in testnet",
-      "symbol": "OKT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OKXChain Mainnet",
-    "chainId": 66,
-    "nativeCurrency": {
-      "name": "OKXChain Global Utility Token",
-      "symbol": "OKT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DBChain Testnet",
-    "chainId": 67,
-    "nativeCurrency": {
-      "name": "DBChain Testnet",
-      "symbol": "DBM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SoterOne Mainnet",
-    "chainId": 68,
-    "nativeCurrency": {
-      "name": "SoterOne Mainnet Ether",
-      "symbol": "SOTER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Optimism Kovan",
-    "chainId": 69,
-    "nativeCurrency": {
-      "name": "Kovan Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hoo Smart Chain",
-    "chainId": 70,
-    "nativeCurrency": {
-      "name": "Hoo Smart Chain Native Token",
-      "symbol": "HOO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Conflux eSpace (Testnet)",
-    "chainId": 71,
-    "nativeCurrency": {
-      "name": "CFX",
-      "symbol": "CFX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DxChain Testnet",
-    "chainId": 72,
-    "nativeCurrency": {
-      "name": "DxChain Testnet",
-      "symbol": "DX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "FNCY",
-    "chainId": 73,
-    "nativeCurrency": {
-      "name": "FNCY",
-      "symbol": "FNCY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "IDChain Mainnet",
-    "chainId": 74,
-    "nativeCurrency": {
-      "name": "EIDI",
-      "symbol": "EIDI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Decimal Smart Chain Mainnet",
-    "chainId": 75,
-    "nativeCurrency": {
-      "name": "Decimal",
-      "symbol": "DEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mix",
-    "chainId": 76,
-    "nativeCurrency": {
-      "name": "Mix Ether",
-      "symbol": "MIX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "POA Network Sokol",
-    "chainId": 77,
-    "nativeCurrency": {
-      "name": "POA Sokol Ether",
-      "symbol": "SPOA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PrimusChain mainnet",
-    "chainId": 78,
-    "nativeCurrency": {
-      "name": "Primus Ether",
-      "symbol": "PETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zenith Mainnet",
-    "chainId": 79,
-    "nativeCurrency": {
-      "name": "ZENITH",
-      "symbol": "ZENITH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GeneChain",
-    "chainId": 80,
-    "nativeCurrency": {
-      "name": "RNA",
-      "symbol": "RNA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zenith Testnet (Vilnius)",
-    "chainId": 81,
-    "nativeCurrency": {
-      "name": "Vilnius",
-      "symbol": "VIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Meter Mainnet",
-    "chainId": 82,
-    "nativeCurrency": {
-      "name": "Meter",
-      "symbol": "MTR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Meter Testnet",
-    "chainId": 83,
-    "nativeCurrency": {
-      "name": "Meter",
-      "symbol": "MTR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GateChain Testnet",
-    "chainId": 85,
-    "nativeCurrency": {
-      "name": "GateToken",
-      "symbol": "GT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GateChain Mainnet",
-    "chainId": 86,
-    "nativeCurrency": {
-      "name": "GateToken",
-      "symbol": "GT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nova Network",
-    "chainId": 87,
-    "nativeCurrency": {
-      "name": "Supernova",
-      "symbol": "SNT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TomoChain",
-    "chainId": 88,
-    "nativeCurrency": {
-      "name": "TomoChain",
-      "symbol": "TOMO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TomoChain Testnet",
-    "chainId": 89,
-    "nativeCurrency": {
-      "name": "TomoChain",
-      "symbol": "TOMO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Stage0",
-    "chainId": 90,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Stage1",
-    "chainId": 91,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Stage2",
-    "chainId": 92,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Stage3",
-    "chainId": 93,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CryptoKylin Testnet",
-    "chainId": 95,
-    "nativeCurrency": {
-      "name": "EOS",
-      "symbol": "EOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitkub Chain",
-    "chainId": 96,
-    "nativeCurrency": {
-      "name": "Bitkub Coin",
-      "symbol": "KUB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Binance Smart Chain Testnet",
-    "chainId": 97,
-    "nativeCurrency": {
-      "name": "Binance Chain Native Token",
-      "symbol": "tBNB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "POA Network Core",
-    "chainId": 99,
-    "nativeCurrency": {
-      "name": "POA Network Core Ether",
-      "symbol": "POA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gnosis",
-    "chainId": 100,
-    "nativeCurrency": {
-      "name": "xDAI",
-      "symbol": "xDAI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "EtherInc",
-    "chainId": 101,
-    "nativeCurrency": {
-      "name": "EtherInc Ether",
-      "symbol": "ETI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Web3Games Testnet",
-    "chainId": 102,
-    "nativeCurrency": {
-      "name": "Web3Games",
-      "symbol": "W3G",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kaiba Lightning Chain Testnet",
-    "chainId": 104,
-    "nativeCurrency": {
-      "name": "Kaiba Testnet Token",
-      "symbol": "tKAIBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Web3Games Devnet",
-    "chainId": 105,
-    "nativeCurrency": {
-      "name": "Web3Games",
-      "symbol": "W3G",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Velas EVM Mainnet",
-    "chainId": 106,
-    "nativeCurrency": {
-      "name": "Velas",
-      "symbol": "VLX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nebula Testnet",
-    "chainId": 107,
-    "nativeCurrency": {
-      "name": "Nebula X",
-      "symbol": "NBX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ThunderCore Mainnet",
-    "chainId": 108,
-    "nativeCurrency": {
-      "name": "ThunderCore Token",
-      "symbol": "TT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Proton Testnet",
-    "chainId": 110,
-    "nativeCurrency": {
-      "name": "Proton",
-      "symbol": "XPR",
-      "decimals": 4
-    }
-  },
-  {
-    "name": "EtherLite Chain",
-    "chainId": 111,
-    "nativeCurrency": {
-      "name": "EtherLite",
-      "symbol": "ETL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dehvo",
-    "chainId": 113,
-    "nativeCurrency": {
-      "name": "Dehvo",
-      "symbol": "Deh",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flare Testnet Coston2",
-    "chainId": 114,
-    "nativeCurrency": {
-      "name": "Coston2 Flare",
-      "symbol": "C2FLR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DeBank Testnet",
-    "chainId": 115,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DeBank Mainnet",
-    "chainId": 116,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Uptick Mainnet",
-    "chainId": 117,
-    "nativeCurrency": {
-      "name": "Uptick",
-      "symbol": "UPTICK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Arcology Testnet",
-    "chainId": 118,
-    "nativeCurrency": {
-      "name": "Arcology Coin",
-      "symbol": "Acol",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ENULS Mainnet",
-    "chainId": 119,
-    "nativeCurrency": {
-      "name": "NULS",
-      "symbol": "NULS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ENULS Testnet",
-    "chainId": 120,
-    "nativeCurrency": {
-      "name": "NULS",
-      "symbol": "NULS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Realchain Mainnet",
-    "chainId": 121,
-    "nativeCurrency": {
-      "name": "Realchain",
-      "symbol": "REAL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fuse Mainnet",
-    "chainId": 122,
-    "nativeCurrency": {
-      "name": "Fuse",
-      "symbol": "FUSE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fuse Sparknet",
-    "chainId": 123,
-    "nativeCurrency": {
-      "name": "Spark",
-      "symbol": "SPARK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Decentralized Web Mainnet",
-    "chainId": 124,
-    "nativeCurrency": {
-      "name": "Decentralized Web Utility",
-      "symbol": "DWU",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OYchain Testnet",
-    "chainId": 125,
-    "nativeCurrency": {
-      "name": "OYchain Token",
-      "symbol": "OY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OYchain Mainnet",
-    "chainId": 126,
-    "nativeCurrency": {
-      "name": "OYchain Token",
-      "symbol": "OY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Factory 127 Mainnet",
-    "chainId": 127,
-    "nativeCurrency": {
-      "name": "Factory 127 Token",
-      "symbol": "FETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Huobi ECO Chain Mainnet",
-    "chainId": 128,
-    "nativeCurrency": {
-      "name": "Huobi ECO Chain Native Token",
-      "symbol": "HT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "iExec Sidechain",
-    "chainId": 134,
-    "nativeCurrency": {
-      "name": "xRLC",
-      "symbol": "xRLC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Alyx Chain Testnet",
-    "chainId": 135,
-    "nativeCurrency": {
-      "name": "Alyx Testnet Native Token",
-      "symbol": "ALYX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polygon Mainnet",
-    "chainId": 137,
-    "nativeCurrency": {
-      "name": "MATIC",
-      "symbol": "MATIC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Defi Oracle Meta Mainnet",
-    "chainId": 138,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "WoopChain Mainnet",
-    "chainId": 139,
-    "nativeCurrency": {
-      "name": "WoopCoin",
-      "symbol": "WOOC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Openpiece Testnet",
-    "chainId": 141,
-    "nativeCurrency": {
-      "name": "Belly",
-      "symbol": "BELLY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DAX CHAIN",
-    "chainId": 142,
-    "nativeCurrency": {
-      "name": "Prodax",
-      "symbol": "DAX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PHI Network v2",
-    "chainId": 144,
-    "nativeCurrency": {
-      "name": "PHI",
-      "symbol": "Φ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Armonia Eva Chain Mainnet",
-    "chainId": 160,
-    "nativeCurrency": {
-      "name": "Armonia Multichain Native Token",
-      "symbol": "AMAX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Armonia Eva Chain Testnet",
-    "chainId": 161,
-    "nativeCurrency": {
-      "name": "Armonia Multichain Native Token",
-      "symbol": "AMAX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lightstreams Testnet",
-    "chainId": 162,
-    "nativeCurrency": {
-      "name": "Lightstreams PHT",
-      "symbol": "PHT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lightstreams Mainnet",
-    "chainId": 163,
-    "nativeCurrency": {
-      "name": "Lightstreams PHT",
-      "symbol": "PHT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Atoshi Testnet",
-    "chainId": 167,
-    "nativeCurrency": {
-      "name": "ATOSHI",
-      "symbol": "ATOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AIOZ Network",
-    "chainId": 168,
-    "nativeCurrency": {
-      "name": "AIOZ",
-      "symbol": "AIOZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HOO Smart Chain Testnet",
-    "chainId": 170,
-    "nativeCurrency": {
-      "name": "HOO",
-      "symbol": "HOO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Latam-Blockchain Resil Testnet",
-    "chainId": 172,
-    "nativeCurrency": {
-      "name": "Latam-Blockchain Resil Test Native Token",
-      "symbol": "usd",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AME Chain Mainnet",
-    "chainId": 180,
-    "nativeCurrency": {
-      "name": "AME",
-      "symbol": "AME",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Seele Mainnet",
-    "chainId": 186,
-    "nativeCurrency": {
-      "name": "Seele",
-      "symbol": "Seele",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BMC Mainnet",
-    "chainId": 188,
-    "nativeCurrency": {
-      "name": "BTM",
-      "symbol": "BTM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BMC Testnet",
-    "chainId": 189,
-    "nativeCurrency": {
-      "name": "BTM",
-      "symbol": "BTM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Crypto Emergency",
-    "chainId": 193,
-    "nativeCurrency": {
-      "name": "Crypto Emergency",
-      "symbol": "CEM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OKBChain Testnet",
-    "chainId": 195,
-    "nativeCurrency": {
-      "name": "OKBChain Global Utility Token in testnet",
-      "symbol": "OKB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OKBChain Mainnet",
-    "chainId": 196,
-    "nativeCurrency": {
-      "name": "OKBChain Global Utility Token",
-      "symbol": "OKB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Neutrinos TestNet",
-    "chainId": 197,
-    "nativeCurrency": {
-      "name": "Neutrinos",
-      "symbol": "NEUTR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BitTorrent Chain Mainnet",
-    "chainId": 199,
-    "nativeCurrency": {
-      "name": "BitTorrent",
-      "symbol": "BTT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Arbitrum on xDai",
-    "chainId": 200,
-    "nativeCurrency": {
-      "name": "xDAI",
-      "symbol": "xDAI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MOAC testnet",
-    "chainId": 201,
-    "nativeCurrency": {
-      "name": "MOAC",
-      "symbol": "mc",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Freight Trust Network",
-    "chainId": 211,
-    "nativeCurrency": {
-      "name": "Freight Trust Native",
-      "symbol": "0xF",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MAP Makalu",
-    "chainId": 212,
-    "nativeCurrency": {
-      "name": "Makalu MAP",
-      "symbol": "MAP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SiriusNet V2",
-    "chainId": 217,
-    "nativeCurrency": {
-      "name": "MCD",
-      "symbol": "MCD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SoterOne Mainnet old",
-    "chainId": 218,
-    "nativeCurrency": {
-      "name": "SoterOne Mainnet Ether",
-      "symbol": "SOTER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Permission",
-    "chainId": 222,
-    "nativeCurrency": {
-      "name": "ASK",
-      "symbol": "ASK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "LACHAIN Mainnet",
-    "chainId": 225,
-    "nativeCurrency": {
-      "name": "LA",
-      "symbol": "LA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "LACHAIN Testnet",
-    "chainId": 226,
-    "nativeCurrency": {
-      "name": "TLA",
-      "symbol": "TLA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Energy Web Chain",
-    "chainId": 246,
-    "nativeCurrency": {
-      "name": "Energy Web Token",
-      "symbol": "EWT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oasys Mainnet",
-    "chainId": 248,
-    "nativeCurrency": {
-      "name": "OAS",
-      "symbol": "OAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fantom Opera",
-    "chainId": 250,
-    "nativeCurrency": {
-      "name": "Fantom",
-      "symbol": "FTM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Huobi ECO Chain Testnet",
-    "chainId": 256,
-    "nativeCurrency": {
-      "name": "Huobi ECO Chain Test Native Token",
-      "symbol": "htt",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Setheum",
-    "chainId": 258,
-    "nativeCurrency": {
-      "name": "Setheum",
-      "symbol": "SETM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SUR Blockchain Network",
-    "chainId": 262,
-    "nativeCurrency": {
-      "name": "Suren",
-      "symbol": "SRN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "High Performance Blockchain",
-    "chainId": 269,
-    "nativeCurrency": {
-      "name": "High Performance Blockchain Ether",
-      "symbol": "HPB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "zkSync Era Testnet",
-    "chainId": 280,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Boba Network",
-    "chainId": 288,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hedera Mainnet",
-    "chainId": 295,
-    "nativeCurrency": {
-      "name": "hbar",
-      "symbol": "HBAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hedera Testnet",
-    "chainId": 296,
-    "nativeCurrency": {
-      "name": "hbar",
-      "symbol": "HBAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hedera Previewnet",
-    "chainId": 297,
-    "nativeCurrency": {
-      "name": "hbar",
-      "symbol": "HBAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hedera Localnet",
-    "chainId": 298,
-    "nativeCurrency": {
-      "name": "hbar",
-      "symbol": "HBAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Optimism on Gnosis",
-    "chainId": 300,
-    "nativeCurrency": {
-      "name": "xDAI",
-      "symbol": "xDAI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bobaopera",
-    "chainId": 301,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Omax Mainnet",
-    "chainId": 311,
-    "nativeCurrency": {
-      "name": "OMAX COIN",
-      "symbol": "OMAX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Filecoin - Mainnet",
-    "chainId": 314,
-    "nativeCurrency": {
-      "name": "filecoin",
-      "symbol": "FIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "KCC Mainnet",
-    "chainId": 321,
-    "nativeCurrency": {
-      "name": "KuCoin Token",
-      "symbol": "KCS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "KCC Testnet",
-    "chainId": 322,
-    "nativeCurrency": {
-      "name": "KuCoin Testnet Token",
-      "symbol": "tKCS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "zkSync Era Mainnet",
-    "chainId": 324,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Web3Q Mainnet",
-    "chainId": 333,
-    "nativeCurrency": {
-      "name": "Web3Q",
-      "symbol": "W3Q",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DFK Chain Test",
-    "chainId": 335,
-    "nativeCurrency": {
-      "name": "Jewel",
-      "symbol": "JEWEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Shiden",
-    "chainId": 336,
-    "nativeCurrency": {
-      "name": "Shiden",
-      "symbol": "SDN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Cronos Testnet",
-    "chainId": 338,
-    "nativeCurrency": {
-      "name": "Cronos Test Coin",
-      "symbol": "TCRO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Theta Mainnet",
-    "chainId": 361,
-    "nativeCurrency": {
-      "name": "Theta Fuel",
-      "symbol": "TFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Theta Sapphire Testnet",
-    "chainId": 363,
-    "nativeCurrency": {
-      "name": "Theta Fuel",
-      "symbol": "TFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Theta Amber Testnet",
-    "chainId": 364,
-    "nativeCurrency": {
-      "name": "Theta Fuel",
-      "symbol": "TFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Theta Testnet",
-    "chainId": 365,
-    "nativeCurrency": {
-      "name": "Theta Fuel",
-      "symbol": "TFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PulseChain Mainnet",
-    "chainId": 369,
-    "nativeCurrency": {
-      "name": "Pulse",
-      "symbol": "PLS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Consta Testnet",
-    "chainId": 371,
-    "nativeCurrency": {
-      "name": "tCNT",
-      "symbol": "tCNT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lisinski",
-    "chainId": 385,
-    "nativeCurrency": {
-      "name": "Lisinski Ether",
-      "symbol": "LISINS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HyperonChain TestNet",
-    "chainId": 400,
-    "nativeCurrency": {
-      "name": "HyperonChain",
-      "symbol": "HPN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SX Network Mainnet",
-    "chainId": 416,
-    "nativeCurrency": {
-      "name": "SX Network",
-      "symbol": "SX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "LA Testnet",
-    "chainId": 418,
-    "nativeCurrency": {
-      "name": "Test La Coin",
-      "symbol": "TLA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Optimism Goerli Testnet",
-    "chainId": 420,
-    "nativeCurrency": {
-      "name": "Goerli Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zeeth Chain",
-    "chainId": 427,
-    "nativeCurrency": {
-      "name": "Zeeth Token",
-      "symbol": "ZTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Frenchain Testnet",
-    "chainId": 444,
-    "nativeCurrency": {
-      "name": "tFREN",
-      "symbol": "FtREN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rupaya",
-    "chainId": 499,
-    "nativeCurrency": {
-      "name": "Rupaya",
-      "symbol": "RUPX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Camino C-Chain",
-    "chainId": 500,
-    "nativeCurrency": {
-      "name": "Camino",
-      "symbol": "CAM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Columbus Test Network",
-    "chainId": 501,
-    "nativeCurrency": {
-      "name": "Camino",
-      "symbol": "CAM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Double-A Chain Mainnet",
-    "chainId": 512,
-    "nativeCurrency": {
-      "name": "Acuteangle Native Token",
-      "symbol": "AAC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Double-A Chain Testnet",
-    "chainId": 513,
-    "nativeCurrency": {
-      "name": "Acuteangle Native Token",
-      "symbol": "AAC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gear Zero Network Mainnet",
-    "chainId": 516,
-    "nativeCurrency": {
-      "name": "Gear Zero Network Native Token",
-      "symbol": "GZN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "XT Smart Chain Mainnet",
-    "chainId": 520,
-    "nativeCurrency": {
-      "name": "XT Smart Chain Native Token",
-      "symbol": "XT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Firechain Mainnet",
-    "chainId": 529,
-    "nativeCurrency": {
-      "name": "Firechain",
-      "symbol": "FIRE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "F(x)Core Mainnet Network",
-    "chainId": 530,
-    "nativeCurrency": {
-      "name": "Function X",
-      "symbol": "FX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Candle",
-    "chainId": 534,
-    "nativeCurrency": {
-      "name": "CANDLE",
-      "symbol": "CNDL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Vela1 Chain Mainnet",
-    "chainId": 555,
-    "nativeCurrency": {
-      "name": "CLASS COIN",
-      "symbol": "CLASS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Tao Network",
-    "chainId": 558,
-    "nativeCurrency": {
-      "name": "Tao",
-      "symbol": "TAO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dogechain Testnet",
-    "chainId": 568,
-    "nativeCurrency": {
-      "name": "Dogecoin",
-      "symbol": "DOGE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metis Stardust Testnet",
-    "chainId": 588,
-    "nativeCurrency": {
-      "name": "tMetis",
-      "symbol": "METIS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Astar",
-    "chainId": 592,
-    "nativeCurrency": {
-      "name": "Astar",
-      "symbol": "ASTR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Acala Mandala Testnet",
-    "chainId": 595,
-    "nativeCurrency": {
-      "name": "Acala Mandala Token",
-      "symbol": "mACA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Karura Network Testnet",
-    "chainId": 596,
-    "nativeCurrency": {
-      "name": "Karura Token",
-      "symbol": "KAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Acala Network Testnet",
-    "chainId": 597,
-    "nativeCurrency": {
-      "name": "Acala Token",
-      "symbol": "ACA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metis Goerli Testnet",
-    "chainId": 599,
-    "nativeCurrency": {
-      "name": "Goerli Metis",
-      "symbol": "METIS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Meshnyan testnet",
-    "chainId": 600,
-    "nativeCurrency": {
-      "name": "Meshnyan Testnet Native Token",
-      "symbol": "MESHT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Graphlinq Blockchain Mainnet",
-    "chainId": 614,
-    "nativeCurrency": {
-      "name": "GLQ",
-      "symbol": "GLQ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SX Network Testnet",
-    "chainId": 647,
-    "nativeCurrency": {
-      "name": "SX Network",
-      "symbol": "SX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Endurance Smart Chain Mainnet",
-    "chainId": 648,
-    "nativeCurrency": {
-      "name": "Endurance Chain Native Token",
-      "symbol": "ACE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Pixie Chain Testnet",
-    "chainId": 666,
-    "nativeCurrency": {
-      "name": "Pixie Chain Testnet Native Token",
-      "symbol": "PCTT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Karura Network",
-    "chainId": 686,
-    "nativeCurrency": {
-      "name": "Karura Token",
-      "symbol": "KAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Star Social Testnet",
-    "chainId": 700,
-    "nativeCurrency": {
-      "name": "Social",
-      "symbol": "SNS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BlockChain Station Mainnet",
-    "chainId": 707,
-    "nativeCurrency": {
-      "name": "BCS Token",
-      "symbol": "BCS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BlockChain Station Testnet",
-    "chainId": 708,
-    "nativeCurrency": {
-      "name": "BCS Testnet Token",
-      "symbol": "tBCS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lycan Chain",
-    "chainId": 721,
-    "nativeCurrency": {
-      "name": "Lycan",
-      "symbol": "LYC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Canto Testnet",
-    "chainId": 740,
-    "nativeCurrency": {
-      "name": "Canto",
-      "symbol": "CANTO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Vention Smart Chain Testnet",
-    "chainId": 741,
-    "nativeCurrency": {
-      "name": "VNT",
-      "symbol": "VNT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QL1",
-    "chainId": 766,
-    "nativeCurrency": {
-      "name": "Shiba Predator",
-      "symbol": "QOM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OpenChain Testnet",
-    "chainId": 776,
-    "nativeCurrency": {
-      "name": "Openchain Testnet",
-      "symbol": "TOPC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "cheapETH",
-    "chainId": 777,
-    "nativeCurrency": {
-      "name": "cTH",
-      "symbol": "cTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Acala Network",
-    "chainId": 787,
-    "nativeCurrency": {
-      "name": "Acala Token",
-      "symbol": "ACA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aerochain Testnet",
-    "chainId": 788,
-    "nativeCurrency": {
-      "name": "Aerochain Testnet",
-      "symbol": "TAero",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lucid Blockchain",
-    "chainId": 800,
-    "nativeCurrency": {
-      "name": "LUCID",
-      "symbol": "LUCID",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Haic",
-    "chainId": 803,
-    "nativeCurrency": {
-      "name": "Haicoin",
-      "symbol": "HAIC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Portal Fantasy Chain Test",
-    "chainId": 808,
-    "nativeCurrency": {
-      "name": "Portal Fantasy Token",
-      "symbol": "PFT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Qitmeer",
-    "chainId": 813,
-    "nativeCurrency": {
-      "name": "Qitmeer",
-      "symbol": "MEER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BeOne Chain Mainnet",
-    "chainId": 818,
-    "nativeCurrency": {
-      "name": "BeOne Chain Mainnet",
-      "symbol": "BOC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Callisto Mainnet",
-    "chainId": 820,
-    "nativeCurrency": {
-      "name": "Callisto",
-      "symbol": "CLO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Callisto Testnet Deprecated",
-    "chainId": 821,
-    "nativeCurrency": {
-      "name": "Callisto Testnet Ether",
-      "symbol": "TCLO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Taraxa Mainnet",
-    "chainId": 841,
-    "nativeCurrency": {
-      "name": "Tara",
-      "symbol": "TARA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Taraxa Testnet",
-    "chainId": 842,
-    "nativeCurrency": {
-      "name": "Tara",
-      "symbol": "TARA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zeeth Chain Dev",
-    "chainId": 859,
-    "nativeCurrency": {
-      "name": "Zeeth Token",
-      "symbol": "ZTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fantasia Chain Mainnet",
-    "chainId": 868,
-    "nativeCurrency": {
-      "name": "FST",
-      "symbol": "FST",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bandai Namco Research Verse Mainnet",
-    "chainId": 876,
-    "nativeCurrency": {
-      "name": "OAS",
-      "symbol": "OAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dexit Network",
-    "chainId": 877,
-    "nativeCurrency": {
-      "name": "Dexit network",
-      "symbol": "DXT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ambros Chain Mainnet",
-    "chainId": 880,
-    "nativeCurrency": {
-      "name": "AMBROS",
-      "symbol": "AMBROS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Wanchain",
-    "chainId": 888,
-    "nativeCurrency": {
-      "name": "Wancoin",
-      "symbol": "WAN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Testnet Stage0",
-    "chainId": 900,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Testnet Stage1",
-    "chainId": 901,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Testnet Stage2",
-    "chainId": 902,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Garizon Testnet Stage3",
-    "chainId": 903,
-    "nativeCurrency": {
-      "name": "Garizon",
-      "symbol": "GAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Portal Fantasy Chain",
-    "chainId": 909,
-    "nativeCurrency": {
-      "name": "Portal Fantasy Token",
-      "symbol": "PFT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DecentraBone Layer1 Testnet",
-    "chainId": 910,
-    "nativeCurrency": {
-      "name": "DecentraBone",
-      "symbol": "DBONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rinia Testnet",
-    "chainId": 917,
-    "nativeCurrency": {
-      "name": "Firechain",
-      "symbol": "FIRE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PulseChain Testnet",
-    "chainId": 940,
-    "nativeCurrency": {
-      "name": "Test Pulse",
-      "symbol": "tPLS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PulseChain Testnet v2b",
-    "chainId": 941,
-    "nativeCurrency": {
-      "name": "Test Pulse",
-      "symbol": "tPLS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PulseChain Testnet v3",
-    "chainId": 942,
-    "nativeCurrency": {
-      "name": "Test Pulse",
-      "symbol": "tPLS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "muNode Testnet",
-    "chainId": 956,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oort Mainnet",
-    "chainId": 970,
-    "nativeCurrency": {
-      "name": "Oort",
-      "symbol": "CCN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oort Huygens",
-    "chainId": 971,
-    "nativeCurrency": {
-      "name": "Oort",
-      "symbol": "CCN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oort Ascraeus",
-    "chainId": 972,
-    "nativeCurrency": {
-      "name": "Oort",
-      "symbol": "CCNA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nepal Blockchain Network",
-    "chainId": 977,
-    "nativeCurrency": {
-      "name": "Nepal Blockchain Network Ether",
-      "symbol": "YETI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TOP Mainnet EVM",
-    "chainId": 980,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Memo Smart Chain Mainnet",
-    "chainId": 985,
-    "nativeCurrency": {
-      "name": "Memo",
-      "symbol": "CMEMO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TOP Mainnet",
-    "chainId": 989,
-    "nativeCurrency": {
-      "name": "TOP",
-      "symbol": "TOP",
-      "decimals": 6
-    }
-  },
-  {
-    "name": "Lucky Network",
-    "chainId": 998,
-    "nativeCurrency": {
-      "name": "Lucky",
-      "symbol": "L99",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Wanchain Testnet",
-    "chainId": 999,
-    "nativeCurrency": {
-      "name": "Wancoin",
-      "symbol": "WAN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GTON Mainnet",
-    "chainId": 1000,
-    "nativeCurrency": {
-      "name": "GCD",
-      "symbol": "GCD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Klaytn Testnet Baobab",
-    "chainId": 1001,
-    "nativeCurrency": {
-      "name": "KLAY",
-      "symbol": "KLAY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "T-EKTA",
-    "chainId": 1004,
-    "nativeCurrency": {
-      "name": "T-EKTA",
-      "symbol": "T-EKTA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Newton Testnet",
-    "chainId": 1007,
-    "nativeCurrency": {
-      "name": "Newton",
-      "symbol": "NEW",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Eurus Mainnet",
-    "chainId": 1008,
-    "nativeCurrency": {
-      "name": "Eurus",
-      "symbol": "EUN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Evrice Network",
-    "chainId": 1010,
-    "nativeCurrency": {
-      "name": "Evrice",
-      "symbol": "EVC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Newton",
-    "chainId": 1012,
-    "nativeCurrency": {
-      "name": "Newton",
-      "symbol": "NEW",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Sakura",
-    "chainId": 1022,
-    "nativeCurrency": {
-      "name": "Sakura",
-      "symbol": "SKU",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Clover Testnet",
-    "chainId": 1023,
-    "nativeCurrency": {
-      "name": "Clover",
-      "symbol": "CLV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CLV Parachain",
-    "chainId": 1024,
-    "nativeCurrency": {
-      "name": "CLV",
-      "symbol": "CLV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BitTorrent Chain Testnet",
-    "chainId": 1028,
-    "nativeCurrency": {
-      "name": "BitTorrent",
-      "symbol": "BTT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Conflux eSpace",
-    "chainId": 1030,
-    "nativeCurrency": {
-      "name": "CFX",
-      "symbol": "CFX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Proxy Network Testnet",
-    "chainId": 1031,
-    "nativeCurrency": {
-      "name": "PRX",
-      "symbol": "PRX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bronos Testnet",
-    "chainId": 1038,
-    "nativeCurrency": {
-      "name": "tBRO",
-      "symbol": "tBRO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bronos Mainnet",
-    "chainId": 1039,
-    "nativeCurrency": {
-      "name": "BRO",
-      "symbol": "BRO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ShimmerEVM Testnet",
-    "chainId": 1071,
-    "nativeCurrency": {
-      "name": "SMR",
-      "symbol": "SMR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metis Andromeda Mainnet",
-    "chainId": 1088,
-    "nativeCurrency": {
-      "name": "Metis",
-      "symbol": "METIS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MOAC mainnet",
-    "chainId": 1099,
-    "nativeCurrency": {
-      "name": "MOAC",
-      "symbol": "mc",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polygon zkEVM",
-    "chainId": 1101,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "WEMIX3.0 Mainnet",
-    "chainId": 1111,
-    "nativeCurrency": {
-      "name": "WEMIX",
-      "symbol": "WEMIX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "WEMIX3.0 Testnet",
-    "chainId": 1112,
-    "nativeCurrency": {
-      "name": "TestnetWEMIX",
-      "symbol": "tWEMIX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Core Blockchain Testnet",
-    "chainId": 1115,
-    "nativeCurrency": {
-      "name": "Core Blockchain Testnet Native Token",
-      "symbol": "tCORE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Core Blockchain Mainnet",
-    "chainId": 1116,
-    "nativeCurrency": {
-      "name": "Core Blockchain Native Token",
-      "symbol": "CORE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dogcoin Mainnet",
-    "chainId": 1117,
-    "nativeCurrency": {
-      "name": "Dogcoin",
-      "symbol": "DOGS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DeFiChain EVM Network Mainnet",
-    "chainId": 1130,
-    "nativeCurrency": {
-      "name": "DeFiChain",
-      "symbol": "DFI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DeFiChain EVM Network Testnet",
-    "chainId": 1131,
-    "nativeCurrency": {
-      "name": "DeFiChain",
-      "symbol": "DFI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AmStar Testnet",
-    "chainId": 1138,
-    "nativeCurrency": {
-      "name": "SINSO",
-      "symbol": "SINSO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MathChain",
-    "chainId": 1139,
-    "nativeCurrency": {
-      "name": "MathChain",
-      "symbol": "MATH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MathChain Testnet",
-    "chainId": 1140,
-    "nativeCurrency": {
-      "name": "MathChain",
-      "symbol": "MATH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Smart Host Teknoloji TESTNET",
-    "chainId": 1177,
-    "nativeCurrency": {
-      "name": "Smart Host Teknoloji TESTNET",
-      "symbol": "tSHT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Iora Chain",
-    "chainId": 1197,
-    "nativeCurrency": {
-      "name": "Iora",
-      "symbol": "IORA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Evanesco Testnet",
-    "chainId": 1201,
-    "nativeCurrency": {
-      "name": "AVIS",
-      "symbol": "AVIS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "World Trade Technical Chain Mainnet",
-    "chainId": 1202,
-    "nativeCurrency": {
-      "name": "World Trade Token",
-      "symbol": "WTT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Popcateum Mainnet",
-    "chainId": 1213,
-    "nativeCurrency": {
-      "name": "Popcat",
-      "symbol": "POP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "EnterChain Mainnet",
-    "chainId": 1214,
-    "nativeCurrency": {
-      "name": "EnterCoin",
-      "symbol": "ENTER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Exzo Network Mainnet",
-    "chainId": 1229,
-    "nativeCurrency": {
-      "name": "Exzo",
-      "symbol": "XZO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ultron Testnet",
-    "chainId": 1230,
-    "nativeCurrency": {
-      "name": "Ultron",
-      "symbol": "ULX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ultron Mainnet",
-    "chainId": 1231,
-    "nativeCurrency": {
-      "name": "Ultron",
-      "symbol": "ULX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Step Network",
-    "chainId": 1234,
-    "nativeCurrency": {
-      "name": "FITFI",
-      "symbol": "FITFI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OM Platform Mainnet",
-    "chainId": 1246,
-    "nativeCurrency": {
-      "name": "OMCOIN",
-      "symbol": "OM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CIC Chain Testnet",
-    "chainId": 1252,
-    "nativeCurrency": {
-      "name": "Crazy Internet Coin",
-      "symbol": "CICT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HALO Mainnet",
-    "chainId": 1280,
-    "nativeCurrency": {
-      "name": "HALO",
-      "symbol": "HO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Moonbeam",
-    "chainId": 1284,
-    "nativeCurrency": {
-      "name": "Glimmer",
-      "symbol": "GLMR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Moonriver",
-    "chainId": 1285,
-    "nativeCurrency": {
-      "name": "Moonriver",
-      "symbol": "MOVR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Moonrock old",
-    "chainId": 1286,
-    "nativeCurrency": {
-      "name": "Rocs",
-      "symbol": "ROC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Moonbase Alpha",
-    "chainId": 1287,
-    "nativeCurrency": {
-      "name": "Dev",
-      "symbol": "DEV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Moonrock",
-    "chainId": 1288,
-    "nativeCurrency": {
-      "name": "Rocs",
-      "symbol": "ROC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bobabeam",
-    "chainId": 1294,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bobabase Testnet",
-    "chainId": 1297,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dos Fuji Subnet",
-    "chainId": 1311,
-    "nativeCurrency": {
-      "name": "Dos Native Token",
-      "symbol": "DOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Alyx Mainnet",
-    "chainId": 1314,
-    "nativeCurrency": {
-      "name": "Alyx Chain Native Token",
-      "symbol": "ALYX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aitd Mainnet",
-    "chainId": 1319,
-    "nativeCurrency": {
-      "name": "AITD Mainnet",
-      "symbol": "AITD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aitd Testnet",
-    "chainId": 1320,
-    "nativeCurrency": {
-      "name": "AITD Testnet",
-      "symbol": "AITD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Geth Testnet",
-    "chainId": 1337,
-    "nativeCurrency": {
-      "name": "Geth Testnet Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Elysium Testnet",
-    "chainId": 1338,
-    "nativeCurrency": {
-      "name": "LAVA",
-      "symbol": "LAVA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Elysium Mainnet",
-    "chainId": 1339,
-    "nativeCurrency": {
-      "name": "LAVA",
-      "symbol": "LAVA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CIC Chain Mainnet",
-    "chainId": 1353,
-    "nativeCurrency": {
-      "name": "Crazy Internet Coin",
-      "symbol": "CIC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AmStar Mainnet",
-    "chainId": 1388,
-    "nativeCurrency": {
-      "name": "SINSO",
-      "symbol": "SINSO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polygon zkEVM Testnet old",
-    "chainId": 1402,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polygon zkEVM Testnet Pre Audit-Upgraded",
-    "chainId": 1422,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rikeza Network Mainnet",
-    "chainId": 1433,
-    "nativeCurrency": {
-      "name": "Rikeza",
-      "symbol": "RIK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polygon zkEVM Testnet",
-    "chainId": 1442,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ctex Scan Blockchain",
-    "chainId": 1455,
-    "nativeCurrency": {
-      "name": "CTEX",
-      "symbol": "CTEX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Sherpax Mainnet",
-    "chainId": 1506,
-    "nativeCurrency": {
-      "name": "KSX",
-      "symbol": "KSX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Sherpax Testnet",
-    "chainId": 1507,
-    "nativeCurrency": {
-      "name": "KSX",
-      "symbol": "KSX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Beagle Messaging Chain",
-    "chainId": 1515,
-    "nativeCurrency": {
-      "name": "Beagle",
-      "symbol": "BG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Catecoin Chain Mainnet",
-    "chainId": 1618,
-    "nativeCurrency": {
-      "name": "Catecoin",
-      "symbol": "CATE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Atheios",
-    "chainId": 1620,
-    "nativeCurrency": {
-      "name": "Atheios Ether",
-      "symbol": "ATH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Btachain",
-    "chainId": 1657,
-    "nativeCurrency": {
-      "name": "Bitcoin Asset",
-      "symbol": "BTA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Horizen Yuma Testnet",
-    "chainId": 1662,
-    "nativeCurrency": {
-      "name": "Testnet Zen",
-      "symbol": "tZEN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "LUDAN Mainnet",
-    "chainId": 1688,
-    "nativeCurrency": {
-      "name": "LUDAN",
-      "symbol": "LUDAN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Anytype EVM Chain",
-    "chainId": 1701,
-    "nativeCurrency": {
-      "name": "ANY",
-      "symbol": "ANY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TBSI Mainnet",
-    "chainId": 1707,
-    "nativeCurrency": {
-      "name": "Jinda",
-      "symbol": "JINDA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TBSI Testnet",
-    "chainId": 1708,
-    "nativeCurrency": {
-      "name": "Jinda",
-      "symbol": "JINDA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Palette Chain Mainnet",
-    "chainId": 1718,
-    "nativeCurrency": {
-      "name": "Palette Token",
-      "symbol": "PLT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kerleano",
-    "chainId": 1804,
-    "nativeCurrency": {
-      "name": "Carbon Reduction Coin",
-      "symbol": "CRC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rabbit Analog Testnet Chain",
-    "chainId": 1807,
-    "nativeCurrency": {
-      "name": "Rabbit Analog Test Chain Native Token ",
-      "symbol": "rAna",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Cube Chain Mainnet",
-    "chainId": 1818,
-    "nativeCurrency": {
-      "name": "Cube Chain Native Token",
-      "symbol": "CUBE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Cube Chain Testnet",
-    "chainId": 1819,
-    "nativeCurrency": {
-      "name": "Cube Chain Test Native Token",
-      "symbol": "CUBET",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Teslafunds",
-    "chainId": 1856,
-    "nativeCurrency": {
-      "name": "Teslafunds Ether",
-      "symbol": "TSF",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gitshock Cartenz Testnet",
-    "chainId": 1881,
-    "nativeCurrency": {
-      "name": "Gitshock Cartenz",
-      "symbol": "tGTFX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lightlink Phoenix Mainnet",
-    "chainId": 1890,
-    "nativeCurrency": {
-      "name": "Ethereum",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lightlink Pegasus Testnet",
-    "chainId": 1891,
-    "nativeCurrency": {
-      "name": "Ethereum",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BON Network",
-    "chainId": 1898,
-    "nativeCurrency": {
-      "name": "BOYACoin",
-      "symbol": "BOY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitcichain Mainnet",
-    "chainId": 1907,
-    "nativeCurrency": {
-      "name": "Bitci",
-      "symbol": "BITCI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitcichain Testnet",
-    "chainId": 1908,
-    "nativeCurrency": {
-      "name": "Test Bitci",
-      "symbol": "TBITCI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ONUS Chain Testnet",
-    "chainId": 1945,
-    "nativeCurrency": {
-      "name": "ONUS",
-      "symbol": "ONUS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "D-Chain Mainnet",
-    "chainId": 1951,
-    "nativeCurrency": {
-      "name": "DOINX",
-      "symbol": "DOINX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dexilla Testnet",
-    "chainId": 1954,
-    "nativeCurrency": {
-      "name": "Dexilla Native Token",
-      "symbol": "DXZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Eleanor",
-    "chainId": 1967,
-    "nativeCurrency": {
-      "name": "Eleanor Metacoin",
-      "symbol": "MTC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Super Smart Chain Testnet",
-    "chainId": 1969,
-    "nativeCurrency": {
-      "name": "Super Chain Native Token",
-      "symbol": "TSCS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Super Smart Chain Mainnet",
-    "chainId": 1970,
-    "nativeCurrency": {
-      "name": "Super Chain Native Token",
-      "symbol": "SCS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Atelier",
-    "chainId": 1971,
-    "nativeCurrency": {
-      "name": "ATLR",
-      "symbol": "ATLR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ONUS Chain Mainnet",
-    "chainId": 1975,
-    "nativeCurrency": {
-      "name": "ONUS",
-      "symbol": "ONUS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Eurus Testnet",
-    "chainId": 1984,
-    "nativeCurrency": {
-      "name": "Eurus",
-      "symbol": "EUN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "EtherGem",
-    "chainId": 1987,
-    "nativeCurrency": {
-      "name": "EtherGem Ether",
-      "symbol": "EGEM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ekta",
-    "chainId": 1994,
-    "nativeCurrency": {
-      "name": "EKTA",
-      "symbol": "EKTA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "edeXa Testnet",
-    "chainId": 1995,
-    "nativeCurrency": {
-      "name": "EDEXA",
-      "symbol": "EDX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dogechain Mainnet",
-    "chainId": 2000,
-    "nativeCurrency": {
-      "name": "Dogecoin",
-      "symbol": "DOGE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Milkomeda C1 Mainnet",
-    "chainId": 2001,
-    "nativeCurrency": {
-      "name": "milkAda",
-      "symbol": "mADA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Milkomeda A1 Mainnet",
-    "chainId": 2002,
-    "nativeCurrency": {
-      "name": "milkALGO",
-      "symbol": "mALGO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CloudWalk Testnet",
-    "chainId": 2008,
-    "nativeCurrency": {
-      "name": "CloudWalk Native Token",
-      "symbol": "CWN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CloudWalk Mainnet",
-    "chainId": 2009,
-    "nativeCurrency": {
-      "name": "CloudWalk Native Token",
-      "symbol": "CWN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MainnetZ Mainnet",
-    "chainId": 2016,
-    "nativeCurrency": {
-      "name": "MainnetZ",
-      "symbol": "NetZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PublicMint Devnet",
-    "chainId": 2018,
-    "nativeCurrency": {
-      "name": "USD",
-      "symbol": "USD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PublicMint Testnet",
-    "chainId": 2019,
-    "nativeCurrency": {
-      "name": "USD",
-      "symbol": "USD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PublicMint Mainnet",
-    "chainId": 2020,
-    "nativeCurrency": {
-      "name": "USD",
-      "symbol": "USD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Edgeware EdgeEVM Mainnet",
-    "chainId": 2021,
-    "nativeCurrency": {
-      "name": "Edgeware",
-      "symbol": "EDG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Beresheet BereEVM Testnet",
-    "chainId": 2022,
-    "nativeCurrency": {
-      "name": "Testnet EDG",
-      "symbol": "tEDG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Taycan Testnet",
-    "chainId": 2023,
-    "nativeCurrency": {
-      "name": "test-Shuffle",
-      "symbol": "tSFL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rangers Protocol Mainnet",
-    "chainId": 2025,
-    "nativeCurrency": {
-      "name": "Rangers Protocol Gas",
-      "symbol": "RPG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OriginTrail Parachain",
-    "chainId": 2043,
-    "nativeCurrency": {
-      "name": "OriginTrail Parachain Token",
-      "symbol": "OTP",
-      "decimals": 12
-    }
-  },
-  {
-    "name": "Stratos Testnet",
-    "chainId": 2047,
-    "nativeCurrency": {
-      "name": "STOS",
-      "symbol": "STOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Stratos Mainnet",
-    "chainId": 2048,
-    "nativeCurrency": {
-      "name": "STOS",
-      "symbol": "STOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Quokkacoin Mainnet",
-    "chainId": 2077,
-    "nativeCurrency": {
-      "name": "Qkacoin",
-      "symbol": "QKA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ecoball Mainnet",
-    "chainId": 2100,
-    "nativeCurrency": {
-      "name": "Ecoball Coin",
-      "symbol": "ECO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ecoball Testnet Espuma",
-    "chainId": 2101,
-    "nativeCurrency": {
-      "name": "Espuma Coin",
-      "symbol": "ECO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Exosama Network",
-    "chainId": 2109,
-    "nativeCurrency": {
-      "name": "Sama Token",
-      "symbol": "SAMA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metaplayerone Mainnet",
-    "chainId": 2122,
-    "nativeCurrency": {
-      "name": "METAD",
-      "symbol": "METAD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Defi Oracle Meta Testnet",
-    "chainId": 2138,
-    "nativeCurrency": {
-      "name": "testEther",
-      "symbol": "tETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BOSagora Mainnet",
-    "chainId": 2151,
-    "nativeCurrency": {
-      "name": "BOSAGORA",
-      "symbol": "BOA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Findora Mainnet",
-    "chainId": 2152,
-    "nativeCurrency": {
-      "name": "FRA",
-      "symbol": "FRA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Findora Testnet",
-    "chainId": 2153,
-    "nativeCurrency": {
-      "name": "FRA",
-      "symbol": "FRA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Findora Forge",
-    "chainId": 2154,
-    "nativeCurrency": {
-      "name": "FRA",
-      "symbol": "FRA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitcoin EVM",
-    "chainId": 2203,
-    "nativeCurrency": {
-      "name": "Bitcoin",
-      "symbol": "eBTC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Evanesco Mainnet",
-    "chainId": 2213,
-    "nativeCurrency": {
-      "name": "EVA",
-      "symbol": "EVA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kava EVM Testnet",
-    "chainId": 2221,
-    "nativeCurrency": {
-      "name": "TKava",
-      "symbol": "TKAVA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kava EVM",
-    "chainId": 2222,
-    "nativeCurrency": {
-      "name": "Kava",
-      "symbol": "KAVA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "VChain Mainnet",
-    "chainId": 2223,
-    "nativeCurrency": {
-      "name": "VNDT",
-      "symbol": "VNDT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BOMB Chain",
-    "chainId": 2300,
-    "nativeCurrency": {
-      "name": "BOMB Token",
-      "symbol": "BOMB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Arevia",
-    "chainId": 2309,
-    "nativeCurrency": {
-      "name": "Arev",
-      "symbol": "ARÉV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Altcoinchain",
-    "chainId": 2330,
-    "nativeCurrency": {
-      "name": "Altcoin",
-      "symbol": "ALT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "WEMIX Kanvas Sepolia",
-    "chainId": 2357,
-    "nativeCurrency": {
-      "name": "Sepolia Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BOMB Chain Testnet",
-    "chainId": 2399,
-    "nativeCurrency": {
-      "name": "BOMB Token",
-      "symbol": "tBOMB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TCG Verse Mainnet",
-    "chainId": 2400,
-    "nativeCurrency": {
-      "name": "OAS",
-      "symbol": "OAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "XODEX",
-    "chainId": 2415,
-    "nativeCurrency": {
-      "name": "XODEX Native Token",
-      "symbol": "XODEX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kortho Mainnet",
-    "chainId": 2559,
-    "nativeCurrency": {
-      "name": "KorthoChain",
-      "symbol": "KTO",
-      "decimals": 11
-    }
-  },
-  {
-    "name": "TechPay Mainnet",
-    "chainId": 2569,
-    "nativeCurrency": {
-      "name": "TechPay",
-      "symbol": "TPC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PoCRNet",
-    "chainId": 2606,
-    "nativeCurrency": {
-      "name": "Carbon Reduction Coin",
-      "symbol": "CRC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Redlight Chain Mainnet",
-    "chainId": 2611,
-    "nativeCurrency": {
-      "name": "Redlight Coin",
-      "symbol": "REDLC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "EZChain C-Chain Mainnet",
-    "chainId": 2612,
-    "nativeCurrency": {
-      "name": "EZChain",
-      "symbol": "EZC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "EZChain C-Chain Testnet",
-    "chainId": 2613,
-    "nativeCurrency": {
-      "name": "EZChain",
-      "symbol": "EZC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Boba Network Goerli Testnet",
-    "chainId": 2888,
-    "nativeCurrency": {
-      "name": "Goerli Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BitYuan Mainnet",
-    "chainId": 2999,
-    "nativeCurrency": {
-      "name": "BTY",
-      "symbol": "BTY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CENNZnet Rata",
-    "chainId": 3000,
-    "nativeCurrency": {
-      "name": "CPAY",
-      "symbol": "CPAY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CENNZnet Nikau",
-    "chainId": 3001,
-    "nativeCurrency": {
-      "name": "CPAY",
-      "symbol": "CPAY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Orlando Chain",
-    "chainId": 3031,
-    "nativeCurrency": {
-      "name": "Orlando",
-      "symbol": "ORL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bifrost Mainnet",
-    "chainId": 3068,
-    "nativeCurrency": {
-      "name": "Bifrost",
-      "symbol": "BFC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Filecoin - Hyperspace testnet",
-    "chainId": 3141,
-    "nativeCurrency": {
-      "name": "testnet filecoin",
-      "symbol": "tFIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Debounce Subnet Testnet",
-    "chainId": 3306,
-    "nativeCurrency": {
-      "name": "Debounce Network",
-      "symbol": "DB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ZCore Testnet",
-    "chainId": 3331,
-    "nativeCurrency": {
-      "name": "ZCore",
-      "symbol": "ZCR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Web3Q Testnet",
-    "chainId": 3333,
-    "nativeCurrency": {
-      "name": "Web3Q",
-      "symbol": "W3Q",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Web3Q Galileo",
-    "chainId": 3334,
-    "nativeCurrency": {
-      "name": "Web3Q",
-      "symbol": "W3Q",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Paribu Net Mainnet",
-    "chainId": 3400,
-    "nativeCurrency": {
-      "name": "PRB",
-      "symbol": "PRB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Paribu Net Testnet",
-    "chainId": 3500,
-    "nativeCurrency": {
-      "name": "PRB",
-      "symbol": "PRB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "JFIN Chain",
-    "chainId": 3501,
-    "nativeCurrency": {
-      "name": "JFIN Coin",
-      "symbol": "jfin",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PandoProject Mainnet",
-    "chainId": 3601,
-    "nativeCurrency": {
-      "name": "pando-token",
-      "symbol": "PTX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PandoProject Testnet",
-    "chainId": 3602,
-    "nativeCurrency": {
-      "name": "pando-token",
-      "symbol": "PTX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metacodechain",
-    "chainId": 3666,
-    "nativeCurrency": {
-      "name": "J",
-      "symbol": "J",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bittex Mainnet",
-    "chainId": 3690,
-    "nativeCurrency": {
-      "name": "Bittex",
-      "symbol": "BTX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Empire Network",
-    "chainId": 3693,
-    "nativeCurrency": {
-      "name": "Empire",
-      "symbol": "EMPIRE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Crossbell",
-    "chainId": 3737,
-    "nativeCurrency": {
-      "name": "Crossbell Token",
-      "symbol": "CSB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AlveyChain Mainnet",
-    "chainId": 3797,
-    "nativeCurrency": {
-      "name": "AlveyCoin",
-      "symbol": "ALV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DRAC Network",
-    "chainId": 3912,
-    "nativeCurrency": {
-      "name": "DRAC",
-      "symbol": "DRAC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DOS Tesnet",
-    "chainId": 3939,
-    "nativeCurrency": {
-      "name": "DOS",
-      "symbol": "DOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DYNO Mainnet",
-    "chainId": 3966,
-    "nativeCurrency": {
-      "name": "DYNO Token",
-      "symbol": "DYNO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DYNO Testnet",
-    "chainId": 3967,
-    "nativeCurrency": {
-      "name": "DYNO Token",
-      "symbol": "tDYNO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "YuanChain Mainnet",
-    "chainId": 3999,
-    "nativeCurrency": {
-      "name": "YCC",
-      "symbol": "YCC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fantom Testnet",
-    "chainId": 4002,
-    "nativeCurrency": {
-      "name": "Fantom",
-      "symbol": "FTM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bobaopera Testnet",
-    "chainId": 4051,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nahmii 3 Mainnet",
-    "chainId": 4061,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nahmii 3 Testnet",
-    "chainId": 4062,
-    "nativeCurrency": {
-      "name": "Goerli Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitindi Testnet",
-    "chainId": 4096,
-    "nativeCurrency": {
-      "name": "BNI",
-      "symbol": "$BNI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitindi Mainnet",
-    "chainId": 4099,
-    "nativeCurrency": {
-      "name": "BNI",
-      "symbol": "$BNI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AIOZ Network Testnet",
-    "chainId": 4102,
-    "nativeCurrency": {
-      "name": "testAIOZ",
-      "symbol": "AIOZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Tipboxcoin Testnet",
-    "chainId": 4141,
-    "nativeCurrency": {
-      "name": "Tipboxcoin",
-      "symbol": "TPBX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PHI Network V1",
-    "chainId": 4181,
-    "nativeCurrency": {
-      "name": "PHI",
-      "symbol": "Φ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nexi Mainnet",
-    "chainId": 4242,
-    "nativeCurrency": {
-      "name": "Nexi",
-      "symbol": "NEXI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bobafuji Testnet",
-    "chainId": 4328,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Htmlcoin Mainnet",
-    "chainId": 4444,
-    "nativeCurrency": {
-      "name": "Htmlcoin",
-      "symbol": "HTML",
-      "decimals": 8
-    }
-  },
-  {
-    "name": "IoTeX Network Mainnet",
-    "chainId": 4689,
-    "nativeCurrency": {
-      "name": "IoTeX",
-      "symbol": "IOTX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "IoTeX Network Testnet",
-    "chainId": 4690,
-    "nativeCurrency": {
-      "name": "IoTeX",
-      "symbol": "IOTX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BlackFort Exchange Network Testnet",
-    "chainId": 4777,
-    "nativeCurrency": {
-      "name": "BlackFort Testnet Token",
-      "symbol": "TBXN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Venidium Testnet",
-    "chainId": 4918,
-    "nativeCurrency": {
-      "name": "Venidium",
-      "symbol": "XVM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Venidium Mainnet",
-    "chainId": 4919,
-    "nativeCurrency": {
-      "name": "Venidium",
-      "symbol": "XVM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BlackFort Exchange Network",
-    "chainId": 4999,
-    "nativeCurrency": {
-      "name": "BlackFort Token",
-      "symbol": "BXN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mantle",
-    "chainId": 5000,
-    "nativeCurrency": {
-      "name": "BitDAO",
-      "symbol": "BIT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TLChain Network Mainnet",
-    "chainId": 5177,
-    "nativeCurrency": {
-      "name": "TLChain Network",
-      "symbol": "TLC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "EraSwap Mainnet",
-    "chainId": 5197,
-    "nativeCurrency": {
-      "name": "EraSwap",
-      "symbol": "ES",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Humanode Mainnet",
-    "chainId": 5234,
-    "nativeCurrency": {
-      "name": "HMND",
-      "symbol": "HMND",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Firechain Mainnet Old",
-    "chainId": 5290,
-    "nativeCurrency": {
-      "name": "Firechain",
-      "symbol": "FIRE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Uzmi Network Mainnet",
-    "chainId": 5315,
-    "nativeCurrency": {
-      "name": "UZMI",
-      "symbol": "UZMI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nahmii Mainnet",
-    "chainId": 5551,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nahmii Testnet",
-    "chainId": 5553,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Chain Verse Mainnet",
-    "chainId": 5555,
-    "nativeCurrency": {
-      "name": "Oasys",
-      "symbol": "OAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Syscoin Tanenbaum Testnet",
-    "chainId": 5700,
-    "nativeCurrency": {
-      "name": "Testnet Syscoin",
-      "symbol": "tSYS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hika Network Testnet",
-    "chainId": 5729,
-    "nativeCurrency": {
-      "name": "Hik Token",
-      "symbol": "HIK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ganache",
-    "chainId": 5777,
-    "nativeCurrency": {
-      "name": "Ganache Test Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ontology Testnet",
-    "chainId": 5851,
-    "nativeCurrency": {
-      "name": "ONG",
-      "symbol": "ONG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Wegochain Rubidium Mainnet",
-    "chainId": 5869,
-    "nativeCurrency": {
-      "name": "Rubid",
-      "symbol": "RBD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Tres Testnet",
-    "chainId": 6065,
-    "nativeCurrency": {
-      "name": "TRES",
-      "symbol": "TRES",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Tres Mainnet",
-    "chainId": 6066,
-    "nativeCurrency": {
-      "name": "TRES",
-      "symbol": "TRES",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Scolcoin WeiChain Testnet",
-    "chainId": 6552,
-    "nativeCurrency": {
-      "name": "Scolcoin",
-      "symbol": "SCOL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Pixie Chain Mainnet",
-    "chainId": 6626,
-    "nativeCurrency": {
-      "name": "Pixie Chain Native Token",
-      "symbol": "PIX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gold Smart Chain Mainnet",
-    "chainId": 6789,
-    "nativeCurrency": {
-      "name": "Standard in Gold",
-      "symbol": "STAND",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Tomb Chain Mainnet",
-    "chainId": 6969,
-    "nativeCurrency": {
-      "name": "Tomb",
-      "symbol": "TOMB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PolySmartChain",
-    "chainId": 6999,
-    "nativeCurrency": {
-      "name": "PSC",
-      "symbol": "PSC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ZetaChain Mainnet",
-    "chainId": 7000,
-    "nativeCurrency": {
-      "name": "Zeta",
-      "symbol": "ZETA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ZetaChain Athens Testnet",
-    "chainId": 7001,
-    "nativeCurrency": {
-      "name": "Zeta",
-      "symbol": "aZETA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ella the heart",
-    "chainId": 7027,
-    "nativeCurrency": {
-      "name": "Ella",
-      "symbol": "ELLA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Planq Mainnet",
-    "chainId": 7070,
-    "nativeCurrency": {
-      "name": "Planq",
-      "symbol": "PLQ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "KLYNTAR",
-    "chainId": 7331,
-    "nativeCurrency": {
-      "name": "KLYNTAR",
-      "symbol": "KLY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Shyft Mainnet",
-    "chainId": 7341,
-    "nativeCurrency": {
-      "name": "Shyft",
-      "symbol": "SHYFT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ADIL Testnet",
-    "chainId": 7575,
-    "nativeCurrency": {
-      "name": "Testnet ADIL",
-      "symbol": "ADIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "The Root Network - Mainnet",
-    "chainId": 7668,
-    "nativeCurrency": {
-      "name": "XRP",
-      "symbol": "XRP",
-      "decimals": 6
-    }
-  },
-  {
-    "name": "The Root Network - Porcini Testnet",
-    "chainId": 7672,
-    "nativeCurrency": {
-      "name": "XRP",
-      "symbol": "XRP",
-      "decimals": 6
-    }
-  },
-  {
-    "name": "Canto",
-    "chainId": 7700,
-    "nativeCurrency": {
-      "name": "Canto",
-      "symbol": "CANTO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Canto Tesnet",
-    "chainId": 7701,
-    "nativeCurrency": {
-      "name": "Testnet Canto",
-      "symbol": "CANTO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rise of the Warbots Testnet",
-    "chainId": 7777,
-    "nativeCurrency": {
-      "name": "Nano Machines",
-      "symbol": "NMAC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hazlor Testnet",
-    "chainId": 7878,
-    "nativeCurrency": {
-      "name": "Hazlor Test Coin",
-      "symbol": "TSCAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DOS Chain",
-    "chainId": 7979,
-    "nativeCurrency": {
-      "name": "DOS",
-      "symbol": "DOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Teleport",
-    "chainId": 8000,
-    "nativeCurrency": {
-      "name": "Tele",
-      "symbol": "TELE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Teleport Testnet",
-    "chainId": 8001,
-    "nativeCurrency": {
-      "name": "Tele",
-      "symbol": "TELE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MDGL Testnet",
-    "chainId": 8029,
-    "nativeCurrency": {
-      "name": "MDGL Token",
-      "symbol": "MDGLT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Shardeum Liberty 1.X",
-    "chainId": 8080,
-    "nativeCurrency": {
-      "name": "Shardeum SHM",
-      "symbol": "SHM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Shardeum Liberty 2.X",
-    "chainId": 8081,
-    "nativeCurrency": {
-      "name": "Shardeum SHM",
-      "symbol": "SHM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Shardeum Sphinx 1.X",
-    "chainId": 8082,
-    "nativeCurrency": {
-      "name": "Shardeum SHM",
-      "symbol": "SHM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "StreamuX Blockchain",
-    "chainId": 8098,
-    "nativeCurrency": {
-      "name": "StreamuX",
-      "symbol": "SmuX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Qitmeer Network Testnet",
-    "chainId": 8131,
-    "nativeCurrency": {
-      "name": "Qitmeer Testnet",
-      "symbol": "MEER-T",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Qitmeer Network Mixnet",
-    "chainId": 8132,
-    "nativeCurrency": {
-      "name": "Qitmeer Mixnet",
-      "symbol": "MEER-M",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Qitmeer Network Privnet",
-    "chainId": 8133,
-    "nativeCurrency": {
-      "name": "Qitmeer Privnet",
-      "symbol": "MEER-P",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Amana",
-    "chainId": 8134,
-    "nativeCurrency": {
-      "name": "Amana Mainnet",
-      "symbol": "MEER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flana",
-    "chainId": 8135,
-    "nativeCurrency": {
-      "name": "Flana Mainnet",
-      "symbol": "MEER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mizana",
-    "chainId": 8136,
-    "nativeCurrency": {
-      "name": "Mizana Mainnet",
-      "symbol": "MEER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BeOne Chain Testnet",
-    "chainId": 8181,
-    "nativeCurrency": {
-      "name": "BeOne Chain Testnet",
-      "symbol": "BOC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Klaytn Mainnet Cypress",
-    "chainId": 8217,
-    "nativeCurrency": {
-      "name": "KLAY",
-      "symbol": "KLAY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Blockton Blockchain",
-    "chainId": 8272,
-    "nativeCurrency": {
-      "name": "BLOCKTON",
-      "symbol": "BTON",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "KorthoTest",
-    "chainId": 8285,
-    "nativeCurrency": {
-      "name": "Kortho Test",
-      "symbol": "KTO",
-      "decimals": 11
-    }
-  },
-  {
-    "name": "Dracones Financial Services",
-    "chainId": 8387,
-    "nativeCurrency": {
-      "name": "Functionally Universal Coin Kind",
-      "symbol": "FUCK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Base",
-    "chainId": 8453,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Toki Network",
-    "chainId": 8654,
-    "nativeCurrency": {
-      "name": "Toki",
-      "symbol": "TOKI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Toki Testnet",
-    "chainId": 8655,
-    "nativeCurrency": {
-      "name": "Toki",
-      "symbol": "TOKI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TOOL Global Mainnet",
-    "chainId": 8723,
-    "nativeCurrency": {
-      "name": "TOOL Global",
-      "symbol": "OLO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TOOL Global Testnet",
-    "chainId": 8724,
-    "nativeCurrency": {
-      "name": "TOOL Global",
-      "symbol": "OLO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Alph Network",
-    "chainId": 8738,
-    "nativeCurrency": {
-      "name": "Alph Network",
-      "symbol": "ALPH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "TMY Chain",
-    "chainId": 8768,
-    "nativeCurrency": {
-      "name": "TMY",
-      "symbol": "TMY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MARO Blockchain Mainnet",
-    "chainId": 8848,
-    "nativeCurrency": {
-      "name": "MARO",
-      "symbol": "MARO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Unique",
-    "chainId": 8880,
-    "nativeCurrency": {
-      "name": "Unique",
-      "symbol": "UNQ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Quartz by Unique",
-    "chainId": 8881,
-    "nativeCurrency": {
-      "name": "Quartz",
-      "symbol": "QTZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Opal testnet by Unique",
-    "chainId": 8882,
-    "nativeCurrency": {
-      "name": "Opal",
-      "symbol": "UNQ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Sapphire by Unique",
-    "chainId": 8883,
-    "nativeCurrency": {
-      "name": "Quartz",
-      "symbol": "QTZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "XANAChain",
-    "chainId": 8888,
-    "nativeCurrency": {
-      "name": "XETA",
-      "symbol": "XETA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Vyvo Smart Chain",
-    "chainId": 8889,
-    "nativeCurrency": {
-      "name": "VSC",
-      "symbol": "VSC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mammoth Mainnet",
-    "chainId": 8898,
-    "nativeCurrency": {
-      "name": "Mammoth Token",
-      "symbol": "MMT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "JIBCHAIN L1",
-    "chainId": 8899,
-    "nativeCurrency": {
-      "name": "JIBCOIN",
-      "symbol": "JBC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Giant Mammoth Mainnet",
-    "chainId": 8989,
-    "nativeCurrency": {
-      "name": "Giant Mammoth Coin",
-      "symbol": "GMMT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "bloxberg",
-    "chainId": 8995,
-    "nativeCurrency": {
-      "name": "BERG",
-      "symbol": "U+25B3",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Evmos Testnet",
-    "chainId": 9000,
-    "nativeCurrency": {
-      "name": "test-Evmos",
-      "symbol": "tEVMOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Evmos",
-    "chainId": 9001,
-    "nativeCurrency": {
-      "name": "Evmos",
-      "symbol": "EVMOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BerylBit Mainnet",
-    "chainId": 9012,
-    "nativeCurrency": {
-      "name": "BerylBit Chain Native Token",
-      "symbol": "BRB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Genesis Coin",
-    "chainId": 9100,
-    "nativeCurrency": {
-      "name": "GN Coin",
-      "symbol": "GNC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rinia Testnet Old",
-    "chainId": 9170,
-    "nativeCurrency": {
-      "name": "Firechain",
-      "symbol": "FIRE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dogcoin Testnet",
-    "chainId": 9339,
-    "nativeCurrency": {
-      "name": "Dogcoin",
-      "symbol": "DOGS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rangers Protocol Testnet Robin",
-    "chainId": 9527,
-    "nativeCurrency": {
-      "name": "Rangers Protocol Gas",
-      "symbol": "tRPG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QEasyWeb3 Testnet",
-    "chainId": 9528,
-    "nativeCurrency": {
-      "name": "QET",
-      "symbol": "QET",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oort MainnetDev",
-    "chainId": 9700,
-    "nativeCurrency": {
-      "name": "Oort",
-      "symbol": "CCN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Boba BNB Testnet",
-    "chainId": 9728,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MainnetZ Testnet",
-    "chainId": 9768,
-    "nativeCurrency": {
-      "name": "MainnetZ",
-      "symbol": "NetZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "myOwn Testnet",
-    "chainId": 9999,
-    "nativeCurrency": {
-      "name": "MYN",
-      "symbol": "MYN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Smart Bitcoin Cash",
-    "chainId": 10000,
-    "nativeCurrency": {
-      "name": "Bitcoin Cash",
-      "symbol": "BCH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Smart Bitcoin Cash Testnet",
-    "chainId": 10001,
-    "nativeCurrency": {
-      "name": "Bitcoin Cash Test Token",
-      "symbol": "BCHT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gon Chain",
-    "chainId": 10024,
-    "nativeCurrency": {
-      "name": "Gon Token",
-      "symbol": "GT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SJATSH",
-    "chainId": 10086,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Blockchain Genesis Mainnet",
-    "chainId": 10101,
-    "nativeCurrency": {
-      "name": "GEN",
-      "symbol": "GEN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Chiado Testnet",
-    "chainId": 10200,
-    "nativeCurrency": {
-      "name": "Chiado xDAI",
-      "symbol": "xDAI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "0XTade",
-    "chainId": 10248,
-    "nativeCurrency": {
-      "name": "0XT",
-      "symbol": "0XT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Numbers Mainnet",
-    "chainId": 10507,
-    "nativeCurrency": {
-      "name": "NUM Token",
-      "symbol": "NUM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Numbers Testnet",
-    "chainId": 10508,
-    "nativeCurrency": {
-      "name": "NUM Token",
-      "symbol": "NUM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CryptoCoinPay",
-    "chainId": 10823,
-    "nativeCurrency": {
-      "name": "CryptoCoinPay",
-      "symbol": "CCP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Quadrans Blockchain",
-    "chainId": 10946,
-    "nativeCurrency": {
-      "name": "Quadrans Coin",
-      "symbol": "QDC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Quadrans Blockchain Testnet",
-    "chainId": 10947,
-    "nativeCurrency": {
-      "name": "Quadrans Testnet Coin",
-      "symbol": "tQDC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Astra",
-    "chainId": 11110,
-    "nativeCurrency": {
-      "name": "Astra",
-      "symbol": "ASA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "WAGMI",
-    "chainId": 11111,
-    "nativeCurrency": {
-      "name": "WAGMI",
-      "symbol": "WGM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Astra Testnet",
-    "chainId": 11115,
-    "nativeCurrency": {
-      "name": "test-Astra",
-      "symbol": "tASA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HashBit Mainnet",
-    "chainId": 11119,
-    "nativeCurrency": {
-      "name": "HashBit Native Token",
-      "symbol": "HBIT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Haqq Network",
-    "chainId": 11235,
-    "nativeCurrency": {
-      "name": "Islamic Coin",
-      "symbol": "ISLM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Shyft Testnet",
-    "chainId": 11437,
-    "nativeCurrency": {
-      "name": "Shyft Test Token",
-      "symbol": "SHYFTT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Sardis Testnet",
-    "chainId": 11612,
-    "nativeCurrency": {
-      "name": "Sardis",
-      "symbol": "SRDX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SanR Chain",
-    "chainId": 11888,
-    "nativeCurrency": {
-      "name": "nSAN",
-      "symbol": "nSAN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Singularity ZERO Testnet",
-    "chainId": 12051,
-    "nativeCurrency": {
-      "name": "ZERO",
-      "symbol": "tZERO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Singularity ZERO Mainnet",
-    "chainId": 12052,
-    "nativeCurrency": {
-      "name": "ZERO",
-      "symbol": "ZERO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fibonacci Mainnet",
-    "chainId": 12306,
-    "nativeCurrency": {
-      "name": "FIBONACCI UTILITY TOKEN",
-      "symbol": "FIBO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BLG Testnet",
-    "chainId": 12321,
-    "nativeCurrency": {
-      "name": "Blg",
-      "symbol": "BLG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Step Testnet",
-    "chainId": 12345,
-    "nativeCurrency": {
-      "name": "FITFI",
-      "symbol": "FITFI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Rikeza Network Testnet",
-    "chainId": 12715,
-    "nativeCurrency": {
-      "name": "Rikeza",
-      "symbol": "RIK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SPS",
-    "chainId": 13000,
-    "nativeCurrency": {
-      "name": "ECG",
-      "symbol": "ECG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Credit Smartchain Mainnet",
-    "chainId": 13308,
-    "nativeCurrency": {
-      "name": "Credit",
-      "symbol": "CREDIT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Phoenix Mainnet",
-    "chainId": 13381,
-    "nativeCurrency": {
-      "name": "Phoenix",
-      "symbol": "PHX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Susono",
-    "chainId": 13812,
-    "nativeCurrency": {
-      "name": "Susono",
-      "symbol": "OPN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SPS Testnet",
-    "chainId": 14000,
-    "nativeCurrency": {
-      "name": "ECG",
-      "symbol": "ECG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "LoopNetwork Mainnet",
-    "chainId": 15551,
-    "nativeCurrency": {
-      "name": "LOOP",
-      "symbol": "LOOP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Trust EVM Testnet",
-    "chainId": 15555,
-    "nativeCurrency": {
-      "name": "Trust EVM",
-      "symbol": "EVM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MetaDot Mainnet",
-    "chainId": 16000,
-    "nativeCurrency": {
-      "name": "MetaDot Token",
-      "symbol": "MTT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MetaDot Testnet",
-    "chainId": 16001,
-    "nativeCurrency": {
-      "name": "MetaDot Token TestNet",
-      "symbol": "MTTest",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AirDAO Mainnet",
-    "chainId": 16718,
-    "nativeCurrency": {
-      "name": "Amber",
-      "symbol": "AMB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "IVAR Chain Testnet",
-    "chainId": 16888,
-    "nativeCurrency": {
-      "name": "tIvar",
-      "symbol": "tIVAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Frontier of Dreams Testnet",
-    "chainId": 18000,
-    "nativeCurrency": {
-      "name": "ZKST",
-      "symbol": "ZKST",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Proof Of Memes",
-    "chainId": 18159,
-    "nativeCurrency": {
-      "name": "Proof Of Memes",
-      "symbol": "POM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HOME Verse Mainnet",
-    "chainId": 19011,
-    "nativeCurrency": {
-      "name": "OAS",
-      "symbol": "OAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BTCIX Network",
-    "chainId": 19845,
-    "nativeCurrency": {
-      "name": "BTCIX Network",
-      "symbol": "BTCIX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Camelark Mainnet",
-    "chainId": 20001,
-    "nativeCurrency": {
-      "name": "EthereumPoW",
-      "symbol": "ETHW",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Callisto Testnet",
-    "chainId": 20729,
-    "nativeCurrency": {
-      "name": "Callisto",
-      "symbol": "CLO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "P12 Chain",
-    "chainId": 20736,
-    "nativeCurrency": {
-      "name": "Hooked P2",
-      "symbol": "hP2",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CENNZnet Azalea",
-    "chainId": 21337,
-    "nativeCurrency": {
-      "name": "CPAY",
-      "symbol": "CPAY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "omChain Mainnet",
-    "chainId": 21816,
-    "nativeCurrency": {
-      "name": "omChain",
-      "symbol": "OMC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Taycan",
-    "chainId": 22023,
-    "nativeCurrency": {
-      "name": "shuffle",
-      "symbol": "SFL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "AirDAO Testnet",
-    "chainId": 22040,
-    "nativeCurrency": {
-      "name": "Amber",
-      "symbol": "AMB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MAP Mainnet",
-    "chainId": 22776,
-    "nativeCurrency": {
-      "name": "MAP",
-      "symbol": "MAP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Opside Testnet",
-    "chainId": 23118,
-    "nativeCurrency": {
-      "name": "IDE",
-      "symbol": "IDE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oasis Sapphire",
-    "chainId": 23294,
-    "nativeCurrency": {
-      "name": "Sapphire Rose",
-      "symbol": "ROSE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oasis Sapphire Testnet",
-    "chainId": 23295,
-    "nativeCurrency": {
-      "name": "Sapphire Test Rose",
-      "symbol": "TEST",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Webchain",
-    "chainId": 24484,
-    "nativeCurrency": {
-      "name": "Webchain Ether",
-      "symbol": "WEB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MintMe.com Coin",
-    "chainId": 24734,
-    "nativeCurrency": {
-      "name": "MintMe.com Coin",
-      "symbol": "MINTME",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hammer Chain Mainnet",
-    "chainId": 25888,
-    "nativeCurrency": {
-      "name": "GOLDT",
-      "symbol": "GOLDT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitkub Chain Testnet",
-    "chainId": 25925,
-    "nativeCurrency": {
-      "name": "Bitkub Coin",
-      "symbol": "tKUB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hertz Network Mainnet",
-    "chainId": 26600,
-    "nativeCurrency": {
-      "name": "Hertz",
-      "symbol": "HTZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OasisChain Mainnet",
-    "chainId": 26863,
-    "nativeCurrency": {
-      "name": "OAC",
-      "symbol": "OAC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Optimism Bedrock (Goerli Alpha Testnet)",
-    "chainId": 28528,
-    "nativeCurrency": {
-      "name": "Goerli Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Piece testnet",
-    "chainId": 30067,
-    "nativeCurrency": {
-      "name": "ECE",
-      "symbol": "ECE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ethersocial Network",
-    "chainId": 31102,
-    "nativeCurrency": {
-      "name": "Ethersocial Network Ether",
-      "symbol": "ESN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CloudTx Mainnet",
-    "chainId": 31223,
-    "nativeCurrency": {
-      "name": "CloudTx",
-      "symbol": "CLD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CloudTx Testnet",
-    "chainId": 31224,
-    "nativeCurrency": {
-      "name": "CloudTx",
-      "symbol": "CLD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GoChain Testnet",
-    "chainId": 31337,
-    "nativeCurrency": {
-      "name": "GoChain Coin",
-      "symbol": "GO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Filecoin - Wallaby testnet",
-    "chainId": 31415,
-    "nativeCurrency": {
-      "name": "testnet filecoin",
-      "symbol": "tFIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bitgert Mainnet",
-    "chainId": 32520,
-    "nativeCurrency": {
-      "name": "Bitrise Token",
-      "symbol": "Brise",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fusion Mainnet",
-    "chainId": 32659,
-    "nativeCurrency": {
-      "name": "Fusion",
-      "symbol": "FSN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zilliqa EVM Testnet",
-    "chainId": 33101,
-    "nativeCurrency": {
-      "name": "Zilliqa",
-      "symbol": "ZIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aves Mainnet",
-    "chainId": 33333,
-    "nativeCurrency": {
-      "name": "Aves",
-      "symbol": "AVS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "J2O Taro",
-    "chainId": 35011,
-    "nativeCurrency": {
-      "name": "TARO Coin",
-      "symbol": "taro",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Q Mainnet",
-    "chainId": 35441,
-    "nativeCurrency": {
-      "name": "Q token",
-      "symbol": "Q",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Q Testnet",
-    "chainId": 35443,
-    "nativeCurrency": {
-      "name": "Q token",
-      "symbol": "Q",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Energi Mainnet",
-    "chainId": 39797,
-    "nativeCurrency": {
-      "name": "Energi",
-      "symbol": "NRG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OHO Mainnet",
-    "chainId": 39815,
-    "nativeCurrency": {
-      "name": "OHO",
-      "symbol": "OHO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Opulent-X BETA",
-    "chainId": 41500,
-    "nativeCurrency": {
-      "name": "Oxyn Gas",
-      "symbol": "OXYN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "pegglecoin",
-    "chainId": 42069,
-    "nativeCurrency": {
-      "name": "pegglecoin",
-      "symbol": "peggle",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Arbitrum One",
-    "chainId": 42161,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Arbitrum Nova",
-    "chainId": 42170,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Celo Mainnet",
-    "chainId": 42220,
-    "nativeCurrency": {
-      "name": "CELO",
-      "symbol": "CELO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oasis Emerald Testnet",
-    "chainId": 42261,
-    "nativeCurrency": {
-      "name": "Emerald Rose",
-      "symbol": "ROSE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oasis Emerald",
-    "chainId": 42262,
-    "nativeCurrency": {
-      "name": "Emerald Rose",
-      "symbol": "ROSE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Athereum",
-    "chainId": 43110,
-    "nativeCurrency": {
-      "name": "Athereum Ether",
-      "symbol": "ATH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Avalanche Fuji Testnet",
-    "chainId": 43113,
-    "nativeCurrency": {
-      "name": "Avalanche",
-      "symbol": "AVAX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Avalanche C-Chain",
-    "chainId": 43114,
-    "nativeCurrency": {
-      "name": "Avalanche",
-      "symbol": "AVAX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Boba Avax",
-    "chainId": 43288,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Frenchain",
-    "chainId": 44444,
-    "nativeCurrency": {
-      "name": "FREN",
-      "symbol": "FREN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Celo Alfajores Testnet",
-    "chainId": 44787,
-    "nativeCurrency": {
-      "name": "CELO",
-      "symbol": "CELO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Autobahn Network",
-    "chainId": 45000,
-    "nativeCurrency": {
-      "name": "TXL",
-      "symbol": "TXL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fusion Testnet",
-    "chainId": 46688,
-    "nativeCurrency": {
-      "name": "Testnet Fusion",
-      "symbol": "T-FSN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "REI Network",
-    "chainId": 47805,
-    "nativeCurrency": {
-      "name": "REI",
-      "symbol": "REI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Floripa",
-    "chainId": 49049,
-    "nativeCurrency": {
-      "name": "WIRE",
-      "symbol": "WIRE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bifrost Testnet",
-    "chainId": 49088,
-    "nativeCurrency": {
-      "name": "Bifrost",
-      "symbol": "BFC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Energi Testnet",
-    "chainId": 49797,
-    "nativeCurrency": {
-      "name": "Energi",
-      "symbol": "NRG",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Liveplex OracleEVM",
-    "chainId": 50001,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "GTON Testnet",
-    "chainId": 50021,
-    "nativeCurrency": {
-      "name": "GCD",
-      "symbol": "GCD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Sardis Mainnet",
-    "chainId": 51712,
-    "nativeCurrency": {
-      "name": "Sardis",
-      "symbol": "SRDX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DFK Chain",
-    "chainId": 53935,
-    "nativeCurrency": {
-      "name": "Jewel",
-      "symbol": "JEWEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Haqq Chain Testnet",
-    "chainId": 54211,
-    "nativeCurrency": {
-      "name": "Islamic Coin",
-      "symbol": "ISLMT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "REI Chain Mainnet",
-    "chainId": 55555,
-    "nativeCurrency": {
-      "name": "Rei",
-      "symbol": "REI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "REI Chain Testnet",
-    "chainId": 55556,
-    "nativeCurrency": {
-      "name": "tRei",
-      "symbol": "tREI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Boba BNB Mainnet",
-    "chainId": 56288,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Syscoin Rollux Testnet",
-    "chainId": 57000,
-    "nativeCurrency": {
-      "name": "Rollux Testnet Syscoin",
-      "symbol": "tSYS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Linea Testnet",
-    "chainId": 59140,
-    "nativeCurrency": {
-      "name": "Goerli Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Testnet Chain 0",
-    "chainId": 60000,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Testnet Chain 1",
-    "chainId": 60001,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Testnet Chain 2",
-    "chainId": 60002,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Testnet Chain 103",
-    "chainId": 60103,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Etica Mainnet",
-    "chainId": 61803,
-    "nativeCurrency": {
-      "name": "EGAZ",
-      "symbol": "EGAZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DoKEN Super Chain Mainnet",
-    "chainId": 61916,
-    "nativeCurrency": {
-      "name": "DoKEN",
-      "symbol": "DKN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Celo Baklava Testnet",
-    "chainId": 62320,
-    "nativeCurrency": {
-      "name": "CELO",
-      "symbol": "CELO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "MultiVAC Mainnet",
-    "chainId": 62621,
-    "nativeCurrency": {
-      "name": "MultiVAC",
-      "symbol": "MTV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "eCredits Mainnet",
-    "chainId": 63000,
-    "nativeCurrency": {
-      "name": "eCredits",
-      "symbol": "ECS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "eCredits Testnet",
-    "chainId": 63001,
-    "nativeCurrency": {
-      "name": "eCredits",
-      "symbol": "ECS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Scolcoin Mainnet",
-    "chainId": 65450,
-    "nativeCurrency": {
-      "name": "Scolcoin",
-      "symbol": "SCOL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SiriusNet",
-    "chainId": 67390,
-    "nativeCurrency": {
-      "name": "MCD",
-      "symbol": "MCD",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Condrieu",
-    "chainId": 69420,
-    "nativeCurrency": {
-      "name": "Condrieu Testnet Ether",
-      "symbol": "CTE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Mainnet Chain 0",
-    "chainId": 70000,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Mainnet Chain 1",
-    "chainId": 70001,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Mainnet Chain 2",
-    "chainId": 70002,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Thinkium Mainnet Chain 103",
-    "chainId": 70103,
-    "nativeCurrency": {
-      "name": "TKM",
-      "symbol": "TKM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polyjuice Testnet",
-    "chainId": 71393,
-    "nativeCurrency": {
-      "name": "CKB",
-      "symbol": "CKB",
-      "decimals": 8
-    }
-  },
-  {
-    "name": "Godwoken Testnet v1",
-    "chainId": 71401,
-    "nativeCurrency": {
-      "name": "pCKB",
-      "symbol": "pCKB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Godwoken Mainnet",
-    "chainId": 71402,
-    "nativeCurrency": {
-      "name": "pCKB",
-      "symbol": "pCKB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Energy Web Volta Testnet",
-    "chainId": 73799,
-    "nativeCurrency": {
-      "name": "Volta Token",
-      "symbol": "VT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mixin Virtual Machine",
-    "chainId": 73927,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ResinCoin Mainnet",
-    "chainId": 75000,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "RESIN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Vention Smart Chain Mainnet",
-    "chainId": 77612,
-    "nativeCurrency": {
-      "name": "VNT",
-      "symbol": "VNT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Firenze test network",
-    "chainId": 78110,
-    "nativeCurrency": {
-      "name": "Firenze Ether",
-      "symbol": "FIN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gold Smart Chain Testnet",
-    "chainId": 79879,
-    "nativeCurrency": {
-      "name": "Standard in Gold",
-      "symbol": "STAND",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mumbai",
-    "chainId": 80001,
-    "nativeCurrency": {
-      "name": "MATIC",
-      "symbol": "MATIC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Amana Testnet",
-    "chainId": 81341,
-    "nativeCurrency": {
-      "name": "Amana Testnet",
-      "symbol": "MEER-T",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Amana Mixnet",
-    "chainId": 81342,
-    "nativeCurrency": {
-      "name": "Amana Mixnet",
-      "symbol": "MEER-M",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Amana Privnet",
-    "chainId": 81343,
-    "nativeCurrency": {
-      "name": "Amana Privnet",
-      "symbol": "MEER-P",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flana Testnet",
-    "chainId": 81351,
-    "nativeCurrency": {
-      "name": "Flana Testnet",
-      "symbol": "MEER-T",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flana Mixnet",
-    "chainId": 81352,
-    "nativeCurrency": {
-      "name": "Flana Mixnet",
-      "symbol": "MEER-M",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flana Privnet",
-    "chainId": 81353,
-    "nativeCurrency": {
-      "name": "Flana Privnet",
-      "symbol": "MEER-P",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mizana Testnet",
-    "chainId": 81361,
-    "nativeCurrency": {
-      "name": "Mizana Testnet",
-      "symbol": "MEER-T",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mizana Mixnet",
-    "chainId": 81362,
-    "nativeCurrency": {
-      "name": "Mizana Mixnet",
-      "symbol": "MEER-M",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mizana Privnet",
-    "chainId": 81363,
-    "nativeCurrency": {
-      "name": "Mizana Privnet",
-      "symbol": "MEER-P",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Base Goerli Testnet",
-    "chainId": 84531,
-    "nativeCurrency": {
-      "name": "Goerli Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CYBERTRUST",
-    "chainId": 85449,
-    "nativeCurrency": {
-      "name": "Cyber Trust",
-      "symbol": "CYBER",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Chiliz Scoville Testnet",
-    "chainId": 88880,
-    "nativeCurrency": {
-      "name": "Chiliz",
-      "symbol": "CHZ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "IVAR Chain Mainnet",
-    "chainId": 88888,
-    "nativeCurrency": {
-      "name": "Ivar",
-      "symbol": "IVAR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Beverly Hills",
-    "chainId": 90210,
-    "nativeCurrency": {
-      "name": "Beverly Hills Testnet Ether",
-      "symbol": "BVE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Lambda Testnet",
-    "chainId": 92001,
-    "nativeCurrency": {
-      "name": "test-Lamb",
-      "symbol": "LAMB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Boba BNB Mainnet Old",
-    "chainId": 97288,
-    "nativeCurrency": {
-      "name": "Boba Token",
-      "symbol": "BOBA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "UB Smart Chain(testnet)",
-    "chainId": 99998,
-    "nativeCurrency": {
-      "name": "UBC",
-      "symbol": "UBC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "UB Smart Chain",
-    "chainId": 99999,
-    "nativeCurrency": {
-      "name": "UBC",
-      "symbol": "UBC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Root",
-    "chainId": 100000,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 0",
-    "chainId": 100001,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 1",
-    "chainId": 100002,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 2",
-    "chainId": 100003,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 3",
-    "chainId": 100004,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 4",
-    "chainId": 100005,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 5",
-    "chainId": 100006,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 6",
-    "chainId": 100007,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Mainnet Shard 7",
-    "chainId": 100008,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "VeChain",
-    "chainId": 100009,
-    "nativeCurrency": {
-      "name": "VeChain",
-      "symbol": "VET",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "VeChain Testnet",
-    "chainId": 100010,
-    "nativeCurrency": {
-      "name": "VeChain",
-      "symbol": "VET",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Deprecated Chiado Testnet",
-    "chainId": 100100,
-    "nativeCurrency": {
-      "name": "Chiado xDAI",
-      "symbol": "xDAI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Soverun Testnet",
-    "chainId": 101010,
-    "nativeCurrency": {
-      "name": "Soverun",
-      "symbol": "SVRN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Crystaleum",
-    "chainId": 103090,
-    "nativeCurrency": {
-      "name": "CRFI",
-      "symbol": "◈",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BROChain Mainnet",
-    "chainId": 108801,
-    "nativeCurrency": {
-      "name": "Brother",
-      "symbol": "BRO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Root",
-    "chainId": 110000,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 0",
-    "chainId": 110001,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 1",
-    "chainId": 110002,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 2",
-    "chainId": 110003,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 3",
-    "chainId": 110004,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 4",
-    "chainId": 110005,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 5",
-    "chainId": 110006,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 6",
-    "chainId": 110007,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QuarkChain Devnet Shard 7",
-    "chainId": 110008,
-    "nativeCurrency": {
-      "name": "QKC",
-      "symbol": "QKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Siberium Network",
-    "chainId": 111111,
-    "nativeCurrency": {
-      "name": "Siberium",
-      "symbol": "SBR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ADIL Devnet",
-    "chainId": 123456,
-    "nativeCurrency": {
-      "name": "Devnet ADIL",
-      "symbol": "ADIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ETND Chain Mainnets",
-    "chainId": 131419,
-    "nativeCurrency": {
-      "name": "ETND",
-      "symbol": "ETND",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Taiko (Alpha-2 Testnet)",
-    "chainId": 167004,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Condor Test Network",
-    "chainId": 188881,
-    "nativeCurrency": {
-      "name": "Condor Native Token",
-      "symbol": "CONDOR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Milkomeda C1 Testnet",
-    "chainId": 200101,
-    "nativeCurrency": {
-      "name": "milkTAda",
-      "symbol": "mTAda",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Milkomeda A1 Testnet",
-    "chainId": 200202,
-    "nativeCurrency": {
-      "name": "milkTAlgo",
-      "symbol": "mTAlgo",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Akroma",
-    "chainId": 200625,
-    "nativeCurrency": {
-      "name": "Akroma Ether",
-      "symbol": "AKA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Alaya Mainnet",
-    "chainId": 201018,
-    "nativeCurrency": {
-      "name": "ATP",
-      "symbol": "atp",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Alaya Dev Testnet",
-    "chainId": 201030,
-    "nativeCurrency": {
-      "name": "ATP",
-      "symbol": "atp",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mythical Chain",
-    "chainId": 201804,
-    "nativeCurrency": {
-      "name": "Mythos",
-      "symbol": "MYTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Decimal Smart Chain Testnet",
-    "chainId": 202020,
-    "nativeCurrency": {
-      "name": "Decimal",
-      "symbol": "tDEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Jellie",
-    "chainId": 202624,
-    "nativeCurrency": {
-      "name": "Twala Coin",
-      "symbol": "TWL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PlatON Mainnet",
-    "chainId": 210425,
-    "nativeCurrency": {
-      "name": "LAT",
-      "symbol": "lat",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Mas Mainnet",
-    "chainId": 220315,
-    "nativeCurrency": {
-      "name": "Master Bank",
-      "symbol": "MAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Taf ECO Chain Mainnet",
-    "chainId": 224168,
-    "nativeCurrency": {
-      "name": "Taf ECO Chain Mainnet",
-      "symbol": "TAFECO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HashKey Chain Testnet",
-    "chainId": 230315,
-    "nativeCurrency": {
-      "name": "HashKey Token",
-      "symbol": "tHSK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Haymo Testnet",
-    "chainId": 234666,
-    "nativeCurrency": {
-      "name": "HAYMO",
-      "symbol": "HYM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ARTIS sigma1",
-    "chainId": 246529,
-    "nativeCurrency": {
-      "name": "ARTIS sigma1 Ether",
-      "symbol": "ATS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ARTIS Testnet tau1",
-    "chainId": 246785,
-    "nativeCurrency": {
-      "name": "ARTIS tau1 Ether",
-      "symbol": "tATS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Saakuru Testnet",
-    "chainId": 247253,
-    "nativeCurrency": {
-      "name": "OAS",
-      "symbol": "OAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CMP-Mainnet",
-    "chainId": 256256,
-    "nativeCurrency": {
-      "name": "Caduceus Token",
-      "symbol": "CMP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gear Zero Network Testnet",
-    "chainId": 266256,
-    "nativeCurrency": {
-      "name": "Gear Zero Network Native Token",
-      "symbol": "GZN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Social Smart Chain Mainnet",
-    "chainId": 281121,
-    "nativeCurrency": {
-      "name": "SoChain",
-      "symbol": "$OC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Filecoin - Calibration testnet",
-    "chainId": 314159,
-    "nativeCurrency": {
-      "name": "testnet filecoin",
-      "symbol": "tFIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Oone Chain Testnet",
-    "chainId": 333777,
-    "nativeCurrency": {
-      "name": "Oone",
-      "symbol": "tOONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polis Testnet",
-    "chainId": 333888,
-    "nativeCurrency": {
-      "name": "tPolis",
-      "symbol": "tPOLIS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Polis Mainnet",
-    "chainId": 333999,
-    "nativeCurrency": {
-      "name": "Polis",
-      "symbol": "POLIS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HAPchain Testnet",
-    "chainId": 373737,
-    "nativeCurrency": {
-      "name": "HAP",
-      "symbol": "HAP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metal C-Chain",
-    "chainId": 381931,
-    "nativeCurrency": {
-      "name": "Metal",
-      "symbol": "METAL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Metal Tahoe C-Chain",
-    "chainId": 381932,
-    "nativeCurrency": {
-      "name": "Metal",
-      "symbol": "METAL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Tipboxcoin Mainnet",
-    "chainId": 404040,
-    "nativeCurrency": {
-      "name": "Tipboxcoin",
-      "symbol": "TPBX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kekchain",
-    "chainId": 420420,
-    "nativeCurrency": {
-      "name": "KEK",
-      "symbol": "KEK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kekchain (kektest)",
-    "chainId": 420666,
-    "nativeCurrency": {
-      "name": "tKEK",
-      "symbol": "tKEK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Arbitrum Rinkeby",
-    "chainId": 421611,
-    "nativeCurrency": {
-      "name": "Arbitrum Rinkeby Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Arbitrum Goerli",
-    "chainId": 421613,
-    "nativeCurrency": {
-      "name": "Arbitrum Goerli Ether",
-      "symbol": "AGOR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Fastex Chain testnet",
-    "chainId": 424242,
-    "nativeCurrency": {
-      "name": "FTN",
-      "symbol": "FTN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dexalot Subnet Testnet",
-    "chainId": 432201,
-    "nativeCurrency": {
-      "name": "Dexalot",
-      "symbol": "ALOT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Dexalot Subnet",
-    "chainId": 432204,
-    "nativeCurrency": {
-      "name": "Dexalot",
-      "symbol": "ALOT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Weelink Testnet",
-    "chainId": 444900,
-    "nativeCurrency": {
-      "name": "Weelink Chain Token",
-      "symbol": "tWLK",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OpenChain Mainnet",
-    "chainId": 474142,
-    "nativeCurrency": {
-      "name": "OpenCoin",
-      "symbol": "OPC",
-      "decimals": 10
-    }
-  },
-  {
-    "name": "CMP-Testnet",
-    "chainId": 512512,
-    "nativeCurrency": {
-      "name": "Caduceus Testnet Token",
-      "symbol": "CMP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "ethereum Fair",
-    "chainId": 513100,
-    "nativeCurrency": {
-      "name": "EthereumFair",
-      "symbol": "ETHF",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Scroll",
-    "chainId": 534352,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Scroll Alpha Testnet",
-    "chainId": 534353,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Scroll Pre-Alpha Testnet",
-    "chainId": 534354,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "TSETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "BeanEco SmartChain",
-    "chainId": 535037,
-    "nativeCurrency": {
-      "name": "BeanEco SmartChain",
-      "symbol": "BESC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bear Network Chain Mainnet",
-    "chainId": 641230,
-    "nativeCurrency": {
-      "name": "Bear Network Chain Native Token",
-      "symbol": "BRNKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Vision - Vpioneer Test Chain",
-    "chainId": 666666,
-    "nativeCurrency": {
-      "name": "VS",
-      "symbol": "VS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Bear Network Chain Testnet",
-    "chainId": 751230,
-    "nativeCurrency": {
-      "name": "Bear Network Chain Testnet Token",
-      "symbol": "tBRNKC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OctaSpace",
-    "chainId": 800001,
-    "nativeCurrency": {
-      "name": "OctaSpace",
-      "symbol": "OCTA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "4GoodNetwork",
-    "chainId": 846000,
-    "nativeCurrency": {
-      "name": "APTA",
-      "symbol": "APTA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Vision - Mainnet",
-    "chainId": 888888,
-    "nativeCurrency": {
-      "name": "VS",
-      "symbol": "VS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Posichain Mainnet Shard 0",
-    "chainId": 900000,
-    "nativeCurrency": {
-      "name": "Posichain Native Token",
-      "symbol": "POSI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Posichain Testnet Shard 0",
-    "chainId": 910000,
-    "nativeCurrency": {
-      "name": "Posichain Native Token",
-      "symbol": "POSI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Posichain Devnet Shard 0",
-    "chainId": 920000,
-    "nativeCurrency": {
-      "name": "Posichain Native Token",
-      "symbol": "POSI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Posichain Devnet Shard 1",
-    "chainId": 920001,
-    "nativeCurrency": {
-      "name": "Posichain Native Token",
-      "symbol": "POSI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "FNCY Testnet",
-    "chainId": 923018,
-    "nativeCurrency": {
-      "name": "FNCY",
-      "symbol": "FNCY",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Eluvio Content Fabric",
-    "chainId": 955305,
-    "nativeCurrency": {
-      "name": "ELV",
-      "symbol": "ELV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Etho Protocol",
-    "chainId": 1313114,
-    "nativeCurrency": {
-      "name": "Etho Protocol",
-      "symbol": "ETHO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Xerom",
-    "chainId": 1313500,
-    "nativeCurrency": {
-      "name": "Xerom Ether",
-      "symbol": "XERO",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kintsugi",
-    "chainId": 1337702,
-    "nativeCurrency": {
-      "name": "kintsugi Ethere",
-      "symbol": "kiETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Kiln",
-    "chainId": 1337802,
-    "nativeCurrency": {
-      "name": "Testnet ETH",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zhejiang",
-    "chainId": 1337803,
-    "nativeCurrency": {
-      "name": "Testnet ETH",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Plian Mainnet Main",
-    "chainId": 2099156,
-    "nativeCurrency": {
-      "name": "Plian Token",
-      "symbol": "PI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PlatON Dev Testnet Deprecated",
-    "chainId": 2203181,
-    "nativeCurrency": {
-      "name": "LAT",
-      "symbol": "lat",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PlatON Dev Testnet2",
-    "chainId": 2206132,
-    "nativeCurrency": {
-      "name": "LAT",
-      "symbol": "lat",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Filecoin - Butterfly testnet",
-    "chainId": 3141592,
-    "nativeCurrency": {
-      "name": "testnet filecoin",
-      "symbol": "tFIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Imversed Mainnet",
-    "chainId": 5555555,
-    "nativeCurrency": {
-      "name": "Imversed Token",
-      "symbol": "IMV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Imversed Testnet",
-    "chainId": 5555558,
-    "nativeCurrency": {
-      "name": "Imversed Token",
-      "symbol": "IMV",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Saakuru Mainnet",
-    "chainId": 7225878,
-    "nativeCurrency": {
-      "name": "OAS",
-      "symbol": "OAS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OpenVessel",
-    "chainId": 7355310,
-    "nativeCurrency": {
-      "name": "Vessel ETH",
-      "symbol": "VETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "QL1 Testnet",
-    "chainId": 7668378,
-    "nativeCurrency": {
-      "name": "Shiba Predator",
-      "symbol": "QOM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Musicoin",
-    "chainId": 7762959,
-    "nativeCurrency": {
-      "name": "Musicoin",
-      "symbol": "MUSIC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Plian Mainnet Subchain 1",
-    "chainId": 8007736,
-    "nativeCurrency": {
-      "name": "Plian Token",
-      "symbol": "PI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HAPchain",
-    "chainId": 8794598,
-    "nativeCurrency": {
-      "name": "HAP",
-      "symbol": "HAP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Quarix Testnet",
-    "chainId": 8888881,
-    "nativeCurrency": {
-      "name": "Q",
-      "symbol": "Q",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Quarix",
-    "chainId": 8888888,
-    "nativeCurrency": {
-      "name": "Q",
-      "symbol": "Q",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Plian Testnet Subchain 1",
-    "chainId": 10067275,
-    "nativeCurrency": {
-      "name": "Plian Token",
-      "symbol": "TPI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Soverun Mainnet",
-    "chainId": 10101010,
-    "nativeCurrency": {
-      "name": "Soverun",
-      "symbol": "SVRN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Sepolia",
-    "chainId": 11155111,
-    "nativeCurrency": {
-      "name": "Sepolia Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PepChain Churchill",
-    "chainId": 13371337,
-    "nativeCurrency": {
-      "name": "PepChain Churchill Ether",
-      "symbol": "TPEP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Anduschain Mainnet",
-    "chainId": 14288640,
-    "nativeCurrency": {
-      "name": "DAON",
-      "symbol": "DEB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Plian Testnet Main",
-    "chainId": 16658437,
-    "nativeCurrency": {
-      "name": "Plian Testnet Token",
-      "symbol": "TPI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "IOLite",
-    "chainId": 18289463,
-    "nativeCurrency": {
-      "name": "IOLite Ether",
-      "symbol": "ILT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "SmartMesh Mainnet",
-    "chainId": 20180430,
-    "nativeCurrency": {
-      "name": "SmartMesh Native Token",
-      "symbol": "SMT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "quarkblockchain",
-    "chainId": 20181205,
-    "nativeCurrency": {
-      "name": "quarkblockchain Native Token",
-      "symbol": "QKI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Excelon Mainnet",
-    "chainId": 22052002,
-    "nativeCurrency": {
-      "name": "Excelon",
-      "symbol": "xlon",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Excoincial Chain Volta-Testnet",
-    "chainId": 27082017,
-    "nativeCurrency": {
-      "name": "TExlcoin",
-      "symbol": "TEXL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Excoincial Chain Mainnet",
-    "chainId": 27082022,
-    "nativeCurrency": {
-      "name": "Exlcoin",
-      "symbol": "EXL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Auxilium Network Mainnet",
-    "chainId": 28945486,
-    "nativeCurrency": {
-      "name": "Auxilium coin",
-      "symbol": "AUX",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Flachain Mainnet",
-    "chainId": 29032022,
-    "nativeCurrency": {
-      "name": "Flacoin",
-      "symbol": "FLA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Filecoin - Local testnet",
-    "chainId": 31415926,
-    "nativeCurrency": {
-      "name": "testnet filecoin",
-      "symbol": "tFIL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Joys Digital Mainnet",
-    "chainId": 35855456,
-    "nativeCurrency": {
-      "name": "JOYS",
-      "symbol": "JOYS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "maistestsubnet",
-    "chainId": 43214913,
-    "nativeCurrency": {
-      "name": "maistestsubnet",
-      "symbol": "MAI",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aquachain",
-    "chainId": 61717561,
-    "nativeCurrency": {
-      "name": "Aquachain Ether",
-      "symbol": "AQUA",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Autonity Bakerloo (Thames) Testnet",
-    "chainId": 65010000,
-    "nativeCurrency": {
-      "name": "Bakerloo Auton",
-      "symbol": "ATN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Autonity Piccadilly (Thames) Testnet",
-    "chainId": 65100000,
-    "nativeCurrency": {
-      "name": "Piccadilly Auton",
-      "symbol": "ATN",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "T.E.A.M Blockchain",
-    "chainId": 88888888,
-    "nativeCurrency": {
-      "name": "TEAM",
-      "symbol": "$TEAM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Joys Digital TestNet",
-    "chainId": 99415706,
-    "nativeCurrency": {
-      "name": "TOYS",
-      "symbol": "TOYS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gather Mainnet Network",
-    "chainId": 192837465,
-    "nativeCurrency": {
-      "name": "Gather",
-      "symbol": "GTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Neon EVM DevNet",
-    "chainId": 245022926,
-    "nativeCurrency": {
-      "name": "Neon",
-      "symbol": "NEON",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Neon EVM MainNet",
-    "chainId": 245022934,
-    "nativeCurrency": {
-      "name": "Neon",
-      "symbol": "NEON",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Neon EVM TestNet",
-    "chainId": 245022940,
-    "nativeCurrency": {
-      "name": "Neon",
-      "symbol": "NEON",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OneLedger Mainnet",
-    "chainId": 311752642,
-    "nativeCurrency": {
-      "name": "OLT",
-      "symbol": "OLT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Calypso NFT Hub (SKALE Testnet)",
-    "chainId": 344106930,
-    "nativeCurrency": {
-      "name": "sFUEL",
-      "symbol": "sFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gather Testnet Network",
-    "chainId": 356256156,
-    "nativeCurrency": {
-      "name": "Gather",
-      "symbol": "GTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Gather Devnet Network",
-    "chainId": 486217935,
-    "nativeCurrency": {
-      "name": "Gather",
-      "symbol": "GTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nebula Staging",
-    "chainId": 503129905,
-    "nativeCurrency": {
-      "name": "sFUEL",
-      "symbol": "sFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "IPOS Network",
-    "chainId": 1122334455,
-    "nativeCurrency": {
-      "name": "IPOS Network Ether",
-      "symbol": "IPOS",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "CyberdeckNet",
-    "chainId": 1146703430,
-    "nativeCurrency": {
-      "name": "Cyb",
-      "symbol": "CYB",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "HUMAN Protocol",
-    "chainId": 1273227453,
-    "nativeCurrency": {
-      "name": "sFUEL",
-      "symbol": "sFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aurora Mainnet",
-    "chainId": 1313161554,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aurora Testnet",
-    "chainId": 1313161555,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Aurora Betanet",
-    "chainId": 1313161556,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "RaptorChain",
-    "chainId": 1380996178,
-    "nativeCurrency": {
-      "name": "Raptor",
-      "symbol": "RPTR",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Nebula Mainnet",
-    "chainId": 1482601649,
-    "nativeCurrency": {
-      "name": "sFUEL",
-      "symbol": "sFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Calypso NFT Hub (SKALE)",
-    "chainId": 1564830818,
-    "nativeCurrency": {
-      "name": "sFUEL",
-      "symbol": "sFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Mainnet Shard 0",
-    "chainId": 1666600000,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Mainnet Shard 1",
-    "chainId": 1666600001,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Mainnet Shard 2",
-    "chainId": 1666600002,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Mainnet Shard 3",
-    "chainId": 1666600003,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Testnet Shard 0",
-    "chainId": 1666700000,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Testnet Shard 1",
-    "chainId": 1666700001,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Testnet Shard 2",
-    "chainId": 1666700002,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Testnet Shard 3",
-    "chainId": 1666700003,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Harmony Devnet Shard 0",
-    "chainId": 1666900000,
-    "nativeCurrency": {
-      "name": "ONE",
-      "symbol": "ONE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "DataHopper",
-    "chainId": 2021121117,
-    "nativeCurrency": {
-      "name": "DataHoppers",
-      "symbol": "HOP",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Europa SKALE Chain",
-    "chainId": 2046399126,
-    "nativeCurrency": {
-      "name": "sFUEL",
-      "symbol": "sFUEL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Pirl",
-    "chainId": 3125659152,
-    "nativeCurrency": {
-      "name": "Pirl Ether",
-      "symbol": "PIRL",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "OneLedger Testnet Frankenstein",
-    "chainId": 4216137055,
-    "nativeCurrency": {
-      "name": "OLT",
-      "symbol": "OLT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Palm Testnet",
-    "chainId": 11297108099,
-    "nativeCurrency": {
-      "name": "PALM",
-      "symbol": "PALM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Palm",
-    "chainId": 11297108109,
-    "nativeCurrency": {
-      "name": "PALM",
-      "symbol": "PALM",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Ntity Mainnet",
-    "chainId": 197710212030,
-    "nativeCurrency": {
-      "name": "Ntity",
-      "symbol": "NTT",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Haradev Testnet",
-    "chainId": 197710212031,
-    "nativeCurrency": {
-      "name": "Ntity Haradev",
-      "symbol": "NTTH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Zeniq",
-    "chainId": 383414847825,
-    "nativeCurrency": {
-      "name": "Zeniq",
-      "symbol": "ZENIQ",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "PDC Mainnet",
-    "chainId": 666301171999,
-    "nativeCurrency": {
-      "name": "PDC",
-      "symbol": "PDC",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Molereum Network",
-    "chainId": 6022140761023,
-    "nativeCurrency": {
-      "name": "Molereum Ether",
-      "symbol": "MOLE",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Godwoken Testnet (V1)",
-    "chainId": 868455272153094,
-    "nativeCurrency": {
-      "name": "CKB",
-      "symbol": "CKB",
-      "decimals": 8
-    }
-  },
-  {
-    "name": "Athena testnet",
-    "chainId": 5001,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Hermes testnet",
-    "chainId": 5002,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  },
-  {
-    "name": "Demeter testnet",
-    "chainId": 5003,
-    "nativeCurrency": {
-      "name": "Ether",
-      "symbol": "ETH",
-      "decimals": 18
-    }
-  }
-]
\ No newline at end of file
diff --git a/tools/scripts/utils/on-chain-utils/getViemClient.ts b/tools/scripts/utils/on-chain-utils/getViemClient.ts
deleted file mode 100644
index 3f591ea11d..0000000000
--- a/tools/scripts/utils/on-chain-utils/getViemClient.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { LOCALNET_CHAIN_IDS } from '@webb-tools/dapp-config/src/chains';
-import { chainsConfig } from '@webb-tools/dapp-config/src/chains/chain-config';
-import { EVMChainId } from '@webb-tools/dapp-types/src/EVMChainId';
-import { parseTypedChainId } from '@webb-tools/sdk-core';
-import { Chain, createPublicClient, http } from 'viem';
-
-import * as chains from 'viem/chains';
-
-// At the time of writing, Viem does not support multicall for these chains.
-const VIEM_NOT_SUPPORTED_MULTICALL_CHAINS = [EVMChainId.ScrollAlpha].concat(
-  LOCALNET_CHAIN_IDS
-);
-
-/**
- * Gets the chain object for the given chain id.
- * @param chainId - Chain id of the target EVM chain.
- * @returns Viem's chain object.
- */
-function getViemChain(chainId: number): Chain {
-  for (const chain of Object.values(chains)) {
-    if (chain.id === chainId) {
-      return chain;
-    }
-  }
-}
-
-/**
- * Defines the Viem chain object from the org chain config.
- * @returns Viem's chain object.
- */
-function defineViemChain(typedChainId: number): Chain {
-  const chain = chainsConfig[typedChainId];
-  if (!chain) {
-    throw new Error('Chain not found in the chainsConfig');
-  }
-
-  if (!chain.base) {
-    throw new Error(`Chain ${chain.name} does not have a base network`);
-  }
-
-  if (!chain.evmRpcUrls) {
-    throw new Error(`Chain ${chain.name} does not have evmRpcUrls`);
-  }
-
-  return {
-    id: chain.chainId,
-    name: chain.name,
-    network: chain.base,
-    testnet: true,
-    nativeCurrency: {
-      decimals: 18,
-      name: 'ETH',
-      symbol: 'ETH',
-    },
-    rpcUrls: {
-      public: { http: chain.evmRpcUrls },
-      default: { http: chain.evmRpcUrls },
-    },
-    blockExplorers: chain.blockExplorerStub
-      ? {
-          default: {
-            name: chain.name,
-            url: chain.blockExplorerStub,
-          },
-        }
-      : undefined,
-    contracts: {
-      multicall3: chain.multicall3
-        ? {
-            address: chain.multicall3.address,
-            blockCreated: chain.multicall3.deployedAt,
-          }
-        : undefined,
-    },
-  } as const satisfies Chain;
-}
-
-function getViemClient(typedChainId: number) {
-  const { chainId } = parseTypedChainId(typedChainId);
-
-  let chain = getViemChain(chainId);
-  if (!chain || VIEM_NOT_SUPPORTED_MULTICALL_CHAINS.includes(chainId)) {
-    chain = defineViemChain(typedChainId);
-  }
-
-  return createPublicClient({
-    chain: chain,
-    batch: {
-      multicall: !!chain.contracts?.multicall3,
-    },
-    transport: http(undefined, { timeout: 60_000 }),
-  });
-}
-
-export default getViemClient;
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 19c70e7191..765dce61e3 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -40,8 +40,6 @@
       "@webb-tools/dapp-types/*": ["libs/dapp-types/src/*"],
       "@webb-tools/icons": ["libs/icons/src/index.ts"],
       "@webb-tools/icons/*": ["libs/icons/src/*"],
-      "@webb-tools/logos": ["libs/logos/src/index.ts"],
-      "@webb-tools/logos/*": ["libs/logos/src/*"],
       "@webb-tools/note-manager": ["libs/note-manager/src/index.ts"],
       "@webb-tools/note-manager/*": ["libs/note-manager/src/*"],
       "@webb-tools/polkadot-api-provider": [
diff --git a/yarn.lock b/yarn.lock
index 13b39989f5..f762e0ae77 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1135,7 +1135,7 @@
     babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-runtime@^7.15.0", "@babel/plugin-transform-runtime@^7.19.6", "@babel/plugin-transform-runtime@^7.5.5":
+"@babel/plugin-transform-runtime@^7.15.0", "@babel/plugin-transform-runtime@^7.19.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.6.tgz#9ed446bf6829ccfd16305662bd650c159fa19d24"
   integrity sha512-+AGkst7Kqq3QUflKGkhWWMRb9vaKamoreNmYc+sjsIpOp+TsyU0exhp3RlwjQa/HdlKkPt3AMDwfg8Hpt9Vwqg==
@@ -1481,7 +1481,7 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.8", "@babel/runtime@^7.17.8", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.8", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
   integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
@@ -1557,6 +1557,29 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@coinbase/wallet-sdk@^3.6.6":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.7.1.tgz#44b3b7a925ff5cc974e4cbf7a44199ffdcf03541"
+  integrity sha512-LjyoDCB+7p0waQXfK+fUgcAs3Ezk6S6e+LYaoFjpJ6c9VTop3NyZF40Pi7df4z7QJohCwzuIDjz0Rhtig6Y7Pg==
+  dependencies:
+    "@metamask/safe-event-emitter" "2.0.0"
+    "@solana/web3.js" "^1.70.1"
+    bind-decorator "^1.0.11"
+    bn.js "^5.1.1"
+    buffer "^6.0.3"
+    clsx "^1.1.0"
+    eth-block-tracker "6.1.0"
+    eth-json-rpc-filters "5.1.0"
+    eth-rpc-errors "4.0.2"
+    json-rpc-engine "6.1.0"
+    keccak "^3.0.1"
+    preact "^10.5.9"
+    qs "^6.10.3"
+    rxjs "^6.6.3"
+    sha.js "^2.4.11"
+    stream-browserify "^3.0.0"
+    util "^0.12.4"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -3260,85 +3283,28 @@
   resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
-"@ledgerhq/devices@^8.0.4":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.4.tgz#ebc7779adbbec2d046424603a481623eb3fbe306"
-  integrity sha512-dxOiWZmtEv1tgw70+rW8gviCRZUeGDUnxY6HUPiRqTAc0Ts2AXxiJChgAsPvIywWTGW+S67Nxq1oTZdpRbdt+A==
-  dependencies:
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/logs" "^6.10.1"
-    rxjs "6"
-    semver "^7.3.5"
-
-"@ledgerhq/errors@^6.12.7":
-  version "6.12.7"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.7.tgz#c7b630488d5713bc7b1e1682d6ab5d08918c69f1"
-  integrity sha512-1BpjzFErPK7qPFx0oItcX0mNLJMplVAm2Dpl5urZlubewnTyyw5sahIBjU+8LLCWJ2eGEh/0wyvh0jMtR0n2Mg==
-
-"@ledgerhq/hw-transport-node-hid-noevents@^6.27.16":
-  version "6.27.16"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.16.tgz#5497b8194ec7802e221a0dd95b799d6c12da1a89"
-  integrity sha512-7MK245Cfj4B4WijO+a0iux+glmyHr44ezSuec4h1PfQrtiOGf+Sk26oi8WHJX+pabc9c566Qxkgdo4FvHWCCaA==
-  dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/hw-transport" "^6.28.5"
-    "@ledgerhq/logs" "^6.10.1"
-    node-hid "^2.1.2"
-
-"@ledgerhq/hw-transport-node-hid-singleton@^6.28.12":
-  version "6.28.13"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-singleton/-/hw-transport-node-hid-singleton-6.28.13.tgz#c06f17eff6085921bd95a2fadf94e7ca5e0718b2"
-  integrity sha512-Pd7hfQT1TbWwE3QEmTh/EFsmHEOlvDpWXtx7ii/xCRDbdnPTBgfwcaAMlCO+9Ic/U1uTVH6Wih1dtxGCunNyGw==
-  dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/hw-transport" "^6.28.5"
-    "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.16"
-    "@ledgerhq/logs" "^6.10.1"
-    lodash "^4.17.21"
-    node-hid "^2.1.2"
-    usb "2.5.1"
-
-"@ledgerhq/hw-transport-webhid@^6.27.15":
-  version "6.27.16"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.27.16.tgz#c8bb9f9a55d637134f24d51c2cef6e4aea3830ce"
-  integrity sha512-inNn710l01c0OI5sXo+8jNaxxGZermOdEsbF/a20pfvqFYvdz7WQAtmjO2NjUbScyFadxNmNnocQxQ5DRvMKOQ==
-  dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/hw-transport" "^6.28.5"
-    "@ledgerhq/logs" "^6.10.1"
-
-"@ledgerhq/hw-transport-webusb@^6.27.15":
-  version "6.27.16"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.27.16.tgz#b8e20e772f78c312fc7f2ce3a469c99ecf59dc67"
-  integrity sha512-A3S2p5Rh9Ot402pWNZw8v5EpO3wOHP8ch/Dcz0AjInmwNouQ9nIYd1+eLSL7QiyG9X7+tuHxFF1IjrEgvAzQuQ==
-  dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/hw-transport" "^6.28.5"
-    "@ledgerhq/logs" "^6.10.1"
-
-"@ledgerhq/hw-transport@^6.27.1", "@ledgerhq/hw-transport@^6.28.4", "@ledgerhq/hw-transport@^6.28.5":
-  version "6.28.5"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.5.tgz#675193be2f695a596068145351da598316c25831"
-  integrity sha512-xmw5RhYbqExBBqTvOnOjN/RYNIGMBxFJ+zcYNfkfw/E+uEY3L7xq8Z7sC/n7URTT6xtEctElqduBJnBQE4OQtw==
-  dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
-    events "^3.3.0"
-
-"@ledgerhq/logs@^6.10.1":
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.1.tgz#5bd16082261d7364eabb511c788f00937dac588d"
-  integrity sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w==
+"@ledgerhq/connect-kit-loader@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/connect-kit-loader/-/connect-kit-loader-1.1.0.tgz#10343b78ef13436818bf3453568a559c0eeb9d48"
+  integrity sha512-HUy12FEczoWY2FPubnsm1uOA8tkVWc0j90i47suThV3C9NL2xx69ZAIEU3Ytzs2bwLek9S1Q2S1VQJvA+3Ygkg==
 
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
+"@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.1.tgz#64df34e2f12e68e78ac57e571d25ec07fa460ca9"
+  integrity sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ==
+
+"@lit/reactive-element@^1.3.0", "@lit/reactive-element@^1.6.0":
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.6.2.tgz#c256690f82f2d7d0ffb0b1cdf68dcb1ec86cea28"
+  integrity sha512-rDfl+QnCYjuIGf5xI2sVJWdYIi56CTCwWa+nidKYX6oIuBYwUbT/vX4qbUDlHiZKJ/3FRNQ/tWJui44p6/stSA==
+  dependencies:
+    "@lit-labs/ssr-dom-shim" "^1.0.0"
+
 "@matejmazur/react-katex@^3.1.3":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@matejmazur/react-katex/-/react-katex-3.1.3.tgz#f07404c848b93bfef9ed9653a4bb080dc8bf2bf0"
@@ -3352,11 +3318,6 @@
     "@types/mdx" "^2.0.0"
     "@types/react" ">=16"
 
-"@metamask/detect-provider@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/detect-provider/-/detect-provider-2.0.0.tgz#4bc2795e5e6f7d8b84b2e845058d2f222c99917d"
-  integrity sha512-sFpN+TX13E9fdBDh9lvQeZdJn4qYoRb/6QF2oZZK/Pn559IhCFacPMU1rMuqyXoFQF3JSJfii2l98B87QDPeCQ==
-
 "@metamask/eth-sig-util@^5.0.2":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-5.1.0.tgz#a47f62800ee1917fef976ba67544a0ccd7d1bd6b"
@@ -3369,11 +3330,90 @@
     tweetnacl "^1.0.3"
     tweetnacl-util "^0.15.1"
 
-"@metamask/safe-event-emitter@^2.0.0":
+"@metamask/safe-event-emitter@2.0.0", "@metamask/safe-event-emitter@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c"
   integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==
 
+"@metamask/utils@^3.0.1":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-3.6.0.tgz#b218b969a05ca7a8093b5d1670f6625061de707d"
+  integrity sha512-9cIRrfkWvHblSiNDVXsjivqa9Ak0RYo/1H6tqTqTbAx+oBK2Sva0lWDHxGchOqA7bySGUJKAWSNJvH6gdHZ0gQ==
+  dependencies:
+    "@types/debug" "^4.1.7"
+    debug "^4.3.4"
+    semver "^7.3.8"
+    superstruct "^1.0.3"
+
+"@motionone/animation@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807"
+  integrity sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ==
+  dependencies:
+    "@motionone/easing" "^10.15.1"
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    tslib "^2.3.1"
+
+"@motionone/dom@^10.16.2":
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.16.2.tgz#0c44df8ee3d1cfc50ee11d27050b27824355a61a"
+  integrity sha512-bnuHdNbge1FutZXv+k7xub9oPWcF0hsu8y1HTH/qg6av58YI0VufZ3ngfC7p2xhMJMnoh0LXFma2EGTgPeCkeg==
+  dependencies:
+    "@motionone/animation" "^10.15.1"
+    "@motionone/generators" "^10.15.1"
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    hey-listen "^1.0.8"
+    tslib "^2.3.1"
+
+"@motionone/easing@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.15.1.tgz#95cf3adaef34da6deebb83940d8143ede3deb693"
+  integrity sha512-6hIHBSV+ZVehf9dcKZLT7p5PEKHGhDwky2k8RKkmOvUoYP3S+dXsKupyZpqx5apjd9f+php4vXk4LuS+ADsrWw==
+  dependencies:
+    "@motionone/utils" "^10.15.1"
+    tslib "^2.3.1"
+
+"@motionone/generators@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.15.1.tgz#dc6abb11139d1bafe758a41c134d4c753a9b871c"
+  integrity sha512-67HLsvHJbw6cIbLA/o+gsm7h+6D4Sn7AUrB/GPxvujse1cGZ38F5H7DzoH7PhX+sjvtDnt2IhFYF2Zp1QTMKWQ==
+  dependencies:
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    tslib "^2.3.1"
+
+"@motionone/svelte@^10.16.2":
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/@motionone/svelte/-/svelte-10.16.2.tgz#0b37c3b12927814d31d24941d1ca0ff49981b444"
+  integrity sha512-38xsroKrfK+aHYhuQlE6eFcGy0EwrB43Q7RGjF73j/kRUTcLNu/LAaKiLLsN5lyqVzCgTBVt4TMT/ShWbTbc5Q==
+  dependencies:
+    "@motionone/dom" "^10.16.2"
+    tslib "^2.3.1"
+
+"@motionone/types@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.15.1.tgz#89441b54285012795cbba8612cbaa0fa420db3eb"
+  integrity sha512-iIUd/EgUsRZGrvW0jqdst8st7zKTzS9EsKkP+6c6n4MPZoQHwiHuVtTQLD6Kp0bsBLhNzKIBlHXponn/SDT4hA==
+
+"@motionone/utils@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.15.1.tgz#6b5f51bde75be88b5411e084310299050368a438"
+  integrity sha512-p0YncgU+iklvYr/Dq4NobTRdAPv9PveRDUXabPEeOjBLSO/1FNB2phNTZxOxpi1/GZwYpAoECEa0Wam+nsmhSw==
+  dependencies:
+    "@motionone/types" "^10.15.1"
+    hey-listen "^1.0.8"
+    tslib "^2.3.1"
+
+"@motionone/vue@^10.16.2":
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/@motionone/vue/-/vue-10.16.2.tgz#faf13afc27620a2df870c71c58a04ee8de8dea65"
+  integrity sha512-7/dEK/nWQXOkJ70bqb2KyNfSWbNvWqKKq1C8juj+0Mg/AorgD8O5wE3naddK0G+aXuNMqRuc4jlsYHHWHtIzVw==
+  dependencies:
+    "@motionone/dom" "^10.16.2"
+    tslib "^2.3.1"
+
 "@ndelangen/get-tarball@^3.0.7":
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz#727ff4454e65f34707e742a59e5e6b1f525d8964"
@@ -3643,7 +3683,7 @@
   dependencies:
     "@noble/hashes" "1.3.0"
 
-"@noble/curves@1.1.0":
+"@noble/curves@1.1.0", "@noble/curves@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.1.0.tgz#f13fc667c89184bc04cccb9b11e8e7bae27d8c3d"
   integrity sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==
@@ -3655,7 +3695,7 @@
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.0.tgz#085fd70f6d7d9d109671090ccae1d3bec62554a1"
   integrity sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==
 
-"@noble/hashes@1.3.1", "@noble/hashes@^1.2.0", "@noble/hashes@~1.3.0":
+"@noble/hashes@1.3.1", "@noble/hashes@^1.3.0", "@noble/hashes@~1.3.0":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9"
   integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==
@@ -4375,7 +4415,7 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
   integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
 
-"@polkadot/api-augment@10.3.2", "@polkadot/api-augment@10.9.1", "@polkadot/api-augment@^10.6.1":
+"@polkadot/api-augment@10.3.2", "@polkadot/api-augment@10.9.1", "@polkadot/api-augment@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/api-augment/-/api-augment-10.9.1.tgz#9fc81b81903229bb23b0b16783e97ec52a5d4f1b"
   integrity sha512-kRZZvCFVcN4hAH4dJ+Qzfdy27/4EEq3oLDf3ihj0LTVrAezSWcKPGE3EVFy+Mn6Lo4SUc7RVyoKvIUhSk2l4Dg==
@@ -4388,7 +4428,7 @@
     "@polkadot/util" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/api-base@10.9.1", "@polkadot/api-base@^10.6.1":
+"@polkadot/api-base@10.9.1", "@polkadot/api-base@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/api-base/-/api-base-10.9.1.tgz#27f63c4950814c2f10535f794121fa1384dc2207"
   integrity sha512-Q3m2KzlceMK2kX8bhnUZWk3RT6emmijeeFZZQgCePpEcrSeNjnqG4qjuTPgkveaOkUT8MAoDc5Avuzcc2jlW9g==
@@ -4399,7 +4439,7 @@
     rxjs "^7.8.1"
     tslib "^2.5.3"
 
-"@polkadot/api-contract@^10.6.1":
+"@polkadot/api-contract@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-10.9.1.tgz#6820836df2d0efa10d08d58fd85e3513a5d4c537"
   integrity sha512-BJjFYSFtsUlClC3mgvPNQ5h/7LZd5gVfexwl+mDgLd/6SN4dUBQjIXhlIL5a1cGYjq3EROuu7t0agG2DIaiZMQ==
@@ -4414,7 +4454,7 @@
     rxjs "^7.8.1"
     tslib "^2.5.3"
 
-"@polkadot/api-derive@10.3.2", "@polkadot/api-derive@10.9.1", "@polkadot/api-derive@^10.6.1":
+"@polkadot/api-derive@10.3.2", "@polkadot/api-derive@10.9.1", "@polkadot/api-derive@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-10.9.1.tgz#04a4ca3285fd215c4cd50cfb3f4791d38dd90050"
   integrity sha512-mRud1UZCFIc4Z63qAoGSIHh/foyUYADfy1RQYCmPpeFKfIdCIrHpd7xFdJXTOMYOS0BwlM6u4qli/ZT4XigezQ==
@@ -4430,7 +4470,7 @@
     rxjs "^7.8.1"
     tslib "^2.5.3"
 
-"@polkadot/api@10.3.2", "@polkadot/api@10.9.1", "@polkadot/api@^10.6.1":
+"@polkadot/api@10.3.2", "@polkadot/api@10.9.1", "@polkadot/api@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-10.9.1.tgz#156b3436f45ef18218960804988c1f552d2c4e46"
   integrity sha512-ND/2UqZBWvtt4PfV03OStTKg0mxmPk4UpMAgJKutdgsz/wP9CYJ1KbjwFgPNekL9JnzbKQsWyQNPVrcw7kQk8A==
@@ -4517,52 +4557,30 @@
     webpack-subresource-integrity "^5.2.0-rc.1"
     yargs "^17.7.1"
 
-"@polkadot/extension-dapp@0.46.3":
-  version "0.46.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.46.3.tgz#744c741f198cd150b9346b2ff67dac425de51c06"
-  integrity sha512-5aoKHd2utAs/Ztd6i1TPYqTLrnt43v2ebbX1zyW6xMdGTsSbnBFoTPhkkp826U5FfCB04stj+HfhP+UMqGg9Xg==
-  dependencies:
-    "@polkadot/extension-inject" "0.46.3"
-    "@polkadot/util" "^12.2.1"
-    "@polkadot/util-crypto" "^12.2.1"
-    tslib "^2.5.0"
-
-"@polkadot/extension-inject@0.46.3":
-  version "0.46.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.46.3.tgz#822b25f34c5a5d9da2cdaf2549ab5e92ed14905e"
-  integrity sha512-VYq7pDjafZ1jxHJXp2OFELiU2SURYEL7mUWfi/3WiAwhPuOnd0mSNQMDz+s5tk5XkSU70xLJhNnBxid0rxEvaA==
+"@polkadot/extension-dapp@0.46.5":
+  version "0.46.5"
+  resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.46.5.tgz#ace9dfda199ddc1e588f3506ac678641392ee41e"
+  integrity sha512-9Efm3oorx6orq1eue+tTk5rxuGFFCUdRxiZbdQMKiVl3lZnwBn0M61ceE3xXcf/oIwAm8RhUpQdwcbZfupJRgw==
   dependencies:
-    "@polkadot/rpc-provider" "^10.7.1"
-    "@polkadot/types" "^10.7.1"
-    "@polkadot/util" "^12.2.1"
-    "@polkadot/util-crypto" "^12.2.1"
-    "@polkadot/x-global" "^12.2.1"
-    tslib "^2.5.0"
-
-"@polkadot/hw-ledger-transports@12.3.2":
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/hw-ledger-transports/-/hw-ledger-transports-12.3.2.tgz#12e80d7122356320c43bc736fa79fcec9a6abece"
-  integrity sha512-zMPKBKW0q30JYp9VVG0OtFkVKNntMd9JcvHHC2I+FQk0ec1TzKVK/jg8McRUHAYNNJkxohMnAJNzMDGSXT31fw==
-  dependencies:
-    "@ledgerhq/hw-transport" "^6.28.4"
-    "@ledgerhq/hw-transport-webhid" "^6.27.15"
-    "@ledgerhq/hw-transport-webusb" "^6.27.15"
-    "@polkadot/util" "12.3.2"
+    "@polkadot/extension-inject" "0.46.5"
+    "@polkadot/util" "^12.3.2"
+    "@polkadot/util-crypto" "^12.3.2"
     tslib "^2.5.3"
-  optionalDependencies:
-    "@ledgerhq/hw-transport-node-hid-singleton" "^6.28.12"
 
-"@polkadot/hw-ledger@^12.1.1":
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/@polkadot/hw-ledger/-/hw-ledger-12.3.2.tgz#82a076d1f4dad6acb861b0fb99e35e0b96df279a"
-  integrity sha512-mfxGmcVcoaK1lzzS1SUGuHmNTgOjnFmNbAKswva/Z7BEvw3JqW/slv7GIPxQKJpg0ao8wxGTv+Z2cCJL3Dsezg==
-  dependencies:
-    "@polkadot/hw-ledger-transports" "12.3.2"
-    "@polkadot/util" "12.3.2"
-    "@zondax/ledger-substrate" "^0.40.7"
+"@polkadot/extension-inject@0.46.5":
+  version "0.46.5"
+  resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.46.5.tgz#6abee0eb28a73fd1a9461f257cac5875c2e9fc63"
+  integrity sha512-QcpkCMuv7iFbWjufkw14JRozpEYFyjP0H8KOJ8IsHGfPd2DPiismQ0NXr+AS7f6U+0I+Rhv9E4dnXxtJPROVMQ==
+  dependencies:
+    "@polkadot/api" "^10.9.1"
+    "@polkadot/rpc-provider" "^10.9.1"
+    "@polkadot/types" "^10.9.1"
+    "@polkadot/util" "^12.3.2"
+    "@polkadot/util-crypto" "^12.3.2"
+    "@polkadot/x-global" "^12.3.2"
     tslib "^2.5.3"
 
-"@polkadot/keyring@11.1.3", "@polkadot/keyring@^12.1.2", "@polkadot/keyring@^12.3.1":
+"@polkadot/keyring@11.1.3", "@polkadot/keyring@^12.3.1", "@polkadot/keyring@^12.3.2":
   version "12.3.2"
   resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-12.3.2.tgz#112a0c28816a1f47edad6260dc94222c29465a54"
   integrity sha512-NTdtDeI0DP9l/45hXynNABeP5VB8piw5YR+CbUxK2e36xpJWVXwbcOepzslg5ghE9rs8UKJb30Z/HqTU4sBY0Q==
@@ -4571,7 +4589,7 @@
     "@polkadot/util-crypto" "12.3.2"
     tslib "^2.5.3"
 
-"@polkadot/networks@12.3.2", "@polkadot/networks@^12.1.1", "@polkadot/networks@^12.3.1":
+"@polkadot/networks@12.3.2", "@polkadot/networks@^12.3.1", "@polkadot/networks@^12.3.2":
   version "12.3.2"
   resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-12.3.2.tgz#131b0439c481add159814dd2cf0286c6c3fe5b3b"
   integrity sha512-uCkyybKoeEm1daKr0uT/9oNDHDDzCy2/ZdVl346hQqfdR1Ct3BaxMjxqvdmb5N8aCw0cBWSfgsxAYtw8ESmllQ==
@@ -4580,7 +4598,7 @@
     "@substrate/ss58-registry" "^1.40.0"
     tslib "^2.5.3"
 
-"@polkadot/phishing@^0.21.2":
+"@polkadot/phishing@^0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@polkadot/phishing/-/phishing-0.21.5.tgz#89134c75ac78bf3bb25fa54016ae2e0ecf403d6d"
   integrity sha512-bLlOvx5AdOn+zYIjoCw5wETKzu048R2qlBq6hUScZ8tjRMFHSqsp3viU9iODBq+UKkM4TTSKMxAAH/fTj1rRhw==
@@ -4590,7 +4608,7 @@
     "@polkadot/x-fetch" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/react-identicon@^3.2.2":
+"@polkadot/react-identicon@^3.5.1":
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-3.5.1.tgz#0e6796669c63a13497348a84de5ab4549771d0dc"
   integrity sha512-otMoajqrJn6COm3qAVYXo1IiUWKycApfhSiYRXnbbtZPJ5vq1SJacfhDYTl/S3B1l2UF/o3yei6Tq3fNu67ZNA==
@@ -4606,7 +4624,7 @@
     styled-components "^5.3.11"
     tslib "^2.5.3"
 
-"@polkadot/rpc-augment@10.3.2", "@polkadot/rpc-augment@10.9.1", "@polkadot/rpc-augment@^10.6.1":
+"@polkadot/rpc-augment@10.3.2", "@polkadot/rpc-augment@10.9.1", "@polkadot/rpc-augment@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/rpc-augment/-/rpc-augment-10.9.1.tgz#214ec3ee145d20caa61ea204041a3aadb89c6b0f"
   integrity sha512-MaLHkNlyqN20ZRYr6uNd1BZr1OsrnX9qLAmsl0mcrri1vPGRH6VHjfFH1RBLkikpWD82v17g0l2hLwdV1ZHMcw==
@@ -4617,7 +4635,7 @@
     "@polkadot/util" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/rpc-core@10.9.1", "@polkadot/rpc-core@^10.6.1":
+"@polkadot/rpc-core@10.9.1", "@polkadot/rpc-core@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-10.9.1.tgz#798c514dbed6f6c2e43098a494c9f51fb144dc31"
   integrity sha512-ZtA8B8SfXSAwVkBlCcKRHw0eSM7ec/sbiNOM5GasXPeRujUgT7lOwSH2GbUZSqe9RfRDMp6DvO9c2JoGc3LLWw==
@@ -4629,7 +4647,7 @@
     rxjs "^7.8.1"
     tslib "^2.5.3"
 
-"@polkadot/rpc-provider@10.3.2", "@polkadot/rpc-provider@10.9.1", "@polkadot/rpc-provider@^10.6.1", "@polkadot/rpc-provider@^10.7.1":
+"@polkadot/rpc-provider@10.3.2", "@polkadot/rpc-provider@10.9.1", "@polkadot/rpc-provider@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-10.9.1.tgz#de3a474bbcd26d28d9cd3134acdb3b5ce92b680b"
   integrity sha512-4QzT2QzD+320+eT6b79sGAA85Tt3Bb8fQvse4r5Mom2iiBd2SO81vOhxSAOaIe4GUsw25VzFJmsbe7+OObItdg==
@@ -4670,7 +4688,7 @@
     tslib "^2.5.0"
     yargs "^17.7.1"
 
-"@polkadot/types-augment@10.3.2", "@polkadot/types-augment@10.9.1", "@polkadot/types-augment@^10.6.1":
+"@polkadot/types-augment@10.3.2", "@polkadot/types-augment@10.9.1", "@polkadot/types-augment@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types-augment/-/types-augment-10.9.1.tgz#5f1c1225c04ffbfe243629a46087c9c9de25a6b3"
   integrity sha512-OY9/jTMFRFqYdkUnfcGwqMLC64A0Q25bjvCuVQCVjsPFKE3wl0Kt5rNT01eV2UmLXrR6fY0xWbR2w80bLA7CIQ==
@@ -4680,7 +4698,7 @@
     "@polkadot/util" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/types-codec@10.3.2", "@polkadot/types-codec@10.9.1", "@polkadot/types-codec@^10.6.1":
+"@polkadot/types-codec@10.3.2", "@polkadot/types-codec@10.9.1", "@polkadot/types-codec@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types-codec/-/types-codec-10.9.1.tgz#f30026d3dfeaa69c07c45fa66d1c39318fd232cc"
   integrity sha512-mJ5OegKGraY1FLvEa8FopRCr3pQrhDkcn5RNOjmgJQozENVeRaxhk0NwxYz7IojFvSDnKnc6lNQfKaaSe5pLHg==
@@ -4689,7 +4707,7 @@
     "@polkadot/x-bigint" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/types-create@10.3.2", "@polkadot/types-create@10.9.1", "@polkadot/types-create@^10.6.1":
+"@polkadot/types-create@10.3.2", "@polkadot/types-create@10.9.1", "@polkadot/types-create@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types-create/-/types-create-10.9.1.tgz#087d7e2af51cce558b67e3859613b932a3bdc0a3"
   integrity sha512-OVz50MGTTuiuVnRP/zAx4CTuLioc0hsiwNwqN2lNhmIJGtnQ4Vy/7mQRsIWehiYz6g0Vzzm5B3qWkTXO1NSN5w==
@@ -4698,7 +4716,7 @@
     "@polkadot/util" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/types-known@10.9.1", "@polkadot/types-known@^10.6.1":
+"@polkadot/types-known@10.9.1", "@polkadot/types-known@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-10.9.1.tgz#fe0c7e55191aa843119edcaf9abb5d2471463a7d"
   integrity sha512-zCMVWc4pJtkbMFPu72bD4IhvV/gkHXPX3C5uu92WdmCfnn0vEIEsMKWlVXVVvQQZKAqvs/awpqIfrUtEViOGEA==
@@ -4710,7 +4728,7 @@
     "@polkadot/util" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/types-support@10.3.2", "@polkadot/types-support@10.9.1", "@polkadot/types-support@^10.6.1":
+"@polkadot/types-support@10.3.2", "@polkadot/types-support@10.9.1", "@polkadot/types-support@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types-support/-/types-support-10.9.1.tgz#17a861aab8e5a225a4e20cefa2d16076ddd51baf"
   integrity sha512-XsieuLDsszvMZQlleacQBfx07i/JkwQV/UxH9q8Hz7Okmaz9pEVEW1h3ka2/cPuC7a4l32JhaORBUYshBZNdJg==
@@ -4718,7 +4736,7 @@
     "@polkadot/util" "^12.3.1"
     tslib "^2.5.3"
 
-"@polkadot/types@10.3.2", "@polkadot/types@10.9.1", "@polkadot/types@^10.6.1", "@polkadot/types@^10.7.1":
+"@polkadot/types@10.3.2", "@polkadot/types@10.9.1", "@polkadot/types@^10.9.1":
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-10.9.1.tgz#f111d00f7278ad3be95deba3d701fafefe080cb2"
   integrity sha512-AG33i2ZGGfq7u+5rkAdGrXAQHHl844/Yv+junH5ZzX69xiCoWO1bH/yzDUNBdpki2GlACWvF9nLYh3F2tVF93w==
@@ -4751,7 +4769,7 @@
     colord "^2.9.3"
     tslib "^2.5.3"
 
-"@polkadot/util-crypto@12.3.2", "@polkadot/util-crypto@^11.1.3", "@polkadot/util-crypto@^12.1.1", "@polkadot/util-crypto@^12.2.1", "@polkadot/util-crypto@^12.3.1":
+"@polkadot/util-crypto@12.3.2", "@polkadot/util-crypto@^11.1.3", "@polkadot/util-crypto@^12.3.1", "@polkadot/util-crypto@^12.3.2":
   version "12.3.2"
   resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-12.3.2.tgz#42d810886904e06fa6e5db254c15f6ef80f4ab72"
   integrity sha512-pTpx+YxolY0BDT4RcGmgeKbHHD/dI6Ll9xRsqmVdIjpcVVY20uDNTyXs81ZNtfKgyod1y9JQkfNv2Dz9iEpTkQ==
@@ -4767,7 +4785,7 @@
     "@scure/base" "1.1.1"
     tslib "^2.5.3"
 
-"@polkadot/util@11.1.3", "@polkadot/util@12.3.2", "@polkadot/util@^11.1.3", "@polkadot/util@^12.1.1", "@polkadot/util@^12.2.1", "@polkadot/util@^12.3.1":
+"@polkadot/util@11.1.3", "@polkadot/util@12.3.2", "@polkadot/util@^11.1.3", "@polkadot/util@^12.3.1", "@polkadot/util@^12.3.2":
   version "12.3.2"
   resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-12.3.2.tgz#f46e147b0e6a426da5ba59df4ce65de1a3effe4a"
   integrity sha512-y/JShcGyOamCUiSIg++XZuLHt1ktSKBaSH2K5Nw5NXlgP0+7am+GZzqPB8fQ4qhYLruEOv+YRiz0GC1Zr9S+wg==
@@ -4857,7 +4875,7 @@
   dependencies:
     tslib "^2.5.0"
 
-"@polkadot/x-global@12.3.2", "@polkadot/x-global@^12.2.1", "@polkadot/x-global@^12.3.1":
+"@polkadot/x-global@12.3.2", "@polkadot/x-global@^12.3.1", "@polkadot/x-global@^12.3.2":
   version "12.3.2"
   resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-12.3.2.tgz#04ac0b0e559a35107f0b95ff7889fcade3796aa3"
   integrity sha512-yVZq6oIegjlyh5rUZiTklgu+fL+W/DG1ypEa02683tUCB3avV5cA3PAHKptMSlb6FpweHu37lKKrqfAWrraDxg==
@@ -5558,7 +5576,30 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.3.2.tgz#31b9c510d8cada9683549e1dbb4284cca5001faf"
   integrity sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==
 
-"@scure/base@1.1.1", "@scure/base@^1.1.1", "@scure/base@~1.1.0":
+"@safe-global/safe-apps-provider@^0.17.1":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-provider/-/safe-apps-provider-0.17.1.tgz#72df2a66be5343940ed505efe594ed3b0f2f7015"
+  integrity sha512-lYfRqrbbK1aKU1/UGkYWc/X7PgySYcumXKc5FB2uuwAs2Ghj8uETuW5BrwPqyjBknRxutFbTv+gth/JzjxAhdQ==
+  dependencies:
+    "@safe-global/safe-apps-sdk" "8.0.0"
+    events "^3.3.0"
+
+"@safe-global/safe-apps-sdk@8.0.0", "@safe-global/safe-apps-sdk@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-8.0.0.tgz#9bdfe0e0d85e1b2d279bb840f40c4b930aaf8bc1"
+  integrity sha512-gYw0ki/EAuV1oSyMxpqandHjnthZjYYy+YWpTAzf8BqfXM3ItcZLpjxfg+3+mXW8HIO+3jw6T9iiqEXsqHaMMw==
+  dependencies:
+    "@safe-global/safe-gateway-typescript-sdk" "^3.5.3"
+    viem "^1.0.0"
+
+"@safe-global/safe-gateway-typescript-sdk@^3.5.3":
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/@safe-global/safe-gateway-typescript-sdk/-/safe-gateway-typescript-sdk-3.7.3.tgz#68ec7d82711e2d0f82ce2e577b1df67ba8da2bed"
+  integrity sha512-O6JCgXNZWG0Vv8FnOEjKfcbsP0WxGvoPJk5ufqUrsyBlHup16It6oaLnn+25nXFLBZOHI1bz8429JlqAc2t2hg==
+  dependencies:
+    cross-fetch "^3.1.5"
+
+"@scure/base@1.1.1", "@scure/base@~1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"
   integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==
@@ -5680,6 +5721,168 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
+"@solana/buffer-layout@^4.0.0":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz#b996235eaec15b1e0b5092a8ed6028df77fa6c15"
+  integrity sha512-E1ImOIAD1tBZFRdjeM4/pzTiTApC0AOBGwyAMS4fwIodCWArzJ3DWdoh8cKxeFM2fElkxBh2Aqts1BPC373rHA==
+  dependencies:
+    buffer "~6.0.3"
+
+"@solana/web3.js@^1.70.1":
+  version "1.77.3"
+  resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.77.3.tgz#2cbeaa1dd24f8fa386ac924115be82354dfbebab"
+  integrity sha512-PHaO0BdoiQRPpieC1p31wJsBaxwIOWLh8j2ocXNKX8boCQVldt26Jqm2tZE4KlrvnCIV78owPLv1pEUgqhxZ3w==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@noble/curves" "^1.0.0"
+    "@noble/hashes" "^1.3.0"
+    "@solana/buffer-layout" "^4.0.0"
+    agentkeepalive "^4.2.1"
+    bigint-buffer "^1.1.5"
+    bn.js "^5.0.0"
+    borsh "^0.7.0"
+    bs58 "^4.0.1"
+    buffer "6.0.3"
+    fast-stable-stringify "^1.0.0"
+    jayson "^4.1.0"
+    node-fetch "^2.6.7"
+    rpc-websockets "^7.5.1"
+    superstruct "^0.14.2"
+
+"@stablelib/aead@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/aead/-/aead-1.0.1.tgz#c4b1106df9c23d1b867eb9b276d8f42d5fc4c0c3"
+  integrity sha512-q39ik6sxGHewqtO0nP4BuSe3db5G1fEJE8ukvngS2gLkBXyy6E7pLubhbYgnkDFv6V8cWaxcE4Xn0t6LWcJkyg==
+
+"@stablelib/binary@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/binary/-/binary-1.0.1.tgz#c5900b94368baf00f811da5bdb1610963dfddf7f"
+  integrity sha512-ClJWvmL6UBM/wjkvv/7m5VP3GMr9t0osr4yVgLZsLCOz4hGN9gIAFEqnJ0TsSMAN+n840nf2cHZnA5/KFqHC7Q==
+  dependencies:
+    "@stablelib/int" "^1.0.1"
+
+"@stablelib/bytes@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/bytes/-/bytes-1.0.1.tgz#0f4aa7b03df3080b878c7dea927d01f42d6a20d8"
+  integrity sha512-Kre4Y4kdwuqL8BR2E9hV/R5sOrUj6NanZaZis0V6lX5yzqC3hBuVSDXUIBqQv/sCpmuWRiHLwqiT1pqqjuBXoQ==
+
+"@stablelib/chacha20poly1305@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/chacha20poly1305/-/chacha20poly1305-1.0.1.tgz#de6b18e283a9cb9b7530d8767f99cde1fec4c2ee"
+  integrity sha512-MmViqnqHd1ymwjOQfghRKw2R/jMIGT3wySN7cthjXCBdO+qErNPUBnRzqNpnvIwg7JBCg3LdeCZZO4de/yEhVA==
+  dependencies:
+    "@stablelib/aead" "^1.0.1"
+    "@stablelib/binary" "^1.0.1"
+    "@stablelib/chacha" "^1.0.1"
+    "@stablelib/constant-time" "^1.0.1"
+    "@stablelib/poly1305" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/chacha@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/chacha/-/chacha-1.0.1.tgz#deccfac95083e30600c3f92803a3a1a4fa761371"
+  integrity sha512-Pmlrswzr0pBzDofdFuVe1q7KdsHKhhU24e8gkEwnTGOmlC7PADzLVxGdn2PoNVBBabdg0l/IfLKg6sHAbTQugg==
+  dependencies:
+    "@stablelib/binary" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/constant-time@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/constant-time/-/constant-time-1.0.1.tgz#bde361465e1cf7b9753061b77e376b0ca4c77e35"
+  integrity sha512-tNOs3uD0vSJcK6z1fvef4Y+buN7DXhzHDPqRLSXUel1UfqMB1PWNsnnAezrKfEwTLpN0cGH2p9NNjs6IqeD0eg==
+
+"@stablelib/ed25519@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@stablelib/ed25519/-/ed25519-1.0.3.tgz#f8fdeb6f77114897c887bb6a3138d659d3f35996"
+  integrity sha512-puIMWaX9QlRsbhxfDc5i+mNPMY+0TmQEskunY1rZEBPi1acBCVQAhnsk/1Hk50DGPtVsZtAWQg4NHGlVaO9Hqg==
+  dependencies:
+    "@stablelib/random" "^1.0.2"
+    "@stablelib/sha512" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/hash@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/hash/-/hash-1.0.1.tgz#3c944403ff2239fad8ebb9015e33e98444058bc5"
+  integrity sha512-eTPJc/stDkdtOcrNMZ6mcMK1e6yBbqRBaNW55XA1jU8w/7QdnCF0CmMmOD1m7VSkBR44PWrMHU2l6r8YEQHMgg==
+
+"@stablelib/hkdf@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/hkdf/-/hkdf-1.0.1.tgz#b4efd47fd56fb43c6a13e8775a54b354f028d98d"
+  integrity sha512-SBEHYE16ZXlHuaW5RcGk533YlBj4grMeg5TooN80W3NpcHRtLZLLXvKyX0qcRFxf+BGDobJLnwkvgEwHIDBR6g==
+  dependencies:
+    "@stablelib/hash" "^1.0.1"
+    "@stablelib/hmac" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/hmac@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/hmac/-/hmac-1.0.1.tgz#3d4c1b8cf194cb05d28155f0eed8a299620a07ec"
+  integrity sha512-V2APD9NSnhVpV/QMYgCVMIYKiYG6LSqw1S65wxVoirhU/51ACio6D4yDVSwMzuTJXWZoVHbDdINioBwKy5kVmA==
+  dependencies:
+    "@stablelib/constant-time" "^1.0.1"
+    "@stablelib/hash" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/int@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/int/-/int-1.0.1.tgz#75928cc25d59d73d75ae361f02128588c15fd008"
+  integrity sha512-byr69X/sDtDiIjIV6m4roLVWnNNlRGzsvxw+agj8CIEazqWGOQp2dTYgQhtyVXV9wpO6WyXRQUzLV/JRNumT2w==
+
+"@stablelib/keyagreement@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/keyagreement/-/keyagreement-1.0.1.tgz#4612efb0a30989deb437cd352cee637ca41fc50f"
+  integrity sha512-VKL6xBwgJnI6l1jKrBAfn265cspaWBPAPEc62VBQrWHLqVgNRE09gQ/AnOEyKUWrrqfD+xSQ3u42gJjLDdMDQg==
+  dependencies:
+    "@stablelib/bytes" "^1.0.1"
+
+"@stablelib/poly1305@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/poly1305/-/poly1305-1.0.1.tgz#93bfb836c9384685d33d70080718deae4ddef1dc"
+  integrity sha512-1HlG3oTSuQDOhSnLwJRKeTRSAdFNVB/1djy2ZbS35rBSJ/PFqx9cf9qatinWghC2UbfOYD8AcrtbUQl8WoxabA==
+  dependencies:
+    "@stablelib/constant-time" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/random@^1.0.1", "@stablelib/random@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@stablelib/random/-/random-1.0.2.tgz#2dece393636489bf7e19c51229dd7900eddf742c"
+  integrity sha512-rIsE83Xpb7clHPVRlBj8qNe5L8ISQOzjghYQm/dZ7VaM2KHYwMW5adjQjrzTZCchFnNCNhkwtnOBa9HTMJCI8w==
+  dependencies:
+    "@stablelib/binary" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/sha256@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/sha256/-/sha256-1.0.1.tgz#77b6675b67f9b0ea081d2e31bda4866297a3ae4f"
+  integrity sha512-GIIH3e6KH+91FqGV42Kcj71Uefd/QEe7Dy42sBTeqppXV95ggCcxLTk39bEr+lZfJmp+ghsR07J++ORkRELsBQ==
+  dependencies:
+    "@stablelib/binary" "^1.0.1"
+    "@stablelib/hash" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/sha512@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/sha512/-/sha512-1.0.1.tgz#6da700c901c2c0ceacbd3ae122a38ac57c72145f"
+  integrity sha512-13gl/iawHV9zvDKciLo1fQ8Bgn2Pvf7OV6amaRVKiq3pjQ3UmEpXxWiAfV8tYjUpeZroBxtyrwtdooQT/i3hzw==
+  dependencies:
+    "@stablelib/binary" "^1.0.1"
+    "@stablelib/hash" "^1.0.1"
+    "@stablelib/wipe" "^1.0.1"
+
+"@stablelib/wipe@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@stablelib/wipe/-/wipe-1.0.1.tgz#d21401f1d59ade56a62e139462a97f104ed19a36"
+  integrity sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==
+
+"@stablelib/x25519@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@stablelib/x25519/-/x25519-1.0.3.tgz#13c8174f774ea9f3e5e42213cbf9fc68a3c7b7fd"
+  integrity sha512-KnTbKmUhPhHavzobclVJQG5kuivH+qDLpe84iRqX3CLrKp881cF160JvXJ+hjn1aMyCwYOKeIZefIH/P5cJoRw==
+  dependencies:
+    "@stablelib/keyagreement" "^1.0.1"
+    "@stablelib/random" "^1.0.2"
+    "@stablelib/wipe" "^1.0.1"
+
 "@storybook/addon-a11y@^7.0.12":
   version "7.0.25"
   resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-7.0.25.tgz#b42797ac38b65caff0e70380664d1b7b93003c8e"
@@ -7360,6 +7563,40 @@
   dependencies:
     remove-accents "0.4.2"
 
+"@tanstack/query-core@4.29.19":
+  version "4.29.19"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.29.19.tgz#49ccbd0606633d1e55baf3b91ab7cc7aef411b1d"
+  integrity sha512-uPe1DukeIpIHpQi6UzIgBcXsjjsDaLnc7hF+zLBKnaUlh7jFE/A+P8t4cU4VzKPMFB/C970n/9SxtpO5hmIRgw==
+
+"@tanstack/query-persist-client-core@4.29.19":
+  version "4.29.19"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-persist-client-core/-/query-persist-client-core-4.29.19.tgz#c0cd03eca74d33e5aa40c95cadd5585620ff2320"
+  integrity sha512-rr6p3xwEZCz3cEDZsj3QGePf6PG44WxRUGQVcm2JFPZOq9TkG/0i5+hQ3STiHm1Fj6qwCH8xIi62L8kG0zRj/Q==
+  dependencies:
+    "@tanstack/query-core" "4.29.19"
+
+"@tanstack/query-sync-storage-persister@^4.27.1":
+  version "4.29.19"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-4.29.19.tgz#292d33cdc9b38b11127f2f07b1935a73039cbba4"
+  integrity sha512-B3wDl3D3YBFTlY2yeXecEh4NEG/8Hr8pqsxnWJijRwBqvOKlqD4bUgk5kl5nbn1mShD2vnQ+yvH900/11X29Zw==
+  dependencies:
+    "@tanstack/query-persist-client-core" "4.29.19"
+
+"@tanstack/react-query-persist-client@^4.28.0":
+  version "4.29.19"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query-persist-client/-/react-query-persist-client-4.29.19.tgz#27b24ec5c8983894d6f23450e2f922d07f47706f"
+  integrity sha512-LfcasTosdnI9K66HTP0Rk72Ypza3tCgrcF9bc2qFlKsBleYOYo8bz7/GiiOHj1SQH4GRQlKB+P4+/it+qlJg4g==
+  dependencies:
+    "@tanstack/query-persist-client-core" "4.29.19"
+
+"@tanstack/react-query@^4.28.0":
+  version "4.29.19"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.29.19.tgz#6ba187f2d0ea36ae83ff1f67068f53c88ce7b228"
+  integrity sha512-XiTIOHHQ5Cw1WUlHaD4fmVUMhoWjuNJlAeJGq7eM4BraI5z7y8WkZO+NR8PSuRnQGblpuVdjClQbDFtwxTtTUw==
+  dependencies:
+    "@tanstack/query-core" "4.29.19"
+    use-sync-external-store "^1.2.0"
+
 "@tanstack/react-table@^8.9.1":
   version "8.9.3"
   resolved "https://registry.yarnpkg.com/@tanstack/react-table/-/react-table-8.9.3.tgz#03a52e9e15f65c82a8c697a445c42bfca0c5cfc4"
@@ -7501,13 +7738,6 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@types/bn.js@^4.11.3":
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c"
-  integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/bn.js@^5.1.0", "@types/bn.js@^5.1.1":
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682"
@@ -7548,7 +7778,7 @@
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
 
-"@types/connect@*":
+"@types/connect@*", "@types/connect@^3.4.33":
   version "3.4.35"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
   integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
@@ -7606,7 +7836,7 @@
   resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-3.0.0.tgz#e2505f1c21ec08bda8915238e397fb71d2fc54ce"
   integrity sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==
 
-"@types/debug@^4.0.0":
+"@types/debug@^4.0.0", "@types/debug@^4.1.7":
   version "4.1.8"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
   integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==
@@ -7899,7 +8129,7 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.1.5.tgz#e94b604c67fc408f215fcbf3bd84d4743bf7f710"
   integrity sha512-IvGD1CD/nego63ySR7vrAKEX3AJTcmrAN2kn+/sDNLi1Ff5kBzDeEdqWDplK+0HAEoLYej137Sk0cUU8OLOlMg==
 
-"@types/node@^12.12.6":
+"@types/node@^12.12.54", "@types/node@^12.12.6":
   version "12.20.55"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
   integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
@@ -8107,15 +8337,22 @@
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
   integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
 
+"@types/trusted-types@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311"
+  integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==
+
 "@types/unist@*", "@types/unist@^2.0.0":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
   integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
 
-"@types/w3c-web-usb@1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/w3c-web-usb/-/w3c-web-usb-1.0.6.tgz#5d8560d0d9f585ffc80865bc773db7bc975b680c"
-  integrity sha512-cSjhgrr8g4KbPnnijAr/KJDNKa/bBa+ixYkywFRvrhvi9n1WEl7yYbtRyzE6jqNQiSxxJxoAW3STaOQwJHndaw==
+"@types/ws@^7.4.4":
+  version "7.4.7"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702"
+  integrity sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==
+  dependencies:
+    "@types/node" "*"
 
 "@types/ws@^8.0.0", "@types/ws@^8.5.1", "@types/ws@^8.5.5":
   version "8.5.5"
@@ -8343,42 +8580,66 @@
   resolved "https://registry.yarnpkg.com/@vercel/node-bridge/-/node-bridge-2.2.2.tgz#f63466ab6a2588afdc6262c2d060289bfe8baa6b"
   integrity sha512-haGBC8noyA5BfjCRXRH+VIkHCDVW5iD5UX24P2nOdilwUxI4qWsattS/co8QBGq64XsNLRAMdM5pQUE3zxkF9Q==
 
-"@wagmi/chains@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-1.0.0.tgz#41710941f2c2a699a246c4e3a6112b4efd996171"
-  integrity sha512-eNbqRWyHbivcMNq5tbXJks4NaOzVLHnNQauHPeE/EDT9AlpqzcrMc+v2T1/2Iw8zN4zgqB86NCsxeJHJs7+xng==
+"@wagmi/chains@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-1.2.0.tgz#d59eaa70ec51a5fdcd113975926992acfb17ab12"
+  integrity sha512-dmDRipsE54JfyudOBkuhEexqQWcrZqxn/qiujG8SBzMh/az/AH5xlJSA+j1CPWTx9+QofSMF3B7A4gb6XRmSaQ==
 
-"@walletconnect/browser-utils@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.8.0.tgz#33c10e777aa6be86c713095b5206d63d32df0951"
-  integrity sha512-Wcqqx+wjxIo9fv6eBUFHPsW1y/bGWWRboni5dfD8PtOmrihrEpOCmvRJe4rfl7xgJW8Ea9UqKEaq0bIRLHlK4A==
-  dependencies:
-    "@walletconnect/safe-json" "1.0.0"
-    "@walletconnect/types" "^1.8.0"
-    "@walletconnect/window-getters" "1.0.0"
-    "@walletconnect/window-metadata" "1.0.0"
-    detect-browser "5.2.0"
+"@wagmi/chains@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-1.5.0.tgz#0b23a1505704b4b07a46f41e1ec65a486aceb16b"
+  integrity sha512-JO5iqh7Km4GW/6XKKDYMq3YQ9wlOSGzzaTUQhALQ58KANxEZ70tZWhfTZAPD3fdgv4wheai7kyHDNgTW6X7fnw==
+
+"@wagmi/connectors@2.6.6":
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/@wagmi/connectors/-/connectors-2.6.6.tgz#98f0f90831ed8d76295f44b1b85439ce0118bf70"
+  integrity sha512-/o1c/TCivQs8DOAUOcQvY2UIt3p2mWOAHi39D0LC74+ncpXzLC5/gyaWU38qnTxPM8s/PmTmaWDgz+VhICXrag==
+  dependencies:
+    "@coinbase/wallet-sdk" "^3.6.6"
+    "@ledgerhq/connect-kit-loader" "^1.1.0"
+    "@safe-global/safe-apps-provider" "^0.17.1"
+    "@safe-global/safe-apps-sdk" "^8.0.0"
+    "@walletconnect/ethereum-provider" "2.9.0"
+    "@walletconnect/legacy-provider" "^2.0.0"
+    "@walletconnect/modal" "2.5.9"
+    "@walletconnect/utils" "2.9.0"
+    abitype "0.8.7"
+    eventemitter3 "^4.0.7"
 
-"@walletconnect/client@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.8.0.tgz#6f46b5499c7c861c651ff1ebe5da5b66225ca696"
-  integrity sha512-svyBQ14NHx6Cs2j4TpkQaBI/2AF4+LXz64FojTjMtV4VMMhl81jSO1vNeg+yYhQzvjcGH/GpSwixjyCW0xFBOQ==
+"@wagmi/core@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@wagmi/core/-/core-1.3.7.tgz#7bc00d172d206ffa171df0d5a813c3559d8824e3"
+  integrity sha512-ens31RwICdrbRanNYwlJs0DAw/LOqUPQm6qXsmEciOENT4w+7pC959LXU9xfaOADWVMekeLDmRqAGCszTNIXAg==
   dependencies:
-    "@walletconnect/core" "^1.8.0"
-    "@walletconnect/iso-crypto" "^1.8.0"
-    "@walletconnect/types" "^1.8.0"
-    "@walletconnect/utils" "^1.8.0"
+    "@wagmi/chains" "1.5.0"
+    "@wagmi/connectors" "2.6.6"
+    abitype "0.8.7"
+    eventemitter3 "^4.0.7"
+    zustand "^4.3.1"
 
-"@walletconnect/core@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.8.0.tgz#6b2748b90c999d9d6a70e52e26a8d5e8bfeaa81e"
-  integrity sha512-aFTHvEEbXcZ8XdWBw6rpQDte41Rxwnuk3SgTD8/iKGSRTni50gI9S3YEzMj05jozSiOBxQci4pJDMVhIUMtarw==
-  dependencies:
-    "@walletconnect/socket-transport" "^1.8.0"
-    "@walletconnect/types" "^1.8.0"
-    "@walletconnect/utils" "^1.8.0"
+"@walletconnect/core@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.9.0.tgz#7837a5d015a22b48d35b987bcde2aa9ccdf300d8"
+  integrity sha512-MZYJghS9YCvGe32UOgDj0mCasaOoGHQaYXWeQblXE/xb8HuaM6kAWhjIQN9P+MNp5QP134BHP5olQostcCotXQ==
+  dependencies:
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-provider" "1.0.13"
+    "@walletconnect/jsonrpc-types" "1.0.3"
+    "@walletconnect/jsonrpc-utils" "1.0.8"
+    "@walletconnect/jsonrpc-ws-connection" "1.0.12"
+    "@walletconnect/keyvaluestorage" "^1.0.2"
+    "@walletconnect/logger" "^2.0.1"
+    "@walletconnect/relay-api" "^1.0.9"
+    "@walletconnect/relay-auth" "^1.0.4"
+    "@walletconnect/safe-json" "^1.0.2"
+    "@walletconnect/time" "^1.0.2"
+    "@walletconnect/types" "2.9.0"
+    "@walletconnect/utils" "2.9.0"
+    events "^3.3.0"
+    lodash.isequal "4.5.0"
+    uint8arrays "^3.1.0"
 
-"@walletconnect/crypto@^1.0.2":
+"@walletconnect/crypto@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@walletconnect/crypto/-/crypto-1.0.3.tgz#7b8dd4d7e2884fe3543c7c07aea425eef5ef9dd4"
   integrity sha512-+2jdORD7XQs76I2Odgr3wwrtyuLUXD/kprNVsjWRhhhdO9Mt6WqVzOPu0/t7OHSmgal8k7SoBQzUc5hu/8zL/g==
@@ -8390,7 +8651,7 @@
     hash.js "^1.1.7"
     tslib "1.14.1"
 
-"@walletconnect/encoding@^1.0.1", "@walletconnect/encoding@^1.0.2":
+"@walletconnect/encoding@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/encoding/-/encoding-1.0.2.tgz#cb3942ad038d6a6bf01158f66773062dd25724da"
   integrity sha512-CrwSBrjqJ7rpGQcTL3kU+Ief+Bcuu9PH6JLOb+wM6NITX1GTxR/MfNwnQfhLKK6xpRAyj2/nM04OOH6wS8Imag==
@@ -8406,26 +8667,58 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/http-connection@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.8.0.tgz#c19fff5c179d5180d8b974faef2621bd012adb4e"
-  integrity sha512-IziEr3c53qsMromK7jz0EkbKDHlryRbxXdFR+xaG+S5nfxtUdAfjzlZabvczXdDCgmTij6KbNsZAjBMqCBzACw==
+"@walletconnect/ethereum-provider@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.9.0.tgz#aa6e9e441678c824af8f744c50dafd604f19d69e"
+  integrity sha512-rSXkC0SXMigJRdIi/M2RMuEuATY1AwtlTWQBnqyxoht7xbO2bQNPCXn0XL4s/GRNrSUtoKSY4aPMHXV4W4yLBA==
   dependencies:
-    "@walletconnect/types" "^1.8.0"
-    "@walletconnect/utils" "^1.8.0"
-    eventemitter3 "4.0.7"
-    xhr2-cookies "1.1.0"
+    "@walletconnect/jsonrpc-http-connection" "^1.0.7"
+    "@walletconnect/jsonrpc-provider" "^1.0.13"
+    "@walletconnect/jsonrpc-types" "^1.0.3"
+    "@walletconnect/jsonrpc-utils" "^1.0.8"
+    "@walletconnect/sign-client" "2.9.0"
+    "@walletconnect/types" "2.9.0"
+    "@walletconnect/universal-provider" "2.9.0"
+    "@walletconnect/utils" "2.9.0"
+    events "^3.3.0"
 
-"@walletconnect/iso-crypto@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.8.0.tgz#44ddf337c4f02837c062dbe33fa7ab36789df451"
-  integrity sha512-pWy19KCyitpfXb70hA73r9FcvklS+FvO9QUIttp3c2mfW8frxgYeRXfxLRCIQTkaYueRKvdqPjbyhPLam508XQ==
+"@walletconnect/events@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/events/-/events-1.0.1.tgz#2b5f9c7202019e229d7ccae1369a9e86bda7816c"
+  integrity sha512-NPTqaoi0oPBVNuLv7qPaJazmGHs5JGyO8eEAk5VGKmJzDR7AHzD4k6ilox5kxk1iwiOnFopBOOMLs86Oa76HpQ==
   dependencies:
-    "@walletconnect/crypto" "^1.0.2"
-    "@walletconnect/types" "^1.8.0"
-    "@walletconnect/utils" "^1.8.0"
+    keyvaluestorage-interface "^1.0.0"
+    tslib "1.14.1"
+
+"@walletconnect/heartbeat@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.1.tgz#afaa3a53232ae182d7c9cff41c1084472d8f32e9"
+  integrity sha512-yVzws616xsDLJxuG/28FqtZ5rzrTA4gUjdEMTbWB5Y8V1XHRmqq4efAxCw5ie7WjbXFSUyBHaWlMR+2/CpQC5Q==
+  dependencies:
+    "@walletconnect/events" "^1.0.1"
+    "@walletconnect/time" "^1.0.2"
+    tslib "1.14.1"
 
-"@walletconnect/jsonrpc-types@^1.0.3":
+"@walletconnect/jsonrpc-http-connection@^1.0.4", "@walletconnect/jsonrpc-http-connection@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-http-connection/-/jsonrpc-http-connection-1.0.7.tgz#a6973569b8854c22da707a759d241e4f5c2d5a98"
+  integrity sha512-qlfh8fCfu8LOM9JRR9KE0s0wxP6ZG9/Jom8M0qsoIQeKF3Ni0FyV4V1qy/cc7nfI46SLQLSl4tgWSfLiE1swyQ==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.6"
+    "@walletconnect/safe-json" "^1.0.1"
+    cross-fetch "^3.1.4"
+    tslib "1.14.1"
+
+"@walletconnect/jsonrpc-provider@1.0.13", "@walletconnect/jsonrpc-provider@^1.0.13", "@walletconnect/jsonrpc-provider@^1.0.6":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.13.tgz#9a74da648d015e1fffc745f0c7d629457f53648b"
+  integrity sha512-K73EpThqHnSR26gOyNEL+acEex3P7VWZe6KE12ZwKzAt2H4e5gldZHbjsu2QR9cLeJ8AXuO7kEMOIcRv1QEc7g==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.8"
+    "@walletconnect/safe-json" "^1.0.2"
+    tslib "1.14.1"
+
+"@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c"
   integrity sha512-iIQ8hboBl3o5ufmJ8cuduGad0CQm3ZlsHtujv9Eu16xq89q+BG7Nh5VLxxUgmtpnrePgFkTwXirCTkwJH1v+Yw==
@@ -8433,7 +8726,7 @@
     keyvaluestorage-interface "^1.0.0"
     tslib "1.14.1"
 
-"@walletconnect/jsonrpc-utils@^1.0.3":
+"@walletconnect/jsonrpc-utils@1.0.8", "@walletconnect/jsonrpc-utils@^1.0.4", "@walletconnect/jsonrpc-utils@^1.0.6", "@walletconnect/jsonrpc-utils@^1.0.7", "@walletconnect/jsonrpc-utils@^1.0.8":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.8.tgz#82d0cc6a5d6ff0ecc277cb35f71402c91ad48d72"
   integrity sha512-vdeb03bD8VzJUL6ZtzRYsFMq1eZQcM3EAzT0a3st59dyLfJ0wq+tKMpmGH7HlB7waD858UWgfIcudbPFsbzVdw==
@@ -8442,22 +8735,118 @@
     "@walletconnect/jsonrpc-types" "^1.0.3"
     tslib "1.14.1"
 
-"@walletconnect/mobile-registry@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5"
-  integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw==
+"@walletconnect/jsonrpc-ws-connection@1.0.12":
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.12.tgz#2192314884fabdda6d0a9d22e157e5b352025ed8"
+  integrity sha512-HAcadga3Qjt1Cqy+qXEW6zjaCs8uJGdGQrqltzl3OjiK4epGZRdvSzTe63P+t/3z+D2wG+ffEPn0GVcDozmN1w==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.6"
+    "@walletconnect/safe-json" "^1.0.2"
+    events "^3.3.0"
+    tslib "1.14.1"
+    ws "^7.5.1"
 
-"@walletconnect/qrcode-modal@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.8.0.tgz#ddd6f5c9b7ee52c16adf9aacec2a3eac4994caea"
-  integrity sha512-BueaFefaAi8mawE45eUtztg3ZFbsAH4DDXh1UNwdUlsvFMjqcYzLUG0xZvDd6z2eOpbgDg2N3bl6gF0KONj1dg==
+"@walletconnect/keyvaluestorage@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.0.2.tgz#92f5ca0f54c1a88a093778842ce0c874d86369c8"
+  integrity sha512-U/nNG+VLWoPFdwwKx0oliT4ziKQCEoQ27L5Hhw8YOFGA2Po9A9pULUYNWhDgHkrb0gYDNt//X7wABcEWWBd3FQ==
   dependencies:
-    "@walletconnect/browser-utils" "^1.8.0"
-    "@walletconnect/mobile-registry" "^1.4.0"
-    "@walletconnect/types" "^1.8.0"
-    copy-to-clipboard "^3.3.1"
-    preact "10.4.1"
-    qrcode "1.4.4"
+    safe-json-utils "^1.1.1"
+    tslib "1.14.1"
+
+"@walletconnect/legacy-client@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/legacy-client/-/legacy-client-2.0.0.tgz#9f2c09694789fd4b6c5d68d6423b44bac55aed30"
+  integrity sha512-v5L7rYk9loVnfvUf0mF+76bUPFaU5/Vh7mzL6/950CD/yoGdzYZ3Kj+L7mkC6HPMEGeQsBP1+sqBuiVGZ/aODA==
+  dependencies:
+    "@walletconnect/crypto" "^1.0.3"
+    "@walletconnect/encoding" "^1.0.2"
+    "@walletconnect/jsonrpc-utils" "^1.0.4"
+    "@walletconnect/legacy-types" "^2.0.0"
+    "@walletconnect/legacy-utils" "^2.0.0"
+    "@walletconnect/safe-json" "^1.0.1"
+    "@walletconnect/window-getters" "^1.0.1"
+    "@walletconnect/window-metadata" "^1.0.1"
+    detect-browser "^5.3.0"
+    query-string "^6.13.5"
+
+"@walletconnect/legacy-modal@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/legacy-modal/-/legacy-modal-2.0.0.tgz#d0fab01a1337a8f5d88cdb1430cbef2d46072bbf"
+  integrity sha512-jckNd8lMhm4X7dX9TDdxM3bXKJnaqkRs6K2Mo5j6GmbIF9Eyx40jZ5+q457RVxvM6ciZEDT5s1wBHWdWoOo+9Q==
+  dependencies:
+    "@walletconnect/legacy-types" "^2.0.0"
+    "@walletconnect/legacy-utils" "^2.0.0"
+    copy-to-clipboard "^3.3.3"
+    preact "^10.12.0"
+    qrcode "^1.5.1"
+
+"@walletconnect/legacy-provider@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/legacy-provider/-/legacy-provider-2.0.0.tgz#08e2db1e4c234743b2f30422bc8100bc42e8fc44"
+  integrity sha512-A8xPebMI1A+50HbWwTpFCbwP7G+1NGKdTKyg8BUUg3h3Y9JucpC1W6w/x0v1Xw7qFEqQnz74LoIN/A3ytH9xrQ==
+  dependencies:
+    "@walletconnect/jsonrpc-http-connection" "^1.0.4"
+    "@walletconnect/jsonrpc-provider" "^1.0.6"
+    "@walletconnect/legacy-client" "^2.0.0"
+    "@walletconnect/legacy-modal" "^2.0.0"
+    "@walletconnect/legacy-types" "^2.0.0"
+    "@walletconnect/legacy-utils" "^2.0.0"
+
+"@walletconnect/legacy-types@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/legacy-types/-/legacy-types-2.0.0.tgz#224278ae2874c6a2ca805c2d1d062a511dcf7227"
+  integrity sha512-sOVrA7HUdbI1OwKyPOQU0/DdvTSVFlsXWpAk2K2WvP2erTkBWPMTJq6cv2BmKdoJ3p6gLApT7sd+jHi3OF71uw==
+  dependencies:
+    "@walletconnect/jsonrpc-types" "^1.0.2"
+
+"@walletconnect/legacy-utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/legacy-utils/-/legacy-utils-2.0.0.tgz#e3a637c00783f9cd2ae139b640f82223ab78ed9d"
+  integrity sha512-CPWxSVVXw0kgNCxvU126g4GiV3mzXmC8IPJ15twE46aJ1FX+RHEIfAzFMFz2F2+fEhBxL63A7dwNQKDXorRPcQ==
+  dependencies:
+    "@walletconnect/encoding" "^1.0.2"
+    "@walletconnect/jsonrpc-utils" "^1.0.4"
+    "@walletconnect/legacy-types" "^2.0.0"
+    "@walletconnect/safe-json" "^1.0.1"
+    "@walletconnect/window-getters" "^1.0.1"
+    "@walletconnect/window-metadata" "^1.0.1"
+    detect-browser "^5.3.0"
+    query-string "^6.13.5"
+
+"@walletconnect/logger@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/logger/-/logger-2.0.1.tgz#7f489b96e9a1ff6bf3e58f0fbd6d69718bf844a8"
+  integrity sha512-SsTKdsgWm+oDTBeNE/zHxxr5eJfZmE9/5yp/Ku+zJtcTAjELb3DXueWkDXmE9h8uHIbJzIb5wj5lPdzyrjT6hQ==
+  dependencies:
+    pino "7.11.0"
+    tslib "1.14.1"
+
+"@walletconnect/modal-core@2.5.9":
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal-core/-/modal-core-2.5.9.tgz#45e0c25320d42855aaac39e6ba256a84f972b871"
+  integrity sha512-isIebwF9hOknGouhS/Ob4YJ9Sa/tqNYG2v6Ua9EkCqIoLimepkG5eC53tslUWW29SLSfQ9qqBNG2+iE7yQXqgw==
+  dependencies:
+    buffer "6.0.3"
+    valtio "1.10.6"
+
+"@walletconnect/modal-ui@2.5.9":
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal-ui/-/modal-ui-2.5.9.tgz#4d07f1697147ec9f75d85d93f564cadae05a5e59"
+  integrity sha512-nfBaAT9Ls7RZTBBgAq+Nt/3AoUcinIJ9bcq5UHXTV3lOPu/qCKmUC/0HY3GvUK8ykabUAsjr0OAGmcqkB91qug==
+  dependencies:
+    "@walletconnect/modal-core" "2.5.9"
+    lit "2.7.5"
+    motion "10.16.2"
+    qrcode "1.5.3"
+
+"@walletconnect/modal@2.5.9":
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.5.9.tgz#28840f2a46bcd0a47c5fda60d18a5f1607a92a72"
+  integrity sha512-Zs2RvPwbBNRdBhb50FuJCxi3FJltt1KSpI7odjU/x9GTpTOcSOkmR66PBCy2JvNA0+ztnS1Xs0LVEr3lu7/Jzw==
+  dependencies:
+    "@walletconnect/modal-core" "2.5.9"
+    "@walletconnect/modal-ui" "2.5.9"
 
 "@walletconnect/randombytes@^1.0.3":
   version "1.0.3"
@@ -8469,68 +8858,116 @@
     randombytes "^2.1.0"
     tslib "1.14.1"
 
-"@walletconnect/safe-json@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2"
-  integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg==
+"@walletconnect/relay-api@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@walletconnect/relay-api/-/relay-api-1.0.9.tgz#f8c2c3993dddaa9f33ed42197fc9bfebd790ecaf"
+  integrity sha512-Q3+rylJOqRkO1D9Su0DPE3mmznbAalYapJ9qmzDgK28mYF9alcP3UwG/og5V7l7CFOqzCLi7B8BvcBUrpDj0Rg==
+  dependencies:
+    "@walletconnect/jsonrpc-types" "^1.0.2"
+    tslib "1.14.1"
 
-"@walletconnect/socket-transport@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.8.0.tgz#9a1128a249628a0be11a0979b522fe82b44afa1b"
-  integrity sha512-5DyIyWrzHXTcVp0Vd93zJ5XMW61iDM6bcWT4p8DTRfFsOtW46JquruMhxOLeCOieM4D73kcr3U7WtyR4JUsGuQ==
+"@walletconnect/relay-auth@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz#0b5c55c9aa3b0ef61f526ce679f3ff8a5c4c2c7c"
+  integrity sha512-kKJcS6+WxYq5kshpPaxGHdwf5y98ZwbfuS4EE/NkQzqrDFm5Cj+dP8LofzWvjrrLkZq7Afy7WrQMXdLy8Sx7HQ==
   dependencies:
-    "@walletconnect/types" "^1.8.0"
-    "@walletconnect/utils" "^1.8.0"
-    ws "7.5.3"
+    "@stablelib/ed25519" "^1.0.2"
+    "@stablelib/random" "^1.0.1"
+    "@walletconnect/safe-json" "^1.0.1"
+    "@walletconnect/time" "^1.0.2"
+    tslib "1.14.1"
+    uint8arrays "^3.0.0"
 
-"@walletconnect/types@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195"
-  integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==
+"@walletconnect/safe-json@^1.0.1", "@walletconnect/safe-json@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.2.tgz#7237e5ca48046e4476154e503c6d3c914126fa77"
+  integrity sha512-Ogb7I27kZ3LPC3ibn8ldyUr5544t3/STow9+lzz7Sfo808YD7SBWk7SAsdBFlYgP2zDRy2hS3sKRcuSRM0OTmA==
+  dependencies:
+    tslib "1.14.1"
 
-"@walletconnect/utils@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.8.0.tgz#2591a197c1fa7429941fe428876088fda6632060"
-  integrity sha512-zExzp8Mj1YiAIBfKNm5u622oNw44WOESzo6hj+Q3apSMIb0Jph9X3GDIdbZmvVZsNPxWDL7uodKgZcCInZv2vA==
-  dependencies:
-    "@walletconnect/browser-utils" "^1.8.0"
-    "@walletconnect/encoding" "^1.0.1"
-    "@walletconnect/jsonrpc-utils" "^1.0.3"
-    "@walletconnect/types" "^1.8.0"
-    bn.js "4.11.8"
-    js-sha3 "0.8.0"
-    query-string "6.13.5"
+"@walletconnect/sign-client@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.9.0.tgz#fd3b0acb68bc8d56350f01ed70f8c6326e6e89fa"
+  integrity sha512-mEKc4LlLMebCe45qzqh+MX4ilQK4kOEBzLY6YJpG8EhyT45eX4JMNA7qQoYa9MRMaaVb/7USJcc4e3ZrjZvQmA==
+  dependencies:
+    "@walletconnect/core" "2.9.0"
+    "@walletconnect/events" "^1.0.1"
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-utils" "1.0.8"
+    "@walletconnect/logger" "^2.0.1"
+    "@walletconnect/time" "^1.0.2"
+    "@walletconnect/types" "2.9.0"
+    "@walletconnect/utils" "2.9.0"
+    events "^3.3.0"
 
-"@walletconnect/web3-provider@^1.7.1":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.8.0.tgz#e90d903f4c609b7158ecb5f0f41df121e93b56b5"
-  integrity sha512-lqqEO0oRmCehH+c8ZPk3iH7I7YtbzmkWd58/Or2AgWAl869JamzndKCD3sTlNsPRQLxxPpraHQqzur7uclLWvg==
+"@walletconnect/time@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/time/-/time-1.0.2.tgz#6c5888b835750ecb4299d28eecc5e72c6d336523"
+  integrity sha512-uzdd9woDcJ1AaBZRhqy5rNC9laqWGErfc4dxA9a87mPdKOgWMD85mcFo9dIYIts/Jwocfwn07EC6EzclKubk/g==
   dependencies:
-    "@walletconnect/client" "^1.8.0"
-    "@walletconnect/http-connection" "^1.8.0"
-    "@walletconnect/qrcode-modal" "^1.8.0"
-    "@walletconnect/types" "^1.8.0"
-    "@walletconnect/utils" "^1.8.0"
-    web3-provider-engine "16.0.1"
+    tslib "1.14.1"
 
-"@walletconnect/window-getters@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.0.tgz#1053224f77e725dfd611c83931b5f6c98c32bfc8"
-  integrity sha512-xB0SQsLaleIYIkSsl43vm8EwETpBzJ2gnzk7e0wMF3ktqiTGS6TFHxcprMl5R44KKh4tCcHCJwolMCaDSwtAaA==
+"@walletconnect/types@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.9.0.tgz#6e5dfdc7212c1ec4ab49a1ec409c743e16093f72"
+  integrity sha512-ORopsMfSRvUYqtjKKd6scfg8o4/aGebipLxx92AuuUgMTERSU6cGmIrK6rdLu7W6FBJkmngPLEGc9mRqAb9Lug==
+  dependencies:
+    "@walletconnect/events" "^1.0.1"
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-types" "1.0.3"
+    "@walletconnect/keyvaluestorage" "^1.0.2"
+    "@walletconnect/logger" "^2.0.1"
+    events "^3.3.0"
 
-"@walletconnect/window-getters@^1.0.0":
+"@walletconnect/universal-provider@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.9.0.tgz#a6b4a1f099262536e17b5c25bf7b3c89db9945a8"
+  integrity sha512-k3nkSBkF69sJJVoe17IVoPtnhp/sgaa2t+x7BvA/BKeMxE0DGdtRJdEXotTc8DBmI7o2tkq6l8+HyFBGjQ/CjQ==
+  dependencies:
+    "@walletconnect/jsonrpc-http-connection" "^1.0.7"
+    "@walletconnect/jsonrpc-provider" "1.0.13"
+    "@walletconnect/jsonrpc-types" "^1.0.2"
+    "@walletconnect/jsonrpc-utils" "^1.0.7"
+    "@walletconnect/logger" "^2.0.1"
+    "@walletconnect/sign-client" "2.9.0"
+    "@walletconnect/types" "2.9.0"
+    "@walletconnect/utils" "2.9.0"
+    events "^3.3.0"
+
+"@walletconnect/utils@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.9.0.tgz#c73925edb9fefe79021bcf028e957028f986b728"
+  integrity sha512-7Tu3m6dZL84KofrNBcblsgpSqU2vdo9ImLD7zWimLXERVGNQ8smXG+gmhQYblebIBhsPzjy9N38YMC3nPlfQNw==
+  dependencies:
+    "@stablelib/chacha20poly1305" "1.0.1"
+    "@stablelib/hkdf" "1.0.1"
+    "@stablelib/random" "^1.0.2"
+    "@stablelib/sha256" "1.0.1"
+    "@stablelib/x25519" "^1.0.3"
+    "@walletconnect/relay-api" "^1.0.9"
+    "@walletconnect/safe-json" "^1.0.2"
+    "@walletconnect/time" "^1.0.2"
+    "@walletconnect/types" "2.9.0"
+    "@walletconnect/window-getters" "^1.0.1"
+    "@walletconnect/window-metadata" "^1.0.1"
+    detect-browser "5.3.0"
+    query-string "7.1.3"
+    uint8arrays "^3.1.0"
+
+"@walletconnect/window-getters@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.1.tgz#f36d1c72558a7f6b87ecc4451fc8bd44f63cbbdc"
   integrity sha512-vHp+HqzGxORPAN8gY03qnbTMnhqIwjeRJNOMOAzePRg4xVEEE2WvYsI9G2NMjOknA8hnuYbU3/hwLcKbjhc8+Q==
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/window-metadata@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.0.tgz#93b1cc685e6b9b202f29c26be550fde97800c4e5"
-  integrity sha512-9eFvmJxIKCC3YWOL97SgRkKhlyGXkrHwamfechmqszbypFspaSk+t2jQXAEU7YClHF6Qjw5eYOmy1//zFi9/GA==
+"@walletconnect/window-metadata@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.1.tgz#2124f75447b7e989e4e4e1581d55d25bc75f7be5"
+  integrity sha512-9koTqyGrM2cqFRW517BPY/iEtUDx2r1+Pwwu5m7sJ7ka79wi3EyqhqcICk/yDmv6jAS1rjKgTKXlEhanYjijcA==
   dependencies:
-    "@walletconnect/window-getters" "^1.0.0"
+    "@walletconnect/window-getters" "^1.0.1"
+    tslib "1.14.1"
 
 "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
   version "1.11.6"
@@ -9000,25 +9437,24 @@
   dependencies:
     argparse "^2.0.1"
 
-"@zondax/ledger-substrate@^0.40.7":
-  version "0.40.7"
-  resolved "https://registry.yarnpkg.com/@zondax/ledger-substrate/-/ledger-substrate-0.40.7.tgz#e2909de326a43fa17649c177daef8244acd048e5"
-  integrity sha512-2Yttb5YydgpS2ZRu+mPE23SZCTnK8VPchd9vo1Neukv0YCQghJB5Ou+X69AN4elKs0VUc2FJd/j8SDmtuPEu9Q==
-  dependencies:
-    "@ledgerhq/hw-transport" "^6.27.1"
-    bip32 "^4.0.0"
-    bip32-ed25519 "https://github.com/Zondax/bip32-ed25519"
-    bip39 "^3.0.4"
-    blakejs "^1.2.1"
-    bs58 "^5.0.0"
-    chalk "^4.1.0"
-    hash.js "^1.1.7"
+JSONStream@^1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
 
 abab@^2.0.5, abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
+abitype@0.8.11:
+  version "0.8.11"
+  resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.8.11.tgz#66e1cf2cbf46f48d0e57132d7c1c392447536cc1"
+  integrity sha512-bM4v2dKvX08sZ9IU38IN5BKmN+ZkOSd2oI4a9f0ejHYZQYV6cDr7j+d95ga0z2XHG36Y4jzoG5Z7qDqxp7fi/A==
+
 abitype@0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.8.7.tgz#e4b3f051febd08111f486c0cc6a98fa72d033622"
@@ -9041,20 +9477,6 @@ abstract-leveldown@^7.2.0:
     level-supports "^2.0.1"
     queue-microtask "^1.2.3"
 
-abstract-leveldown@~2.6.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz#1c5e8c6a5ef965ae8c35dfb3a8770c476b82c4b8"
-  integrity sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==
-  dependencies:
-    xtend "~4.0.0"
-
-abstract-leveldown@~2.7.1:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz#87a44d7ebebc341d59665204834c8b7e0932cc93"
-  integrity sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==
-  dependencies:
-    xtend "~4.0.0"
-
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -9135,6 +9557,15 @@ agent-base@^7.0.2, agent-base@^7.1.0:
   dependencies:
     debug "^4.3.4"
 
+agentkeepalive@^4.2.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255"
+  integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==
+  dependencies:
+    debug "^4.1.0"
+    depd "^2.0.0"
+    humanize-ms "^1.2.1"
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -9221,11 +9652,6 @@ ansi-html-community@0.0.8, ansi-html-community@^0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -9236,7 +9662,7 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -9537,13 +9963,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-eventemitter@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/async-eventemitter/-/async-eventemitter-0.2.4.tgz#f5e7c8ca7d3e46aab9ec40a292baf686a0bafaca"
-  integrity sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==
-  dependencies:
-    async "^2.4.0"
-
 async-limiter@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
@@ -9556,12 +9975,7 @@ async-mutex@^0.2.6:
   dependencies:
     tslib "^2.0.0"
 
-async@^1.4.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==
-
-async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.4:
+async@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
   integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
@@ -9588,6 +10002,11 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+atomic-sleep@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
+  integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
+
 attr-accept@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
@@ -9926,13 +10345,6 @@ babyjubjub@^1.0.4:
     bignumber.js "^9.0.0"
     buffer-reverse "^1.0.1"
 
-backoff@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"
-  integrity sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==
-  dependencies:
-    precond "0.2"
-
 bail@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
@@ -9950,11 +10362,6 @@ base-x@^3.0.2, base-x@^3.0.8:
   dependencies:
     safe-buffer "^5.0.1"
 
-base-x@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
-  integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
-
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -10016,6 +10423,13 @@ big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
+bigint-buffer@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/bigint-buffer/-/bigint-buffer-1.1.5.tgz#d038f31c8e4534c1f8d0015209bf34b4fa6dd442"
+  integrity sha512-trfYco6AoZ+rKhKnxA0hgX0HAbVP/s808/EuDSe2JDzUnCp/xAsli35Orvk67UrTEcwuxZqYZDmfA2RXJgxVvA==
+  dependencies:
+    bindings "^1.3.0"
+
 bignumber.js@^8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.1.1.tgz#4b072ae5aea9c20f6730e4e5d529df1271c4d885"
@@ -10031,38 +10445,18 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bindings@^1.5.0:
+bind-decorator@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/bind-decorator/-/bind-decorator-1.0.11.tgz#e41bc06a1f65dd9cec476c91c5daf3978488252f"
+  integrity sha512-yzkH0uog6Vv/vQ9+rhSKxecnqGUZHYncg7qS7voz3Q76+TAi1SGiOKk2mlOvusQnFz9Dc4BC/NMkeXu11YgjJg==
+
+bindings@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
   integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
   dependencies:
     file-uri-to-path "1.0.0"
 
-"bip32-ed25519@https://github.com/Zondax/bip32-ed25519":
-  version "0.0.4"
-  resolved "https://github.com/Zondax/bip32-ed25519#0949df01b5c93885339bc28116690292088f6134"
-  dependencies:
-    bn.js "^5.1.1"
-    elliptic "^6.4.1"
-    hash.js "^1.1.7"
-
-bip32@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/bip32/-/bip32-4.0.0.tgz#7fac3c05072188d2d355a4d6596b37188f06aa2f"
-  integrity sha512-aOGy88DDlVUhspIXJN+dVEtclhIsfAUppD43V0j40cPTld3pv/0X/MlrZSZ6jowIaQQzFwP8M6rFU2z2mVYjDQ==
-  dependencies:
-    "@noble/hashes" "^1.2.0"
-    "@scure/base" "^1.1.1"
-    typeforce "^1.11.5"
-    wif "^2.0.6"
-
-bip39@^3.0.4:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.1.0.tgz#c55a418deaf48826a6ceb34ac55b3ee1577e18a3"
-  integrity sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==
-  dependencies:
-    "@noble/hashes" "^1.2.0"
-
 bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -10097,7 +10491,7 @@ blake2b@^2.1.3:
     blake2b-wasm "^2.4.0"
     nanoassert "^2.0.0"
 
-blakejs@^1.1.0, blakejs@^1.2.1:
+blakejs@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814"
   integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==
@@ -10117,12 +10511,7 @@ bn.js@4.11.6:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
   integrity sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==
 
-bn.js@4.11.8:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.12.0:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.6, bn.js@^4.11.9, bn.js@^4.12.0:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
@@ -10183,6 +10572,15 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+borsh@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/borsh/-/borsh-0.7.0.tgz#6e9560d719d86d90dc589bca60ffc8a6c51fec2a"
+  integrity sha512-CLCsZGIBCFnPtkNnieW/a8wmreDmfUtjU2m9yHrzPXIlNbqVs0AQrSatSG6vdNYUqdc83tkQi2eHfF98ubzQLA==
+  dependencies:
+    bn.js "^5.2.0"
+    bs58 "^4.0.0"
+    text-encoding-utf-8 "^1.0.2"
+
 boxen@^5.0.0, boxen@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
@@ -10321,20 +10719,13 @@ bs-logger@0.x:
   dependencies:
     fast-json-stable-stringify "2.x"
 
-bs58@^4.0.0:
+bs58@^4.0.0, bs58@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
   integrity sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==
   dependencies:
     base-x "^3.0.2"
 
-bs58@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/bs58/-/bs58-5.0.0.tgz#865575b4d13c09ea2a84622df6c8cbeb54ffc279"
-  integrity sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==
-  dependencies:
-    base-x "^4.0.0"
-
 bs58check@<3.0.0, bs58check@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
@@ -10351,35 +10742,12 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-btoa@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
-  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
-
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
-
-buffer-from@^1.0.0, buffer-from@^1.1.1:
+buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
@@ -10399,15 +10767,7 @@ buffer-xor@^1.0.3:
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
   integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
 
-buffer@^5.0.5, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-buffer@^6.0.3:
+buffer@6.0.3, buffer@^6.0.3, buffer@~6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
   integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
@@ -10415,6 +10775,14 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
+buffer@^5.0.5, buffer@^5.5.0, buffer@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 bufferutil@4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.5.tgz#da9ea8166911cc276bf677b8aed2d02d31f59028"
@@ -10754,13 +11122,6 @@ check-types@^11.1.1:
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.2.2.tgz#7afc0b6a860d686885062f2dba888ba5710335b4"
   integrity sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA==
 
-checkpoint-store@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/checkpoint-store/-/checkpoint-store-1.1.0.tgz#04e4cb516b91433893581e6d4601a78e9552ea06"
-  integrity sha512-J/NdY2WvIx654cc6LWSq/IYFFCUf75fFTgwzFnmbqyORH4MwgiQCgswLLKBGzmsyTI5V7i5bp/So6sMbDWhedg==
-  dependencies:
-    functional-red-black-tree "^1.0.1"
-
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.5.1, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -10950,15 +11311,6 @@ clipboardy@^3.0.0:
     execa "^5.1.1"
     is-wsl "^2.2.0"
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -11007,11 +11359,6 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clone@^2.0.0, clone@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
-
 clsx@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
@@ -11283,11 +11630,6 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-cookiejar@^2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
-  integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==
-
 copy-anything@^2.0.1:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
@@ -11295,7 +11637,7 @@ copy-anything@^2.0.1:
   dependencies:
     is-what "^3.14.1"
 
-copy-to-clipboard@^3.3.1, copy-to-clipboard@^3.3.2:
+copy-to-clipboard@^3.3.1, copy-to-clipboard@^3.3.2, copy-to-clipboard@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
   integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
@@ -11454,14 +11796,6 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-fetch@^2.1.0:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a"
-  integrity sha512-9JZz+vXCmfKUZ68zAptS7k4Nu8e2qcibe7WVZYps7sAgk5R8GYTc+T1WR0v1rlP9HxgARmOX1UTIJZFytajpNA==
-  dependencies:
-    node-fetch "^2.6.7"
-    whatwg-fetch "^2.0.4"
-
 cross-fetch@^3.1.4, cross-fetch@^3.1.5:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
@@ -12077,7 +12411,7 @@ decode-named-character-reference@^1.0.0:
   dependencies:
     character-entities "^2.0.0"
 
-decode-uri-component@^0.2.0:
+decode-uri-component@^0.2.0, decode-uri-component@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
@@ -12189,13 +12523,6 @@ defer-to-connect@^2.0.0, defer-to-connect@^2.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
   integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
 
-deferred-leveldown@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz#3acd2e0b75d1669924bc0a4b642851131173e1eb"
-  integrity sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==
-  dependencies:
-    abstract-leveldown "~2.6.0"
-
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -12233,6 +12560,11 @@ del@^6.0.0:
     rimraf "^3.0.2"
     slash "^3.0.0"
 
+delay@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
+  integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -12248,7 +12580,7 @@ denque@^2.1.0:
   resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
 
-depd@2.0.0:
+depd@2.0.0, depd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -12307,12 +12639,7 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-detect-browser@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97"
-  integrity sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA==
-
-detect-browser@^5.2.0:
+detect-browser@5.3.0, detect-browser@^5.2.0, detect-browser@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca"
   integrity sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w==
@@ -12725,7 +13052,7 @@ duplexify@^3.5.0, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-duplexify@^4.1.1:
+duplexify@^4.1.1, duplexify@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
   integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
@@ -12774,7 +13101,7 @@ electron-to-chromium@^1.4.431:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.449.tgz#79ffe4514c81c35d4eb13030a63ff3383a8cc655"
   integrity sha512-TxLRpRUj/107ATefeP8VIUWNOv90xJxZZbCW/eIbSZQiuiFANCx2b7u+GbVc9X4gU+xnbvypNMYVM/WArE1DNQ==
 
-elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.4.1, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4:
+elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
   integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
@@ -12802,11 +13129,6 @@ emittery@^0.13.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -12822,6 +13144,11 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
+encode-utf8@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
+  integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -12873,7 +13200,7 @@ envinfo@^7.7.3:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
   integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
 
-errno@^0.1.1, errno@~0.1.1:
+errno@^0.1.1:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
   integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
@@ -13002,11 +13329,18 @@ es6-object-assign@^1.1.0:
   resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
   integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==
 
-es6-promise@^4.2.8:
+es6-promise@^4.0.3, es6-promise@^4.2.8:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==
+  dependencies:
+    es6-promise "^4.0.3"
+
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
@@ -13543,17 +13877,15 @@ etag@^1.8.1, etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
-eth-block-tracker@^4.4.2:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-4.4.3.tgz#766a0a0eb4a52c867a28328e9ae21353812cf626"
-  integrity sha512-A8tG4Z4iNg4mw5tP1Vung9N9IjgMNqpiMoJ/FouSFwNCGHv2X0mmOYwtQOJzki6XN7r7Tyo01S29p7b224I4jw==
+eth-block-tracker@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-6.1.0.tgz#0481f97bbb88a100b9d45806fe7e37af741cbefc"
+  integrity sha512-K9SY8+/xMBi4M5HHTDdxnpEqEEGjbNpzHFqvxyjMZej8InV/B+CkFRKM6W+uvrFJ7m8Zd1E0qUkseU3vdIDFYQ==
   dependencies:
-    "@babel/plugin-transform-runtime" "^7.5.5"
-    "@babel/runtime" "^7.5.5"
-    eth-query "^2.1.0"
+    "@metamask/safe-event-emitter" "^2.0.0"
+    "@metamask/utils" "^3.0.1"
     json-rpc-random-id "^1.0.1"
     pify "^3.0.0"
-    safe-event-emitter "^1.0.1"
 
 eth-ens-namehash@2.0.8:
   version "2.0.8"
@@ -13563,45 +13895,17 @@ eth-ens-namehash@2.0.8:
     idna-uts46-hx "^2.3.1"
     js-sha3 "^0.5.7"
 
-eth-json-rpc-filters@^4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz#eb35e1dfe9357ace8a8908e7daee80b2cd60a10d"
-  integrity sha512-DGtqpLU7bBg63wPMWg1sCpkKCf57dJ+hj/k3zF26anXMzkmtSBDExL8IhUu7LUd34f0Zsce3PYNO2vV2GaTzaw==
+eth-json-rpc-filters@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-5.1.0.tgz#f0c2aeaec2a45e2dc6ca1b9843d8e85447821427"
+  integrity sha512-fos+9xmoa1A2Ytsc9eYof17r81BjdJOUcGcgZn4K/tKdCCTb+a8ytEtwlu1op5qsXFDlgGmstTELFrDEc89qEQ==
   dependencies:
     "@metamask/safe-event-emitter" "^2.0.0"
     async-mutex "^0.2.6"
-    eth-json-rpc-middleware "^6.0.0"
     eth-query "^2.1.2"
     json-rpc-engine "^6.1.0"
     pify "^5.0.0"
 
-eth-json-rpc-infura@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-5.1.0.tgz#e6da7dc47402ce64c54e7018170d89433c4e8fb6"
-  integrity sha512-THzLye3PHUSGn1EXMhg6WTLW9uim7LQZKeKaeYsS9+wOBcamRiCQVGHa6D2/4P0oS0vSaxsBnU/J6qvn0MPdow==
-  dependencies:
-    eth-json-rpc-middleware "^6.0.0"
-    eth-rpc-errors "^3.0.0"
-    json-rpc-engine "^5.3.0"
-    node-fetch "^2.6.0"
-
-eth-json-rpc-middleware@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-6.0.0.tgz#4fe16928b34231a2537856f08a5ebbc3d0c31175"
-  integrity sha512-qqBfLU2Uq1Ou15Wox1s+NX05S9OcAEL4JZ04VZox2NS0U+RtCMjSxzXhLFWekdShUPZ+P8ax3zCO2xcPrp6XJQ==
-  dependencies:
-    btoa "^1.2.1"
-    clone "^2.1.1"
-    eth-query "^2.1.2"
-    eth-rpc-errors "^3.0.0"
-    eth-sig-util "^1.4.2"
-    ethereumjs-util "^5.1.2"
-    json-rpc-engine "^5.3.0"
-    json-stable-stringify "^1.0.1"
-    node-fetch "^2.6.1"
-    pify "^3.0.0"
-    safe-event-emitter "^1.0.1"
-
 eth-lib@0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.8.tgz#b194058bef4b220ad12ea497431d6cb6aa0623c8"
@@ -13623,7 +13927,7 @@ eth-lib@^0.1.26:
     ws "^3.0.0"
     xhr-request-promise "^0.1.2"
 
-eth-query@^2.1.0, eth-query@^2.1.2:
+eth-query@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.2.tgz#d6741d9000106b51510c72db92d6365456a6da5e"
   integrity sha512-srES0ZcvwkR/wd5OQBRA1bIJMww1skfGS0s8wlwK3/oNP4+wnds60krvu5R1QbpRQjMmpG5OMIWro5s7gvDPsA==
@@ -13631,28 +13935,20 @@ eth-query@^2.1.0, eth-query@^2.1.2:
     json-rpc-random-id "^1.0.0"
     xtend "^4.0.1"
 
-eth-rpc-errors@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz#d7b22653c70dbf9defd4ef490fd08fe70608ca10"
-  integrity sha512-iPPNHPrLwUlR9xCSYm7HHQjWBasor3+KZfRvwEWxMz3ca0yqnlBeJrnyphkGIXZ4J7AMAaOLmwy4AWhnxOiLxg==
+eth-rpc-errors@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.2.tgz#11bc164e25237a679061ac05b7da7537b673d3b7"
+  integrity sha512-n+Re6Gu8XGyfFy1it0AwbD1x0MUzspQs0D5UiPs1fFPCr6WAwZM+vbIhXheBFrpgosqN9bs5PqlB4Q61U/QytQ==
   dependencies:
     fast-safe-stringify "^2.0.6"
 
-eth-rpc-errors@^4.0.2, eth-rpc-errors@^4.0.3:
+eth-rpc-errors@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a"
   integrity sha512-Z3ymjopaoft7JDoxZcEb3pwdGh7yiYMhOwm2doUt6ASXlMavpNlK6Cre0+IMl2VSGyEU9rkiperQhp5iRxn5Pg==
   dependencies:
     fast-safe-stringify "^2.0.6"
 
-eth-sig-util@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.2.tgz#8d958202c7edbaae839707fba6f09ff327606210"
-  integrity sha512-iNZ576iTOGcfllftB73cPB5AN+XUQAT/T8xzsILsghXC1o8gJUqe3RHlcDqagu+biFpYQ61KQrZZJza8eRSYqw==
-  dependencies:
-    ethereumjs-abi "git+https://github.com/ethereumjs/ethereumjs-abi.git"
-    ethereumjs-util "^5.1.1"
-
 ethereum-blockies-base64@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ethereum-blockies-base64/-/ethereum-blockies-base64-1.0.2.tgz#4aebca52142bf4d16a3144e6e2b59303e39ed2b3"
@@ -13667,16 +13963,6 @@ ethereum-bloom-filters@^1.0.6:
   dependencies:
     js-sha3 "^0.8.0"
 
-ethereum-common@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.2.0.tgz#13bf966131cce1eeade62a1b434249bb4cb120ca"
-  integrity sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==
-
-ethereum-common@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
-  integrity sha512-EoltVQTRNg2Uy4o84qpa2aXymXDJhxm7eos/ACOg0DG4baAbMjhbdAEsx9GeE8sC3XCxnYvrrzZDH8D8MtA2iQ==
-
 ethereum-cryptography@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz#8d6143cfc3d74bf79bbd8edecdf29e4ae20dd191"
@@ -13694,104 +13980,19 @@ ethereum-cryptography@^0.1.3:
     pbkdf2 "^3.0.17"
     randombytes "^2.1.0"
     safe-buffer "^5.1.2"
-    scrypt-js "^3.0.0"
-    secp256k1 "^4.0.1"
-    setimmediate "^1.0.5"
-
-ethereum-cryptography@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-2.0.0.tgz#e052b49fa81affae29402e977b8d3a31f88612b6"
-  integrity sha512-g25m4EtfQGjstWgVE1aIz7XYYjf3kH5kG17ULWVB5dH6uLahsoltOhACzSxyDV+fhn4gbR4xRrOXGe6r2uh4Bg==
-  dependencies:
-    "@noble/curves" "1.0.0"
-    "@noble/hashes" "1.3.0"
-    "@scure/bip32" "1.3.0"
-    "@scure/bip39" "1.2.0"
-
-"ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
-  version "0.6.8"
-  resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0"
-  dependencies:
-    bn.js "^4.11.8"
-    ethereumjs-util "^6.0.0"
-
-ethereumjs-account@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz#eeafc62de544cb07b0ee44b10f572c9c49e00a84"
-  integrity sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==
-  dependencies:
-    ethereumjs-util "^5.0.0"
-    rlp "^2.0.0"
-    safe-buffer "^5.1.1"
-
-ethereumjs-block@^1.2.2:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz#78b88e6cc56de29a6b4884ee75379b6860333c3f"
-  integrity sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==
-  dependencies:
-    async "^2.0.1"
-    ethereum-common "0.2.0"
-    ethereumjs-tx "^1.2.2"
-    ethereumjs-util "^5.0.0"
-    merkle-patricia-tree "^2.1.2"
-
-ethereumjs-block@~2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz#c7654be7e22df489fda206139ecd63e2e9c04965"
-  integrity sha512-2p49ifhek3h2zeg/+da6XpdFR3GlqY3BIEiqxGF8j9aSRIgkb7M1Ky+yULBKJOu8PAZxfhsYA+HxUk2aCQp3vg==
-  dependencies:
-    async "^2.0.1"
-    ethereumjs-common "^1.5.0"
-    ethereumjs-tx "^2.1.1"
-    ethereumjs-util "^5.0.0"
-    merkle-patricia-tree "^2.1.2"
-
-ethereumjs-common@^1.1.0, ethereumjs-common@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz#2065dbe9214e850f2e955a80e650cb6999066979"
-  integrity sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA==
-
-ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz#88323a2d875b10549b8347e09f4862b546f3d89a"
-  integrity sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==
-  dependencies:
-    ethereum-common "^0.0.18"
-    ethereumjs-util "^5.0.0"
-
-ethereumjs-tx@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz#5dfe7688bf177b45c9a23f86cf9104d47ea35fed"
-  integrity sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==
-  dependencies:
-    ethereumjs-common "^1.5.0"
-    ethereumjs-util "^6.0.0"
-
-ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.5:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz#a833f0e5fca7e5b361384dc76301a721f537bf65"
-  integrity sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==
-  dependencies:
-    bn.js "^4.11.0"
-    create-hash "^1.1.2"
-    elliptic "^6.5.2"
-    ethereum-cryptography "^0.1.3"
-    ethjs-util "^0.1.3"
-    rlp "^2.0.0"
-    safe-buffer "^5.1.1"
+    scrypt-js "^3.0.0"
+    secp256k1 "^4.0.1"
+    setimmediate "^1.0.5"
 
-ethereumjs-util@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz#fcb4e4dd5ceacb9d2305426ab1a5cd93e3163b69"
-  integrity sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==
+ethereum-cryptography@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-2.0.0.tgz#e052b49fa81affae29402e977b8d3a31f88612b6"
+  integrity sha512-g25m4EtfQGjstWgVE1aIz7XYYjf3kH5kG17ULWVB5dH6uLahsoltOhACzSxyDV+fhn4gbR4xRrOXGe6r2uh4Bg==
   dependencies:
-    "@types/bn.js" "^4.11.3"
-    bn.js "^4.11.0"
-    create-hash "^1.1.2"
-    elliptic "^6.5.2"
-    ethereum-cryptography "^0.1.3"
-    ethjs-util "0.1.6"
-    rlp "^2.2.3"
+    "@noble/curves" "1.0.0"
+    "@noble/hashes" "1.3.0"
+    "@scure/bip32" "1.3.0"
+    "@scure/bip39" "1.2.0"
 
 ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5:
   version "7.1.5"
@@ -13804,23 +14005,6 @@ ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereum
     ethereum-cryptography "^0.1.3"
     rlp "^2.2.4"
 
-ethereumjs-vm@^2.3.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz#76243ed8de031b408793ac33907fb3407fe400c6"
-  integrity sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==
-  dependencies:
-    async "^2.1.2"
-    async-eventemitter "^0.2.2"
-    ethereumjs-account "^2.0.3"
-    ethereumjs-block "~2.2.0"
-    ethereumjs-common "^1.1.0"
-    ethereumjs-util "^6.0.0"
-    fake-merkle-patricia-tree "^1.0.1"
-    functional-red-black-tree "^1.0.1"
-    merkle-patricia-tree "^2.3.2"
-    rustbn.js "~0.2.0"
-    safe-buffer "^5.1.1"
-
 ethers@5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.0.tgz#0055da174b9e076b242b8282638bc94e04b39835"
@@ -13901,7 +14085,7 @@ ethjs-unit@0.1.6:
     bn.js "4.11.6"
     number-to-bn "1.7.0"
 
-ethjs-util@0.1.6, ethjs-util@^0.1.3, ethjs-util@^0.1.6:
+ethjs-util@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.6.tgz#f308b62f185f9fe6237132fb2a9818866a5cd536"
   integrity sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==
@@ -13919,7 +14103,7 @@ eventemitter3@4.0.4:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
   integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
 
-eventemitter3@4.0.7, eventemitter3@^4.0.0, eventemitter3@^4.0.1, eventemitter3@^4.0.4, eventemitter3@^4.0.7:
+eventemitter3@^4.0.0, eventemitter3@^4.0.1, eventemitter3@^4.0.4, eventemitter3@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
@@ -13929,7 +14113,7 @@ eventemitter3@^5.0.1:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
   integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
 
-events@^3.0.0, events@^3.2.0, events@^3.3.0:
+events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -14115,12 +14299,10 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
-fake-merkle-patricia-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fake-merkle-patricia-tree/-/fake-merkle-patricia-tree-1.0.1.tgz#4b8c3acfb520afadf9860b1f14cd8ce3402cddd3"
-  integrity sha512-Tgq37lkc9pUIgIKw5uitNUKcgcYL3R6JvXtKQbOf/ZSavXbidsksgp/pAY6p//uhw0I4yoMsvTSovvVIsk/qxA==
-  dependencies:
-    checkpoint-store "^1.1.0"
+eyes@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+  integrity sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==
 
 fast-decode-uri-component@^1.0.1:
   version "1.0.1"
@@ -14191,6 +14373,11 @@ fast-querystring@^1.1.1:
   dependencies:
     fast-decode-uri-component "^1.0.1"
 
+fast-redact@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.2.0.tgz#b1e2d39bc731376d28bde844454fa23e26919987"
+  integrity sha512-zaTadChr+NekyzallAMXATXLOR8MNx3zqpZ0MUF2aGf4EathnG0f32VLODNlY8IuGY3HoRO2L6/6fSzNsLaHIw==
+
 fast-safe-stringify@^2.0.6:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
@@ -14201,6 +14388,11 @@ fast-shallow-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b"
   integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==
 
+fast-stable-stringify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-stable-stringify/-/fast-stable-stringify-1.0.0.tgz#5c5543462b22aeeefd36d05b34e51c78cb86d313"
+  integrity sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag==
+
 fast-url-parser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
@@ -14397,6 +14589,11 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+filter-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
+  integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==
+
 finalhandler@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
@@ -14716,11 +14913,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
 functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -15485,6 +15677,11 @@ header-case@^2.0.4:
     capital-case "^1.0.4"
     tslib "^2.0.3"
 
+hey-listen@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68"
+  integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==
+
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -15783,6 +15980,13 @@ human-signals@^4.3.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"
   integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==
 
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
+  dependencies:
+    ms "^2.0.0"
+
 hyphenate-style-name@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
@@ -15853,11 +16057,6 @@ image-size@~0.5.0:
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
 
-immediate@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266"
-  integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==
-
 immutable@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
@@ -15936,7 +16135,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -16206,16 +16405,6 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-is-fn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fn/-/is-fn-1.0.0.tgz#9543d5de7bcf5b08a22ec8a20bae6e286d510d8c"
-  integrity sha512-XoFPJQmsAShb3jEQRfzf2rqXavq7fIqF/jOekp308JlThqrODnMpweVSGilKTCXELfLhltGP2AGgbQGVP8F1dg==
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -16549,12 +16738,7 @@ is-yarn-global@^0.3.0:
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
-
-isarray@^2.0.1, isarray@^2.0.5:
+isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
@@ -16587,6 +16771,11 @@ isomorphic-ws@5.0.0, isomorphic-ws@^5.0.0:
   resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf"
   integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==
 
+isomorphic-ws@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
+  integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -16644,6 +16833,24 @@ jake@^10.8.5:
     filelist "^1.0.4"
     minimatch "^3.1.2"
 
+jayson@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/jayson/-/jayson-4.1.0.tgz#60dc946a85197317f2b1439d672a8b0a99cea2f9"
+  integrity sha512-R6JlbyLN53Mjku329XoRT2zJAE6ZgOQ8f91ucYdMCD4nkGCF9kZSrcGXpHIU4jeKj58zUZke2p+cdQchU7Ly7A==
+  dependencies:
+    "@types/connect" "^3.4.33"
+    "@types/node" "^12.12.54"
+    "@types/ws" "^7.4.4"
+    JSONStream "^1.3.5"
+    commander "^2.20.3"
+    delay "^5.0.0"
+    es6-promisify "^5.0.0"
+    eyes "^0.1.8"
+    isomorphic-ws "^4.0.1"
+    json-stringify-safe "^5.0.1"
+    uuid "^8.3.2"
+    ws "^7.4.5"
+
 jdenticon@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jdenticon/-/jdenticon-3.2.0.tgz#b5b9ef413cb66f70c600d6e69a764c977f248a46"
@@ -17229,15 +17436,7 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json-rpc-engine@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.4.0.tgz#75758609d849e1dba1e09021ae473f3ab63161e5"
-  integrity sha512-rAffKbPoNDjuRnXkecTjnsE3xLLrb00rEkdgalINhaYVYIxDwWtvYBr9UFbhTvPB1B2qUOLoFd/cV6f4Q7mh7g==
-  dependencies:
-    eth-rpc-errors "^3.0.0"
-    safe-event-emitter "^1.0.1"
-
-json-rpc-engine@^6.1.0:
+json-rpc-engine@6.1.0, json-rpc-engine@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-6.1.0.tgz#bf5ff7d029e1c1bf20cb6c0e9f348dcd8be5a393"
   integrity sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ==
@@ -17328,6 +17527,11 @@ jsonify@^0.0.1:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
   integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
 
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
+
 jsprim@^1.2.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
@@ -17379,7 +17583,7 @@ keccak@3.0.2:
     node-gyp-build "^4.2.0"
     readable-stream "^3.6.0"
 
-keccak@^3.0.0:
+keccak@^3.0.0, keccak@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276"
   integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ==
@@ -17492,11 +17696,6 @@ less@4.1.3:
     needle "^3.1.0"
     source-map "~0.6.0"
 
-level-codec@~7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-7.0.1.tgz#341f22f907ce0f16763f24bddd681e395a0fb8a7"
-  integrity sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==
-
 level-concat-iterator@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/level-concat-iterator/-/level-concat-iterator-3.1.0.tgz#5235b1f744bc34847ed65a50548aa88d22e881cf"
@@ -17504,43 +17703,11 @@ level-concat-iterator@^3.0.0:
   dependencies:
     catering "^2.1.0"
 
-level-errors@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-1.1.2.tgz#4399c2f3d3ab87d0625f7e3676e2d807deff404d"
-  integrity sha512-Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==
-  dependencies:
-    errno "~0.1.1"
-
-level-errors@~1.0.3:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-1.0.5.tgz#83dbfb12f0b8a2516bdc9a31c4876038e227b859"
-  integrity sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==
-  dependencies:
-    errno "~0.1.1"
-
-level-iterator-stream@~1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz#e43b78b1a8143e6fa97a4f485eb8ea530352f2ed"
-  integrity sha512-1qua0RHNtr4nrZBgYlpV0qHHeHpcRRWTxEZJ8xsemoHAXNL5tbooh4tPEEqIqsbWCAJBmUmkwYK/sW5OrFjWWw==
-  dependencies:
-    inherits "^2.0.1"
-    level-errors "^1.0.3"
-    readable-stream "^1.0.33"
-    xtend "^4.0.0"
-
 level-supports@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-2.1.0.tgz#9af908d853597ecd592293b2fad124375be79c5f"
   integrity sha512-E486g1NCjW5cF78KGPrMDRBYzPuueMZ6VBXHT6gC7A8UYWGiM14fGgp+s/L1oFfDWSPV/+SFkYCmZ0SiESkRKA==
 
-level-ws@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/level-ws/-/level-ws-0.0.0.tgz#372e512177924a00424b0b43aef2bb42496d228b"
-  integrity sha512-XUTaO/+Db51Uiyp/t7fCMGVFOTdtLS/NIACxE/GHsij15mKzxksZifKVjlXDF41JMUP/oM1Oc4YNGdKnc3dVLw==
-  dependencies:
-    readable-stream "~1.0.15"
-    xtend "~2.1.1"
-
 leveldown@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee"
@@ -17550,19 +17717,6 @@ leveldown@6.1.0:
     napi-macros "~2.0.0"
     node-gyp-build "^4.3.0"
 
-levelup@^1.2.1:
-  version "1.3.9"
-  resolved "https://registry.yarnpkg.com/levelup/-/levelup-1.3.9.tgz#2dbcae845b2bb2b6bea84df334c475533bbd82ab"
-  integrity sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==
-  dependencies:
-    deferred-leveldown "~1.2.1"
-    level-codec "~7.0.0"
-    level-errors "~1.0.3"
-    level-iterator-stream "~1.3.0"
-    prr "~1.0.1"
-    semver "~5.4.1"
-    xtend "~4.0.0"
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -17657,6 +17811,31 @@ listr2@^6.6.0:
     rfdc "^1.3.0"
     wrap-ansi "^8.1.0"
 
+lit-element@^3.3.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.3.2.tgz#9913bf220b85065f0e5f1bb8878cc44f36b50cfa"
+  integrity sha512-xXAeVWKGr4/njq0rGC9dethMnYCq5hpKYrgQZYTzawt9YQhMiXfD+T1RgrdY3NamOxwq2aXlb0vOI6e29CKgVQ==
+  dependencies:
+    "@lit-labs/ssr-dom-shim" "^1.1.0"
+    "@lit/reactive-element" "^1.3.0"
+    lit-html "^2.7.0"
+
+lit-html@^2.7.0:
+  version "2.7.5"
+  resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.7.5.tgz#0c1b9d381abe20c01475ae53ea4b07bf4c923eb8"
+  integrity sha512-YqUzpisJodwKIlbMFCtyrp58oLloKGnnPLMJ1t23cbfIJjg/H9pvLWK4XS69YeubK5HUs1UE4ys9w5dP1zg6IA==
+  dependencies:
+    "@types/trusted-types" "^2.0.2"
+
+lit@2.7.5:
+  version "2.7.5"
+  resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.5.tgz#60bc82990cfad169d42cd786999356dcf79b035f"
+  integrity sha512-i/cH7Ye6nBDUASMnfwcictBnsTN91+aBjXoTHF2xARghXScKxpD4F4WYI+VLXg9lqbMinDfvoI7VnZXjyHgdfQ==
+  dependencies:
+    "@lit/reactive-element" "^1.6.0"
+    lit-element "^3.3.0"
+    lit-html "^2.7.0"
+
 load-json-file@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
@@ -17737,6 +17916,11 @@ lodash.isarguments@^3.1.0:
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
   integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
 
+lodash.isequal@4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
 lodash.memoize@4.x, lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -17882,11 +18066,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-ltgt@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
-  integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==
-
 lz-string@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
@@ -18204,18 +18383,6 @@ mem@^9.0.2:
     map-age-cleaner "^0.1.3"
     mimic-fn "^4.0.0"
 
-memdown@^1.0.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215"
-  integrity sha512-iVrGHZB8i4OQfM155xx8akvG9FIj+ht14DX5CQkCTG4EHzZ3d3sgckIf/Lm9ivZalEsFuEVnWv2B2WZvbrro2w==
-  dependencies:
-    abstract-leveldown "~2.7.1"
-    functional-red-black-tree "^1.0.1"
-    immediate "^3.2.3"
-    inherits "~2.0.1"
-    ltgt "~2.2.0"
-    safe-buffer "~5.1.1"
-
 memfs@^3.4.1, memfs@^3.4.3:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
@@ -18257,20 +18424,6 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz#982ca1b5a0fde00eed2f6aeed1f9152860b8208a"
-  integrity sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==
-  dependencies:
-    async "^1.4.2"
-    ethereumjs-util "^5.0.0"
-    level-ws "0.0.0"
-    levelup "^1.2.1"
-    memdown "^1.0.0"
-    readable-stream "^2.0.0"
-    rlp "^2.0.0"
-    semaphore ">=1.0.1"
-
 meros@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/meros/-/meros-1.3.0.tgz#c617d2092739d55286bf618129280f362e6242f2"
@@ -18822,6 +18975,18 @@ moize@^6.1.0:
     fast-equals "^3.0.1"
     micro-memoize "^4.1.2"
 
+motion@10.16.2:
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/motion/-/motion-10.16.2.tgz#7dc173c6ad62210a7e9916caeeaf22c51e598d21"
+  integrity sha512-p+PurYqfUdcJZvtnmAqu5fJgV2kR0uLFQuBKtLeFVTrYEVllI99tiOTSefVNYuip9ELTEkepIIDftNdze76NAQ==
+  dependencies:
+    "@motionone/animation" "^10.15.1"
+    "@motionone/dom" "^10.16.2"
+    "@motionone/svelte" "^10.16.2"
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    "@motionone/vue" "^10.16.2"
+
 mri@^1.1.0, mri@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
@@ -18847,7 +19012,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -18891,6 +19056,11 @@ multicodec@^1.0.0:
     buffer "^5.6.0"
     varint "^5.0.0"
 
+multiformats@^9.4.2:
+  version "9.9.0"
+  resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-9.9.0.tgz#c68354e7d21037a8f1f8833c8ccd68618e8f1d37"
+  integrity sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==
+
 multihashes@^0.4.15, multihashes@~0.4.15:
   version "0.4.21"
   resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-0.4.21.tgz#dc02d525579f334a7909ade8a122dabb58ccfcb5"
@@ -19064,16 +19234,11 @@ node-addon-api@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
   integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
 
-node-addon-api@^3.0.0, node-addon-api@^3.0.2, node-addon-api@^3.2.1:
+node-addon-api@^3.0.0, node-addon-api@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
-node-addon-api@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
-  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
-
 node-addon-api@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
@@ -19132,15 +19297,6 @@ node-gyp-build@^4.2.0, node-gyp-build@^4.2.2, node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
   integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
 
-node-hid@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-2.1.2.tgz#3145fa86ed4336a402a71e9f372c54213b88797c"
-  integrity sha512-qhCyQqrPpP93F/6Wc/xUR7L8mAJW0Z6R7HMQV8jCHHksAxNDe/4z4Un/H9CpLOT+5K39OPyt9tIQlavxWES3lg==
-  dependencies:
-    bindings "^1.5.0"
-    node-addon-api "^3.0.2"
-    prebuild-install "^7.1.1"
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -19393,11 +19549,6 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-  integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==
-
 object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
@@ -19474,6 +19625,11 @@ ofetch@^1.1.1:
     node-fetch-native "^1.2.0"
     ufo "^1.1.2"
 
+on-exit-leak-free@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz#b39c9e3bf7690d890f4861558b0d7b90a442d209"
+  integrity sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -20007,6 +20163,36 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
+pino-abstract-transport@v0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz#4b54348d8f73713bfd14e3dc44228739aa13d9c0"
+  integrity sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ==
+  dependencies:
+    duplexify "^4.1.2"
+    split2 "^4.0.0"
+
+pino-std-serializers@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz#1791ccd2539c091ae49ce9993205e2cd5dbba1e2"
+  integrity sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==
+
+pino@7.11.0:
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-7.11.0.tgz#0f0ea5c4683dc91388081d44bff10c83125066f6"
+  integrity sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg==
+  dependencies:
+    atomic-sleep "^1.0.0"
+    fast-redact "^3.0.0"
+    on-exit-leak-free "^0.2.0"
+    pino-abstract-transport v0.5.0
+    pino-std-serializers "^4.0.0"
+    process-warning "^1.0.0"
+    quick-format-unescaped "^4.0.3"
+    real-require "^0.1.0"
+    safe-stable-stringify "^2.1.0"
+    sonic-boom "^2.2.1"
+    thread-stream "^0.15.1"
+
 pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.5:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
@@ -20045,10 +20231,10 @@ pluralize@^8.0.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
   integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
 
-pngjs@^3.3.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
-  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+pngjs@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
+  integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==
 
 pnglib@0.0.1:
   version "0.0.1"
@@ -20925,16 +21111,16 @@ postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-preact@10.4.1:
-  version "10.4.1"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431"
-  integrity sha512-WKrRpCSwL2t3tpOOGhf2WfTpcmbpxaWtDbdJdKdjd0aEiTkvOmS4NBkG6kzlaAHI9AkQ3iVqbFWM3Ei7mZ4o1Q==
-
 preact@^10.11.3:
   version "10.15.1"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.15.1.tgz#a1de60c9fc0c79a522d969c65dcaddc5d994eede"
   integrity sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g==
 
+preact@^10.12.0, preact@^10.5.9:
+  version "10.16.0"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.16.0.tgz#68a06d70b191b8a313ea722d61e09c6b2a79a37e"
+  integrity sha512-XTSj3dJ4roKIC93pald6rWuB2qQJO9gO2iLLyTe87MrjQN+HklueLsmskbywEWqCHlclgz3/M4YLL2iBr9UmMA==
+
 prebuild-install@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
@@ -20990,11 +21176,6 @@ precinct@^9.0.0:
     module-definition "^4.1.0"
     node-source-walk "^5.0.1"
 
-precond@0.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac"
-  integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -21063,6 +21244,11 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process-warning@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616"
+  integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==
+
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -21081,14 +21267,6 @@ progress@^2.0.1:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise-to-callback@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/promise-to-callback/-/promise-to-callback-1.0.0.tgz#5d2a749010bfb67d963598fcd3960746a68feef7"
-  integrity sha512-uhMIZmKM5ZteDMfLgJnoSq9GCwsNKrYau73Awf1jIy6/eUcuuZ3P+CD9zUv0kJsIUbU+x6uLNIhXhLHDs1pNPA==
-  dependencies:
-    is-fn "^1.0.0"
-    set-immediate-shim "^1.0.1"
-
 promise.series@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd"
@@ -21136,6 +21314,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-compare@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/proxy-compare/-/proxy-compare-2.5.1.tgz#17818e33d1653fbac8c2ec31406bce8a2966f600"
+  integrity sha512-oyfc0Tx87Cpwva5ZXezSp5V9vht1c7dZBhvuV/y3ctkgMVUmiAGDVeeB0dKhGSyT0v1ZTEQYpe/RXlBVBNuCLA==
+
 proxy-from-env@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -21257,18 +21440,15 @@ pvutils@^1.1.3:
   resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3"
   integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==
 
-qrcode@1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83"
-  integrity sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==
+qrcode@1.5.3, qrcode@^1.5.1:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170"
+  integrity sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==
   dependencies:
-    buffer "^5.4.3"
-    buffer-alloc "^1.2.0"
-    buffer-from "^1.1.1"
     dijkstrajs "^1.0.1"
-    isarray "^2.0.1"
-    pngjs "^3.3.0"
-    yargs "^13.2.4"
+    encode-utf8 "^1.0.3"
+    pngjs "^5.0.0"
+    yargs "^15.3.1"
 
 qs@6.11.0:
   version "6.11.0"
@@ -21277,7 +21457,7 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
-qs@^6.10.0, qs@^6.4.0:
+qs@^6.10.0, qs@^6.10.3, qs@^6.4.0:
   version "6.11.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
   integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
@@ -21296,12 +21476,13 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
   integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
-query-string@6.13.5:
-  version "6.13.5"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.5.tgz#99e95e2fb7021db90a6f373f990c0c814b3812d8"
-  integrity sha512-svk3xg9qHR39P3JlHuD7g3nRnyay5mHbrPctEBDUxUkHRifPHXJDhBUycdCC0NBjXoDf44Gb+IsOZL1Uwn8M/Q==
+query-string@7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328"
+  integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==
   dependencies:
-    decode-uri-component "^0.2.0"
+    decode-uri-component "^0.2.2"
+    filter-obj "^1.1.0"
     split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
@@ -21314,6 +21495,16 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+query-string@^6.13.5:
+  version "6.14.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
+  integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    filter-obj "^1.1.0"
+    split-on-first "^1.0.0"
+    strict-uri-encode "^2.0.0"
+
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
@@ -21324,6 +21515,11 @@ queue-microtask@^1.2.2, queue-microtask@^1.2.3:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+quick-format-unescaped@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
+  integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==
+
 quick-lru@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
@@ -21779,17 +21975,7 @@ read@^1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@^1.0.33:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@~2.3.6:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -21811,16 +21997,6 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~1.0.15:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -21833,6 +22009,11 @@ readline@^1.3.0:
   resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c"
   integrity sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==
 
+real-require@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.1.0.tgz#736ac214caa20632847b7ca8c1056a0767df9381"
+  integrity sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==
+
 recast@^0.21.0:
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495"
@@ -22092,7 +22273,7 @@ request-progress@^3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request@^2.79.0, request@^2.85.0:
+request@^2.79.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -22305,7 +22486,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rlp@^2.0.0, rlp@^2.2.3, rlp@^2.2.4:
+rlp@^2.2.4:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.7.tgz#33f31c4afac81124ac4b283e2bd4d9720b30beaf"
   integrity sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==
@@ -22395,6 +22576,19 @@ rollup@^3.20.7, rollup@^3.21.8:
   optionalDependencies:
     fsevents "~2.3.2"
 
+rpc-websockets@^7.5.1:
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.5.1.tgz#e0a05d525a97e7efc31a0617f093a13a2e10c401"
+  integrity sha512-kGFkeTsmd37pHPMaHIgN1LVKXMi0JD782v4Ds9ZKtLlwdTKjn+CxM9A9/gLT2LaOuEcEFGL98h1QWQtlOIdW0w==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    eventemitter3 "^4.0.7"
+    uuid "^8.3.2"
+    ws "^8.5.0"
+  optionalDependencies:
+    bufferutil "^4.0.1"
+    utf-8-validate "^5.0.2"
+
 rrweb-cssom@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
@@ -22426,18 +22620,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rustbn.js@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca"
-  integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==
-
-rxjs@6:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
 rxjs@7.8.1, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0, rxjs@^7.8.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
@@ -22445,6 +22627,13 @@ rxjs@7.8.1, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0, rxjs@^7.8.1:
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^6.6.3:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 sade@^1.7.3:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
@@ -22467,18 +22656,16 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-event-emitter@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/safe-event-emitter/-/safe-event-emitter-1.0.1.tgz#5b692ef22329ed8f69fdce607e50ca734f6f20af"
-  integrity sha512-e1wFe99A91XYYxoQbcq2ZJUWurxEyP8vfz7A7vuUe1s95q8r5ebraVaA1BukYJcpM6V16ugWoD9vngi8Ccu5fg==
-  dependencies:
-    events "^3.0.0"
-
 safe-identifier@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
   integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
 
+safe-json-utils@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/safe-json-utils/-/safe-json-utils-1.1.1.tgz#0e883874467d95ab914c3f511096b89bfb3e63b1"
+  integrity sha512-SAJWGKDs50tAbiDXLf89PDwt9XYkWyANFWVzn4dTXl5QyI8t2o/bW5/OJl3lvc2WVU4MEpTo9Yz5NVFNsp+OJQ==
+
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
@@ -22488,6 +22675,11 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
+safe-stable-stringify@^2.1.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
+  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -22617,11 +22809,6 @@ selfsigned@^2.1.1:
   dependencies:
     node-forge "^1"
 
-semaphore@>=1.0.1, semaphore@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
-  integrity sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==
-
 semver-diff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -22653,11 +22840,6 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@~5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-  integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
-
 semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -22753,11 +22935,6 @@ set-harmonic-interval@^1.0.1:
   resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249"
   integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==
 
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha512-Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ==
-
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -22773,7 +22950,7 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.0, sha.js@^2.4.8:
+sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
@@ -22995,6 +23172,13 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
+sonic-boom@^2.2.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611"
+  integrity sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==
+  dependencies:
+    atomic-sleep "^1.0.0"
+
 sort-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18"
@@ -23137,6 +23321,11 @@ split-on-first@^1.0.0:
   resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
   integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
 
+split2@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
+  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
+
 sponge-case@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-1.0.1.tgz#260833b86453883d974f84854cdb63aecc5aef4c"
@@ -23347,15 +23536,6 @@ string-length@^4.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
 string-width@^5.0.0, string-width@^5.0.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -23413,11 +23593,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -23434,13 +23609,6 @@ stringify-object@^3.2.1:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -23627,6 +23795,16 @@ sucrase@^3.32.0:
     pirates "^4.0.1"
     ts-interface-checker "^0.1.9"
 
+superstruct@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.14.2.tgz#0dbcdf3d83676588828f1cf5ed35cda02f59025b"
+  integrity sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==
+
+superstruct@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-1.0.3.tgz#de626a5b49c6641ff4d37da3c7598e7a87697046"
+  integrity sha512-8iTn3oSS8nRGn+C2pgXSKPI3jmpm6FExNazNpjvqS6ZUJQCej3PUXEKM8NjHBOs54ExM+LPW/FBRhymrdcCiSg==
+
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -23892,6 +24070,11 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
+text-encoding-utf-8@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
+  integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -23921,6 +24104,13 @@ thread-loader@^4.0.1:
     neo-async "^2.6.2"
     schema-utils "^4.0.1"
 
+thread-stream@^0.15.1:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-0.15.2.tgz#fb95ad87d2f1e28f07116eb23d85aba3bc0425f4"
+  integrity sha512-UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA==
+  dependencies:
+    real-require "^0.1.0"
+
 throttle-debounce@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
@@ -23939,7 +24129,7 @@ through2@^2.0.3, through2@~2.0.3:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@^2.3.4, through@^2.3.6, through@^2.3.8:
+"through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -24359,12 +24549,12 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typeforce@^1.11.5, typeforce@^1.18.0:
+typeforce@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc"
   integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==
 
-typescript@^3.9.10, typescript@^3.9.7, typescript@^4.0.0, typescript@^4.9.5, typescript@^5.0.4:
+typescript@^3.9.10, typescript@^3.9.7, typescript@^4.0.0, typescript@^4.9.5, typescript@^5.0.4, typescript@^5.1.6:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
   integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
@@ -24389,6 +24579,13 @@ uint8array-tools@0.0.7:
   resolved "https://registry.yarnpkg.com/uint8array-tools/-/uint8array-tools-0.0.7.tgz#a7a2bb5d8836eae2fade68c771454e6a438b390d"
   integrity sha512-vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ==
 
+uint8arrays@^3.0.0, uint8arrays@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.1.tgz#2d8762acce159ccd9936057572dade9459f65ae0"
+  integrity sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg==
+  dependencies:
+    multiformats "^9.4.2"
+
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -24696,15 +24893,6 @@ urlpattern-polyfill@^8.0.0:
   resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz#99f096e35eff8bf4b5a2aa7d58a1523d6ebc7ce5"
   integrity sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==
 
-usb@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/usb/-/usb-2.5.1.tgz#27550f078a785144fbc19b5f6664742a066b961f"
-  integrity sha512-/VNr4wUL32KVqyrVJ1HGBhDEvklhouVh+8ehIGKv6FsOKz6MWlkYLLAEyXbRo72HXhhiFNj6bwz6L+bIk8F0Yw==
-  dependencies:
-    "@types/w3c-web-usb" "1.0.6"
-    node-addon-api "^4.2.0"
-    node-gyp-build "^4.3.0"
-
 use-callback-ref@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5"
@@ -24732,6 +24920,11 @@ use-sidecar@^1.1.2:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
+use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
+  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
+
 utf-8-validate@5.0.7:
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922"
@@ -24834,6 +25027,14 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+valtio@1.10.6:
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.10.6.tgz#80ed00198b949939863a0fa56ae687abb417fc4f"
+  integrity sha512-SxN1bHUmdhW6V8qsQTpCgJEwp7uHbntuH0S9cdLQtiohuevwBksbpXjwj5uDMA7bLwg1WKyq9sEpZrx3TIMrkA==
+  dependencies:
+    proxy-compare "2.5.1"
+    use-sync-external-store "1.2.0"
+
 value-or-promise@^1.0.11, value-or-promise@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c"
@@ -24896,18 +25097,33 @@ victory-vendor@^36.6.8:
     d3-time "^3.0.0"
     d3-timer "^3.0.1"
 
-viem@^0.3.41:
-  version "0.3.50"
-  resolved "https://registry.yarnpkg.com/viem/-/viem-0.3.50.tgz#999a7682eda7eabc48c923f4b9923c3f098fc1ab"
-  integrity sha512-s+LxCYZTR9F/qPk1/n1YDVAX9vSeVz7GraqBZWGrDuenCJxo9ArCoIceJ6ksI0WwSeNzcZ0VVbD/kWRzTxkipw==
+viem@^1.0.0:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-1.2.9.tgz#8ccf786cd00d28b14b644f2b9fe35fc6bf2bdc41"
+  integrity sha512-EnEbTuAAHv43unUgMISdQXbD9mrhZLvOdmf6eRGbDFl+XwP/PEzZAT79RaWAuDPnLXGMP1gBCJF++NFjSMukUw==
   dependencies:
     "@adraffy/ens-normalize" "1.9.0"
     "@noble/curves" "1.0.0"
     "@noble/hashes" "1.3.0"
     "@scure/bip32" "1.3.0"
     "@scure/bip39" "1.2.0"
-    "@wagmi/chains" "1.0.0"
-    abitype "0.8.7"
+    "@wagmi/chains" "1.2.0"
+    abitype "0.8.11"
+    isomorphic-ws "5.0.0"
+    ws "8.12.0"
+
+viem@^1.2.14:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-1.2.14.tgz#f3d3f2262c420336a1aa453f50e1d8b1834df289"
+  integrity sha512-Hak+NGxdm+vRyt/cV8NbTlW1IRPKAmJBCx1SZZIc1uNVA/Rs6eN0Nh7mB8MbmA3FLJ0ymD/dSbB4MI9GGbGCgA==
+  dependencies:
+    "@adraffy/ens-normalize" "1.9.0"
+    "@noble/curves" "1.0.0"
+    "@noble/hashes" "1.3.0"
+    "@scure/bip32" "1.3.0"
+    "@scure/bip39" "1.2.0"
+    "@wagmi/chains" "1.2.0"
+    abitype "0.8.11"
     isomorphic-ws "5.0.0"
     ws "8.12.0"
 
@@ -24918,6 +25134,18 @@ w3c-xmlserializer@^4.0.0:
   dependencies:
     xml-name-validator "^4.0.0"
 
+wagmi@^1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/wagmi/-/wagmi-1.3.8.tgz#544554fdab35ee32d93f107eb75b9d1924e22880"
+  integrity sha512-RCfcE+Q+yhyfq7j5u7KQRz2KXUMAMexu0Y2kr8z81t4fmDlU5C+OEVQ6NFoUzAzEsJpznpQjZgsfpHKeFm17hQ==
+  dependencies:
+    "@tanstack/query-sync-storage-persister" "^4.27.1"
+    "@tanstack/react-query" "^4.28.0"
+    "@tanstack/react-query-persist-client" "^4.28.0"
+    "@wagmi/core" "1.3.7"
+    abitype "0.8.7"
+    use-sync-external-store "^1.2.0"
+
 walkdir@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39"
@@ -25154,34 +25382,6 @@ web3-net@1.10.0:
     web3-core-method "1.10.0"
     web3-utils "1.10.0"
 
-web3-provider-engine@16.0.1:
-  version "16.0.1"
-  resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-16.0.1.tgz#2600a39ede364cdc0a1fc773bf40a94f2177e605"
-  integrity sha512-/Eglt2aocXMBiDj7Se/lyZnNDaHBaoJlaUfbP5HkLJQC/HlGbR+3/W+dINirlJDhh7b54DzgykqY7ksaU5QgTg==
-  dependencies:
-    async "^2.5.0"
-    backoff "^2.5.0"
-    clone "^2.0.0"
-    cross-fetch "^2.1.0"
-    eth-block-tracker "^4.4.2"
-    eth-json-rpc-filters "^4.2.1"
-    eth-json-rpc-infura "^5.1.0"
-    eth-json-rpc-middleware "^6.0.0"
-    eth-rpc-errors "^3.0.0"
-    eth-sig-util "^1.4.2"
-    ethereumjs-block "^1.2.2"
-    ethereumjs-tx "^1.2.0"
-    ethereumjs-util "^5.1.5"
-    ethereumjs-vm "^2.3.4"
-    json-stable-stringify "^1.0.1"
-    promise-to-callback "^1.0.0"
-    readable-stream "^2.2.9"
-    request "^2.85.0"
-    semaphore "^1.0.3"
-    ws "^5.1.1"
-    xhr "^2.2.0"
-    xtend "^4.0.1"
-
 web3-providers-http@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.10.0.tgz#864fa48675e7918c9a4374e5f664b32c09d0151b"
@@ -25232,7 +25432,7 @@ web3-utils@1.10.0, web3-utils@^1.6.0:
     randombytes "^2.1.0"
     utf8 "3.0.0"
 
-web3@^1.3.5, web3@^1.6.0:
+web3@^1.6.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/web3/-/web3-1.10.0.tgz#2fde0009f59aa756c93e07ea2a7f3ab971091274"
   integrity sha512-YfKY9wSkGcM8seO+daR89oVTcbu18NsVfvOngzqMYGUU0pPSQmE57qQDvQzUeoIOHAnXEBNzrhjQJmm8ER0rng==
@@ -25510,11 +25710,6 @@ whatwg-encoding@^2.0.0:
   dependencies:
     iconv-lite "0.6.3"
 
-whatwg-fetch@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-
 whatwg-mimetype@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
@@ -25620,15 +25815,6 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -25705,17 +25891,12 @@ ws@7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
-ws@7.5.3:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
-  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
-
 ws@8.12.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8"
   integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==
 
-ws@8.13.0, ws@^8.11.0, ws@^8.12.0, ws@^8.13.0, ws@^8.2.3, ws@^8.8.1:
+ws@8.13.0, ws@^8.11.0, ws@^8.12.0, ws@^8.13.0, ws@^8.2.3, ws@^8.5.0, ws@^8.8.1:
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
   integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
@@ -25729,13 +25910,6 @@ ws@^3.0.0:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
-ws@^5.1.1:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d"
-  integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==
-  dependencies:
-    async-limiter "~1.0.0"
-
 ws@^6.1.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
@@ -25743,7 +25917,7 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.3.1:
+ws@^7.3.1, ws@^7.4.5, ws@^7.5.1:
   version "7.5.9"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
@@ -25773,14 +25947,7 @@ xhr-request@^1.0.1, xhr-request@^1.1.0:
     url-set-query "^1.0.0"
     xhr "^2.0.4"
 
-xhr2-cookies@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz#7d77449d0999197f155cb73b23df72505ed89d48"
-  integrity sha512-hjXUA6q+jl/bd8ADHcVfFsSPIf+tyLIjuO9TwJC9WI6JP2zKcS7C+p56I9kCLLsaCiNT035iYvEUUzdEFj/8+g==
-  dependencies:
-    cookiejar "^2.1.1"
-
-xhr@^2.0.4, xhr@^2.2.0, xhr@^2.3.3:
+xhr@^2.0.4, xhr@^2.3.3:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d"
   integrity sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==
@@ -25808,18 +25975,11 @@ xss@^1.0.14:
     commander "^2.20.3"
     cssfilter "0.0.10"
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-xtend@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-  integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==
-  dependencies:
-    object-keys "~0.4.0"
-
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -25865,14 +26025,6 @@ yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -25886,22 +26038,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.9:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@^13.2.4:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -25975,6 +26111,13 @@ zen-observable@0.8.15:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
 
+zustand@^4.3.1:
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.9.tgz#a7d4332bbd75dfd25c6848180b3df1407217f2ad"
+  integrity sha512-Tat5r8jOMG1Vcsj8uldMyqYKC5IZvQif8zetmLHs9WoZlntTHmIoNM8TpLRY31ExncuUvUOXehd0kvahkuHjDw==
+  dependencies:
+    use-sync-external-store "1.2.0"
+
 zwitch@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"