-
Notifications
You must be signed in to change notification settings - Fork 225
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
Prevent stray accounts.toml
files from breaking upgrades
#4657
Merged
casperlabs-bors-ng
merged 8 commits into
casper-network:feat-2.0
from
fizyk20:fix-rewards-2
Apr 25, 2024
Merged
Prevent stray accounts.toml
files from breaking upgrades
#4657
casperlabs-bors-ng
merged 8 commits into
casper-network:feat-2.0
from
fizyk20:fix-rewards-2
Apr 25, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fizyk20
requested review from
EdHastingsCasperAssociation,
AlexanderLimonov,
alsrdn and
rafal-ch
April 10, 2024 15:27
alsrdn
approved these changes
Apr 10, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
EdHastingsCasperAssociation
approved these changes
Apr 15, 2024
bors merge |
casperlabs-bors-ng bot
added a commit
that referenced
this pull request
Apr 15, 2024
4657: Prevent stray `accounts.toml` files from breaking upgrades r=fizyk20 a=fizyk20 The rewards calculation used to take the validators from `accounts.toml` when writing zero rewards to validators at genesis or at an upgrade point. This is now just replaced with an empty map, which has the same effect and doesn't depend on external data. Co-authored-by: Bartłomiej Kamiński <[email protected]>
Build failed: |
bors r+ |
casperlabs-bors-ng bot
added a commit
that referenced
this pull request
Apr 23, 2024
4566: Change PublicKey on Bid r=EdHastingsCasperAssociation a=wojcik91 Implements casper-network/ceps#91 4657: Prevent stray `accounts.toml` files from breaking upgrades r=EdHastingsCasperAssociation a=fizyk20 The rewards calculation used to take the validators from `accounts.toml` when writing zero rewards to validators at genesis or at an upgrade point. This is now just replaced with an empty map, which has the same effect and doesn't depend on external data. Co-authored-by: Maciej Wójcik <[email protected]> Co-authored-by: Bartłomiej Kamiński <[email protected]>
Build failed (retrying...): |
casperlabs-bors-ng bot
added a commit
that referenced
this pull request
Apr 23, 2024
4657: Prevent stray `accounts.toml` files from breaking upgrades r=EdHastingsCasperAssociation a=fizyk20 The rewards calculation used to take the validators from `accounts.toml` when writing zero rewards to validators at genesis or at an upgrade point. This is now just replaced with an empty map, which has the same effect and doesn't depend on external data. Co-authored-by: Bartłomiej Kamiński <[email protected]>
Timed out. |
bors r+ |
casperlabs-bors-ng bot
added a commit
that referenced
this pull request
Apr 24, 2024
4657: Prevent stray `accounts.toml` files from breaking upgrades r=fizyk20 a=fizyk20 The rewards calculation used to take the validators from `accounts.toml` when writing zero rewards to validators at genesis or at an upgrade point. This is now just replaced with an empty map, which has the same effect and doesn't depend on external data. 4670: Changed the format used to deserialize StoredValue::ContractPackage variant because it broke backwards compatibility. r=zajko a=zajko StoredValue::ContractPackage deserialization fix presented some time ago changed the way json is structured which made it backwards incompatible: In 1.x a ContractPackage will be json-formatted as: ``` "ContractPackage": { "access_key": "uref-024d69e50a458f337817d3d11ba95bdbdd6258ba8f2dc980644c9efdbd64945d-007", "versions": [ { "protocol_version_major": 1, "contract_version": 1, "contract_hash": "contract-1b301b49505ec5eaec1787686c54818bd60836b9301cce3f5c0237560e5a4bfd" } ], "disabled_versions": [], "groups": [], "lock_status": "Unlocked" } ``` and this flat representation of `versions` collection is what needed to be reinstantiated in this PR. Co-authored-by: Bartłomiej Kamiński <[email protected]> Co-authored-by: Jakub Zajkowski <[email protected]>
This PR was included in a batch that timed out, it will be automatically retried |
casperlabs-bors-ng bot
added a commit
that referenced
this pull request
Apr 25, 2024
4657: Prevent stray `accounts.toml` files from breaking upgrades r=fizyk20 a=fizyk20 The rewards calculation used to take the validators from `accounts.toml` when writing zero rewards to validators at genesis or at an upgrade point. This is now just replaced with an empty map, which has the same effect and doesn't depend on external data. Co-authored-by: Bartłomiej Kamiński <[email protected]>
Timed out. |
bors r+ |
Build succeeded: |
casperlabs-bors-ng
bot
merged commit Apr 25, 2024
42276e4
into
casper-network:feat-2.0
3 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The rewards calculation used to take the validators from
accounts.toml
when writing zero rewards to validators at genesis or at an upgrade point. This is now just replaced with an empty map, which has the same effect and doesn't depend on external data.