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

fix: blocktemplate dao potential inconsistent with transactions #3727

Merged

Conversation

zhangsoledad
Copy link
Member

@zhangsoledad zhangsoledad commented Nov 25, 2022

What problem does this PR solve?

In generating the blocktemplate is probably due to asynchronous reasons, resulting in the calculation of DAO is to filter out some conflicting transactions, but in filling in the blocktemplate transaction field did not use the filtered transactions, so led to potential inconsistency problems.

What is changed and how it works?

Ensure that the transaction used in filling the blocktemplate field is the same as the used in calculating the DAO

Check List

Tests

  • Unit test
  • Integration test

Release note

Title Only: Include only the PR title in the release note.

@zhangsoledad zhangsoledad requested a review from a team as a code owner November 25, 2022 11:22
@zhangsoledad zhangsoledad requested review from quake and removed request for a team November 25, 2022 11:22
@zhangsoledad zhangsoledad force-pushed the zhangsoledad/fix-blocktemplate-dao branch from 86ec06c to 751fdc5 Compare November 26, 2022 06:20
@zhangsoledad zhangsoledad requested a review from quake November 26, 2022 06:20
@zhangsoledad
Copy link
Member Author

bors r+

@bors
Copy link
Contributor

bors bot commented Nov 28, 2022

@bors bors bot merged commit c51f891 into nervosnetwork:develop Nov 28, 2022
bors bot added a commit that referenced this pull request Nov 28, 2022
3728: [backport] fix: blocktemplate dao potential inconsistent with transactions r=zhangsoledad a=zhangsoledad

<!--
Thank you for contributing to nervosnetwork/ckb!

If you haven't already, please read [CONTRIBUTING](https://github.com/nervosnetwork/ckb/blob/develop/CONTRIBUTING.md) document.

If you're unsure about anything, just ask; somebody should be along to answer within a day or two.

PR Title Format:
1. module [, module2, module3]: what's changed
2. *: what's changed
-->

### What problem does this PR solve?

backport #3727



### Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

- Unit test
- Integration test


### Release note <!-- Choose from None, Title Only and Note. Bugfixes or new features need a release note. -->

```release-note
None: Exclude this PR from the release note.
```



Co-authored-by: zhangsoledad <787953403@qq.com>
@doitian doitian mentioned this pull request Nov 28, 2022
@zhangsoledad zhangsoledad deleted the zhangsoledad/fix-blocktemplate-dao branch December 1, 2022 03:33
@doitian doitian mentioned this pull request Jan 12, 2023
4 tasks
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.

2 participants