diff --git a/.changeset/friendly-bobcats-repeat.md b/.changeset/friendly-bobcats-repeat.md
new file mode 100644
index 0000000..91d574d
--- /dev/null
+++ b/.changeset/friendly-bobcats-repeat.md
@@ -0,0 +1,6 @@
+---
+"@wallet01/react": patch
+"@wallet01/core": patch
+---
+
+adding isAutoConnecting variable
diff --git a/.changeset/gold-icons-tap.md b/.changeset/gold-icons-tap.md
new file mode 100644
index 0000000..409843e
--- /dev/null
+++ b/.changeset/gold-icons-tap.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/react": patch
+---
+
+add onsuccessful connect option
diff --git a/.changeset/happy-gifts-tap.md b/.changeset/happy-gifts-tap.md
new file mode 100644
index 0000000..667223d
--- /dev/null
+++ b/.changeset/happy-gifts-tap.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/react": patch
+---
+
+build then publish
diff --git a/.changeset/happy-schools-add.md b/.changeset/happy-schools-add.md
new file mode 100644
index 0000000..e8b4719
--- /dev/null
+++ b/.changeset/happy-schools-add.md
@@ -0,0 +1,10 @@
+---
+"@wallet01/react": major
+"@wallet01/core": major
+"@wallet01/cosmos": minor
+"@wallet01/solana": minor
+"@wallet01/tezos": minor
+"@wallet01/evm": minor
+---
+
+New events based architecture Wallet01; updated connectors and react package
diff --git a/.changeset/long-yaks-rescue.md b/.changeset/long-yaks-rescue.md
new file mode 100644
index 0000000..6d10657
--- /dev/null
+++ b/.changeset/long-yaks-rescue.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/react": patch
+---
+
+removing listeners in useEffect
diff --git a/.changeset/pink-lions-cry.md b/.changeset/pink-lions-cry.md
new file mode 100644
index 0000000..096c26d
--- /dev/null
+++ b/.changeset/pink-lions-cry.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/react": patch
+---
+
+Adding alternative way of handling event listeners
diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 0000000..96a0cee
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,28 @@
+{
+  "mode": "pre",
+  "tag": "beta",
+  "initialVersions": {
+    "eslint-config-custom": "0.0.0",
+    "tsconfig": "0.0.0",
+    "example-nextjs": "0.1.40-beta.4",
+    "exmaple-vite-react": "0.0.41",
+    "@wallet01/core": "0.6.5",
+    "@wallet01/cosmos": "0.7.5",
+    "@wallet01/evm": "0.11.1",
+    "@wallet01/react": "0.8.7",
+    "@wallet01/solana": "0.6.6",
+    "@wallet01/tezos": "0.2.1"
+  },
+  "changesets": [
+    "friendly-bobcats-repeat",
+    "gold-icons-tap",
+    "happy-gifts-tap",
+    "happy-schools-add",
+    "long-yaks-rescue",
+    "pink-lions-cry",
+    "real-seals-stare",
+    "shy-turtles-flash",
+    "six-bees-whisper",
+    "smart-cups-judge"
+  ]
+}
diff --git a/.changeset/real-seals-stare.md b/.changeset/real-seals-stare.md
new file mode 100644
index 0000000..d34c041
--- /dev/null
+++ b/.changeset/real-seals-stare.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/evm": patch
+---
+
+Adding metamask connector
diff --git a/.changeset/shy-turtles-flash.md b/.changeset/shy-turtles-flash.md
new file mode 100644
index 0000000..069d3c4
--- /dev/null
+++ b/.changeset/shy-turtles-flash.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/react": patch
+---
+
+updating client error with hook name
diff --git a/.changeset/six-bees-whisper.md b/.changeset/six-bees-whisper.md
new file mode 100644
index 0000000..bf8cd02
--- /dev/null
+++ b/.changeset/six-bees-whisper.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/react": patch
+---
+
+adding succes handlers to all the hooks
diff --git a/.changeset/smart-cups-judge.md b/.changeset/smart-cups-judge.md
new file mode 100644
index 0000000..3ad0f96
--- /dev/null
+++ b/.changeset/smart-cups-judge.md
@@ -0,0 +1,5 @@
+---
+"@wallet01/react": patch
+---
+
+removing unnecesary errors
diff --git a/.eslintrc.js b/.eslintrc.js
index a2845bf..7d48c6d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,10 +1,10 @@
 module.exports = {
   root: true,
   // This tells ESLint to load the config from the package `eslint-config-custom`
-  extends: ['custom'],
+  extends: ["custom"],
   settings: {
     next: {
-      rootDir: ['apps/*/'],
+      rootDir: ["examples/*/", "packages/*/"],
     },
   },
 };
diff --git a/examples/nextjs/components/ConnectButtons.tsx b/examples/nextjs/components/ConnectButtons.tsx
index 0de0197..c3c3247 100644
--- a/examples/nextjs/components/ConnectButtons.tsx
+++ b/examples/nextjs/components/ConnectButtons.tsx
@@ -3,18 +3,14 @@ import { toast } from "react-hot-toast";
 import WalletIcons from "./assets/WalletIcons";
 
 const ConnectButtons = () => {
-  const { connectors, isAutoConnecting } = useClient();
-  const { activeConnector, isConnected, did, address } = useWallet();
+  const { connectors } = useClient();
+  const { activeConnector, isConnected } = useWallet();
   const { connect, isError, error } = useConnect();
 
   if (isError && error) {
     toast.error(error.message);
   }
 
-  if (isAutoConnecting) {
-    console.log("isAutoConnecting");
-  }
-
   return (
     <div className="flex flex-col">
       <span className="font-bold text-lg text-center w-full">
diff --git a/examples/nextjs/components/ConnectedModal.tsx b/examples/nextjs/components/ConnectedModal.tsx
index 5485aca..c590723 100644
--- a/examples/nextjs/components/ConnectedModal.tsx
+++ b/examples/nextjs/components/ConnectedModal.tsx
@@ -1,15 +1,21 @@
-import { useClient, useMessage, useSwitch, useWallet } from "@wallet01/react";
+import {
+  useClient,
+  useDisconnect,
+  useMessage,
+  useSwitch,
+  useWallet,
+} from "@wallet01/react";
 import React, { useState } from "react";
 import WalletIcons from "./assets/WalletIcons";
-import { BeaconConnector } from "@wallet01/tezos";
 
 const ConnectedModal = () => {
   const [message, setMessage] = useState<string>("");
   const [chainId, setChainId] = useState<string>("");
-  const { did, activeConnector, address, disconnect } = useWallet();
+  const { activeConnector, address, chainId: cId } = useWallet();
   const { signMessage, hash } = useMessage();
+  const { disconnect } = useDisconnect();
   const { switchChain } = useSwitch();
-  const { activeChain } = useClient();
+  const { ecosystem } = useClient();
 
   return (
     <div className="flex flex-col">
@@ -19,18 +25,9 @@ const ConnectedModal = () => {
       </span>
       <div className="grid grid-cols-2 mt-5 justify-center items-center gap-8 border border-slate-600 bg-slate-700 p-4 rounded-lg m-10">
         <div className="flex flex-col p-6 gap-4 max-w-full">
-          {activeChain ? (
-            <span className="text-xl font-base">
-              Connected to {activeChain}
-            </span>
+          {ecosystem ? (
+            <span className="text-xl font-base">Connected to {ecosystem}</span>
           ) : null}
-          {did ? (
-            <span className="text-xl font-base">
-              Hello, <b className="underline underline-offset-1">{did}</b>
-            </span>
-          ) : (
-            ""
-          )}
           {address ? (
             <span className="text-xl font-base truncate">
               Address: <br />
@@ -39,9 +36,15 @@ const ConnectedModal = () => {
           ) : (
             ""
           )}
-          {activeConnector?.name === "beacon" ? (
+          {
+            <span className="text-xl font-base">
+              ChainId: <br />
+              <b className="italic truncate ">{cId}</b>
+            </span>
+          }
+          {/* {activeConnector?.name === "beacon" ? (
             <span>{BeaconConnector.publicKey}</span>
-          ) : null}
+          ) : null} */}
           <button
             className="bg-slate-600 w-fit p-3 text-medium text-lg rounded-md"
             onClick={() => disconnect()}
diff --git a/examples/nextjs/lib/filecoin.ts b/examples/nextjs/lib/filecoin.ts
deleted file mode 100644
index fa48e9e..0000000
--- a/examples/nextjs/lib/filecoin.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { ethers } from "ethers";
-import { hexValue } from "ethers/lib/utils";
-import { Web3Provider, ExternalProvider } from "@ethersproject/providers";
-import detectEthereumProvider from "@metamask/detect-provider";
-
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
-
-export class FilecoinConnector extends BaseConnector<Web3Provider> {
-  provider?: Web3Provider;
-
-  constructor(chain: string = "3141") {
-    super(chain, "filecoin", "ethereum");
-    this.getProvider();
-  }
-
-  async getProvider() {
-    const provider = await detectEthereumProvider();
-
-    if (provider) {
-      const _provider = new ethers.providers.Web3Provider(
-        <ExternalProvider>(<unknown>provider)
-      );
-      this.provider = _provider;
-      return this.provider;
-    } else {
-      throw new Error("Please install a Browser Wallet");
-    }
-  }
-
-  async getAccount(): Promise<string[]> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("No Provider Found!");
-      const result = await this.provider.send("eth_requestAccounts", []);
-      return result;
-    } catch (err) {
-      console.error(err);
-      throw new Error("Error in getting Accounts");
-    }
-  }
-
-  async getChainId(): Promise<string> {
-    if (this.provider) {
-      const { result } = await this.provider?.send("eth_chainId", []);
-      return result;
-    }
-    return "";
-  }
-
-  async switchChain(chainId: string): Promise<void> {
-    const provider = await this.getProvider();
-
-    const id = hexValue(Number(chainId));
-    try {
-      await provider?.send("wallet_switchEthereumChain", [{ chainId: id }]);
-    } catch (error) {
-      console.error("error in switching chain", error);
-      throw error;
-    }
-  }
-
-  async connect({ chainId = "3141" }) {
-    try {
-      const provider = await this.getProvider();
-      this.provider = provider;
-
-      if (provider.on) {
-        provider.on("accountsChanged", this.onAccountsChanged);
-        provider.on("chainChanged", this.onChainChanged);
-        provider.on("disconnect", this.onDisconnect);
-      }
-
-      let id = await this.getChainId();
-
-      if (chainId && id !== chainId) {
-        await this.switchChain(chainId);
-      }
-      setLastUsedConnector(this.name);
-    } catch (error) {
-      console.error(error, "in connect");
-      throw error;
-    }
-  }
-
-  async disconnect(): Promise<void> {
-    this.provider = undefined;
-  }
-
-  async resolveDid(address: string): Promise<string | null> {
-    return null;
-  }
-
-  async signMessage(message: string): Promise<string> {
-    if (!this.provider) throw new Error("Connect a wallet!");
-    const signer = await this.provider.getSigner();
-    const hash = await signer.signMessage(message);
-    return hash;
-  }
-
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
-  }
-
-  protected onChainChanged(_chain: string): void {
-    console.log("Chain Changed");
-  }
-
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
-  }
-}
diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
index f222253..0ad0d2c 100644
--- a/examples/nextjs/package.json
+++ b/examples/nextjs/package.json
@@ -12,9 +12,9 @@
     "@ethersproject/providers": "^5.7.2",
     "@metamask/detect-provider": "^2.0.0",
     "@wallet01/core": "workspace:*",
-    "@wallet01/cosmos": "workspace:*",
     "@wallet01/evm": "workspace:*",
     "@wallet01/react": "workspace:*",
+    "@wallet01/cosmos": "workspace:*",
     "@wallet01/solana": "workspace:*",
     "@wallet01/tezos": "workspace:*",
     "ethers": "^5.7.2",
diff --git a/examples/nextjs/pages/_app.tsx b/examples/nextjs/pages/_app.tsx
index 20326e1..3836a03 100644
--- a/examples/nextjs/pages/_app.tsx
+++ b/examples/nextjs/pages/_app.tsx
@@ -11,7 +11,7 @@ import {
 } from "@wallet01/evm";
 import { KeplrConnector } from "@wallet01/cosmos";
 import { PhantomConnector, SolflareConnector } from "@wallet01/solana";
-import { BeaconConnector, TempleConnector } from "@wallet01/tezos";
+import { BeaconConnector } from "@wallet01/tezos";
 import Layout from "../components/layout";
 import { ColorMode } from "@wallet01/tezos/dist/types";
 
@@ -20,26 +20,22 @@ export default function App({ Component, pageProps }: AppProps) {
     <Wallet01
       autoConnect={true}
       connectors={() => [
-        new InjectedConnector(),
-        new WalletconnectConnector({
-          chain: "1",
+        InjectedConnector.init(),
+        WalletconnectConnector.init({
           chains: [1],
           optionalChains: [137, 80001],
           projectId: "cef77f9c3969fb563468d997449c92d2",
           showQrModal: true,
         }),
-        new BananaConnector(),
-        new OkxWalletConnector(),
-        new CoinbaseConnector(),
-        new PhantomConnector({
-          rpcUrl: "https://api.mainnet-beta.solana.com",
+        BananaConnector.init(),
+        OkxWalletConnector.init(),
+        CoinbaseConnector.init({
+          appName: "Wallet01",
         }),
-        new SolflareConnector({
-          rpcUrl: "https://api.mainnet-beta.solana.com",
-        }),
-        new KeplrConnector(),
-        new TempleConnector({ projectName: "Wallet01" }),
-        new BeaconConnector({
+        PhantomConnector.init(),
+        SolflareConnector.init(),
+        KeplrConnector.init("osmosis"),
+        BeaconConnector.init({
           name: "Wallet01",
           featuredWallets: ["temple", "umami", "kukai", "naan"],
           colorMode: ColorMode.DARK,
diff --git a/examples/nextjs/pages/index.tsx b/examples/nextjs/pages/index.tsx
index 8b6fec6..12a5602 100644
--- a/examples/nextjs/pages/index.tsx
+++ b/examples/nextjs/pages/index.tsx
@@ -8,19 +8,15 @@ interface SVGIcons {
 }
 
 export default function Home() {
-  const { isAutoConnecting } = useClient();
+  // const { isAutoConnecting } = useClient();
   const { isConnected } = useWallet();
 
   return (
     <div className="flex flex-col h-screen justify-center items-center">
-      {isAutoConnecting ? (
+      {/* {isAutoConnecting ? (
         <span className="text-xl text-white font-bold">AutoConnecting</span>
-      ) : null}
-      {isConnected && !isAutoConnecting ? (
-        <ConnectedModal />
-      ) : (
-        <ConnectButtons />
-      )}
+      ) : null} */}
+      {isConnected ? <ConnectedModal /> : <ConnectButtons />}
     </div>
   );
 }
diff --git a/examples/vite-react/CHANGELOG.md b/examples/vite-react/CHANGELOG.md
index 04711b7..105c089 100644
--- a/examples/vite-react/CHANGELOG.md
+++ b/examples/vite-react/CHANGELOG.md
@@ -1,5 +1,69 @@
 # vite-react
 
+## 0.0.42-beta.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/evm@0.12.0-beta.2
+
+## 0.0.42-beta.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/react@1.0.0-beta.8
+
+## 0.0.42-beta.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/react@1.0.0-beta.7
+
+## 0.0.42-beta.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/react@1.0.0-beta.6
+
+## 0.0.42-beta.3
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies
+  - @wallet01/react@1.0.0-beta.5
+
+## 0.0.42-beta.2
+
+### Patch Changes
+
+- Updated dependencies [82d8693]
+- Updated dependencies
+  - @wallet01/react@1.0.0-beta.3
+
+## 0.0.42-beta.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/react@1.0.0-beta.1
+  - @wallet01/cosmos@0.8.0-beta.1
+  - @wallet01/evm@0.12.0-beta.1
+  - @wallet01/solana@0.7.0-beta.1
+
+## 0.0.42-beta.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/react@1.0.0-beta.0
+  - @wallet01/cosmos@0.8.0-beta.0
+  - @wallet01/solana@0.7.0-beta.0
+  - @wallet01/evm@0.12.0-beta.0
+
 ## 0.0.41
 
 ### Patch Changes
diff --git a/examples/vite-react/package.json b/examples/vite-react/package.json
index 3a5f787..7e0b49c 100644
--- a/examples/vite-react/package.json
+++ b/examples/vite-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "exmaple-vite-react",
   "private": true,
-  "version": "0.0.41",
+  "version": "0.0.42-beta.7",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/package.json b/package.json
index efa6027..2e6214b 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "postinstall": "turbo run build --filter=./packages/*"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.25.2",
+    "@changesets/cli": "^2.26.2",
     "eslint-config-custom": "workspace:*",
     "prettier": "latest",
     "turbo": "latest"
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 78566aa..cc80573 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @wallet01/core
 
+## 1.0.0-beta.1
+
+### Patch Changes
+
+- adding isAutoConnecting variable
+
+## 1.0.0-beta.0
+
+### Major Changes
+
+- New events based architecture Wallet01; updated connectors and react package
+
 ## 0.6.5
 
 ### Patch Changes
diff --git a/packages/core/package.json b/packages/core/package.json
index 83701c9..7ba27d3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wallet01/core",
-  "version": "0.6.5",
+  "version": "1.0.0-beta.1",
   "description": "",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
diff --git a/packages/core/src/client/client.ts b/packages/core/src/client/client.ts
index d4f7156..37ab49c 100644
--- a/packages/core/src/client/client.ts
+++ b/packages/core/src/client/client.ts
@@ -1,100 +1,135 @@
-import { BaseConnector } from "../types";
+import { ClientEvents, ConnectorEvents } from "../types/events";
+import { ClientConfig } from "../types/methodTypes";
+import { EnhancedEventEmitter } from "../utils/EnhancedEventEmitter";
 import { Wallet01Store } from "./store";
 
-type ClientConfig = {
-  autoConnect?: boolean;
-  connectors: BaseConnector[];
-};
+export default class Wallet01Client {
+  static #instance: Wallet01Client;
+  public readonly emitter: EnhancedEventEmitter<ConnectorEvents & ClientEvents>;
 
-export default class Client extends Wallet01Store {
-  private static instance: Client;
-  activeConnector: BaseConnector | null = null;
+  public store: Wallet01Store = Wallet01Store.init();
 
-  constructor({ autoConnect, connectors }: ClientConfig) {
-    super();
-    this.setAutoConnect(autoConnect || false);
-    this.setConnectors(connectors);
+  private constructor({ autoConnect = false, connectors }: ClientConfig) {
+    this.emitter = EnhancedEventEmitter.init();
+    this.store.setConnectors(connectors);
+
+    console.log("Creating client class");
+
+    this.registerEventListeners();
 
     if (localStorage.getItem("autoConnect") === null)
       localStorage.setItem("autoConnect", String(autoConnect));
 
-    if (localStorage.getItem("autoConnect") === "false")
-      this.setIsAutoConnecting(false);
+    if (localStorage.getItem("autoConnect") === "false") {
+      return;
+    }
 
     if (localStorage.getItem("autoConnect") !== String(autoConnect))
       localStorage.setItem("autoConnect", String(autoConnect));
 
-    if (!localStorage.getItem("lastUsedConnector"))
-      this.setIsAutoConnecting(false);
+    if (!localStorage.getItem("lastUsedConnector")) {
+      return;
+    }
 
     if (
       localStorage.getItem("lastUsedConnector") &&
       localStorage.getItem("autoConnect") === "true"
     ) {
-      this.ac();
+      this.autoConnect();
     }
   }
 
   static init = (config: ClientConfig) => {
-    if (!Client.instance) Client.instance = new Client(config);
-    return Client.instance;
+    if (!Wallet01Client.#instance)
+      Wallet01Client.#instance = new Wallet01Client(config);
+    return Wallet01Client.#instance;
   };
 
-  private async ac() {
-    try {
-      this.setIsAutoConnecting(true);
-      const lastConnName = localStorage.getItem("lastUsedConnector");
-      if (!lastConnName) {
-        this.setIsAutoConnecting(false);
-        return;
+  private registerEventListeners() {
+    // this.on("isAutoConnecting", (ecosystem) => {})
+    this.emitter.on(
+      "connected",
+      (address, chainId, walletName, ecosystem, activeConnector) => {
+        localStorage.setItem("lastUsedConnector", walletName);
+        this.store.setActiveConnector(activeConnector);
+        this.store.setAddress(address);
+        this.store.setChainId(chainId);
+        this.store.setEcosystem(ecosystem);
+        this.store.setIsConnected(true);
       }
+    );
+
+    this.emitter.on("disconnected", () => {
+      localStorage.removeItem("lastUsedConnector");
+      this.store.setActiveConnector(null);
+      this.store.setAddress(null);
+      this.store.setChainId(null);
+      this.store.setEcosystem(null);
+      this.store.setIsConnected(false);
+    });
+
+    this.emitter.on(
+      "switchingChain",
+      async (_f, toChainId, activeConnector) => {
+        const accounts = await activeConnector.getAccount();
+        if (accounts[0]) this.store.setAddress(accounts[0]);
+        this.store.setActiveConnector(activeConnector);
+        this.store.setChainId(toChainId);
+      }
+    );
 
-      const connector = this.getConnectors().find(
-        conn => conn.name === lastConnName
-      );
-
-      if (!connector) {
-        this.setIsAutoConnecting(false);
-        return;
-      } else this.setLastUsedConnector(connector);
-
-      this.setActiveConnector(this.getLastUsedConnector());
-      this.activeConnector = this.getLastUsedConnector();
+    this.emitter.on("chainChanged", chainId => {
+      this.store.setChainId(chainId);
+    });
 
-      if (this.activeConnector) {
-        await this.activeConnector.connect({});
-        const addresses = await this.activeConnector.getAccount();
+    this.emitter.on("accountsChanged", addresses => {
+      console.log("accountsChanged", addresses);
+      this.store.setAddresses(addresses);
+      if (addresses[0]) this.store.setAddress(addresses[0]);
+    });
+  }
 
-        const address = addresses[0];
+  private async autoConnect() {
+    const lastUsedConnectorName = localStorage.getItem("lastUsedConnector");
 
-        if (!address) return;
+    if (!lastUsedConnectorName) {
+      console.info({
+        message: "No last used connector found",
+      });
+      return;
+    }
 
-        this.setAddress(address);
+    const lastUsedConnector = this.store
+      .getConnectors()
+      .find(conn => conn.name === lastUsedConnectorName);
 
-        const did = await this.activeConnector
-          .resolveDid(address)
-          .catch(err => {
-            console.error({ error: err });
-            return null;
-          });
+    if (!lastUsedConnector) {
+      console.warn({
+        message: `The connector for wallet name: ${lastUsedConnectorName} was not found in the list of connectors`,
+      });
+      return;
+    }
 
-        this.setDid(did);
+    this.store.setActiveConnector(lastUsedConnector);
 
-        const chain = this.activeConnector.getChainId
-          ? await this.activeConnector.getChainId()
-          : null;
+    const activeConnector = this.store.getActiveConnector();
 
-        this.setChainId(chain);
+    if (activeConnector) {
+      this.emitter.emit(
+        "isAutoConnecting",
+        activeConnector.ecosystem,
+        activeConnector
+      );
 
-        this.setActiveChain(this.activeConnector.activeChain);
-        this.setIsAutoConnecting(false);
-        this.setIsConnected(true);
-      } else {
-        this.setIsAutoConnecting(false);
-      }
-    } catch (error) {
-      console.error({ error });
-      this.setIsAutoConnecting(false);
+      this.store.setIsAutoConnecting(true);
+      await activeConnector
+        .connect()
+        .then(() => {
+          this.store.setIsAutoConnecting(false);
+        })
+        .catch(() => {
+          this.store.setIsAutoConnecting(false);
+        });
     }
   }
 }
diff --git a/packages/core/src/client/store.ts b/packages/core/src/client/store.ts
index e199a0d..b1af524 100644
--- a/packages/core/src/client/store.ts
+++ b/packages/core/src/client/store.ts
@@ -1,20 +1,41 @@
-import getState from "../store/rootStore";
+import { getState } from "../store/rootStore";
+import { IState } from "../store/storeTypes";
 import { BaseConnector } from "../types";
 
 export class Wallet01Store {
-  getActiveChain(): "ethereum" | "solana" | "cosmos" | "tezos" | null {
-    const { activeChain } = getState();
-    return activeChain;
+  static #instance: Wallet01Store;
+
+  private constructor() {
+    this.getState = getState;
+  }
+
+  public static init() {
+    if (!Wallet01Store.#instance) {
+      Wallet01Store.#instance = new Wallet01Store();
+    }
+    return Wallet01Store.#instance;
+  }
+
+  getState: () => IState;
+
+  getEcosystem() {
+    const { ecosystem } = getState();
+    return ecosystem;
   }
 
-  getAddress(): string | null {
+  getIsAutoConnecting() {
+    const { isAutoConnecting } = getState();
+    return isAutoConnecting;
+  }
+
+  getAddress() {
     const { address } = getState();
     return address;
   }
 
-  getDid(): string | null {
-    const { did } = getState();
-    return did;
+  getAddresses() {
+    const { addresses } = getState();
+    return addresses;
   }
 
   getIsConnected(): boolean {
@@ -27,11 +48,6 @@ export class Wallet01Store {
     return chainId;
   }
 
-  getAutoConnect(): boolean {
-    const { autoConnect } = getState();
-    return autoConnect;
-  }
-
   getConnectors(): BaseConnector[] {
     const { connectors } = getState();
     return connectors;
@@ -42,65 +58,43 @@ export class Wallet01Store {
     return activeConnector;
   }
 
-  getLastUsedConnector(): BaseConnector | null {
-    const { lastUsedConnector } = getState();
-    return lastUsedConnector;
-  }
-
-  getIsAutoConnecting(): boolean {
-    const { isAutoConnecting } = getState();
-    return isAutoConnecting;
+  setEcosystem(ecosystem: "ethereum" | "solana" | "cosmos" | "tezos" | null) {
+    const { setEcosystem } = getState();
+    setEcosystem(ecosystem);
   }
 
-  setActiveChain(
-    activeChain: "ethereum" | "solana" | "cosmos" | "tezos" | null
-  ): void {
-    const { setActiveChain } = getState();
-    setActiveChain(activeChain);
+  setIsAutoConnecting(val: boolean) {
+    const { setAutoConnecting } = getState();
+    setAutoConnecting(val);
   }
 
-  setAddress(address: string | null): void {
+  setAddress(address: string | null) {
     const { setAddress } = getState();
     setAddress(address);
   }
 
-  setDid(did: string | null): void {
-    const { setDid } = getState();
-    setDid(did);
+  setAddresses(addresses: string[]) {
+    const { setAddresses } = getState();
+    setAddresses(addresses);
   }
 
-  setIsConnected(val: boolean): void {
+  setIsConnected(val: boolean) {
     const { setIsConnected } = getState();
     setIsConnected(val);
   }
 
-  setChainId(id: string | null): void {
+  setChainId(id: string | "mainnet" | null) {
     const { setChainId } = getState();
     setChainId(id);
   }
 
-  setAutoConnect(val: boolean): void {
-    const { setAutoConnect } = getState();
-    setAutoConnect(val);
-  }
-
-  setConnectors(connectors: BaseConnector[]): void {
+  setConnectors(connectors: BaseConnector[]) {
     const { setConnectors } = getState();
     setConnectors(connectors);
   }
 
-  setActiveConnector(connector: BaseConnector | null): void {
+  setActiveConnector(connector: BaseConnector | null) {
     const { setActiveConnector } = getState();
     setActiveConnector(connector);
   }
-
-  setLastUsedConnector(connector: BaseConnector | null): void {
-    const { setLastUsedConnector } = getState();
-    setLastUsedConnector(connector);
-  }
-
-  setIsAutoConnecting(val: boolean): void {
-    const { setIsAutoConnecting } = getState();
-    setIsAutoConnecting(val);
-  }
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 41c782a..9c1129a 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,22 +1,13 @@
 // import { Client, createClient } from './client';
 import Client from "./client/client";
-import { useStore } from "./store/rootStore";
+import { useStore, getState, setState } from "./store/rootStore";
 
-import {
-  type ClientConfig,
-  type ConnectedData,
-  BaseConnector,
-  TProvider,
-} from "./types";
+import { BaseConnector } from "./types/BaseConnector";
 
-import setLastUsedConnector from "./utils/util";
+import setLastUsedConnector from "./utils";
 
-export {
-  Client,
-  type ClientConfig,
-  type ConnectedData,
-  type TProvider,
-  BaseConnector,
-  setLastUsedConnector,
-  useStore,
-};
+export { Client, BaseConnector, setLastUsedConnector };
+
+export { useStore, getState, setState };
+
+export * from "./utils/errors";
diff --git a/packages/core/src/store/createAccountSlice.ts b/packages/core/src/store/createAccountSlice.ts
index 5888f6a..7fe68e7 100644
--- a/packages/core/src/store/createAccountSlice.ts
+++ b/packages/core/src/store/createAccountSlice.ts
@@ -1,5 +1,5 @@
-import { StateCreator } from 'zustand';
-import { IAccountState } from './storeTypes';
+import { StateCreator } from "zustand";
+import { IAccountState } from "./storeTypes";
 
 const createAccountSlice: StateCreator<
   IAccountState,
@@ -8,12 +8,12 @@ const createAccountSlice: StateCreator<
   IAccountState
 > = set => ({
   address: null,
-  did: null,
+  addresses: [],
   setAddress: address => {
     set(() => ({ address }));
   },
-  setDid: did => {
-    set(() => ({ did }));
+  setAddresses: addresses => {
+    set(() => ({ addresses }));
   },
 });
 
diff --git a/packages/core/src/store/createClientSlice.ts b/packages/core/src/store/createClientSlice.ts
index 55ea0b8..89f21a9 100644
--- a/packages/core/src/store/createClientSlice.ts
+++ b/packages/core/src/store/createClientSlice.ts
@@ -7,17 +7,15 @@ const createClientSlice: StateCreator<
   [],
   IClientState
 > = set => ({
-  activeChain: null,
-  autoConnect: false,
+  isAutoConnecting: false,
+  ecosystem: null,
   connectors: [],
   activeConnector: null,
-  lastUsedConnector: null,
-  isAutoConnecting: true,
-  setActiveChain: activeChain => {
-    set(() => ({ activeChain }));
+  setAutoConnecting: val => {
+    set(() => ({ isAutoConnecting: val }));
   },
-  setAutoConnect: autoConnect => {
-    set(() => ({ autoConnect }));
+  setEcosystem: ecosystem => {
+    set(() => ({ ecosystem }));
   },
   setConnectors: connectors => {
     set(() => ({ connectors }));
@@ -25,12 +23,6 @@ const createClientSlice: StateCreator<
   setActiveConnector: activeConnector => {
     set(() => ({ activeConnector }));
   },
-  setLastUsedConnector: lastUsedConnector => {
-    set(() => ({ lastUsedConnector }));
-  },
-  setIsAutoConnecting: val => {
-    set(() => ({ isAutoConnecting: val }));
-  },
 });
 
 export default createClientSlice;
diff --git a/packages/core/src/store/createWalletSlice.ts b/packages/core/src/store/createWalletSlice.ts
index 6efc36f..fb0e608 100644
--- a/packages/core/src/store/createWalletSlice.ts
+++ b/packages/core/src/store/createWalletSlice.ts
@@ -1,5 +1,5 @@
-import { StateCreator } from 'zustand';
-import { IWalletState } from './storeTypes';
+import { StateCreator } from "zustand";
+import { IWalletState } from "./storeTypes";
 
 const createWalletSlice: StateCreator<
   IWalletState,
@@ -8,7 +8,7 @@ const createWalletSlice: StateCreator<
   IWalletState
 > = set => ({
   isConnected: false,
-  chainId: null,
+  chainId: "mainnet",
   setIsConnected: isConnected => {
     set(() => ({ isConnected }));
   },
diff --git a/packages/core/src/store/rootStore.ts b/packages/core/src/store/rootStore.ts
index 268ac87..da0cd98 100644
--- a/packages/core/src/store/rootStore.ts
+++ b/packages/core/src/store/rootStore.ts
@@ -1,8 +1,8 @@
-import create from 'zustand';
-import createAccountSlice from './createAccountSlice';
-import createClientSlice from './createClientSlice';
-import createWalletSlice from './createWalletSlice';
-import { IState } from './storeTypes';
+import create from "zustand";
+import createAccountSlice from "./createAccountSlice";
+import createClientSlice from "./createClientSlice";
+import createWalletSlice from "./createWalletSlice";
+import { IState } from "./storeTypes";
 
 export const useStore = create<IState>()((...a) => ({
   ...createAccountSlice(...a),
@@ -10,6 +10,6 @@ export const useStore = create<IState>()((...a) => ({
   ...createClientSlice(...a),
 }));
 
-const { getState } = useStore;
+export const { getState, setState } = useStore;
 
-export default getState;
+// export default getState;
diff --git a/packages/core/src/store/storeTypes.ts b/packages/core/src/store/storeTypes.ts
index 81a5b93..53dadd0 100644
--- a/packages/core/src/store/storeTypes.ts
+++ b/packages/core/src/store/storeTypes.ts
@@ -1,34 +1,30 @@
 import { BaseConnector } from "../types";
 
+export type TEcosystem = "ethereum" | "solana" | "cosmos" | "tezos";
+
 export interface IAccountState {
   address: string | null;
-  did: string | null;
+  addresses: string[];
   setAddress: (address: string | null) => void;
-  setDid: (did: string | null) => void;
+  setAddresses: (addresses: string[]) => void;
 }
 
 export interface IWalletState {
   isConnected: boolean;
-  chainId: string | null;
+  chainId: "mainnet" | string | null;
   setIsConnected: (val: boolean) => void;
-  setChainId: (id: string | null) => void;
+  setChainId: (id: "mainnet" | string | null) => void;
 }
 
 export interface IClientState {
-  activeChain: "ethereum" | "solana" | "cosmos" | "tezos" | null;
-  autoConnect: boolean;
+  isAutoConnecting: boolean;
+  ecosystem: TEcosystem | null;
   connectors: BaseConnector[];
   activeConnector: BaseConnector | null;
-  lastUsedConnector: BaseConnector | null;
-  isAutoConnecting: boolean;
-  setActiveChain: (
-    val: "ethereum" | "solana" | "cosmos" | "tezos" | null
-  ) => void;
-  setAutoConnect: (val: boolean) => void;
+  setAutoConnecting: (val: boolean) => void;
+  setEcosystem: (val: TEcosystem | null) => void;
   setConnectors: (connectors: BaseConnector[]) => void;
   setActiveConnector: (connector: BaseConnector | null) => void;
-  setLastUsedConnector: (connector: BaseConnector | null) => void;
-  setIsAutoConnecting: (val: boolean) => void;
 }
 
 export type IState = IAccountState & IWalletState & IClientState;
diff --git a/packages/core/src/types/BaseConnector.ts b/packages/core/src/types/BaseConnector.ts
new file mode 100644
index 0000000..db1bd1e
--- /dev/null
+++ b/packages/core/src/types/BaseConnector.ts
@@ -0,0 +1,43 @@
+import { AddChainParameter } from "./methodTypes";
+import { TEcosystem } from "../store/storeTypes";
+import { EnhancedEventEmitter } from "../utils/EnhancedEventEmitter";
+import {
+  ChainSwitchResponse,
+  ConnectionResponse,
+  DisconnectionResponse,
+  MessageSignedResponse,
+} from "./methodTypes";
+import { ClientEvents, ConnectorEvents } from "./events";
+
+export abstract class BaseConnector<
+  TProvider extends {} = {},
+  TWalletName extends string = string,
+> {
+  abstract provider: TProvider;
+  readonly name: TWalletName;
+  readonly ecosystem: TEcosystem;
+  protected emitter: EnhancedEventEmitter<ConnectorEvents & ClientEvents> =
+    EnhancedEventEmitter.init();
+
+  constructor(name: TWalletName, ecosystem: TEcosystem) {
+    this.name = name;
+    this.ecosystem = ecosystem;
+  }
+
+  abstract connect(options?: { chainId: string }): Promise<ConnectionResponse>;
+
+  abstract disconnect(): Promise<DisconnectionResponse>;
+
+  abstract getAccount(): Promise<string[]>;
+
+  getChainId?(): Promise<string>;
+
+  abstract getProvider(): Promise<TProvider>;
+
+  abstract signMessage(message: string): Promise<MessageSignedResponse>;
+
+  switchChain?(
+    chainId: string,
+    options?: AddChainParameter
+  ): Promise<ChainSwitchResponse>;
+}
diff --git a/packages/core/src/types/TProvider.ts b/packages/core/src/types/TProvider.ts
deleted file mode 100644
index b396194..0000000
--- a/packages/core/src/types/TProvider.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type TProvider = any;
diff --git a/packages/core/src/types/baseConnector.ts b/packages/core/src/types/baseConnector.ts
deleted file mode 100644
index 7ff1bc8..0000000
--- a/packages/core/src/types/baseConnector.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-export abstract class BaseConnector<Provider = any> {
-  chain: string;
-  readonly name: string;
-  readonly activeChain: "ethereum" | "solana" | "cosmos" | "tezos";
-  abstract provider?: Provider;
-
-  constructor(
-    chain: string,
-    name: string,
-    activeChain: "ethereum" | "solana" | "cosmos" | "tezos"
-  ) {
-    this.chain = chain;
-    this.name = name;
-    this.activeChain = activeChain;
-  }
-
-  abstract connect({
-    chainId,
-  }: {
-    chainId?: string | undefined;
-  }): Promise<void>;
-
-  // DISCUSSION: We might wanna have the disconnect method only in the client as there is no specific function in wallets
-  abstract disconnect(): Promise<void>;
-
-  abstract getAccount(): Promise<string[]>;
-
-  getChainId?(): Promise<string>;
-
-  abstract getProvider(): Promise<Provider>;
-
-  abstract resolveDid(address: string): Promise<string | null>;
-
-  abstract signMessage(message: string): Promise<string>;
-
-  switchChain?(chainId: string): Promise<void>;
-
-  protected abstract onAccountsChanged(): void;
-  protected abstract onChainChanged(chain: number | string): void;
-  protected abstract onDisconnect(): void;
-}
diff --git a/packages/core/src/types/events.ts b/packages/core/src/types/events.ts
new file mode 100644
index 0000000..389dc49
--- /dev/null
+++ b/packages/core/src/types/events.ts
@@ -0,0 +1,28 @@
+import { TEcosystem } from "../store/storeTypes";
+import { BaseConnector } from "./BaseConnector";
+import { SignatureHash } from "./methodTypes";
+
+export type ConnectorEvents = {
+  connecting: [walletName: string, ecosystem: TEcosystem];
+  connected: [
+    address: string,
+    chainId: string,
+    walletName: string,
+    ecosystem: TEcosystem,
+    activeConnector: BaseConnector,
+  ];
+  disconnected: [walletName: string, ecosystem: TEcosystem];
+  chainChanged: [chainId: string, activeConnector: BaseConnector];
+  accountsChanged: [address: string[], activeConnector: BaseConnector];
+  messageSigned: [signature: SignatureHash, activeConnector: BaseConnector];
+  error: [error: Error];
+  switchingChain: [
+    fromChainId: string | "default",
+    toChainId: string | "default",
+    activeConnector: BaseConnector,
+  ];
+};
+
+export type ClientEvents = {
+  isAutoConnecting: [ecosystem: TEcosystem, lastUsedConnector: BaseConnector];
+};
diff --git a/packages/core/src/types/index.ts b/packages/core/src/types/index.ts
index 4842926..409a945 100644
--- a/packages/core/src/types/index.ts
+++ b/packages/core/src/types/index.ts
@@ -1,15 +1,3 @@
-import { BaseConnector } from './baseConnector';
-import { TProvider } from './TProvider';
+import { BaseConnector } from "./BaseConnector";
 
-type ClientConfig<TProvider> = {
-  chainId: string;
-  connector: BaseConnector<TProvider>;
-};
-
-type ConnectedData<TProvider> = {
-  account: string;
-  chainId: string;
-  provider: TProvider;
-};
-
-export { type ClientConfig, type ConnectedData, BaseConnector, type TProvider };
+export { BaseConnector };
diff --git a/packages/core/src/types/methodTypes.ts b/packages/core/src/types/methodTypes.ts
new file mode 100644
index 0000000..69e0920
--- /dev/null
+++ b/packages/core/src/types/methodTypes.ts
@@ -0,0 +1,46 @@
+import { TEcosystem } from "../store/storeTypes";
+import { BaseConnector } from "./BaseConnector";
+
+export type SignatureHash = string | Uint8Array;
+
+export type ClientConfig = {
+  autoConnect?: boolean;
+  connectors: BaseConnector[];
+};
+
+export interface AddChainParameter {
+  chainId: string;
+  blockExplorerUrls?: string[];
+  chainName?: string;
+  iconUrls?: string[];
+  nativeCurrency?: {
+    name: string;
+    symbol: string;
+    decimals: number;
+  };
+  rpcUrls?: string[];
+}
+
+export type ConnectionResponse = {
+  address: string;
+  chainId: string;
+  walletName: string;
+  ecosystem: TEcosystem;
+  activeConnector: BaseConnector;
+};
+
+export type DisconnectionResponse = {
+  walletName: string;
+  ecosystem: TEcosystem;
+};
+
+export type MessageSignedResponse = {
+  signature: SignatureHash;
+  activeConnector: BaseConnector;
+};
+
+export type ChainSwitchResponse = {
+  fromChainId: string | "mainnet";
+  toChainId: string | "mainnet";
+  activeConnector: BaseConnector;
+};
diff --git a/packages/core/src/utils/EnhancedEventEmitter.ts b/packages/core/src/utils/EnhancedEventEmitter.ts
new file mode 100644
index 0000000..e23735e
--- /dev/null
+++ b/packages/core/src/utils/EnhancedEventEmitter.ts
@@ -0,0 +1,89 @@
+import { EventEmitter } from "events";
+import { ClientEvents, ConnectorEvents } from "../types/events";
+
+export type Events = Record<string, unknown[]>;
+
+class EnhancedEventEmitter<E extends Events = ConnectorEvents & ClientEvents> {
+  static #instance: EnhancedEventEmitter<Events>;
+  private emitter: EventEmitter;
+
+  private constructor() {
+    this.emitter = new EventEmitter();
+    this.emitter.setMaxListeners(Infinity);
+  }
+
+  static init = () => {
+    if (!EnhancedEventEmitter.#instance)
+      EnhancedEventEmitter.#instance = new EnhancedEventEmitter<
+        ConnectorEvents & ClientEvents
+      >();
+    return EnhancedEventEmitter.#instance;
+  };
+
+  public on<K extends keyof E>(
+    eventName: K,
+    listener: (...args: E[K]) => void
+  ): this {
+    this.emitter.on(
+      eventName as string,
+      // rome-ignore lint/suspicious/noExplicitAny: need to override the type because default it's any[ and we cannot assign E[K] to any[]
+      listener as unknown as (...args: any[]) => void
+    );
+    return this;
+  }
+
+  public off<K extends keyof E>(
+    eventName: K,
+    listener: (...args: E[K]) => void
+  ): this {
+    this.emitter.off(
+      eventName as string,
+      // rome-ignore lint/suspicious/noExplicitAny: <explanation>
+      listener as unknown as (...args: any[]) => void
+    );
+    return this;
+  }
+
+  public listenerCount<K extends keyof E>(eventName: K): number {
+    return this.emitter.listenerCount(eventName as string);
+  }
+
+  public listeners<K extends keyof E>(
+    eventName: K
+  ): ((...args: E[K]) => void)[] {
+    return this.emitter.listeners(eventName as string) as ((
+      ...args: E[K]
+    ) => void)[];
+  }
+
+  public emit<K extends keyof E>(eventName: K, ...args: E[K]): boolean {
+    return this.emitter.emit(eventName as string, ...args);
+  }
+
+  public safeEmit<K extends keyof E>(eventName: K, ...args: E[K]): boolean {
+    return this.emitter.emit(eventName as string, ...args);
+  }
+
+  public once<K extends keyof E>(
+    eventName: K,
+    listener: (...args: E[K]) => void
+  ): this {
+    this.emitter.once(
+      eventName as string,
+      // rome-ignore lint/suspicious/noExplicitAny: <explanation>
+      listener as unknown as (...args: any[]) => void
+    );
+    return this;
+  }
+
+  protected removeAllListeners<K extends keyof E>(eventName?: K): this {
+    if (eventName) {
+      this.emitter.removeAllListeners(eventName as string);
+    } else {
+      this.emitter.removeAllListeners();
+    }
+    return this;
+  }
+}
+
+export { EnhancedEventEmitter };
diff --git a/packages/core/src/utils/errors.ts b/packages/core/src/utils/errors.ts
new file mode 100644
index 0000000..0c7bbd7
--- /dev/null
+++ b/packages/core/src/utils/errors.ts
@@ -0,0 +1,114 @@
+export class AutoConnectionError extends Error {
+  name = "AutoConnectionError";
+}
+
+export class ProviderNotFoundError extends Error {
+  name = "ProviderNotFoundError";
+  walletName: string;
+
+  constructor({ walletName }: { walletName: string }) {
+    super();
+    this.walletName = walletName;
+  }
+}
+
+export class WalletConnectionError extends Error {
+  name = "WalletConnectionError";
+  walletName: string;
+
+  constructor({ walletName }: { walletName: string }) {
+    super(`Error while connecting to ${walletName} wallet.`);
+    this.walletName = walletName;
+  }
+}
+
+export class WalletNotConnectedError extends Error {
+  name = "WalletNotConnectedError";
+  walletName: string;
+
+  constructor({ walletName }: { walletName: string }) {
+    super(`${walletName} wallet is not connected.`);
+    this.walletName = walletName;
+  }
+}
+
+export class UnknownError extends Error {
+  name = "UnknownError";
+
+  constructor({
+    walletName,
+    atFunction,
+  }: {
+    walletName: string;
+    atFunction: string;
+  }) {
+    super(
+      `There was an unexpected error while using ${walletName} wallet at ${atFunction}(). Check console for more details.`
+    );
+  }
+}
+
+export class UserRejectedRequestError extends Error {
+  name = "UserRejectedRequestError";
+
+  constructor() {
+    super(`User rejected the request.`);
+  }
+}
+
+export class UnsupportedChainError extends Error {
+  name = "UnsupportedChainError";
+  chainId: string;
+
+  constructor({ chainId }: { chainId: string }) {
+    super(`ChainId: ${chainId} is not supported`);
+    this.chainId = chainId;
+  }
+}
+
+export class WalletCreationError extends Error {
+  name = "WalletCreationError";
+
+  constructor({ walletName }: { walletName: string }) {
+    super(`Error while creating ${walletName} wallet.`);
+  }
+}
+
+export class MessageSignError extends Error {
+  name = "MessageSignError";
+
+  constructor({ walletName }: { walletName: string }) {
+    super(`Error while signing message with ${walletName} wallet.`);
+  }
+}
+
+export class UnrecognisedChainError extends Error {
+  name = "UnrecognisedChainError";
+
+  constructor({
+    walletName,
+    chainId,
+  }: {
+    walletName: string;
+    chainId: string;
+  }) {
+    super(
+      `Unrecognised chainId ${chainId} provided. Please provide options to add chain to ${walletName} wallet.`
+    );
+  }
+}
+
+export class AddressNotFoundError extends Error {
+  name = "AddressNotFoundError";
+  constructor({ walletName }: { walletName: string }) {
+    super(`Address not found in ${walletName} wallet.`);
+  }
+}
+
+export class WalletNotInstalledError extends Error {
+  name = "WalletNotInstalledError";
+
+  constructor({ walletName }: { walletName: string }) {
+    super(`${walletName} wallet is not installed.`);
+  }
+}
diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
new file mode 100644
index 0000000..4b03ceb
--- /dev/null
+++ b/packages/core/src/utils/index.ts
@@ -0,0 +1,6 @@
+const setLastUsedConnector = (connectorName: string) => {
+  if (localStorage.getItem("lastUsedConnector") !== connectorName)
+    localStorage.setItem("lastUsedConnector", connectorName);
+};
+
+export default setLastUsedConnector;
diff --git a/packages/core/src/utils/util.ts b/packages/core/src/utils/util.ts
deleted file mode 100644
index ab12913..0000000
--- a/packages/core/src/utils/util.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-const setLastUsedConnector = (connectorName: string) => {
-  if (localStorage.getItem('lastUsedConnector') !== connectorName)
-    localStorage.setItem('lastUsedConnector', connectorName);
-};
-
-export default setLastUsedConnector;
diff --git a/packages/core/tsup.config.ts b/packages/core/tsup.config.ts
index 3fe8046..012413c 100644
--- a/packages/core/tsup.config.ts
+++ b/packages/core/tsup.config.ts
@@ -10,5 +10,5 @@ export default defineConfig({
   entryPoints: ["src/index.ts"],
   target: "es2020",
   outDir: "dist",
-  entry: ["src/**/*.ts"], //include all files under src
+  entry: ["src/index.ts"],
 });
diff --git a/packages/cosmos/CHANGELOG.md b/packages/cosmos/CHANGELOG.md
index 790a97f..7c3a0ea 100644
--- a/packages/cosmos/CHANGELOG.md
+++ b/packages/cosmos/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @wallet01/cosmos
 
+## 0.8.0-beta.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.1
+
+## 0.8.0-beta.0
+
+### Minor Changes
+
+- New events based architecture Wallet01; updated connectors and react package
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.0
+
 ## 0.7.5
 
 ### Patch Changes
diff --git a/packages/cosmos/package.json b/packages/cosmos/package.json
index 41a88d1..6f2e6d6 100644
--- a/packages/cosmos/package.json
+++ b/packages/cosmos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wallet01/cosmos",
-  "version": "0.7.5",
+  "version": "0.8.0-beta.1",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "import": "dist/index.js",
@@ -12,7 +12,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@keplr-wallet/types": "^0.11.13",
+    "@keplr-wallet/types": "^0.12.32",
     "@wallet01/core": "workspace:*",
     "eventemitter3": "^4.0.7"
   },
diff --git a/packages/cosmos/src/connectors/keplr.ts b/packages/cosmos/src/connectors/keplr.ts
index 8a284e7..2d3618b 100644
--- a/packages/cosmos/src/connectors/keplr.ts
+++ b/packages/cosmos/src/connectors/keplr.ts
@@ -1,35 +1,69 @@
 import { Window as KeplrWindow } from "@keplr-wallet/types";
 import { KeplrProvider } from "../providers/keplrProvider";
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
-import emitter from "../utils/emiter";
+import {
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+} from "@wallet01/core";
+import { AddressNotFoundError } from "../utils/errors";
+import {
+  ChainSwitchResponse,
+  ConnectionResponse,
+  MessageSignedResponse,
+} from "@wallet01/core/dist/types/methodTypes";
 
 declare const window: KeplrWindow;
 
 export class KeplrConnector extends BaseConnector<KeplrProvider> {
+  static #instance: BaseConnector<KeplrProvider>;
   provider!: KeplrProvider;
+  private chain = "secret-4";
 
-  constructor(chain: string = "secret-4") {
-    super(chain, "keplr", "cosmos");
+  private constructor(chainId?: string) {
+    super("keplr", "cosmos");
+    if (chainId) this.chain = chainId;
   }
 
-  async getProvider(): Promise<KeplrProvider> {
-    if (typeof window !== "undefined" && window.keplr) {
-      this.provider = window.keplr;
-      return this.provider;
-    } else {
-      throw new Error("Wallet Not Installed!");
+  static init(chainId?: string) {
+    if (!KeplrConnector.#instance) {
+      KeplrConnector.#instance = new KeplrConnector(
+        chainId
+      ) as BaseConnector<KeplrProvider>;
     }
+    return KeplrConnector.#instance;
   }
 
-  async getAccount(): Promise<string[]> {
-    if (!this.provider) throw new Error("Provider undefined");
+  async getProvider() {
     try {
+      if (typeof window !== "undefined" && window.keplr) {
+        this.provider = window.keplr;
+        return this.provider;
+      }
+      throw new ProviderNotFoundError({ walletName: this.name });
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getProvider",
+      });
+    }
+  }
+
+  async getAccount() {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
       await this.provider.enable(this.chain);
       const { bech32Address } = await this.provider.getKey(this.chain);
       return [bech32Address];
     } catch (error) {
       console.error({ error });
-      throw new Error("Error in getting accounts");
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getAccount",
+      });
     }
   }
 
@@ -37,69 +71,126 @@ export class KeplrConnector extends BaseConnector<KeplrProvider> {
     return this.chain;
   }
 
-  async switchChain(chainId: string): Promise<void> {
-    if (!this.provider) throw new Error("Provider undefined");
+  async switchChain(chainId: string): Promise<ChainSwitchResponse> {
+    if (!this.provider) await this.getProvider();
     try {
-      await this.provider.enable(chainId);
-      this.chain = chainId;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const fromChainId = await this.getChainId();
+
+      const toChainId = chainId;
+
+      await this.provider.disable();
+
+      await this.provider.enable(toChainId);
+      this.chain = toChainId;
+
+      this.emitter.emit(
+        "switchingChain",
+        fromChainId,
+        toChainId,
+        KeplrConnector.#instance
+      );
+
+      return {
+        fromChainId,
+        toChainId,
+        activeConnector: KeplrConnector.#instance,
+      };
     } catch (err) {
       console.error(err);
       throw err;
     }
   }
 
-  async connect({ chainId = "secret-4" }): Promise<void> {
+  async connect(
+    options?: { chainId: string } | undefined
+  ): Promise<ConnectionResponse> {
+    if (!this.provider) await this.getProvider();
     try {
-      const provider = await this.getProvider();
-      if (!provider) throw new Error("Keplr not installed");
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
 
-      await this.provider.enable(chainId);
-      this.chain = chainId;
-      setLastUsedConnector(this.name);
+      if (options?.chainId) {
+        await this.switchChain(options.chainId);
+        this.chain = options.chainId;
+      } else {
+        await this.provider.enable(this.chain);
+      }
+
+      const { bech32Address } = await this.provider.getKey(this.chain);
+
+      this.emitter.emit(
+        "connected",
+        bech32Address,
+        this.chain,
+        this.name,
+        this.ecosystem,
+        KeplrConnector.#instance
+      );
+
+      return {
+        activeConnector: KeplrConnector.#instance,
+        address: bech32Address,
+        chainId: this.chain,
+        ecosystem: this.ecosystem,
+        walletName: this.name,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "connect",
+      });
     }
   }
 
-  async disconnect(): Promise<void> {
-    this.chain = "";
-    emitter.emit("disconnected");
-  }
-
-  async resolveDid(_address: string): Promise<string | null> {
-    console.error("Cosmos Ecosystem doesn't support DIDs as of now");
-    throw new Error("Cosmos Ecosystem doesn't support DIDs as of now");
+  async disconnect() {
+    if (!this.provider) await this.getProvider();
+    try {
+      await this.provider.disable();
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "disconnect",
+      });
+    }
   }
 
-  async signMessage(message: string): Promise<string> {
-    if (!this.provider) throw new Error("Provider Undefined");
+  async signMessage(message: string): Promise<MessageSignedResponse> {
+    if (!this.provider) await this.getProvider();
     try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
       const address = (await this.getAccount())[0];
 
-      if (!address) throw new Error("No address found");
+      if (!address) throw new AddressNotFoundError({ walletName: this.name });
 
       const { signature } = await this.provider.signArbitrary(
         this.chain,
         address,
         message
       );
-      return signature;
-    } catch (error) {
-      console.warn(error);
-      throw error;
-    }
-  }
-
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
-  }
 
-  protected onChainChanged(_chain: string | number): void {
-    console.log("Chain Changed");
-  }
+      this.emitter.emit("messageSigned", signature, KeplrConnector.#instance);
 
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
+      return {
+        signature,
+        activeConnector: KeplrConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "signMessage",
+      });
+    }
   }
 }
diff --git a/packages/cosmos/src/types/chainConfig.ts b/packages/cosmos/src/types/chainConfig.ts
deleted file mode 100644
index f91530f..0000000
--- a/packages/cosmos/src/types/chainConfig.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type CustomChainConfig = {
-  chainNamespace: 'eip155' | 'solana' | 'other';
-  chainId: string;
-  rpcTarget?: string;
-  displayName: string;
-  blockExplorer?: string;
-  ticker: string;
-  tickerName: string;
-};
diff --git a/packages/cosmos/src/types/index.ts b/packages/cosmos/src/types/index.ts
deleted file mode 100644
index a2ef279..0000000
--- a/packages/cosmos/src/types/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { BaseConnector } from '@wallet01/core';
-import { CustomChainConfig } from './chainConfig';
-
-type ClientConfig<TProvider> = {
-  chainConfig: CustomChainConfig;
-  connector: BaseConnector<TProvider>;
-};
-
-type ConnectedData<TProvider> = {
-  account: string;
-  chainId: string;
-  provider: TProvider;
-};
-
-export { type CustomChainConfig, type ClientConfig, type ConnectedData };
diff --git a/packages/cosmos/src/utils/emiter.ts b/packages/cosmos/src/utils/emiter.ts
deleted file mode 100644
index 17c4b4b..0000000
--- a/packages/cosmos/src/utils/emiter.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import EventEmitter from 'eventemitter3';
-
-const eventEmitter = new EventEmitter();
-const emitter = {
-  on: (event: string, fn: (args: any) => void) => eventEmitter.on(event, fn),
-  once: (event: string, fn: () => void) => eventEmitter.once(event, fn),
-  off: (event: string, fn: () => void) => eventEmitter.off(event, fn),
-  emit: (event: string, payload?: unknown) => eventEmitter.emit(event, payload),
-};
-
-Object.freeze(emitter);
-export default emitter;
diff --git a/packages/cosmos/src/utils/errors.ts b/packages/cosmos/src/utils/errors.ts
new file mode 100644
index 0000000..f36ba57
--- /dev/null
+++ b/packages/cosmos/src/utils/errors.ts
@@ -0,0 +1,6 @@
+export class AddressNotFoundError extends Error {
+  name = "AddressNotFoundError";
+  constructor({ walletName }: { walletName: string }) {
+    super(`Address not found in ${walletName} wallet.`);
+  }
+}
diff --git a/packages/evm/CHANGELOG.md b/packages/evm/CHANGELOG.md
index fb8c1f6..29a9749 100644
--- a/packages/evm/CHANGELOG.md
+++ b/packages/evm/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @wallet01/evm
 
+## 0.12.0-beta.2
+
+### Patch Changes
+
+- Adding metamask connector
+
+## 0.12.0-beta.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.1
+
+## 0.12.0-beta.0
+
+### Minor Changes
+
+- New events based architecture Wallet01; updated connectors and react package
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.0
+
 ## 0.11.1
 
 ### Patch Changes
diff --git a/packages/evm/package.json b/packages/evm/package.json
index bd307a0..a66110f 100644
--- a/packages/evm/package.json
+++ b/packages/evm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wallet01/evm",
-  "version": "0.11.1",
+  "version": "0.12.0-beta.2",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "import": "dist/index.js",
@@ -12,7 +12,7 @@
     "dev": "pnpm build --watch"
   },
   "dependencies": {
-    "@coinbase/wallet-sdk": "^3.6.3",
+    "@coinbase/wallet-sdk": "^3.7.2",
     "@ethersproject/providers": "^5.7.2",
     "@metamask/detect-provider": "^2.0.0",
     "@rize-labs/banana-wallet-sdk": "^0.1.18",
@@ -20,7 +20,6 @@
     "@walletconnect/ethereum-provider": "^2.8.2",
     "@walletconnect/modal": "^2.5.2",
     "@web3modal/core": "^2.2.2",
-    "@web3modal/standalone": "^2.2.2",
     "ethers": "^5.7.2",
     "eventemitter3": "^4.0.7"
   },
diff --git a/packages/evm/src/connectors/banana.ts b/packages/evm/src/connectors/banana.ts
index 4b62336..ca66ebc 100644
--- a/packages/evm/src/connectors/banana.ts
+++ b/packages/evm/src/connectors/banana.ts
@@ -1,94 +1,98 @@
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
+import {
+  BaseConnector,
+  MessageSignError,
+  ProviderNotFoundError,
+  UnknownError,
+  UnsupportedChainError,
+  WalletConnectionError,
+  WalletCreationError,
+  WalletNotConnectedError,
+} from "@wallet01/core";
 import {
   Banana4337Provider,
   Banana,
   Wallet,
+  Chains,
 } from "@rize-labs/banana-wallet-sdk";
 import { isBananSupported, getBananaSupportedChain } from "../utils/helpers";
 
 export class BananaConnector extends BaseConnector<Banana4337Provider> {
+  static #instance: BaseConnector<Banana4337Provider>;
+
   provider!: Banana4337Provider;
-  BananaInstance: Banana;
-  wallet!: Wallet;
-  address!: string;
-  connected!: boolean;
-
-  constructor(chain: string = "80001") {
-    super(chain, "banana", "ethereum");
-    if (isBananSupported(chain)) {
-      const bananaChain = getBananaSupportedChain(chain);
-      this.BananaInstance = new Banana(bananaChain);
-    } else {
-      throw new Error("Chainid passed not supported");
+  private BananaInstance!: Banana;
+  private wallet!: Wallet;
+
+  private constructor() {
+    super("banana", "ethereum");
+  }
+
+  static init() {
+    if (!BananaConnector.#instance) {
+      BananaConnector.#instance =
+        new BananaConnector() as BaseConnector<Banana4337Provider>;
     }
+    return BananaConnector.#instance;
   }
 
   async getProvider(): Promise<Banana4337Provider> {
-    try {
-      if (!this.provider) {
-        if (this.wallet) {
-          const provider = this.wallet.getProvider();
-          this.provider = provider;
-          return this.provider;
-        }
-        await this.connect();
-        //@ts-ignore
-        this.provider = this.wallet.getProvider();
-        return this.provider;
-      }
-
-      return this.provider;
-    } catch (error) {
-      console.error(error);
-      throw error;
+    if (!this.provider) {
+      throw new ProviderNotFoundError({ walletName: this.name });
     }
+
+    return this.provider;
   }
 
-  async connect(): Promise<void> {
+  async connect() {
+    this.BananaInstance = new Banana(Chains.mumbai);
     const walletName = this.BananaInstance.getWalletName();
-    let provider;
 
     if (walletName) {
       this.wallet = await this.BananaInstance.connectWallet(walletName);
       if (!this.wallet) {
-        throw new Error("Wallet connection failed");
+        throw new WalletConnectionError({ walletName: this.name });
       }
-      provider = this.wallet.getProvider();
+      this.provider = this.wallet.getProvider();
     } else {
       // @ts-ignore-next-line
       this.wallet = await this.BananaInstance.createWallet();
       if (!this.wallet) {
-        throw new Error("Wallet creation failed");
+        throw new WalletCreationError({ walletName: this.name });
       }
 
-      provider = this.wallet.getProvider();
+      this.provider = this.wallet.getProvider();
     }
-    setLastUsedConnector(this.name);
-
-    provider.on("accountsChanged", this.onAccountsChanged.bind(this));
-    provider.on("disconnect", this.onDisconnect.bind(this));
-    provider.on("chainChanged", this.onChainChanged.bind(this));
 
-    this.address = await this.wallet.getAddress();
-    this.connected = true;
+    this.provider.on("accountsChanged", this.onAccountsChanged.bind(this));
+    this.provider.on("disconnect", this.onDisconnect.bind(this));
+    this.provider.on("chainChanged", this.onChainChanged.bind(this));
+
+    const address = await this.wallet.getAddress();
+    const chainId = await this.getChainId();
+
+    this.emitter.emit(
+      "connected",
+      address,
+      chainId,
+      this.name,
+      this.ecosystem,
+      BananaConnector.#instance
+    );
+
+    return {
+      address,
+      walletName: this.name,
+      chainId,
+      ecosystem: this.ecosystem,
+      activeConnector: BananaConnector.#instance,
+    };
   }
 
-  async resolveDid(address: string): Promise<string | null> {
-    try {
-      if (!this.provider) throw new Error("Wallet not connected");
-      if ((await this.getChainId()) !== "1") return null;
-      const name = this.provider.lookupAddress(address);
-      return name;
-    } catch (error) {
-      console.error(error);
-      throw error;
-    }
-  }
-
-  async switchChain(chainId: string): Promise<void> {
+  async switchChain(chainId: string) {
+    const oldChainId = await this.getChainId();
     const isNewChainSupported = isBananSupported(chainId);
     if (!isNewChainSupported)
-      throw new Error(`Unsupported chainId: ${chainId}`);
+      throw new UnsupportedChainError({ chainId: chainId });
 
     const bananaChain = getBananaSupportedChain(chainId);
 
@@ -96,19 +100,30 @@ export class BananaConnector extends BaseConnector<Banana4337Provider> {
     this.BananaInstance = BananaInstance;
 
     // connect to same wallet with new configs
-    await this.connect();
+    const connection = await this.connect();
+
+    this.emitter.emit("chainChanged", chainId, BananaConnector.#instance);
+
+    return {
+      fromChainId: oldChainId,
+      toChainId: chainId,
+      activeConnector: connection.activeConnector,
+    };
   }
 
-  async signMessage(message: string): Promise<string> {
+  async signMessage(message: string) {
     try {
       if (!this.provider) throw new Error("Wallet not Connected!");
       const signer = this.wallet.getSigner();
       const hash = (await signer.signBananaMessage(message)).signature;
 
-      return hash;
+      return {
+        signature: hash,
+        activeConnector: BananaConnector.#instance,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new MessageSignError({ walletName: this.name });
     }
   }
 
@@ -116,8 +131,9 @@ export class BananaConnector extends BaseConnector<Banana4337Provider> {
   async getAccount(): Promise<string[]> {
     if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet Not Connected");
-      const result = [this.address];
+      if (!this.provider)
+        throw new WalletNotConnectedError({ walletName: this.name });
+      const result = [await this.wallet.getAddress()];
       return result;
     } catch (error) {
       console.error(error);
@@ -126,16 +142,28 @@ export class BananaConnector extends BaseConnector<Banana4337Provider> {
   }
 
   async disconnect() {
-    this.connected = false;
+    this.onDisconnect();
+    return {
+      walletName: this.name,
+      ecosystem: this.ecosystem,
+    };
   }
 
   async getChainId(): Promise<string> {
-    if (this.provider) {
-      const id = this.provider.chainId;
-      this.chain = id.toString();
-      return this.chain;
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const chainId = this.provider.chainId.toString();
+      return chainId;
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getChainId",
+      });
     }
-    return "";
   }
 
   //! Currently Banana wallet has 1:1 mapping with account
@@ -148,6 +176,6 @@ export class BananaConnector extends BaseConnector<Banana4337Provider> {
   }
 
   protected onDisconnect(): void {
-    this.connected = false;
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
   }
 }
diff --git a/packages/evm/src/connectors/coinbase.ts b/packages/evm/src/connectors/coinbase.ts
index 3bbb595..efec765 100644
--- a/packages/evm/src/connectors/coinbase.ts
+++ b/packages/evm/src/connectors/coinbase.ts
@@ -1,23 +1,47 @@
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
+import {
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+  UnrecognisedChainError,
+  UserRejectedRequestError,
+} from "@wallet01/core";
 import { CoinbaseWalletProvider } from "@coinbase/wallet-sdk";
 import { CoinbaseWalletSDK } from "@coinbase/wallet-sdk";
-import { ExternalProvider, Web3Provider } from "@ethersproject/providers";
-import { hexValue } from "ethers/lib/utils.js";
-import { chainData } from "../utils/chains";
+import { hexlify, toUtf8Bytes, hexValue } from "ethers/lib/utils.js";
+import { CoinbaseWalletSDKOptions } from "@coinbase/wallet-sdk/dist/CoinbaseWalletSDK";
+import {
+  AddChainParameter,
+  ConnectionResponse,
+} from "@wallet01/core/dist/types/methodTypes";
+export class CoinbaseConnector extends BaseConnector<
+  CoinbaseWalletProvider,
+  "coinbase"
+> {
+  static #instance: BaseConnector<CoinbaseWalletProvider, "coinbase">;
+  static options: CoinbaseWalletSDKOptions;
+  provider!: CoinbaseWalletProvider;
 
-export class CoinbaseConnector extends BaseConnector<CoinbaseWalletProvider> {
-  provider?: CoinbaseWalletProvider;
+  private constructor(options: CoinbaseWalletSDKOptions) {
+    super("coinbase", "ethereum");
+    CoinbaseConnector.options = options;
+  }
 
-  constructor(chain: string = "1") {
-    super(chain, "coinbase", "ethereum");
+  static init(options: CoinbaseWalletSDKOptions) {
+    if (!CoinbaseConnector.#instance) {
+      CoinbaseConnector.#instance = new CoinbaseConnector(
+        options
+      ) as BaseConnector<CoinbaseWalletProvider, "coinbase">;
+    }
+    return CoinbaseConnector.#instance;
   }
 
   async getProvider(): Promise<CoinbaseWalletProvider> {
     try {
-      const _provider = new CoinbaseWalletSDK({
-        appName: "Wallet01",
-      }).makeWeb3Provider();
-      this.provider = _provider;
+      if (this.provider) return this.provider;
+      const provider = new CoinbaseWalletSDK(
+        CoinbaseConnector.options
+      ).makeWeb3Provider();
+      this.provider = provider;
       return this.provider;
     } catch (error) {
       console.error(error);
@@ -28,115 +52,214 @@ export class CoinbaseConnector extends BaseConnector<CoinbaseWalletProvider> {
   async getAccount(): Promise<string[]> {
     if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet Not Connected");
-      const result: string[] = await this.provider.send(
-        "eth_requestAccounts",
-        []
-      );
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const result = (await this.provider.request({
+        method: "eth_requestAccounts",
+      })) as string[];
+
       return result;
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getAccount",
+      });
     }
   }
 
-  async getChainId(): Promise<string> {
-    if (this.provider) {
-      const id = this.provider.chainId;
-      this.chain = id;
-      return id;
+  async getChainId() {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const id = (await this.provider.request({
+        method: "eth_chainId",
+      })) as string;
+
+      const chainId = parseInt(id, 16).toString();
+      return chainId;
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getChainId",
+      });
     }
-    return "";
   }
 
-  async switchChain(chainId: string): Promise<void> {
-    if (!this.provider) throw new Error("Wallet Not Connected");
-    const id = hexValue(Number(chainId));
-
+  async switchChain(chainId: string, options?: AddChainParameter | undefined) {
+    if (!this.provider) await this.getProvider();
     try {
-      await this.provider.request({
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const oldChainId = await this.getChainId();
+      const hexChainId = hexValue(Number(chainId));
+      const params = [{ chainId: hexChainId }];
+
+      const response = await this.provider.request({
         method: "wallet_switchEthereumChain",
-        params: [{ chainId: id }],
+        params,
       });
-      this.chain = chainId;
-    } catch (error) {
-      console.error(error);
-      if (chainData[chainId]) {
-        this.provider.request({
+
+      if ((response as any).code === 4902) {
+        if (!options) {
+          throw new UnrecognisedChainError({ walletName: this.name, chainId });
+        }
+
+        await this.provider.request({
           method: "wallet_addEthereumChain",
-          params: [{ data: chainData[chainId] }],
+          params: [options],
         });
-        this.switchChain(chainId);
       }
-      throw error;
+
+      this.emitter.emit(
+        "switchingChain",
+        oldChainId,
+        chainId,
+        CoinbaseConnector.#instance
+      );
+
+      return {
+        fromChainId: oldChainId,
+        toChainId: chainId,
+        activeConnector: CoinbaseConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "switchChain",
+      });
     }
   }
 
-  async connect({ chainId }: { chainId?: string | undefined }): Promise<void> {
+  async connect(options?: { chainId: string }): Promise<ConnectionResponse> {
     if (!this.provider) await this.getProvider();
     try {
-      await this.provider?.enable();
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
 
-      let currentId = await this.getChainId();
-      if (chainId && currentId !== chainId) {
-        await this.switchChain(chainId);
+      const response = await this.provider.request({
+        method: "eth_requestAccounts",
+      });
+
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
+      }
+
+      this.provider.on("accountsChanged", this._onAccountsChanged);
+      this.provider.on("disconnect", this._onDisconnect);
+      this.provider.on("chainChanged", this._onChainChanged);
+
+      const currentId = await this.getChainId();
+      if (options?.chainId && currentId !== options.chainId) {
+        await this.switchChain(options.chainId);
       }
 
-      setLastUsedConnector(this.name);
+      const address = await this.getAccount();
+
+      this.emitter.emit(
+        "connected",
+        address[0]!,
+        currentId,
+        this.name,
+        this.ecosystem,
+        CoinbaseConnector.#instance
+      );
+
+      return {
+        address: address[0]!,
+        walletName: this.name,
+        chainId: currentId,
+        ecosystem: this.ecosystem,
+        activeConnector: CoinbaseConnector.#instance,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "connect",
+      });
     }
   }
 
-  async disconnect(): Promise<void> {
-    if (!this.provider) throw new Error("Wallet already disconnected");
-    await this.provider.disconnect();
-    this.provider = undefined;
-  }
-
-  async resolveDid(address: string): Promise<string | null> {
+  async disconnect() {
+    if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet not connected");
-      if ((await this.getChainId()) !== "1") return null;
+      await this.provider.disconnect();
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
 
-      const _provider = new Web3Provider(
-        this.provider as unknown as ExternalProvider
-      );
-      const name = _provider.lookupAddress(address);
-      return name;
+      this.provider.removeListener("accountsChanged", this._onAccountsChanged);
+      this.provider.removeListener("disconnect", this._onDisconnect);
+      this.provider.removeListener("chainChanged", this._onChainChanged);
+
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "disconnect",
+      });
     }
   }
 
-  async signMessage(message: string): Promise<string> {
+  async signMessage(message: string) {
+    if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet not Connected!");
-      const _address = await this.getAccount();
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      const address = await this.getAccount();
+
+      const hexMessage = hexlify(toUtf8Bytes(message));
+
+      const response = await this.provider.request({
+        method: "personal_sign",
+        params: [hexMessage, address[0]],
+      });
+
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
+      }
 
-      const signer = new Web3Provider(
-        this.provider as unknown as ExternalProvider
-      ).getSigner(_address[0]);
+      this.emitter.emit(
+        "messageSigned",
+        response as string,
+        CoinbaseConnector.#instance
+      );
 
-      const hash = await signer.signMessage(message);
-      return hash;
+      return {
+        signature: response as string,
+        activeConnector: CoinbaseConnector.#instance,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "signMessage",
+      });
     }
   }
 
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
-  }
+  protected _onAccountsChanged = (accounts: string[]) => {
+    this.emitter.emit("accountsChanged", accounts, CoinbaseConnector.#instance);
+  };
 
-  protected onChainChanged(_chain: string): void {
-    console.log("Chain Changed");
-  }
+  protected _onChainChanged = (hexChainId: string) => {
+    const chainId = parseInt(hexChainId, 16).toString();
+    this.emitter.emit("chainChanged", chainId, CoinbaseConnector.#instance);
+  };
 
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
-  }
+  protected _onDisconnect = (error: any) => {
+    console.error({
+      error,
+    });
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
+  };
 }
diff --git a/packages/evm/src/connectors/injected.ts b/packages/evm/src/connectors/injected.ts
index 2a228eb..56e300a 100644
--- a/packages/evm/src/connectors/injected.ts
+++ b/packages/evm/src/connectors/injected.ts
@@ -1,149 +1,275 @@
-import { hexValue } from "ethers/lib/utils.js";
-import { Web3Provider, ExternalProvider } from "@ethersproject/providers";
-import detectEthereumProvider from "@metamask/detect-provider";
+import { hexValue, toUtf8Bytes, hexlify } from "ethers/lib/utils.js";
+import { Web3Provider } from "@ethersproject/providers";
 
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
+import {
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+  UnrecognisedChainError,
+  UserRejectedRequestError,
+} from "@wallet01/core";
 
-import emitter from "../utils/emiter";
-import { chainData } from "../utils/chains";
+import {
+  AddChainParameter,
+  ChainSwitchResponse,
+} from "@wallet01/core/dist/types/methodTypes";
+import { ProviderRpcError } from "@walletconnect/ethereum-provider/dist/types/types";
 
 export class InjectedConnector extends BaseConnector<Web3Provider> {
-  provider?: Web3Provider;
+  static #instance: BaseConnector<Web3Provider>;
+  provider!: Web3Provider;
 
-  constructor(chain: string = "1") {
-    super(chain, "injected", "ethereum");
+  private constructor() {
+    super("injected", "ethereum");
+  }
+
+  static init() {
+    if (!InjectedConnector.#instance) {
+      InjectedConnector.#instance =
+        new InjectedConnector() as BaseConnector<Web3Provider>;
+    }
+    return InjectedConnector.#instance;
   }
 
   async getProvider() {
     try {
-      const provider = await detectEthereumProvider();
+      if (this.provider) return this.provider;
 
-      const _provider = new Web3Provider(
-        <ExternalProvider>(<unknown>provider),
-        "any"
-      );
-      this.provider = _provider;
+      const windowProvider = window.ethereum;
+
+      if (!windowProvider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const provider = new Web3Provider(windowProvider);
+
+      this.provider = provider;
       return this.provider;
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getProvider",
+      });
     }
   }
 
   async getAccount(): Promise<string[]> {
     if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
-      const result = await this.provider.send("eth_requestAccounts", []);
-      return result;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const accounts = (await this.provider.send(
+        "eth_requestAccounts",
+        []
+      )) as string[];
+
+      return accounts;
     } catch (err) {
       console.error(err);
-      throw err;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getAccount",
+      });
     }
   }
 
   async getChainId(): Promise<string> {
-    if (this.provider) {
-      const chainId = await (
-        await this.provider.getNetwork()
-      ).chainId.toString();
-      this.chain = chainId;
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const id = (await this.provider.send("eth_chainId", [])) as string;
+
+      const chainId = parseInt(id, 16).toString();
       return chainId;
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getChainId",
+      });
     }
-    return "";
   }
 
-  async switchChain(chainId: string): Promise<void> {
-    const provider = await this.getProvider();
-
-    const id = hexValue(Number(chainId));
+  async switchChain(
+    chainId: string,
+    options?: AddChainParameter | undefined
+  ): Promise<ChainSwitchResponse> {
+    if (!this.provider) await this.getProvider();
     try {
-      await provider?.send("wallet_switchEthereumChain", [{ chainId: id }]);
-      this.chain = chainId;
-    } catch (error: any) {
-      console.log("error in switching chain", error);
-      if (error.code === 4902 && chainData[chainId]) {
-        await this.addChain(chainId, provider);
-        await this.switchChain(chainId);
-      } else {
-        throw error;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const oldChainId = await this.getChainId();
+      const hexChainId = hexValue(Number(chainId));
+      const params = [{ chainId: hexChainId }];
+
+      try {
+        await this.provider.send("wallet_switchEthereumChain", params);
+      } catch (error) {
+        if (
+          (error as ProviderRpcError).code &&
+          (error as ProviderRpcError).code === 4902
+        ) {
+          if (!options) {
+            throw new UnrecognisedChainError({
+              walletName: this.name,
+              chainId,
+            });
+          }
+
+          await this.provider.send("wallet_addEthereumChain", [options]);
+        }
       }
+
+      this.emitter.emit(
+        "switchingChain",
+        oldChainId,
+        chainId,
+        InjectedConnector.#instance
+      );
+
+      return {
+        fromChainId: oldChainId,
+        toChainId: chainId,
+        activeConnector: InjectedConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "switchChain",
+      });
     }
   }
 
-  async connect({ chainId }: { chainId: string }) {
+  async connect(options?: { chainId: string }) {
+    if (!this.provider) await this.getProvider();
     try {
-      const provider = await this.getProvider();
-      this.provider = provider;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const response = await this.provider.send("eth_requestAccounts", []);
 
-      if (provider.on) {
-        provider.on("accountsChanged", this.onAccountsChanged);
-        provider.on("chainChanged", this.onChainChanged);
-        provider.on("disconnect", this.onDisconnect);
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
       }
 
-      let id = await this.getChainId();
+      window.ethereum.on("accountsChanged", this._onAccountsChanged);
+      window.ethereum.on("disconnect", this._onDisconnect);
+      window.ethereum.on("chainChanged", this._onChainChanged);
 
-      if (chainId && id !== chainId) {
-        await this.switchChain(chainId);
+      const currentId = await this.getChainId();
+      if (options?.chainId && currentId !== options.chainId) {
+        await this.switchChain(options.chainId);
       }
 
-      setLastUsedConnector(this.name);
+      const address = await this.getAccount();
 
-      emitter.emit("connected");
-    } catch (error) {
-      console.error(error, "in connect");
-      throw error;
-    }
-  }
-
-  async disconnect(): Promise<void> {
-    this.provider = undefined;
-    emitter.emit("disconnected");
-  }
+      this.emitter.emit(
+        "connected",
+        address[0]!,
+        currentId,
+        this.name,
+        this.ecosystem,
+        InjectedConnector.#instance
+      );
 
-  async resolveDid(address: string): Promise<string | null> {
-    try {
-      if ((await this.getChainId()) !== "1") return null;
-      const provider = await this.getProvider();
-      const name = await provider.lookupAddress(address);
-      return name;
+      return {
+        address: address[0]!,
+        walletName: this.name,
+        chainId: currentId,
+        ecosystem: this.ecosystem,
+        activeConnector: InjectedConnector.#instance,
+      };
     } catch (error) {
-      console.error({ error }, "resolveDid");
-      throw error;
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "connect",
+      });
     }
   }
 
-  async signMessage(message: string): Promise<string> {
+  async disconnect() {
+    if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Connect a wallet!");
-      const signer = await this.provider.getSigner();
-      const hash = await signer.signMessage(message);
-      return hash;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      window.ethereum.removeListener(
+        "accountsChanged",
+        this._onAccountsChanged
+      );
+      window.ethereum.removeListener("chainChanged", this._onChainChanged);
+      window.ethereum.removeListener("disconnect", this._onDisconnect);
+
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "disconnect",
+      });
     }
   }
 
-  private async addChain(chainId: string, provider: Web3Provider) {
+  async signMessage(message: string) {
+    if (!this.provider) await this.getProvider();
     try {
-      await provider.send("wallet_addEthereumChain", [chainData[chainId]]);
-    } catch (error: any) {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      const address = await this.getAccount();
+
+      const hexMessage = hexlify(toUtf8Bytes(message));
+
+      const response = await this.provider.send("personal_sign", [
+        hexMessage,
+        address[0],
+      ]);
+
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
+      }
+
+      this.emitter.emit(
+        "messageSigned",
+        response as string,
+        InjectedConnector.#instance
+      );
+
+      return {
+        signature: response as string,
+        activeConnector: InjectedConnector.#instance,
+      };
+    } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "signMessage",
+      });
     }
   }
 
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
-  }
+  protected _onAccountsChanged = (accounts: string[]) => {
+    this.emitter.emit("accountsChanged", accounts, InjectedConnector.#instance);
+  };
 
-  protected onChainChanged(_chain: string): void {
-    console.log("Chain Changed");
-  }
+  protected _onChainChanged = (hexChainId: string) => {
+    const chainId = parseInt(hexChainId, 16).toString();
+    this.emitter.emit("chainChanged", chainId, InjectedConnector.#instance);
+  };
 
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
-  }
+  protected _onDisconnect = (error: any) => {
+    console.error({
+      error,
+    });
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
+  };
 }
diff --git a/packages/evm/src/connectors/metamask.ts b/packages/evm/src/connectors/metamask.ts
new file mode 100644
index 0000000..7495d1d
--- /dev/null
+++ b/packages/evm/src/connectors/metamask.ts
@@ -0,0 +1,299 @@
+import {
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+  UnrecognisedChainError,
+  UserRejectedRequestError,
+} from "@wallet01/core";
+import { Web3Provider } from "@ethersproject/providers";
+import {
+  AddChainParameter,
+  ChainSwitchResponse,
+} from "@wallet01/core/dist/types/methodTypes";
+import { hexValue, hexlify, toUtf8Bytes } from "ethers/lib/utils.js";
+import { ProviderRpcError } from "@walletconnect/ethereum-provider/dist/types/types";
+
+export class MetamaskConnector extends BaseConnector<Web3Provider> {
+  static #instance: BaseConnector<Web3Provider>;
+  provider!: Web3Provider;
+
+  protected constructor() {
+    super("metamask", "ethereum");
+  }
+
+  static init() {
+    if (!MetamaskConnector.#instance) {
+      MetamaskConnector.#instance =
+        new MetamaskConnector() as BaseConnector<Web3Provider>;
+    }
+    return MetamaskConnector.#instance;
+  }
+
+  async getProvider() {
+    try {
+      if (this.provider) return this.provider;
+
+      const windowProvider = this.getReady(window.ethereum);
+
+      if (!windowProvider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const provider = new Web3Provider(windowProvider);
+
+      this.provider = provider;
+      return this.provider;
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getProvider",
+      });
+    }
+  }
+
+  async getAccount(): Promise<string[]> {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const accounts = (await this.provider.send(
+        "eth_requestAccounts",
+        []
+      )) as string[];
+
+      return accounts;
+    } catch (err) {
+      console.error(err);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getAccount",
+      });
+    }
+  }
+
+  async getChainId(): Promise<string> {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const id = (await this.provider.send("eth_chainId", [])) as string;
+
+      const chainId = parseInt(id, 16).toString();
+      return chainId;
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getChainId",
+      });
+    }
+  }
+
+  async switchChain(
+    chainId: string,
+    options?: AddChainParameter | undefined
+  ): Promise<ChainSwitchResponse> {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const oldChainId = await this.getChainId();
+      const hexChainId = hexValue(Number(chainId));
+      const params = [{ chainId: hexChainId }];
+
+      try {
+        await this.provider.send("wallet_switchEthereumChain", params);
+      } catch (error) {
+        if (
+          (error as ProviderRpcError).code &&
+          (error as ProviderRpcError).code === 4902
+        ) {
+          if (!options) {
+            throw new UnrecognisedChainError({
+              walletName: this.name,
+              chainId,
+            });
+          }
+
+          await this.provider.send("wallet_addEthereumChain", [options]);
+        }
+      }
+
+      this.emitter.emit(
+        "switchingChain",
+        oldChainId,
+        chainId,
+        MetamaskConnector.#instance
+      );
+
+      return {
+        fromChainId: oldChainId,
+        toChainId: chainId,
+        activeConnector: MetamaskConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "switchChain",
+      });
+    }
+  }
+
+  async connect(options?: { chainId: string }) {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const response = await this.provider.send("eth_requestAccounts", []);
+
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
+      }
+
+      window.ethereum.on("accountsChanged", this._onAccountsChanged);
+      window.ethereum.on("disconnect", this._onDisconnect);
+      window.ethereum.on("chainChanged", this._onChainChanged);
+
+      const currentId = await this.getChainId();
+      if (options?.chainId && currentId !== options.chainId) {
+        await this.switchChain(options.chainId);
+      }
+
+      const address = await this.getAccount();
+
+      this.emitter.emit(
+        "connected",
+        address[0]!,
+        currentId,
+        this.name,
+        this.ecosystem,
+        MetamaskConnector.#instance
+      );
+
+      return {
+        address: address[0]!,
+        walletName: this.name,
+        chainId: currentId,
+        ecosystem: this.ecosystem,
+        activeConnector: MetamaskConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "connect",
+      });
+    }
+  }
+
+  async disconnect() {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      window.ethereum.removeListener(
+        "accountsChanged",
+        this._onAccountsChanged
+      );
+      window.ethereum.removeListener("chainChanged", this._onChainChanged);
+      window.ethereum.removeListener("disconnect", this._onDisconnect);
+
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "disconnect",
+      });
+    }
+  }
+
+  async signMessage(message: string) {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      const address = await this.getAccount();
+
+      const hexMessage = hexlify(toUtf8Bytes(message));
+
+      const response = await this.provider.send("personal_sign", [
+        hexMessage,
+        address[0],
+      ]);
+
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
+      }
+
+      this.emitter.emit(
+        "messageSigned",
+        response as string,
+        MetamaskConnector.#instance
+      );
+
+      return {
+        signature: response as string,
+        activeConnector: MetamaskConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "signMessage",
+      });
+    }
+  }
+
+  protected _onAccountsChanged = (accounts: string[]) => {
+    this.emitter.emit("accountsChanged", accounts, MetamaskConnector.#instance);
+  };
+
+  protected _onChainChanged = (hexChainId: string) => {
+    const chainId = parseInt(hexChainId, 16).toString();
+    this.emitter.emit("chainChanged", chainId, MetamaskConnector.#instance);
+  };
+
+  protected _onDisconnect = (error: any) => {
+    console.error({
+      error,
+    });
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
+  };
+
+  private getReady(ethereum?: any) {
+    const isMetaMask = !!ethereum?.isMetaMask;
+    if (!isMetaMask) return;
+    // Brave tries to make itself look like MetaMask
+    // Could also try RPC `web3_clientVersion` if following is unreliable
+    if (ethereum.isBraveWallet && !ethereum._events && !ethereum._state) return;
+    if (ethereum.isApexWallet) return;
+    if (ethereum.isAvalanche) return;
+    if (ethereum.isBitKeep) return;
+    if (ethereum.isBlockWallet) return;
+    if (ethereum.isCoin98) return;
+    if (ethereum.isFordefi) return;
+    if (ethereum.isMathWallet) return;
+    if (ethereum.isOkxWallet || ethereum.isOKExWallet) return;
+    if (ethereum.isOneInchIOSWallet || ethereum.isOneInchAndroidWallet) return;
+    if (ethereum.isOpera) return;
+    if (ethereum.isPortal) return;
+    if (ethereum.isRabby) return;
+    if (ethereum.isDefiant) return;
+    if (ethereum.isTokenPocket) return;
+    if (ethereum.isTokenary) return;
+    if (ethereum.isZeal) return;
+    if (ethereum.isZerion) return;
+    return ethereum;
+  }
+}
diff --git a/packages/evm/src/connectors/okxwallet.ts b/packages/evm/src/connectors/okxwallet.ts
index d912d15..1309eca 100644
--- a/packages/evm/src/connectors/okxwallet.ts
+++ b/packages/evm/src/connectors/okxwallet.ts
@@ -1,147 +1,273 @@
-import { hexValue } from "ethers/lib/utils.js";
-import { Web3Provider, ExternalProvider } from "@ethersproject/providers";
+import { hexValue, toUtf8Bytes, hexlify } from "ethers/lib/utils.js";
+import { Web3Provider } from "@ethersproject/providers";
 
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
+import {
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+  UnrecognisedChainError,
+  UserRejectedRequestError,
+} from "@wallet01/core";
 
-import emitter from "../utils/emiter";
-import { chainData } from "../utils/chains";
+import {
+  AddChainParameter,
+  ChainSwitchResponse,
+} from "@wallet01/core/dist/types/methodTypes";
 
 interface OkxWalletWindow extends Window {
-  okxwallet?: Web3Provider;
+  okxwallet?: any;
 }
 
 declare const window: OkxWalletWindow;
 
 export class OkxWalletConnector extends BaseConnector<Web3Provider> {
-  provider?: Web3Provider;
+  static #instance: BaseConnector<Web3Provider>;
+  provider!: Web3Provider;
 
-  constructor(chain: string = "1") {
-    super(chain, "okxwallet", "ethereum");
+  private constructor() {
+    super("okxwallet", "ethereum");
+  }
+
+  static init() {
+    if (!OkxWalletConnector.#instance) {
+      OkxWalletConnector.#instance =
+        new OkxWalletConnector() as BaseConnector<Web3Provider>;
+    }
+    return OkxWalletConnector.#instance;
   }
 
   async getProvider() {
-    if (typeof window !== "undefined" && window.okxwallet) {
-      const provider = window.okxwallet;
-      const _provider = new Web3Provider(<ExternalProvider>(<unknown>provider));
-      this.provider = _provider;
+    try {
+      const windowProvider = window.okxwallet;
+
+      if (!windowProvider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const provider = new Web3Provider(windowProvider);
+      this.provider = provider;
       return this.provider;
-    } else {
-      throw new Error("Wallet Not Installed");
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getProvider",
+      });
     }
   }
 
   async getAccount(): Promise<string[]> {
     if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
-      const result = await this.provider.send("eth_requestAccounts", []);
-      return result;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const accounts = (await this.provider.send(
+        "eth_requestAccounts",
+        []
+      )) as string[];
+
+      return accounts;
     } catch (err) {
       console.error(err);
-      throw err;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getAccount",
+      });
     }
   }
 
   async getChainId(): Promise<string> {
-    if (this.provider) {
-      const chainId = (await this.provider.getNetwork()).chainId.toString();
-      this.chain = chainId;
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const id = (await this.provider.send("eth_chainId", [])) as string;
+
+      const chainId = parseInt(id, 16).toString();
       return chainId;
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getChainId",
+      });
     }
-    return "";
   }
 
-  async switchChain(chainId: string): Promise<void> {
-    const provider = await this.getProvider();
-
-    const id = hexValue(Number(chainId));
+  async switchChain(
+    chainId: string,
+    options?: AddChainParameter | undefined
+  ): Promise<ChainSwitchResponse> {
+    if (!this.provider) await this.getProvider();
     try {
-      await provider?.send("wallet_switchEthereumChain", [{ chainId: id }]);
-      this.chain = chainId;
-    } catch (error: any) {
-      console.log("error in switching chain", error);
-      if (error.code === 4902 && chainData[chainId]) {
-        await this.addChain(chainId, provider);
-        await this.switchChain(chainId);
-      } else {
-        throw error;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const oldChainId = await this.getChainId();
+      const hexChainId = hexValue(Number(chainId));
+      const params = [{ chainId: hexChainId }];
+
+      const response = await this.provider.send(
+        "wallet_switchEthereumChain",
+        params
+      );
+
+      if ((response as any).code === 4902) {
+        if (!options) {
+          throw new UnrecognisedChainError({ walletName: this.name, chainId });
+        }
+
+        await this.provider.send("wallet_addEthereumChain", [options]);
       }
+
+      this.emitter.emit(
+        "switchingChain",
+        oldChainId,
+        chainId,
+        OkxWalletConnector.#instance
+      );
+
+      return {
+        fromChainId: oldChainId,
+        toChainId: chainId,
+        activeConnector: OkxWalletConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "switchChain",
+      });
     }
   }
 
-  async connect({ chainId }: { chainId: string }) {
+  async connect(options?: { chainId: string }) {
+    if (!this.provider) await this.getProvider();
     try {
-      const provider = await this.getProvider();
-      this.provider = provider;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const response = await this.provider.send("eth_requestAccounts", []);
 
-      if (provider.on) {
-        provider.on("accountsChanged", this.onAccountsChanged);
-        provider.on("chainChanged", this.onChainChanged);
-        provider.on("disconnect", this.onDisconnect);
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
       }
 
-      let id = await this.getChainId();
+      this.provider.on("accountsChanged", this._onAccountsChanged);
+      this.provider.on("disconnect", this._onDisconnect);
+      this.provider.on("chainChanged", this._onChainChanged);
 
-      if (chainId && id !== chainId) {
-        await this.switchChain(chainId);
+      const currentId = await this.getChainId();
+      if (options?.chainId && currentId !== options.chainId) {
+        await this.switchChain(options.chainId);
       }
 
-      setLastUsedConnector(this.name);
+      const address = await this.getAccount();
 
-      emitter.emit("connected");
-    } catch (error) {
-      console.error(error, "in connect");
-      throw error;
-    }
-  }
+      this.emitter.emit(
+        "connected",
+        address[0]!,
+        await this.getChainId(),
+        this.name,
+        this.ecosystem,
+        OkxWalletConnector.#instance
+      );
 
-  async disconnect(): Promise<void> {
-    this.provider = undefined;
-    emitter.emit("disconnected");
-  }
-
-  async resolveDid(address: string): Promise<string | null> {
-    try {
-      if ((await this.getChainId()) !== "1") return null;
-      const provider = await this.getProvider();
-      const name = await provider.lookupAddress(address);
-      return name;
+      return {
+        address: address[0]!,
+        walletName: this.name,
+        chainId: await this.getChainId(),
+        ecosystem: this.ecosystem,
+        activeConnector: OkxWalletConnector.#instance,
+      };
     } catch (error) {
-      console.error({ error }, "resolveDid");
-      throw error;
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "connect",
+      });
     }
   }
 
-  async signMessage(message: string): Promise<string> {
+  async disconnect() {
+    if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Connect a wallet!");
-      const signer = await this.provider.getSigner();
-      const hash = await signer.signMessage(message);
-      return hash;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      this.provider.removeListener("accountsChanged", this._onAccountsChanged);
+      this.provider.removeListener("chainChanged", this._onChainChanged);
+      this.provider.removeListener("disconnect", this._onDisconnect);
+
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "disconnect",
+      });
     }
   }
 
-  private async addChain(chainId: string, provider: Web3Provider) {
+  async signMessage(message: string) {
+    if (!this.provider) await this.getProvider();
     try {
-      await provider.send("wallet_addEthereumChain", [chainData[chainId]]);
-    } catch (error: any) {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      const address = await this.getAccount();
+
+      const hexMessage = hexlify(toUtf8Bytes(message));
+
+      const response = await this.provider.send("personal_sign", [
+        hexMessage,
+        address[0],
+      ]);
+
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
+      }
+
+      this.emitter.emit(
+        "messageSigned",
+        response as string,
+        OkxWalletConnector.#instance
+      );
+
+      return {
+        signature: response as string,
+        activeConnector: OkxWalletConnector.#instance,
+      };
+    } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "signMessage",
+      });
     }
   }
 
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
-  }
+  protected _onAccountsChanged = (accounts: string[]) => {
+    this.emitter.emit(
+      "accountsChanged",
+      accounts,
+      OkxWalletConnector.#instance
+    );
+  };
 
-  protected onChainChanged(_chain: string): void {
-    console.log("Chain Changed");
-  }
+  protected _onChainChanged = (hexChainId: string) => {
+    const chainId = parseInt(hexChainId, 16).toString();
+    this.emitter.emit("chainChanged", chainId, OkxWalletConnector.#instance);
+  };
 
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
-  }
+  protected _onDisconnect = (error: any) => {
+    console.error({
+      error,
+    });
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
+  };
 }
diff --git a/packages/evm/src/connectors/walletconnect.ts b/packages/evm/src/connectors/walletconnect.ts
index c954bfd..1188dae 100644
--- a/packages/evm/src/connectors/walletconnect.ts
+++ b/packages/evm/src/connectors/walletconnect.ts
@@ -1,53 +1,75 @@
-import { ExternalProvider, Web3Provider } from "@ethersproject/providers";
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
+import { hexlify, hexValue, toUtf8Bytes } from "ethers/lib/utils.js";
+
+import {
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+  UserRejectedRequestError,
+} from "@wallet01/core";
+
 import EthereumProvider, {
   OPTIONAL_METHODS,
   REQUIRED_METHODS,
 } from "@walletconnect/ethereum-provider";
 import { EthereumProviderOptions } from "@walletconnect/ethereum-provider/dist/types/EthereumProvider";
-// import { hexValue } from "ethers/lib/utils.js";
-import { chainData } from "../utils/chains";
-import { hexlify } from "ethers/lib/utils";
 
-type WalletconnectConnectorOptions = {
-  chain?: string;
-} & EthereumProviderOptions;
+import {
+  AddChainParameter,
+  ChainSwitchResponse,
+  ConnectionResponse,
+  DisconnectionResponse,
+} from "@wallet01/core/dist/types/methodTypes";
+
+type WalletconnectConnectorOptions = EthereumProviderOptions;
 
 const NAMESPACE = "eip155";
 const ADD_ETH_CHAIN_METHOD = "wallet_addEthereumChain";
 
 export class WalletconnectConnector extends BaseConnector<EthereumProvider> {
-  provider?: EthereumProvider;
-  private options: EthereumProviderOptions;
+  static #instance: BaseConnector<EthereumProvider>;
+  provider!: EthereumProvider;
+  static options: EthereumProviderOptions;
 
-  constructor({
-    chain = "1",
+  private constructor({
     chains,
     projectId,
-    ...options
+    ...params
   }: WalletconnectConnectorOptions) {
-    super(chain, "walletconnect", "ethereum");
-    this.options = {
+    super("walletconnect", "ethereum");
+    console.log(this.emitter);
+    WalletconnectConnector.options = {
       chains,
       projectId,
-      optionalChains: options.optionalChains ?? [],
-      methods: options.methods ?? REQUIRED_METHODS,
-      optionalMethods: options.optionalMethods ?? OPTIONAL_METHODS,
-      ...options,
+      optionalChains: params.optionalChains ?? [],
+      methods: params.methods ?? REQUIRED_METHODS,
+      optionalMethods: params.optionalMethods ?? OPTIONAL_METHODS,
+      ...params,
     };
+  }
 
-    this.getProvider();
+  static init(options: WalletconnectConnectorOptions) {
+    if (!WalletconnectConnector.#instance) {
+      WalletconnectConnector.#instance = new WalletconnectConnector(
+        options
+      ) as BaseConnector<EthereumProvider>;
+    }
+    return WalletconnectConnector.#instance;
   }
 
   async getProvider(): Promise<EthereumProvider> {
     try {
-      const _provider = await EthereumProvider.init(this.options);
+      const provider = await EthereumProvider.init(
+        WalletconnectConnector.options
+      );
 
-      this.provider = _provider;
+      this.provider = provider;
       return this.provider;
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getProvider",
+      });
     }
   }
 
@@ -59,118 +81,200 @@ export class WalletconnectConnector extends BaseConnector<EthereumProvider> {
       return result;
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getAccount",
+      });
     }
   }
 
-  async getChainId(): Promise<string> {
-    if (this.provider) {
-      const chainId = this.provider.chainId.toString();
-      this.chain = chainId;
-      return chainId;
+  async getChainId() {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const result = await this.provider.chainId.toString();
+      return result;
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getChainId",
+      });
     }
-    return "";
   }
 
-  async switchChain(chainId: string): Promise<void> {
+  async switchChain(
+    chainId: string,
+    options?: AddChainParameter | undefined
+  ): Promise<ChainSwitchResponse> {
     if (!this.provider) await this.getProvider();
-    const _id = hexlify(Number(chainId));
-
     try {
-      if (!this.provider) throw new Error("Provider not found");
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+
+      const oldChainId = await this.getChainId();
+      const hexChainId = hexValue(Number(chainId));
       const namespaceChains = this.getNamespaceChainsIds();
       const namespaceMethods = this.getNamespaceMethods();
       const isChainApproved = namespaceChains.includes(chainId);
 
       if (!isChainApproved && namespaceMethods.includes(ADD_ETH_CHAIN_METHOD)) {
+        if (!namespaceMethods.includes(ADD_ETH_CHAIN_METHOD))
+          throw new Error(
+            `${ADD_ETH_CHAIN_METHOD} method was not passed in the options object`
+          );
+        if (!options)
+          throw new Error(
+            `Given chainId ${chainId} is not approved and no options object was passed to add the chain`
+          );
         await this.provider.request({
           method: ADD_ETH_CHAIN_METHOD,
-          params: [
-            {
-              ...chainData[chainId],
-            },
-          ],
+          params: [options],
         });
       }
 
       await this.provider.request({
         method: "wallet_switchEthereumChain",
-        params: [{ chainId: _id }],
+        params: [{ chainId: hexChainId }],
       });
 
-      this.chain = chainId;
+      this.emitter.emit(
+        "switchingChain",
+        oldChainId,
+        chainId,
+        WalletconnectConnector.#instance
+      );
+
+      return {
+        fromChainId: oldChainId,
+        toChainId: chainId,
+        activeConnector: WalletconnectConnector.#instance,
+      };
     } catch (error) {
-      console.error({ error });
-
-      throw error;
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "switchChain",
+      });
     }
   }
 
-  async connect({ chainId }: { chainId?: string | undefined }): Promise<void> {
+  async connect(options?: { chainId: string }): Promise<ConnectionResponse> {
+    if (!this.provider) await this.getProvider();
     try {
-      const provider = await this.getProvider();
-      const isStaleChain = this.isChainsStale();
-
-      if (provider.session && isStaleChain) await provider.disconnect();
-
-      if (!provider.session || isStaleChain) {
-        const _chainId = Number(chainId || this.chain);
-        await provider.connect({
-          chains: [_chainId],
-          optionalChains: this.options.optionalChains,
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      const isStaleChain = await this.isChainsStale();
+
+      if (this.provider.session && isStaleChain)
+        await this.provider.disconnect();
+
+      if (!this.provider.session || isStaleChain) {
+        const chainIdToConnect = Number(options?.chainId || 1);
+        await this.provider.connect({
+          chains: [chainIdToConnect],
+          optionalChains: WalletconnectConnector.options.optionalChains,
         });
-
-        this.chain = _chainId.toString();
+      } else {
+        await this.provider.enable();
+        if (options?.chainId && (await this.getChainId()) !== options.chainId) {
+          await this.switchChain(options.chainId);
+        }
       }
 
-      await provider.enable();
-      this.chain = await this.getChainId();
-      const currentId = this.chain;
-      if (chainId && currentId !== chainId) {
-        await this.switchChain(chainId);
-      }
+      const accounts = this.provider.accounts;
+      const currentChainId = await this.getChainId();
+
+      this.provider.on("disconnect", this.onDisconnect);
+      this.provider.on("accountsChanged", this.onAccountsChanged);
+      this.provider.on("chainChanged", hexChainId => {
+        const chainId = parseInt(hexChainId, 16).toString();
 
-      setLastUsedConnector(this.name);
+        this.emitter.emit(
+          "chainChanged",
+          chainId,
+          WalletconnectConnector.#instance
+        );
+      });
+
+      this.emitter.emit(
+        "connected",
+        accounts[0]!,
+        currentChainId,
+        this.name,
+        "ethereum",
+        WalletconnectConnector.#instance
+      );
+      return {
+        address: accounts[0]!,
+        chainId: currentChainId,
+        walletName: this.name,
+        ecosystem: "ethereum",
+        activeConnector: WalletconnectConnector.#instance,
+      };
     } catch (error) {
       console.error(error);
       throw error;
     }
   }
 
-  async disconnect(): Promise<void> {
-    if (!this.provider) throw new Error("Wallet already disconnected");
-    await this.provider.disconnect();
-    this.provider = undefined;
-  }
-
-  async resolveDid(address: string): Promise<string | null> {
+  async disconnect(): Promise<DisconnectionResponse> {
+    if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet not connected");
-      if ((await this.getChainId()) !== "1") return null;
-
-      const _provider = new Web3Provider(this.provider as ExternalProvider);
-      const name = await _provider.lookupAddress(address);
-      return name;
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      await this.provider.disconnect();
+
+      this.emitter.emit("disconnected", this.name, "ethereum");
+      return {
+        walletName: this.name,
+        ecosystem: "ethereum",
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "disconnect",
+      });
     }
   }
 
-  async signMessage(message: string): Promise<string> {
+  async signMessage(message: string) {
+    if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet not Connected!");
-      const _address = await this.getAccount();
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      const address = await this.getAccount();
 
-      const hash = await this.provider.request<string>({
+      const hexMessage = hexlify(toUtf8Bytes(message));
+
+      const response = await this.provider.request({
         method: "personal_sign",
-        params: [_address[0], message],
+        params: [hexMessage, address[0]],
       });
 
-      return hash;
+      if ((response as any).code === 4001) {
+        throw new UserRejectedRequestError();
+      }
+
+      this.emitter.emit(
+        "messageSigned",
+        response as string,
+        WalletconnectConnector.#instance
+      );
+
+      return {
+        signature: response as string,
+        activeConnector: WalletconnectConnector.#instance,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "signMessage",
+      });
     }
   }
 
@@ -188,31 +292,43 @@ export class WalletconnectConnector extends BaseConnector<EthereumProvider> {
     return methods ?? [];
   }
 
-  private isChainsStale() {
+  private async isChainsStale() {
     const namespaceMethods = this.getNamespaceMethods();
     if (namespaceMethods.includes(ADD_ETH_CHAIN_METHOD)) return false;
 
-    const connectorChains = this.chain;
+    const connectorChains = await this.getChainId();
     const namespaceChains = this.getNamespaceChainsIds();
 
     if (
       namespaceChains.length &&
-      !namespaceChains.some(id => id === this.chain)
+      !namespaceChains.some(async id => id === (await this.getChainId()))
     )
       return false;
 
-    return !connectorChains.includes(this.chain);
+    return !connectorChains.includes(await this.getChainId());
   }
 
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
+  protected onAccountsChanged(accounts: string[]): void {
+    this.emitter.emit(
+      "accountsChanged",
+      accounts,
+      WalletconnectConnector.#instance
+    );
   }
 
-  protected onChainChanged(_chain: string): void {
-    console.log("Chain Changed");
+  protected onChainChanged(hexChainId: string): void {
+    const chainId = parseInt(hexChainId, 16).toString();
+    this.emitter.emit(
+      "chainChanged",
+      chainId,
+      WalletconnectConnector.#instance
+    );
   }
 
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
+  protected onDisconnect(error: any): void {
+    console.error({
+      error,
+    });
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
   }
 }
diff --git a/packages/evm/src/index.ts b/packages/evm/src/index.ts
index 0f2e2fb..6cff11c 100644
--- a/packages/evm/src/index.ts
+++ b/packages/evm/src/index.ts
@@ -1,7 +1,15 @@
-import { InjectedConnector } from './connectors/injected';
-import { CoinbaseConnector } from './connectors/coinbase';
-import { WalletconnectConnector } from './connectors/walletconnect';
-import { BananaConnector } from './connectors/banana';
-import { OkxWalletConnector } from './connectors/okxwallet';
+import { InjectedConnector } from "./connectors/injected";
+import { CoinbaseConnector } from "./connectors/coinbase";
+import { WalletconnectConnector } from "./connectors/walletconnect";
+import { BananaConnector } from "./connectors/banana";
+import { OkxWalletConnector } from "./connectors/okxwallet";
+import { MetamaskConnector } from "./connectors/metamask";
 
-export { InjectedConnector, CoinbaseConnector, WalletconnectConnector, BananaConnector, OkxWalletConnector };
+export {
+  InjectedConnector,
+  CoinbaseConnector,
+  WalletconnectConnector,
+  BananaConnector,
+  OkxWalletConnector,
+  MetamaskConnector,
+};
diff --git a/packages/evm/src/types/chainConfig.ts b/packages/evm/src/types/chainConfig.ts
deleted file mode 100644
index f91530f..0000000
--- a/packages/evm/src/types/chainConfig.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type CustomChainConfig = {
-  chainNamespace: 'eip155' | 'solana' | 'other';
-  chainId: string;
-  rpcTarget?: string;
-  displayName: string;
-  blockExplorer?: string;
-  ticker: string;
-  tickerName: string;
-};
diff --git a/packages/evm/src/types/index.ts b/packages/evm/src/types/index.ts
deleted file mode 100644
index e454ea7..0000000
--- a/packages/evm/src/types/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { CustomChainConfig } from './chainConfig';
-import { BaseConnector } from '@wallet01/core';
-
-type ClientConfig<TProvider> = {
-  chainConfig: CustomChainConfig;
-  connector: BaseConnector<TProvider>;
-};
-
-type ConnectedData<TProvider> = {
-  account: string;
-  chainId: string;
-  provider: TProvider;
-};
-
-export { type CustomChainConfig, type ClientConfig, type ConnectedData };
diff --git a/packages/evm/src/utils/chains.ts b/packages/evm/src/utils/chains.ts
deleted file mode 100644
index f601561..0000000
--- a/packages/evm/src/utils/chains.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-interface ChainData {
-  chainId: string;
-  chainName: string;
-  nativeCurrency: {
-    name: string;
-    symbol: string;
-    decimals: number;
-  };
-  rpcUrls: string[];
-  blockExplorerUrls: string[];
-}
-
-interface ChainObj {
-  [name: string]: ChainData;
-}
-
-export const chainData: ChainObj = {
-  "3141": {
-    chainId: "0x7ab7",
-    chainName: "Wallaby filecoin",
-    nativeCurrency: {
-      name: "Test FIlecoin",
-      symbol: "tFIL",
-      decimals: 18,
-    },
-    rpcUrls: [`https://wallaby.node.glif.io/rpc/v0`],
-    blockExplorerUrls: [
-      "https://wallaby.filscan.io",
-      "https://explorer.glif.io/actor/?network=wallaby",
-    ],
-  },
-  "137": {
-    chainId: "0x89",
-    chainName: "Matic Mainnet",
-    nativeCurrency: {
-      name: "Matic",
-      symbol: "MATIC",
-      decimals: 18,
-    },
-    rpcUrls: [`https://polygon.llamarpc.com`],
-    blockExplorerUrls: [`https://polygonscan.com`],
-  },
-  "80001": {
-    chainId: "0x13881",
-    chainName: "Mumbai",
-    nativeCurrency: {
-      name: "Matic",
-      symbol: "MATIC",
-      decimals: 18,
-    },
-    rpcUrls: [`https://rpc-mumbai.maticvigil.com`],
-    blockExplorerUrls: [`https://mumbai.polygonscan.com`],
-  },
-  "303": {
-    chainId: "0x12f",
-    chainName: "WYZth Scan",
-    nativeCurrency: {
-      name: "WYZ",
-      symbol: "WYZ",
-      decimals: 18,
-    },
-    rpcUrls: [`https://rpc-mainnet.wyzthchain.org`],
-    blockExplorerUrls: [`https://wyzthscan.org`],
-  },
-  "8081": {
-    chainId: "0x1f91",
-    chainName: "Shardeum Sphinx Dapp 1.X",
-    nativeCurrency: {
-      name: "SHM",
-      symbol: "SHM",
-      decimals: 18,
-    },
-    rpcUrls: [`https://dapps.shardeum.org`],
-    blockExplorerUrls: [`https://explorer-dapps.shardeum.org`],
-  }
-};
diff --git a/packages/evm/src/utils/emiter.ts b/packages/evm/src/utils/emiter.ts
deleted file mode 100644
index 17c4b4b..0000000
--- a/packages/evm/src/utils/emiter.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import EventEmitter from 'eventemitter3';
-
-const eventEmitter = new EventEmitter();
-const emitter = {
-  on: (event: string, fn: (args: any) => void) => eventEmitter.on(event, fn),
-  once: (event: string, fn: () => void) => eventEmitter.once(event, fn),
-  off: (event: string, fn: () => void) => eventEmitter.off(event, fn),
-  emit: (event: string, payload?: unknown) => eventEmitter.emit(event, payload),
-};
-
-Object.freeze(emitter);
-export default emitter;
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index 8802e0b..59a953a 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @wallet01/react
 
+## 1.0.0-beta.8
+
+### Patch Changes
+
+- adding succes handlers to all the hooks
+
+## 1.0.0-beta.7
+
+### Patch Changes
+
+- add onsuccessful connect option
+
+## 1.0.0-beta.6
+
+### Patch Changes
+
+- removing listeners in useEffect
+
+## 1.0.0-beta.5
+
+### Patch Changes
+
+- Adding alternative way of handling event listeners
+- removing unnecesary errors
+
+## 1.0.0-beta.3
+
+### Patch Changes
+
+- 82d8693: build then publish
+- updating client error with hook name
+
+## 1.0.0-beta.1
+
+### Patch Changes
+
+- adding isAutoConnecting variable
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.1
+
+## 1.0.0-beta.0
+
+### Major Changes
+
+- New events based architecture Wallet01; updated connectors and react package
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.0
+
 ## 0.8.7
 
 ### Patch Changes
diff --git a/packages/react/package.json b/packages/react/package.json
index 96e7208..1bff684 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wallet01/react",
-  "version": "0.8.7",
+  "version": "1.0.0-beta.8",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "import": "dist/index.js",
diff --git a/packages/react/src/context.tsx b/packages/react/src/context.tsx
index e3bed58..57047d2 100644
--- a/packages/react/src/context.tsx
+++ b/packages/react/src/context.tsx
@@ -1,12 +1,14 @@
-import React, { FunctionComponent, useEffect } from 'react';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { BaseConnector, Client } from '@wallet01/core';
+import React, { FunctionComponent, useEffect, useState } from "react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { BaseConnector, Client } from "@wallet01/core";
 
 interface Props {
   children: JSX.Element;
   autoConnect: boolean;
   connectors: BaseConnector[] | (() => BaseConnector[]);
 }
+
+export const ClientProvider = React.createContext<Client | null>(null);
 /**
  * @description A context that wraps your app under wallet01 states and providers
  */
@@ -16,17 +18,26 @@ const Wallet01: FunctionComponent<Props> = ({
   connectors,
 }) => {
   // if (typeof window === 'undefined') <>{children}</>;
-  const [queryClient] = React.useState(() => new QueryClient());
+  const [queryClient] = useState(() => new QueryClient());
+  const [wallet01Client, setWalletClient] = useState<Client | null>(null);
 
   useEffect(() => {
-    Client.init({
+    const client = Client.init({
       autoConnect,
-      connectors: typeof connectors === 'function' ? connectors() : connectors,
+      connectors: typeof connectors === "function" ? connectors() : connectors,
     });
-  }, []);
+
+    console.log("setting client");
+
+    setWalletClient(client);
+  }, [connectors]);
 
   return (
-    <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+    <QueryClientProvider client={queryClient}>
+      <ClientProvider.Provider value={wallet01Client}>
+        {children}
+      </ClientProvider.Provider>
+    </QueryClientProvider>
   );
 };
 
diff --git a/packages/react/src/hooks/index.ts b/packages/react/src/hooks/index.ts
index f7d04f6..36f52eb 100644
--- a/packages/react/src/hooks/index.ts
+++ b/packages/react/src/hooks/index.ts
@@ -1,10 +1,19 @@
-import { useConnect } from './useConnect';
-import { useMessage } from './useMessage';
-import { useSwitch } from './useSwitch';
-import { useClient } from './useClient';
-import { useWallet } from './useWallet';
-// import { initClientAtom } from '../store/clientStore';
+import { useConnect } from "./useConnect";
+import { useMessage } from "./useMessage";
+import { useSwitch } from "./useSwitch";
+import { useClient } from "./useClient";
+import { useWallet } from "./useWallet";
+import { useDisconnect } from "./useDisconnect";
+import { useChain } from "./useChain";
+import { useAccount } from "./useAccount";
 
-export { useConnect, useMessage, useSwitch, useClient, useWallet };
-
-// export const useInitClient = () => useSetAtom(initClientAtom);
+export {
+  useConnect,
+  useMessage,
+  useSwitch,
+  useClient,
+  useWallet,
+  useDisconnect,
+  useChain,
+  useAccount,
+};
diff --git a/packages/react/src/hooks/useAccount.ts b/packages/react/src/hooks/useAccount.ts
new file mode 100644
index 0000000..a0d3e47
--- /dev/null
+++ b/packages/react/src/hooks/useAccount.ts
@@ -0,0 +1,31 @@
+import { BaseConnector, useStore } from "@wallet01/core";
+import { ClientProvider } from "../context";
+import { useContext, useEffect } from "react";
+
+type useAccountConfig = {
+  onAccountChange?: (
+    address: string[],
+    activeConnector: BaseConnector
+  ) => Promise<void> | void;
+};
+
+export const useAccount = (params?: useAccountConfig) => {
+  const client = useContext(ClientProvider);
+  const { address, addresses, activeConnector } = useStore();
+
+  useEffect(() => {
+    if (params?.onAccountChange && client)
+      client.emitter.on("accountsChanged", params.onAccountChange);
+
+    return () => {
+      if (params?.onAccountChange && client)
+        client.emitter.off("accountsChanged", params.onAccountChange);
+    };
+  }, [activeConnector, client]);
+
+  return {
+    address,
+    addresses,
+    activeConnector,
+  };
+};
diff --git a/packages/react/src/hooks/useChain.ts b/packages/react/src/hooks/useChain.ts
new file mode 100644
index 0000000..8454459
--- /dev/null
+++ b/packages/react/src/hooks/useChain.ts
@@ -0,0 +1,27 @@
+import { BaseConnector, useStore } from "@wallet01/core";
+import { useContext, useEffect } from "react";
+import { ClientProvider } from "../context";
+
+interface useChainConfig {
+  onChainChanged?: (chainId: string, activeConnector: BaseConnector) => void;
+}
+
+export const useChain = (params?: useChainConfig) => {
+  const client = useContext(ClientProvider);
+  const { activeConnector, chainId } = useStore();
+
+  useEffect(() => {
+    if (params?.onChainChanged && client)
+      client.emitter.on("chainChanged", params.onChainChanged);
+
+    return () => {
+      if (params?.onChainChanged && client)
+        client.emitter.off("chainChanged", params.onChainChanged);
+    };
+  }, [activeConnector, client]);
+
+  return {
+    chainId,
+    activeConnector,
+  };
+};
diff --git a/packages/react/src/hooks/useClient.ts b/packages/react/src/hooks/useClient.ts
index 38a551e..ec7a7e3 100644
--- a/packages/react/src/hooks/useClient.ts
+++ b/packages/react/src/hooks/useClient.ts
@@ -1,11 +1,13 @@
 import { useStore } from "@wallet01/core";
 
 export const useClient = () => {
-  const { connectors, isAutoConnecting, activeChain } = useStore();
+  const { connectors, ecosystem, activeConnector, isAutoConnecting } =
+    useStore();
 
   return {
     connectors,
+    ecosystem,
+    activeConnector,
     isAutoConnecting,
-    activeChain,
   };
 };
diff --git a/packages/react/src/hooks/useConnect.ts b/packages/react/src/hooks/useConnect.ts
index 02c9396..27313cf 100644
--- a/packages/react/src/hooks/useConnect.ts
+++ b/packages/react/src/hooks/useConnect.ts
@@ -1,90 +1,90 @@
-import { BaseConnector, useStore } from "@wallet01/core";
+import { BaseConnector } from "@wallet01/core";
 import { useMutation, UseMutationOptions } from "@tanstack/react-query";
+import { useCallback, useContext, useEffect } from "react";
+import { ClientProvider } from "../context";
+import { ClientNotFoundError, ConnectorNotFoundError } from "../utils/errors";
+import { ConnectionResponse } from "@wallet01/core/dist/types/methodTypes";
+import { TEcosystem } from "@wallet01/core/dist/store/storeTypes";
 
 type ConnectArgs = {
-  connector: BaseConnector | undefined;
-  chainId?: string;
-};
-
-type ConnectResult = {
-  address: string;
-  chain: "ethereum" | "solana" | "cosmos" | "tezos";
   connector: BaseConnector;
+  chainId?: string;
 };
 
 type UseConenctConfig = {
-  onError?: UseMutationOptions<void, Error, unknown>["onError"];
-  onSuccess?: UseMutationOptions<ConnectResult, Error, unknown>["onSuccess"];
+  onError?: UseMutationOptions<void, Error, ConnectArgs>["onError"];
+  onSuccessfulConnect?: UseMutationOptions<
+    ConnectionResponse,
+    Error,
+    ConnectArgs
+  >["onSuccess"];
+  onConnect?: (
+    address: string,
+    chainId: string,
+    walletName: string,
+    ecosystem: TEcosystem,
+    activeConnector: BaseConnector
+  ) => Promise<void> | void;
 };
 
-export const useConnect = ({
-  onError,
-  onSuccess,
-}: Partial<UseConenctConfig> = {}) => {
-  const {
-    connectors,
-    setActiveConnector,
-    setIsConnected,
-    setAddress,
-    setDid,
-    setChainId,
-    setActiveChain,
-  } = useStore();
+export const useConnect = (params?: UseConenctConfig) => {
+  const client = useContext(ClientProvider);
 
   const { mutate, mutateAsync, isLoading, isError, error } = useMutation<
-    ConnectResult,
+    ConnectionResponse,
     Error,
     ConnectArgs,
     unknown
   >({
     mutationFn: async ({ connector, chainId }: ConnectArgs) => {
-      if (connectors.length === 0) throw new Error("Client not initialised");
+      if (!client) throw new ClientNotFoundError("useConnect");
 
-      if (!connector) throw new Error("Connector required to connect");
-      setActiveConnector(connector);
+      const connectors = client.store.getConnectors();
 
       if (!connectors.includes(connector))
-        throw new Error("Connector not found");
+        throw new ConnectorNotFoundError({ connectorName: connector.name });
+
+      let connectionResult: ConnectionResponse;
 
       if (chainId) {
-        await connector.connect({ chainId: chainId });
+        connectionResult = await connector.connect({ chainId: chainId });
       } else {
-        await connector.connect({});
+        connectionResult = await connector.connect();
       }
 
-      const address = (await connector.getAccount())[0];
-      const chain = connector.activeChain;
-
-      if (!address) throw new Error("No account found");
+      return connectionResult;
+    },
+    onSuccess: params?.onSuccessfulConnect,
+    onError: params?.onError,
+  });
 
-      setAddress(address);
+  const connect = useCallback(
+    (params?: ConnectArgs) => {
+      return mutate(params as ConnectArgs);
+    },
+    [client]
+  );
 
-      setActiveChain(connector.activeChain);
-      setIsConnected(true);
+  const connectAsync = useCallback(
+    (params?: ConnectArgs) => {
+      return mutateAsync(params as ConnectArgs);
+    },
+    [client]
+  );
 
-      setDid(
-        await connector.resolveDid(address).catch(error => {
-          console.error({ error });
-          return null;
-        })
-      );
-      if (connector.getChainId) {
-        setChainId(await connector.getChainId());
-      }
+  useEffect(() => {
+    if (params?.onConnect && client)
+      client.emitter.on("connected", params.onConnect);
 
-      return {
-        address,
-        chain,
-        connector,
-      };
-    },
-    onError,
-    onSuccess,
-  });
+    return () => {
+      if (params?.onConnect && client)
+        client.emitter.off("connected", params.onConnect);
+    };
+  }, [client]);
 
   return {
-    connect: mutate,
-    connectAsync: mutateAsync,
+    connect,
+    connectAsync,
     isLoading,
     isError,
     error,
diff --git a/packages/react/src/hooks/useDisconnect.ts b/packages/react/src/hooks/useDisconnect.ts
new file mode 100644
index 0000000..996fc51
--- /dev/null
+++ b/packages/react/src/hooks/useDisconnect.ts
@@ -0,0 +1,68 @@
+import { UseMutationOptions, useMutation } from "@tanstack/react-query";
+import { DisconnectionResponse } from "@wallet01/core/dist/types/methodTypes";
+import { ClientProvider } from "../context";
+import { useCallback, useContext, useEffect } from "react";
+import { ClientNotFoundError, NoWalletConnectedError } from "../utils/errors";
+import { TEcosystem } from "@wallet01/core/dist/store/storeTypes";
+
+interface useDisconnectConfig {
+  onError?: UseMutationOptions<void, Error, unknown>["onError"];
+  onSuccessfulDisconnect?: UseMutationOptions<
+    DisconnectionResponse,
+    Error,
+    void
+  >["onSuccess"];
+  onDisconnect?: (walletName: string, ecosystem: TEcosystem) => void;
+}
+
+export const useDisconnect = (params?: useDisconnectConfig) => {
+  const client = useContext(ClientProvider);
+
+  const { data, isLoading, isError, mutate, mutateAsync, error } = useMutation<
+    DisconnectionResponse,
+    Error,
+    void,
+    unknown
+  >({
+    mutationFn: async () => {
+      if (!client) throw new ClientNotFoundError("useDisconnect");
+
+      const activeConnector = client.store.getActiveConnector();
+
+      if (!activeConnector)
+        throw new NoWalletConnectedError({ methodName: "disconnect" });
+      const response = await activeConnector.disconnect();
+
+      return response;
+    },
+    onSuccess: params?.onSuccessfulDisconnect,
+    onError: params?.onError,
+  });
+
+  const disconnect = useCallback(() => {
+    return mutate();
+  }, [client]);
+
+  const disconnectAsync = useCallback(() => {
+    return mutateAsync();
+  }, [client]);
+
+  useEffect(() => {
+    if (params?.onDisconnect && client)
+      client.emitter.on("disconnected", params.onDisconnect);
+
+    return () => {
+      if (params?.onDisconnect && client)
+        client.emitter.off("disconnected", params.onDisconnect);
+    };
+  }, [client]);
+
+  return {
+    disconnect,
+    disconnectAsync,
+    disconnectionResponse: data,
+    isLoading,
+    isError,
+    error,
+  };
+};
diff --git a/packages/react/src/hooks/useMessage.ts b/packages/react/src/hooks/useMessage.ts
index 5044560..1b92632 100644
--- a/packages/react/src/hooks/useMessage.ts
+++ b/packages/react/src/hooks/useMessage.ts
@@ -1,5 +1,32 @@
-import { useMutation } from '@tanstack/react-query';
-import { useStore } from '@wallet01/core';
+import { UseMutationOptions, useMutation } from "@tanstack/react-query";
+import { useCallback, useContext, useEffect } from "react";
+import { ClientProvider } from "../context";
+import { ClientNotFoundError, NoWalletConnectedError } from "../utils/errors";
+import {
+  MessageSignedResponse,
+  SignatureHash,
+} from "@wallet01/core/dist/types/methodTypes";
+import { BaseConnector } from "@wallet01/core";
+interface SignMessageArgs {
+  message: string;
+}
+
+interface useMessageConfig {
+  onError?: UseMutationOptions<
+    MessageSignedResponse,
+    Error,
+    SignMessageArgs
+  >["onError"];
+  onSuccessfulMessageSigned?: UseMutationOptions<
+    MessageSignedResponse,
+    Error,
+    SignMessageArgs
+  >["onSuccess"];
+  onMessageSigned?: (
+    signature: SignatureHash,
+    activeConnector: BaseConnector
+  ) => void;
+}
 /**
  * @description This hooks will return signMessage function that helps sign messages from desired wallet.
  * @params Accepts an object with properties connector and message
@@ -8,39 +35,61 @@ import { useStore } from '@wallet01/core';
  * For more details visit {@link}
  */
 
-interface SignMessageArgs {
-  message: string;
-}
-
-export const useMessage = () => {
-  const { connectors, activeConnector } = useStore();
+export const useMessage = (params?: useMessageConfig) => {
+  const client = useContext(ClientProvider);
 
   const { data, isLoading, isError, mutate, mutateAsync, error } = useMutation<
-    string,
+    MessageSignedResponse,
     Error,
     SignMessageArgs,
     unknown
   >({
     mutationFn: async ({ message }: SignMessageArgs) => {
-      // if (!client) throw new Error('Client not Initialised');
+      if (!client) throw new ClientNotFoundError("useMessage");
+
+      const activeConnector = client.store.getActiveConnector();
 
-      if (!activeConnector) throw new Error('Wallet not connected');
+      if (!activeConnector)
+        throw new NoWalletConnectedError({ methodName: "signMessage" });
 
-      if (!connectors.includes(activeConnector)) {
-        throw new Error('Connector not found');
-      }
+      const response = await activeConnector.signMessage(message);
 
-      const hash = await activeConnector.signMessage(message);
-      return hash;
+      return response;
     },
+    onSuccess: params?.onSuccessfulMessageSigned,
+    onError: params?.onError,
   });
 
+  const signMessage = useCallback(
+    (params: SignMessageArgs) => {
+      return mutate(params);
+    },
+    [client]
+  );
+
+  const signMessageAsync = useCallback(
+    (params: SignMessageArgs) => {
+      return mutateAsync(params);
+    },
+    [client]
+  );
+
+  useEffect(() => {
+    if (params?.onMessageSigned && client)
+      client.emitter.on("messageSigned", params.onMessageSigned);
+
+    return () => {
+      if (params?.onMessageSigned && client)
+        client.emitter.off("messageSigned", params.onMessageSigned);
+    };
+  }, [client]);
+
   return {
-    hash: data,
+    hash: data?.signature,
     isLoading,
     isError,
     error: error?.message,
-    signMessage: mutate,
-    signMessageAsync: mutateAsync,
+    signMessage,
+    signMessageAsync,
   };
 };
diff --git a/packages/react/src/hooks/useSwitch.ts b/packages/react/src/hooks/useSwitch.ts
index 0859132..e1b3b26 100644
--- a/packages/react/src/hooks/useSwitch.ts
+++ b/packages/react/src/hooks/useSwitch.ts
@@ -1,5 +1,31 @@
-import { useMutation } from "@tanstack/react-query";
-import { useStore } from "@wallet01/core";
+import { UseMutationOptions, useMutation } from "@tanstack/react-query";
+import { ChainSwitchResponse } from "@wallet01/core/dist/types/methodTypes";
+import { useCallback, useContext, useEffect } from "react";
+import { ClientProvider } from "../context";
+import {
+  ClientNotFoundError,
+  NoWalletConnectedError,
+  UnsupportedFunctionCalledError,
+} from "../utils/errors";
+import { BaseConnector } from "@wallet01/core";
+
+interface ChainSwitchArgs {
+  chainId: string;
+}
+
+interface useMessageConfig {
+  onError?: UseMutationOptions<void, Error, ChainSwitchArgs>["onError"];
+  onSuccessfulChainSwitched?: UseMutationOptions<
+    ChainSwitchResponse,
+    Error,
+    ChainSwitchArgs
+  >["onSuccess"];
+  onChainSwitched?: (
+    fromChainId: string | "mainnet",
+    toChainId: string | "mainnet",
+    activeConnector: BaseConnector
+  ) => void;
+}
 
 /**
  * @description This hooks will return switchChain function that will help chain in your desired wallet.
@@ -9,74 +35,71 @@ import { useStore } from "@wallet01/core";
  * For more details visit {@link}
  */
 
-interface ChainSwitchArgs {
-  chainId: string;
-}
-
-export const useSwitch = () => {
-  const {
-    connectors,
-    activeConnector,
-    setAddress,
-    setIsConnected,
-    setDid,
-    setChainId,
-  } = useStore();
+export const useSwitch = (params?: useMessageConfig) => {
+  const client = useContext(ClientProvider);
 
   const { isLoading, isError, error, mutate, mutateAsync } = useMutation<
-    string,
+    ChainSwitchResponse,
     Error,
     ChainSwitchArgs,
     unknown
   >({
     mutationFn: async ({ chainId }: ChainSwitchArgs) => {
-      // if (!client) throw new Error('Client not Initialised');
+      if (!client) throw new ClientNotFoundError("useSwitch");
+
+      const activeConnector = client.store.getActiveConnector();
+      const connectors = client.store.getConnectors();
 
-      if (!activeConnector) throw new Error("Wallet not connected");
+      if (!activeConnector)
+        throw new NoWalletConnectedError({ methodName: "switchChain" });
 
       if (!connectors.includes(activeConnector)) {
         throw new Error("Connector not found");
       }
 
       if (!activeConnector.switchChain)
-        throw new Error("Function not supported by wallet");
-
-      await activeConnector.switchChain(chainId);
-      setIsConnected(false);
-
-      const address = (await activeConnector.getAccount())[0];
-
-      if (!address) throw new Error("No account found");
-
-      setAddress(address);
-
-      setDid(
-        address
-          ? await activeConnector.resolveDid(address).catch(error => {
-              console.error({ error });
-              return null;
-            })
-          : null
-      );
-      setChainId(
-        activeConnector.getChainId
-          ? await activeConnector.getChainId().catch(error => {
-              console.error({ error });
-              return null;
-            })
-          : null
-      );
-      setIsConnected(true);
-
-      return address;
+        throw new UnsupportedFunctionCalledError({
+          methodName: "switchChain",
+          walletName: activeConnector.name,
+        });
+
+      const response = await activeConnector.switchChain(chainId);
+
+      return response;
     },
+    onSuccess: params?.onSuccessfulChainSwitched,
+    onError: params?.onError,
   });
 
+  const switchChain = useCallback(
+    (params: ChainSwitchArgs) => {
+      return mutate(params);
+    },
+    [client]
+  );
+
+  const switchChainAsync = useCallback(
+    (params: ChainSwitchArgs) => {
+      return mutateAsync(params);
+    },
+    [client]
+  );
+
+  useEffect(() => {
+    if (params?.onChainSwitched && client)
+      client.emitter.on("switchingChain", params.onChainSwitched);
+
+    return () => {
+      if (params?.onChainSwitched && client)
+        client.emitter.off("switchingChain", params.onChainSwitched);
+    };
+  }, [client]);
+
   return {
     isLoading,
     isError,
     error,
-    switchChain: mutate,
-    switchChainAsync: mutateAsync,
+    switchChain,
+    switchChainAsync,
   };
 };
diff --git a/packages/react/src/hooks/useWallet.ts b/packages/react/src/hooks/useWallet.ts
index ef258fe..2a9a3ca 100644
--- a/packages/react/src/hooks/useWallet.ts
+++ b/packages/react/src/hooks/useWallet.ts
@@ -1,51 +1,14 @@
-import { useMutation } from "@tanstack/react-query";
 import { useStore } from "@wallet01/core";
 
 export const useWallet = () => {
-  const {
-    did,
-    chainId,
-    address,
-    connectors,
-    isConnected,
-    activeConnector,
-    setDid,
-    setAddress,
-    setChainId,
-    setIsConnected,
-    setActiveConnector,
-    setActiveChain,
-    setIsAutoConnecting,
-  } = useStore();
-
-  const { mutate } = useMutation({
-    mutationFn: async () => {
-      // if (!client) throw new Error('Client not Initialised');
-
-      if (!activeConnector) throw new Error("Wallet not connected");
-
-      if (!connectors.includes(activeConnector)) {
-        throw new Error("Connector not found");
-      }
-
-      await activeConnector.disconnect();
-      setActiveConnector(null);
-      setAddress(null);
-      setChainId(null);
-      setDid(null);
-      setActiveChain(null);
-      setIsConnected(false);
-      setIsAutoConnecting(false);
-      localStorage.setItem("lastUsedConnector", "");
-    },
-  });
+  const { chainId, address, isConnected, activeConnector } = useStore();
 
   return {
+    walletName: activeConnector?.name,
+    ecosystem: activeConnector?.ecosystem,
     isConnected,
     address,
-    did,
     chainId,
     activeConnector,
-    disconnect: mutate,
   };
 };
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
index fc402fe..15eb54d 100644
--- a/packages/react/src/index.ts
+++ b/packages/react/src/index.ts
@@ -1,10 +1,4 @@
-import {
-  useClient,
-  useConnect,
-  useMessage,
-  useSwitch,
-  useWallet,
-} from "./hooks";
 import Wallet01 from "./context";
+export * from "./hooks";
 
-export { Wallet01, useClient, useConnect, useMessage, useSwitch, useWallet };
+export { Wallet01 };
diff --git a/packages/react/src/utils/errors.ts b/packages/react/src/utils/errors.ts
new file mode 100644
index 0000000..a043490
--- /dev/null
+++ b/packages/react/src/utils/errors.ts
@@ -0,0 +1,41 @@
+export class ClientNotFoundError extends Error {
+  name = "ClientNotFoundError";
+  constructor(hookName: string) {
+    super(
+      `Wallet01Client has not been initialised. Please initialise the client to use the ${hookName} hooks.`
+    );
+  }
+}
+
+export class ConnectorNotFoundError extends Error {
+  name = "ConnectorNotFoundError";
+  constructor({ connectorName }: { connectorName: string }) {
+    super(
+      `Connector ${connectorName} not found. Please check your Wallet01Client config.`
+    );
+  }
+}
+
+export class NoWalletConnectedError extends Error {
+  name = "NoWalletConnectedError";
+  constructor({ methodName }: { methodName: string }) {
+    super(
+      `No wallet connected. Please connect a wallet to use ${methodName} method.`
+    );
+  }
+}
+
+export class UnsupportedFunctionCalledError extends Error {
+  name = "UnsupportedFunctionCalledError";
+  constructor({
+    methodName,
+    walletName,
+  }: {
+    methodName: string;
+    walletName: string;
+  }) {
+    super(
+      `Function ${methodName} is not supported by the ${walletName} wallet.`
+    );
+  }
+}
diff --git a/packages/react/tsup.config.ts b/packages/react/tsup.config.ts
index 3fe8046..a326692 100644
--- a/packages/react/tsup.config.ts
+++ b/packages/react/tsup.config.ts
@@ -7,8 +7,7 @@ export default defineConfig({
   format: ["cjs", "esm"], // generate cjs and esm files
   bundle: true,
   skipNodeModulesBundle: true,
-  entryPoints: ["src/index.ts"],
   target: "es2020",
   outDir: "dist",
-  entry: ["src/**/*.ts"], //include all files under src
+  entry: ["src/index.ts"], //include all files under src
 });
diff --git a/packages/solana/CHANGELOG.md b/packages/solana/CHANGELOG.md
index 448bad4..636cb59 100644
--- a/packages/solana/CHANGELOG.md
+++ b/packages/solana/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @wallet01/solana
 
+## 0.7.0-beta.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.1
+
+## 0.7.0-beta.0
+
+### Minor Changes
+
+- New events based architecture Wallet01; updated connectors and react package
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.0
+
 ## 0.6.6
 
 ### Patch Changes
diff --git a/packages/solana/package.json b/packages/solana/package.json
index 936e395..ba49dd7 100644
--- a/packages/solana/package.json
+++ b/packages/solana/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wallet01/solana",
-  "version": "0.6.6",
+  "version": "0.7.0-beta.1",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "import": "dist/index.js",
@@ -12,12 +12,10 @@
     "dev": "pnpm build --watch"
   },
   "dependencies": {
-    "@bonfida/spl-name-service": "^0.1.55",
-    "@keplr-wallet/types": "^0.11.13",
-    "@solana/web3.js": "^1.66.2",
+    "@solana/web3.js": "^1.87.1",
+    "@solflare-wallet/sdk": "^1.3.2",
     "@wallet01/core": "workspace:*",
-    "eventemitter3": "^4.0.7",
-    "tweetnacl": "^1.0.3"
+    "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
diff --git a/packages/solana/src/connectors/phantom.ts b/packages/solana/src/connectors/phantom.ts
index 7a81160..a9d7d88 100644
--- a/packages/solana/src/connectors/phantom.ts
+++ b/packages/solana/src/connectors/phantom.ts
@@ -1,9 +1,16 @@
-import { Connection, PublicKey } from "@solana/web3.js";
-import { performReverseLookup, getAllDomains } from "@bonfida/spl-name-service";
-
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
+import {
+  AddressNotFoundError,
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+  WalletNotConnectedError,
+} from "@wallet01/core";
 import { PhantomProvider } from "../providers/phantomProvider";
-import emitter from "../utils/emiter";
+import {
+  ConnectionResponse,
+  MessageSignedResponse,
+} from "@wallet01/core/dist/types/methodTypes";
+import { SolanaErrorHandler } from "../utils/utils";
 
 interface PhantomWindow extends Window {
   solana?: PhantomProvider;
@@ -11,108 +18,131 @@ interface PhantomWindow extends Window {
 
 declare const window: PhantomWindow;
 
-interface PhantomConnectorOptions {
-  rpcUrl: string;
-}
-
 export class PhantomConnector extends BaseConnector<PhantomProvider> {
+  static #instance: BaseConnector<PhantomProvider>;
   provider!: PhantomProvider;
-  private rpcUrl: string;
-  constructor({ rpcUrl }: PhantomConnectorOptions) {
-    super("", "phantom", "solana");
 
-    this.rpcUrl = rpcUrl;
+  private constructor() {
+    super("phantom", "solana");
   }
 
-  async getProvider(): Promise<PhantomProvider> {
-    if (
-      typeof window !== "undefined" &&
-      window.solana &&
-      window.solana.isPhantom
-    ) {
-      this.provider = window.solana;
-      return this.provider;
-    } else {
-      throw new Error("Wallet Not Installed");
+  static init() {
+    if (!PhantomConnector.#instance) {
+      PhantomConnector.#instance =
+        new PhantomConnector() as BaseConnector<PhantomProvider>;
     }
+    return PhantomConnector.#instance;
   }
 
-  async getAccount(): Promise<string[]> {
-    if (!this.provider) throw new Error("Provider Undefined");
+  async getProvider() {
     try {
-      await this.connect("");
-      const accounts = this.provider.publicKey;
-      return [String(accounts)];
+      if (
+        typeof window !== "undefined" &&
+        window.solana &&
+        window.solana.isPhantom
+      ) {
+        this.provider = window.solana;
+        return this.provider;
+      }
+      throw new ProviderNotFoundError({ walletName: this.name });
     } catch (error) {
       console.error(error);
-      throw error;
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getProvider",
+      });
     }
   }
 
-  async connect({}): Promise<void> {
+  async getAccount(): Promise<string[]> {
+    if (!this.provider) throw new Error("Provider Undefined");
     try {
-      const provider = await this.getProvider();
-      if (!provider) throw new Error("Phantom is not installed");
-      await this.provider.connect();
-      setLastUsedConnector(this.name);
-
-      if (provider.on) {
-        provider.on("accountChanged", this.onAccountsChanged);
-        provider.on("disconnect", this.onDisconnect);
-      }
+      const account = this.provider.publicKey?.toString();
+      if (!account) throw new AddressNotFoundError({ walletName: this.name });
+      return [account];
     } catch (error) {
       console.error(error);
-      throw error;
+      throw SolanaErrorHandler(error, "getAccount", this.name);
     }
   }
 
-  async disconnect(): Promise<void> {
-    if (!this.provider) throw new Error("No wallet Conencted");
-    this.provider.disconnect();
-    emitter.emit("disconnected");
-  }
+  async connect(): Promise<ConnectionResponse> {
+    if (!this.provider) await this.getProvider();
+    try {
+      if (!this.provider) throw new Error("Provider Undefined");
+      const { publicKey } = await this.provider.connect();
+
+      this.provider.on("accountChanged", this.onAccountsChanged);
+      this.provider.on("disconnect", this.onDisconnect);
+
+      this.emitter.emit(
+        "connected",
+        publicKey.toString(),
+        "mainnet",
+        this.name,
+        this.ecosystem,
+        PhantomConnector.#instance
+      );
 
-  async resolveDid(address: string): Promise<string | null> {
-    if (!this.provider) throw new Error("No wallet Connected");
-    const connection = new Connection(this.rpcUrl);
+      return {
+        address: publicKey.toString(),
+        chainId: "mainnet",
+        ecosystem: this.ecosystem,
+        walletName: this.name,
+        activeConnector: PhantomConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw SolanaErrorHandler(error, "connect", this.name);
+    }
+  }
 
+  async disconnect() {
+    if (!this.provider) await this.getProvider();
     try {
-      const ownerWallet = new PublicKey(address);
-      const allDomainKeys = await getAllDomains(connection, ownerWallet);
-      const allDomainNames = await Promise.all(
-        allDomainKeys.map(key => {
-          return performReverseLookup(connection, key);
-        })
-      );
-      if (!allDomainNames[0]) return null;
-      return allDomainNames[0];
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
+      this.provider.disconnect();
+
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw SolanaErrorHandler(error, "disconnect", this.name);
     }
   }
 
-  async signMessage(message: string): Promise<string> {
-    if (!this.provider) throw new Error("No wallet Connected");
+  async signMessage(message: string): Promise<MessageSignedResponse> {
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
     try {
-      const _message = new TextEncoder().encode(message);
-      const { signature } = await this.provider.signMessage(_message);
-      return new TextDecoder("utf-8").decode(signature);
+      const encodedMessage = new TextEncoder().encode(message);
+      const { signature } = await this.provider.signMessage(
+        encodedMessage,
+        "utf8"
+      );
+
+      this.emitter.emit("messageSigned", signature, PhantomConnector.#instance);
+
+      return {
+        signature,
+        activeConnector: PhantomConnector.#instance,
+      };
     } catch (err) {
       console.error(err);
-      throw err;
+      throw SolanaErrorHandler(err, "signMessage", this.name);
     }
   }
 
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
-  }
-
-  protected onChainChanged(_chain: string | number): void {
-    console.log("Chain Changed");
-  }
+  protected onAccountsChanged = (accounts: string[]) => {
+    this.emitter.emit("accountsChanged", accounts, PhantomConnector.#instance);
+  };
 
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
-  }
+  protected onDisconnect = (error: any) => {
+    console.error(error);
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
+  };
 }
diff --git a/packages/solana/src/connectors/solflare.ts b/packages/solana/src/connectors/solflare.ts
index 0cda4be..2526055 100644
--- a/packages/solana/src/connectors/solflare.ts
+++ b/packages/solana/src/connectors/solflare.ts
@@ -1,118 +1,150 @@
-import { Connection, PublicKey } from "@solana/web3.js";
-import { performReverseLookup, getAllDomains } from "@bonfida/spl-name-service";
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
-
-import { SolflareProvider } from "../providers/solflareProvider";
-import emitter from "../utils/emiter";
-
-declare const window: {
-  solflare: SolflareProvider;
-};
-
-interface SolflareConnectorOptions {
-  rpcUrl: string;
-}
+import {
+  AddressNotFoundError,
+  BaseConnector,
+  ProviderNotFoundError,
+  WalletNotConnectedError,
+} from "@wallet01/core";
+
+import SolflareProvider from "@solflare-wallet/sdk";
+import { SolanaErrorHandler } from "../utils/utils";
+import {
+  ConnectionResponse,
+  DisconnectionResponse,
+  MessageSignedResponse,
+} from "@wallet01/core/dist/types/methodTypes";
+import { WalletNotInstalledError } from "@wallet01/core";
 
 export class SolflareConnector extends BaseConnector<SolflareProvider> {
+  static #instance: BaseConnector<SolflareProvider>;
   provider!: SolflareProvider;
-  private rpcUrl: string;
 
-  constructor({ rpcUrl }: SolflareConnectorOptions) {
-    super("", "solflare", "solana");
+  private constructor() {
+    super("solflare", "solana");
+  }
 
-    this.rpcUrl = rpcUrl;
+  static init() {
+    if (!SolflareConnector.#instance) {
+      SolflareConnector.#instance =
+        new SolflareConnector() as BaseConnector<SolflareProvider>;
+    }
+    return SolflareConnector.#instance;
   }
 
   async getProvider(): Promise<SolflareProvider> {
-    if (
-      typeof window !== "undefined" &&
-      window.solflare &&
-      window.solflare.isSolflare
-    ) {
-      this.provider = window.solflare;
+    try {
+      const provider = new SolflareProvider();
+      const isWalletInstalled = await provider.detectWallet();
+      if (!isWalletInstalled)
+        throw new WalletNotInstalledError({ walletName: this.name });
+      this.provider = provider;
       return this.provider;
-    } else {
-      throw new Error("Wallet Not Installed");
+    } catch (error) {
+      console.error(error);
+      throw SolanaErrorHandler(error, "getProvider", this.name);
     }
   }
 
   async getAccount(): Promise<string[]> {
-    if (!this.provider) throw new Error("Provider Undefined");
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
     try {
-      await this.provider.connect();
-      const accounts = this.provider.publicKey;
-      return [String(accounts)];
+      const account = this.provider.publicKey?.toString();
+      if (!account) throw new AddressNotFoundError({ walletName: this.name });
+      return [account];
     } catch (error) {
       console.error(error);
-      throw error;
+      throw SolanaErrorHandler(error, "getAccount", this.name);
     }
   }
 
-  async connect({}): Promise<void> {
+  async connect(): Promise<ConnectionResponse> {
+    if (!this.provider) await this.getProvider();
     try {
-      const provider = await this.getProvider();
-      if (!provider) throw new Error("Solflare is not installed");
-
-      if (provider.on) {
-        provider.on("accountChanged", this.onAccountsChanged);
-        provider.on("disconnect", this.onDisconnect);
-      }
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
 
       await this.provider.connect();
-      setLastUsedConnector(this.name);
+
+      this.provider.on("accountChanged", this.onAccountsChanged);
+      this.provider.on("disconnect", this.onDisconnect);
+
+      const address = this.provider.publicKey?.toString()!;
+      const chainId = "mainnet";
+
+      this.emitter.emit(
+        "connected",
+        address,
+        chainId,
+        this.name,
+        this.ecosystem,
+        SolflareConnector.#instance
+      );
+
+      return {
+        address,
+        chainId,
+        ecosystem: this.ecosystem,
+        walletName: this.name,
+        activeConnector: SolflareConnector.#instance,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw SolanaErrorHandler(error, "connect", this.name);
     }
   }
 
-  async disconnect(): Promise<void> {
-    if (!this.provider) throw new Error("No wallet Conencted");
-    this.provider.disconnect();
-    emitter.emit("disconnected");
-  }
+  async disconnect(): Promise<DisconnectionResponse> {
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
+    try {
+      this.provider.disconnect();
 
-  async resolveDid(address: string): Promise<string | null> {
-    if (!this.provider) throw new Error("No wallet Connected");
-    const connection = new Connection(this.rpcUrl);
+      this.provider.removeListener("accountChanged", this.onAccountsChanged);
+      this.provider.removeListener("disconnect", this.onDisconnect);
 
-    try {
-      const ownerWallet = new PublicKey(address);
-      const allDomainKeys = await getAllDomains(connection, ownerWallet);
-      const allDomainNames = await Promise.all(
-        allDomainKeys.map(key => {
-          return performReverseLookup(connection, key);
-        })
-      );
-      if (!allDomainNames[0]) return null;
-      return allDomainNames[0];
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
     } catch (error) {
       console.error(error);
-      throw error;
+      throw SolanaErrorHandler(error, "disconnect", this.name);
     }
   }
 
-  async signMessage(message: string): Promise<string> {
-    if (!this.provider) throw new Error("No wallet Connected");
+  async signMessage(message: string): Promise<MessageSignedResponse> {
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
     try {
-      const _message = new TextEncoder().encode(message);
-      const hash = await this.provider.signMessage(_message, "utf8");
-      return new TextDecoder("utf-8").decode(hash);
+      const encodedMessage = new TextEncoder().encode(message);
+      const signature = await this.provider.signMessage(encodedMessage, "utf8");
+
+      this.emitter.emit(
+        "messageSigned",
+        signature,
+        SolflareConnector.#instance
+      );
+
+      return {
+        signature,
+        activeConnector: SolflareConnector.#instance,
+      };
     } catch (err) {
       console.error(err);
-      throw err;
+      throw SolanaErrorHandler(err, "signMessage", this.name);
     }
   }
 
-  protected onAccountsChanged(): void {
-    console.log("Account Changed");
-  }
-
-  protected onChainChanged(_chain: string | number): void {
-    console.log("Chain Changed");
-  }
-
-  protected onDisconnect(): void {
-    console.log("Wallet disconnected");
-  }
+  protected onAccountsChanged = (address: string) => {
+    this.emitter.emit(
+      "accountsChanged",
+      [address],
+      SolflareConnector.#instance
+    );
+  };
+
+  protected onDisconnect = () => {
+    this.emitter.emit("disconnected", this.name, this.ecosystem);
+  };
 }
diff --git a/packages/solana/src/index.ts b/packages/solana/src/index.ts
index 505b501..0edaf08 100644
--- a/packages/solana/src/index.ts
+++ b/packages/solana/src/index.ts
@@ -2,11 +2,5 @@ import { SolflareConnector } from "./connectors/solflare";
 import { PhantomConnector } from "./connectors/phantom";
 
 import { PhantomProvider } from "./providers/phantomProvider";
-import { SolflareProvider } from "./providers/solflareProvider";
 
-export {
-  SolflareConnector,
-  type SolflareProvider,
-  PhantomConnector,
-  type PhantomProvider,
-};
+export { SolflareConnector, PhantomConnector, type PhantomProvider };
diff --git a/packages/solana/src/providers/phantomProvider.ts b/packages/solana/src/providers/phantomProvider.ts
index 7fca704..6f2f035 100644
--- a/packages/solana/src/providers/phantomProvider.ts
+++ b/packages/solana/src/providers/phantomProvider.ts
@@ -1,21 +1,35 @@
-import {
-  SendOptions,
-  Transaction,
-  TransactionSignature,
-} from '@solana/web3.js';
-import EventEmitter from 'eventemitter3';
+import { PublicKey } from "@solana/web3.js";
 
-export interface PhantomProvider extends EventEmitter {
+type DisplayEncoding = "utf8" | "hex";
+interface ConnectOpts {
+  onlyIfTrusted: boolean;
+}
+
+type PhantomEvent = "connect" | "disconnect" | "accountChanged";
+
+type PhantomRequestMethod =
+  | "connect"
+  | "disconnect"
+  | "signAndSendTransaction"
+  | "signAndSendTransactionV0"
+  | "signAndSendTransactionV0WithLookupTable"
+  | "signTransaction"
+  | "signAllTransactions"
+  | "signMessage";
+
+export interface PhantomProvider {
+  publicKey: PublicKey | null;
+  isConnected: boolean | null;
   isPhantom?: boolean;
-  publicKey?: { toBytes(): Uint8Array };
-  isConnected: boolean;
-  signTransaction(transaction: Transaction): Promise<Transaction>;
-  signAllTransactions(transactions: Transaction[]): Promise<Transaction[]>;
-  signAndSendTransaction(
-    transaction: Transaction,
-    options?: SendOptions
-  ): Promise<{ signature: TransactionSignature }>;
-  signMessage(message: Uint8Array): Promise<{ signature: Uint8Array }>;
-  connect(): Promise<void>;
-  disconnect(): Promise<void>;
+  signMessage: (
+    message: Uint8Array | string,
+    display?: DisplayEncoding
+  ) => Promise<{
+    signature: Uint8Array;
+    publicKey: PublicKey;
+  }>;
+  connect: (opts?: Partial<ConnectOpts>) => Promise<{ publicKey: PublicKey }>;
+  disconnect: () => Promise<void>;
+  on: (event: PhantomEvent, handler: (args: any) => void) => void;
+  request: (method: PhantomRequestMethod, params: any) => Promise<unknown>;
 }
diff --git a/packages/solana/src/providers/solflareProvider.ts b/packages/solana/src/providers/solflareProvider.ts
deleted file mode 100644
index be1d505..0000000
--- a/packages/solana/src/providers/solflareProvider.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-import EventEmitter from 'eventemitter3';
-
-export interface SolflareProvider extends EventEmitter {
-  isSolflare?: boolean;
-
-  publicKey(): PublicKey | null;
-  connected(): boolean;
-
-  connect(): Promise<void>;
-  disconnect(): Promise<void>;
-  signTransaction(message: Uint8Array): Promise<Uint8Array>;
-  signAllTransactions(messages: Uint8Array[]): Promise<Uint8Array[]>;
-  signMessage(data: Uint8Array, display: 'hex' | 'utf8'): Promise<Uint8Array>;
-}
diff --git a/packages/solana/src/types/chainConfig.ts b/packages/solana/src/types/chainConfig.ts
deleted file mode 100644
index f91530f..0000000
--- a/packages/solana/src/types/chainConfig.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type CustomChainConfig = {
-  chainNamespace: 'eip155' | 'solana' | 'other';
-  chainId: string;
-  rpcTarget?: string;
-  displayName: string;
-  blockExplorer?: string;
-  ticker: string;
-  tickerName: string;
-};
diff --git a/packages/solana/src/types/index.ts b/packages/solana/src/types/index.ts
deleted file mode 100644
index e454ea7..0000000
--- a/packages/solana/src/types/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { CustomChainConfig } from './chainConfig';
-import { BaseConnector } from '@wallet01/core';
-
-type ClientConfig<TProvider> = {
-  chainConfig: CustomChainConfig;
-  connector: BaseConnector<TProvider>;
-};
-
-type ConnectedData<TProvider> = {
-  account: string;
-  chainId: string;
-  provider: TProvider;
-};
-
-export { type CustomChainConfig, type ClientConfig, type ConnectedData };
diff --git a/packages/solana/src/utils/emiter.ts b/packages/solana/src/utils/emiter.ts
deleted file mode 100644
index 17c4b4b..0000000
--- a/packages/solana/src/utils/emiter.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import EventEmitter from 'eventemitter3';
-
-const eventEmitter = new EventEmitter();
-const emitter = {
-  on: (event: string, fn: (args: any) => void) => eventEmitter.on(event, fn),
-  once: (event: string, fn: () => void) => eventEmitter.once(event, fn),
-  off: (event: string, fn: () => void) => eventEmitter.off(event, fn),
-  emit: (event: string, payload?: unknown) => eventEmitter.emit(event, payload),
-};
-
-Object.freeze(emitter);
-export default emitter;
diff --git a/packages/solana/src/utils/utils.ts b/packages/solana/src/utils/utils.ts
new file mode 100644
index 0000000..1d377f4
--- /dev/null
+++ b/packages/solana/src/utils/utils.ts
@@ -0,0 +1,45 @@
+import { UnknownError, UserRejectedRequestError } from "@wallet01/core";
+
+export class WalletInternalError extends Error {
+  name = "WalletInternalError";
+
+  constructor({ walletName }: { walletName: string }) {
+    super(`There was an internal error while using ${walletName} wallet.`);
+  }
+}
+
+export class UnauthorisedMethodError extends Error {
+  name = "UnauthorisedMethodError";
+
+  constructor({ method, walletName }: { method: string; walletName: string }) {
+    super(
+      `Method ${method} is not authorised by the user for ${walletName} wallet.`
+    );
+  }
+}
+
+export const SolanaErrorHandler = (
+  error: any,
+  atFunction: string,
+  walletName: string
+) => {
+  switch (error.code) {
+    case 4100:
+      throw new UnauthorisedMethodError({
+        method: atFunction,
+        walletName,
+      });
+
+    case 4001:
+      throw new UserRejectedRequestError();
+
+    case -32603:
+      throw new WalletInternalError({ walletName });
+
+    default:
+      throw new UnknownError({
+        walletName,
+        atFunction,
+      });
+  }
+};
diff --git a/packages/tezos/CHANGELOG.md b/packages/tezos/CHANGELOG.md
index b97f228..6a98b0b 100644
--- a/packages/tezos/CHANGELOG.md
+++ b/packages/tezos/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @wallet01/tezos
 
+## 0.3.0-beta.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.1
+
+## 0.3.0-beta.0
+
+### Minor Changes
+
+- New events based architecture Wallet01; updated connectors and react package
+
+### Patch Changes
+
+- Updated dependencies
+  - @wallet01/core@1.0.0-beta.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/tezos/package.json b/packages/tezos/package.json
index a859314..2af03ce 100644
--- a/packages/tezos/package.json
+++ b/packages/tezos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wallet01/tezos",
-  "version": "0.2.1",
+  "version": "0.3.0-beta.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,9 +14,8 @@
   "keywords": [],
   "author": "thevatsal.eth",
   "dependencies": {
-    "@taquito/beacon-wallet": "^17.1.0",
-    "@taquito/taquito": "12.0.0",
-    "@temple-wallet/dapp": "^7.0.0",
+    "@taquito/beacon-wallet": "^17.3.1",
+    "@taquito/taquito": "^17.3.1",
     "@wallet01/core": "workspace:*"
   },
   "devDependencies": {
diff --git a/packages/tezos/src/connectors/BeaconConnector.ts b/packages/tezos/src/connectors/BeaconConnector.ts
index 9a58391..71797d1 100644
--- a/packages/tezos/src/connectors/BeaconConnector.ts
+++ b/packages/tezos/src/connectors/BeaconConnector.ts
@@ -1,119 +1,149 @@
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
+import {
+  AddressNotFoundError,
+  BaseConnector,
+  ProviderNotFoundError,
+  UnknownError,
+  WalletNotConnectedError,
+} from "@wallet01/core";
 import { TezosToolkit } from "@taquito/taquito";
 import { BeaconWallet } from "@taquito/beacon-wallet";
 
 import { formatMessage } from "../utils/formatMessage";
 import { isNetwork } from "../utils/isNetwork";
 import { PermissionScope, SigningType, DAppClientOptions } from "../types";
+import {
+  ConnectionResponse,
+  DisconnectionResponse,
+  MessageSignedResponse,
+} from "@wallet01/core/dist/types/methodTypes";
 
 type BeaconConnectorOptions = {
-  chain?: string;
   name: string;
   rpcUrl?: string;
 } & DAppClientOptions;
 
 export class BeaconConnector extends BaseConnector<BeaconWallet> {
-  provider?: BeaconWallet | undefined;
-  private projectName: string;
+  static #instance: BaseConnector<BeaconWallet>;
+  provider!: BeaconWallet;
   private rpcUrl: string;
-  private featuredWallets?: string[];
-  private toolkit: TezosToolkit;
+  private toolkit!: TezosToolkit;
+  private isConnected = false;
+  private options: DAppClientOptions;
 
-  static publicKey?: string;
-
-  constructor({
-    chain = "mainnet",
-    name,
-    rpcUrl,
-    featuredWallets,
-  }: BeaconConnectorOptions) {
-    super(chain, "beacon", "tezos");
-    this.projectName = name;
-    this.featuredWallets = featuredWallets;
+  private constructor({ rpcUrl, ...options }: BeaconConnectorOptions) {
+    super("beacon", "tezos");
+    this.options = options;
 
     if (rpcUrl) {
       this.rpcUrl = rpcUrl;
     } else {
       this.rpcUrl = "https://mainnet.api.tez.ie/";
     }
+  }
 
-    this.toolkit = new TezosToolkit(this.rpcUrl);
+  static init(options: BeaconConnectorOptions) {
+    if (!BeaconConnector.#instance) {
+      BeaconConnector.#instance = new BeaconConnector(
+        options
+      ) as BaseConnector<BeaconWallet>;
+    }
+    return BeaconConnector.#instance;
   }
 
   async getProvider(): Promise<BeaconWallet> {
     try {
-      if (!this.provider) {
-        const provider = new BeaconWallet({
-          name: this.projectName,
-          featuredWallets: this.featuredWallets,
-        });
+      if (!this.toolkit) this.toolkit = new TezosToolkit(this.rpcUrl);
+      if (!this.isConnected) {
+        const provider = new BeaconWallet(this.options);
         this.provider = provider;
         this.toolkit.setProvider({ wallet: provider });
       }
       return this.provider;
     } catch (error) {
-      console.error({ error }, "getProvider");
-      throw error;
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getProvider",
+      });
     }
   }
 
   async getAccount(): Promise<string[]> {
-    if (!this.provider) await this.getProvider();
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
     try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
       const account = await this.provider.getPKH();
-      if (!account) {
-        throw new Error("Wallet Not Conencted");
-      }
       return [account];
     } catch (error) {
-      console.error({ error }, "getAccount");
-      throw error;
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getAccount",
+      });
     }
   }
 
   async getChainId(): Promise<string> {
-    if (!this.provider) await this.getProvider();
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
     try {
       if (!this.provider) throw new Error("Wallet Not Installed");
       const account = await this.provider.client.getActiveAccount();
       if (!account) {
-        await this.connect({});
-        return this.chain;
+        throw new WalletNotConnectedError({ walletName: this.name });
       }
       const {
-        network: { type },
+        network: { type: chainId },
       } = account;
-      return type;
+      return chainId;
     } catch (error) {
-      console.error({ error }, "getChainId");
-      throw error;
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "getChainId",
+      });
     }
   }
 
-  async switchChain(chainId: string): Promise<void> {
+  // async switchChain(chainId: string): Promise<ChainSwitchResponse> {
+  //   if (!this.provider)
+  //     throw new WalletNotConnectedError({ walletName: this.name });
+  //   try {
+  //     const fromChainId = await this.getChainId();
+  //     const toChainId = chainId;
+  //     await this.provider.clearActiveAccount();
+
+  //     if (isNetwork(toChainId)) {
+  //       await this.connect({ chainId: toChainId });
+  //     }
+
+  //     return {
+  //       fromChainId,
+  //       toChainId,
+  //       activeConnector: BeaconConnector.#instance,
+  //     };
+  //   } catch (error) {
+  //     console.error(error);
+  //     throw new UnknownError({
+  //       walletName: this.name,
+  //       atFunction: "switchChain",
+  //     });
+  //   }
+  // }
+
+  async connect(options?: { chainId: string }): Promise<ConnectionResponse> {
     if (!this.provider) await this.getProvider();
     try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
-      await this.connect({ chainId });
-      this.chain = chainId;
-    } catch (error) {
-      console.error({ error }, "switchChain");
-      throw error;
-    }
-  }
+      if (!this.provider)
+        throw new ProviderNotFoundError({ walletName: this.name });
 
-  async connect({ chainId }: { chainId?: string | undefined }): Promise<void> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
       let activeAccount = await this.provider.client.getActiveAccount();
       if (!activeAccount) {
         await this.provider.requestPermissions(
-          isNetwork(chainId)
+          options?.chainId && isNetwork(options.chainId)
             ? {
                 network: {
-                  type: chainId,
+                  type: options.chainId,
                 },
                 scopes: [PermissionScope.SIGN],
               }
@@ -124,75 +154,84 @@ export class BeaconConnector extends BaseConnector<BeaconWallet> {
         activeAccount = await this.provider.client.getActiveAccount();
       }
       if (!activeAccount?.address) {
-        throw new Error("Wallet Not Conencted");
+        throw new WalletNotConnectedError({ walletName: this.name });
       }
 
-      BeaconConnector.publicKey = activeAccount.publicKey;
-      this.chain = activeAccount.network.type;
-      setLastUsedConnector(this.name);
+      const address = activeAccount.address;
+      const chainId = activeAccount.network.type;
+
+      this.isConnected = true;
+      this.emitter.emit(
+        "connected",
+        address,
+        chainId,
+        this.name,
+        this.ecosystem,
+        BeaconConnector.#instance
+      );
+
+      return {
+        address,
+        chainId,
+        ecosystem: this.ecosystem,
+        walletName: this.name,
+        activeConnector: BeaconConnector.#instance,
+      };
     } catch (error) {
       console.error({ error }, "connect");
       throw error;
     }
   }
 
-  async disconnect(): Promise<void> {
-    if (!this.provider) await this.getProvider();
+  async disconnect(): Promise<DisconnectionResponse> {
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
     try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
       await this.provider.clearActiveAccount();
-      BeaconConnector.publicKey = undefined;
       await this.provider.disconnect();
-    } catch (error) {
-      console.error({ error }, "disconnect");
-      throw error;
-    }
-  }
+      this.isConnected = false;
 
-  async resolveDid(address: string): Promise<string | null> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Connected");
-      const domain = await fetch(
-        `https://api.tzkt.io/v1/domains?owner=${address}`
-      ).then(res => res.json());
-      if (!domain || domain.length == 0 || !domain[0]) return null;
-      return domain[0].name as string;
+      this.emitter.emit("disconnected", this.name, this.ecosystem);
+
+      return {
+        walletName: this.name,
+        ecosystem: this.ecosystem,
+      };
     } catch (error) {
-      console.error({ error }, "resolveDid");
-      throw error;
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "disconnect",
+      });
     }
   }
 
-  async signMessage(message: string): Promise<string> {
-    if (!this.provider) await this.getProvider();
+  async signMessage(message: string): Promise<MessageSignedResponse> {
+    if (!this.provider)
+      throw new WalletNotConnectedError({ walletName: this.name });
     try {
-      if (!this.provider) throw new Error("Wallet Not Connected");
-      const address = await this.provider.getPKH();
+      const address = (await this.getAccount())[0];
       if (!address) {
-        throw new Error("Wallet Not Conencted");
+        throw new AddressNotFoundError({ walletName: this.name });
       }
       const { signature } = await this.provider.client.requestSignPayload({
         signingType: SigningType.MICHELINE,
         payload: formatMessage(message),
         sourceAddress: address,
       });
-      return signature;
-    } catch (error) {
-      console.error({ error }, "signMessage");
-      throw error;
-    }
-  }
 
-  protected onAccountsChanged(): void {
-    return;
-  }
+      this.emitter.emit("messageSigned", signature, BeaconConnector.#instance);
 
-  protected onChainChanged(): void {
-    return;
-  }
-
-  protected onDisconnect(): void {
-    return;
+      return {
+        signature,
+        activeConnector: BeaconConnector.#instance,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new UnknownError({
+        walletName: this.name,
+        atFunction: "signMessage",
+      });
+    }
   }
 }
diff --git a/packages/tezos/src/connectors/TempleConnector.ts b/packages/tezos/src/connectors/TempleConnector.ts
deleted file mode 100644
index c2791f5..0000000
--- a/packages/tezos/src/connectors/TempleConnector.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { BaseConnector, setLastUsedConnector } from "@wallet01/core";
-
-import { TempleDAppNetwork, TempleWallet } from "@temple-wallet/dapp";
-import { TezosToolkit } from "@taquito/taquito";
-import { formatMessage } from "../utils/formatMessage";
-import { isTempleNetwork } from "../utils/isNetwork";
-
-interface TempleConnectorOptions {
-  chain?: string;
-  rpcUrl?: string;
-  projectName: string;
-}
-
-export class TempleConnector extends BaseConnector<TempleWallet> {
-  provider?: TempleWallet | undefined;
-  private toolkit: TezosToolkit;
-  private rpcUrl: string;
-  private projectName: string;
-
-  static publicKey?: string;
-
-  constructor({
-    chain = "mainnet",
-    projectName,
-    rpcUrl,
-  }: TempleConnectorOptions) {
-    super(chain, "templewallet", "tezos");
-
-    this.projectName = projectName;
-    if (rpcUrl) {
-      this.rpcUrl = rpcUrl;
-    } else {
-      this.rpcUrl = "https://mainnet.api.tez.ie/";
-    }
-
-    this.toolkit = new TezosToolkit(this.rpcUrl);
-    this.provider = new TempleWallet(projectName);
-
-    this.toolkit.setProvider({ wallet: this.provider });
-  }
-
-  async getProvider(): Promise<TempleWallet> {
-    try {
-      if (this.provider) return this.provider;
-      const provider = new TempleWallet(this.projectName);
-      this.provider = provider;
-      return this.provider;
-    } catch (error) {
-      console.error({ error }, "getProvider");
-      throw error;
-    }
-  }
-
-  async getAccount(): Promise<string[]> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
-      const account = await this.provider.getPKH();
-      if (!account) {
-        throw new Error("Wallet Not Conencted");
-      }
-      return [account];
-    } catch (error) {
-      console.error({ error }, "getAccount");
-      throw error;
-    }
-  }
-
-  async getChainId(): Promise<string> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
-      if (!this.chain) await this.connect({});
-      return this.chain;
-    } catch (error) {
-      console.error({ error }, "getChainId");
-      throw error;
-    }
-  }
-
-  async switchChain(chainId: string): Promise<void> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
-      await this.provider.reconnect(chainId as TempleDAppNetwork);
-      this.chain = chainId;
-    } catch (error) {
-      console.error({ error }, "switchChain");
-      throw error;
-    }
-  }
-
-  async connect({ chainId }: { chainId?: string | undefined }): Promise<void> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Provider not initialized");
-
-      if (!(await TempleWallet.isAvailable())) {
-        throw new Error("Wallet Not Installed");
-      }
-
-      if (isTempleNetwork(chainId)) {
-        await this.provider.connect(chainId as TempleDAppNetwork);
-      } else {
-        await this.provider.connect("mainnet");
-      }
-
-      TempleConnector.publicKey = await this.provider.permission?.publicKey;
-      this.chain = chainId || "mainnet";
-      setLastUsedConnector(this.name);
-    } catch (error) {
-      console.error({ error }, "connect");
-      throw error;
-    }
-  }
-
-  async disconnect(): Promise<void> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Installed");
-      TempleConnector.publicKey = undefined;
-      this.provider = undefined;
-      this.chain = "";
-    } catch (error) {
-      console.error({ error }, "disconnect");
-      throw error;
-    }
-  }
-
-  async resolveDid(address: string): Promise<string | null> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Connected");
-      const domain = await fetch(
-        `https://api.tzkt.io/v1/domains?owner=${address}`
-      ).then(res => res.json());
-      if (!domain || domain.length == 0 || !domain[0]) return null;
-      console.error(address, domain[0].name);
-      return domain[0].name as string;
-    } catch (error) {
-      console.error({ error }, "resolveDid");
-      throw error;
-    }
-  }
-
-  async signMessage(message: string): Promise<string> {
-    if (!this.provider) await this.getProvider();
-    try {
-      if (!this.provider) throw new Error("Wallet Not Connected");
-      const signature = await this.provider.sign(formatMessage(message));
-      return signature;
-    } catch (error) {
-      console.error({ error }, "signMessage");
-      throw error;
-    }
-  }
-
-  protected onAccountsChanged(): void {
-    return;
-  }
-
-  protected onChainChanged(_chain: string | number): void {
-    return;
-  }
-
-  protected onDisconnect(): void {
-    return;
-  }
-}
diff --git a/packages/tezos/src/index.ts b/packages/tezos/src/index.ts
index 0b30333..b4fa4ed 100644
--- a/packages/tezos/src/index.ts
+++ b/packages/tezos/src/index.ts
@@ -1,4 +1,3 @@
-import { TempleConnector } from "./connectors/TempleConnector";
 import { BeaconConnector } from "./connectors/BeaconConnector";
 
-export { TempleConnector, BeaconConnector };
+export { BeaconConnector };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dc6d509..c041e92 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '6.1'
+lockfileVersion: '6.0'
 
 settings:
   autoInstallPeers: false
@@ -9,17 +9,17 @@ importers:
   .:
     devDependencies:
       '@changesets/cli':
-        specifier: ^2.25.2
-        version: 2.25.2
+        specifier: ^2.26.2
+        version: 2.26.2
       eslint-config-custom:
         specifier: workspace:*
         version: link:configs/eslint
       prettier:
         specifier: latest
-        version: 3.0.0
+        version: 3.0.3
       turbo:
         specifier: latest
-        version: 1.10.6
+        version: 1.10.15
 
   configs/eslint:
     dependencies:
@@ -31,7 +31,7 @@ importers:
         version: 8.5.0(eslint@7.32.0)
       eslint-config-turbo:
         specifier: latest
-        version: 0.0.10(eslint@7.32.0)
+        version: 1.10.15(eslint@7.32.0)
     devDependencies:
       typescript:
         specifier: ^4.7.4
@@ -186,8 +186,8 @@ importers:
   packages/cosmos:
     dependencies:
       '@keplr-wallet/types':
-        specifier: ^0.11.13
-        version: 0.11.17
+        specifier: ^0.12.32
+        version: 0.12.32
       '@wallet01/core':
         specifier: workspace:*
         version: link:../core
@@ -211,8 +211,8 @@ importers:
   packages/evm:
     dependencies:
       '@coinbase/wallet-sdk':
-        specifier: ^3.6.3
-        version: 3.6.3
+        specifier: ^3.7.2
+        version: 3.7.2
       '@ethersproject/providers':
         specifier: ^5.7.2
         version: 5.7.2
@@ -234,9 +234,6 @@ importers:
       '@web3modal/core':
         specifier: ^2.2.2
         version: 2.2.2
-      '@web3modal/standalone':
-        specifier: ^2.2.2
-        version: 2.2.2
       ethers:
         specifier: ^5.7.2
         version: 5.7.2
@@ -290,24 +287,18 @@ importers:
 
   packages/solana:
     dependencies:
-      '@bonfida/spl-name-service':
-        specifier: ^0.1.55
-        version: 0.1.55(@solana/spl-token@0.1.8)(@solana/web3.js@1.66.2)(bn.js@5.2.1)(borsh@0.6.0)
-      '@keplr-wallet/types':
-        specifier: ^0.11.13
-        version: 0.11.17
       '@solana/web3.js':
-        specifier: ^1.66.2
-        version: 1.66.2
+        specifier: ^1.87.1
+        version: 1.87.1
+      '@solflare-wallet/sdk':
+        specifier: ^1.3.2
+        version: 1.3.2(@solana/web3.js@1.87.1)
       '@wallet01/core':
         specifier: workspace:*
         version: link:../core
       eventemitter3:
         specifier: ^4.0.7
         version: 4.0.7
-      tweetnacl:
-        specifier: ^1.0.3
-        version: 1.0.3
     devDependencies:
       rimraf:
         specifier: ^3.0.2
@@ -325,14 +316,11 @@ importers:
   packages/tezos:
     dependencies:
       '@taquito/beacon-wallet':
-        specifier: ^17.1.0
-        version: 17.1.0
+        specifier: ^17.3.1
+        version: 17.3.1
       '@taquito/taquito':
-        specifier: 12.0.0
-        version: 12.0.0
-      '@temple-wallet/dapp':
-        specifier: ^7.0.0
-        version: 7.0.0(@taquito/taquito@12.0.0)
+        specifier: ^17.3.1
+        version: 17.3.1
       '@wallet01/core':
         specifier: workspace:*
         version: link:../core
@@ -393,11 +381,11 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@airgap/beacon-core@4.0.2:
-    resolution: {integrity: sha512-a6mAn6BfbejBQI95tRc6pIZ0VS6MTK9MZ7iXPTLF9hrnCHiROmrCgNKst8qp2dcE0Ehk7z/hGs2WliJzi657YA==}
+  /@airgap/beacon-core@4.0.10:
+    resolution: {integrity: sha512-iOAKZRD5BSDFfZKa++FoYBnfDhTLZSzKUbhF/AI6CnnTgzZaEbkTIs+/XVpFhcJQY58hJN77cGnioeG2/WCWkw==}
     dependencies:
-      '@airgap/beacon-types': 4.0.2
-      '@airgap/beacon-utils': 4.0.2
+      '@airgap/beacon-types': 4.0.10
+      '@airgap/beacon-utils': 4.0.10
       '@stablelib/ed25519': 1.0.3
       '@stablelib/nacl': 1.0.4
       '@stablelib/utf8': 1.0.1
@@ -405,14 +393,14 @@ packages:
       bs58check: 2.1.2
     dev: false
 
-  /@airgap/beacon-dapp@4.0.2:
-    resolution: {integrity: sha512-7vjvcM470GPfDkizYpuUzJ7Fus7X/zkFeXYTkxx69Dt5TlmKg09YNfRtvrFMDbf4OKnjbaRfVhqzwfYkpaRbPg==}
+  /@airgap/beacon-dapp@4.0.10:
+    resolution: {integrity: sha512-QfoRKxMCt4/RjW/lkExicoqzwdhhEhRxPwntS19VW+Q+cWhsJhmWULdF3rQNHRBtSsHws3LnOT0r8e1hndDxfQ==}
     dependencies:
-      '@airgap/beacon-core': 4.0.2
-      '@airgap/beacon-transport-matrix': 4.0.2
-      '@airgap/beacon-transport-postmessage': 4.0.2
-      '@airgap/beacon-transport-walletconnect': 4.0.2
-      '@airgap/beacon-ui': 4.0.2
+      '@airgap/beacon-core': 4.0.10
+      '@airgap/beacon-transport-matrix': 4.0.10
+      '@airgap/beacon-transport-postmessage': 4.0.10
+      '@airgap/beacon-transport-walletconnect': 4.0.10
+      '@airgap/beacon-ui': 4.0.10
     transitivePeerDependencies:
       - '@react-native-async-storage/async-storage'
       - bufferutil
@@ -421,30 +409,30 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@airgap/beacon-transport-matrix@4.0.2:
-    resolution: {integrity: sha512-sidXWA9QkcdpTLObsgMIIePq2+6eHn8djSK2UeoAWZpVOky+jpaIU78UlzqgDzMrO9inzu/xwsuXlk5Nmy1RyA==}
+  /@airgap/beacon-transport-matrix@4.0.10:
+    resolution: {integrity: sha512-UB7QZaI+hizg5vWYXaGyZfl0uQbhcbJzS6vzyeYxQcUH6uK9h3drHL/UiF8RQuMK73P3WcxShQq1Wn2Pu02gag==}
     dependencies:
-      '@airgap/beacon-core': 4.0.2
-      '@airgap/beacon-utils': 4.0.2
+      '@airgap/beacon-core': 4.0.10
+      '@airgap/beacon-utils': 4.0.10
       axios: 0.24.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /@airgap/beacon-transport-postmessage@4.0.2:
-    resolution: {integrity: sha512-UDHigcIRD5/VdKX3YDj+CVHYWafYg3N8nHT5yQ2JOU5nsQhD2y5NNNp/7U7I44CcD4OeK9d2slV+lnp8lBYe1g==}
+  /@airgap/beacon-transport-postmessage@4.0.10:
+    resolution: {integrity: sha512-MaBRLU/8QFFyXt9LoTN1Vz3dnRwHPptl0r4XPPH6enJTNBZ6PoqLenIs+BiCMMrnMKlBTlRHzfDUlSd9avcFbA==}
     dependencies:
-      '@airgap/beacon-core': 4.0.2
-      '@airgap/beacon-types': 4.0.2
-      '@airgap/beacon-utils': 4.0.2
+      '@airgap/beacon-core': 4.0.10
+      '@airgap/beacon-types': 4.0.10
+      '@airgap/beacon-utils': 4.0.10
     dev: false
 
-  /@airgap/beacon-transport-walletconnect@4.0.2:
-    resolution: {integrity: sha512-t4ZrgyImVf8UIhVa6ei/p1STVKNdRq5WSoop8eTSqArIHVj4zk2dr5J0ihbe64UyLAX1O0Z7yV+dUVoH+kVWGw==}
+  /@airgap/beacon-transport-walletconnect@4.0.10:
+    resolution: {integrity: sha512-SV9RIZLk6pZVPfEFWWJzB4MuVGi+fBGQsZI25NTPvuT9bvF6IBZwdQp8YwdNiGK3lOhThH+eb82W/b8CH6OOyg==}
     dependencies:
-      '@airgap/beacon-core': 4.0.2
-      '@airgap/beacon-types': 4.0.2
-      '@airgap/beacon-utils': 4.0.2
+      '@airgap/beacon-core': 4.0.10
+      '@airgap/beacon-types': 4.0.10
+      '@airgap/beacon-utils': 4.0.10
       '@walletconnect/sign-client': 2.7.0
     transitivePeerDependencies:
       - '@react-native-async-storage/async-storage'
@@ -453,25 +441,25 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@airgap/beacon-types@4.0.2:
-    resolution: {integrity: sha512-MWbE+350Yd7aICBEwTVIkty/YmKO5eTDsMbReUCNH8qf64gGhj/ZXEN6FPwMab+qKdmACgCkmbbtAXGGtmjwrA==}
+  /@airgap/beacon-types@4.0.10:
+    resolution: {integrity: sha512-C7gRyReO1puytL+D9I0xV5WTdbqXtHRcRJHnXt+KTWckZf9eHmUcnAk5JinBlIyFT0oz5jgPxN63UmhJ+lTtZQ==}
     dependencies:
       '@types/chrome': 0.0.163
     dev: false
 
-  /@airgap/beacon-ui@4.0.2:
-    resolution: {integrity: sha512-ZTcvdQ5GNlQ58M0Fduoq/KqsulBXeBN6jKiHnzHM3e98syy953DKQoDhU2NXNZiJ7AvEGO3s/fd+BN8y/+CVuQ==}
+  /@airgap/beacon-ui@4.0.10:
+    resolution: {integrity: sha512-mvhtUSpKfkfz+MWSKXVWHcE8SqD8ChtOv/0dNziQr75LPmLreMB29/hZEQYCfF0T+FXeNVjTvizOlw8sv2Gd6g==}
     dependencies:
-      '@airgap/beacon-core': 4.0.2
-      '@airgap/beacon-transport-postmessage': 4.0.2
-      '@airgap/beacon-types': 4.0.2
-      '@airgap/beacon-utils': 4.0.2
+      '@airgap/beacon-core': 4.0.10
+      '@airgap/beacon-transport-postmessage': 4.0.10
+      '@airgap/beacon-types': 4.0.10
+      '@airgap/beacon-utils': 4.0.10
       qrcode-svg: 1.1.0
       solid-js: 1.7.8
     dev: false
 
-  /@airgap/beacon-utils@4.0.2:
-    resolution: {integrity: sha512-5TfOI3ZolQQ9WNHogEO3SY4M2Paqbb3hf8DvolFofST6Brp0qyxkwZ0i99puahgwRo+B0qGilZpkLCYl72DMQg==}
+  /@airgap/beacon-utils@4.0.10:
+    resolution: {integrity: sha512-g4nCL8hQ2Y59Lp1a0BEm01HbGpjq+WOFFHTD5G3ySTHXwYOIfP1h8T9SLerK2hb91/nMJxthjAshfNwKXaqbqw==}
     dependencies:
       '@stablelib/ed25519': 1.0.3
       '@stablelib/nacl': 1.0.4
@@ -486,6 +474,7 @@ packages:
     dependencies:
       '@jridgewell/gen-mapping': 0.1.1
       '@jridgewell/trace-mapping': 0.3.17
+    dev: true
 
   /@babel/code-frame@7.12.11:
     resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==}
@@ -498,10 +487,12 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
+    dev: true
 
   /@babel/compat-data@7.20.1:
     resolution: {integrity: sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/core@7.20.2:
     resolution: {integrity: sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==}
@@ -524,6 +515,7 @@ packages:
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/generator@7.20.4:
     resolution: {integrity: sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==}
@@ -532,6 +524,7 @@ packages:
       '@babel/types': 7.20.2
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
+    dev: true
 
   /@babel/helper-annotate-as-pure@7.18.6:
     resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
@@ -551,25 +544,12 @@ packages:
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.21.4
       semver: 6.3.0
-
-  /@babel/helper-define-polyfill-provider@0.3.3:
-    resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
-    peerDependencies:
-      '@babel/core': ^7.4.0-0
-    dependencies:
-      '@babel/helper-compilation-targets': 7.20.0(@babel/core@7.20.2)
-      '@babel/helper-plugin-utils': 7.20.2
-      debug: 4.3.4
-      lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+    dev: true
 
   /@babel/helper-environment-visitor@7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-function-name@7.19.0:
     resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
@@ -577,18 +557,21 @@ packages:
     dependencies:
       '@babel/template': 7.18.10
       '@babel/types': 7.20.2
+    dev: true
 
   /@babel/helper-hoist-variables@7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.2
+    dev: true
 
   /@babel/helper-module-imports@7.18.6:
     resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.2
+    dev: true
 
   /@babel/helper-module-transforms@7.20.2:
     resolution: {integrity: sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==}
@@ -604,26 +587,31 @@ packages:
       '@babel/types': 7.20.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/helper-plugin-utils@7.20.2:
     resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-simple-access@7.20.2:
     resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.2
+    dev: true
 
   /@babel/helper-split-export-declaration@7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.2
+    dev: true
 
   /@babel/helper-string-parser@7.19.4:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-validator-identifier@7.19.1:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
@@ -632,6 +620,7 @@ packages:
   /@babel/helper-validator-option@7.18.6:
     resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helpers@7.20.1:
     resolution: {integrity: sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==}
@@ -642,6 +631,7 @@ packages:
       '@babel/types': 7.20.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
@@ -656,6 +646,7 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@babel/types': 7.20.2
+    dev: true
 
   /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.20.2):
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
@@ -711,22 +702,6 @@ packages:
       '@babel/types': 7.20.2
     dev: true
 
-  /@babel/plugin-transform-runtime@7.19.6:
-    resolution: {integrity: sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      babel-plugin-polyfill-corejs2: 0.3.3
-      babel-plugin-polyfill-corejs3: 0.6.0
-      babel-plugin-polyfill-regenerator: 0.4.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@babel/runtime-corejs3@7.20.1:
     resolution: {integrity: sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==}
     engines: {node: '>=6.9.0'}
@@ -741,6 +716,12 @@ packages:
     dependencies:
       regenerator-runtime: 0.13.11
 
+  /@babel/runtime@7.23.2:
+    resolution: {integrity: sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.14.0
+
   /@babel/template@7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -748,6 +729,7 @@ packages:
       '@babel/code-frame': 7.18.6
       '@babel/parser': 7.20.3
       '@babel/types': 7.20.2
+    dev: true
 
   /@babel/traverse@7.20.1:
     resolution: {integrity: sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==}
@@ -765,6 +747,7 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/types@7.20.2:
     resolution: {integrity: sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==}
@@ -773,54 +756,16 @@ packages:
       '@babel/helper-string-parser': 7.19.4
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
+    dev: true
 
-  /@bonfida/name-offers@0.0.1:
-    resolution: {integrity: sha512-R0GJ/+R5OXfm4KfiKEjHx88QnQxw+kzDA8O4pHouev1voPJueOzzo5x+YLowMpk3/2maqEwkNPWiWIlSExjdug==}
-    dependencies:
-      '@bonfida/spl-name-service': 0.1.55(@solana/spl-token@0.1.8)(@solana/web3.js@1.66.2)(bn.js@5.2.1)(borsh@0.6.0)
-      '@solana/spl-token': 0.1.8
-      '@solana/web3.js': 1.66.2
-      bn.js: 5.2.1
-      borsh: 0.6.0
-      bs58: 4.0.1
-    transitivePeerDependencies:
-      - '@solana/buffer-layout'
-      - bufferutil
-      - encoding
-      - supports-color
-      - utf-8-validate
-    dev: false
-
-  /@bonfida/spl-name-service@0.1.55(@solana/spl-token@0.1.8)(@solana/web3.js@1.66.2)(bn.js@5.2.1)(borsh@0.6.0):
-    resolution: {integrity: sha512-Yv9OVAWzVzVIvOOIkPWRIWHCf0S/tJx7VVMboJB9eojcRT1IWGPhQs0yy6XzCSX9SjoJSk4ZjUY4cRhCeNeknQ==}
-    peerDependencies:
-      '@solana/buffer-layout': ^4.0.0
-      '@solana/spl-token': 0.2.0
-      '@solana/web3.js': ^1.37.1
-      bn.js: ^5.1.3
-      borsh: ^0.7.0
-    dependencies:
-      '@bonfida/name-offers': 0.0.1
-      '@ethersproject/sha2': 5.7.0
-      '@solana/spl-token': 0.1.8
-      '@solana/web3.js': 1.66.2
-      bn.js: 5.2.1
-      borsh: 0.6.0
-    transitivePeerDependencies:
-      - bufferutil
-      - encoding
-      - supports-color
-      - utf-8-validate
-    dev: false
-
-  /@changesets/apply-release-plan@6.1.2:
-    resolution: {integrity: sha512-H8TV9E/WtJsDfoDVbrDGPXmkZFSv7W2KLqp4xX4MKZXshb0hsQZUNowUa8pnus9qb/5OZrFFRVsUsDCVHNW/AQ==}
+  /@changesets/apply-release-plan@6.1.4:
+    resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==}
     dependencies:
-      '@babel/runtime': 7.20.1
-      '@changesets/config': 2.2.0
+      '@babel/runtime': 7.23.2
+      '@changesets/config': 2.3.1
       '@changesets/get-version-range-type': 0.3.2
-      '@changesets/git': 1.5.0
-      '@changesets/types': 5.2.0
+      '@changesets/git': 2.0.0
+      '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
       detect-indent: 6.1.0
       fs-extra: 7.0.1
@@ -828,46 +773,47 @@ packages:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 5.7.1
+      semver: 7.5.4
     dev: true
 
-  /@changesets/assemble-release-plan@5.2.2:
-    resolution: {integrity: sha512-B1qxErQd85AeZgZFZw2bDKyOfdXHhG+X5S+W3Da2yCem8l/pRy4G/S7iOpEcMwg6lH8q2ZhgbZZwZ817D+aLuQ==}
+  /@changesets/assemble-release-plan@5.2.4:
+    resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==}
     dependencies:
-      '@babel/runtime': 7.20.1
+      '@babel/runtime': 7.23.2
       '@changesets/errors': 0.1.4
-      '@changesets/get-dependents-graph': 1.3.4
-      '@changesets/types': 5.2.0
+      '@changesets/get-dependents-graph': 1.3.6
+      '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
-      semver: 5.7.1
+      semver: 7.5.4
     dev: true
 
-  /@changesets/changelog-git@0.1.13:
-    resolution: {integrity: sha512-zvJ50Q+EUALzeawAxax6nF2WIcSsC5PwbuLeWkckS8ulWnuPYx8Fn/Sjd3rF46OzeKA8t30loYYV6TIzp4DIdg==}
+  /@changesets/changelog-git@0.1.14:
+    resolution: {integrity: sha512-+vRfnKtXVWsDDxGctOfzJsPhaCdXRYoe+KyWYoq5X/GqoISREiat0l3L8B0a453B2B4dfHGcZaGyowHbp9BSaA==}
     dependencies:
-      '@changesets/types': 5.2.0
+      '@changesets/types': 5.2.1
     dev: true
 
-  /@changesets/cli@2.25.2:
-    resolution: {integrity: sha512-ACScBJXI3kRyMd2R8n8SzfttDHi4tmKSwVwXBazJOylQItSRSF4cGmej2E4FVf/eNfGy6THkL9GzAahU9ErZrA==}
+  /@changesets/cli@2.26.2:
+    resolution: {integrity: sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==}
+    hasBin: true
     dependencies:
-      '@babel/runtime': 7.20.1
-      '@changesets/apply-release-plan': 6.1.2
-      '@changesets/assemble-release-plan': 5.2.2
-      '@changesets/changelog-git': 0.1.13
-      '@changesets/config': 2.2.0
+      '@babel/runtime': 7.23.2
+      '@changesets/apply-release-plan': 6.1.4
+      '@changesets/assemble-release-plan': 5.2.4
+      '@changesets/changelog-git': 0.1.14
+      '@changesets/config': 2.3.1
       '@changesets/errors': 0.1.4
-      '@changesets/get-dependents-graph': 1.3.4
-      '@changesets/get-release-plan': 3.0.15
-      '@changesets/git': 1.5.0
+      '@changesets/get-dependents-graph': 1.3.6
+      '@changesets/get-release-plan': 3.0.17
+      '@changesets/git': 2.0.0
       '@changesets/logger': 0.0.5
-      '@changesets/pre': 1.0.13
-      '@changesets/read': 0.5.8
-      '@changesets/types': 5.2.0
-      '@changesets/write': 0.2.2
+      '@changesets/pre': 1.0.14
+      '@changesets/read': 0.5.9
+      '@changesets/types': 5.2.1
+      '@changesets/write': 0.2.3
       '@manypkg/get-packages': 1.1.3
       '@types/is-ci': 3.0.0
-      '@types/semver': 6.2.3
+      '@types/semver': 7.5.3
       ansi-colors: 4.1.3
       chalk: 2.4.2
       enquirer: 2.3.6
@@ -880,19 +826,19 @@ packages:
       p-limit: 2.3.0
       preferred-pm: 3.0.3
       resolve-from: 5.0.0
-      semver: 5.7.1
+      semver: 7.5.4
       spawndamnit: 2.0.0
       term-size: 2.2.1
       tty-table: 4.1.6
     dev: true
 
-  /@changesets/config@2.2.0:
-    resolution: {integrity: sha512-GGaokp3nm5FEDk/Fv2PCRcQCOxGKKPRZ7prcMqxEr7VSsG75MnChQE8plaW1k6V8L2bJE+jZWiRm19LbnproOw==}
+  /@changesets/config@2.3.1:
+    resolution: {integrity: sha512-PQXaJl82CfIXddUOppj4zWu+987GCw2M+eQcOepxN5s+kvnsZOwjEJO3DH9eVy+OP6Pg/KFEWdsECFEYTtbg6w==}
     dependencies:
       '@changesets/errors': 0.1.4
-      '@changesets/get-dependents-graph': 1.3.4
+      '@changesets/get-dependents-graph': 1.3.6
       '@changesets/logger': 0.0.5
-      '@changesets/types': 5.2.0
+      '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
       fs-extra: 7.0.1
       micromatch: 4.0.5
@@ -904,25 +850,25 @@ packages:
       extendable-error: 0.1.7
     dev: true
 
-  /@changesets/get-dependents-graph@1.3.4:
-    resolution: {integrity: sha512-+C4AOrrFY146ydrgKOo5vTZfj7vetNu1tWshOID+UjPUU9afYGDXI8yLnAeib1ffeBXV3TuGVcyphKpJ3cKe+A==}
+  /@changesets/get-dependents-graph@1.3.6:
+    resolution: {integrity: sha512-Q/sLgBANmkvUm09GgRsAvEtY3p1/5OCzgBE5vX3vgb5CvW0j7CEljocx5oPXeQSNph6FXulJlXV3Re/v3K3P3Q==}
     dependencies:
-      '@changesets/types': 5.2.0
+      '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
       chalk: 2.4.2
       fs-extra: 7.0.1
-      semver: 5.7.1
+      semver: 7.5.4
     dev: true
 
-  /@changesets/get-release-plan@3.0.15:
-    resolution: {integrity: sha512-W1tFwxE178/en+zSj/Nqbc3mvz88mcdqUMJhRzN1jDYqN3QI4ifVaRF9mcWUU+KI0gyYEtYR65tour690PqTcA==}
+  /@changesets/get-release-plan@3.0.17:
+    resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==}
     dependencies:
-      '@babel/runtime': 7.20.1
-      '@changesets/assemble-release-plan': 5.2.2
-      '@changesets/config': 2.2.0
-      '@changesets/pre': 1.0.13
-      '@changesets/read': 0.5.8
-      '@changesets/types': 5.2.0
+      '@babel/runtime': 7.23.2
+      '@changesets/assemble-release-plan': 5.2.4
+      '@changesets/config': 2.3.1
+      '@changesets/pre': 1.0.14
+      '@changesets/read': 0.5.9
+      '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
     dev: true
 
@@ -930,14 +876,15 @@ packages:
     resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==}
     dev: true
 
-  /@changesets/git@1.5.0:
-    resolution: {integrity: sha512-Xo8AT2G7rQJSwV87c8PwMm6BAc98BnufRMsML7m7Iw8Or18WFvFmxqG5aOL5PBvhgq9KrKvaeIBNIymracSuHg==}
+  /@changesets/git@2.0.0:
+    resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==}
     dependencies:
-      '@babel/runtime': 7.20.1
+      '@babel/runtime': 7.23.2
       '@changesets/errors': 0.1.4
-      '@changesets/types': 5.2.0
+      '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
       is-subdir: 1.2.0
+      micromatch: 4.0.5
       spawndamnit: 2.0.0
     dev: true
 
@@ -947,31 +894,31 @@ packages:
       chalk: 2.4.2
     dev: true
 
-  /@changesets/parse@0.3.15:
-    resolution: {integrity: sha512-3eDVqVuBtp63i+BxEWHPFj2P1s3syk0PTrk2d94W9JD30iG+OER0Y6n65TeLlY8T2yB9Fvj6Ev5Gg0+cKe/ZUA==}
+  /@changesets/parse@0.3.16:
+    resolution: {integrity: sha512-127JKNd167ayAuBjUggZBkmDS5fIKsthnr9jr6bdnuUljroiERW7FBTDNnNVyJ4l69PzR57pk6mXQdtJyBCJKg==}
     dependencies:
-      '@changesets/types': 5.2.0
+      '@changesets/types': 5.2.1
       js-yaml: 3.14.1
     dev: true
 
-  /@changesets/pre@1.0.13:
-    resolution: {integrity: sha512-jrZc766+kGZHDukjKhpBXhBJjVQMied4Fu076y9guY1D3H622NOw8AQaLV3oQsDtKBTrT2AUFjt9Z2Y9Qx+GfA==}
+  /@changesets/pre@1.0.14:
+    resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==}
     dependencies:
-      '@babel/runtime': 7.20.1
+      '@babel/runtime': 7.23.2
       '@changesets/errors': 0.1.4
-      '@changesets/types': 5.2.0
+      '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
       fs-extra: 7.0.1
     dev: true
 
-  /@changesets/read@0.5.8:
-    resolution: {integrity: sha512-eYaNfxemgX7f7ELC58e7yqQICW5FB7V+bd1lKt7g57mxUrTveYME+JPaBPpYx02nP53XI6CQp6YxnR9NfmFPKw==}
+  /@changesets/read@0.5.9:
+    resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==}
     dependencies:
-      '@babel/runtime': 7.20.1
-      '@changesets/git': 1.5.0
+      '@babel/runtime': 7.23.2
+      '@changesets/git': 2.0.0
       '@changesets/logger': 0.0.5
-      '@changesets/parse': 0.3.15
-      '@changesets/types': 5.2.0
+      '@changesets/parse': 0.3.16
+      '@changesets/types': 5.2.1
       chalk: 2.4.2
       fs-extra: 7.0.1
       p-filter: 2.1.0
@@ -981,22 +928,22 @@ packages:
     resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==}
     dev: true
 
-  /@changesets/types@5.2.0:
-    resolution: {integrity: sha512-km/66KOqJC+eicZXsm2oq8A8bVTSpkZJ60iPV/Nl5Z5c7p9kk8xxh6XGRTlnludHldxOOfudhnDN2qPxtHmXzA==}
+  /@changesets/types@5.2.1:
+    resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==}
     dev: true
 
-  /@changesets/write@0.2.2:
-    resolution: {integrity: sha512-kCYNHyF3xaId1Q/QE+DF3UTrHTyg3Cj/f++T8S8/EkC+jh1uK2LFnM9h+EzV+fsmnZDrs7r0J4LLpeI/VWC5Hg==}
+  /@changesets/write@0.2.3:
+    resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==}
     dependencies:
-      '@babel/runtime': 7.20.1
-      '@changesets/types': 5.2.0
+      '@babel/runtime': 7.23.2
+      '@changesets/types': 5.2.1
       fs-extra: 7.0.1
       human-id: 1.0.2
       prettier: 2.8.8
     dev: true
 
-  /@coinbase/wallet-sdk@3.6.3:
-    resolution: {integrity: sha512-XUR4poOJE+dKzwBTdlM693CdLFitr046oZOVY3iDnbFcRrrQswhbDji7q4CmUcD4HxbfViX7PFoIwl79YQcukg==}
+  /@coinbase/wallet-sdk@3.7.2:
+    resolution: {integrity: sha512-lIGvXMsgpsQWci/XOMQIJ2nIZ8JUy/L+bvC0wkRaYarr0YylwpXrJ2gRM3hCXPS477pkyO7N/kSiAoRgEXUdJQ==}
     engines: {node: '>= 10.0.0'}
     dependencies:
       '@metamask/safe-event-emitter': 2.0.0
@@ -1005,8 +952,8 @@ packages:
       bn.js: 5.2.1
       buffer: 6.0.3
       clsx: 1.2.1
-      eth-block-tracker: 4.4.3
-      eth-json-rpc-filters: 4.2.2
+      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.3
@@ -1017,7 +964,6 @@ packages:
       stream-browserify: 3.0.0
       util: 0.12.5
     transitivePeerDependencies:
-      - '@babel/core'
       - bufferutil
       - encoding
       - supports-color
@@ -1427,41 +1373,13 @@ packages:
   /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
 
-  /@iov/crypto@2.1.0:
-    resolution: {integrity: sha512-jnb4XuK50admolm7fBxOcxfAW2TO+wYrZlhDWiMETItY/Y5gNNa1zaDSO2wNIjjfGng+8nQ1yqnNhqy7busV2Q==}
-    dependencies:
-      '@iov/encoding': 2.1.0
-      bip39: 3.0.4
-      bn.js: 4.12.0
-      elliptic: 6.5.4
-      js-sha3: 0.8.0
-      libsodium-wrappers: 0.7.10
-      pbkdf2: 3.1.2
-      ripemd160: 2.0.2
-      sha.js: 2.4.11
-      type-tagger: 1.0.0
-      unorm: 1.6.0
-    dev: false
-
-  /@iov/encoding@2.1.0:
-    resolution: {integrity: sha512-5IOdLO7Xg/uRykuiCqeMYghQ3IjWDtGxv7NTWXkgpHuna0aewx43mRpT2NPCpOZd1tpuorDtQ7/zbDNRaIIF/w==}
-    dependencies:
-      base64-js: 1.5.1
-      bech32: 1.1.4
-      bn.js: 4.12.0
-      readonly-date: 1.0.0
-    dev: false
-
-  /@iov/utils@2.0.2:
-    resolution: {integrity: sha512-4D8MEvTcFc/DVy5q25vHxRItmgJyeX85dixMH+MxdKr+yy71h3sYk+sVBEIn70uqGP7VqAJkGOPNFs08/XYELw==}
-    dev: false
-
   /@jridgewell/gen-mapping@0.1.1:
     resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.14
+    dev: true
 
   /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
@@ -1470,32 +1388,33 @@ packages:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.14
       '@jridgewell/trace-mapping': 0.3.17
+    dev: true
 
   /@jridgewell/resolve-uri@3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
+    dev: true
 
   /@jridgewell/set-array@1.1.2:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
+    dev: true
 
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
+    dev: true
 
   /@jridgewell/trace-mapping@0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
+    dev: true
 
-  /@keplr-wallet/types@0.11.17:
-    resolution: {integrity: sha512-ks3+L8SR4Wnn/kqafpJB2g/wzgNVoW3Y48Qb8vddnWmgub/ib1g1Xs3RB7lRzvrgWsuj2xmNCK9BFLcdisW6+g==}
+  /@keplr-wallet/types@0.12.32:
+    resolution: {integrity: sha512-uxTz2Tidmob12dy0Hp+posGkm9WFW5sFSpVenIX6geRIfJwgpApDWZ1oD4NtRPy8s5aa51DirJceSuIYz+fx1g==}
     dependencies:
-      axios: 0.27.2
       long: 4.0.0
-      secretjs: 0.17.7
-    transitivePeerDependencies:
-      - debug
     dev: false
 
   /@lit-labs/ssr-dom-shim@1.1.1:
@@ -1511,7 +1430,7 @@ packages:
   /@manypkg/find-root@1.1.0:
     resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
     dependencies:
-      '@babel/runtime': 7.20.1
+      '@babel/runtime': 7.23.2
       '@types/node': 12.20.55
       find-up: 4.1.0
       fs-extra: 8.1.0
@@ -1520,7 +1439,7 @@ packages:
   /@manypkg/get-packages@1.1.3:
     resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==}
     dependencies:
-      '@babel/runtime': 7.20.1
+      '@babel/runtime': 7.23.2
       '@changesets/types': 4.1.0
       '@manypkg/find-root': 1.1.0
       fs-extra: 8.1.0
@@ -1537,6 +1456,18 @@ packages:
     resolution: {integrity: sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==}
     dev: false
 
+  /@metamask/utils@3.6.0:
+    resolution: {integrity: sha512-9cIRrfkWvHblSiNDVXsjivqa9Ak0RYo/1H6tqTqTbAx+oBK2Sva0lWDHxGchOqA7bySGUJKAWSNJvH6gdHZ0gQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@types/debug': 4.1.7
+      debug: 4.3.4
+      semver: 7.3.8
+      superstruct: 1.0.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /@motionone/animation@10.15.1:
     resolution: {integrity: sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ==}
     dependencies:
@@ -1725,6 +1656,12 @@ packages:
     dev: false
     optional: true
 
+  /@noble/curves@1.2.0:
+    resolution: {integrity: sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==}
+    dependencies:
+      '@noble/hashes': 1.3.2
+    dev: false
+
   /@noble/ed25519@1.7.1:
     resolution: {integrity: sha512-Rk4SkJFaXZiznFyC/t77Q0NKS4FL7TLJJsVG2V2oiEq3kJVeTdxysEe/yRWSpnWMe808XRDJ+VFh5pt/FN5plw==}
     dev: false
@@ -1733,6 +1670,11 @@ packages:
     resolution: {integrity: sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==}
     dev: false
 
+  /@noble/hashes@1.3.2:
+    resolution: {integrity: sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==}
+    engines: {node: '>= 16'}
+    dev: false
+
   /@noble/secp256k1@1.7.0:
     resolution: {integrity: sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw==}
     dev: false
@@ -1762,49 +1704,6 @@ packages:
     resolution: {integrity: sha512-bQHV8R9Me8IaJoJ2vPG4rXcL7seB7YVuskr4f+f5RyOStSZetwzkWtoqDMl5erkBJy0lDRUnIR2WIkPiC0GJlg==}
     dev: false
 
-  /@protobufjs/aspromise@1.1.2:
-    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
-    dev: false
-
-  /@protobufjs/base64@1.1.2:
-    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
-    dev: false
-
-  /@protobufjs/codegen@2.0.4:
-    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
-    dev: false
-
-  /@protobufjs/eventemitter@1.1.0:
-    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
-    dev: false
-
-  /@protobufjs/fetch@1.1.0:
-    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
-    dependencies:
-      '@protobufjs/aspromise': 1.1.2
-      '@protobufjs/inquire': 1.1.0
-    dev: false
-
-  /@protobufjs/float@1.0.2:
-    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
-    dev: false
-
-  /@protobufjs/inquire@1.1.0:
-    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
-    dev: false
-
-  /@protobufjs/path@1.1.2:
-    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
-    dev: false
-
-  /@protobufjs/pool@1.1.0:
-    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
-    dev: false
-
-  /@protobufjs/utf8@1.1.0:
-    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
-    dev: false
-
   /@rize-labs/banana-wallet-sdk@0.1.18:
     resolution: {integrity: sha512-zV4pwjfaefMoQ8ZUsRv2QhhB0Xs3Q7JlcnBCYBBASHNtAqINH3eBO9d2ZLaTvNuAc0jzWBhLsOx2tQwR2ReoWw==}
     dependencies:
@@ -1836,25 +1735,8 @@ packages:
       buffer: 6.0.3
     dev: false
 
-  /@solana/spl-token@0.1.8:
-    resolution: {integrity: sha512-LZmYCKcPQDtJgecvWOgT/cnoIQPWjdH+QVyzPcFvyDUiT0DiRjZaam4aqNUyvchLFhzgunv3d9xOoyE34ofdoQ==}
-    engines: {node: '>= 10'}
-    dependencies:
-      '@babel/runtime': 7.20.1
-      '@solana/web3.js': 1.73.0
-      bn.js: 5.2.1
-      buffer: 6.0.3
-      buffer-layout: 1.2.2
-      dotenv: 10.0.0
-    transitivePeerDependencies:
-      - bufferutil
-      - encoding
-      - supports-color
-      - utf-8-validate
-    dev: false
-
-  /@solana/web3.js@1.66.2:
-    resolution: {integrity: sha512-RyaHMR2jGmaesnYP045VLeBGfR/gAW3cvZHzMFGg7bkO+WOYOYp1nEllf0/la4U4qsYGKCsO9eEevR5fhHiVHg==}
+  /@solana/web3.js@1.73.0:
+    resolution: {integrity: sha512-YrgX3Py7ylh8NYkbanoINUPCj//bWUjYZ5/WPy9nQ9SK3Cl7QWCR+NmbDjmC/fTspZGR+VO9LTQslM++jr5PRw==}
     engines: {node: '>=12.20.0'}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -1862,6 +1744,7 @@ packages:
       '@noble/hashes': 1.1.3
       '@noble/secp256k1': 1.7.0
       '@solana/buffer-layout': 4.0.0
+      agentkeepalive: 4.2.1
       bigint-buffer: 1.1.5
       bn.js: 5.2.1
       borsh: 0.7.0
@@ -1875,36 +1758,45 @@ packages:
     transitivePeerDependencies:
       - bufferutil
       - encoding
+      - supports-color
       - utf-8-validate
     dev: false
 
-  /@solana/web3.js@1.73.0:
-    resolution: {integrity: sha512-YrgX3Py7ylh8NYkbanoINUPCj//bWUjYZ5/WPy9nQ9SK3Cl7QWCR+NmbDjmC/fTspZGR+VO9LTQslM++jr5PRw==}
-    engines: {node: '>=12.20.0'}
+  /@solana/web3.js@1.87.1:
+    resolution: {integrity: sha512-E8Y9bNlZ8TQlhOvCx1b7jG+TjA4SJLVwufmIk1+tcQctUhK5HiB1Q8ljd4yQDkFlk6OOeAlAeqvW0YntWJU94Q==}
     dependencies:
-      '@babel/runtime': 7.20.1
-      '@noble/ed25519': 1.7.1
-      '@noble/hashes': 1.1.3
-      '@noble/secp256k1': 1.7.0
+      '@babel/runtime': 7.23.2
+      '@noble/curves': 1.2.0
+      '@noble/hashes': 1.3.2
       '@solana/buffer-layout': 4.0.0
-      agentkeepalive: 4.2.1
+      agentkeepalive: 4.5.0
       bigint-buffer: 1.1.5
       bn.js: 5.2.1
       borsh: 0.7.0
       bs58: 4.0.1
-      buffer: 6.0.1
+      buffer: 6.0.3
       fast-stable-stringify: 1.0.0
-      jayson: 3.7.0
-      node-fetch: 2.6.7
-      rpc-websockets: 7.5.0
+      jayson: 4.1.0
+      node-fetch: 2.7.0
+      rpc-websockets: 7.6.0
       superstruct: 0.14.2
     transitivePeerDependencies:
       - bufferutil
       - encoding
-      - supports-color
       - utf-8-validate
     dev: false
 
+  /@solflare-wallet/sdk@1.3.2(@solana/web3.js@1.87.1):
+    resolution: {integrity: sha512-jXOCogqYWIpvgKRWBUlt9HZTH25u2qAvaufVh/ooQlVyFbCUb03XKuMxPcUk29ZelU3PTKy6nCcWDc+cImfPpA==}
+    peerDependencies:
+      '@solana/web3.js': '*'
+    dependencies:
+      '@solana/web3.js': 1.87.1
+      bs58: 5.0.0
+      eventemitter3: 5.0.1
+      uuid: 9.0.0
+    dev: false
+
   /@stablelib/aead@1.0.1:
     resolution: {integrity: sha512-q39ik6sxGHewqtO0nP4BuSe3db5G1fEJE8ukvngS2gLkBXyy6E7pLubhbYgnkDFv6V8cWaxcE4Xn0t6LWcJkyg==}
     dev: false
@@ -2096,13 +1988,13 @@ packages:
       use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
-  /@taquito/beacon-wallet@17.1.0:
-    resolution: {integrity: sha512-iABiUx4KDXkqXVAKo8W1ik0zEt+aAZRxFHaxtS6wqwmpqCCl9+EGDPpP+FlOLoj320HXlkIba7OdsPpHAEJsKQ==}
+  /@taquito/beacon-wallet@17.3.1:
+    resolution: {integrity: sha512-PQDtTZt8rR6yFBM6//3G8KBLW0e9oWqCsHB7WSgk195ShMpHy7bd8eLOWz8ofOBdUFVZ4UDUrR6Pl35Y0HZ/Zw==}
     engines: {node: '>=16'}
     dependencies:
-      '@airgap/beacon-dapp': 4.0.2
-      '@taquito/core': 17.1.0
-      '@taquito/taquito': 17.1.0
+      '@airgap/beacon-dapp': 4.0.10
+      '@taquito/core': 17.3.1
+      '@taquito/taquito': 17.3.1
     transitivePeerDependencies:
       - '@react-native-async-storage/async-storage'
       - bufferutil
@@ -2111,167 +2003,86 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@taquito/core@17.1.0:
-    resolution: {integrity: sha512-tfdgC7/Q5U9lN3UzvuJYf8Z7iBWyOtqILRuWRGFM6VtSXwNwcNK62f8FNKAgyHahFkVA4vVdD9zrt8NbM/TB2g==}
-    engines: {node: '>=16'}
-    dev: false
-
-  /@taquito/core@17.1.1:
-    resolution: {integrity: sha512-ib+dzHbVT+0maYGAVdeIk9v9CNkOiB5j8CwnHUygBkEajoOdWTPlsrldRhRTAOnbj+iQk0kdkUECD6KY6iNknw==}
+  /@taquito/core@17.3.1:
+    resolution: {integrity: sha512-dk8ZXuZktfoIV5ESUx3mPkJxLBVL7o3CXLsaVoiPIu2nyd4I/VNkPh+aIOrhxHSVPBib3sVYN0Pc2a8ZO+0gsg==}
     engines: {node: '>=16'}
     dev: false
 
-  /@taquito/http-utils@12.1.1:
-    resolution: {integrity: sha512-Zlp/eTRVjFs0XEIiAhgxkh6s9npF4dO+e/Sm2XWsDmNPoGI2jdXNH0L+NiKJIOkYcu0CXlcgriTeEaYnbeTvcA==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      axios: 0.26.1
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /@taquito/http-utils@17.1.0:
-    resolution: {integrity: sha512-vkArbB7h9jMAf6apOERBoUYi/ARiBF5xuJunsPf/hECXz0kjaKGI7dKC6PsWJrvhfR/cACXKu4CAKG41WDNprw==}
+  /@taquito/http-utils@17.3.1:
+    resolution: {integrity: sha512-lHwkNM1sx1HmzJHuxQy3lxaksZH/Jqxq5cYEPJAeCzEj68TD4T4X2rcVPpa0b6Qka5mQgLITCbyFE+RUg+orgA==}
     engines: {node: '>=16'}
     dependencies:
-      '@taquito/core': 17.1.0
+      '@taquito/core': 17.3.1
       axios: 0.26.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /@taquito/local-forging@12.1.1:
-    resolution: {integrity: sha512-SUA1YYRIpEGsTy5OfUIgIem0k/QsAzGjDCvf/wl5XV/fVBkP/+GN7uvYoqgJblCmsgtsMBhJFtXgs+D6bjGexg==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@taquito/utils': 12.1.1
-      bignumber.js: 9.1.1
-    dev: false
-
-  /@taquito/local-forging@17.1.0:
-    resolution: {integrity: sha512-vKjjMDoVxgxbjYFhREaNtuI0OT6Jnty6+x+Tfzuk7alLf8zwDBvDXyXz+47WgFZb4Y3RtojRlnpIP4EhbtLnJQ==}
+  /@taquito/local-forging@17.3.1:
+    resolution: {integrity: sha512-1pBbN8g2Jhq7bxWW3diRC+llL5TA1/m9W2za75IAl2sv5oo8ttXVla4XY8yapLu/yeOWrb5ta7yvfEZ5x2ZeOw==}
     engines: {node: '>=16'}
     dependencies:
-      '@taquito/core': 17.1.0
-      '@taquito/utils': 17.1.1
+      '@taquito/core': 17.3.1
+      '@taquito/utils': 17.3.1
       bignumber.js: 9.1.1
     dev: false
 
-  /@taquito/michel-codec@12.1.1:
-    resolution: {integrity: sha512-BAig8YyLyRW5kxV/r0S191W+SvYuiTRJpgSp5IsgCDLAOh+d4/xq6IgU3PuGJgokQDstZdTbjpkrgRCnufR8lw==}
-    engines: {node: '>=6.0.0'}
-    dev: false
-
-  /@taquito/michel-codec@17.1.0:
-    resolution: {integrity: sha512-PjXySJonM77a6uoEOJwGxcz0+1kckahsepMMkjDDdkNhLjTExnNLY5bDoNwzvKj3Ag53zhIWzGwNb4qls1C0XQ==}
+  /@taquito/michel-codec@17.3.1:
+    resolution: {integrity: sha512-dxhrqn+/VBzkhL+bhLO9bVb1r/NKdvSYEoXRWgszNT+enVlokkFBM4kXcvGlFUZklaSiw0dQYd1Zk0sDMkr1sw==}
     engines: {node: '>=16'}
     dependencies:
-      '@taquito/core': 17.1.0
-    dev: false
-
-  /@taquito/michelson-encoder@12.1.1:
-    resolution: {integrity: sha512-mWcA1DHHlFj7UswJpEmml853x9e0IYHyeiKZYAo7DtizHz0jiUWtptCuEWiPQ4fMOreFbYZ6KVYenoVfQVNrqA==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@taquito/rpc': 12.1.1
-      '@taquito/utils': 12.1.1
-      bignumber.js: 9.1.1
-      fast-json-stable-stringify: 2.1.0
-    transitivePeerDependencies:
-      - debug
+      '@taquito/core': 17.3.1
     dev: false
 
-  /@taquito/michelson-encoder@17.1.0:
-    resolution: {integrity: sha512-1sYJp3QENlX2FoT/8poB+CcTH52S5RgIhVM4N0VOWR2MF8+y2SRVjMfrStfC9oDrH4jTt/ESQQFThcyw9XVEMg==}
+  /@taquito/michelson-encoder@17.3.1:
+    resolution: {integrity: sha512-PaJYlZnjqDwjvK2qC4j9icqcGLoHHQygnGLs9lPV1quAV1v9yWPe6ABK+miuq2vv4WDMFH6amaXBtLimgPDcuQ==}
     engines: {node: '>=16'}
     dependencies:
-      '@taquito/rpc': 17.1.0
-      '@taquito/utils': 17.1.1
+      '@taquito/rpc': 17.3.1
+      '@taquito/utils': 17.3.1
       bignumber.js: 9.1.1
       fast-json-stable-stringify: 2.1.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /@taquito/rpc@12.1.1:
-    resolution: {integrity: sha512-CgAF9kdmKLa/UbmiqApDtncCQGiG7kEOIYis8IIa0JUT9JD1H8WBbSNF/oNh4e0soWUK9BL2qU369RFnxIW+iA==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@taquito/http-utils': 12.1.1
-      '@taquito/utils': 12.1.1
-      bignumber.js: 9.1.1
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /@taquito/rpc@17.1.0:
-    resolution: {integrity: sha512-/nzsGMxHbZOea4C9BnmXGaQVYwERNKF9IwFzdrBVTS7m+lfoRku9QfV88b3K77wXvcpZYSuXa1x4tJIXS8hHXw==}
+  /@taquito/rpc@17.3.1:
+    resolution: {integrity: sha512-VHY5qgUVT4RDXDv7H8DQrrMk1tfnJ6m+BFHmJxYCe7WQCCr8u2TlN0X2N95QhM+LG0LXL/LFlzhQLRBOxLnxsw==}
     engines: {node: '>=16'}
     dependencies:
-      '@taquito/core': 17.1.0
-      '@taquito/http-utils': 17.1.0
-      '@taquito/utils': 17.1.1
+      '@taquito/core': 17.3.1
+      '@taquito/http-utils': 17.3.1
+      '@taquito/utils': 17.3.1
       bignumber.js: 9.1.1
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /@taquito/taquito@12.0.0:
-    resolution: {integrity: sha512-KWKSOCxDW6GG9Hpj50YE35z/l3ISnms90ev8nMICWFdEJd8IHQqj1NQ3/3zCmNn9E/ZLrve3uTHY9RbP7VmeKg==}
-    engines: {node: '>=6.0.0'}
-    requiresBuild: true
-    dependencies:
-      '@taquito/http-utils': 12.1.1
-      '@taquito/local-forging': 12.1.1
-      '@taquito/michel-codec': 12.1.1
-      '@taquito/michelson-encoder': 12.1.1
-      '@taquito/rpc': 12.1.1
-      '@taquito/utils': 12.1.1
-      bignumber.js: 9.1.1
-      rxjs: 6.6.7
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /@taquito/taquito@17.1.0:
-    resolution: {integrity: sha512-hmIPgSun3sH40ay1xk4YHR37nhqhjIaRxACZLWkX5vr+N7amFKfPWxUJvI1mlTuT8GFQsVVQMtYMLMs8YOh04Q==}
+  /@taquito/taquito@17.3.1:
+    resolution: {integrity: sha512-9CnIJv5z6KmYYhycOSTpSh51hH818yzXMjr5iR4Q2raWEtWQHYeXoDcVec1dkI+IITm9cQpLp5Gm++smSBElOA==}
     engines: {node: '>=16'}
     requiresBuild: true
     dependencies:
-      '@taquito/core': 17.1.0
-      '@taquito/http-utils': 17.1.0
-      '@taquito/local-forging': 17.1.0
-      '@taquito/michel-codec': 17.1.0
-      '@taquito/michelson-encoder': 17.1.0
-      '@taquito/rpc': 17.1.0
-      '@taquito/utils': 17.1.1
+      '@taquito/core': 17.3.1
+      '@taquito/http-utils': 17.3.1
+      '@taquito/local-forging': 17.3.1
+      '@taquito/michel-codec': 17.3.1
+      '@taquito/michelson-encoder': 17.3.1
+      '@taquito/rpc': 17.3.1
+      '@taquito/utils': 17.3.1
       bignumber.js: 9.1.1
       rxjs: 7.8.1
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /@taquito/utils@12.1.1:
-    resolution: {integrity: sha512-GxNSBrA02vwhy56ayWB49VZficB+j2oyhPdlsRb2CguephmyEYnlUaNV27ILa6dPDW+zv6+QWQj6GyqLBRpIlA==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@stablelib/blake2b': 1.0.1
-      '@stablelib/ed25519': 1.0.3
-      '@types/bs58check': 2.1.0
-      blakejs: 1.2.1
-      bs58check: 2.1.2
-      buffer: 6.0.3
-      elliptic: 6.5.4
-      typedarray-to-buffer: 4.0.0
-    dev: false
-
-  /@taquito/utils@17.1.1:
-    resolution: {integrity: sha512-KcK7Qa2+SCcevxSJixA3utDtlPYS5DGXpZdMlrAjwjozMiuDGSLM63D1CrW/ojYI0t3tPuErty10cPhURZ+d4A==}
+  /@taquito/utils@17.3.1:
+    resolution: {integrity: sha512-NLSFOaZbbs5L7aSV+vgCxj6celHBYLkzwmGvPiCm/mDSj1a1i4bgt8fJ6DbtwDiAmiA9tXPmRileRC4iPEaewg==}
     engines: {node: '>=16'}
     dependencies:
       '@stablelib/blake2b': 1.0.1
       '@stablelib/ed25519': 1.0.3
-      '@taquito/core': 17.1.1
+      '@taquito/core': 17.3.1
       '@types/bs58check': 2.1.0
       bignumber.js: 9.1.1
       blakejs: 1.2.1
@@ -2281,21 +2092,6 @@ packages:
       typedarray-to-buffer: 4.0.0
     dev: false
 
-  /@temple-wallet/dapp@7.0.0(@taquito/taquito@12.0.0):
-    resolution: {integrity: sha512-JbpXompkVDh4Wl0Oa+i8iKEGinFqYPTM4uuqw8eBH57vHxq52W5K3NSgVaKjfyWms9UYQ8xOfsUOzzUVWSYtxA==}
-    peerDependencies:
-      '@taquito/taquito': ^12.0.0
-    dependencies:
-      '@taquito/taquito': 12.0.0
-      nanoid: 3.3.4
-    dev: false
-
-  /@types/bn.js@4.11.6:
-    resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==}
-    dependencies:
-      '@types/node': 18.11.18
-    dev: false
-
   /@types/bs58check@2.1.0:
     resolution: {integrity: sha512-OxsysnJQh82vy9DRbOcw9m2j/WiyqZLn0YBhKxdQ+aCwoHj+tWzyCgpwAkr79IfDXZKxc6h7k89T9pwS78CqTQ==}
     dependencies:
@@ -2345,10 +2141,6 @@ packages:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
     dev: true
 
-  /@types/long@4.0.2:
-    resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
-    dev: false
-
   /@types/minimist@1.2.2:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
@@ -2357,10 +2149,6 @@ packages:
     resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
     dev: false
 
-  /@types/node@11.11.6:
-    resolution: {integrity: sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==}
-    dev: false
-
   /@types/node@12.20.55:
     resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}
 
@@ -2375,12 +2163,6 @@ packages:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
     dev: true
 
-  /@types/pbkdf2@3.1.0:
-    resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==}
-    dependencies:
-      '@types/node': 18.11.18
-    dev: false
-
   /@types/prop-types@15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
     dev: true
@@ -2409,14 +2191,8 @@ packages:
     resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
     dev: true
 
-  /@types/secp256k1@4.0.3:
-    resolution: {integrity: sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==}
-    dependencies:
-      '@types/node': 18.11.18
-    dev: false
-
-  /@types/semver@6.2.3:
-    resolution: {integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==}
+  /@types/semver@7.5.3:
+    resolution: {integrity: sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==}
     dev: true
 
   /@types/trusted-types@2.0.3:
@@ -2888,27 +2664,6 @@ packages:
       - react
     dev: false
 
-  /@web3modal/standalone@2.2.2:
-    resolution: {integrity: sha512-c05kkTFNGZqnjJ3n2C8uo+wWL6ut1jexGYAyTvbweDengdsOr8LDo0VpK5V3XSKCV2fFcPh5JE9H1aA4jpnZPg==}
-    deprecated: This package has been deprecated in favor of @walletconnect/modal. Please read more at https://docs.walletconnect.com
-    dependencies:
-      '@web3modal/core': 2.2.2
-      '@web3modal/ui': 2.2.2
-    transitivePeerDependencies:
-      - react
-    dev: false
-
-  /@web3modal/ui@2.2.2:
-    resolution: {integrity: sha512-PAuMOuk4sZ4UGjucGMZKzu6Qu56XtFsgLaqOn8ZgP2RkZmYEBGSG9mUQVzJd3XzfzAy1T91Wmqp/3TI3m0pXuQ==}
-    dependencies:
-      '@web3modal/core': 2.2.2
-      lit: 2.6.1
-      motion: 10.15.5
-      qrcode: 1.5.1
-    transitivePeerDependencies:
-      - react
-    dev: false
-
   /JSONStream@1.3.5:
     resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
     dependencies:
@@ -2969,6 +2724,13 @@ packages:
       - supports-color
     dev: false
 
+  /agentkeepalive@4.5.0:
+    resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
+    engines: {node: '>= 8.0.0'}
+    dependencies:
+      humanize-ms: 1.2.1
+    dev: false
+
   /ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
@@ -3149,14 +2911,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /axios@0.21.1:
-    resolution: {integrity: sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==}
-    dependencies:
-      follow-redirects: 1.15.2
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /axios@0.24.0:
     resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==}
     dependencies:
@@ -3173,23 +2927,6 @@ packages:
       - debug
     dev: false
 
-  /axios@0.26.1:
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
-    dependencies:
-      follow-redirects: 1.15.2
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /axios@0.27.2:
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /axios@1.3.6:
     resolution: {integrity: sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==}
     dependencies:
@@ -3204,39 +2941,6 @@ packages:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
 
-  /babel-plugin-polyfill-corejs2@0.3.3:
-    resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.20.1
-      '@babel/helper-define-polyfill-provider': 0.3.3
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /babel-plugin-polyfill-corejs3@0.6.0:
-    resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/helper-define-polyfill-provider': 0.3.3
-      core-js-compat: 3.27.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /babel-plugin-polyfill-regenerator@0.4.1:
-    resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/helper-define-polyfill-provider': 0.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
@@ -3246,6 +2950,10 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
+  /base-x@4.0.0:
+    resolution: {integrity: sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==}
+    dev: false
+
   /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
     dev: false
@@ -3288,15 +2996,6 @@ packages:
       file-uri-to-path: 1.0.0
     dev: false
 
-  /bip39@3.0.4:
-    resolution: {integrity: sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==}
-    dependencies:
-      '@types/node': 11.11.6
-      create-hash: 1.2.0
-      pbkdf2: 3.1.2
-      randombytes: 2.1.0
-    dev: false
-
   /blakejs@1.2.1:
     resolution: {integrity: sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==}
     dev: false
@@ -3309,14 +3008,6 @@ packages:
     resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==}
     dev: false
 
-  /borsh@0.6.0:
-    resolution: {integrity: sha512-sl5k89ViqsThXQpYa9XDtz1sBl3l1lI313cFUY1HKr+wvMILnb+58xpkqTNrYbelh99dY7K8usxoCusQmqix9Q==}
-    dependencies:
-      bn.js: 5.2.1
-      bs58: 4.0.1
-      text-encoding-utf-8: 1.0.2
-    dev: false
-
   /borsh@0.7.0:
     resolution: {integrity: sha512-CLCsZGIBCFnPtkNnieW/a8wmreDmfUtjU2m9yHrzPXIlNbqVs0AQrSatSG6vdNYUqdc83tkQi2eHfF98ubzQLA==}
     dependencies:
@@ -3405,6 +3096,7 @@ packages:
       electron-to-chromium: 1.4.284
       node-releases: 2.0.6
       update-browserslist-db: 1.0.10(browserslist@4.21.4)
+    dev: true
 
   /bs58@4.0.1:
     resolution: {integrity: sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==}
@@ -3412,6 +3104,12 @@ packages:
       base-x: 3.0.9
     dev: false
 
+  /bs58@5.0.0:
+    resolution: {integrity: sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==}
+    dependencies:
+      base-x: 4.0.0
+    dev: false
+
   /bs58check@2.1.2:
     resolution: {integrity: sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==}
     dependencies:
@@ -3420,27 +3118,10 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /btoa@1.2.1:
-    resolution: {integrity: sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==}
-    engines: {node: '>= 0.4.0'}
-    dev: false
-
-  /buffer-layout@1.2.2:
-    resolution: {integrity: sha512-kWSuLN694+KTk8SrYvCqwP2WcgQjoRCiF5b4QDvkkz8EmgD+aWAIceGFKMIAdmF/pH+vpgNV3d3kAKorcdAmWA==}
-    engines: {node: '>=4.5'}
-    dev: false
-
   /buffer-xor@1.0.3:
     resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==}
     dev: false
 
-  /buffer@5.4.3:
-    resolution: {integrity: sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==}
-    dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-    dev: false
-
   /buffer@6.0.1:
     resolution: {integrity: sha512-rVAXBwEcEoYtxnHSO5iWyhzV/O1WMtkUYWlfdLS7FjU4PnSJJHEfHXi/uHPI5EwltmOA794gN3bm3/pzuctWjQ==}
     dependencies:
@@ -3528,10 +3209,6 @@ packages:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: true
 
-  /charenc@0.0.2:
-    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
-    dev: false
-
   /chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
     engines: {node: '>= 8.10.0'}
@@ -3582,12 +3259,7 @@ packages:
   /clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
     engines: {node: '>=0.8'}
-    dev: true
-
-  /clone@2.1.2:
-    resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
-    engines: {node: '>=0.8'}
-    dev: false
+    dev: true
 
   /clsx@1.2.1:
     resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
@@ -3632,12 +3304,7 @@ packages:
 
   /convert-source-map@1.9.0:
     resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
-
-  /core-js-compat@3.27.1:
-    resolution: {integrity: sha512-Dg91JFeCDA17FKnneN7oCMz4BkQ4TcffkgHP4OWwp9yx3pi7ubqMDXXSacfNak1PQqjc95skyt+YBLHQJnkJwA==}
-    dependencies:
-      browserslist: 4.21.4
-    dev: false
+    dev: true
 
   /core-js-pure@3.26.1:
     resolution: {integrity: sha512-VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ==}
@@ -3696,10 +3363,6 @@ packages:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  /crypt@0.0.2:
-    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
-    dev: false
-
   /crypto-browserify@3.12.0:
     resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==}
     dependencies:
@@ -3746,10 +3409,6 @@ packages:
       stream-transform: 2.1.3
     dev: true
 
-  /curve25519-js@0.0.4:
-    resolution: {integrity: sha512-axn2UMEnkhyDUPWOwVKBMVIzSQy2ejH2xRGy1wq81dqRwApXfIzfbE3hIX0ZRFBIihf/KDqK158DLwESu4AK1w==}
-    dev: false
-
   /damerau-levenshtein@1.0.8:
     resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
     dev: true
@@ -3905,9 +3564,9 @@ packages:
     dependencies:
       esutils: 2.0.3
 
-  /dotenv@10.0.0:
-    resolution: {integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==}
-    engines: {node: '>=10'}
+  /dotenv@16.0.3:
+    resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
+    engines: {node: '>=12'}
     dev: false
 
   /duplexify@4.1.2:
@@ -3921,6 +3580,7 @@ packages:
 
   /electron-to-chromium@1.4.284:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
+    dev: true
 
   /elliptic@6.5.4:
     resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==}
@@ -4230,6 +3890,7 @@ packages:
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
+    dev: true
 
   /escape-string-regexp@1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
@@ -4273,13 +3934,13 @@ packages:
       eslint: 7.32.0
     dev: false
 
-  /eslint-config-turbo@0.0.10(eslint@7.32.0):
-    resolution: {integrity: sha512-o4ULFZYM1OihSd63eDGEuy9rt6tW4ma6xnW9grnr44BoJwKaGQko2aka9kfqQs0vtmwD1++Os3ThPHETmzkFzA==}
+  /eslint-config-turbo@1.10.15(eslint@7.32.0):
+    resolution: {integrity: sha512-76mpx2x818JZE26euen14utYcFDxOahZ9NaWA+6Xa4pY2ezVKVschuOxS96EQz3o3ZRSmcgBOapw/gHbN+EKxQ==}
     peerDependencies:
       eslint: '>6.6.0'
     dependencies:
       eslint: 7.32.0
-      eslint-plugin-turbo: 0.0.10(eslint@7.32.0)
+      eslint-plugin-turbo: 1.10.15(eslint@7.32.0)
     dev: false
 
   /eslint-import-resolver-node@0.3.6:
@@ -4425,11 +4086,12 @@ packages:
       string.prototype.matchall: 4.0.8
     dev: true
 
-  /eslint-plugin-turbo@0.0.10(eslint@7.32.0):
-    resolution: {integrity: sha512-T7QRwF4rjBQCJD9AHLHn9ShtHCHNkfIZW5Oio92WtQYhoU5jZCU3ynU+ONFXLuvoUx4dJ19WergIyHL+DwL2+g==}
+  /eslint-plugin-turbo@1.10.15(eslint@7.32.0):
+    resolution: {integrity: sha512-Tv4QSKV/U56qGcTqS/UgOvb9HcKFmWOQcVh3HEaj7of94lfaENgfrtK48E2CckQf7amhKs1i+imhCsNCKjkQyA==}
     peerDependencies:
       eslint: '>6.6.0'
     dependencies:
+      dotenv: 16.0.3
       eslint: 7.32.0
     dev: false
 
@@ -4622,49 +4284,27 @@ packages:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
 
-  /eth-block-tracker@4.4.3:
-    resolution: {integrity: sha512-A8tG4Z4iNg4mw5tP1Vung9N9IjgMNqpiMoJ/FouSFwNCGHv2X0mmOYwtQOJzki6XN7r7Tyo01S29p7b224I4jw==}
+  /eth-block-tracker@6.1.0:
+    resolution: {integrity: sha512-K9SY8+/xMBi4M5HHTDdxnpEqEEGjbNpzHFqvxyjMZej8InV/B+CkFRKM6W+uvrFJ7m8Zd1E0qUkseU3vdIDFYQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/plugin-transform-runtime': 7.19.6
-      '@babel/runtime': 7.20.1
-      eth-query: 2.1.2
+      '@metamask/safe-event-emitter': 2.0.0
+      '@metamask/utils': 3.6.0
       json-rpc-random-id: 1.0.1
       pify: 3.0.0
-      safe-event-emitter: 1.0.1
     transitivePeerDependencies:
-      - '@babel/core'
       - supports-color
     dev: false
 
-  /eth-json-rpc-filters@4.2.2:
-    resolution: {integrity: sha512-DGtqpLU7bBg63wPMWg1sCpkKCf57dJ+hj/k3zF26anXMzkmtSBDExL8IhUu7LUd34f0Zsce3PYNO2vV2GaTzaw==}
+  /eth-json-rpc-filters@5.1.0:
+    resolution: {integrity: sha512-fos+9xmoa1A2Ytsc9eYof17r81BjdJOUcGcgZn4K/tKdCCTb+a8ytEtwlu1op5qsXFDlgGmstTELFrDEc89qEQ==}
+    engines: {node: '>=14.0.0'}
     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
-    transitivePeerDependencies:
-      - encoding
-    dev: false
-
-  /eth-json-rpc-middleware@6.0.0:
-    resolution: {integrity: sha512-qqBfLU2Uq1Ou15Wox1s+NX05S9OcAEL4JZ04VZox2NS0U+RtCMjSxzXhLFWekdShUPZ+P8ax3zCO2xcPrp6XJQ==}
-    dependencies:
-      btoa: 1.2.1
-      clone: 2.1.2
-      eth-query: 2.1.2
-      eth-rpc-errors: 3.0.0
-      eth-sig-util: 1.4.2
-      ethereumjs-util: 5.2.1
-      json-rpc-engine: 5.4.0
-      json-stable-stringify: 1.0.2
-      node-fetch: 2.6.7
-      pify: 3.0.0
-      safe-event-emitter: 1.0.1
-    transitivePeerDependencies:
-      - encoding
     dev: false
 
   /eth-query@2.1.2:
@@ -4674,69 +4314,12 @@ packages:
       xtend: 4.0.2
     dev: false
 
-  /eth-rpc-errors@3.0.0:
-    resolution: {integrity: sha512-iPPNHPrLwUlR9xCSYm7HHQjWBasor3+KZfRvwEWxMz3ca0yqnlBeJrnyphkGIXZ4J7AMAaOLmwy4AWhnxOiLxg==}
-    dependencies:
-      fast-safe-stringify: 2.1.1
-    dev: false
-
   /eth-rpc-errors@4.0.2:
     resolution: {integrity: sha512-n+Re6Gu8XGyfFy1it0AwbD1x0MUzspQs0D5UiPs1fFPCr6WAwZM+vbIhXheBFrpgosqN9bs5PqlB4Q61U/QytQ==}
     dependencies:
       fast-safe-stringify: 2.1.1
     dev: false
 
-  /eth-sig-util@1.4.2:
-    resolution: {integrity: sha512-iNZ576iTOGcfllftB73cPB5AN+XUQAT/T8xzsILsghXC1o8gJUqe3RHlcDqagu+biFpYQ61KQrZZJza8eRSYqw==}
-    dependencies:
-      ethereumjs-abi: github.com/ethereumjs/ethereumjs-abi/ee3994657fa7a427238e6ba92a84d0b529bbcde0
-      ethereumjs-util: 5.2.1
-    dev: false
-
-  /ethereum-cryptography@0.1.3:
-    resolution: {integrity: sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==}
-    dependencies:
-      '@types/pbkdf2': 3.1.0
-      '@types/secp256k1': 4.0.3
-      blakejs: 1.2.1
-      browserify-aes: 1.2.0
-      bs58check: 2.1.2
-      create-hash: 1.2.0
-      create-hmac: 1.1.7
-      hash.js: 1.1.7
-      keccak: 3.0.3
-      pbkdf2: 3.1.2
-      randombytes: 2.1.0
-      safe-buffer: 5.2.1
-      scrypt-js: 3.0.1
-      secp256k1: 4.0.3
-      setimmediate: 1.0.5
-    dev: false
-
-  /ethereumjs-util@5.2.1:
-    resolution: {integrity: sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==}
-    dependencies:
-      bn.js: 4.12.0
-      create-hash: 1.2.0
-      elliptic: 6.5.4
-      ethereum-cryptography: 0.1.3
-      ethjs-util: 0.1.6
-      rlp: 2.2.7
-      safe-buffer: 5.2.1
-    dev: false
-
-  /ethereumjs-util@6.2.1:
-    resolution: {integrity: sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==}
-    dependencies:
-      '@types/bn.js': 4.11.6
-      bn.js: 4.12.0
-      create-hash: 1.2.0
-      elliptic: 6.5.4
-      ethereum-cryptography: 0.1.3
-      ethjs-util: 0.1.6
-      rlp: 2.2.7
-    dev: false
-
   /ethers@5.7.2:
     resolution: {integrity: sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==}
     dependencies:
@@ -4775,18 +4358,14 @@ packages:
       - utf-8-validate
     dev: false
 
-  /ethjs-util@0.1.6:
-    resolution: {integrity: sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==}
-    engines: {node: '>=6.5.0', npm: '>=3'}
-    dependencies:
-      is-hex-prefixed: 1.0.0
-      strip-hex-prefix: 1.0.0
-    dev: false
-
   /eventemitter3@4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: false
 
+  /eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+    dev: false
+
   /events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
@@ -4832,10 +4411,6 @@ packages:
     engines: {node: '> 0.1.90'}
     dev: false
 
-  /fast-deep-equal@3.1.1:
-    resolution: {integrity: sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==}
-    dev: false
-
   /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -5011,6 +4586,7 @@ packages:
   /gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
@@ -5084,6 +4660,7 @@ packages:
   /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
+    dev: true
 
   /globals@13.18.0:
     resolution: {integrity: sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==}
@@ -5297,16 +4874,13 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-buffer@1.1.6:
-    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
-    dev: false
-
   /is-callable@1.2.7:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
 
   /is-ci@3.0.1:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
+    hasBin: true
     dependencies:
       ci-info: 3.7.0
     dev: true
@@ -5315,6 +4889,7 @@ packages:
     resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
     dependencies:
       has: 1.0.3
+    dev: true
 
   /is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
@@ -5344,11 +4919,6 @@ packages:
     dependencies:
       is-extglob: 2.1.1
 
-  /is-hex-prefixed@1.0.0:
-    resolution: {integrity: sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==}
-    engines: {node: '>=6.5.0', npm: '>=3'}
-    dev: false
-
   /is-negative-zero@2.0.2:
     resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
     engines: {node: '>= 0.4'}
@@ -5471,51 +5041,33 @@ packages:
       - utf-8-validate
     dev: false
 
+  /jayson@4.1.0:
+    resolution: {integrity: sha512-R6JlbyLN53Mjku329XoRT2zJAE6ZgOQ8f91ucYdMCD4nkGCF9kZSrcGXpHIU4jeKj58zUZke2p+cdQchU7Ly7A==}
+    engines: {node: '>=8'}
+    hasBin: true
+    dependencies:
+      '@types/connect': 3.4.35
+      '@types/node': 12.20.55
+      '@types/ws': 7.4.7
+      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(ws@7.5.9)
+      json-stringify-safe: 5.0.1
+      uuid: 8.3.2
+      ws: 7.5.9
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+    dev: false
+
   /joycon@3.1.1:
     resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
     engines: {node: '>=10'}
     dev: true
 
-  /js-crypto-env@0.3.2:
-    resolution: {integrity: sha512-F1uHiCkSOo36qBuuZABA4sBf+xeFBzhJZ0Sd7af8FAruszIhm1Xxv+Zr5Ne90Zlh7/fnxCsrdkj0N8f0a3lVlQ==}
-    dev: false
-
-  /js-crypto-hash@0.6.3:
-    resolution: {integrity: sha512-SG8c9tM8y3sUb4k7WvpVfu5vU7zfPvX+eaYR5578TvehkehdaQbqAc+y+1FwxnqQ3WZ0gsYoOKp/mW+mqtNoWA==}
-    dependencies:
-      buffer: 5.4.3
-      hash.js: 1.1.7
-      js-crypto-env: 0.3.2
-      md5: 2.2.1
-      sha3: 2.1.4
-    dev: false
-
-  /js-crypto-hkdf@0.7.3:
-    resolution: {integrity: sha512-eAaVArAjS2GCacWGXY4hjBiexrLQYlI0PMOcbwtrSEj84XU3kUfMYZm9bpTyaTXgdHC/eQoXe/Of6biG+RSEaQ==}
-    dependencies:
-      js-crypto-env: 0.3.2
-      js-crypto-hmac: 0.6.3
-      js-crypto-random: 0.4.3
-      js-encoding-utils: 0.5.6
-    dev: false
-
-  /js-crypto-hmac@0.6.3:
-    resolution: {integrity: sha512-T0pKOaHACOSG6Xs6/06G8RDDeZouQwIQNBq9L/zoUGsd4F67gAjpT3q2lGigAGpUd1hiyy7vnhvLpz7VDt6DbA==}
-    dependencies:
-      js-crypto-env: 0.3.2
-      js-crypto-hash: 0.6.3
-    dev: false
-
-  /js-crypto-random@0.4.3:
-    resolution: {integrity: sha512-C3gzphPPfw9jfQ9Q/LjhJMZxQNp3AaoVRDvyZkiB+zYltfs8tKQPsskWkXACpg1Nzh01PtSRUvVijjptd2qGHQ==}
-    dependencies:
-      js-crypto-env: 0.3.2
-    dev: false
-
-  /js-encoding-utils@0.5.6:
-    resolution: {integrity: sha512-qnAGsUIWrmzh5n+3AXqbxX1KsB9hkQmJZf3aA9DLAS7GpL/NEHCBreFFbW+imramoU+Q0TDyvkwhRbBRH1TVkg==}
-    dev: false
-
   /js-sdsl@4.2.0:
     resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
     dev: true
@@ -5542,18 +5094,12 @@ packages:
   /jsesc@2.5.2:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
     engines: {node: '>=4'}
+    dev: true
 
   /json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
     dev: true
 
-  /json-rpc-engine@5.4.0:
-    resolution: {integrity: sha512-rAffKbPoNDjuRnXkecTjnsE3xLLrb00rEkdgalINhaYVYIxDwWtvYBr9UFbhTvPB1B2qUOLoFd/cV6f4Q7mh7g==}
-    dependencies:
-      eth-rpc-errors: 3.0.0
-      safe-event-emitter: 1.0.1
-    dev: false
-
   /json-rpc-engine@6.1.0:
     resolution: {integrity: sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ==}
     engines: {node: '>=10.0.0'}
@@ -5576,12 +5122,6 @@ packages:
   /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
-  /json-stable-stringify@1.0.2:
-    resolution: {integrity: sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==}
-    dependencies:
-      jsonify: 0.0.1
-    dev: false
-
   /json-stringify-safe@5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
     dev: false
@@ -5595,6 +5135,7 @@ packages:
   /json5@2.2.1:
     resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==}
     engines: {node: '>=6'}
+    dev: true
 
   /jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
@@ -5602,10 +5143,6 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /jsonify@0.0.1:
-    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
-    dev: false
-
   /jsonparse@1.3.1:
     resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
     engines: {'0': node >= 0.2.0}
@@ -5660,16 +5197,6 @@ packages:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  /libsodium-wrappers@0.7.10:
-    resolution: {integrity: sha512-pO3F1Q9NPLB/MWIhehim42b/Fwb30JNScCNh8TcQ/kIc+qGLQch8ag8wb0keK3EP5kbGakk1H8Wwo7v+36rNQg==}
-    dependencies:
-      libsodium: 0.7.10
-    dev: false
-
-  /libsodium@0.7.10:
-    resolution: {integrity: sha512-eY+z7hDrDKxkAK+QKZVNv92A5KYkxfvIshtBJkmg5TSiCnYqZP3i9OO9whE79Pwgm4jGaoHgkM4ao/b9Cyu4zQ==}
-    dev: false
-
   /lilconfig@2.0.6:
     resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==}
     engines: {node: '>=10'}
@@ -5693,14 +5220,6 @@ packages:
       '@types/trusted-types': 2.0.3
     dev: false
 
-  /lit@2.6.1:
-    resolution: {integrity: sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==}
-    dependencies:
-      '@lit/reactive-element': 1.6.2
-      lit-element: 3.3.2
-      lit-html: 2.7.5
-    dev: false
-
   /lit@2.7.5:
     resolution: {integrity: sha512-i/cH7Ye6nBDUASMnfwcictBnsTN91+aBjXoTHF2xARghXScKxpD4F4WYI+VLXg9lqbMinDfvoI7VnZXjyHgdfQ==}
     dependencies:
@@ -5737,10 +5256,6 @@ packages:
       p-locate: 5.0.0
     dev: true
 
-  /lodash.debounce@4.0.8:
-    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
-    dev: false
-
   /lodash.isequal@4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
     dev: false
@@ -5811,14 +5326,6 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /md5@2.2.1:
-    resolution: {integrity: sha512-PlGG4z5mBANDGCKsYQe0CaUYHdZYZt8ZPZLmEt+Urf0W4GlpTX4HescwHU+dc9+Z/G/vZKYZYFrwgm9VxK6QOQ==}
-    dependencies:
-      charenc: 0.0.2
-      crypt: 0.0.2
-      is-buffer: 1.1.6
-    dev: false
-
   /meow@6.1.1:
     resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
     engines: {node: '>=8'}
@@ -5908,26 +5415,11 @@ packages:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
     dev: true
 
-  /miscreant@0.3.2:
-    resolution: {integrity: sha512-fL9KxsQz9BJB2KGPMHFrReioywkiomBiuaLk6EuChijK0BsJsIKJXdVomR+/bPj5mvbFD6wM0CM3bZio9g7OHA==}
-    dev: false
-
   /mixme@0.5.4:
     resolution: {integrity: sha512-3KYa4m4Vlqx98GPdOHghxSdNtTvcP8E0kkaJ5Dlh+h2DRzF7zpuVVcA8B0QpKd11YJeP9QQ7ASkKzOeu195Wzw==}
     engines: {node: '>= 8.0.0'}
     dev: true
 
-  /motion@10.15.5:
-    resolution: {integrity: sha512-ejP6KioN4pigTGxL93APzOnvtLklParL59UQB2T3HWXQBxFcIp5/7YXFmkgiA6pNKKzjvnLhnonRBN5iSFMnNw==}
-    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
-    dev: false
-
   /motion@10.16.2:
     resolution: {integrity: sha512-p+PurYqfUdcJZvtnmAqu5fJgV2kR0uLFQuBKtLeFVTrYEVllI99tiOTSefVNYuip9ELTEkepIIDftNdze76NAQ==}
     dependencies:
@@ -6029,12 +5521,25 @@ packages:
       whatwg-url: 5.0.0
     dev: false
 
+  /node-fetch@2.7.0:
+    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: false
+
   /node-gyp-build@4.5.0:
     resolution: {integrity: sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==}
     dev: false
 
   /node-releases@2.0.6:
     resolution: {integrity: sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==}
+    dev: true
 
   /normalize-package-data@2.5.0:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
@@ -6202,10 +5707,6 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
-  /pako@1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
-    dev: false
-
   /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -6246,6 +5747,7 @@ packages:
 
   /path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+    dev: true
 
   /path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
@@ -6438,8 +5940,8 @@ packages:
     hasBin: true
     dev: true
 
-  /prettier@3.0.0:
-    resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==}
+  /prettier@3.0.3:
+    resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==}
     engines: {node: '>=14'}
     hasBin: true
     dev: true
@@ -6461,25 +5963,6 @@ packages:
       react-is: 16.13.1
     dev: true
 
-  /protobufjs@6.11.3:
-    resolution: {integrity: sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==}
-    requiresBuild: true
-    dependencies:
-      '@protobufjs/aspromise': 1.1.2
-      '@protobufjs/base64': 1.1.2
-      '@protobufjs/codegen': 2.0.4
-      '@protobufjs/eventemitter': 1.1.0
-      '@protobufjs/fetch': 1.1.0
-      '@protobufjs/float': 1.0.2
-      '@protobufjs/inquire': 1.1.0
-      '@protobufjs/path': 1.1.2
-      '@protobufjs/pool': 1.1.0
-      '@protobufjs/utf8': 1.1.0
-      '@types/long': 4.0.2
-      '@types/node': 18.11.18
-      long: 4.0.0
-    dev: false
-
   /proxy-compare@2.5.0:
     resolution: {integrity: sha512-f1us0OsVAJ3tdIMXGQx2lmseYS4YXe4W+sKF5g5ww/jV+5ogMadPt+sIZ+88Ga9kvMJsrRNWzCrKPpr6pMWYbA==}
     dev: false
@@ -6516,17 +5999,6 @@ packages:
     hasBin: true
     dev: false
 
-  /qrcode@1.5.1:
-    resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    dependencies:
-      dijkstrajs: 1.0.2
-      encode-utf8: 1.0.3
-      pngjs: 5.0.0
-      yargs: 15.4.1
-    dev: false
-
   /qrcode@1.5.3:
     resolution: {integrity: sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==}
     engines: {node: '>=10.13.0'}
@@ -6687,10 +6159,6 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /readonly-date@1.0.0:
-    resolution: {integrity: sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ==}
-    dev: false
-
   /real-require@0.1.0:
     resolution: {integrity: sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==}
     engines: {node: '>= 12.13.0'}
@@ -6707,6 +6175,9 @@ packages:
   /regenerator-runtime@0.13.11:
     resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
 
+  /regenerator-runtime@0.14.0:
+    resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==}
+
   /regexp.prototype.flags@1.4.3:
     resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
     engines: {node: '>= 0.4'}
@@ -6747,6 +6218,7 @@ packages:
       is-core-module: 2.11.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
+    dev: true
 
   /resolve@2.0.0-next.4:
     resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==}
@@ -6773,12 +6245,6 @@ packages:
       inherits: 2.0.4
     dev: false
 
-  /rlp@2.2.7:
-    resolution: {integrity: sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==}
-    dependencies:
-      bn.js: 5.2.1
-    dev: false
-
   /rollup@2.79.1:
     resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
     engines: {node: '>=10.0.0'}
@@ -6805,6 +6271,18 @@ packages:
       utf-8-validate: 5.0.10
     dev: false
 
+  /rpc-websockets@7.6.0:
+    resolution: {integrity: sha512-Jgcs8q6t8Go98dEulww1x7RysgTkzpCMelVxZW4hvuyFtOGpeUz9prpr2KjUa/usqxgFCd9Tu3+yhHEP9GVmiQ==}
+    dependencies:
+      '@babel/runtime': 7.23.2
+      eventemitter3: 4.0.7
+      uuid: 8.3.2
+      ws: 8.11.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
+    optionalDependencies:
+      bufferutil: 4.0.7
+      utf-8-validate: 5.0.10
+    dev: false
+
   /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
@@ -6828,12 +6306,6 @@ packages:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: false
 
-  /safe-event-emitter@1.0.1:
-    resolution: {integrity: sha512-e1wFe99A91XYYxoQbcq2ZJUWurxEyP8vfz7A7vuUe1s95q8r5ebraVaA1BukYJcpM6V16ugWoD9vngi8Ccu5fg==}
-    dependencies:
-      events: 3.3.0
-    dev: false
-
   /safe-json-utils@1.1.1:
     resolution: {integrity: sha512-SAJWGKDs50tAbiDXLf89PDwt9XYkWyANFWVzn4dTXl5QyI8t2o/bW5/OJl3lvc2WVU4MEpTo9Yz5NVFNsp+OJQ==}
     dev: false
@@ -6864,44 +6336,14 @@ packages:
     resolution: {integrity: sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==}
     dev: false
 
-  /secp256k1@4.0.3:
-    resolution: {integrity: sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==}
-    engines: {node: '>=10.0.0'}
-    requiresBuild: true
-    dependencies:
-      elliptic: 6.5.4
-      node-addon-api: 2.0.2
-      node-gyp-build: 4.5.0
-    dev: false
-
-  /secretjs@0.17.7:
-    resolution: {integrity: sha512-j39l9+vR2A8067QBqDDejS7LmRLgdkG4uRw2Ar6HMfzDGo26eTh7cIXVlVu/yHBumxtQzKun20epOXwuYHXjQg==}
-    dependencies:
-      '@iov/crypto': 2.1.0
-      '@iov/encoding': 2.1.0
-      '@iov/utils': 2.0.2
-      axios: 0.21.1
-      curve25519-js: 0.0.4
-      fast-deep-equal: 3.1.1
-      js-crypto-hkdf: 0.7.3
-      miscreant: 0.3.2
-      pako: 1.0.11
-      protobufjs: 6.11.3
-      secure-random: 1.1.2
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /secure-random@1.1.2:
-    resolution: {integrity: sha512-H2bdSKERKdBV1SwoqYm6C0y+9EA94v6SUBOWO8kDndc4NoUih7Dv6Tsgma7zO1lv27wIvjlD0ZpMQk7um5dheQ==}
-    dev: false
-
   /semver@5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
+    hasBin: true
     dev: true
 
   /semver@6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
+    dev: true
 
   /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
@@ -6909,6 +6351,14 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
+  /semver@7.5.4:
+    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
   /seroval@0.5.1:
     resolution: {integrity: sha512-ZfhQVB59hmIauJG5Ydynupy8KHyr5imGNtdDhbZG68Ufh1Ynkv9KOYOAABf71oVbQxJ8VkWnMHAjEHE7fWkH5g==}
     engines: {node: '>=10'}
@@ -6917,10 +6367,6 @@ packages:
   /set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
-  /setimmediate@1.0.5:
-    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
-    dev: false
-
   /sha.js@2.4.11:
     resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     dependencies:
@@ -6928,12 +6374,6 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /sha3@2.1.4:
-    resolution: {integrity: sha512-S8cNxbyb0UGUM2VhRD4Poe5N58gJnJsLJ5vC7FYWGUmGhcsj4++WaIOBFVDxlG0W3To6xBuiRh+i0Qp2oNCOtg==}
-    dependencies:
-      buffer: 6.0.3
-    dev: false
-
   /shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
@@ -6984,6 +6424,7 @@ packages:
   /smartwrap@2.0.2:
     resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==}
     engines: {node: '>=6'}
+    hasBin: true
     dependencies:
       array.prototype.flat: 1.3.1
       breakword: 1.0.5
@@ -7144,13 +6585,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /strip-hex-prefix@1.0.0:
-    resolution: {integrity: sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==}
-    engines: {node: '>=6.5.0', npm: '>=3'}
-    dependencies:
-      is-hex-prefixed: 1.0.0
-    dev: false
-
   /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -7195,6 +6629,11 @@ packages:
     resolution: {integrity: sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==}
     dev: false
 
+  /superstruct@1.0.3:
+    resolution: {integrity: sha512-8iTn3oSS8nRGn+C2pgXSKPI3jmpm6FExNazNpjvqS6ZUJQCej3PUXEKM8NjHBOs54ExM+LPW/FBRhymrdcCiSg==}
+    engines: {node: '>=14.0.0'}
+    dev: false
+
   /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
@@ -7210,6 +6649,7 @@ packages:
   /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
+    dev: true
 
   /table@6.8.1:
     resolution: {integrity: sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==}
@@ -7301,6 +6741,7 @@ packages:
   /to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
+    dev: true
 
   /to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
@@ -7433,6 +6874,7 @@ packages:
   /tty-table@4.1.6:
     resolution: {integrity: sha512-kRj5CBzOrakV4VRRY5kUWbNYvo/FpOsz65DzI5op9P+cHov3+IqPbo1JE1ZnQGkHdZgNFDsrEjrfqqy/Ply9fw==}
     engines: {node: '>=8.0.0'}
+    hasBin: true
     dependencies:
       chalk: 4.1.2
       csv: 5.5.3
@@ -7443,71 +6885,66 @@ packages:
       yargs: 17.6.2
     dev: true
 
-  /turbo-darwin-64@1.10.6:
-    resolution: {integrity: sha512-s2Gc7i9Ud+H9GDcrGJjPIyscJfzDGQ6il4Sl2snfvwngJs4/TaqKuBoX3HNt/7F4NiFRs7ZhlLV1/Yu9zGBRhw==}
+  /turbo-darwin-64@1.10.15:
+    resolution: {integrity: sha512-Sik5uogjkRTe1XVP9TC2GryEMOJCaKE2pM/O9uLn4koQDnWKGcLQv+mDU+H+9DXvKLnJnKCD18OVRkwK5tdpoA==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-darwin-arm64@1.10.6:
-    resolution: {integrity: sha512-tgl70t5PBLyRcNTdP9N6NjvdvQ5LUk8Z60JGUhBhnc+oCOdA4pltrDJNPyel3tQAXXt1dDpl8pp9vUrbwoVyGg==}
+  /turbo-darwin-arm64@1.10.15:
+    resolution: {integrity: sha512-xwqyFDYUcl2xwXyGPmHkmgnNm4Cy0oNzMpMOBGRr5x64SErS7QQLR4VHb0ubiR+VAb8M+ECPklU6vD1Gm+wekg==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-64@1.10.6:
-    resolution: {integrity: sha512-h7eyAA3xtAVpamcYJYUwe0xm0LWdbv7/I7QiM09AZ67TTNpyUgqW8giFN3h793BHEQ2Rcnk9FNkpIbjWBbyamg==}
+  /turbo-linux-64@1.10.15:
+    resolution: {integrity: sha512-dM07SiO3RMAJ09Z+uB2LNUSkPp3I1IMF8goH5eLj+d8Kkwoxd/+qbUZOj9RvInyxU/IhlnO9w3PGd3Hp14m/nA==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-arm64@1.10.6:
-    resolution: {integrity: sha512-8cZhOeLqu3QZ27yLd6bw4FNaB8y5pLdWeRLJeiWHkIb/cptKnRKJFP+keBJzJi8ovaMqdBpabrxiBRN2lhau5Q==}
+  /turbo-linux-arm64@1.10.15:
+    resolution: {integrity: sha512-MkzKLkKYKyrz4lwfjNXH8aTny5+Hmiu4SFBZbx+5C0vOlyp6fV5jZANDBvLXWiDDL4DSEAuCEK/2cmN6FVH1ow==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-64@1.10.6:
-    resolution: {integrity: sha512-qx5jcfCJodN1Mh0KtSVQau7pK8CxDvtif7+joPHI2HbQPAADgdUl0LHfA5tFHh6aWgfvhxbvIXqJd6v7Mqkj9g==}
+  /turbo-windows-64@1.10.15:
+    resolution: {integrity: sha512-3TdVU+WEH9ThvQGwV3ieX/XHebtYNHv9HARHauPwmVj3kakoALkpGxLclkHFBLdLKkqDvmHmXtcsfs6cXXRHJg==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-arm64@1.10.6:
-    resolution: {integrity: sha512-vTQaRG3/s2XTreOBr6J9HKFtjzusvwGQg0GtuW2+9Z7fizdzP8MuhaDbN6FhKHcWC81PQPD61TBIKTVTsYOEZg==}
+  /turbo-windows-arm64@1.10.15:
+    resolution: {integrity: sha512-l+7UOBCbfadvPMYsX08hyLD+UIoAkg6ojfH+E8aud3gcA1padpjCJTh9gMpm3QdMbKwZteT5uUM+wyi6Rbbyww==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo@1.10.6:
-    resolution: {integrity: sha512-0/wbjw4HvmPP1abVWHTdeFRfCA9cn5oxCPP5bDixagLzvDgGWE3xfdlsyGmq779Ekr9vjtDPgC2Y4JlXEhyryw==}
+  /turbo@1.10.15:
+    resolution: {integrity: sha512-mKKkqsuDAQy1wCCIjCdG+jOCwUflhckDMSRoeBPcIL/CnCl7c5yRDFe7SyaXloUUkt4tUR0rvNIhVCcT7YeQpg==}
     hasBin: true
-    requiresBuild: true
     optionalDependencies:
-      turbo-darwin-64: 1.10.6
-      turbo-darwin-arm64: 1.10.6
-      turbo-linux-64: 1.10.6
-      turbo-linux-arm64: 1.10.6
-      turbo-windows-64: 1.10.6
-      turbo-windows-arm64: 1.10.6
+      turbo-darwin-64: 1.10.15
+      turbo-darwin-arm64: 1.10.15
+      turbo-linux-64: 1.10.15
+      turbo-linux-arm64: 1.10.15
+      turbo-windows-64: 1.10.15
+      turbo-windows-arm64: 1.10.15
     dev: true
 
-  /tweetnacl@1.0.3:
-    resolution: {integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==}
-    dev: false
-
   /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
@@ -7533,10 +6970,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /type-tagger@1.0.0:
-    resolution: {integrity: sha512-FIPqqpmDgdaulCnRoKv1/d3U4xVBUrYn42QXWNP3XYmgfPUDuBUsgFOb9ntT0aIe0UsUP+lknpQ5d9Kn36RssA==}
-    dev: false
-
   /typedarray-to-buffer@4.0.0:
     resolution: {integrity: sha512-6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ==}
     dev: false
@@ -7581,11 +7014,6 @@ packages:
     engines: {node: '>= 4.0.0'}
     dev: true
 
-  /unorm@1.6.0:
-    resolution: {integrity: sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==}
-    engines: {node: '>= 0.4.0'}
-    dev: false
-
   /update-browserslist-db@1.0.10(browserslist@4.21.4):
     resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
     hasBin: true
@@ -7595,6 +7023,7 @@ packages:
       browserslist: 4.21.4
       escalade: 3.1.1
       picocolors: 1.0.0
+    dev: true
 
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
@@ -7636,6 +7065,7 @@ packages:
 
   /uuid@9.0.0:
     resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
+    hasBin: true
     dev: false
 
   /v8-compile-cache@2.3.0:
@@ -7772,6 +7202,7 @@ packages:
 
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
     dependencies:
       isexe: 2.0.0
     dev: true
@@ -7933,12 +7364,3 @@ packages:
       react: 18.2.0
       use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
-
-  github.com/ethereumjs/ethereumjs-abi/ee3994657fa7a427238e6ba92a84d0b529bbcde0:
-    resolution: {tarball: https://codeload.github.com/ethereumjs/ethereumjs-abi/tar.gz/ee3994657fa7a427238e6ba92a84d0b529bbcde0}
-    name: ethereumjs-abi
-    version: 0.6.8
-    dependencies:
-      bn.js: 4.12.0
-      ethereumjs-util: 6.2.1
-    dev: false
diff --git a/turbo.json b/turbo.json
index e9487a3..a54abff 100644
--- a/turbo.json
+++ b/turbo.json
@@ -18,13 +18,7 @@
       "dependsOn": ["@wallet01/core#build"]
     },
     "@wallet01/react#build": {
-      "dependsOn": [
-        "@wallet01/core#build",
-        "@wallet01/evm#build",
-        "@wallet01/cosmos#build",
-        "@wallet01/solana#build",
-        "@wallet01/tezos#build"
-      ],
+      "dependsOn": ["@wallet01/core#build"],
       "outputs": []
     },
     "lint": {