Skip to content
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.

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

feat: Use 2 phase commit to solve DAO's lock period issue #59

Merged
merged 2 commits into from
Oct 29, 2019

Conversation

xxuejie
Copy link
Collaborator

@xxuejie xxuejie commented Oct 24, 2019

TODO:

  • phase 1 tests

@xxuejie xxuejie requested review from a team October 24, 2019 07:26
c/dao.c Show resolved Hide resolved
@keroro520 keroro520 dismissed their stale review October 25, 2019 11:12

misunderstand

c/dao.c Outdated Show resolved Hide resolved
@doitian
Copy link
Member

doitian commented Oct 29, 2019

Merge first. I'll keep reviewing it later.

@doitian doitian merged commit 2b9daf3 into master Oct 29, 2019
@doitian doitian deleted the 2-phase-dao-adjustment branch October 29, 2019 07:09
bors bot added a commit to nervosnetwork/ckb that referenced this pull request Oct 29, 2019
1763: fix: fix cli output and ban reason r=quake a=driftluo

1. fix #1746
2. add reason on `ban_peer` in cx trait

1769: feat: Adapt to 2-phase Nervos DAO implementation r=doitian a=xxuejie

Depends on nervosnetwork/ckb-system-scripts#59

Co-authored-by: driftluo <[email protected]>
Co-authored-by: Xuejie Xiao <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants