Merge branch 'develop' into dependabot/npm_and_yarn/packages/neuron-ui/canvg-4.0.3

Author: Keith-CY

.github/workflows/check-code-style.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Changed Files
         id: changed-files
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@v46
         with:
           files: "packages/**/*.{js,cjs,mjs,jsx,ts,tsx,css,scss}"
 

packages/neuron-ui/package.json

@@ -108,7 +108,7 @@
     "storybook": "8.6.4",
     "storybook-addon-react-router-v6": "2.0.10",
     "terser": "5.39.0",
-    "vite": "6.2.1",
+    "vite": "6.2.4",
     "vite-plugin-commonjs": "0.10.4",
     "vite-plugin-eslint": "1.8.1",
     "vite-plugin-node-polyfills": "0.23.0",

packages/neuron-ui/src/containers/Navbar/index.tsx

@@ -116,6 +116,15 @@ const Navbar = () => {
   }, [i18n.language])
 
   useEffect(() => {
+    if (verifyCkbResult && !verifyCkbResult.withIndexer) {
+      showGlobalAlertDialog({
+        type: 'warning',
+        message: t('navbar.ckb-without-indexer'),
+        action: 'ok',
+      })(dispatch)
+      return
+    }
+
     // isUpdated is true or version is not empty means check update has return
     if (!verifyCkbResult || (isUpdated !== true && !version)) {
       return
@@ -142,12 +151,6 @@ const Navbar = () => {
         ),
         action: 'ok',
       })(dispatch)
-    } else if (!verifyCkbResult.withIndexer) {
-      showGlobalAlertDialog({
-        type: 'warning',
-        message: t('navbar.ckb-without-indexer'),
-        action: 'ok',
-      })(dispatch)
     }
   }, [verifyCkbResult, version, isUpdated])
 

packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts

@@ -26,24 +26,23 @@ export default class FullSynchronizer extends Synchronizer {
   }
 
   private async initSync() {
-    await this.processNextBlockNumber()
+    try {
+      await this.processNextBlockNumber()
 
-    while (this.pollingIndexer) {
-      const indexerTipBlock = await this.indexer.tip()
-      await this.synchronize(indexerTipBlock)
-      await CommonUtils.sleep(5000)
+      while (this.pollingIndexer) {
+        const indexerTipBlock = await this.indexer.tip()
+        await this.synchronize(indexerTipBlock)
+        await CommonUtils.sleep(5000)
+      }
+    } catch (error) {
+      logger.error(`Error connecting to Indexer: ${error.message}`)
     }
   }
 
   public async connect() {
-    try {
-      this.pollingIndexer = true
+    this.pollingIndexer = true
 
-      this.initSync()
-    } catch (error) {
-      logger.error(`Error connecting to Indexer: ${error.message}`)
-      throw error
-    }
+    this.initSync()
   }
 
   async processTxsInNextBlockNumber() {

packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts

@@ -280,14 +280,18 @@ export default class LightSynchronizer extends Synchronizer {
   }
 
   private async initSync(syncMultisig?: boolean) {
-    if (syncMultisig) {
-      await this.initMultisigSyncProgress()
-    } else {
-      await this.initSyncProgress()
-    }
-    while (this.pollingIndexer) {
-      await this.synchronize()
-      await scheduler.wait(5000)
+    try {
+      if (syncMultisig) {
+        await this.initMultisigSyncProgress()
+      } else {
+        await this.initSyncProgress()
+      }
+      while (this.pollingIndexer) {
+        await this.synchronize()
+        await scheduler.wait(5000)
+      }
+    } catch (error) {
+      logger.error(`Error connecting to Light: ${error.message}`)
     }
   }
 
@@ -324,15 +328,10 @@ export default class LightSynchronizer extends Synchronizer {
   }
 
   public async connect(syncMultisig?: boolean) {
-    try {
-      logger.info('LightConnector:\tconnect ...:')
-      this.pollingIndexer = true
-      this.syncMultisig = syncMultisig
-      this.initSync(syncMultisig)
-    } catch (error) {
-      logger.error(`Error connecting to Light: ${error.message}`)
-      throw error
-    }
+    logger.info('LightConnector:\tconnect ...:')
+    this.pollingIndexer = true
+    this.syncMultisig = syncMultisig
+    this.initSync(syncMultisig)
   }
 
   private async checkTxExist(txHashes: string[]) {

packages/neuron-wallet/src/services/node.ts

@@ -280,7 +280,8 @@ class NodeService {
     const network = NetworksService.getInstance().getCurrent()
     try {
       const res = await rpcRequest<{ error?: { code: number } }>(network.remote, { method: 'get_indexer_tip' })
-      if (res.error?.code === START_WITHOUT_INDEXER) {
+
+      if (res.error?.code === START_WITHOUT_INDEXER || (Array.isArray(res) && res.length === 0)) {
         logger.info('Node:\tthe ckb node does not start with --indexer')
         return false
       }

yarn.lock

@@ -1351,24 +1351,10 @@
     "@babel/plugin-transform-modules-commonjs" "^7.23.3"
     "@babel/plugin-transform-typescript" "^7.23.3"
 
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
-  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/runtime@^7.23.2":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d"
-  integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
-"@babel/runtime@^7.25.0", "@babel/runtime@^7.8.4":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.9.tgz#aa4c6facc65b9cb3f87d75125ffd47781b475433"
-  integrity sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.25.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+  version "7.27.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762"
+  integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -14190,7 +14176,7 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.7:
+regenerator-runtime@^0.13.7:
   version "0.13.11"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
@@ -15477,9 +15463,9 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tar-fs@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
+  integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
@@ -16340,10 +16326,10 @@ vite-plugin-svgr@4.3.0:
     "@svgr/core" "^8.1.0"
     "@svgr/plugin-jsx" "^8.1.0"
 
-vite@6.2.1, "vite@^5.0.0 || ^6.0.0":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-6.2.1.tgz#ae865d4bb93a11844be1bc647c8b2dd1856ea180"
-  integrity sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==
+vite@6.2.4, "vite@^5.0.0 || ^6.0.0":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-6.2.4.tgz#05809de3f918fded87f73a838761995a4d66a680"
+  integrity sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw==
   dependencies:
     esbuild "^0.25.0"
     postcss "^8.5.3"