Merge pull request #375 from enkryptcom/develop

Release: v1.30.0
enkryptcom · Jan 3, 2024 · 88b0a97 · 88b0a97 · github-actions · Jan 3, 2024
2 parents 3f5cfa7 + 8375c1a
commit 88b0a97
Show file tree

Hide file tree

Showing 51 changed files with 3,002 additions and 1,779 deletions.
diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -6,7 +6,7 @@ jobs:
   buildAll:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: setup env
         id: node-version

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: setup env
         id: node-version

diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -6,8 +6,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
         with:
           node-version: "16"
           cache: "yarn"

diff --git a/package.json b/package.json
@@ -29,14 +29,14 @@
     "version:apply": "yarn version apply --all"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@swc/core": "^1.3.84",
-    "concurrently": "^8.2.1",
+    "@commitlint/cli": "^17.8.1",
+    "@commitlint/config-conventional": "^17.8.1",
+    "@swc/core": "^1.3.100",
+    "concurrently": "^8.2.2",
     "devmoji": "^2.3.0",
     "husky": "^8.0.3",
     "node-notifier": "^10.0.1",
-    "nodemon": "^3.0.1",
+    "nodemon": "^3.0.2",
     "ultra-runner": "^3.10.5"
   },
   "resolutions": {

diff --git a/packages/extension-bridge/package.json b/packages/extension-bridge/package.json
@@ -34,23 +34,23 @@
   ],
   "dependencies": {
     "nanoevents": "^7.0.1",
-    "serialize-error": "11.0.2",
+    "serialize-error": "11.0.3",
     "tiny-uid": "^1.1.2",
     "webextension-polyfill": "^0.10.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.6",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.6.0",
-    "@types/webextension-polyfill": "^0.10.2",
+    "@types/chai": "^4.3.11",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.10.4",
+    "@types/webextension-polyfill": "^0.10.7",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "bumpp": "^8.2.1",
-    "eslint": "^8.49.0",
+    "bumpp": "^9.2.0",
+    "eslint": "^8.55.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-alias": "^1.1.2",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-module-resolver": "^1.5.0",
     "prettier": "^2.8.8",
     "ts-node": "^10.9.1",

diff --git a/packages/extension/babel.config.js b/packages/extension/babel.config.js
@@ -1,3 +1,4 @@
 module.exports = {
+  plugins: ["@babel/plugin-transform-class-static-block"],
   presets: ["@vue/cli-plugin-babel/preset"],
 };
diff --git a/packages/extension/configs/browser-build.js b/packages/extension/configs/browser-build.js
@@ -61,6 +61,7 @@ const setConfig = (config) => {
     args[0]["process.env"] = {
       ..._base,
       PACKAGE_VERSION: JSON.stringify(package.version),
+      BUILD_TIME: new Date().toLocaleString().replace(/\D/g, ""),
       IS_DEV: process.env.NODE_ENV === "development",
       IS_FIREFOX: BROWSER === browserNames.firefox,
       PREFILL_PASSWORD:

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "1.29.0",
+  "version": "1.30.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.15",
+    "@babel/runtime": "^7.23.5",
     "@enkryptcom/extension-bridge": "workspace:^",
     "@enkryptcom/hw-wallets": "workspace:^",
     "@enkryptcom/keyring": "workspace:^",
@@ -29,23 +29,23 @@
     "@enkryptcom/utils": "workspace:^",
     "@ethereumjs/common": "^3.2.0",
     "@ethereumjs/tx": "^4.2.0",
-    "@ledgerhq/hw-transport-webusb": "^6.27.19",
-    "@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.4",
-    "@types/lodash": "^4.14.198",
-    "@types/utf-8-validate": "^5.0.0",
+    "@ledgerhq/hw-transport-webusb": "^6.28.0",
+    "@metamask/eth-sig-util": "^6.0.2",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@types/chrome": "^0.0.250",
+    "@types/events": "^3.0.3",
+    "@types/less": "^3.0.6",
+    "@types/lodash": "^4.14.202",
+    "@types/utf-8-validate": "^5.0.2",
     "@vueuse/core": "^9.13.0",
     "add": "^2.0.6",
     "bignumber.js": "^9.1.2",
     "bip39": "^3.1.0",
-    "bitcoinjs-lib": "^6.1.3",
+    "bitcoinjs-lib": "^6.1.5",
     "bitcoinjs-message": "^2.2.0",
-    "chai": "^4.3.8",
-    "concurrently": "^8.2.1",
-    "core-js": "^3.32.2",
+    "chai": "^4.3.10",
+    "concurrently": "^8.2.2",
+    "core-js": "^3.34.0",
     "echarts": "^5.4.3",
     "ethereumjs-abi": "^0.6.8",
     "ethereumjs-util": "^7.1.5",
@@ -55,41 +55,42 @@
     "memoize-one": "^6.0.0",
     "moment": "^2.29.4",
     "nanoevents": "^7.0.1",
-    "pinia": "^2.1.6",
+    "pinia": "^2.1.7",
     "qrcode.vue": "^3.4.1",
     "switch-ts": "^1.1.1",
     "url-parse": "^1.5.10",
-    "uuid": "^9.0.0",
-    "vue": "^3.3.4",
-    "vue-echarts": "^6.6.1",
-    "vue-router": "4.2.4",
+    "uuid": "^9.0.1",
+    "vue": "^3.3.10",
+    "vue-echarts": "6.6.1",
+    "vue-router": "4.2.5",
     "vue3-lottie": "^2.7.4",
     "vuedraggable": "^4.1.0",
-    "web3-eth": "^1.10.2",
-    "web3-utils": "^1.10.2",
-    "yarn": "^1.22.19",
+    "web3-eth": "^1.10.3",
+    "web3-utils": "^1.10.3",
+    "yarn": "^1.22.21",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@polkadot/api": "^10.9.1",
-    "@polkadot/extension-inject": "^0.46.5",
-    "@polkadot/keyring": "^12.4.2",
-    "@polkadot/rpc-provider": "^10.9.1",
-    "@polkadot/types": "^10.9.1",
-    "@polkadot/types-known": "^10.9.1",
-    "@polkadot/ui-shared": "^3.6.2",
-    "@polkadot/util": "^12.4.2",
-    "@polkadot/wasm-crypto": "^7.2.2",
-    "@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.9",
-    "@types/uuid": "^9.0.3",
-    "@types/wif": "^2.0.2",
-    "@types/zxcvbn": "^4.4.2",
+    "@babel/plugin-transform-class-static-block": "^7.23.4",
+    "@polkadot/api": "^10.11.1",
+    "@polkadot/extension-inject": "^0.46.6",
+    "@polkadot/keyring": "^12.6.1",
+    "@polkadot/rpc-provider": "^10.11.1",
+    "@polkadot/types": "^10.11.1",
+    "@polkadot/types-known": "^10.11.1",
+    "@polkadot/ui-shared": "^3.6.4",
+    "@polkadot/util": "^12.6.1",
+    "@polkadot/wasm-crypto": "^7.3.2",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-inject": "^5.0.5",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.5",
+    "@types/ethereumjs-abi": "^0.6.5",
+    "@types/mocha": "^10.0.6",
+    "@types/url-parse": "^1.4.11",
+    "@types/uuid": "^9.0.7",
+    "@types/wif": "^2.0.5",
+    "@types/zxcvbn": "^4.4.4",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "@vue/cli-plugin-babel": "~5.0.8",
@@ -100,7 +101,7 @@
     "buffer": "^6.0.3",
     "cross-env": "^7.0.3",
     "crypto-browserify": "^3.12.0",
-    "eslint": "^8.49.0",
+    "eslint": "^8.55.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^8.7.1",
@@ -110,16 +111,16 @@
     "mocha": "^10.2.0",
     "path-browserify": "^1.0.1",
     "prettier": "^2.8.8",
-    "rimraf": "^5.0.1",
-    "rollup": "^3.29.1",
+    "rimraf": "^5.0.5",
+    "rollup": "^3.29.4",
     "rollup-plugin-uglify": "^6.0.4",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
-    "systeminformation": "^5.21.4",
+    "systeminformation": "^5.21.20",
     "ts-mocha": "^10.0.0",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^4.9.5",
-    "url": "^0.11.2",
+    "url": "^0.11.3",
     "webextension-polyfill": "^0.10.0"
   },
   "installConfig": {

diff --git a/packages/extension/src/libs/settings-state/index.ts b/packages/extension/src/libs/settings-state/index.ts
@@ -30,7 +30,7 @@ class SettingsState {
   async getSubstrateSettings(): Promise<SubstrateSettingsType> {
     const state = await this.getStateByKey(StorageKeys.substrateState);
     const settings: SubstrateSettingsType = {
-      injectPolkadotjs: true,
+      injectPolkadotjs: false,
     };
     return merge(settings, state);
   }

diff --git a/packages/extension/src/providers/bitcoin/libs/api-ss.ts b/packages/extension/src/providers/bitcoin/libs/api-ss.ts
@@ -63,7 +63,8 @@ class API implements ProviderAPIInterface {
         return toBN(balance.balance)
           .add(toBN(balance.unconfirmedBalance))
           .toString();
-      });
+      })
+      .catch(() => "0");
   }
   async broadcastTx(rawtx: string): Promise<boolean> {
     return fetch(`${this.node}/api/v1/send`, {

diff --git a/packages/extension/src/providers/bitcoin/libs/api.ts b/packages/extension/src/providers/bitcoin/libs/api.ts
@@ -56,7 +56,8 @@ class API implements ProviderAPIInterface {
       .then((balance: HaskoinBalanceType) => {
         if ((balance as any).error) return "0";
         return toBN(balance.confirmed).addn(balance.unconfirmed).toString();
-      });
+      })
+      .catch(() => "0");
   }
   async broadcastTx(rawtx: string): Promise<boolean> {
     return fetch(`${this.node}transactions`, {

diff --git a/packages/extension/src/providers/bitcoin/libs/ss-fee-handler.ts b/packages/extension/src/providers/bitcoin/libs/ss-fee-handler.ts
@@ -19,6 +19,8 @@ const SSFeeHandler = async (
     .then((json: FeeType) => {
       if (json.fast.satsPerKiloByte < 0)
         json.fast.satsPerKiloByte = json.average.satsPerKiloByte;
+      if (json.average.satsPerKiloByte < 0)
+        json.average.satsPerKiloByte = json.slow.satsPerKiloByte;
       return {
         [GasPriceTypes.FASTEST]:
           Math.ceil(json.fast.satsPerKiloByte / 1024) + 5,

diff --git a/packages/extension/src/providers/bitcoin/networks/bitcoin-testnet.ts b/packages/extension/src/providers/bitcoin/networks/bitcoin-testnet.ts
@@ -46,6 +46,7 @@ const bitcoinOptions: BitcoinNetworkOptions = {
     wif: 0xef,
     dustThreshold: null,
     paymentType: PaymentType.P2WPKH,
+    maxFeeRate: 5000 * 2,
   },
 };
 

diff --git a/packages/extension/src/providers/bitcoin/networks/bitcoin.ts b/packages/extension/src/providers/bitcoin/networks/bitcoin.ts
@@ -39,6 +39,7 @@ const bitcoinOptions: BitcoinNetworkOptions = {
     wif: 0x80,
     dustThreshold: null,
     paymentType: PaymentType.P2WPKH,
+    maxFeeRate: 5000,
   },
 };
 

diff --git a/packages/extension/src/providers/bitcoin/networks/dogecoin.ts b/packages/extension/src/providers/bitcoin/networks/dogecoin.ts
@@ -41,6 +41,7 @@ const dogeOptions: BitcoinNetworkOptions = {
     wif: 0x9e,
     dustThreshold: null,
     paymentType: PaymentType.P2PKH,
+    maxFeeRate: 5000 * 4,
   },
 };
 

diff --git a/packages/extension/src/providers/bitcoin/networks/litecoin.ts b/packages/extension/src/providers/bitcoin/networks/litecoin.ts
@@ -41,6 +41,7 @@ const litecoinOptions: BitcoinNetworkOptions = {
     wif: 0xb0,
     dustThreshold: null,
     paymentType: PaymentType.P2WPKH,
+    maxFeeRate: 5000 * 2,
   },
 };
 

diff --git a/packages/extension/src/providers/bitcoin/types/index.ts b/packages/extension/src/providers/bitcoin/types/index.ts
@@ -19,6 +19,7 @@ export interface BitcoinNetworkInfo {
   wif: number;
   dustThreshold: null;
   paymentType: PaymentType;
+  maxFeeRate: number;
 }
 
 export interface HaskoinBalanceType {

diff --git a/packages/extension/src/providers/bitcoin/ui/libs/signer.ts b/packages/extension/src/providers/bitcoin/ui/libs/signer.ts
@@ -32,7 +32,10 @@ const TransactionSigner = (
         });
       },
     };
-    const tx = new Psbt({ network: network.networkInfo });
+    const tx = new Psbt({
+      network: network.networkInfo,
+      maximumFeeRate: network.networkInfo.maxFeeRate,
+    });
     payload.inputs
       .map((u) => {
         const res: {

diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
@@ -185,7 +185,10 @@ onMounted(async () => {
 });
 
 const nativeBalanceAfterTransaction = computed(() => {
-  if (selectedAsset.value) {
+  if (
+    selectedAsset.value &&
+    isValidDecimals(sendAmount.value, selectedAsset.value.decimals!)
+  ) {
     return toBN(selectedAsset.value.balance ?? "0").sub(
       toBN(toBase(sendAmount.value ?? "0", selectedAsset.value.decimals!)).add(
         toBN(