Merge pull request #1402 from Conflux-Chain/dev

release 2.7.3
Conflux-Chain · Sep 5, 2024 · 2dc621e · 2dc621e
2 parents 3e9143b + adccc64
commit 2dc621e
Show file tree

Hide file tree

Showing 20 changed files with 384 additions and 554 deletions.
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
@@ -62,15 +62,19 @@ jobs:
 
       - run: yarn install --immutable
 
-      - name: Dotenv Action
-        id: dotenv
-        uses: falti/dotenv-action@v0.2.8
+      - name: Set package version
+        id: get-package-version
+        run: |
+          echo "PACKAGE_VERSION=$(cat package.json | jq -r '.version')" >>  "$GITHUB_OUTPUT"
+
+      - name: Print package version
+        run: echo "PACKAGE_VERSION=${{ steps.get-package-version.outputs.PACKAGE_VERSION }}"
 
       - name: Get PR Release
         uses: actions/github-script@v6
         id: get-release-version-and-tag
         env:
-          NEXT_VERSION: ${{ steps.dotenv.outputs.SNOWPACK_PUBLIC_FLUENT_VERSION }}
+          NEXT_VERSION: ${{ steps.get-package-version.outputs.PACKAGE_VERSION }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -107,7 +111,7 @@ jobs:
           SNOWPACK_PUBLIC_FLUENT_ENV: 'debug-release'
           SNOWPACK_PUBLIC_FLUENT_VERSION: ${{ fromJSON(steps.get-release-version-and-tag.outputs.result).version }}
         run: yarn build
-        
+
       - name: zip files
         run: |
           cd ./dist

diff --git a/.github/workflows/prod-release.yaml b/.github/workflows/prod-release.yaml
@@ -33,12 +33,12 @@ jobs:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: 'yarn'
           node-version: ${{ matrix.node-version }}
       - uses: actions/setup-java@v3
         with:
-          distribution: "adopt"
-          java-version: "11"
+          distribution: 'adopt'
+          java-version: '11'
       - name: Install clojure tools
         uses: DeLaGuardo/setup-clojure@7.0
         with:
@@ -61,15 +61,19 @@ jobs:
 
       - run: yarn install --immutable
 
-      - name: Dotenv Action
-        id: dotenv
-        uses: falti/dotenv-action@v0.2.8
+      - name: Set package version
+        id: get-package-version
+        run: |
+          echo "PACKAGE_VERSION=$(cat package.json | jq -r '.version')" >> "$GITHUB_OUTPUT"
+
+      - name: Print package version
+        run: echo "PACKAGE_VERSION=${{ steps.get-package-version.outputs.PACKAGE_VERSION }}"
 
       - name: Get PR Release
         uses: actions/github-script@v6
         id: get-release-version-and-tag
         env:
-          NEXT_VERSION: ${{ steps.dotenv.outputs.SNOWPACK_PUBLIC_FLUENT_VERSION }}
+          NEXT_VERSION: ${{ steps.get-package-version.outputs.PACKAGE_VERSION }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -92,8 +96,8 @@ jobs:
       - name: build and release
         env:
           SNOWPACK_PUBLIC_SENTRY_DSN: ${{ secrets.SNOWPACK_PUBLIC_SENTRY_DSN }}
-          SNOWPACK_PUBLIC_FLUENT_ENV: "production"
-          SNOWPACK_PUBLIC_FLUENT_VERSION: ${{ steps.dotenv.outputs.SNOWPACK_PUBLIC_FLUENT_VERSION }}
+          SNOWPACK_PUBLIC_FLUENT_ENV: 'production'
+          SNOWPACK_PUBLIC_FLUENT_VERSION: ${{ steps.get-package-version.outputs.PACKAGE_VERSION }}
         run: yarn build
 
       - name: zip files
@@ -112,7 +116,7 @@ jobs:
         uses: peter-evans/create-pull-request@v4.0.4
         with:
           token: ${{ secrets.CONFLUX_BOT_GH_TOKEN }}
-          branch: "create-pull-request/__main->dev__"
+          branch: 'create-pull-request/__main->dev__'
           delete-branch: true
-          base: "dev"
-          title: "chore: merge main back to dev"
+          base: 'dev'
+          title: 'chore: merge main back to dev'
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "helios",
   "private": true,
-  "version": "2.7.2",
+  "version": "2.7.3",
   "workspaces": [
     "websites/*",
     "packages/doc-ui/*",
@@ -64,7 +64,8 @@
     "build:chrome": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=chrome webpack --config ./scripts/webpack.config.prod.mjs",
     "build:firefox": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=firefox webpack --config ./scripts/webpack.config.prod.mjs",
     "build:edge": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=edge webpack --config ./scripts/webpack.config.prod.mjs",
-    "build": "yarn build:chrome && yarn build:firefox && yarn build:edge"
+    "build": "yarn build:chrome && yarn build:firefox && yarn build:edge && yarn removeEmptyFile",
+    "removeEmptyFile": "rm -rf ./dist/*/manifest.js"
   },
   "devDependencies": {
     "@babel/core": "7.17.9",

diff --git a/packages/background/package.json b/packages/background/package.json
@@ -1,6 +1,6 @@
 {
   "name": "helios-background",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "type": "module",
   "main": "src/index.js",
   "private": true,

diff --git a/packages/browser-extension/package.json b/packages/browser-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browser-extension",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "main": "index.js",
   "author": "yqrashawn <namy.19@gmail.com>",
   "license": "MIT",

diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -2,11 +2,11 @@
   "name": "@fluent-wallet/ledger",
   "type": "module",
   "main": "index.js",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "dependencies": {
     "@fluent-wallet/base32-address": "workspace:packages/base32-address",
     "@fluent-wallet/hw-app-conflux": "0.0.8",
-    "@ledgerhq/hw-app-eth": "6.38.0",
+    "@ledgerhq/hw-app-eth": "6.24.1",
     "@ledgerhq/hw-transport-webusb": "6.29.2"
   }
 }
diff --git a/packages/popup/package.json b/packages/popup/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "helios-popup",
   "type": "module",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "main": "index.js",
   "author": "yqrashawn <namy.19@gmail.com>",
   "license": "MIT",

diff --git a/packages/rpcs/cfx_sendTransaction/package.json b/packages/rpcs/cfx_sendTransaction/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.0.1",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "dependencies": {
     "@fluent-wallet/cfx_sign-transaction": "workspace:*",
     "@fluent-wallet/spec": "workspace:packages/spec"

diff --git a/packages/rpcs/cfx_signTransaction/package.json b/packages/rpcs/cfx_signTransaction/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.0.1",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "dependencies": {
     "@fluent-wallet/ledger": "workspace:packages/ledger",
     "@fluent-wallet/signature": "workspace:packages/signature"

diff --git a/packages/rpcs/cfx_signTxWithLedgerNanoS/package.json b/packages/rpcs/cfx_signTxWithLedgerNanoS/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.1.0",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "dependencies": {
     "@fluent-wallet/ledger": "workspace:*",
     "@fluent-wallet/signature": "workspace:*",

diff --git a/packages/rpcs/eth_sendTransaction/package.json b/packages/rpcs/eth_sendTransaction/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.1.0",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "dependencies": {
     "@fluent-wallet/eth_sign-transaction": "workspace:*",
     "@fluent-wallet/spec": "workspace:*"

diff --git a/packages/rpcs/eth_signTransaction/package.json b/packages/rpcs/eth_signTransaction/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.1.0",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "dependencies": {
     "@ethersproject/units": "5.6.1",
     "@fluent-wallet/consts": "workspace:*",

diff --git a/packages/rpcs/eth_signTxWithLedgerNanoS/package.json b/packages/rpcs/eth_signTxWithLedgerNanoS/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.1.0",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "dependencies": {
     "@ethereumjs/rlp": "5.0.2",
     "@ethereumjs/tx": "5.3.0",

diff --git a/packages/rpcs/wallet_importHardwareWalletAccountGroupOrAccount/package.json b/packages/rpcs/wallet_importHardwareWalletAccountGroupOrAccount/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.1.0",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "dependencies": {
     "@fluent-wallet/base32-address": "workspace:*",
     "@fluent-wallet/ledger": "workspace:packages/ledger",

diff --git a/packages/rpcs/wallet_sendTransaction/package.json b/packages/rpcs/wallet_sendTransaction/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.1.0",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "dependencies": {
     "@ethersproject/bignumber": "5.6.2",
     "@fluent-wallet/cfx_send-transaction": "workspace:*",

diff --git a/packages/rpcs/wallet_sendTransactionWithAction/package.json b/packages/rpcs/wallet_sendTransactionWithAction/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "main": "index.js",
   "packageManager": "yarn@3.2.0",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "dependencies": {
     "@fluent-wallet/spec": "workspace:*",
     "@fluent-wallet/wallet_send-transaction": "workspace:*"

diff --git a/scripts/webpack.config.cjs b/scripts/webpack.config.cjs
@@ -113,6 +113,7 @@ const defaultConfig = {
     },
     alias: {
       '/images': path.join(packagesPath, 'browser-extension/images'),
+      "js-conflux-sdk": path.join(path.resolve(), './node_modules/js-conflux-sdk'),
     },
   },
   plugins: [

diff --git a/scripts/webpack.config.dev.mjs b/scripts/webpack.config.dev.mjs
@@ -15,6 +15,11 @@ const devConfig = {
   mode: 'development',
   devtool: 'inline-cheap-module-source-map',
   watch: true,
+  output: isFirefox
+    ? {
+        chunkFormat: 'array-push',
+      }
+    : undefined,
   plugins: [
     new Dotenv({
       prefix: 'import.meta.env.',

diff --git a/scripts/webpack.config.prod.mjs b/scripts/webpack.config.prod.mjs
@@ -13,6 +13,15 @@ const isFirefox = process.env.TARGET_BROWSER === 'firefox'
 const prodConfig = {
   mode: 'production',
   devtool: false,
+  performance: {
+    maxEntrypointSize: 2500000,
+    maxAssetSize: 2500000,
+  },
+  output: isFirefox
+    ? {
+        chunkFormat: 'array-push',
+      }
+    : undefined,
   plugins: [
     new MiniCssExtractPlugin(),
     new Dotenv({
@@ -23,6 +32,7 @@ const prodConfig = {
     // new BundleAnalyzerPlugin(),
   ],
   optimization: {
+    minimize: true,
     minimizer: [
       new EsbuildPlugin({
         target: 'esnext', // Syntax to transpile to (see options below for possible values)