diff --git a/.ckb-light-version b/.ckb-light-version index 576b77719a..f82e0685d9 100644 --- a/.ckb-light-version +++ b/.ckb-light-version @@ -1 +1 @@ -v0.2.3 +v0.2.4 diff --git a/packages/neuron-ui/src/components/NervosDAO/hooks.ts b/packages/neuron-ui/src/components/NervosDAO/hooks.ts index 2b7bb35c4e..4db179fa68 100644 --- a/packages/neuron-ui/src/components/NervosDAO/hooks.ts +++ b/packages/neuron-ui/src/components/NervosDAO/hooks.ts @@ -563,18 +563,18 @@ export const useUpdateDepositEpochList = ({ if (connectionStatus === 'online') { getBlockHashes(records.map(v => v.depositOutPoint?.txHash).filter(v => !!v) as string[]).then( depositBlockHashes => { - const recordKeyIdxMap = new Map() + const recordKeyIdx: string[] = [] const batchParams: ['getHeader', string][] = [] - records.forEach((record, idx) => { + records.forEach((record) => { if (!record.depositOutPoint && record.blockHash) { batchParams.push(['getHeader', record.blockHash]) - recordKeyIdxMap.set(record.outPoint.txHash, idx) + recordKeyIdx.push(record.outPoint.txHash) } }) - depositBlockHashes.forEach((v, idx) => { + depositBlockHashes.forEach((v) => { if (v.blockHash) { batchParams.push(['getHeader', v.blockHash]) - recordKeyIdxMap.set(v.txHash, idx) + recordKeyIdx.push(v.txHash) } }) ckbCore.rpc @@ -584,7 +584,7 @@ export const useUpdateDepositEpochList = ({ const epochList = new Map() records.forEach(record => { const key = record.depositOutPoint ? record.depositOutPoint.txHash : record.outPoint.txHash - epochList.set(key, recordKeyIdxMap.has(key) ? res[recordKeyIdxMap.get(key)!]?.epoch : null) + epochList.set(key, res[recordKeyIdx.indexOf(key)]?.epoch) }) setDepositEpochList(epochList) }) diff --git a/packages/neuron-wallet/src/services/node.ts b/packages/neuron-wallet/src/services/node.ts index 6e0d3feb7d..b8e38df6d3 100644 --- a/packages/neuron-wallet/src/services/node.ts +++ b/packages/neuron-wallet/src/services/node.ts @@ -143,13 +143,16 @@ class NodeService { } else { logger.info('CKB:\texternal RPC on default uri detected, skip starting bundled CKB node.') this._isCkbNodeExternal = true - await this.verifyNodeVersion() - await this.verifyStartWithIndexer() + const network = NetworksService.getInstance().getCurrent() + if (network.type !== NetworkType.Light) { + await this.verifyNodeVersion() + await this.verifyStartWithIndexer() + } } } public async isDefaultCKBNeedRestart() { - let network = NetworksService.getInstance().getCurrent() + const network = NetworksService.getInstance().getCurrent() if (network.remote !== BUNDLED_CKB_URL && network.remote !== BUNDLED_LIGHT_CKB_URL) { return false }