diff --git a/package.json b/package.json
index 2a3661292..d4cbdbb9f 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
     "packages/extension",
     "packages/storage",
     "packages/request",
-    "packages/hw-wallets"
+    "packages/hw-wallets",
+    "packages/name-resolution"
   ],
   "scripts": {
     "test": "yarn workspaces foreach -pv run test",
diff --git a/packages/extension/package.json b/packages/extension/package.json
index cf8b96a3c..c672bf844 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
   "scripts": {
     "zip": "cd dist; zip -r release.zip *;",
diff --git a/packages/extension/src/libs/dapp-list/index.ts b/packages/extension/src/libs/dapp-list/index.ts
index 5cf861246..c45a3650e 100644
--- a/packages/extension/src/libs/dapp-list/index.ts
+++ b/packages/extension/src/libs/dapp-list/index.ts
@@ -2,35 +2,43 @@ import { NetworkNames } from "@enkryptcom/types";
 
 const lists: Partial<Record<NetworkNames, string>> = {
   [NetworkNames.Ethereum]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/eth.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/eth.json",
   [NetworkNames.Binance]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/bsc.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/bsc.json",
   [NetworkNames.Matic]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/matic.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/matic.json",
   [NetworkNames.EthereumClassic]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/etc.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/etc.json",
   [NetworkNames.Kusama]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/ksm.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/ksm.json",
   [NetworkNames.Polkadot]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/dot.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/dot.json",
   [NetworkNames.Acala]:
     "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/aca.json",
   [NetworkNames.Karura]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/kar.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/kar.json",
   [NetworkNames.Moonbeam]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/glmr.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/glmr.json",
   [NetworkNames.Moonriver]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/movr.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/movr.json",
   [NetworkNames.Astar]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/astr.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/astr.json",
   [NetworkNames.AstarEVM]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/astr.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/astr.json",
   [NetworkNames.Shiden]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/sdn.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/sdn.json",
   [NetworkNames.ShidenEVM]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/sdn.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/sdn.json",
   [NetworkNames.Okc]:
-    "https://github.com/enkryptcom/dynamic-data/raw/main/dapps/okc.json",
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/okc.json",
+  [NetworkNames.Optimism]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/op.json",
+  [NetworkNames.Canto]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/canto.json",
+  [NetworkNames.Bifrost]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/bifrost.json",
+  [NetworkNames.BifrostKusama]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/bifrost.json",
 };
 
 export default lists;
diff --git a/packages/extension/src/libs/name-resolver/index.ts b/packages/extension/src/libs/name-resolver/index.ts
new file mode 100644
index 000000000..0fb2f7f91
--- /dev/null
+++ b/packages/extension/src/libs/name-resolver/index.ts
@@ -0,0 +1,23 @@
+import NameResolver, { CoinType } from "@enkryptcom/name-resolution";
+class GenericNameResolver {
+  nameResolver: NameResolver;
+
+  constructor() {
+    this.nameResolver = new NameResolver({
+      ens: { node: "https://nodes.mewapi.io/rpc/eth" },
+    });
+  }
+
+  async resolveName(name: string, coins: CoinType[]): Promise<string | null> {
+    let response: string | null = null;
+    for (const coin of coins) {
+      response = await this.nameResolver
+        .resolveAddress(name, coin)
+        .catch(() => null);
+      if (response) return response;
+    }
+    return response;
+  }
+}
+
+export { CoinType, GenericNameResolver };
diff --git a/packages/extension/src/manifest/base.json b/packages/extension/src/manifest/base.json
index 4f6e2c8d8..096ecd316 100644
--- a/packages/extension/src/manifest/base.json
+++ b/packages/extension/src/manifest/base.json
@@ -2,7 +2,7 @@
   "author": "https://www.enkrypt.com",
   "homepage_url": "https://www.enkrypt.com",
   "version": "",
-  "name": "Enkrypt: Ethereum, Polkadot and OKX Wallet",
+  "name": "Enkrypt: Ethereum, Polkadot and Canto Wallet",
   "short_name": "Enkrypt",
   "permissions": [
     "storage",
diff --git a/packages/extension/src/providers/ethereum/index.ts b/packages/extension/src/providers/ethereum/index.ts
index 2fb2d6536..5baaab7e6 100644
--- a/packages/extension/src/providers/ethereum/index.ts
+++ b/packages/extension/src/providers/ethereum/index.ts
@@ -43,8 +43,13 @@ class EthereumProvider
     this.middlewares = Middlewares.map((mw) => mw.bind(this));
   }
   setRequestProvider(network: BaseNetwork): void {
+    const prevURL = new URL(this.network.node);
+    const newURL = new URL(network.node);
     this.network = network as EvmNetwork;
-    this.requestProvider.changeNetwork(network.node);
+    if (prevURL.protocol === newURL.protocol)
+      this.requestProvider.changeNetwork(network.node);
+    else
+      this.requestProvider = getRequestProvider(network.node, this.middlewares);
   }
   async isPersistentEvent(request: ProviderRPCRequest): Promise<boolean> {
     if (request.method === "eth_subscribe") return true;
diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts
index 73ed83c02..e92de0a0b 100644
--- a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts
+++ b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts
@@ -13,6 +13,8 @@ const NetworkEndpoints = {
   [NetworkNames.KaruraEVM]: "https://blockscout.karura.network/",
   [NetworkNames.AstarEVM]: "https://blockscout.com/astar/",
   [NetworkNames.ShidenEVM]: "https://blockscout.com/shiden/",
+  [NetworkNames.Optimism]: "https://api-optimistic.etherscan.io/",
+  [NetworkNames.Canto]: "https://evm.explorer.canto.io/",
 };
 
 export { NetworkEndpoints };
diff --git a/packages/extension/src/providers/ethereum/libs/assets-handlers/types/tokenbalance-mew.ts b/packages/extension/src/providers/ethereum/libs/assets-handlers/types/tokenbalance-mew.ts
index 89b766bdb..0d712e8ba 100644
--- a/packages/extension/src/providers/ethereum/libs/assets-handlers/types/tokenbalance-mew.ts
+++ b/packages/extension/src/providers/ethereum/libs/assets-handlers/types/tokenbalance-mew.ts
@@ -10,7 +10,7 @@ export interface SupportedNetwork {
   cgPlatform: string;
 }
 export interface CGToken {
-  chainId: number;
+  chainId: `0x${string}`;
   address: string;
   name: string;
   symbol: string;
diff --git a/packages/extension/src/providers/ethereum/libs/tx-broadcaster.ts b/packages/extension/src/providers/ethereum/libs/tx-broadcaster.ts
new file mode 100644
index 000000000..d9fdc8a9e
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/tx-broadcaster.ts
@@ -0,0 +1,28 @@
+import { NetworkNames } from "@enkryptcom/types";
+import { v4 } from "uuid";
+
+const broadcastTx = (hexTx: string, network: NetworkNames): Promise<string> => {
+  if (network === NetworkNames.Ethereum) {
+    const burl = "https://broadcast.mewapi.io/eth?product=enkrypt";
+    return fetch(burl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        method: "eth_sendRawTransaction",
+        params: [hexTx],
+        id: v4(),
+      }),
+    })
+      .then((response) => response.json())
+      .then((jRes) => {
+        if (jRes.error) return Promise.reject(jRes.error);
+        else return jRes.result as string;
+      });
+  }
+  return Promise.reject("Not valid network");
+};
+
+export default broadcastTx;
diff --git a/packages/extension/src/providers/ethereum/methods/eth_sendRawTransaction.ts b/packages/extension/src/providers/ethereum/methods/eth_sendRawTransaction.ts
new file mode 100644
index 000000000..433b0bfbc
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/methods/eth_sendRawTransaction.ts
@@ -0,0 +1,25 @@
+import { getCustomError } from "@/libs/error";
+import { MiddlewareFunction } from "@enkryptcom/types";
+import EthereumProvider from "..";
+import broadcastTx from "../libs/tx-broadcaster";
+const method: MiddlewareFunction = function (
+  this: EthereumProvider,
+  payload,
+  res,
+  next
+): void {
+  if (payload.method !== "eth_sendRawTransaction") return next();
+  else {
+    if (!payload.params || payload.params.length < 1) {
+      return res(
+        getCustomError("eth_sendTransaction: invalid request not enough params")
+      );
+    }
+    broadcastTx(payload.params[0], this.network.name)
+      .then((hash) => {
+        res(null, hash);
+      })
+      .catch(() => next());
+  }
+};
+export default method;
diff --git a/packages/extension/src/providers/ethereum/methods/index.ts b/packages/extension/src/providers/ethereum/methods/index.ts
index af8dc5e3b..918debe54 100644
--- a/packages/extension/src/providers/ethereum/methods/index.ts
+++ b/packages/extension/src/providers/ethereum/methods/index.ts
@@ -11,6 +11,7 @@ import addEthereumChain from "./wallet_addEthereumChain";
 import switchEthereumChain from "./wallet_switchEthereumChain";
 import watchAsset from "./wallet_watchAsset";
 import walletRequestPermissions from "./wallet_requestPermissions";
+import ethSendRawTransaction from "./eth_sendRawTransaction";
 export default [
   ethSendTransaction,
   ethSign,
@@ -25,4 +26,5 @@ export default [
   switchEthereumChain,
   addEthereumChain,
   walletRequestPermissions,
+  ethSendRawTransaction,
 ];
diff --git a/packages/extension/src/providers/ethereum/methods/wallet_addEthereumChain.ts b/packages/extension/src/providers/ethereum/methods/wallet_addEthereumChain.ts
index 0132d4c42..0c00ffa1e 100644
--- a/packages/extension/src/providers/ethereum/methods/wallet_addEthereumChain.ts
+++ b/packages/extension/src/providers/ethereum/methods/wallet_addEthereumChain.ts
@@ -2,7 +2,6 @@ import { getCustomError } from "@/libs/error";
 import { MiddlewareFunction } from "@enkryptcom/types";
 import EthNetworks from "../networks";
 import EthereumProvider from "..";
-import { numberToHex } from "web3-utils";
 import { sendToBackgroundFromBackground } from "@/libs/messenger/extension";
 import { InternalMethods } from "@/types/messenger";
 import { ProviderRPCRequest } from "@/types/provider";
@@ -26,7 +25,7 @@ const method: MiddlewareFunction = function (
     }
     const allNetworks = Object.values(EthNetworks);
     const validNetwork = allNetworks.find(
-      (net) => numberToHex(net.chainID) === payload.params![0].chainId
+      (net) => net.chainID === payload.params![0].chainId
     );
     if (validNetwork) {
       sendToBackgroundFromBackground({
diff --git a/packages/extension/src/providers/ethereum/methods/wallet_switchEthereumChain.ts b/packages/extension/src/providers/ethereum/methods/wallet_switchEthereumChain.ts
index 84f767538..f91d4b8be 100644
--- a/packages/extension/src/providers/ethereum/methods/wallet_switchEthereumChain.ts
+++ b/packages/extension/src/providers/ethereum/methods/wallet_switchEthereumChain.ts
@@ -5,7 +5,6 @@ import { ProviderRPCRequest } from "@/types/provider";
 import { MiddlewareFunction } from "@enkryptcom/types";
 import EthNetworks from "../networks";
 import EthereumProvider from "..";
-import { numberToHex } from "web3-utils";
 import { MessageMethod } from "../types";
 import DomainState from "@/libs/domain-state";
 const method: MiddlewareFunction = function (
@@ -25,7 +24,7 @@ const method: MiddlewareFunction = function (
     }
     const allNetworks = Object.values(EthNetworks);
     const validNetwork = allNetworks.find(
-      (net) => numberToHex(net.chainID) === payload.params![0].chainId
+      (net) => net.chainID === payload.params![0].chainId
     );
     if (validNetwork) {
       sendToBackgroundFromBackground({
diff --git a/packages/extension/src/providers/ethereum/networks/astr.ts b/packages/extension/src/providers/ethereum/networks/astr.ts
index 8af5a4adf..2478a618d 100644
--- a/packages/extension/src/providers/ethereum/networks/astr.ts
+++ b/packages/extension/src/providers/ethereum/networks/astr.ts
@@ -9,9 +9,10 @@ const astrOptions: EvmNetworkOptions = {
   homePage: "https://astar.network/",
   blockExplorerTX: "https://blockscout.com/astar/tx/[[txHash]]",
   blockExplorerAddr: "https://blockscout.com/astar/address/[[address]]",
-  chainID: 592,
+  chainID: "0x250",
   isTestNetwork: false,
   currencyName: "ASTR",
+  currencyNameLong: "Astar",
   node: "wss://astar.public.blastapi.io/",
   icon: require("./icons/astr.png"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/bsc.ts b/packages/extension/src/providers/ethereum/networks/bsc.ts
index 55fa73722..709be7266 100644
--- a/packages/extension/src/providers/ethereum/networks/bsc.ts
+++ b/packages/extension/src/providers/ethereum/networks/bsc.ts
@@ -10,9 +10,10 @@ const bscOptions: EvmNetworkOptions = {
   homePage: "https://www.binance.org/en/smartChain",
   blockExplorerTX: "https://bscscan.com/tx/[[txHash]]",
   blockExplorerAddr: "https://bscscan.com/address/[[address]]",
-  chainID: 56,
+  chainID: "0x38",
   isTestNetwork: false,
   currencyName: "BNB",
+  currencyNameLong: "Binance",
   node: "wss://nodes.mewapi.io/ws/bsc",
   icon: require("./icons/bsc.svg"),
   gradient: "#F0B90B",
diff --git a/packages/extension/src/providers/ethereum/networks/canto.ts b/packages/extension/src/providers/ethereum/networks/canto.ts
new file mode 100644
index 000000000..da6ef2a59
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/networks/canto.ts
@@ -0,0 +1,26 @@
+import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
+import { CoingeckoPlatform, NetworkNames } from "@enkryptcom/types";
+import { EtherscanActivity } from "../libs/activity-handlers";
+import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
+
+const cantoOptions: EvmNetworkOptions = {
+  name: NetworkNames.Canto,
+  name_long: "Canto",
+  homePage: "https://canto.io/",
+  blockExplorerTX: "https://evm.explorer.canto.io/tx/[[txHash]]",
+  blockExplorerAddr: "https://evm.explorer.canto.io/address/[[address]]",
+  chainID: "0x1e14",
+  isTestNetwork: false,
+  currencyName: "CANTO",
+  currencyNameLong: "Canto",
+  node: "https://canto.evm.chandrastation.com/",
+  icon: require("./icons/canto.svg"),
+  gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
+  coingeckoID: "canto",
+  coingeckoPlatform: CoingeckoPlatform.Canto,
+  activityHandler: wrapActivityHandler(EtherscanActivity),
+};
+
+const canto = new EvmNetwork(cantoOptions);
+
+export default canto;
diff --git a/packages/extension/src/providers/ethereum/networks/etc.ts b/packages/extension/src/providers/ethereum/networks/etc.ts
index cad57b327..e060efe37 100644
--- a/packages/extension/src/providers/ethereum/networks/etc.ts
+++ b/packages/extension/src/providers/ethereum/networks/etc.ts
@@ -9,9 +9,10 @@ const etcOptions: EvmNetworkOptions = {
   homePage: "https://ethereumclassic.org/",
   blockExplorerTX: "https://blockscout.com/etc/mainnet/tx/[[txHash]]",
   blockExplorerAddr: "https://blockscout.com/etc/mainnet/address/[[address]]",
-  chainID: 61,
+  chainID: "0x3d",
   isTestNetwork: false,
   currencyName: "ETC",
+  currencyNameLong: "Ethereum Classic",
   node: "wss://nodes.mewapi.io/ws/etc",
   icon: require("./icons/etc.svg"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/eth.ts b/packages/extension/src/providers/ethereum/networks/eth.ts
index ddececb67..29f8821bb 100644
--- a/packages/extension/src/providers/ethereum/networks/eth.ts
+++ b/packages/extension/src/providers/ethereum/networks/eth.ts
@@ -11,9 +11,10 @@ const ethOptions: EvmNetworkOptions = {
   homePage: "https://ethereum.org",
   blockExplorerTX: "https://www.ethvm.com/tx/[[txHash]]",
   blockExplorerAddr: "https://www.ethvm.com/address/[[address]]",
-  chainID: 1,
+  chainID: "0x1",
   isTestNetwork: false,
   currencyName: "ETH",
+  currencyNameLong: "Ethereum",
   node: "wss://nodes.mewapi.io/ws/eth",
   icon: require("./icons/eth.svg"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/goerli.ts b/packages/extension/src/providers/ethereum/networks/goerli.ts
index 7aa0d429a..b66ca0da0 100644
--- a/packages/extension/src/providers/ethereum/networks/goerli.ts
+++ b/packages/extension/src/providers/ethereum/networks/goerli.ts
@@ -9,9 +9,10 @@ const goerliOptions: EvmNetworkOptions = {
   homePage: "https://github.com/goerli/testnet",
   blockExplorerTX: "https://goerli.etherscan.io/tx/[[txHash]]",
   blockExplorerAddr: "https://goerli.etherscan.io/address/[[address]]",
-  chainID: 5,
+  chainID: "0x5",
   isTestNetwork: true,
   currencyName: "GöETH",
+  currencyNameLong: "Goerli",
   node: "wss://nodes.mewapi.io/ws/goerli",
   icon: require("./icons/eth.svg"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/icons/canto.svg b/packages/extension/src/providers/ethereum/networks/icons/canto.svg
new file mode 100644
index 000000000..029028234
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/networks/icons/canto.svg
@@ -0,0 +1,4 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="256" height="256" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M201 49V207L82.375 206.999V179.116H55V76.8824H82.375V49H201ZM105.186 76.8837H173.623V104.766H105.186V76.8837ZM173.623 155.884H105.186V104.767H77.8111V155.885H105.186V183.766H173.623V155.884Z" fill="#06FC99"/>
+</svg>
diff --git a/packages/extension/src/providers/ethereum/networks/icons/op.svg b/packages/extension/src/providers/ethereum/networks/icons/op.svg
new file mode 100644
index 000000000..336c6f8c0
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/networks/icons/op.svg
@@ -0,0 +1,5 @@
+<svg width="122" height="122" viewBox="0 0 122 122" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M61 122C94.6894 122 122 94.6894 122 61C122 27.3106 94.6894 0 61 0C27.3106 0 0 27.3106 0 61C0 94.6894 27.3106 122 61 122Z" fill="#FF0420"/>
+<path d="M43.201 77.177C40.0272 77.3124 36.8953 76.4129 34.277 74.614C33.1459 73.75 32.2423 72.6235 31.6443 71.3319C31.0463 70.0403 30.772 68.6224 30.845 67.201C30.859 66.3727 30.9355 65.5467 31.074 64.73C31.4707 62.53 32.035 59.891 32.767 56.813C34.8417 48.423 40.1957 44.228 48.8291 44.228C50.9929 44.1925 53.1415 44.5974 55.144 45.418C56.9217 46.1147 58.4512 47.3256 59.5371 48.896C60.6321 50.514 61.1917 52.435 61.137 54.388C61.1213 55.2009 61.0448 56.0115 60.9081 56.813C60.4501 59.5283 59.901 62.1673 59.261 64.73C58.1944 68.9093 56.3487 72.0363 53.724 74.111C51.102 76.155 47.5944 77.177 43.201 77.177ZM43.842 70.587C45.427 70.6308 46.9734 70.0938 48.1901 69.077C49.5347 67.8575 50.4494 66.2364 50.798 64.455C51.5 61.5883 52.0334 59.0866 52.3981 56.95C52.5208 56.3012 52.5821 55.6423 52.581 54.982C52.581 52.2053 51.132 50.8173 48.234 50.818C46.6362 50.7797 45.0776 51.3154 43.841 52.328C42.5213 53.5603 41.6243 55.1778 41.278 56.95C40.7287 58.994 40.1797 61.4956 39.631 64.455C39.5069 65.088 39.4456 65.7318 39.448 66.377C39.448 69.1836 40.9127 70.587 43.842 70.587Z" fill="white"/>
+<path d="M63.245 76.7199C63.0996 76.7284 62.9542 76.7041 62.8195 76.6487C62.6849 76.5933 62.5644 76.5083 62.467 76.4C62.3148 76.154 62.2656 75.8579 62.33 75.576L68.645 45.8299C68.7009 45.5017 68.8797 45.2071 69.145 45.0059C69.3903 44.8036 69.6971 44.6907 70.015 44.686H82.188C85.054 44.5453 87.895 45.2795 90.334 46.7909C91.3368 47.4478 92.1512 48.3546 92.6969 49.4219C93.2426 50.4893 93.5008 51.6804 93.446 52.878C93.4417 53.679 93.3494 54.477 93.171 55.2579C92.6664 58.3413 91.0155 61.1201 88.549 63.0379C86.261 64.7159 83.1187 65.555 79.122 65.555H72.945L70.84 75.5769C70.784 75.9051 70.6053 76.1997 70.34 76.4009C70.0951 76.6031 69.7886 76.716 69.471 76.721L63.245 76.7199ZM79.445 59.238C80.6441 59.2644 81.8184 58.8946 82.786 58.186C83.7816 57.4548 84.4673 56.3774 84.708 55.1659C84.793 54.7131 84.8389 54.2537 84.845 53.7929C84.871 53.4207 84.8148 53.0473 84.6804 52.6993C84.5459 52.3512 84.3365 52.037 84.067 51.779C83.3034 51.215 82.3578 50.9541 81.413 51.0469H75.922L74.183 59.238H79.445Z" fill="white"/>
+</svg>
diff --git a/packages/extension/src/providers/ethereum/networks/index.ts b/packages/extension/src/providers/ethereum/networks/index.ts
index 425665a44..d538760ce 100644
--- a/packages/extension/src/providers/ethereum/networks/index.ts
+++ b/packages/extension/src/providers/ethereum/networks/index.ts
@@ -12,6 +12,8 @@ import karuraEvmNode from "./karura";
 import okcNode from "./okc";
 import shidenEvmNode from "./sdn";
 import astarEvmNode from "./astr";
+import optimismNode from "./op";
+import cantoNode from "./canto";
 
 export default {
   goerli: goerliNode,
@@ -28,4 +30,6 @@ export default {
   okc: okcNode,
   shidenEvm: shidenEvmNode,
   astarEvm: astarEvmNode,
+  op: optimismNode,
+  canto: cantoNode,
 };
diff --git a/packages/extension/src/providers/ethereum/networks/karura.ts b/packages/extension/src/providers/ethereum/networks/karura.ts
index ffd305aa4..b8d334971 100644
--- a/packages/extension/src/providers/ethereum/networks/karura.ts
+++ b/packages/extension/src/providers/ethereum/networks/karura.ts
@@ -9,9 +9,10 @@ const karuraOptions: EvmNetworkOptions = {
   homePage: "https://karura.network",
   blockExplorerTX: "https://blockscout.karura.network/tx/[[txHash]]",
   blockExplorerAddr: "https://blockscout.karura.network/address/[[address]]",
-  chainID: 686,
+  chainID: "0x2ae",
   isTestNetwork: false,
   currencyName: "KAR",
+  currencyNameLong: "Karura",
   node: "wss://eth-rpc-karura.aca-api.network/ws",
   icon: require("./icons/karura-evm.svg"),
   gradient: "linear-gradient(330.21deg, #E40C5B -26.31%, #FF4C3B 88.17%)",
diff --git a/packages/extension/src/providers/ethereum/networks/kov.ts b/packages/extension/src/providers/ethereum/networks/kov.ts
index 4fbbd0af5..3d123379c 100644
--- a/packages/extension/src/providers/ethereum/networks/kov.ts
+++ b/packages/extension/src/providers/ethereum/networks/kov.ts
@@ -9,9 +9,10 @@ const kovOptions: EvmNetworkOptions = {
   homePage: "https://github.com/kovan-testnet",
   blockExplorerTX: "https://kovan.etherscan.io/tx/[[txHash]]",
   blockExplorerAddr: "https://kovan.etherscan.io/address/[[address]]",
-  chainID: 42,
+  chainID: "0x2a",
   isTestNetwork: true,
   currencyName: "KOV",
+  currencyNameLong: "Kovan",
   node: "wss://nodes.mewapi.io/ws/kovan",
   icon: require("./icons/eth.svg"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/matic.ts b/packages/extension/src/providers/ethereum/networks/matic.ts
index ad6a6b15b..b5b9e8858 100644
--- a/packages/extension/src/providers/ethereum/networks/matic.ts
+++ b/packages/extension/src/providers/ethereum/networks/matic.ts
@@ -11,9 +11,10 @@ const maticOptions: EvmNetworkOptions = {
   homePage: "https://polygonscan.com/",
   blockExplorerTX: "https://polygonscan.com/tx/[[txHash]]",
   blockExplorerAddr: "https://polygonscan.com/address/[[address]]",
-  chainID: 137,
+  chainID: "0x89",
   isTestNetwork: false,
   currencyName: "MATIC",
+  currencyNameLong: "Polygon Matic",
   node: "wss://nodes.mewapi.io/ws/matic",
   icon: require("./icons/matic.svg"),
   gradient: "#7B3FE4",
diff --git a/packages/extension/src/providers/ethereum/networks/moonbeam/index.ts b/packages/extension/src/providers/ethereum/networks/moonbeam/index.ts
index 1816c0035..355e37f8b 100644
--- a/packages/extension/src/providers/ethereum/networks/moonbeam/index.ts
+++ b/packages/extension/src/providers/ethereum/networks/moonbeam/index.ts
@@ -10,9 +10,10 @@ const moonbeamOptions: EvmNetworkOptions = {
   homePage: "https://moonbeam.network",
   blockExplorerTX: "https://moonscan.io/tx/[[txHash]]",
   blockExplorerAddr: "https://moonscan.io/address/[[address]]",
-  chainID: 1284,
+  chainID: "0x504",
   isTestNetwork: false,
   currencyName: "GLMR",
+  currencyNameLong: "Moonbeam",
   node: "wss://wss.api.moonbeam.network/",
   icon: require("../icons/moonbeam.svg"),
   gradient: "#53CBC9",
diff --git a/packages/extension/src/providers/ethereum/networks/moonriver/index.ts b/packages/extension/src/providers/ethereum/networks/moonriver/index.ts
index 10e62de9d..13c2d8275 100644
--- a/packages/extension/src/providers/ethereum/networks/moonriver/index.ts
+++ b/packages/extension/src/providers/ethereum/networks/moonriver/index.ts
@@ -10,9 +10,10 @@ const moonriverOptions: EvmNetworkOptions = {
   homePage: "https://moonbeam.network/networks/moonriver/",
   blockExplorerTX: "https://moonriver.moonscan.io//tx/[[txHash]]",
   blockExplorerAddr: "https://moonriver.moonscan.io/address/[[address]]",
-  chainID: 1285,
+  chainID: "0x505",
   isTestNetwork: false,
   currencyName: "MOVR",
+  currencyNameLong: "Moonriver",
   node: "wss://wss.api.moonriver.moonbeam.network",
   icon: require("../icons/moonriver.svg"),
   gradient: "linear-gradient(180deg, #F2B705 0%, #53CBC8 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/okc.ts b/packages/extension/src/providers/ethereum/networks/okc.ts
index c2b99bcdf..211fc90f2 100644
--- a/packages/extension/src/providers/ethereum/networks/okc.ts
+++ b/packages/extension/src/providers/ethereum/networks/okc.ts
@@ -9,9 +9,10 @@ const okcOptions: EvmNetworkOptions = {
   homePage: "https://www.oklink.com/en/okc",
   blockExplorerTX: "https://www.oklink.com/en/okc/tx/[[txHash]]",
   blockExplorerAddr: "https://www.oklink.com/en/okc/address/[[address]]",
-  chainID: 66,
+  chainID: "0x42",
   isTestNetwork: false,
   currencyName: "OKT",
+  currencyNameLong: "OKX Chain",
   node: "https://exchainrpc.okex.org",
   icon: require("./icons/okc.svg"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/op.ts b/packages/extension/src/providers/ethereum/networks/op.ts
new file mode 100644
index 000000000..7e6efed09
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/networks/op.ts
@@ -0,0 +1,26 @@
+import { CoingeckoPlatform, NetworkNames } from "@enkryptcom/types";
+import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
+import { EtherscanActivity } from "../libs/activity-handlers";
+import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
+
+const opOptions: EvmNetworkOptions = {
+  name: NetworkNames.Optimism,
+  name_long: "Optimism",
+  homePage: "https://www.optimism.io/",
+  blockExplorerTX: "https://optimistic.etherscan.io/tx/[[txHash]]",
+  blockExplorerAddr: "https://optimistic.etherscan.io/address/[[address]]",
+  chainID: "0xa",
+  isTestNetwork: false,
+  currencyName: "ETH",
+  currencyNameLong: "Ethereum",
+  node: "https://mainnet.optimism.io",
+  icon: require("./icons/op.svg"),
+  gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
+  coingeckoID: "ethereum",
+  coingeckoPlatform: CoingeckoPlatform.Optimism,
+  activityHandler: wrapActivityHandler(EtherscanActivity),
+};
+
+const op = new EvmNetwork(opOptions);
+
+export default op;
diff --git a/packages/extension/src/providers/ethereum/networks/rin.ts b/packages/extension/src/providers/ethereum/networks/rin.ts
index 43cbdf689..47a96dcf8 100644
--- a/packages/extension/src/providers/ethereum/networks/rin.ts
+++ b/packages/extension/src/providers/ethereum/networks/rin.ts
@@ -9,9 +9,10 @@ const rinOptions: EvmNetworkOptions = {
   homePage: "https://www.rinkeby.io/",
   blockExplorerTX: "https://rinkeby.etherscan.io/tx/[[txHash]]",
   blockExplorerAddr: "https://rinkeby.etherscan.io/address/[[address]]",
-  chainID: 4,
+  chainID: "0x4",
   isTestNetwork: true,
   currencyName: "RIN",
+  currencyNameLong: "Rinkeby",
   node: "wss://nodes.mewapi.io/ws/rinkeby",
   icon: require("./icons/eth.svg"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/networks/rop.ts b/packages/extension/src/providers/ethereum/networks/rop.ts
index 1773a7fd6..bd64a3e4c 100644
--- a/packages/extension/src/providers/ethereum/networks/rop.ts
+++ b/packages/extension/src/providers/ethereum/networks/rop.ts
@@ -9,9 +9,10 @@ const ropOptions: EvmNetworkOptions = {
   homePage: "https://github.com/ethereum/ropsten",
   blockExplorerTX: "https://ropsten.etherscan.io/tx/[[txHash]]",
   blockExplorerAddr: "https://ropsten.etherscan.io/address/[[address]]",
-  chainID: 3,
+  chainID: "0x3",
   isTestNetwork: true,
   currencyName: "ROP",
+  currencyNameLong: "Ropsten",
   node: "wss://nodes.mewapi.io/ws/rop",
   icon: require("./icons/eth.svg"),
   basePath: "m/44'/1'/0'/0",
diff --git a/packages/extension/src/providers/ethereum/networks/sdn.ts b/packages/extension/src/providers/ethereum/networks/sdn.ts
index 250c613ae..b93445da9 100644
--- a/packages/extension/src/providers/ethereum/networks/sdn.ts
+++ b/packages/extension/src/providers/ethereum/networks/sdn.ts
@@ -9,9 +9,10 @@ const sdnOptions: EvmNetworkOptions = {
   homePage: "https://shiden.astar.network/",
   blockExplorerTX: "https://blockscout.com/shiden/tx/[[txHash]]",
   blockExplorerAddr: "https://blockscout.com/shiden/address/[[address]]",
-  chainID: 336,
+  chainID: "0x150",
   isTestNetwork: false,
   currencyName: "SDN",
+  currencyNameLong: "Shiden",
   node: "wss://shiden.public.blastapi.io",
   icon: require("./icons/sdn.png"),
   gradient: "linear-gradient(180deg, #C549FF 0%, #684CFF 100%)",
diff --git a/packages/extension/src/providers/ethereum/types/evm-network.ts b/packages/extension/src/providers/ethereum/types/evm-network.ts
index edbeb740c..169162943 100644
--- a/packages/extension/src/providers/ethereum/types/evm-network.ts
+++ b/packages/extension/src/providers/ethereum/types/evm-network.ts
@@ -26,9 +26,10 @@ export interface EvmNetworkOptions {
   homePage: string;
   blockExplorerTX: string;
   blockExplorerAddr: string;
-  chainID: number;
+  chainID: `0x${string}`;
   isTestNetwork: boolean;
   currencyName: string;
+  currencyNameLong: string;
   node: string;
   icon: string;
   gradient: string;
@@ -51,7 +52,7 @@ export interface EvmNetworkOptions {
 }
 
 export class EvmNetwork extends BaseNetwork {
-  public chainID: number;
+  public chainID: `0x${string}`;
 
   private assetsInfoHandler?: (
     network: BaseNetwork,
@@ -131,8 +132,8 @@ export class EvmNetwork extends BaseNetwork {
         fromBase(balance, this.decimals)
       ).times(nativeMarketData?.current_price ?? 0);
       const nativeAsset: AssetsType = {
-        name: this.name_long,
-        symbol: this.name,
+        name: this.currencyNameLong,
+        symbol: this.currencyName,
         icon: this.icon,
         balance,
         balancef: formatFloatingPointValue(fromBase(balance, this.decimals))
@@ -208,10 +209,15 @@ export class EvmNetwork extends BaseNetwork {
           return true;
         }) as CustomErc20Token[];
 
-        return erc20Tokens.map(
-          ({ name, symbol, address, icon, decimals }) =>
-            new Erc20Token({ name, symbol, contract: address, icon, decimals })
-        );
+        return erc20Tokens.map(({ name, symbol, address, icon, decimals }) => {
+          return new Erc20Token({
+            name,
+            symbol,
+            contract: address,
+            icon,
+            decimals,
+          });
+        });
       });
 
     const balancePromises = customTokens.map((token) =>
@@ -238,7 +244,7 @@ export class EvmNetwork extends BaseNetwork {
         balanceUSDf: "0",
         value: "0",
         valuef: "0",
-        decimals: this.decimals,
+        decimals: token.decimals,
         sparkline: "",
         priceChangePercentage: 0,
         icon: token.icon,
@@ -247,9 +253,9 @@ export class EvmNetwork extends BaseNetwork {
       const marketInfo = marketInfos[token.contract.toLowerCase()];
 
       if (marketInfo) {
-        const usdBalance = new BigNumber(token.balance ?? "0").times(
-          marketInfo.current_price
-        );
+        const usdBalance = new BigNumber(
+          fromBase(token.balance ?? "0", token.decimals)
+        ).times(marketInfo.current_price);
         asset.balanceUSD = usdBalance.toNumber();
         asset.balanceUSDf = formatFiatValue(usdBalance.toString()).value;
         asset.value = marketInfo.current_price.toString();
diff --git a/packages/extension/src/providers/ethereum/types/index.ts b/packages/extension/src/providers/ethereum/types/index.ts
index 119c520ed..0bf74229c 100644
--- a/packages/extension/src/providers/ethereum/types/index.ts
+++ b/packages/extension/src/providers/ethereum/types/index.ts
@@ -52,7 +52,7 @@ export interface EthereumRequest {
 
 export interface EthereumNodeType extends NodeType {
   signer: [SignerType.secp256k1];
-  chainID: number;
+  chainID: `0x${string}`;
 }
 
 export interface ERC20TokenInfo {
diff --git a/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue b/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue
index ac0a780e8..c8477db68 100644
--- a/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue
+++ b/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue
@@ -157,6 +157,7 @@ import { Activity, ActivityStatus, ActivityType } from "@/types/activity";
 import { generateAddress } from "ethereumjs-util";
 import ActivityState from "@/libs/activity-state";
 import { bigIntToBuffer } from "@enkryptcom/utils";
+import broadcastTx from "../libs/tx-broadcaster";
 
 const isProcessing = ref(false);
 const isOpenSelectFee = ref(false);
@@ -280,62 +281,66 @@ const approve = async () => {
         account: account.value,
         network: network.value,
         payload: finalizedTx,
-      })
-        .then((tx) => {
-          const txActivity: Activity = {
-            from: account.value.address,
-            to: tx.to
-              ? tx.to.toString()
-              : `0x${generateAddress(
-                  tx.getSenderAddress().toBuffer(),
-                  bigIntToBuffer(tx.nonce)
-                ).toString("hex")}`,
-            isIncoming: tx.getSenderAddress().toString() === tx.to?.toString(),
-            network: network.value.name,
-            status: ActivityStatus.pending,
-            timestamp: new Date().getTime(),
-            token: {
-              decimals: decodedTx.value?.tokenDecimals || 18,
-              icon: decodedTx.value?.tokenImage || "",
-              name: decodedTx.value?.tokenName || "Unknown",
-              symbol: decodedTx.value?.tokenSymbol || "UKNWN",
-              price: decodedTx.value?.currentPriceUSD.toString() || "0",
-            },
-            type: ActivityType.transaction,
-            value: decodedTx.value?.tokenValue || "0x0",
-            transactionHash: "",
-          };
-          web3
-            .sendSignedTransaction("0x" + tx.serialize().toString("hex"))
-            .on("transactionHash", (hash) => {
-              activityState
-                .addActivities(
-                  [{ ...txActivity, ...{ transactionHash: hash } }],
-                  { address: txActivity.from, network: network.value.name }
-                )
-                .then(() => {
-                  Resolve.value({
-                    result: JSON.stringify(hash),
-                  });
-                });
+      }).then((tx) => {
+        const txActivity: Activity = {
+          from: account.value.address,
+          to: tx.to
+            ? tx.to.toString()
+            : `0x${generateAddress(
+                tx.getSenderAddress().toBuffer(),
+                bigIntToBuffer(tx.nonce)
+              ).toString("hex")}`,
+          isIncoming: tx.getSenderAddress().toString() === tx.to?.toString(),
+          network: network.value.name,
+          status: ActivityStatus.pending,
+          timestamp: new Date().getTime(),
+          token: {
+            decimals: decodedTx.value?.tokenDecimals || 18,
+            icon: decodedTx.value?.tokenImage || "",
+            name: decodedTx.value?.tokenName || "Unknown",
+            symbol: decodedTx.value?.tokenSymbol || "UKNWN",
+            price: decodedTx.value?.currentPriceUSD.toString() || "0",
+          },
+          type: ActivityType.transaction,
+          value: decodedTx.value?.tokenValue || "0x0",
+          transactionHash: "",
+        };
+        const onHash = (hash: string) => {
+          activityState
+            .addActivities([{ ...txActivity, ...{ transactionHash: hash } }], {
+              address: txActivity.from,
+              network: network.value.name,
             })
-            .on("error", (error) => {
-              txActivity.status = ActivityStatus.failed;
-              activityState
-                .addActivities([txActivity], {
-                  address: txActivity.from,
-                  network: network.value.name,
-                })
-                .then(() => {
-                  Resolve.value({
-                    error: getCustomError(error.message),
-                  });
-                });
+            .then(() => {
+              Resolve.value({
+                result: JSON.stringify(hash),
+              });
             });
-        })
-        .catch((err) => {
-          Resolve.value(err);
-        });
+        };
+        broadcastTx("0x" + tx.serialize().toString("hex"), network.value.name)
+          .then(onHash)
+          .catch(() => {
+            web3
+              .sendSignedTransaction("0x" + tx.serialize().toString("hex"))
+              .on("transactionHash", onHash)
+              .on("error", (error) => {
+                txActivity.status = ActivityStatus.failed;
+                activityState
+                  .addActivities([txActivity], {
+                    address: txActivity.from,
+                    network: network.value.name,
+                  })
+                  .then(() => {
+                    Resolve.value({
+                      error: getCustomError(error.message),
+                    });
+                  });
+              });
+          })
+          .catch((err) => {
+            Resolve.value(err);
+          });
+      });
     }
   );
 };
diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
index 7206bf585..7e2042764 100644
--- a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
@@ -129,6 +129,7 @@
 <script setup lang="ts">
 import { ref, onMounted, PropType, computed, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
+import { debounce } from "lodash";
 import SendHeader from "./components/send-header.vue";
 import SendAddressInput from "./components/send-address-input.vue";
 import SendFromContactsList from "./components/send-from-contacts-list.vue";
@@ -164,6 +165,7 @@ import getUiPath from "@/libs/utils/get-ui-path";
 import Browser from "webextension-polyfill";
 import { ProviderName } from "@/types/provider";
 import PublicKeyRing from "@/libs/keyring/public-keyring";
+import { GenericNameResolver, CoinType } from "@/libs/name-resolver";
 
 const props = defineProps({
   network: {
@@ -185,9 +187,11 @@ const loadingAsset = new Erc20Token({
   decimals: 18,
 });
 
-const addressInputTo = ref();
 const route = useRoute();
 const router = useRouter();
+
+const nameResolver = new GenericNameResolver();
+const addressInputTo = ref();
 const selected: string = route.params.id as string;
 const accountAssets = ref<Erc20Token[]>([]);
 const selectedAsset = ref<Erc20Token | Partial<Erc20Token>>(loadingAsset);
@@ -255,7 +259,7 @@ const TxInfo = computed<SendTransactionDataType>(() => {
           )
           .encodeABI();
   return {
-    chainId: numberToHex(props.network.chainID) as `0x{string}`,
+    chainId: props.network.chainID,
     from: addressFrom.value as `0x{string}`,
     value: value as `0x${string}`,
     to: toAddress as `0x${string}`,
@@ -345,7 +349,7 @@ const setBaseCosts = () => {
   const web3 = new Web3Eth(props.network.node);
   const tx = new Transaction(
     {
-      chainId: numberToHex(props.network.chainID) as `0x{string}`,
+      chainId: props.network.chainID,
       from: props.accountInfo.selectedAccount!.address as `0x{string}`,
       value: "0x0",
       to: NATIVE_TOKEN_ADDRESS,
@@ -440,7 +444,17 @@ const inputAddressFrom = (text: string) => {
   addressFrom.value = text;
 };
 
-const inputAddressTo = (text: string) => {
+const inputAddressTo = async (text: string) => {
+  const debounceResolve = debounce(() => {
+    nameResolver
+      .resolveName(text, [props.network.name as CoinType, "ETH"])
+      .then((resolved) => {
+        if (resolved) {
+          addressTo.value = resolved;
+        }
+      });
+  }, 500);
+  debounceResolve();
   addressTo.value = text;
 };
 
diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue
index 8995b4d3a..673197fc9 100644
--- a/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue
+++ b/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue
@@ -95,6 +95,7 @@ import { ActivityStatus, Activity, ActivityType } from "@/types/activity";
 import ActivityState from "@/libs/activity-state";
 import { EnkryptAccount } from "@enkryptcom/types";
 import CustomScrollbar from "@action/components/custom-scrollbar/index.vue";
+import broadcastTx from "@/providers/ethereum/libs/tx-broadcaster";
 
 const KeyRing = new PublicKeyRing();
 const route = useRoute();
@@ -149,6 +150,24 @@ const sendAction = async () => {
     transactionHash: "",
   };
   const activityState = new ActivityState();
+  const onHash = (hash: string) => {
+    activityState.addActivities(
+      [{ ...txActivity, ...{ transactionHash: hash } }],
+      { address: txData.fromAddress, network: network.name }
+    );
+    isSendDone.value = true;
+    if (getCurrentContext() === "popup") {
+      setTimeout(() => {
+        isProcessing.value = false;
+        router.go(-2);
+      }, 4500);
+    } else {
+      setTimeout(() => {
+        isProcessing.value = false;
+        window.close();
+      }, 1500);
+    }
+  };
   await tx
     .getFinalizedTransaction({ gasPriceType: txData.gasPriceType })
     .then(async (finalizedTx) => {
@@ -156,42 +175,30 @@ const sendAction = async () => {
         account: account.value!,
         network,
         payload: finalizedTx,
-      })
-        .then((signedTx) => {
-          web3
-            .sendSignedTransaction("0x" + signedTx.serialize().toString("hex"))
-            .on("transactionHash", (hash: string) => {
-              activityState.addActivities(
-                [{ ...txActivity, ...{ transactionHash: hash } }],
-                { address: txData.fromAddress, network: network.name }
-              );
-              isSendDone.value = true;
-              if (getCurrentContext() === "popup") {
-                setTimeout(() => {
-                  isProcessing.value = false;
-                  router.go(-2);
-                }, 4500);
-              } else {
-                setTimeout(() => {
-                  isProcessing.value = false;
-                  window.close();
-                }, 1500);
-              }
-            })
-            .on("error", (error: any) => {
-              txActivity.status = ActivityStatus.failed;
-              activityState.addActivities([txActivity], {
-                address: txData.fromAddress,
-                network: network.name,
+      }).then((signedTx) => {
+        broadcastTx("0x" + signedTx.serialize().toString("hex"), network.name)
+          .then(onHash)
+          .catch(() => {
+            web3
+              .sendSignedTransaction(
+                "0x" + signedTx.serialize().toString("hex")
+              )
+              .on("transactionHash", onHash)
+              .on("error", (error: any) => {
+                txActivity.status = ActivityStatus.failed;
+                activityState.addActivities([txActivity], {
+                  address: txData.fromAddress,
+                  network: network.name,
+                });
+                console.error("ERROR", error);
               });
-              console.error("ERROR", error);
-            });
-        })
-        .catch((error) => {
-          isProcessing.value = false;
-          console.error("error", error);
-          errorMsg.value = JSON.stringify(error);
-        });
+          })
+          .catch((error) => {
+            isProcessing.value = false;
+            console.error("error", error);
+            errorMsg.value = JSON.stringify(error);
+          });
+      });
     });
 };
 const isHasScroll = () => {
diff --git a/packages/extension/src/providers/polkadot/index.ts b/packages/extension/src/providers/polkadot/index.ts
index 1b6d68661..88b537053 100644
--- a/packages/extension/src/providers/polkadot/index.ts
+++ b/packages/extension/src/providers/polkadot/index.ts
@@ -36,6 +36,7 @@ class PolkadotProvider
     this.middlewares = Middlewares.map((mw) => mw.bind(this));
   }
   setRequestProvider(network: BaseNetwork): void {
+    this.requestProvider.disconnect();
     this.requestProvider.changeNetwork(network.node);
   }
   request(request: ProviderRPCRequest): Promise<OnMessageResponse> {
diff --git a/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts
index 28fe06bb3..17fb554bd 100644
--- a/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts
+++ b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts
@@ -8,6 +8,8 @@ const NetworkEndpoints = {
   [NetworkNames.Karura]: "https://karura.api.subscan.io/",
   [NetworkNames.Astar]: "https://astar.api.subscan.io/",
   [NetworkNames.Shiden]: "https://shiden.api.subscan.io/",
+  [NetworkNames.Bifrost]: "https://bifrost.api.subscan.io/",
+  [NetworkNames.BifrostKusama]: "https://bifrost-kusama.api.subscan.io/",
 };
 
 export { NetworkEndpoints };
diff --git a/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/index.ts b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/index.ts
index 3a2f31082..325b443e4 100644
--- a/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/index.ts
+++ b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/index.ts
@@ -54,7 +54,7 @@ export default async (
       token: {
         decimals: network.decimals,
         icon: network.icon,
-        name: network.name_long,
+        name: network.currencyNameLong,
         symbol:
           activity.asset_symbol !== ""
             ? activity.asset_symbol
diff --git a/packages/extension/src/providers/polkadot/networks/acala/acala.ts b/packages/extension/src/providers/polkadot/networks/acala/acala.ts
index d04a9b788..4ebaa0017 100644
--- a/packages/extension/src/providers/polkadot/networks/acala/acala.ts
+++ b/packages/extension/src/providers/polkadot/networks/acala/acala.ts
@@ -17,6 +17,7 @@ const acalaOptions: SubstrateNetworkOptions = {
   blockExplorerAddr: "https://acala.subscan.io/account/[[address]]",
   isTestNetwork: false,
   currencyName: "ACA",
+  currencyNameLong: "Acala",
   icon: require("../icons/acala.svg"),
   decimals: 12,
   prefix: 12,
diff --git a/packages/extension/src/providers/polkadot/networks/acala/karura.ts b/packages/extension/src/providers/polkadot/networks/acala/karura.ts
index 40b355663..42be71096 100644
--- a/packages/extension/src/providers/polkadot/networks/acala/karura.ts
+++ b/packages/extension/src/providers/polkadot/networks/acala/karura.ts
@@ -16,6 +16,7 @@ const karuraOptions: SubstrateNetworkOptions = {
   blockExplorerAddr: "https://karura.subscan.io/account/[[address]]",
   isTestNetwork: false,
   currencyName: "KAR",
+  currencyNameLong: "Karura",
   icon: require("../icons/karura.svg"),
   decimals: 12,
   prefix: 8,
diff --git a/packages/extension/src/providers/polkadot/networks/acala/libs/assetinfo-orml.ts b/packages/extension/src/providers/polkadot/networks/acala/libs/assetinfo-orml.ts
index f7bbf59d8..7f72cd55f 100644
--- a/packages/extension/src/providers/polkadot/networks/acala/libs/assetinfo-orml.ts
+++ b/packages/extension/src/providers/polkadot/networks/acala/libs/assetinfo-orml.ts
@@ -130,7 +130,7 @@ export default async (
     });
 
   const nativeAsset = new SubstrateNativeToken({
-    name: network.name_long,
+    name: network.currencyNameLong,
     symbol: network.name,
     decimals: network.decimals,
     existentialDeposit: network.existentialDeposit,
diff --git a/packages/extension/src/providers/polkadot/networks/astar/astar.ts b/packages/extension/src/providers/polkadot/networks/astar/astar.ts
index 9db8cc40f..bc6d1ce42 100644
--- a/packages/extension/src/providers/polkadot/networks/astar/astar.ts
+++ b/packages/extension/src/providers/polkadot/networks/astar/astar.ts
@@ -17,6 +17,7 @@ const astarOptions: SubstrateNetworkOptions = {
   blockExplorerAddr: "https://astar.subscan.io/account/[[address]]",
   isTestNetwork: false,
   currencyName: "ASTR",
+  currencyNameLong: "Astar",
   icon: require("../icons/astar.png"),
   decimals: 18,
   prefix: 5,
diff --git a/packages/extension/src/providers/polkadot/networks/astar/libs/assetinfo.ts b/packages/extension/src/providers/polkadot/networks/astar/libs/assetinfo.ts
index 8941d825c..73edbcbe9 100644
--- a/packages/extension/src/providers/polkadot/networks/astar/libs/assetinfo.ts
+++ b/packages/extension/src/providers/polkadot/networks/astar/libs/assetinfo.ts
@@ -106,7 +106,7 @@ export default async (
   }
 
   const nativeAsset = new SubstrateNativeToken({
-    name: network.name_long,
+    name: network.currencyNameLong,
     symbol: network.name,
     decimals: network.decimals,
     existentialDeposit: network.existentialDeposit,
diff --git a/packages/extension/src/providers/polkadot/networks/astar/shiden.ts b/packages/extension/src/providers/polkadot/networks/astar/shiden.ts
index 686d4da79..4b615082a 100644
--- a/packages/extension/src/providers/polkadot/networks/astar/shiden.ts
+++ b/packages/extension/src/providers/polkadot/networks/astar/shiden.ts
@@ -17,6 +17,7 @@ const shidenOptions: SubstrateNetworkOptions = {
   blockExplorerAddr: "https://shiden.subscan.io/account/[[address]]",
   isTestNetwork: false,
   currencyName: "SDN",
+  currencyNameLong: "Shiden",
   icon: require("../icons/shiden.png"),
   decimals: 18,
   prefix: 5,
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/bifrost-assets.ts b/packages/extension/src/providers/polkadot/networks/bifrost/assets/bifrost-assets.ts
new file mode 100644
index 000000000..4f3dd31a5
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/networks/bifrost/assets/bifrost-assets.ts
@@ -0,0 +1,72 @@
+import { KnownTokenDisplay } from "@/providers/polkadot/types";
+
+const assets: KnownTokenDisplay[] = [
+  {
+    name: "Bifrost",
+    symbol: "BNC",
+    coingeckoID: "bifrost-native-coin",
+    icon: require("./icons/BNC.png"),
+  },
+  {
+    name: "Polkadot",
+    symbol: "DOT",
+    coingeckoID: "polkadot",
+    icon: require("../../icons/polkadot.svg"),
+  },
+  {
+    name: "Kusama",
+    symbol: "KSM",
+    coingeckoID: "kusama",
+    icon: require("../../icons/kusama.svg"),
+  },
+  {
+    name: "Acala Dollar",
+    symbol: "aUSD",
+    icon: require("./icons/AUSD.png"),
+    coingeckoID: "acala-dollar",
+  },
+  {
+    name: "Moonriver",
+    symbol: "MOVR",
+    icon: require("./icons/MOVR.png"),
+    coingeckoID: "moonriver",
+  },
+  {
+    name: "Karura",
+    symbol: "KAR",
+    icon: require("./icons/KAR.png"),
+    coingeckoID: "karura",
+  },
+  {
+    name: "RMRK",
+    symbol: "RMRK",
+    icon: require("./icons/RMRK.png"),
+    coingeckoID: "rmrk",
+  },
+  {
+    name: "Zenlink",
+    symbol: "ZLK",
+    icon: require("./icons/ZLK.png"),
+    coingeckoID: "zenlink-network-token",
+  },
+  {
+    name: "USDT",
+    symbol: "USDT",
+    icon: require("./icons/USDT.png"),
+    coingeckoID: "usdt",
+  },
+  {
+    name: "Turing Network",
+    symbol: "TUR",
+    icon: require("./icons/TUR.png"),
+    coingeckoID: "",
+  },
+  {
+    name: "Darwinia Crab",
+    symbol: "CRAB",
+    icon: require("./icons/CRAB.png"),
+    coingeckoID: "",
+  },
+];
+
+export default assets;
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/AUSD.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/AUSD.png
new file mode 100644
index 000000000..085636783
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/AUSD.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/BNC.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/BNC.png
new file mode 100644
index 000000000..002ca36a8
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/BNC.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/CRAB.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/CRAB.png
new file mode 100644
index 000000000..7a92a0efb
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/CRAB.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/CSM.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/CSM.png
new file mode 100644
index 000000000..24a357e30
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/CSM.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/KAR.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/KAR.png
new file mode 100644
index 000000000..b10943944
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/KAR.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/KSM.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/KSM.png
new file mode 100644
index 000000000..00dd41637
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/KSM.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/MOVR.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/MOVR.png
new file mode 100644
index 000000000..40ba8a7c6
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/MOVR.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/PHA.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/PHA.png
new file mode 100644
index 000000000..250065ef1
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/PHA.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/RMRK.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/RMRK.png
new file mode 100644
index 000000000..12513dc5b
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/RMRK.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/TUR.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/TUR.png
new file mode 100644
index 000000000..05799bb22
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/TUR.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/USDT.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/USDT.png
new file mode 100644
index 000000000..b5733e33e
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/USDT.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/ZLK.png b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/ZLK.png
new file mode 100644
index 000000000..99f67c908
Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/bifrost/assets/icons/ZLK.png differ
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/kusama.ts b/packages/extension/src/providers/polkadot/networks/bifrost/kusama.ts
new file mode 100644
index 000000000..7751dab15
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/networks/bifrost/kusama.ts
@@ -0,0 +1,39 @@
+import assetHandler from "./libs/assetinfo-orml";
+import { CoingeckoPlatform, NetworkNames } from "@enkryptcom/types";
+import assets from "./assets/bifrost-assets";
+import {
+  SubstrateNetwork,
+  SubstrateNetworkOptions,
+} from "../../types/substrate-network";
+import { subscanActivity } from "../../libs/activity-handlers";
+import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
+import { toBN } from "web3-utils";
+
+const bifrostKusamaOptions: SubstrateNetworkOptions = {
+  name: NetworkNames.BifrostKusama,
+  name_long: "Bifrost (Kusama)",
+  homePage: "https://bifrost.finance/",
+  blockExplorerTX: "https://bifrost-kusama.subscan.io/extrinsic/[[txHash]]",
+  blockExplorerAddr: "https://bifrost-kusama.subscan.io/account/[[address]]",
+  isTestNetwork: false,
+  currencyName: "BNC",
+  currencyNameLong: "Kusama Bifrost",
+  icon: require("../icons/bifrost.svg"),
+  decimals: 12,
+  prefix: 6,
+  gradient:
+    "linear-gradient(326.87deg, #5a25f0 12.53%, #5a25f0 50.89%, #5a25f0 89.24%)",
+  node: "wss://bifrost-rpc.liebi.com/ws",
+  coingeckoID: "bifrost-native-coin",
+  coingeckoPlatform: CoingeckoPlatform.Bifrost,
+  genesisHash:
+    "0x9f28c6a68e0fc9646eff64935684f6eeeece527e37bbe1f213d22caa1d9d6bed",
+  activityHandler: wrapActivityHandler(subscanActivity),
+  assetHandler: assetHandler,
+  knownTokens: assets,
+  existentialDeposit: toBN("100000000000"),
+};
+
+const bifrostKusama = new SubstrateNetwork(bifrostKusamaOptions);
+
+export default bifrostKusama;
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/libs/assetinfo-orml.ts b/packages/extension/src/providers/polkadot/networks/bifrost/libs/assetinfo-orml.ts
new file mode 100644
index 000000000..6dc9a8148
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/networks/bifrost/libs/assetinfo-orml.ts
@@ -0,0 +1,160 @@
+import API from "@/providers/polkadot/libs/api";
+import { SubstrateNetwork } from "@/providers/polkadot/types/substrate-network";
+import { hexToString, hexToBn } from "@polkadot/util";
+import {
+  BifrostOrmlAsset,
+  BifrostOrmlAssetOptions,
+  OrmlAssetType,
+} from "../types/bifrost-orml-asset";
+import { OrmlTokensAccountData } from "@acala-network/types/interfaces/types-lookup";
+import { toBN } from "web3-utils";
+import { KnownTokenDisplay } from "@/providers/polkadot/types";
+import { SubstrateNativeToken } from "@/providers/polkadot/types/substrate-native-token";
+
+type AssetMetadata = {
+  name: `0x${string}`;
+  symbol: `0x${string}`;
+  decimals: number;
+  minimalBalance: number | `0x${string}`;
+};
+
+type NativeAsset = Record<string, string>;
+
+type ForeignAsset = string;
+
+type StableAsset = string;
+
+type Erc20 = string;
+
+enum AssetIds {
+  NATIVE_ASSET = "NativeAssetId",
+  FOREIGN_ASSET = "ForeignAssetId",
+  STABLE_ASSET = "StableAssetId",
+  ERC20_ASSET = "Erc20",
+}
+
+type AssetKey = Record<
+  AssetIds,
+  NativeAsset | ForeignAsset | StableAsset | Erc20
+>;
+
+export default async (
+  network: SubstrateNetwork,
+  address: string | null,
+  knownTokens?: KnownTokenDisplay[]
+) => {
+  const api = (await network.api()) as API;
+
+  const apiPromise = api.api;
+
+  const metadata =
+    await apiPromise.query.assetRegistry.assetMetadatas.entries();
+
+  const assets = metadata
+    .map(([key, value]) => {
+      const assetKey = (key.toHuman() as [AssetKey])[0];
+      const assetMetadata = value.toJSON() as AssetMetadata;
+      const decimals = assetMetadata.decimals;
+      const minimalBalance =
+        typeof assetMetadata.minimalBalance === "string"
+          ? hexToBn(assetMetadata.minimalBalance)
+          : toBN(assetMetadata.minimalBalance);
+
+      let assetLookupId: OrmlAssetType | null = null;
+      let assetLookupValue: string | null = null;
+
+      if (assetKey[AssetIds.FOREIGN_ASSET]) {
+        assetLookupId = "foreignAsset";
+        assetLookupValue = assetKey[AssetIds.FOREIGN_ASSET] as string;
+      } else if (assetKey[AssetIds.NATIVE_ASSET]) {
+        assetLookupId = Object.keys(
+          assetKey[AssetIds.NATIVE_ASSET]
+        )[0] as "token";
+
+        assetLookupValue = (assetKey[AssetIds.NATIVE_ASSET] as NativeAsset)[
+          assetLookupId
+        ] as string;
+      } else if (assetKey[AssetIds.STABLE_ASSET]) {
+        assetLookupId = "stableAssetPoolToken";
+        assetLookupValue = assetKey[AssetIds.STABLE_ASSET] as string;
+      } else if (assetKey[AssetIds.ERC20_ASSET]) {
+        // TODO add Erc20 support, required special RPC call
+      }
+
+      if (assetLookupId && assetLookupValue) {
+        const assetInfo = {
+          name: assetMetadata.name,
+          symbol: assetMetadata.symbol,
+          decimals,
+          minimalBalance,
+          assetLookupId,
+          assetLookupValue,
+        };
+
+        return assetInfo;
+      } else {
+        // Unhandled token types, right now just Erc20
+        return null;
+      }
+    })
+    .filter((asset) => asset !== null);
+
+  const tokenOptions: BifrostOrmlAssetOptions[] = assets
+    .map((asset) => {
+      const ormlOptions: BifrostOrmlAssetOptions = {
+        name: hexToString(asset!.name),
+        symbol: hexToString(asset!.symbol),
+        existentialDeposit: asset!.minimalBalance,
+        assetType: asset!.assetLookupId,
+        lookupValue: asset!.assetLookupValue,
+        icon: network.icon,
+        decimals: asset!.decimals,
+      };
+
+      return ormlOptions;
+    })
+    .map((tokenOptions) => {
+      if (knownTokens) {
+        const knownToken = knownTokens.find(
+          (knownToken) =>
+            knownToken.name === tokenOptions.name &&
+            knownToken.symbol === tokenOptions.symbol
+        );
+
+        if (knownToken) {
+          tokenOptions.coingeckoID = knownToken.coingeckoID;
+          tokenOptions.icon = knownToken.icon;
+        }
+      }
+      return tokenOptions;
+    });
+
+  const nativeAsset = new SubstrateNativeToken({
+    name: network.currencyNameLong,
+    symbol: network.name,
+    decimals: network.decimals,
+    existentialDeposit: network.existentialDeposit,
+    icon: network.icon,
+    coingeckoID: network.coingeckoID,
+  });
+
+  if (address) {
+    await nativeAsset.getLatestUserBalance(apiPromise, address);
+    const queries = tokenOptions.map((asset) => {
+      const token = { [asset.assetType]: asset.lookupValue };
+      const query = [address, token];
+
+      return query;
+    });
+
+    const tokenBalances = await apiPromise.query.tokens.accounts.multi(queries);
+
+    tokenBalances.forEach((tokenData, index) => {
+      const data = tokenData as unknown as OrmlTokensAccountData;
+
+      tokenOptions[index].balance = data.free.toString();
+    });
+  }
+
+  return [nativeAsset, ...tokenOptions.map((o) => new BifrostOrmlAsset(o))];
+};
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/polkadot.ts b/packages/extension/src/providers/polkadot/networks/bifrost/polkadot.ts
new file mode 100644
index 000000000..4984c8d2e
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/networks/bifrost/polkadot.ts
@@ -0,0 +1,39 @@
+import assetHandler from "./libs/assetinfo-orml";
+import { CoingeckoPlatform, NetworkNames } from "@enkryptcom/types";
+import assets from "./assets/bifrost-assets";
+import {
+  SubstrateNetwork,
+  SubstrateNetworkOptions,
+} from "../../types/substrate-network";
+import { subscanActivity } from "../../libs/activity-handlers";
+import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
+import { toBN } from "web3-utils";
+
+const bifrostPolkadotOptions: SubstrateNetworkOptions = {
+  name: NetworkNames.Bifrost,
+  name_long: "Bifrost",
+  homePage: "https://bifrost.finance/",
+  blockExplorerTX: "https://bifrost.subscan.io/extrinsic/[[txHash]]",
+  blockExplorerAddr: "https://bifrost.subscan.io/account/[[address]]",
+  isTestNetwork: false,
+  currencyName: "BNC",
+  currencyNameLong: "Bifrost",
+  icon: require("../icons/bifrost.svg"),
+  decimals: 12,
+  prefix: 6,
+  gradient:
+    "linear-gradient(326.87deg, #5a25f0 12.53%, #5a25f0 50.89%, #5a25f0 89.24%)",
+  node: "wss://hk.p.bifrost-rpc.liebi.com/ws",
+  coingeckoID: "bifrost-native-coin",
+  coingeckoPlatform: CoingeckoPlatform.Bifrost,
+  genesisHash:
+    "0x262e1b2ad728475fd6fe88e62d34c200abe6fd693931ddad144059b1eb884e5b",
+  activityHandler: wrapActivityHandler(subscanActivity),
+  assetHandler: assetHandler,
+  knownTokens: assets,
+  existentialDeposit: toBN("100000000000"),
+};
+
+const bifrostPolkadot = new SubstrateNetwork(bifrostPolkadotOptions);
+
+export default bifrostPolkadot;
diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/types/bifrost-orml-asset.ts b/packages/extension/src/providers/polkadot/networks/bifrost/types/bifrost-orml-asset.ts
new file mode 100644
index 000000000..298122183
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/networks/bifrost/types/bifrost-orml-asset.ts
@@ -0,0 +1,54 @@
+import { ApiPromise } from "@polkadot/api";
+import { OrmlTokensAccountData } from "@acala-network/types/interfaces/types-lookup";
+import { SubmittableExtrinsic } from "@polkadot/api/types";
+import { ISubmittableResult } from "@polkadot/types/types";
+import { SubstrateToken } from "@/providers/polkadot/types/substrate-token";
+import { BaseTokenOptions } from "@/types/base-token";
+
+export type OrmlAssetType =
+  | "token"
+  | "foreignAsset"
+  | "stableAssetPoolToken"
+  | "liquidCrowdloan";
+
+export interface BifrostOrmlAssetOptions extends BaseTokenOptions {
+  assetType: OrmlAssetType;
+  lookupValue: string | number;
+}
+
+export class BifrostOrmlAsset extends SubstrateToken {
+  public assetType: OrmlAssetType;
+  public lookupValue: string | number;
+
+  constructor(options: BifrostOrmlAssetOptions) {
+    super(options);
+
+    this.assetType = options.assetType;
+    this.lookupValue = options.lookupValue;
+  }
+
+  public async getLatestUserBalance(
+    api: ApiPromise,
+    address: any
+  ): Promise<string> {
+    const tokenLookup: Record<string, string | number> = {};
+    tokenLookup[this.assetType] = this.lookupValue;
+
+    return api.query.tokens.accounts(address, tokenLookup).then((res) => {
+      const balance = (res as unknown as OrmlTokensAccountData).free.toString();
+      this.balance = balance;
+      return balance;
+    });
+  }
+
+  public async send(
+    api: ApiPromise,
+    to: string,
+    amount: string
+  ): Promise<SubmittableExtrinsic<"promise", ISubmittableResult>> {
+    const currencyId: Record<string, string | number> = {};
+    currencyId[this.assetType] = this.lookupValue;
+
+    return (api as ApiPromise).tx.currencies.transfer(to, currencyId, amount);
+  }
+}
diff --git a/packages/extension/src/providers/polkadot/networks/icons/bifrost.svg b/packages/extension/src/providers/polkadot/networks/icons/bifrost.svg
new file mode 100644
index 000000000..3f2a9b5e1
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/networks/icons/bifrost.svg
@@ -0,0 +1,19 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="100" height="100" rx="50" fill="black"/>
+<g clip-path="url(#clip0_750_624)">
+<path d="M50 72.3684H19.7368L65.1316 26.9736H80.2631L50 72.3684Z" fill="url(#paint0_linear_750_624)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_750_624" x1="50" y1="26.9736" x2="50" y2="72.3684" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7AEDCF"/>
+<stop offset="0.201333" stop-color="#68CEFA"/>
+<stop offset="0.403244" stop-color="#689CF8"/>
+<stop offset="0.602076" stop-color="#AC57C0"/>
+<stop offset="0.801867" stop-color="#E65659"/>
+<stop offset="1" stop-color="#F2C241"/>
+</linearGradient>
+<clipPath id="clip0_750_624">
+<rect width="60.5263" height="45.3947" fill="white" transform="translate(19.7368 26.9736)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/extension/src/providers/polkadot/networks/index.ts b/packages/extension/src/providers/polkadot/networks/index.ts
index b5386e93f..d05d7e7ba 100644
--- a/packages/extension/src/providers/polkadot/networks/index.ts
+++ b/packages/extension/src/providers/polkadot/networks/index.ts
@@ -5,6 +5,8 @@ import karNode from "./acala/karura";
 import wndNode from "./westend";
 import astrNode from "./astar/astar";
 import sdnNode from "./astar/shiden";
+import bncNode from "./bifrost/polkadot";
+import bncKusamaNode from "./bifrost/kusama";
 
 export default {
   acala: acaNode,
@@ -14,4 +16,6 @@ export default {
   westend: wndNode,
   astar: astrNode,
   shiden: sdnNode,
+  bifrost: bncNode,
+  bifrostKusama: bncKusamaNode,
 };
diff --git a/packages/extension/src/providers/polkadot/networks/kusama.ts b/packages/extension/src/providers/polkadot/networks/kusama.ts
index 1279f5118..40b4424a7 100644
--- a/packages/extension/src/providers/polkadot/networks/kusama.ts
+++ b/packages/extension/src/providers/polkadot/networks/kusama.ts
@@ -15,6 +15,7 @@ const ksmOptions: SubstrateNetworkOptions = {
   blockExplorerAddr: "https://kusama.subscan.io/account/[[address]]",
   isTestNetwork: false,
   currencyName: "KSM",
+  currencyNameLong: "Kusama",
   icon: require("./icons/kusama.svg"),
   decimals: 12,
   prefix: 2,
diff --git a/packages/extension/src/providers/polkadot/networks/polkadot.ts b/packages/extension/src/providers/polkadot/networks/polkadot.ts
index 28ef04547..e24b8da74 100644
--- a/packages/extension/src/providers/polkadot/networks/polkadot.ts
+++ b/packages/extension/src/providers/polkadot/networks/polkadot.ts
@@ -15,6 +15,7 @@ const polkadotOptions: SubstrateNetworkOptions = {
   blockExplorerAddr: "https://polkadot.subscan.io/account/[[address]]",
   isTestNetwork: false,
   currencyName: "DOT",
+  currencyNameLong: "Polkadot",
   icon: require("./icons/polkadot.svg"),
   decimals: 10,
   prefix: 0,
diff --git a/packages/extension/src/providers/polkadot/networks/westend.ts b/packages/extension/src/providers/polkadot/networks/westend.ts
index 9c7b93538..51ef1b9f6 100644
--- a/packages/extension/src/providers/polkadot/networks/westend.ts
+++ b/packages/extension/src/providers/polkadot/networks/westend.ts
@@ -15,6 +15,7 @@ const wndOptions: SubstrateNetworkOptions = {
   blockExplorerAddr: "https://westend.subscan.io/extrinsic/[[address]]",
   isTestNetwork: true,
   currencyName: "WND",
+  currencyNameLong: "Westend",
   icon: require("./icons/westend.svg"),
   decimals: 12,
   prefix: 42,
diff --git a/packages/extension/src/providers/polkadot/types/substrate-network.ts b/packages/extension/src/providers/polkadot/types/substrate-network.ts
index 8adaa4358..e37c9d2a8 100644
--- a/packages/extension/src/providers/polkadot/types/substrate-network.ts
+++ b/packages/extension/src/providers/polkadot/types/substrate-network.ts
@@ -28,6 +28,7 @@ export interface SubstrateNetworkOptions {
   blockExplorerAddr: string;
   isTestNetwork: boolean;
   currencyName: string;
+  currencyNameLong: string;
   icon: string;
   decimals: number;
   prefix: number;
@@ -105,7 +106,7 @@ export class SubstrateNetwork extends BaseNetwork {
       return Promise.resolve(this.assets);
     } else {
       const nativeToken = new SubstrateNativeToken({
-        name: this.name_long,
+        name: this.currencyNameLong,
         symbol: this.name,
         coingeckoID: this.coingeckoID,
         decimals: this.decimals,
@@ -124,7 +125,7 @@ export class SubstrateNetwork extends BaseNetwork {
 
     if (supported.length === 0) {
       const nativeToken = new SubstrateNativeToken({
-        name: this.name_long,
+        name: this.currencyNameLong,
         symbol: this.name,
         coingeckoID: this.coingeckoID,
         decimals: this.decimals,
diff --git a/packages/extension/src/providers/polkadot/ui/custom-views/mappings/acala.ts b/packages/extension/src/providers/polkadot/ui/custom-views/mappings/acala.ts
index d78db0a5c..63896668d 100644
--- a/packages/extension/src/providers/polkadot/ui/custom-views/mappings/acala.ts
+++ b/packages/extension/src/providers/polkadot/ui/custom-views/mappings/acala.ts
@@ -57,7 +57,7 @@ const transferNativeCurrency = (
   const token = new SubstrateNativeToken({
     decimals: network.decimals,
     icon: network.icon,
-    name: network.name_long,
+    name: network.currencyNameLong,
     symbol: network.name,
   });
   const rawAmount: string | null = args.amount ?? null;
diff --git a/packages/extension/src/providers/polkadot/ui/custom-views/mappings/substrate.ts b/packages/extension/src/providers/polkadot/ui/custom-views/mappings/substrate.ts
index 9e060cf8d..89670a10d 100644
--- a/packages/extension/src/providers/polkadot/ui/custom-views/mappings/substrate.ts
+++ b/packages/extension/src/providers/polkadot/ui/custom-views/mappings/substrate.ts
@@ -5,7 +5,7 @@ import { polkadotEncodeAddress } from "@enkryptcom/utils";
 export const nativeTransfer = (network: SubstrateNetwork, data: any) => {
   const to = polkadotEncodeAddress(data.dest["Id"], network.prefix);
   const token = new SubstrateNativeToken({
-    name: network.name_long,
+    name: network.currencyNameLong,
     symbol: network.name,
     coingeckoID: network.coingeckoID,
     decimals: network.decimals,
diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
index 16b4d0476..515c0f005 100644
--- a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
@@ -95,6 +95,7 @@
 <script setup lang="ts">
 import { computed, onMounted, PropType, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
+import { debounce } from "lodash";
 import CloseIcon from "@action/icons/common/close-icon.vue";
 import SendAddressInput from "./components/send-address-input.vue";
 import SendContactsList from "./components/send-contacts-list.vue";
@@ -124,6 +125,7 @@ import getUiPath from "@/libs/utils/get-ui-path";
 import { ProviderName } from "@/types/provider";
 import PublicKeyRing from "@/libs/keyring/public-keyring";
 import { polkadotEncodeAddress } from "@enkryptcom/utils";
+import { GenericNameResolver, CoinType } from "@/libs/name-resolver";
 
 const props = defineProps({
   network: {
@@ -138,6 +140,7 @@ const props = defineProps({
 
 const route = useRoute();
 const router = useRouter();
+const nameResolver = new GenericNameResolver();
 
 const addressInputTo = ref();
 const addressInputFrom = ref();
@@ -309,6 +312,16 @@ const inputAddressFrom = (text: string) => {
 };
 
 const inputAddressTo = (text: string) => {
+  const debounceResolve = debounce(() => {
+    nameResolver
+      .resolveName(text, [props.network.name as CoinType, "DOT", "KSM"])
+      .then((resolved) => {
+        if (resolved) {
+          addressTo.value = resolved;
+        }
+      });
+  }, 500);
+  debounceResolve();
   addressTo.value = text;
 };
 
diff --git a/packages/extension/src/providers/swap/types/ChangellySwapProvider.ts b/packages/extension/src/providers/swap/types/ChangellySwapProvider.ts
index cdfc11920..e35bb08cb 100644
--- a/packages/extension/src/providers/swap/types/ChangellySwapProvider.ts
+++ b/packages/extension/src/providers/swap/types/ChangellySwapProvider.ts
@@ -12,7 +12,7 @@ import {
   TransactionInfo,
 } from "./SwapProvider";
 import { toBase } from "@/libs/utils/units";
-import { numberToHex, toBN } from "web3-utils";
+import { toBN } from "web3-utils";
 import { BaseNetwork } from "@/types/base-network";
 import { EnkryptAccount, NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork } from "@/providers/ethereum/types/evm-network";
@@ -32,6 +32,7 @@ import ActivityState from "@/libs/activity-state";
 import { Activity, ActivityStatus, ActivityType } from "@/types/activity";
 import { ChangellyToken, ChangellyTokenOptions } from "./changelly-token";
 import BigNumber from "bignumber.js";
+import broadcastTx from "@/providers/ethereum/libs/tx-broadcaster";
 
 const CHANGELLY_TOKEN_INFO = [
   {
@@ -700,7 +701,7 @@ export class ChangellySwapProvider extends SwapProvider {
           to: to as `0x${string}`,
           data,
           value,
-          chainId: numberToHex((network as EvmNetwork).chainID) as `0x{string}`,
+          chainId: (network as EvmNetwork).chainID,
         },
         web3
       );
@@ -728,12 +729,9 @@ export class ChangellySwapProvider extends SwapProvider {
             account: fromAccount,
             network: network,
             payload: finalizedTx,
-          }).then((signedTx) =>
-            web3
-              .sendSignedTransaction(
-                `0x${signedTx.serialize().toString("hex")}`
-              )
-              .on("transactionHash", (hash: string) => {
+          }).then((signedTx) => {
+            return new Promise((resolve) => {
+              const onHash = (hash: string) => {
                 console.log(hash);
                 activityState.addActivities(
                   [
@@ -744,9 +742,22 @@ export class ChangellySwapProvider extends SwapProvider {
                   ],
                   { address: fromAccount.address, network: network.name }
                 );
-              })
-              .then((receipt) => [receipt.transactionHash] as `0x${string}`[])
-          )
+                resolve([hash] as `0x${string}`[]);
+              };
+              broadcastTx(
+                `0x${signedTx.serialize().toString("hex")}`,
+                network.name
+              )
+                .then(onHash)
+                .catch(() => {
+                  web3
+                    .sendSignedTransaction(
+                      `0x${signedTx.serialize().toString("hex")}`
+                    )
+                    .on("transactionHash", onHash);
+                });
+            });
+          })
         );
     }
   }
diff --git a/packages/extension/src/providers/swap/types/EvmSwapProvider.ts b/packages/extension/src/providers/swap/types/EvmSwapProvider.ts
index 9cee2b9d3..414bab5c6 100644
--- a/packages/extension/src/providers/swap/types/EvmSwapProvider.ts
+++ b/packages/extension/src/providers/swap/types/EvmSwapProvider.ts
@@ -6,6 +6,7 @@ import API from "@/providers/ethereum/libs/api";
 import { NATIVE_TOKEN_ADDRESS } from "@/providers/ethereum/libs/common";
 import Transaction from "@/providers/ethereum/libs/transaction";
 import { GasPriceTypes } from "@/providers/ethereum/libs/transaction/types";
+import broadcastTx from "@/providers/ethereum/libs/tx-broadcaster";
 import { Erc20Token } from "@/providers/ethereum/types/erc20-token";
 import { EvmNetwork } from "@/providers/ethereum/types/evm-network";
 import { TransactionSigner } from "@/providers/ethereum/ui/libs/signer";
@@ -14,7 +15,7 @@ import { BaseToken } from "@/types/base-token";
 import { EnkryptAccount, NetworkNames } from "@enkryptcom/types";
 import BigNumber from "bignumber.js";
 import Web3Eth from "web3-eth";
-import { isAddress, numberToHex, toBN } from "web3-utils";
+import { isAddress, toBN } from "web3-utils";
 import {
   Quote,
   QuoteInfo,
@@ -388,7 +389,7 @@ export class EvmSwapProvider extends SwapProvider {
               data,
               value,
               gas,
-              chainId: numberToHex(network.chainID) as `0x{string}`,
+              chainId: network.chainID,
               nonce: `0x${toBN(nonce)
                 .addn(index)
                 .toString("hex")}` as `0x${string}`,
@@ -408,12 +409,9 @@ export class EvmSwapProvider extends SwapProvider {
               account: fromAccount,
               network: network,
               payload: finalizedTx,
-            }).then((signedTx) =>
-              web3
-                .sendSignedTransaction(
-                  `0x${signedTx.serialize().toString("hex")}`
-                )
-                .on("transactionHash", (hash: string) => {
+            }).then((signedTx) => {
+              return new Promise((resolve: (h: `0x${string}`) => void) => {
+                const onHash = (hash: string) => {
                   if (activity) {
                     activityState.addActivities(
                       [
@@ -425,10 +423,22 @@ export class EvmSwapProvider extends SwapProvider {
                       { address: fromAccount.address, network: network.name }
                     );
                   }
-                  console.log("hash", hash);
-                })
-                .then((receipt) => receipt.transactionHash as `0x${string}`)
-            )
+                  resolve(hash as `0x${string}`);
+                };
+                broadcastTx(
+                  `0x${signedTx.serialize().toString("hex")}`,
+                  network.name
+                )
+                  .then(onHash)
+                  .catch(() => {
+                    web3
+                      .sendSignedTransaction(
+                        `0x${signedTx.serialize().toString("hex")}`
+                      )
+                      .on("transactionHash", onHash);
+                  });
+              });
+            })
           )
       );
 
diff --git a/packages/extension/src/types/base-network.ts b/packages/extension/src/types/base-network.ts
index 0258aa43d..510f8adb2 100644
--- a/packages/extension/src/types/base-network.ts
+++ b/packages/extension/src/types/base-network.ts
@@ -14,6 +14,7 @@ export interface BaseNetworkOptions {
   blockExplorerAddr: string;
   isTestNetwork: boolean;
   currencyName: string;
+  currencyNameLong: string;
   icon: string;
   decimals: number;
   signer: SignerType[];
@@ -37,6 +38,7 @@ export abstract class BaseNetwork {
   public blockExplorerAddr: string;
   public isTestNetwork: boolean;
   public currencyName: string;
+  public currencyNameLong: string;
   public icon: string;
   public signer: SignerType[];
   public gradient: string;
@@ -72,6 +74,7 @@ export abstract class BaseNetwork {
     this.api = options.api;
     this.customTokens = options.customTokens ?? false;
     this.coingeckoPlatform = options.coingeckoPlatform;
+    this.currencyNameLong = options.currencyNameLong;
   }
 
   public abstract getAllTokens(address: string): Promise<BaseToken[]>;
diff --git a/packages/extension/src/ui/action/views/swap-best-offer/index.vue b/packages/extension/src/ui/action/views/swap-best-offer/index.vue
index c17d86bd5..9ae7f43ca 100644
--- a/packages/extension/src/ui/action/views/swap-best-offer/index.vue
+++ b/packages/extension/src/ui/action/views/swap-best-offer/index.vue
@@ -110,7 +110,7 @@ import { BaseToken } from "@/types/base-token";
 import { Swap } from "@/providers/swap";
 import { BaseNetwork } from "@/types/base-network";
 import { AccountsHeaderData } from "../../types/account";
-import { numberToHex, toBN } from "web3-utils";
+import { toBN } from "web3-utils";
 import BN from "bn.js";
 import Web3Eth from "web3-eth";
 import Transaction from "@/providers/ethereum/libs/transaction";
@@ -252,9 +252,7 @@ const Tx = computed(() => {
           to: txData.to as `0x${string}`,
           from: txData.from as `0x${string}`,
           data: txData.data,
-          chainId: numberToHex(
-            (props.network as EvmNetwork).chainID
-          ) as `0x${string}`,
+          chainId: (props.network as EvmNetwork).chainID,
           value: txData.value,
           gas: txData.gas,
         },
diff --git a/packages/name-resolution/.editorconfig b/packages/name-resolution/.editorconfig
new file mode 100644
index 000000000..aa7d67e49
--- /dev/null
+++ b/packages/name-resolution/.editorconfig
@@ -0,0 +1,10 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+
+[*.sh]
+indent_size = 4
\ No newline at end of file
diff --git a/packages/name-resolution/.eslintignore b/packages/name-resolution/.eslintignore
new file mode 100644
index 000000000..4ebc8aea5
--- /dev/null
+++ b/packages/name-resolution/.eslintignore
@@ -0,0 +1 @@
+coverage
diff --git a/packages/name-resolution/.eslintrc.json b/packages/name-resolution/.eslintrc.json
new file mode 100644
index 000000000..d33f3e9e9
--- /dev/null
+++ b/packages/name-resolution/.eslintrc.json
@@ -0,0 +1,66 @@
+{
+  "extends": [
+    "airbnb-base",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "plugin:import/typescript",
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
+  ],
+  "plugins": ["@typescript-eslint"],
+  "root": true,
+  "globals": {},
+  "rules": {
+    "@typescript-eslint/no-var-requires": "off",
+    "no-multi-assign": "off",
+    "no-param-reassign": "off",
+    "no-underscore-dangle": "off",
+    "no-continue": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "no-console": "off",
+    "no-plusplus": "off",
+    "import/extensions": [
+      "error",
+      "ignorePackages",
+      {
+        "js": "never",
+        "jsx": "never",
+        "ts": "never",
+        "tsx": "never"
+      }
+    ],
+    "import/no-unresolved": [
+      2,
+      {
+        "commonjs": true,
+        "amd": true
+      }
+    ],
+    "import/prefer-default-export": "off",
+    "max-len": [
+      "error",
+      {
+        "code": 150,
+        "ignoreComments": true,
+        "ignoreTrailingComments": true,
+        "ignoreUrls": true,
+        "ignoreStrings": true,
+        "ignoreTemplateLiterals": true
+      }
+    ]
+  },
+  "parser": "@typescript-eslint/parser",
+  "env": {},
+  "overrides": [],
+  "settings": {
+    "import/resolver": {
+      "alias": {
+        "map": [
+          ["@src", "./src"],
+          ["@tests", "./tests"]
+        ],
+        "extensions": [".ts", ".js"]
+      }
+    }
+  }
+}
diff --git a/packages/name-resolution/.gitignore b/packages/name-resolution/.gitignore
new file mode 100644
index 000000000..f512ba0ff
--- /dev/null
+++ b/packages/name-resolution/.gitignore
@@ -0,0 +1,107 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+dist
+*.log
\ No newline at end of file
diff --git a/packages/name-resolution/.nvmrc b/packages/name-resolution/.nvmrc
new file mode 100644
index 000000000..7480d3c85
--- /dev/null
+++ b/packages/name-resolution/.nvmrc
@@ -0,0 +1 @@
+lts/fermium
\ No newline at end of file
diff --git a/packages/name-resolution/LICENSE b/packages/name-resolution/LICENSE
new file mode 100644
index 000000000..0c437d9d2
--- /dev/null
+++ b/packages/name-resolution/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2022 kvhnuke <10602065+kvhnuke@users.noreply.github.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/packages/name-resolution/README.md b/packages/name-resolution/README.md
new file mode 100644
index 000000000..5b0ee17c2
--- /dev/null
+++ b/packages/name-resolution/README.md
@@ -0,0 +1,2 @@
+# name resolution
+## name resolution module for enkrypt
\ No newline at end of file
diff --git a/packages/name-resolution/package.json b/packages/name-resolution/package.json
new file mode 100644
index 000000000..fcf3fea2d
--- /dev/null
+++ b/packages/name-resolution/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "@enkryptcom/name-resolution",
+  "version": "0.0.1",
+  "description": "name resolution module for enkrypt",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsup src/index.ts --format esm,cjs --dts",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
+    "test": "ts-mocha -p tsconfig.json tests/**/*.test.ts"
+  },
+  "engines": {
+    "node": ">=14.15.0"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.3",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^18.7.18",
+    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@typescript-eslint/parser": "^5.38.0",
+    "chai": "^4.3.6",
+    "eslint": "^8.23.1",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-module-resolver": "^1.5.0",
+    "mocha": "^10.0.0",
+    "prettier": "^2.7.1",
+    "ts-mocha": "^10.0.0",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.1.0",
+    "tsup": "^6.2.3",
+    "typescript": "^4.8.3",
+    "typescript-eslint": "0.0.1-alpha.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/<FILL_IT>"
+  },
+  "keywords": [],
+  "author": "kvhnuke",
+  "license": "MIT",
+  "dependencies": {
+    "@ensdomains/address-encoder": "^0.2.18",
+    "@unstoppabledomains/resolution": "^8.3.3",
+    "ethers": "^5.7.1"
+  }
+}
diff --git a/packages/name-resolution/src/ens/index.ts b/packages/name-resolution/src/ens/index.ts
new file mode 100644
index 000000000..78e0b567f
--- /dev/null
+++ b/packages/name-resolution/src/ens/index.ts
@@ -0,0 +1,51 @@
+import { ethers } from "ethers";
+import { formatsByName } from "@ensdomains/address-encoder";
+import { BaseResolver, CoinType } from "../types";
+import { ENSOptions } from "./types";
+import { getTLD } from "../utils";
+
+class ENSResolver implements BaseResolver {
+  options: ENSOptions;
+
+  name: string;
+
+  ENSProvider: ethers.providers.JsonRpcProvider;
+
+  constructor(options: ENSOptions) {
+    this.options = options;
+    this.name = "ens";
+  }
+
+  public async init(): Promise<void> {
+    this.ENSProvider = new ethers.providers.JsonRpcProvider(this.options.node);
+  }
+
+  public async resolveReverseName(address: string): Promise<string | null> {
+    const nameAddress = await this.ENSProvider.lookupAddress(address);
+    if (nameAddress) return nameAddress;
+    return null;
+  }
+
+  public async resolveAddress(
+    name: string,
+    coin: CoinType = "ETH"
+  ): Promise<string | null> {
+    const resolver = await this.ENSProvider.getResolver(name);
+    if (resolver) {
+      return resolver
+        .getAddress(formatsByName[coin].coinType)
+        .then((address) => {
+          if (address) return address;
+          return null;
+        });
+    }
+    return null;
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  public isSupportedName(name: string): boolean {
+    return getTLD(name).length > 2;
+  }
+}
+
+export default ENSResolver;
diff --git a/packages/name-resolution/src/ens/types.ts b/packages/name-resolution/src/ens/types.ts
new file mode 100644
index 000000000..5140f6db2
--- /dev/null
+++ b/packages/name-resolution/src/ens/types.ts
@@ -0,0 +1,3 @@
+export interface ENSOptions {
+  node: string;
+}
diff --git a/packages/name-resolution/src/index.ts b/packages/name-resolution/src/index.ts
new file mode 100644
index 000000000..ca643f288
--- /dev/null
+++ b/packages/name-resolution/src/index.ts
@@ -0,0 +1,47 @@
+import ENSResolver from "./ens";
+import { CoinType, NameResolverOptions } from "./types";
+import UDResolver from "./ud";
+
+class NameResolver {
+  ens: ENSResolver;
+
+  ud: UDResolver;
+
+  initDone: Promise<void[]>;
+
+  constructor(options: NameResolverOptions) {
+    this.ens = new ENSResolver(options.ens);
+    this.ud = new UDResolver();
+    this.initDone = Promise.all([this.ens.init(), this.ud.init()]);
+  }
+
+  public async resolveReverseName(address: string): Promise<string | null> {
+    return this.initDone.then(() =>
+      Promise.all([
+        this.ens.resolveReverseName(address),
+        this.ud.resolveReverseName(address),
+      ]).then((results) => {
+        // eslint-disable-next-line no-restricted-syntax
+        for (const name of results) {
+          if (name !== null) return name;
+        }
+        return null;
+      })
+    );
+  }
+
+  public async resolveAddress(
+    name: string,
+    coin: CoinType = "ETH"
+  ): Promise<string | null> {
+    return this.initDone.then(() => {
+      if (this.ud.isSupportedName(name))
+        return this.ud.resolveAddress(name, coin);
+      if (this.ens.isSupportedName(name))
+        return this.ens.resolveAddress(name, coin);
+      return null;
+    });
+  }
+}
+export { ENSResolver, UDResolver, CoinType };
+export default NameResolver;
diff --git a/packages/name-resolution/src/types.ts b/packages/name-resolution/src/types.ts
new file mode 100644
index 000000000..a5b8193fa
--- /dev/null
+++ b/packages/name-resolution/src/types.ts
@@ -0,0 +1,158 @@
+import { ENSOptions } from "./ens/types";
+
+export type CoinType =
+  | "BTC"
+  | "LTC"
+  | "DOGE"
+  | "RDD"
+  | "DASH"
+  | "PPC"
+  | "NMC"
+  | "VIA"
+  | "GRS"
+  | "DGB"
+  | "MONA"
+  | "DCR"
+  | "XEM"
+  | "AIB"
+  | "SYS"
+  | "ETH"
+  | "ETC_LEGACY"
+  | "ICX"
+  | "XVG"
+  | "STRAT"
+  | "ARK"
+  | "ATOM"
+  | "ZIL"
+  | "EGLD"
+  | "ZEN"
+  | "XMR"
+  | "ZEC"
+  | "LSK"
+  | "STEEM"
+  | "FIRO"
+  | "RSK"
+  | "KMD"
+  | "XRP"
+  | "BCH"
+  | "XLM"
+  | "BTM"
+  | "BTG"
+  | "NANO"
+  | "RVN"
+  | "POA_LEGACY"
+  | "LCC"
+  | "EOS"
+  | "TRX"
+  | "BCN"
+  | "FIO"
+  | "BSV"
+  | "NEO"
+  | "NIM"
+  | "EWT_LEGACY"
+  | "ALGO"
+  | "IOST"
+  | "DIVI"
+  | "IOTX"
+  | "BTS"
+  | "CKB"
+  | "MRX"
+  | "LUNA"
+  | "DOT"
+  | "VSYS"
+  | "ABBC"
+  | "NEAR"
+  | "ETN"
+  | "AION"
+  | "KSM"
+  | "AE"
+  | "KAVA"
+  | "FIL"
+  | "AR"
+  | "CCA"
+  | "THETA_LEGACY"
+  | "SOL"
+  | "XHV"
+  | "FLOW"
+  | "IRIS"
+  | "LRG"
+  | "SERO"
+  | "BDX"
+  | "CCXX"
+  | "SRM"
+  | "VLX"
+  | "BPS"
+  | "TFUEL"
+  | "GRIN"
+  | "XDAI_LEGACY"
+  | "VET"
+  | "BNB"
+  | "CLO_LEGACY"
+  | "HIVE"
+  | "TOMO_LEGACY"
+  | "HNT"
+  | "RUNE"
+  | "BCD"
+  | "TT_LEGACY"
+  | "FTM_LEGACY"
+  | "ONE"
+  | "ONT"
+  | "XTZ"
+  | "ADA"
+  | "SC"
+  | "QTUM"
+  | "GXC"
+  | "ELA"
+  | "NAS"
+  | "HBAR"
+  | "IOTA"
+  | "HNS"
+  | "STX"
+  | "GO_LEGACY"
+  | "XCH"
+  | "NULS"
+  | "AVAX"
+  | "NRG_LEGACY"
+  | "ARDR"
+  | "ZEL"
+  | "CELO_LEGACY"
+  | "WICC"
+  | "WAN"
+  | "WAVES"
+  | "OP"
+  | "CRO"
+  | "BSC"
+  | "GO"
+  | "ETC"
+  | "TOMO"
+  | "POA"
+  | "XDAI"
+  | "TT"
+  | "MATIC"
+  | "EWT"
+  | "FTM"
+  | "THETA"
+  | "CLO"
+  | "NRG"
+  | "ARB1"
+  | "CELO"
+  | "AVAXC";
+
+export abstract class BaseResolver {
+  name: string;
+
+  public abstract init(): Promise<void>;
+
+  public abstract resolveAddress(
+    name: string,
+    coint: CoinType
+  ): Promise<string | null>;
+
+  public abstract resolveReverseName(address: string): Promise<string | null>;
+
+  public abstract isSupportedName(name: string): boolean;
+}
+
+export interface NameResolverOptions {
+  ens: ENSOptions;
+}
diff --git a/packages/name-resolution/src/ud/index.ts b/packages/name-resolution/src/ud/index.ts
new file mode 100644
index 000000000..93adfc123
--- /dev/null
+++ b/packages/name-resolution/src/ud/index.ts
@@ -0,0 +1,50 @@
+import { Resolution } from "@unstoppabledomains/resolution";
+import { BaseResolver, CoinType } from "../types";
+import { getTLD } from "../utils";
+
+class UDResolver implements BaseResolver {
+  UDProvider: Resolution;
+
+  name: string;
+
+  supportedTLDs = [
+    "blockchain",
+    "bitcoin",
+    "crypto",
+    "nft",
+    "wallet",
+    "x",
+    "dao",
+    "888",
+    "zil",
+  ];
+
+  constructor() {
+    this.UDProvider = new Resolution();
+    this.name = "ud";
+  }
+
+  // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-empty-function
+  public async init(): Promise<void> {}
+
+  public async resolveReverseName(address: string): Promise<string | null> {
+    return this.UDProvider.reverse(address)
+      .then((name) => name)
+      .catch(() => null);
+  }
+
+  public async resolveAddress(
+    name: string,
+    coin: CoinType = "ETH"
+  ): Promise<string | null> {
+    return this.UDProvider.addr(name, coin)
+      .then((address) => address)
+      .catch(() => null);
+  }
+
+  public isSupportedName(name: string): boolean {
+    return this.supportedTLDs.includes(getTLD(name));
+  }
+}
+
+export default UDResolver;
diff --git a/packages/name-resolution/src/utils.ts b/packages/name-resolution/src/utils.ts
new file mode 100644
index 000000000..d8e433b06
--- /dev/null
+++ b/packages/name-resolution/src/utils.ts
@@ -0,0 +1,5 @@
+export const getTLD = (name: string): string => {
+  const labels = name.split(".");
+  if (labels.length < 2) return "";
+  return labels[labels.length - 1];
+};
diff --git a/packages/name-resolution/tests/ens.test.ts b/packages/name-resolution/tests/ens.test.ts
new file mode 100644
index 000000000..2911fcee3
--- /dev/null
+++ b/packages/name-resolution/tests/ens.test.ts
@@ -0,0 +1,40 @@
+import { expect } from "chai";
+import ENSResolver from "../src/ens";
+
+describe("ENS Name resolving", () => {
+  // the tests container
+  it("it should properly resolve address", async () => {
+    const resolver = new ENSResolver({
+      node: "https://nodes.mewapi.io/rpc/eth",
+    });
+    await resolver.init();
+    let address = await resolver.resolveAddress("test.eth", "ETH");
+    expect(address).to.be.eq("0xeefB13C7D42eFCc655E528dA6d6F7bBcf9A2251d");
+    address = await resolver.resolveAddress("1.offchainexample.eth", "ETH");
+    expect(address).to.be.eq("0x41563129cDbbD0c5D3e1c86cf9563926b243834d");
+  }).timeout(10000);
+
+  it("it should properly reverse resolve", async () => {
+    const resolver = new ENSResolver({
+      node: "https://nodes.mewapi.io/rpc/eth",
+    });
+    await resolver.init();
+    const name = await resolver.resolveReverseName(
+      "0xe5dc07bdcdb8c98850050c7f67de7e164b1ea391"
+    );
+    expect(name).to.be.eq("kvhnuke.eth");
+  }).timeout(10000);
+
+  it("it should return null if not found", async () => {
+    const resolver = new ENSResolver({
+      node: "https://nodes.mewapi.io/rpc/eth",
+    });
+    await resolver.init();
+    const name = await resolver.resolveReverseName(
+      "0xe5dc07bdcdb8c98850050c7f67de7e164b1ea392"
+    );
+    expect(name).to.be.eq(null);
+    const address = await resolver.resolveAddress("sdfsfsdfsdfsdf.eth", "ETH");
+    expect(address).to.be.eq(null);
+  }).timeout(10000);
+});
diff --git a/packages/name-resolution/tests/resolver.test.ts b/packages/name-resolution/tests/resolver.test.ts
new file mode 100644
index 000000000..4d3c6056a
--- /dev/null
+++ b/packages/name-resolution/tests/resolver.test.ts
@@ -0,0 +1,29 @@
+import { expect } from "chai";
+import NameResolver from "../src";
+
+describe("Name Resolver resolving", () => {
+  // the tests container
+  it("it should properly resolve address", async () => {
+    const resolver = new NameResolver({
+      ens: {
+        node: "https://nodes.mewapi.io/rpc/eth",
+      },
+    });
+    let address = await resolver.resolveAddress("test.eth", "ETH");
+    expect(address).to.be.eq("0xeefB13C7D42eFCc655E528dA6d6F7bBcf9A2251d");
+    address = await resolver.resolveAddress("brad.crypto", "ETH");
+    expect(address).to.be.eq("0x8aaD44321A86b170879d7A244c1e8d360c99DdA8");
+  }).timeout(10000);
+
+  it("it should properly reverse resolve", async () => {
+    const resolver = new NameResolver({
+      ens: {
+        node: "https://nodes.mewapi.io/rpc/eth",
+      },
+    });
+    const name = await resolver.resolveReverseName(
+      "0xe5dc07bdcdb8c98850050c7f67de7e164b1ea391"
+    );
+    expect(name).to.be.eq("kvhnuke.eth");
+  }).timeout(10000);
+});
diff --git a/packages/name-resolution/tests/ud.test.ts b/packages/name-resolution/tests/ud.test.ts
new file mode 100644
index 000000000..7926c594b
--- /dev/null
+++ b/packages/name-resolution/tests/ud.test.ts
@@ -0,0 +1,37 @@
+import { expect } from "chai";
+import UDResolver from "../src/ud";
+
+describe("UD Name resolving", () => {
+  // the tests container
+  it("it should properly resolve address", async () => {
+    const resolver = new UDResolver();
+    await resolver.init();
+    let address = await resolver.resolveAddress("brad.crypto", "ETH");
+    expect(address).to.be.eq("0x8aaD44321A86b170879d7A244c1e8d360c99DdA8");
+    address = await resolver.resolveAddress("brad.zil", "ETH");
+    expect(address).to.be.eq("0x45b31e01AA6f42F0549aD482BE81635ED3149abb");
+  }).timeout(10000);
+
+  //   it("it should properly reverse resolve", async () => {
+  //     const resolver = new UDResolver();
+  //     await resolver.init();
+  //     const name = await resolver.resolveReverseName(
+  //       "0xe5dc07bdcdb8c98850050c7f67de7e164b1ea391"
+  //     );
+  //     expect(name).to.be.eq("kvhnuke.eth");
+  //   }).timeout(10000);
+
+  it("it should return null if not found", async () => {
+    const resolver = new UDResolver();
+    await resolver.init();
+    const name = await resolver.resolveReverseName(
+      "0xe5dc07bdcdb8c98850050c7f67de7e164b1ea392"
+    );
+    expect(name).to.be.eq(null);
+    const address = await resolver.resolveAddress(
+      "sdfsfsdfsdfsdf.crypto",
+      "ETH"
+    );
+    expect(address).to.be.eq(null);
+  }).timeout(10000);
+});
diff --git a/packages/name-resolution/tsconfig.json b/packages/name-resolution/tsconfig.json
new file mode 100644
index 000000000..6da8e1f23
--- /dev/null
+++ b/packages/name-resolution/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "extends": "./tsconfig.paths.json",
+  "compilerOptions": {
+    "lib": ["ESNext", "dom"],
+    "moduleResolution": "node",
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "removeComments": true,
+    "sourceMap": true,
+    "target": "es5",
+    "module": "commonjs",
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "declaration": true
+  },
+  "include": ["src/**/*.ts", "tests/**/*.ts"],
+  "exclude": [
+    "node_modules/**/*",
+    "_warmup/**/*",
+    ".vscode/**/*",
+    "tests/**/*"
+  ],
+  "ts-node": {
+    "require": ["tsconfig-paths/register"],
+    "files": true
+  }
+}
diff --git a/packages/name-resolution/tsconfig.paths.json b/packages/name-resolution/tsconfig.paths.json
new file mode 100644
index 000000000..6451834c2
--- /dev/null
+++ b/packages/name-resolution/tsconfig.paths.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@src/*": ["src/*"]
+    }
+  }
+}
diff --git a/packages/types/src/networks.ts b/packages/types/src/networks.ts
index 370de2fc7..2c144ccd5 100644
--- a/packages/types/src/networks.ts
+++ b/packages/types/src/networks.ts
@@ -20,6 +20,10 @@ export enum NetworkNames {
   Shiden = "SDN",
   ShidenEVM = "SDN EVM",
   AstarEVM = "ASTR EVM",
+  Optimism = "OP",
+  Canto = "CANTO",
+  Bifrost = "BNC",
+  BifrostKusama = "BNC (Kusama)",
 }
 
 export enum CoingeckoPlatform {
@@ -37,4 +41,7 @@ export enum CoingeckoPlatform {
   Okc = "okc",
   Astar = "astar",
   Shiden = "shiden network",
+  Optimism = "optimistic-ethereum",
+  Canto = "canto",
+  Bifrost = "Bifrost Native Coin",
 }
diff --git a/yarn.lock b/yarn.lock
index 85e9e7efb..fb8984d2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2558,6 +2558,36 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@enkryptcom/name-resolution@workspace:packages/name-resolution":
+  version: 0.0.0-use.local
+  resolution: "@enkryptcom/name-resolution@workspace:packages/name-resolution"
+  dependencies:
+    "@ensdomains/address-encoder": ^0.2.18
+    "@types/chai": ^4.3.3
+    "@types/mocha": ^9.1.1
+    "@types/node": ^18.7.18
+    "@typescript-eslint/eslint-plugin": ^5.38.0
+    "@typescript-eslint/parser": ^5.38.0
+    "@unstoppabledomains/resolution": ^8.3.3
+    chai: ^4.3.6
+    eslint: ^8.23.1
+    eslint-config-airbnb-base: ^15.0.0
+    eslint-config-prettier: ^8.5.0
+    eslint-import-resolver-alias: ^1.1.2
+    eslint-plugin-import: ^2.26.0
+    eslint-plugin-module-resolver: ^1.5.0
+    ethers: ^5.7.1
+    mocha: ^10.0.0
+    prettier: ^2.7.1
+    ts-mocha: ^10.0.0
+    ts-node: ^10.9.1
+    tsconfig-paths: ^4.1.0
+    tsup: ^6.2.3
+    typescript: ^4.8.3
+    typescript-eslint: 0.0.1-alpha.0
+  languageName: unknown
+  linkType: soft
+
 "@enkryptcom/request@^0.0.1, @enkryptcom/request@workspace:packages/request":
   version: 0.0.0-use.local
   resolution: "@enkryptcom/request@workspace:packages/request"
@@ -2748,6 +2778,25 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@ensdomains/address-encoder@npm:^0.2.18":
+  version: 0.2.18
+  resolution: "@ensdomains/address-encoder@npm:0.2.18"
+  dependencies:
+    bech32: ^2.0.0
+    blakejs: ^1.1.0
+    bn.js: ^4.11.8
+    bs58: ^4.0.1
+    crypto-addr-codec: ^0.1.7
+    js-crc: ^0.2.0
+    js-sha256: ^0.9.0
+    js-sha512: ^0.8.0
+    nano-base32: ^1.0.1
+    ripemd160: ^2.0.2
+    sha3: ^2.1.3
+  checksum: 79f6962b40c8aadd262c21038b4b6b9fbf66e95438d1bf6eedbd99f6125aed1203bc00132382b25cb1a985e4e504971fbccd32e49096a41b8875ee4e906d6411
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-loong64@npm:0.15.7":
   version: 0.15.7
   resolution: "@esbuild/linux-loong64@npm:0.15.7"
@@ -2870,6 +2919,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.0.1, @ethersproject/abi@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/abi@npm:5.7.0"
+  dependencies:
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: bc6962bb6cb854e4d2a4d65b2c49c716477675b131b1363312234bdbb7e19badb7d9ce66f4ca2a70ae2ea84f7123dbc4e300a1bfe5d58864a7eafabc1466627e
+  languageName: node
+  linkType: hard
+
 "@ethersproject/abi@npm:^5.5.0":
   version: 5.6.3
   resolution: "@ethersproject/abi@npm:5.6.3"
@@ -2904,6 +2970,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/abstract-provider@npm:5.7.0, @ethersproject/abstract-provider@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/abstract-provider@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/networks": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/web": ^5.7.0
+  checksum: 74cf4696245cf03bb7cc5b6cbf7b4b89dd9a79a1c4688126d214153a938126d4972d42c93182198653ce1de35f2a2cad68be40337d4774b3698a39b28f0228a8
+  languageName: node
+  linkType: hard
+
 "@ethersproject/abstract-provider@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/abstract-provider@npm:5.6.0"
@@ -2934,6 +3015,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/abstract-signer@npm:5.7.0, @ethersproject/abstract-signer@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/abstract-signer@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+  checksum: a823dac9cfb761e009851050ebebd5b229d1b1cc4a75b125c2da130ff37e8218208f7f9d1386f77407705b889b23d4a230ad67185f8872f083143e0073cbfbe3
+  languageName: node
+  linkType: hard
+
 "@ethersproject/abstract-signer@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/abstract-signer@npm:5.6.0"
@@ -2960,6 +3054,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/address@npm:5.7.0, @ethersproject/address@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/address@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/rlp": ^5.7.0
+  checksum: 64ea5ebea9cc0e845c413e6cb1e54e157dd9fc0dffb98e239d3a3efc8177f2ff798cd4e3206cf3660ee8faeb7bef1a47dc0ebef0d7b132c32e61e550c7d4c843
+  languageName: node
+  linkType: hard
+
 "@ethersproject/address@npm:^5.0.4, @ethersproject/address@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/address@npm:5.6.0"
@@ -2986,6 +3093,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/base64@npm:5.7.0, @ethersproject/base64@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/base64@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+  checksum: 7dd5d734d623582f08f665434f53685041a3d3b334a0e96c0c8afa8bbcaab934d50e5b6b980e826a8fde8d353e0b18f11e61faf17468177274b8e7c69cd9742b
+  languageName: node
+  linkType: hard
+
 "@ethersproject/base64@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/base64@npm:5.6.0"
@@ -3004,6 +3120,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/basex@npm:5.7.0, @ethersproject/basex@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/basex@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+  checksum: 326087b7e1f3787b5fe6cd1cf2b4b5abfafbc355a45e88e22e5e9d6c845b613ffc5301d629b28d5c4d5e2bfe9ec424e6782c804956dff79be05f0098cb5817de
+  languageName: node
+  linkType: hard
+
+"@ethersproject/bignumber@npm:5.7.0, @ethersproject/bignumber@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/bignumber@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    bn.js: ^5.2.1
+  checksum: 8c9a134b76f3feb4ec26a5a27379efb4e156b8fb2de0678a67788a91c7f4e30abe9d948638458e4b20f2e42380da0adacc7c9389d05fce070692edc6ae9b4904
+  languageName: node
+  linkType: hard
+
 "@ethersproject/bignumber@npm:^5.0.7, @ethersproject/bignumber@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/bignumber@npm:5.6.0"
@@ -3026,6 +3163,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/bytes@npm:5.7.0, @ethersproject/bytes@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/bytes@npm:5.7.0"
+  dependencies:
+    "@ethersproject/logger": ^5.7.0
+  checksum: 66ad365ceaab5da1b23b72225c71dce472cf37737af5118181fa8ab7447d696bea15ca22e3a0e8836fdd8cfac161afe321a7c67d0dde96f9f645ddd759676621
+  languageName: node
+  linkType: hard
+
 "@ethersproject/bytes@npm:^5.0.4, @ethersproject/bytes@npm:^5.6.0, @ethersproject/bytes@npm:^5.6.1":
   version: 5.6.1
   resolution: "@ethersproject/bytes@npm:5.6.1"
@@ -3035,6 +3181,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/constants@npm:5.7.0, @ethersproject/constants@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/constants@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+  checksum: 6d4b1355747cce837b3e76ec3bde70e4732736f23b04f196f706ebfa5d4d9c2be50904a390d4d40ce77803b98d03d16a9b6898418e04ba63491933ce08c4ba8a
+  languageName: node
+  linkType: hard
+
 "@ethersproject/constants@npm:^5.0.4, @ethersproject/constants@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/constants@npm:5.6.0"
@@ -3053,6 +3208,41 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/contracts@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/contracts@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abi": ^5.7.0
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+  checksum: 6ccf1121cba01b31e02f8c507cb971ab6bfed85706484a9ec09878ef1594a62215f43c4fdef8f4a4875b99c4a800bc95e3be69b1803f8ce479e07634b5a740c0
+  languageName: node
+  linkType: hard
+
+"@ethersproject/hash@npm:5.7.0, @ethersproject/hash@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/hash@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/base64": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 6e9fa8d14eb08171cd32f17f98cc108ec2aeca74a427655f0d689c550fee0b22a83b3b400fad7fb3f41cf14d4111f87f170aa7905bcbcd1173a55f21b06262ef
+  languageName: node
+  linkType: hard
+
 "@ethersproject/hash@npm:^5.0.4":
   version: 5.6.0
   resolution: "@ethersproject/hash@npm:5.6.0"
@@ -3085,6 +3275,57 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/hdnode@npm:5.7.0, @ethersproject/hdnode@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/hdnode@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/basex": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/pbkdf2": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+    "@ethersproject/signing-key": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/wordlists": ^5.7.0
+  checksum: bfe5ca2d89a42de73655f853170ef4766b933c5f481cddad709b3aca18823275b096e572f92d1602a052f80b426edde44ad6b9d028799775a7dad4a5bbed2133
+  languageName: node
+  linkType: hard
+
+"@ethersproject/json-wallets@npm:5.7.0, @ethersproject/json-wallets@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/json-wallets@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/hdnode": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/pbkdf2": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/random": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    aes-js: 3.0.0
+    scrypt-js: 3.0.1
+  checksum: f583458d22db62efaaf94d38dd243482776a45bf90f9f3882fbad5aa0b8fd288b41eb7c1ff8ec0b99c9b751088e43d6173530db64dd33c59f9d8daa8d7ad5aa2
+  languageName: node
+  linkType: hard
+
+"@ethersproject/keccak256@npm:5.7.0, @ethersproject/keccak256@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/keccak256@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    js-sha3: 0.8.0
+  checksum: ff70950d82203aab29ccda2553422cbac2e7a0c15c986bd20a69b13606ed8bb6e4fdd7b67b8d3b27d4f841e8222cbaccd33ed34be29f866fec7308f96ed244c6
+  languageName: node
+  linkType: hard
+
 "@ethersproject/keccak256@npm:^5.0.3, @ethersproject/keccak256@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/keccak256@npm:5.6.0"
@@ -3105,6 +3346,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/logger@npm:5.7.0, @ethersproject/logger@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/logger@npm:5.7.0"
+  checksum: 075ab2f605f1fd0813f2e39c3308f77b44a67732b36e712d9bc085f22a84aac4da4f71b39bee50fe78da3e1c812673fadc41180c9970fe5e486e91ea17befe0d
+  languageName: node
+  linkType: hard
+
 "@ethersproject/logger@npm:^5.0.5, @ethersproject/logger@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/logger@npm:5.6.0"
@@ -3112,6 +3360,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/networks@npm:5.7.1, @ethersproject/networks@npm:^5.7.0":
+  version: 5.7.1
+  resolution: "@ethersproject/networks@npm:5.7.1"
+  dependencies:
+    "@ethersproject/logger": ^5.7.0
+  checksum: 0339f312304c17d9a0adce550edb825d4d2c8c9468c1634c44172c67a9ed256f594da62c4cda5c3837a0f28b7fabc03aca9b492f68ff1fdad337ee861b27bd5d
+  languageName: node
+  linkType: hard
+
 "@ethersproject/networks@npm:^5.6.0":
   version: 5.6.2
   resolution: "@ethersproject/networks@npm:5.6.2"
@@ -3130,6 +3387,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/pbkdf2@npm:5.7.0, @ethersproject/pbkdf2@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/pbkdf2@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+  checksum: b895adb9e35a8a127e794f7aadc31a2424ef355a70e51cde10d457e3e888bb8102373199a540cf61f2d6b9a32e47358f9c65b47d559f42bf8e596b5fd67901e9
+  languageName: node
+  linkType: hard
+
+"@ethersproject/properties@npm:5.7.0, @ethersproject/properties@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/properties@npm:5.7.0"
+  dependencies:
+    "@ethersproject/logger": ^5.7.0
+  checksum: 6ab0ccf0c3aadc9221e0cdc5306ce6cd0df7f89f77d77bccdd1277182c9ead0202cd7521329ba3acde130820bf8af299e17cf567d0d497c736ee918207bbf59f
+  languageName: node
+  linkType: hard
+
 "@ethersproject/properties@npm:^5.0.3, @ethersproject/properties@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/properties@npm:5.6.0"
@@ -3139,6 +3415,54 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/providers@npm:5.7.1":
+  version: 5.7.1
+  resolution: "@ethersproject/providers@npm:5.7.1"
+  dependencies:
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/base64": ^5.7.0
+    "@ethersproject/basex": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/networks": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/random": ^5.7.0
+    "@ethersproject/rlp": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/web": ^5.7.0
+    bech32: 1.1.4
+    ws: 7.4.6
+  checksum: 673745e967e7215b46b7d3024f5ee02be975d6cf66b605f87a0e5beaa349d6d30c987165f98eceddaf7996f64a1ec414f0715f25fc3458aead6eea4c4820c399
+  languageName: node
+  linkType: hard
+
+"@ethersproject/random@npm:5.7.0, @ethersproject/random@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/random@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: 017829c91cff6c76470852855108115b0b52c611b6be817ed1948d56ba42d6677803ec2012aa5ae298a7660024156a64c11fcf544e235e239ab3f89f0fff7345
+  languageName: node
+  linkType: hard
+
+"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/rlp@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: bce165b0f7e68e4d091c9d3cf47b247cac33252df77a095ca4281d32d5eeaaa3695d9bc06b2b057c5015353a68df89f13a4a54a72e888e4beeabbe56b15dda6e
+  languageName: node
+  linkType: hard
+
 "@ethersproject/rlp@npm:^5.5.0, @ethersproject/rlp@npm:^5.6.1":
   version: 5.6.1
   resolution: "@ethersproject/rlp@npm:5.6.1"
@@ -3159,6 +3483,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/sha2@npm:5.7.0, @ethersproject/sha2@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/sha2@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    hash.js: 1.1.7
+  checksum: 09321057c022effbff4cc2d9b9558228690b5dd916329d75c4b1ffe32ba3d24b480a367a7cc92d0f0c0b1c896814d03351ae4630e2f1f7160be2bcfbde435dbc
+  languageName: node
+  linkType: hard
+
 "@ethersproject/sha2@npm:^5.5.0":
   version: 5.6.1
   resolution: "@ethersproject/sha2@npm:5.6.1"
@@ -3170,6 +3505,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/signing-key@npm:5.7.0, @ethersproject/signing-key@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/signing-key@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    bn.js: ^5.2.1
+    elliptic: 6.5.4
+    hash.js: 1.1.7
+  checksum: 8f8de09b0aac709683bbb49339bc0a4cd2f95598f3546436c65d6f3c3a847ffa98e06d35e9ed2b17d8030bd2f02db9b7bd2e11c5cf8a71aad4537487ab4cf03a
+  languageName: node
+  linkType: hard
+
 "@ethersproject/signing-key@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/signing-key@npm:5.6.0"
@@ -3198,6 +3547,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/solidity@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/solidity@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 9a02f37f801c96068c3e7721f83719d060175bc4e80439fe060e92bd7acfcb6ac1330c7e71c49f4c2535ca1308f2acdcb01e00133129aac00581724c2d6293f3
+  languageName: node
+  linkType: hard
+
+"@ethersproject/strings@npm:5.7.0, @ethersproject/strings@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/strings@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: 5ff78693ae3fdf3cf23e1f6dc047a61e44c8197d2408c42719fef8cb7b7b3613a4eec88ac0ed1f9f5558c74fe0de7ae3195a29ca91a239c74b9f444d8e8b50df
+  languageName: node
+  linkType: hard
+
 "@ethersproject/strings@npm:^5.0.4, @ethersproject/strings@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/strings@npm:5.6.0"
@@ -3220,6 +3594,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/transactions@npm:5.7.0, @ethersproject/transactions@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/transactions@npm:5.7.0"
+  dependencies:
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/rlp": ^5.7.0
+    "@ethersproject/signing-key": ^5.7.0
+  checksum: a31b71996d2b283f68486241bff0d3ea3f1ba0e8f1322a8fffc239ccc4f4a7eb2ea9994b8fd2f093283fd75f87bae68171e01b6265261f821369aca319884a79
+  languageName: node
+  linkType: hard
+
 "@ethersproject/transactions@npm:^5.0.0-beta.135, @ethersproject/transactions@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/transactions@npm:5.6.0"
@@ -3254,6 +3645,53 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/units@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/units@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: 304714f848cd32e57df31bf545f7ad35c2a72adae957198b28cbc62166daa929322a07bff6e9c9ac4577ab6aa0de0546b065ed1b2d20b19e25748b7d475cb0fc
+  languageName: node
+  linkType: hard
+
+"@ethersproject/wallet@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/wallet@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/hdnode": ^5.7.0
+    "@ethersproject/json-wallets": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/random": ^5.7.0
+    "@ethersproject/signing-key": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/wordlists": ^5.7.0
+  checksum: a4009bf7331eddab38e3015b5e9101ef92de7f705b00a6196b997db0e5635b6d83561674d46c90c6f77b87c0500fe4a6b0183ba13749efc22db59c99deb82fbd
+  languageName: node
+  linkType: hard
+
+"@ethersproject/web@npm:5.7.1, @ethersproject/web@npm:^5.7.0":
+  version: 5.7.1
+  resolution: "@ethersproject/web@npm:5.7.1"
+  dependencies:
+    "@ethersproject/base64": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 7028c47103f82fd2e2c197ce0eecfacaa9180ffeec7de7845b1f4f9b19d84081b7a48227aaddde05a4aaa526af574a9a0ce01cc0fc75e3e371f84b38b5b16b2b
+  languageName: node
+  linkType: hard
+
 "@ethersproject/web@npm:^5.6.0":
   version: 5.6.0
   resolution: "@ethersproject/web@npm:5.6.0"
@@ -3280,6 +3718,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/wordlists@npm:5.7.0, @ethersproject/wordlists@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/wordlists@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 30eb6eb0731f9ef5faa44bf9c0c6e950bcaaef61e4d2d9ce0ae6d341f4e2d6d1f4ab4f8880bfce03b7aac4b862fb740e1421170cfbf8e2aafc359277d49e6e97
+  languageName: node
+  linkType: hard
+
 "@gar/promisify@npm:^1.1.3":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
@@ -7441,6 +7892,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@unstoppabledomains/resolution@npm:^8.3.3":
+  version: 8.3.3
+  resolution: "@unstoppabledomains/resolution@npm:8.3.3"
+  dependencies:
+    "@ethersproject/abi": ^5.0.1
+    bn.js: ^4.4.0
+    cross-fetch: ^3.1.4
+    crypto-js: ^4.1.1
+    elliptic: ^6.5.4
+  checksum: 5fdee68899d6c1da501923bdf09ee100676d5172895051d42fc15a6affcab488fbabaf9112e30a0b39194e7c27b6fb66c48b33d35f5408f4c6fadaefaaa522c5
+  languageName: node
+  linkType: hard
+
 "@vue/babel-helper-vue-jsx-merge-props@npm:^1.2.1":
   version: 1.2.1
   resolution: "@vue/babel-helper-vue-jsx-merge-props@npm:1.2.1"
@@ -8486,6 +8950,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aes-js@npm:3.0.0":
+  version: 3.0.0
+  resolution: "aes-js@npm:3.0.0"
+  checksum: 251e26d533cd1a915b44896b17d5ed68c24a02484cfdd2e74ec700a309267db96651ea4eb657bf20aac32a3baa61f6e34edf8e2fec2de440a655da9942d334b8
+  languageName: node
+  linkType: hard
+
 "aes-js@npm:^3.1.2":
   version: 3.1.2
   resolution: "aes-js@npm:3.1.2"
@@ -9496,7 +9967,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.0, bn.js@npm:^4.11.6, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9":
+"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.0, bn.js@npm:^4.11.6, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9, bn.js@npm:^4.4.0":
   version: 4.12.0
   resolution: "bn.js@npm:4.12.0"
   checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
@@ -9823,23 +10294,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:^5.0.5, buffer@npm:^5.1.0, buffer@npm:^5.5.0, buffer@npm:^5.6.0":
-  version: 5.7.1
-  resolution: "buffer@npm:5.7.1"
+"buffer@npm:6.0.3, buffer@npm:^6.0.2, buffer@npm:^6.0.3, buffer@npm:~6.0.3":
+  version: 6.0.3
+  resolution: "buffer@npm:6.0.3"
   dependencies:
     base64-js: ^1.3.1
-    ieee754: ^1.1.13
-  checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84
+    ieee754: ^1.2.1
+  checksum: 5ad23293d9a731e4318e420025800b42bf0d264004c0286c8cc010af7a270c7a0f6522e84f54b9ad65cbd6db20b8badbfd8d2ebf4f80fa03dab093b89e68c3f9
   languageName: node
   linkType: hard
 
-"buffer@npm:^6.0.2, buffer@npm:^6.0.3, buffer@npm:~6.0.3":
-  version: 6.0.3
-  resolution: "buffer@npm:6.0.3"
+"buffer@npm:^5.0.5, buffer@npm:^5.1.0, buffer@npm:^5.5.0, buffer@npm:^5.6.0":
+  version: 5.7.1
+  resolution: "buffer@npm:5.7.1"
   dependencies:
     base64-js: ^1.3.1
-    ieee754: ^1.2.1
-  checksum: 5ad23293d9a731e4318e420025800b42bf0d264004c0286c8cc010af7a270c7a0f6522e84f54b9ad65cbd6db20b8badbfd8d2ebf4f80fa03dab093b89e68c3f9
+    ieee754: ^1.1.13
+  checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84
   languageName: node
   linkType: hard
 
@@ -10046,9 +10517,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001317":
-  version: 1.0.30001332
-  resolution: "caniuse-lite@npm:1.0.30001332"
-  checksum: e54182ea42ab3d2ff1440f9a6480292f7ab23c00c188df7ad65586312e4da567e8bedd5cb5fb8f0ff4193dc027a54e17e0b3c0b6db5d5a3fb61c7726ff9c45b3
+  version: 1.0.30001429
+  resolution: "caniuse-lite@npm:1.0.30001429"
+  checksum: d1658080248ef5ef0f5157423b2766026e6aa45642ce3b2cc74859b6a54e39881dd902397a2368324ed30ed0cd40250f11a4a4f3773453cd57b88db5e5e5c76a
   languageName: node
   linkType: hard
 
@@ -10971,6 +11442,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"crypto-addr-codec@npm:^0.1.7":
+  version: 0.1.7
+  resolution: "crypto-addr-codec@npm:0.1.7"
+  dependencies:
+    base-x: ^3.0.8
+    big-integer: 1.6.36
+    blakejs: ^1.1.0
+    bs58: ^4.0.1
+    ripemd160-min: 0.0.6
+    safe-buffer: ^5.2.0
+    sha3: ^2.1.1
+  checksum: 76a198dea3703b92ecb9329783d30a83257cf5bc8b3c2ed09c2f0a46bf93479fb9d04449bed7cd1702158b3f65060c5fd275300187a5e86feb3bc6acfcaf6fa3
+  languageName: node
+  linkType: hard
+
 "crypto-browserify@npm:3.12.0, crypto-browserify@npm:^3.12.0":
   version: 3.12.0
   resolution: "crypto-browserify@npm:3.12.0"
@@ -12988,6 +13474,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ethers@npm:^5.7.1":
+  version: 5.7.1
+  resolution: "ethers@npm:5.7.1"
+  dependencies:
+    "@ethersproject/abi": 5.7.0
+    "@ethersproject/abstract-provider": 5.7.0
+    "@ethersproject/abstract-signer": 5.7.0
+    "@ethersproject/address": 5.7.0
+    "@ethersproject/base64": 5.7.0
+    "@ethersproject/basex": 5.7.0
+    "@ethersproject/bignumber": 5.7.0
+    "@ethersproject/bytes": 5.7.0
+    "@ethersproject/constants": 5.7.0
+    "@ethersproject/contracts": 5.7.0
+    "@ethersproject/hash": 5.7.0
+    "@ethersproject/hdnode": 5.7.0
+    "@ethersproject/json-wallets": 5.7.0
+    "@ethersproject/keccak256": 5.7.0
+    "@ethersproject/logger": 5.7.0
+    "@ethersproject/networks": 5.7.1
+    "@ethersproject/pbkdf2": 5.7.0
+    "@ethersproject/properties": 5.7.0
+    "@ethersproject/providers": 5.7.1
+    "@ethersproject/random": 5.7.0
+    "@ethersproject/rlp": 5.7.0
+    "@ethersproject/sha2": 5.7.0
+    "@ethersproject/signing-key": 5.7.0
+    "@ethersproject/solidity": 5.7.0
+    "@ethersproject/strings": 5.7.0
+    "@ethersproject/transactions": 5.7.0
+    "@ethersproject/units": 5.7.0
+    "@ethersproject/wallet": 5.7.0
+    "@ethersproject/web": 5.7.1
+    "@ethersproject/wordlists": 5.7.0
+  checksum: 7a61b7a105c41f9fec327887414f1950dc27bfa2d12fe29a068419eaaa3d415e6a12275685c87f700abd88c3b639ae79c09a2f90edea1e69edc8126cb0dce708
+  languageName: node
+  linkType: hard
+
 "ethjs-unit@npm:0.1.6":
   version: 0.1.6
   resolution: "ethjs-unit@npm:0.1.6"
@@ -15384,6 +15908,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-crc@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "js-crc@npm:0.2.0"
+  checksum: 3e307ae64236b745658e0df50d56809a810e67f39e45b7c1302433f10560819bea1d457841b2bac0eb42b72c96d60ae4c3232613275ea6c482b3cdb98a8bab09
+  languageName: node
+  linkType: hard
+
 "js-logger@npm:^1.6.1":
   version: 1.6.1
   resolution: "js-logger@npm:1.6.1"
@@ -16993,6 +17524,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nano-base32@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "nano-base32@npm:1.0.1"
+  checksum: 1abe4229f7197ac35c91376b0a897c01d783dc0bbad35b45b70486bdca79c552d8cc7f3780ae9c815d865e3d52adacf1ca4d805ef0bfd4718f982ef5942a8285
+  languageName: node
+  linkType: hard
+
 "nano-json-stream-parser@npm:^0.1.2":
   version: 0.1.2
   resolution: "nano-json-stream-parser@npm:0.1.2"
@@ -19391,6 +19929,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ripemd160-min@npm:0.0.6":
+  version: 0.0.6
+  resolution: "ripemd160-min@npm:0.0.6"
+  checksum: 3253fec273aee407e736df0baf69f90c65f56573d6fc537532041112e7c09a2f665ee2e618ef4a88eb494923d36614322eac26ddf35a504fcfedb422fd414c75
+  languageName: node
+  linkType: hard
+
 "ripemd160@npm:2, ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1, ripemd160@npm:^2.0.2":
   version: 2.0.2
   resolution: "ripemd160@npm:2.0.2"
@@ -19699,7 +20244,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scrypt-js@npm:^3.0.0, scrypt-js@npm:^3.0.1":
+"scrypt-js@npm:3.0.1, scrypt-js@npm:^3.0.0, scrypt-js@npm:^3.0.1":
   version: 3.0.1
   resolution: "scrypt-js@npm:3.0.1"
   checksum: b7c7d1a68d6ca946f2fbb0778e0c4ec63c65501b54023b2af7d7e9f48fdb6c6580d6f7675cd53bda5944c5ebc057560d5a6365079752546865defb3b79dea454
@@ -19910,6 +20455,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sha3@npm:^2.1.1, sha3@npm:^2.1.3":
+  version: 2.1.4
+  resolution: "sha3@npm:2.1.4"
+  dependencies:
+    buffer: 6.0.3
+  checksum: fb49c8e18143cc46babc0e5d83d5f5d0149e645f26633a0e6a9aa2514df2ef91f10b6ece20da229e7ead8b8002d8e9514dcc747ef96a25b749294d6385c6f29f
+  languageName: node
+  linkType: hard
+
 "shallow-clone@npm:^3.0.0":
   version: 3.0.1
   resolution: "shallow-clone@npm:3.0.1"