Skip to content

fix: Fix dao progress bar and light client should not verify version and indexer #2679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keith-CY merged 4 commits into from
May 24, 2023
Merged

fix: Fix dao progress bar and light client should not verify version and indexer #2679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab3d38b
fix: Fix dao progress bar and light client should not verify version …
yanguoyu May 23, 2023
da7537b
fix: use const if variable will not change.
yanguoyu May 23, 2023
7a180eb
feat: update light client version.
yanguoyu May 23, 2023
c980a37
fix: More clear code.
yanguoyu May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ckb-light-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.2.3
v0.2.4
12 changes: 6 additions & 6 deletions packages/neuron-ui/src/components/NervosDAO/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, number>()
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
Expand All @@ -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)
})
Expand Down
9 changes: 6 additions & 3 deletions packages/neuron-wallet/src/services/node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down