Merge pull request #325 from enkryptcom/develop

Release: v1.23.0
enkryptcom · Jul 19, 2023 · 94ad2bc · 94ad2bc · github-actions · Jul 19, 2023
2 parents 9d09517 + ac269e5
commit 94ad2bc
Show file tree

Hide file tree

Showing 34 changed files with 2,120 additions and 472 deletions.
diff --git a/package.json b/package.json
@@ -29,9 +29,9 @@
     "version:apply": "yarn version apply --all"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.5",
-    "@commitlint/config-conventional": "^17.6.5",
-    "@swc/core": "^1.3.66",
+    "@commitlint/cli": "^17.6.6",
+    "@commitlint/config-conventional": "^17.6.6",
+    "@swc/core": "^1.3.68",
     "concurrently": "^7.6.0",
     "devmoji": "^2.3.0",
     "husky": "^8.0.3",

diff --git a/packages/extension-bridge/package.json b/packages/extension-bridge/package.json
@@ -41,13 +41,13 @@
   "devDependencies": {
     "@antfu/eslint-config": "^0.27.0",
     "@types/chai": "^4.3.5",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.16.18",
-    "@types/webextension-polyfill": "^0.10.0",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.4.2",
+    "@types/webextension-polyfill": "^0.10.1",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "bumpp": "^8.2.1",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-alias": "^1.1.2",

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "private": true,
   "scripts": {
     "zip": "cd dist; zip -r release.zip *;",
@@ -18,7 +18,7 @@
     "watch-vue-firefox": "cross-env BROWSER='firefox' vue-cli-service build --watch --no-clean"
   },
   "dependencies": {
-    "@babel/runtime": "^7.22.5",
+    "@babel/runtime": "^7.22.6",
     "@enkryptcom/extension-bridge": "workspace:^",
     "@enkryptcom/hw-wallets": "workspace:^",
     "@enkryptcom/keyring": "workspace:^",
@@ -29,9 +29,9 @@
     "@enkryptcom/utils": "workspace:^",
     "@ethereumjs/common": "^3.2.0",
     "@ethereumjs/tx": "^4.2.0",
-    "@ledgerhq/hw-transport-webusb": "^6.27.15",
-    "@metamask/eth-sig-util": "^5.1.0",
-    "@types/chrome": "^0.0.237",
+    "@ledgerhq/hw-transport-webusb": "^6.27.16",
+    "@metamask/eth-sig-util": "^6.0.0",
+    "@types/chrome": "^0.0.241",
     "@types/events": "^3.0.0",
     "@types/less": "^3.0.3",
     "@types/lodash": "^4.14.195",
@@ -44,7 +44,7 @@
     "bitcoinjs-message": "^2.2.0",
     "chai": "^4.3.7",
     "concurrently": "^7.6.0",
-    "core-js": "^3.31.0",
+    "core-js": "^3.31.1",
     "echarts": "^5.4.2",
     "ethereumjs-abi": "^0.6.8",
     "ethereumjs-util": "^7.1.5",
@@ -61,8 +61,8 @@
     "uuid": "^9.0.0",
     "vue": "^3.3.4",
     "vue-echarts": "^6.6.0",
-    "vue-router": "4.2.2",
-    "vue3-lottie": "^2.7.3",
+    "vue-router": "4.2.4",
+    "vue3-lottie": "^2.7.4",
     "vuedraggable": "^4.1.0",
     "web3-eth": "^1.10.0",
     "web3-utils": "^1.10.0",
@@ -85,13 +85,13 @@
     "@rollup/plugin-node-resolve": "^14.1.0",
     "@rollup/plugin-typescript": "^8.5.0",
     "@types/ethereumjs-abi": "^0.6.3",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.1",
     "@types/url-parse": "^1.4.8",
     "@types/uuid": "^9.0.2",
     "@types/wif": "^2.0.2",
     "@types/zxcvbn": "^4.4.1",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-plugin-typescript": "~5.0.8",
@@ -100,7 +100,7 @@
     "buffer": "^6.0.3",
     "cross-env": "^7.0.3",
     "crypto-browserify": "^3.12.0",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^8.7.1",
@@ -115,7 +115,7 @@
     "rollup-plugin-uglify": "^6.0.4",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
-    "systeminformation": "^5.18.4",
+    "systeminformation": "^5.18.7",
     "ts-mocha": "^10.0.0",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^4.9.5",

diff --git a/packages/extension/src/libs/name-resolver/index.ts b/packages/extension/src/libs/name-resolver/index.ts
@@ -5,6 +5,12 @@ class GenericNameResolver {
   constructor() {
     this.nameResolver = new NameResolver({
       ens: { node: "https://nodes.mewapi.io/rpc/eth" },
+      sid: {
+        node: {
+          bnb: "https://nodes.mewapi.io/rpc/bsc",
+          arb: "https://nodes.mewapi.io/rpc/arb",
+        },
+      },
     });
   }
 

diff --git 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 & AVAX Wallet",
+  "name": "Enkrypt: Multichain Crypto Wallet",
   "short_name": "Enkrypt",
   "permissions": [
     "storage",

diff --git a/packages/extension/src/providers/ethereum/inject.ts b/packages/extension/src/providers/ethereum/inject.ts
@@ -156,7 +156,7 @@ const injectDocument = (
       uuid: ENKRYPT_UUID_V4,
       icon: `data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODEiIGhlaWdodD0iODEiIHZpZXdCb3g9IjAgMCA4MSA4MSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNy4wMDU3IDE3LjAwNjJDMTguOTMwMyAxNS4wODE2IDIxLjU0MDUgMTQuMDAwNCAyNC4yNjIyIDE0LjAwMDRMNjcuMzI5NiAxNFYyMS44NzQxQzY3LjMyOTYgMjMuODMwNSA2Ni41NTIzIDI1LjcwNjcgNjUuMTY5IDI3LjA5QzYzLjc4NTcgMjguNDczMyA2MS45MDk1IDI5LjI1MDQgNTkuOTUzMiAyOS4yNTA0SDM5LjcwNDVDMzYuOTgyOCAyOS4yNTA0IDM0LjM3MjYgMzAuMzMxNiAzMi40NDggMzIuMjU2MUMzMC41MjM1IDM0LjE4MDcgMjkuNDQyMyAzNi43OTA5IDI5LjQ0MjMgMzkuNTEyNlY0Mi4xMjQyQzI5LjQ0MjMgNDQuODQ1OSAzMC41MjM1IDQ3LjQ1NjEgMzIuNDQ4IDQ5LjM4MDZDMzQuMzcyNiA1MS4zMDUxIDM2Ljk4MjggNTIuMzg2MyAzOS43MDQ1IDUyLjM4NjNINTkuOTUzMkM2MS45MDk1IDUyLjM4NjMgNjMuNzg1NyA1My4xNjM1IDY1LjE2OSA1NC41NDY4QzY2LjU1MjMgNTUuOTMwMSA2Ny4zMjk2IDU3LjgwNjMgNjcuMzI5NiA1OS43NjI2VjY3LjMzSDI0LjI2MjJDMjEuNTQwNSA2Ny4zMyAxOC45MzAzIDY2LjI0ODggMTcuMDA1NyA2NC4zMjQzQzE1LjA4MTIgNjIuMzk5NyAxNCA1OS43ODk1IDE0IDU3LjA2NzhWMjQuMjYyNkMxNCAyMS41NDA5IDE1LjA4MTIgMTguOTMwNyAxNy4wMDU3IDE3LjAwNjJaTTQwLjE0NzkgMzMuNTQyM0g2MC45MTU3QzY0LjQ1OCAzMy41NDIzIDY3LjMyOTUgMzYuNDEzOCA2Ny4zMjk1IDM5Ljk1NjFWNDEuNjgxNkM2Ny4zMjk1IDQ1LjIyMzggNjQuNDU4IDQ4LjA5NTQgNjAuOTE1NyA0OC4wOTU0SDQwLjE0NzlDMzYuNjA1NyA0OC4wOTU0IDMzLjczNDEgNDUuMjIzOCAzMy43MzQxIDQxLjY4MTZWMzkuOTU2MUMzMy43MzQxIDM2LjQxMzggMzYuNjA1NyAzMy41NDIzIDQwLjE0NzkgMzMuNTQyM1oiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl8yODdfMjM1OSkiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl8yODdfMjM1OSIgeDE9IjE5LjM2MDIiIHkxPSIxNCIgeDI9IjU2Ljc2OTYiIHkyPSI2OS44MDA1IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNDNTQ5RkYiLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNjU0QkZGIi8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg==`,
       name: "Enkrypt",
-      walletId: "com.enkrypt",
+      rdns: "com.enkrypt",
     };
     document.dispatchEvent(
       new document.CustomEvent(EIP6963Events.announce, {

diff --git a/...ages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts b/...ages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts
@@ -13,6 +13,7 @@ const NetworkEndpoints = {
   [NetworkNames.Edgeware]: "https://edgeware.api.subscan.io/",
   [NetworkNames.Quartz]: "https://quartz.api.subscan.io/",
   [NetworkNames.Unique]: "https://unique.api.subscan.io/",
+  [NetworkNames.Vara]: "https://vara.api.subscan.io/",
 };
 
 export { NetworkEndpoints };
diff --git a/packages/extension/src/providers/polkadot/networks/icons/vara.svg b/packages/extension/src/providers/polkadot/networks/icons/vara.svg
diff --git a/packages/extension/src/providers/polkadot/networks/index.ts b/packages/extension/src/providers/polkadot/networks/index.ts
@@ -13,6 +13,7 @@ import quartzNode from "./unique/quartz";
 import uniqueNode from "./unique/unique";
 import penNode from "./pendulum/pendulum";
 import ampeNode from "./pendulum/amplitude";
+import varaNode from "./vara";
 
 export default {
   acala: acaNode,
@@ -30,6 +31,5 @@ export default {
   unique: uniqueNode,
   pendulum: penNode,
   amplitude: ampeNode,
-  // interlay: interlayNode,
-  // kintsugi: kintsugiNode,
+  vara: varaNode,
 };
diff --git a/packages/extension/src/providers/polkadot/networks/vara.ts b/packages/extension/src/providers/polkadot/networks/vara.ts
@@ -0,0 +1,32 @@
+import { NetworkNames } from "@enkryptcom/types";
+import { toBN } from "web3-utils";
+import { subscanActivity } from "../libs/activity-handlers";
+import {
+  SubstrateNetwork,
+  SubstrateNetworkOptions,
+} from "../types/substrate-network";
+import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
+
+const varaOptions: SubstrateNetworkOptions = {
+  name: NetworkNames.Vara,
+  name_long: "Vara Network",
+  homePage: "https://vara-network.io/",
+  blockExplorerTX: "https://vara.subscan.io/extrinsic/[[txHash]]",
+  blockExplorerAddr: "https://vara.subscan.io/account/[[address]]",
+  isTestNetwork: false,
+  currencyName: "VARA",
+  currencyNameLong: "Vara",
+  icon: require("./icons/vara.svg"),
+  decimals: 12,
+  prefix: 137,
+  gradient: "#0ed3a3",
+  node: "wss://rpc.vara-network.io",
+  genesisHash:
+    "0xfe1b4c55fd4d668101126434206571a7838a8b6b93a6d1b95d607e78e6c53763",
+  activityHandler: wrapActivityHandler(subscanActivity),
+  existentialDeposit: toBN("10000000000000"),
+};
+
+const vara = new SubstrateNetwork(varaOptions);
+
+export default vara;
diff --git a/packages/extension/src/types/provider.ts b/packages/extension/src/types/provider.ts
@@ -66,7 +66,7 @@ export interface EIP6963ProviderInfo {
   uuid: string;
   name: string;
   icon: `data:image/svg+xml;base64,${string}`;
-  walletId: string;
+  rdns: string;
 }
 
 export enum EIP6963Events {

diff --git a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
@@ -139,6 +139,7 @@ import {
   NetworkType,
   ProviderSwapResponse,
   SupportedNetworkName,
+  SwapToken,
 } from "@enkryptcom/swap";
 import PublicKeyRing from "@/libs/keyring/public-keyring";
 import { SwapData, ProviderResponseWithStatus } from "../../types";
@@ -277,7 +278,6 @@ onMounted(async () => {
   network.value = (await getNetworkByName(selectedNetwork))!;
   account.value = await KeyRing.getAccount(swapData.fromAddress);
   isWindowPopup.value = account.value.isHardware;
-  /* Waiting for changelly to fix the api rate issue
   let tempBestTrade = pickedTrade.value;
   let tempFinalToFiat = 0;
   for (const trade of swapData.trades) {
@@ -296,7 +296,6 @@ onMounted(async () => {
     }
   }
   pickedTrade.value = tempBestTrade;
-  */
   await setTransactionFees();
   isLooking.value = false;
 });
@@ -415,6 +414,7 @@ const selectFee = (option: GasPriceTypes) => {
 };
 
 const selectTrade = (trade: ProviderSwapResponse) => {
+  console.log(trade.provider);
   pickedTrade.value = trade;
   setTransactionFees();
 };

diff --git a/packages/hw-wallets/package.json b/packages/hw-wallets/package.json
@@ -17,12 +17,12 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.5",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.16.18",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.4.2",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.7",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -48,9 +48,9 @@
     "@enkryptcom/types": "workspace:^",
     "@enkryptcom/utils": "workspace:^",
     "@ethereumjs/tx": "^4.2.0",
-    "@ledgerhq/hw-app-eth": "^6.33.6",
-    "@ledgerhq/hw-transport": "^6.28.4",
-    "@ledgerhq/hw-transport-webusb": "^6.27.15",
+    "@ledgerhq/hw-app-eth": "^6.33.7",
+    "@ledgerhq/hw-transport": "^6.28.5",
+    "@ledgerhq/hw-transport-webusb": "^6.27.16",
     "@ledgerhq/live-common": "^24.1.0",
     "@polkadot/types": "^10.9.1",
     "@polkadot/util": "^12.3.2",

diff --git a/packages/keyring/package.json b/packages/keyring/package.json
@@ -29,12 +29,12 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.5",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.16.18",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.4.2",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.7",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-alias": "^1.1.2",

diff --git a/packages/name-resolution/.eslintrc.json b/packages/name-resolution/.eslintrc.json
@@ -19,6 +19,7 @@
     "@typescript-eslint/ban-ts-comment": "off",
     "no-console": "off",
     "no-plusplus": "off",
+    "import/no-extraneous-dependencies": "off",
     "import/extensions": [
       "error",
       "ignorePackages",

diff --git a/packages/name-resolution/package.json b/packages/name-resolution/package.json
@@ -17,12 +17,12 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.5",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.16.18",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.4.2",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.7",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -46,6 +46,7 @@
   "license": "MIT",
   "dependencies": {
     "@ensdomains/address-encoder": "^0.2.21",
+    "@siddomains/sidjs": "0.1.27",
     "@unstoppabledomains/resolution": "^8.5.0",
     "ethers": "^5.7.2"
   }