devop: upgrade rollup

package.json

@@ -31,12 +31,15 @@
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
-    "@swc/core": "^1.3.80",
+    "@swc/core": "^1.3.84",
     "concurrently": "^7.6.0",
     "devmoji": "^2.3.0",
     "husky": "^8.0.3",
     "node-notifier": "^10.0.1",
     "nodemon": "^2.0.22",
     "ultra-runner": "^3.10.5"
+  },
+  "resolutions": {
+    "@ledgerhq/compressjs": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz"
   }
 }

packages/extension-bridge/package.json

@@ -39,15 +39,14 @@
     "webextension-polyfill": "^0.10.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.27.0",
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.6.0",
     "@types/webextension-polyfill": "^0.10.2",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "bumpp": "^8.2.1",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",

packages/extension/configs/rollup.config.base.js → packages/extension/configs/rollup.config.base.mjs

@@ -3,7 +3,8 @@ import commonjs from "@rollup/plugin-commonjs";
 import nodeResolve from "@rollup/plugin-node-resolve";
 import { uglify } from "rollup-plugin-uglify";
 import inject from "@rollup/plugin-inject";
-import json from "@rollup/plugin-json";
+import replace from "@rollup/plugin-replace";
+import packageJson from "../package.json" assert { type: "json" };
 
 const enableMinification = process.env.minify === "on";
 const base = {
@@ -14,9 +15,12 @@ const base = {
     sourcemap: process.env.minify !== "on",
   },
   plugins: [
+    replace({
+      preventAssignment: true,
+      __VERSION__: JSON.stringify(packageJson.version),
+    }),
     typescript(),
     commonjs(),
-    json(),
     inject({
       Buffer: ["buffer", "Buffer"],
     }),

packages/extension/configs/rollup.config.contentscript.js → packages/extension/configs/rollup.config.contentscript.mjs

@@ -1,3 +1,3 @@
-import Base from "./rollup.config.base";
+import Base from "./rollup.config.base.mjs";
 Base.input.push("src/scripts/contentscript.ts");
 export default Base;

packages/extension/configs/rollup.config.inject.js → packages/extension/configs/rollup.config.inject.mjs

@@ -1,3 +1,3 @@
-import Base from "./rollup.config.base";
+import Base from "./rollup.config.base.mjs";
 Base.input.push("src/scripts/inject.ts");
 export default Base;

packages/extension/package.json

@@ -7,18 +7,18 @@
     "build:chrome": "cross-env BROWSER='chrome' vue-cli-service build && yarn build:rollup",
     "build:firefox": "cross-env BROWSER='firefox' vue-cli-service build && yarn build:rollup && node configs/get-system-info.js",
     "lint": "vue-cli-service lint --fix",
-    "build:rollup": "cross-env minify=on rollup --config configs/rollup.config.contentscript.js && cross-env minify=on rollup --config configs/rollup.config.inject.js",
+    "build:rollup": "cross-env minify=on rollup --config configs/rollup.config.contentscript.mjs && cross-env minify=on rollup --config configs/rollup.config.inject.mjs",
     "inspectWebpack": "vue-cli-service inspect > webpack.log",
     "test": "ts-mocha --require ./configs/testNullCompiler.js --paths -p configs/tsconfig.test.json ./**/*.mocha.ts",
     "watch": "rimraf dist && concurrently 'npm:watch-*(!firefox)'",
     "watch:firefox": "concurrently 'npm:watch-*(!chrome)'",
-    "watch-contentscript": "rollup --watch --config configs/rollup.config.contentscript.js",
-    "watch-inject": "rollup --watch --config configs/rollup.config.inject.js",
+    "watch-contentscript": "rollup --watch --config configs/rollup.config.contentscript.mjs",
+    "watch-inject": "rollup --watch --config configs/rollup.config.inject.mjs",
     "watch-vue-chrome": "cross-env BROWSER='chrome' vue-cli-service build --watch --no-clean",
     "watch-vue-firefox": "cross-env BROWSER='firefox' vue-cli-service build --watch --no-clean"
   },
   "dependencies": {
-    "@babel/runtime": "^7.22.10",
+    "@babel/runtime": "^7.22.15",
     "@enkryptcom/extension-bridge": "workspace:^",
     "@enkryptcom/hw-wallets": "workspace:^",
     "@enkryptcom/keyring": "workspace:^",
@@ -30,11 +30,12 @@
     "@ethereumjs/common": "^3.2.0",
     "@ethereumjs/tx": "^4.2.0",
     "@ledgerhq/hw-transport-webusb": "^6.27.19",
-    "@metamask/eth-sig-util": "^6.0.0",
-    "@types/chrome": "^0.0.244",
+    "@metamask/eth-sig-util": "^6.0.1",
+    "@rollup/plugin-replace": "^5.0.2",
+    "@types/chrome": "^0.0.245",
     "@types/events": "^3.0.0",
-    "@types/less": "^3.0.3",
-    "@types/lodash": "^4.14.197",
+    "@types/less": "^3.0.4",
+    "@types/lodash": "^4.14.198",
     "@types/utf-8-validate": "^5.0.0",
     "@vueuse/core": "^9.13.0",
     "add": "^2.0.6",
@@ -44,7 +45,7 @@
     "bitcoinjs-message": "^2.2.0",
     "chai": "^4.3.8",
     "concurrently": "^7.6.0",
-    "core-js": "^3.32.1",
+    "core-js": "^3.32.2",
     "echarts": "^5.4.3",
     "ethereumjs-abi": "^0.6.8",
     "ethereumjs-util": "^7.1.5",
@@ -79,17 +80,16 @@
     "@polkadot/ui-shared": "^3.6.2",
     "@polkadot/util": "^12.4.2",
     "@polkadot/wasm-crypto": "^7.2.2",
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-inject": "^4.0.4",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^14.1.0",
-    "@rollup/plugin-typescript": "^8.5.0",
+    "@rollup/plugin-commonjs": "^25.0.4",
+    "@rollup/plugin-inject": "^5.0.3",
+    "@rollup/plugin-node-resolve": "^15.2.1",
+    "@rollup/plugin-typescript": "^11.1.3",
     "@types/ethereumjs-abi": "^0.6.3",
     "@types/mocha": "^10.0.1",
-    "@types/url-parse": "^1.4.8",
-    "@types/uuid": "^9.0.2",
+    "@types/url-parse": "^1.4.9",
+    "@types/uuid": "^9.0.3",
     "@types/wif": "^2.0.2",
-    "@types/zxcvbn": "^4.4.1",
+    "@types/zxcvbn": "^4.4.2",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "@vue/cli-plugin-babel": "~5.0.8",
@@ -100,7 +100,7 @@
     "buffer": "^6.0.3",
     "cross-env": "^7.0.3",
     "crypto-browserify": "^3.12.0",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^8.7.1",
@@ -111,15 +111,15 @@
     "path-browserify": "^1.0.1",
     "prettier": "^2.8.8",
     "rimraf": "^4.4.1",
-    "rollup": "^2.79.1",
+    "rollup": "^3.29.1",
     "rollup-plugin-uglify": "^6.0.4",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
-    "systeminformation": "^5.21.1",
+    "systeminformation": "^5.21.4",
     "ts-mocha": "^10.0.0",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^4.9.5",
-    "url": "^0.11.1",
+    "url": "^0.11.2",
     "webextension-polyfill": "^0.10.0"
   },
   "installConfig": {

packages/extension/src/configs/constants.ts

@@ -1,4 +1,2 @@
-import packagejson from "@/../package.json";
-export const EXTENSION_VERSION = packagejson.version;
 export const EXTENSION_NAMESPACE =
   "dfc62431af1c3c1258035e5ab4058b6440e507238cf0fe429ea39827a7ee43fc"; //keccak256("enkrypt")

packages/extension/src/providers/bitcoin/inject.ts

@@ -8,15 +8,14 @@ import {
   ProviderInterface,
   SendMessageHandler,
 } from "@/types/provider";
-import { EXTENSION_VERSION } from "@/configs/constants";
 import { EnkryptWindow } from "@/types/globals";
 import { BitcoinNetworks } from "./types";
 
 export class Provider extends EventEmitter implements ProviderInterface {
   connected: boolean;
   name: ProviderName;
   type: ProviderType;
-  version: string = EXTENSION_VERSION;
+  version: string = __VERSION__;
   autoRefreshOnNetworkChange = false;
   networks: typeof BitcoinNetworks;
   sendMessageHandler: SendMessageHandler;

packages/extension/src/providers/ethereum/inject.ts

@@ -15,7 +15,6 @@ import {
   EIP6963ProviderInfo,
   EIP6963Events,
 } from "@/types/provider";
-import { EXTENSION_VERSION } from "@/configs/constants";
 import { SettingsType } from "@/libs/settings-state/types";
 import { EnkryptWindow } from "@/types/globals";
 import { v4 as randomUUID } from "uuid";
@@ -30,7 +29,7 @@ export class Provider extends EventEmitter implements ProviderInterface {
   connected: boolean;
   name: ProviderName;
   type: ProviderType;
-  version: string = EXTENSION_VERSION;
+  version: string = __VERSION__;
   autoRefreshOnNetworkChange = false;
   sendMessageHandler: SendMessageHandler;
   constructor(options: ProviderOptions) {
@@ -43,7 +42,7 @@ export class Provider extends EventEmitter implements ProviderInterface {
     this.connected = true;
     this.name = options.name;
     this.type = options.type;
-    this.version = EXTENSION_VERSION;
+    this.version = __VERSION__;
     this.sendMessageHandler = options.sendMessageHandler;
   }
   async request(request: EthereumRequest): Promise<EthereumResponse> {

packages/extension/src/providers/polkadot/inject.ts

@@ -10,7 +10,6 @@ import {
 import InjectedProvider from "./libs/injected-provider";
 import { SubstrateInjectedProvider } from "./types";
 import MessageRouter from "./libs/message-router";
-import { EXTENSION_VERSION } from "@/configs/constants";
 import { InjectedSendMessageHandler } from "./types";
 import { OnMessageResponse, RPCRequestType } from "@enkryptcom/types";
 import { SettingsType } from "@/libs/settings-state/types";
@@ -24,7 +23,7 @@ export class Provider
 {
   name: ProviderName;
   type: ProviderType;
-  version = EXTENSION_VERSION;
+  version = __VERSION__;
   sendMessageHandler: SendMessageHandler;
   constructor(options: ProviderOptions) {
     super();

packages/extension/src/types/provider.ts

@@ -2,7 +2,6 @@ import type { InjectedProvider as EthereumProvider } from "../providers/ethereum
 import type { InjectedProvider as PolkadotProvider } from "@/providers/polkadot/types";
 import type { InjectedProvider as BitcoinProvider } from "@/providers/bitcoin/types";
 import EventEmitter from "eventemitter3";
-import { EXTENSION_VERSION } from "@/configs/constants";
 import {
   MiddlewareFunction,
   NetworkNames,
@@ -77,7 +76,7 @@ export enum EIP6963Events {
 export abstract class ProviderInterface extends EventEmitter {
   name: ProviderName;
   type: ProviderType;
-  version: string = EXTENSION_VERSION;
+  version = "";
   sendMessageHandler: SendMessageHandler;
   constructor(options: ProviderOptions) {
     super();

packages/extension/src/types/shims-vue.d.ts

@@ -1,2 +1,3 @@
 declare module "*.vue";
 declare module "vue3-lottie";
+declare const __VERSION__: string;

packages/hw-wallets/package.json

@@ -16,13 +16,13 @@
     "node": ">=14.15.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.6.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.8",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -48,13 +48,13 @@
     "@enkryptcom/types": "workspace:^",
     "@enkryptcom/utils": "workspace:^",
     "@ethereumjs/tx": "^4.2.0",
-    "@ledgerhq/hw-app-eth": "^6.34.3",
+    "@ledgerhq/hw-app-eth": "^6.34.5",
     "@ledgerhq/hw-transport": "^6.28.8",
     "@ledgerhq/hw-transport-webusb": "^6.27.19",
-    "@ledgerhq/live-common": "^24.1.0",
+    "@ledgerhq/live-common": "^31.7.0",
     "@polkadot/types": "^10.9.1",
     "@polkadot/util": "^12.4.2",
-    "@trezor/connect-web": "^9.1.1",
+    "@trezor/connect-web": "^9.1.2",
     "@zondax/ledger-substrate": "^0.40.7",
     "ethereumjs-util": "^7.1.5",
     "hdkey": "^2.1.0",

packages/hw-wallets/src/ledger/ledgerConnect.ts

@@ -1,7 +1,7 @@
 import { NetworkNames } from "@enkryptcom/types";
-import getDeviceInfo from "@ledgerhq/live-common/src/hw/getDeviceInfo";
-import openApp from "@ledgerhq/live-common/src/hw/openApp";
-import getAppAndVersion from "@ledgerhq/live-common/src/hw/getAppAndVersion";
+import getDeviceInfo from "@ledgerhq/live-common/lib/hw/getDeviceInfo";
+import openApp from "@ledgerhq/live-common/lib/hw/openApp";
+import getAppAndVersion from "@ledgerhq/live-common/lib/hw/getAppAndVersion";
 import type LedgerEthereum from "./ethereum";
 import type LedgerSubstrate from "./substrate";
 import { ledgerAppNames } from "../configs";

packages/keyring/package.json

@@ -24,17 +24,17 @@
     "@enkryptcom/types": "workspace:^",
     "@enkryptcom/utils": "workspace:^",
     "@polkadot/util": "^12.4.2",
-    "assert": "^2.0.0",
+    "assert": "^2.1.0",
     "bip39": "^3.1.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.6.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.8",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",

packages/name-resolution/package.json

@@ -16,13 +16,13 @@
     "node": ">=14.15.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.6.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.8",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",

packages/request/package.json

@@ -23,16 +23,16 @@
     "node-fetch": "^2.7.0",
     "reconnecting-websocket": "^4.4.0",
     "uuid": "^9.0.0",
-    "ws": "^8.13.0"
+    "ws": "^8.14.1"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.6.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.8",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",

packages/signers/bitcoin/package.json

@@ -27,13 +27,13 @@
   },
   "devDependencies": {
     "@enkryptcom/types": "workspace:^",
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/hdkey": "^2.0.1",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.6.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",

packages/signers/ethereum/package.json

@@ -28,13 +28,13 @@
   },
   "devDependencies": {
     "@enkryptcom/types": "workspace:^",
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/hdkey": "^2.0.1",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.6.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",