Merge branch 'develop' into features/merge-unisat-1.4.5

btc-vision · Aug 20, 2024 · 40475d7 · 40475d7
2 parents efe2399 + fdfe590
commit 40475d7
Show file tree

Hide file tree

Showing 72 changed files with 4,073 additions and 19,638 deletions.
diff --git a/build/_raw/images/artifacts/bitcoin-testnet-all.svg b/build/_raw/images/artifacts/bitcoin-testnet-all.svg
diff --git a/build/_raw/images/artifacts/bitcoin-testnet.png b/build/_raw/images/artifacts/bitcoin-testnet.png
diff --git a/build/_raw/images/artifacts/fractal-mainnet.svg b/build/_raw/images/artifacts/fractal-mainnet.svg
diff --git a/build/_raw/images/artifacts/fractal-testnet.svg b/build/_raw/images/artifacts/fractal-testnet.svg
diff --git a/build/_raw/images/artifacts/fractalbitcoin-mainnet.png b/build/_raw/images/artifacts/fractalbitcoin-mainnet.png
diff --git a/build/_raw/images/artifacts/top-linear-gradient.png b/build/_raw/images/artifacts/top-linear-gradient.png
diff --git a/build/_raw/images/icons/overview.svg b/build/_raw/images/icons/overview.svg
diff --git a/build/_raw/images/icons/right.svg b/build/_raw/images/icons/right.svg
diff --git a/build/_raw/index.html b/build/_raw/index.html
@@ -10,7 +10,8 @@
 
     <title>OP_WALLET</title>
   </head>
-  <body style="background-color: #1c1919">
+
+  <body style="background-color: #070606">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--

diff --git a/build/_raw/notification.html b/build/_raw/notification.html
@@ -10,7 +10,8 @@
 
     <title>OP_WALLET</title>
   </head>
-  <body style="background-color: #1c1919">
+
+  <body style="background-color: #070606">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--

diff --git a/build/webpack.common.config.js b/build/webpack.common.config.js
@@ -72,18 +72,18 @@ const config = (env) => {
             config: false,
             plugins: !useTailwind
               ? [
-                'postcss-flexbugs-fixes',
-                ['postcss-preset-env', { autoprefixer: { flexbox: 'no-2009' }, stage: 3 }],
-                // Adds PostCSS Normalize as the reset css with default options,
-                // so that it honors browserslist config in package.json
-                // which in turn let's users customize the target behavior as per their needs.
-                'postcss-normalize'
-              ]
+                  'postcss-flexbugs-fixes',
+                  ['postcss-preset-env', { autoprefixer: { flexbox: 'no-2009' }, stage: 3 }],
+                  // Adds PostCSS Normalize as the reset css with default options,
+                  // so that it honors browserslist config in package.json
+                  // which in turn let's users customize the target behavior as per their needs.
+                  'postcss-normalize'
+                ]
               : [
-                'tailwindcss',
-                'postcss-flexbugs-fixes',
-                ['postcss-preset-env', { autoprefixer: { flexbox: 'no-2009' }, stage: 3 }]
-              ]
+                  'tailwindcss',
+                  'postcss-flexbugs-fixes',
+                  ['postcss-preset-env', { autoprefixer: { flexbox: 'no-2009' }, stage: 3 }]
+                ]
           },
           sourceMap: isEnvProduction ? shouldUseSourceMap : isEnvDevelopment
         }
@@ -102,7 +102,7 @@ const config = (env) => {
               'primary-color': 'rgb(234,202,68)',
               'primary-color-active': '#383535',
               'input-icon-hover-color': '#FFFFFF',
-              'component-background': '#1C1919',
+              'component-background': '#070606',
               'select-dropdown-bg': '#2A2626',
               'select-item-selected-bg': '#332F2F',
               'select-item-active-bg': '#332F2F',

diff --git a/package.json b/package.json
@@ -96,6 +96,7 @@
         "koa-compose": "^4.1.0",
         "lodash-es": "^4.17.21",
         "loglevel": "^1.8.0",
+        "react-idle-timer": "^5.7.2",
         "mini-css-extract-plugin": "^2.4.5",
         "opnet": "1.0.48",
         "postcss": "^8.4.39",
@@ -146,7 +147,8 @@
         "webpack-dev-server": "^4.6.0",
         "webpack-extension-reloader": "^1.1.4",
         "webpack-manifest-plugin": "^4.0.2",
-        "workbox-webpack-plugin": "^6.4.1"
+        "workbox-webpack-plugin": "^6.4.1",
+        "zxcvbn": "^4.4.2"
     },
     "browserslist": {
         "production": [

diff --git a/release-notes.md b/release-notes.md
@@ -1,5 +1,27 @@
 # UniSat Wallet Release Notes
 
+## v1.4.2
+
+- Support Testnet4
+- Support Signet
+- Fixed the issue of the app crashing when transferring Runes with multiple UTXOs
+- Fixed the issue with the display of the available balance of partially-colored funds during an ARC20 transfer
+- Fixed the issue with the incorrect display of HdPath in Keystone
+- Audit fix: Removed private methods from the browser plugin object to enhance security
+- Audit fix: Methods such as getPublicKey, getNetwork, switchNetwork are now only accessible after authorization for improved security.
+
+## v1.4.1
+
+- Support for setting transfer fees with one decimal place
+- Added display of USD prices for BTC、BRC20 and Runes
+- Real-time fee displays for various buy BTC options
+- Fix unisat.sendRunes
+- Fix unisat.multiSginPsbt
+
+## v1.4.0
+
+- Support fractalbitcoin
+
 ## v1.3.4
 
 - Compatible with partial token coloring for ARC20

diff --git a/src/background/controller/provider/controller.ts b/src/background/controller/provider/controller.ts
@@ -1,3 +1,4 @@
+
 import { permissionService, sessionService } from '@/background/service';
 import { CHAINS, CHAINS_MAP, NETWORK_TYPES, VERSION } from '@/shared/constant';
 
@@ -42,7 +43,7 @@ class ProviderController extends BaseController {
         sessionService.broadcastEvent('accountsChanged', account);
         const connectSite = permissionService.getConnectedSite(origin);
         if (connectSite) {
-            const network = wallet.getNetworkName();
+            const network = wallet.getLegacyNetworkName();
             sessionService.broadcastEvent(
                 'networkChanged',
                 {
@@ -55,22 +56,25 @@ class ProviderController extends BaseController {
         return account;
     };
 
-    @Reflect.metadata('SAFE', true)
-    getAccounts = async ({ session: { origin } }) => {
-        if (!permissionService.hasPermission(origin)) {
-            return [];
-        }
+  disconnect = async ({ session: { origin } }) => {
+    wallet.removeConnectedSite(origin)
+  };
+
+  @Reflect.metadata('SAFE', true)
+  getAccounts = async ({ session: { origin } }) => {
+    if (!permissionService.hasPermission(origin)) {
+      return [];
+    }
 
         const _account = await wallet.getCurrentAccount();
         const account = _account ? [_account.address] : [];
         return account;
     };
 
-    @Reflect.metadata('SAFE', true)
-    getNetwork = async () => {
-        const networkType = wallet.getNetworkType();
-        return NETWORK_TYPES[networkType].name;
-    };
+  @Reflect.metadata('SAFE', true)
+  getNetwork = async () => {
+    return wallet.getLegacyNetworkName()
+  };
 
     @Reflect.metadata('APPROVAL', ['SwitchNetwork', (req) => {
         const network = req.data.params.network;

diff --git a/src/background/controller/provider/internalMethod.ts b/src/background/controller/provider/internalMethod.ts
@@ -11,21 +11,25 @@ const tabCheckin = ({
     session.setProp({ origin, name, icon });
 };
 
-const getProviderState = async () => {
-    const isUnlocked = keyringService.memStore.getState().isUnlocked;
-    const accounts: string[] = [];
-    if (isUnlocked) {
-        const currentAccount = await wallet.getCurrentAccount();
-        if (currentAccount) {
-            accounts.push(currentAccount.address);
-        }
+const getProviderState = async (req) => {
+  const {
+    session: { origin }
+  } = req;
+
+  const isUnlocked = keyringService.memStore.getState().isUnlocked;
+  const accounts: string[] = [];
+  if (isUnlocked) {
+    const currentAccount = await wallet.getCurrentAccount();
+    if (currentAccount) {
+      accounts.push(currentAccount.address);
     }
-    return {
-        network: wallet.getNetworkName(),
-        chain: wallet.getChainType(),
-        isUnlocked,
-        accounts
-    };
+  }
+  return {
+    network: wallet.getLegacyNetworkName(),
+      chain: wallet.getChainType(),
+    isUnlocked,
+    accounts
+  };
 };
 
 const keepAlive = () => {