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

Merge feat 2.0 #4321

Merged
merged 18 commits into from
Oct 17, 2023
Merged

Conversation

real-felix
Copy link
Contributor

Merge the feature branch with rewarded signatures with 2.0
To make that possible, the block header is now versioned.

@rafal-ch
Copy link
Contributor

rafal-ch commented Oct 6, 2023

bors try

casperlabs-bors-ng bot added a commit that referenced this pull request Oct 6, 2023
@casperlabs-bors-ng
Copy link
Contributor

try

Build failed:

Copy link
Contributor

@rafal-ch rafal-ch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Makefile Outdated Show resolved Hide resolved
@real-felix

This comment was marked as outdated.

@real-felix

This comment was marked as outdated.

@real-felix
Copy link
Contributor Author

bors r+

casperlabs-bors-ng bot added a commit that referenced this pull request Oct 12, 2023
4321: Merge feat 2.0 r=Boiethios a=Boiethios

Merge the feature branch with rewarded signatures with 2.0
To make that possible, the block header is now versioned.

Co-authored-by: Félix <felix@casperlabs.io>
Co-authored-by: Bartłomiej Kamiński <bart@casperlabs.io>
Co-authored-by: Félix / Felix <Boiethios@users.noreply.github.com>
Co-authored-by: Alexander Limonov <51098682+AlexanderLimonov@users.noreply.github.com>
Co-authored-by: Luca B <93586856+bradjohnl@users.noreply.github.com>
@casperlabs-bors-ng
Copy link
Contributor

Build failed:

@rafal-ch
Copy link
Contributor

bors try

casperlabs-bors-ng bot added a commit that referenced this pull request Oct 13, 2023
@casperlabs-bors-ng
Copy link
Contributor

try

Build succeeded:

Copy link
Collaborator

@fizyk20 fizyk20 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed the rewards distribution tests and the ExecutableBlock changes and both are looking good, with minor nitpicks 👍 As for the rest, we might have to rely on the tests and fix the issues as they appear 😅

node/src/components/block_synchronizer.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@alsrdn alsrdn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed the ExecutableBlock change and it looks good to me with only a new minor naming nits.

@real-felix
Copy link
Contributor Author

bors r+

casperlabs-bors-ng bot added a commit that referenced this pull request Oct 16, 2023
4321: Merge feat 2.0 r=Boiethios a=Boiethios

Merge the feature branch with rewarded signatures with 2.0
To make that possible, the block header is now versioned.

Co-authored-by: Félix <felix@casperlabs.io>
Co-authored-by: Bartłomiej Kamiński <bart@casperlabs.io>
Co-authored-by: Félix / Felix <Boiethios@users.noreply.github.com>
Co-authored-by: Alexander Limonov <51098682+AlexanderLimonov@users.noreply.github.com>
Co-authored-by: Luca B <93586856+bradjohnl@users.noreply.github.com>
@casperlabs-bors-ng
Copy link
Contributor

Timed out.

@real-felix
Copy link
Contributor Author

bors merge

@casperlabs-bors-ng
Copy link
Contributor

Build succeeded:

@casperlabs-bors-ng casperlabs-bors-ng bot merged commit ece8660 into casper-network:feat-2.0 Oct 17, 2023
3 checks passed
@real-felix real-felix deleted the merge-feat-2.0 branch October 17, 2023 15:43
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.

Version the block header Align the changes to rewards made for "private chain" and for "2.0"
7 participants