Merge branch 'develop' into dependabot/npm_and_yarn/vite-6.4.1

walker27 · web-flow · commit 476847152916 · 2026-01-06T10:40:31.000+08:00
diff --git a/.ckb-light-version b/.ckb-light-version
@@ -1 +1 @@
-v0.5.3
+v0.5.4
diff --git a/.ckb-version b/.ckb-version
@@ -1 +1 @@
-v0.202.0
+v0.204.0
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -11,8 +11,7 @@ jobs:
   default:
     strategy:
       matrix:
-        node:
-          - lts/*
+        node: [22]
         os:
           - macos-latest
           - ubuntu-latest
diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
@@ -11,8 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node:
-          - lts/*
+        node: [22]
         os:
           - macos-latest
           - ubuntu-latest
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Download [CKB Indexer](https://github.com/nervosnetwork/ckb-indexer/releases) an
 
 As of `v0.26.0`, Neuron bundles a CKB binary and starts it for Mainnet automatically. If you prefer to run a local CKB node yourself instead, please follow the [Nervos CKB doc](https://docs.nervos.org/docs/basics/guides/mainnet) to get it up and running before launching Neuron.
 
-**Note**: If you run CKB node on Windows but it fails to start, you may need to download and install the latest [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads).
+**Note**: If you run CKB node on Windows but it fails to start, you may need to download and install the latest [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170).
 
 ### Start Neuron in Development Mode
 
diff --git a/compatible.json b/compatible.json
@@ -1,5 +1,7 @@
 {
   "fullVersions": [
+    "0.204",
+    "0.203",
     "0.202",
     "0.201",
     "0.200",
@@ -32,6 +34,8 @@
   "compatible": {
     "0.111": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -58,6 +62,8 @@
     },
     "0.110": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -100,6 +106,8 @@
     },
     "0.112": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -126,6 +134,8 @@
     },
     "0.114": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -152,6 +162,8 @@
     },
     "0.116": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -178,6 +190,8 @@
     },
     "0.117": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -204,6 +218,8 @@
     },
     "0.119": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -230,6 +246,8 @@
     },
     "0.120": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -256,6 +274,8 @@
     },
     "0.121": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -282,6 +302,8 @@
     },
     "0.201": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
@@ -308,6 +330,8 @@
     },
     "0.202": {
       "full": [
+        "0.204",
+        "0.203",
         "0.202",
         "0.201",
         "0.200",
diff --git a/packages/neuron-ui/public/css/fonts.css b/packages/neuron-ui/public/css/fonts.css
@@ -8,18 +8,6 @@
   src: url('../fonts/SourceCodePro-Regular.ttf') format('truetype');
 }
 
-@font-face {
-  font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximaNova-Regular.otf') format('opentype'),
-    url('../fonts//Proximanova-Regular.ttf') format('opentype');
-}
-
-@font-face {
-  font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximaNova-Semibold.otf') format('opentype'),
-    url('../fonts/ProximaNova-Semibold.ttf') format('opentype');
-}
-
 @font-face {
   font-family: 'D-DIN-PRO';
   src: url('../fonts/D-DIN-PRO-500-Medium.otf') format('opentype'),
diff --git a/packages/neuron-ui/public/fonts/ProximaNova-Regular.otf b/packages/neuron-ui/public/fonts/ProximaNova-Regular.otf
diff --git a/packages/neuron-ui/public/fonts/ProximaNova-Semibold.otf b/packages/neuron-ui/public/fonts/ProximaNova-Semibold.otf
diff --git a/packages/neuron-ui/public/fonts/ProximaNova-Semibold.ttf b/packages/neuron-ui/public/fonts/ProximaNova-Semibold.ttf
diff --git a/packages/neuron-ui/public/fonts/Proximanova-Regular.ttf b/packages/neuron-ui/public/fonts/Proximanova-Regular.ttf
diff --git a/packages/neuron-ui/src/components/ImportHardware/common.ts b/packages/neuron-ui/src/components/ImportHardware/common.ts
@@ -3,7 +3,7 @@ import { FailureFromController } from 'services/remote/remoteApiWrapper'
 
 export enum ImportStep {
   DetectDevice = '/detect-device',
-  Comfirming = '/confirming',
+  Confirming = '/confirming',
   Error = '/error',
   Success = '/success',
   NameWallet = '/name-wallet',
diff --git a/packages/neuron-ui/src/components/ImportHardware/detect-device.tsx b/packages/neuron-ui/src/components/ImportHardware/detect-device.tsx
@@ -98,7 +98,7 @@ const DetectDevice = ({ dispatch, model }: { dispatch: React.Dispatch<ActionType
   })
 
   const onNext = useCallback(() => {
-    dispatch({ step: ImportStep.Comfirming })
+    dispatch({ step: ImportStep.Confirming })
   }, [dispatch])
 
   const errorMsg = error.startsWith('messages.codes.') ? t(error) : error
diff --git a/packages/neuron-ui/src/components/ImportHardware/index.tsx b/packages/neuron-ui/src/components/ImportHardware/index.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useReducer } from 'react'
 import { useDialogWrapper } from 'utils'
-import Comfirming from './confirming'
+import Confirming from './confirming'
 import ImportError from './import-error'
 import SelectModel from './select-model'
 import DetectDevice from './detect-device'
@@ -33,7 +33,7 @@ const Content = () => {
   switch (importHardwareStates.step) {
     case ImportStep.ImportHardware:
     case ImportStep.DetectDevice:
-    case ImportStep.Comfirming:
+    case ImportStep.Confirming:
     case ImportStep.Error:
     case ImportStep.Success:
       return (
@@ -43,7 +43,7 @@ const Content = () => {
             {ImportStep.DetectDevice === importHardwareStates.step && (
               <DetectDevice dispatch={dispatch} model={importHardwareStates.model!} />
             )}
-            {ImportStep.Comfirming === importHardwareStates.step && <Comfirming dispatch={dispatch} />}
+            {ImportStep.Confirming === importHardwareStates.step && <Confirming dispatch={dispatch} />}
             {ImportStep.Error === importHardwareStates.step && (
               <ImportError dispatch={dispatch} error={importHardwareStates.error} />
             )}
diff --git a/packages/neuron-ui/src/components/WalletWizard/index.tsx b/packages/neuron-ui/src/components/WalletWizard/index.tsx
@@ -304,7 +304,7 @@ const Mnemonic = ({ state = initState, rootPath = '/wizard/', dispatch }: Wizard
           </div>
           <div className={styles.commendItem}>
             <ErrorIcon />
-            {t('wizard.do-not-save-scrrenshots')}
+            {t('wizard.do-not-save-screenshots')}
           </div>
         </div>
       )}
diff --git a/packages/neuron-ui/src/locales/ar.json b/packages/neuron-ui/src/locales/ar.json
@@ -188,7 +188,7 @@
       "wallet-suffix": "محفظة {{suffix}}",
       "handwritten-recommended": "يوصى بالنسخ اليدوي",
       "do-not-copy": "لا تقم بالنسخ",
-      "do-not-save-scrrenshots": "لا تحفظ لقطات الشاشة",
+      "do-not-save-screenshots": "لا تحفظ لقطات الشاشة",
       "replenish-your-seed": "يرجى استعادة بذرة محفظتك",
       "new-name": "استخدم اسمًا غير مستخدم للمحفظة الجديدة",
       "complex-password": "يجب أن تتكون كلمة المرور من 8 إلى 50 حرفًا وتحتوي على ثلاث فئات على الأقل من الفئات التالية: حروف كبيرة، حروف صغيرة، أرقام، ورموز خاصة.",
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
@@ -188,7 +188,7 @@
       "wallet-suffix": "Wallet {{suffix}}",
       "handwritten-recommended": "Handwritten transcription recommended",
       "do-not-copy": "Do not copy",
-      "do-not-save-scrrenshots": "Do not save scrrenshots",
+      "do-not-save-screenshots": "Do not save screenshots",
       "replenish-your-seed": "Please replenish your wallet seed",
       "new-name": "Use an unused name for the new wallet",
       "complex-password": "The password should be 8 to 50 characters long containing at least three character categories among the following: uppercase letters, lowercase letters, numbers, and special symbols.",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
@@ -181,7 +181,7 @@
       "wallet-suffix": "Billetera {{suffix}}",
       "handwritten-recommended": "Se recomienda transcripción a mano",
       "do-not-copy": "No copiar",
-      "do-not-save-scrrenshots": "No guardar capturas de pantalla",
+      "do-not-save-screenshots": "No guardar capturas de pantalla",
       "replenish-your-seed": "Por favor, repón la semilla de tu billetera",
       "new-name": "Usa un nombre no usado previamente para la nueva billetera",
       "complex-password": "La contraseña debe tener entre 8 y 50 caracteres y contener al menos tres categorías de caracteres entre las siguientes: letras en mayúscula, letras en minúscula, números y símbolos especiales.",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
@@ -188,7 +188,7 @@
       "wallet-suffix": "Wallet {{suffix}}",
       "handwritten-recommended": "Transcription manuscrite recommandée",
       "do-not-copy": "Ne pas copier",
-      "do-not-save-scrrenshots": "Ne pas sauvegarder de captures d'écran",
+      "do-not-save-screenshots": "Ne pas sauvegarder de captures d'écran",
       "replenish-your-seed": "Veuillez reconstituer la graine de votre portefeuille",
       "new-name": "Utilisez un nom inutilisé pour le nouveau Wallet",
       "complex-password": "Le mot de passe doit contenir entre 8 et 50 caractères, comprenant au moins trois catégories parmi les suivantes : lettres majuscules, lettres minuscules, chiffres et symboles spéciaux.",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
@@ -182,7 +182,7 @@
       "wallet-suffix": "錢包 {{suffix}}",
       "handwritten-recommended": "推薦手寫抄錄",
       "do-not-copy": "不要複製",
-      "do-not-save-scrrenshots": "不要保存截圖",
+      "do-not-save-screenshots": "不要保存截圖",
       "replenish-your-seed": "請補充您的助記詞",
       "new-name": "輸入新的錢包名稱",
       "complex-password": "密碼為 8 至 50 字元由大寫字母、小寫字母、數位、特殊符號中至少三種字元組成的字串。",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
@@ -181,7 +181,7 @@
       "wallet-suffix": "钱包 {{suffix}}",
       "handwritten-recommended": "推荐手写抄录",
       "do-not-copy": "不要复制",
-      "do-not-save-scrrenshots": "不要保存截图",
+      "do-not-save-screenshots": "不要保存截图",
       "replenish-your-seed": "请补充您的助记词",
       "new-name": "输入新的钱包名称",
       "complex-password": "密码为 8 至 50 位由大写字母、小写字母、数字、特殊符号中至少三类字符组成的字符串。",
diff --git a/packages/neuron-ui/src/widgets/MnemonicInput/index.module.scss b/packages/neuron-ui/src/widgets/MnemonicInput/index.module.scss
@@ -15,7 +15,6 @@
   }
 
   & * {
-    font-family: 'ProximaNova-Regular';
     font-size: 14px;
   }
 
diff --git a/packages/neuron-wallet/electron-builder.yml b/packages/neuron-wallet/electron-builder.yml
@@ -1,4 +1,4 @@
-appId: com.nervos.neuron
+appId: com.nervos.app5.neuron
 copyright: Copyright (C) 2019-2025 Nervos Foundation.
 productName: Neuron
 
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
@@ -69,7 +69,7 @@
     "sqlite3": "5.1.6",
     "subleveldown": "4.1.4",
     "tslib": "2.6.3",
-    "typeorm": "0.3.17",
+    "typeorm": "0.3.26",
     "uuid": "8.3.2"
   },
   "devDependencies": {
diff --git a/packages/neuron-wallet/scripts/notarize.js b/packages/neuron-wallet/scripts/notarize.js
@@ -26,7 +26,7 @@ exports.default = async function notarizing(context) {
 
   try {
     await notarize({
-      appBundleId: 'com.nervos.neuron',
+      appBundleId: 'com.nervos.app5.neuron',
       appPath: `${appOutDir}/${appName}.app`,
       appleId,
       appleIdPassword,
diff --git a/packages/neuron-wallet/src/services/node.ts b/packages/neuron-wallet/src/services/node.ts
@@ -224,7 +224,7 @@ class NodeService {
         noLink: true,
       })
       .then(() => {
-        const VC_REDIST_URL = `https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads`
+        const VC_REDIST_URL = `https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170`
         shell.openExternal(VC_REDIST_URL)
         env.app.quit()
         return false
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -25,8 +25,8 @@ export default class SyncProgressService {
         },
       })
     const existHashes = new Set(existProgresses.map(v => v.hash))
-    const newSyncProgreses = syncProgresses.filter(v => !existHashes.has(v.hash))
-    await getConnection().manager.save(newSyncProgreses, { chunk: 100 })
+    const newSyncProgresses = syncProgresses.filter(v => !existHashes.has(v.hash))
+    await getConnection().manager.save(newSyncProgresses, { chunk: 100 })
   }
 
   static async updateSyncProgressFlag(existWalletIds: string[]) {
diff --git a/renovate.json b/renovate.json
@@ -8,5 +8,5 @@
       "addLabels": ["types"]
     }
   ],
-  "reviewers": ["Magickbase/neuron"]
+  "reviewers": ["Appfi5/neuron"]
 }
diff --git a/yarn.lock b/yarn.lock
