Skip to content

Port aleph-node 8.2 testnet to mainnet branch #776

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
Merged
Marcin-Radecki merged 8 commits into from
Dec 1, 2022
Merged

Port aleph-node 8.2 testnet to mainnet branch #776

Marcin-Radecki merged 8 commits into from
Dec 1, 2022

Conversation

@Marcin-Radecki
Copy link
Contributor

@Marcin-Radecki Marcin-Radecki commented Dec 1, 2022

Following commands has been done:

git checkout release-8
git checkout -b port-8-X-Testnet-to-Mainnet
git merge release-8-mainnet # to pick up revert SCs change, resolved conflicts only in locks and toml files 
nvim bin/node/Cargo.toml # bump version to 0.8.2+mainnet
git commit -am "..."
git push -u origin HEAD

Michal Swietek and others added 6 commits November 29, 2022 00:21
Request justification from forks
6ae50ca
@Marcin-Radecki
Reverted changes to cargo lock introduced in 6ae50ca (#773)
2ac588d
@timorl
A0-1635: Limit nonfinalized block production (#769) (#774)
285c13d 
* A0-1635: Limit nonfinalized block production (#769)

* Limit nonfinalized block production

* Better saturation handling

* Add log when delaying block production

* Disable two tests that were operating under outdated assumptions

* Disable one more test

* Turn off the likely broken test
@Marcin-Radecki
Merge branch 'release-8-mainnet' into port-8-X-Testnet-to-Mainnet
e421102
@Marcin-Radecki
Changed node version
9a665fb
@Marcin-Radecki
Fixed leftover conflicted line in lock file
8d217be
timorl
timorl approved these changes Dec 1, 2022
View reviewed changes
Copy link
Contributor

@timorl timorl left a comment

Choose a reason for hiding this comment

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

Just one comment, although might be important. <_<

@Marcin-Radecki Marcin-Radecki merged commit f12d5a2 into release-8-mainnet Dec 1, 2022
@Marcin-Radecki Marcin-Radecki deleted the port-8-X-Testnet-to-Mainnet branch December 1, 2022 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@timorl timorl timorl approved these changes

@mike1729 mike1729 mike1729 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Marcin-Radecki @timorl @mike1729