Skip to content

chore: only get dao cells in live or failed #1091

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
classicalliu merged 2 commits into from
Nov 13, 2019
Merged

chore: only get dao cells in live or failed #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a3225
chore: only get dao cells in live or failed
classicalliu Nov 13, 2019
4f41d9d
fix: dao i18n
classicalliu Nov 13, 2019
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
4 changes: 2 additions & 2 deletions packages/neuron-ui/src/locales/zh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@
"interest-accumulated": "已累计 {{blockNumber}} 个块的利息",
"blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)",
"withdraw-alert": "风险提示：距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch，存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险",
"insufficient-alert-title": "未达到要求周期",
"insufficient-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作"
"insufficient-period-alert-title": "未达到要求周期",
"insufficient-period-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作"
}
}
}
6 changes: 4 additions & 2 deletions packages/neuron-wallet/src/services/cells.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Cell, OutPoint, Input } from 'types/cell-types'
import { CapacityNotEnough, CapacityNotEnoughForChange } from 'exceptions'
import { OutputStatus } from './tx/params'
import FeeMode from 'models/fee-mode'
import { TransactionStatus } from 'types/cell-types'

export const MIN_CELL_CAPACITY = '6100000000'

Expand Down Expand Up @@ -43,9 +44,10 @@ export default class CellsService {
.getRepository(OutputEntity)
.createQueryBuilder('output')
.leftJoinAndSelect('output.transaction', 'tx')
.where(`output.status <> :deadStatus AND output.daoData IS NOT NULL AND output.lockHash in (:...lockHashes) AND tx.blockNumber IS NOT NULL`, {
.where(`(output.status = :liveStatus OR tx.status = :failedStatus) AND output.daoData IS NOT NULL AND output.lockHash in (:...lockHashes) AND tx.blockNumber IS NOT NULL`, {
lockHashes,
deadStatus: OutputStatus.Dead,
liveStatus: OutputStatus.Live,
failedStatus: TransactionStatus.Failed,
})
.orderBy(`CASE output.daoData WHEN '0x0000000000000000' THEN 1 ELSE 0 END`, 'ASC')
.addOrderBy('tx.timestamp', 'ASC')
Expand Down