From 947f1e6d8a391f5aa619747a4dc85658f72fca82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com> Date: Fri, 15 Mar 2024 18:54:12 +0800 Subject: [PATCH] fix: The first sync only stuck full ckb node start. (#3081) --- packages/neuron-wallet/src/services/node.ts | 3 ++- packages/neuron-wallet/tests/services/node.test.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/neuron-wallet/src/services/node.ts b/packages/neuron-wallet/src/services/node.ts index d9731d2328..220bb5fa35 100644 --- a/packages/neuron-wallet/src/services/node.ts +++ b/packages/neuron-wallet/src/services/node.ts @@ -136,7 +136,8 @@ class NodeService { await stopMonitor('ckb') const isDefaultCKBNeedStart = await this.isDefaultCKBNeedRestart() if (isDefaultCKBNeedStart) { - if (SettingsService.getInstance().isFirstSync) { + const currentNetwork = NetworksService.getInstance().getCurrent() + if (SettingsService.getInstance().isFirstSync && currentNetwork.type === NetworkType.Default) { logger.info("CKB:\tThis is the first sync, please wait for the user's confirmation") return } diff --git a/packages/neuron-wallet/tests/services/node.test.ts b/packages/neuron-wallet/tests/services/node.test.ts index 29fafa3f4d..bff33582fb 100644 --- a/packages/neuron-wallet/tests/services/node.test.ts +++ b/packages/neuron-wallet/tests/services/node.test.ts @@ -571,7 +571,7 @@ describe('NodeService', () => { describe('test start default node', () => { beforeEach(() => { const NodeService = require('../../src/services/node').default - stubbedNetworsServiceGet.mockReturnValue({ remote: BUNDLED_CKB_URL, readonly: true }) + stubbedNetworsServiceGet.mockReturnValue({ remote: BUNDLED_CKB_URL, readonly: true, type: 0 }) getLocalNodeInfoMock.mockRejectedValue('not start') nodeService = new NodeService() })