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.

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

Jump to bottom

fix: Use dao type script hash in dao transaction #1609

Merged
merged 3 commits into from
Sep 23, 2019
Merged

fix: Use dao type script hash in dao transaction #1609

merged 3 commits into from
Sep 23, 2019

Conversation

TheWaWaR
Copy link
Contributor

@TheWaWaR TheWaWaR commented Sep 19, 2019 •
edited

Dependent on this PR #1600

@TheWaWaR TheWaWaR requested a review from a team September 19, 2019 12:26
u2
u2 approved these changes Sep 20, 2019
View reviewed changes
test/src/node.rs Outdated Show resolved Hide resolved
u2
u2 reviewed Sep 20, 2019
View reviewed changes
test/src/node.rs Outdated Show resolved Hide resolved
@u2
Copy link
Contributor

u2 commented Sep 20, 2019

bors r=quake,u2

@nervos-bot nervos-bot bot added the s:ready-to-merge Status: Waiting to be merged. label Sep 20, 2019
bors bot added a commit that referenced this pull request Sep 20, 2019
@bors @TheWaWaR
Merge #1609
a1d2258 
1609: fix: Use dao type script hash in dao transaction r=quake,u2 a=TheWaWaR



Co-authored-by: Linfeng Qian <thewawar@gmail.com>
keroro520
keroro520 suggested changes Sep 20, 2019
View reviewed changes
spec/src/consensus.rs Outdated Show resolved Hide resolved
@u2
Copy link
Contributor

u2 commented Sep 20, 2019

bors r-

@bors
Copy link
Contributor

bors bot commented Sep 20, 2019

Canceled

@u2 u2 requested a review from keroro520 September 20, 2019 08:57
@TheWaWaR
Copy link
Contributor Author

bors r+

bors bot added a commit that referenced this pull request Sep 20, 2019
@bors @TheWaWaR
Merge #1609
99e4ac1 
1609: fix: Use dao type script hash in dao transaction r=TheWaWaR a=TheWaWaR

Dependent on this PR #1600

Co-authored-by: Linfeng Qian <thewawar@gmail.com>
@keroro520
Copy link
Contributor

@TheWaWaR resolve conflict

@TheWaWaR
Copy link
Contributor Author

bors r+

bors bot added a commit that referenced this pull request Sep 22, 2019
@bors @TheWaWaR
Merge #1609
4f95422 
1609: fix: Use dao type script hash in dao transaction r=TheWaWaR a=TheWaWaR

Dependent on this PR #1600

Co-authored-by: Linfeng Qian <thewawar@gmail.com>
@keroro520 keroro520 merged commit a5fc1fc into nervosnetwork:develop Sep 23, 2019
@TheWaWaR TheWaWaR deleted the fix-dao-type-script-compare branch June 10, 2022 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@quake quake quake approved these changes

@u2 u2 u2 approved these changes

@keroro520 keroro520 keroro520 approved these changes

Assignees
No one assigned
Labels
s:ready-to-merge Status: Waiting to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@TheWaWaR @u2 @keroro520 @quake @doitian