Merge pull request #185 from enkryptcom/release/v1.7.0

Release/v1.7.0

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 *;",

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;

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",

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;

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 };

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;

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;

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;

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,
 ];

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({

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({

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%)",

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",

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;

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%)",

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%)",

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%)",

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,
 };

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%)",

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%)",

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",

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",

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%)",

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%)",