v1.0: Include account.owner into account hash #9920
Merged
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
mvines
approved these changes
May 7, 2020
|
@mvines Thanks for review! I'm testing this locally now with mainnet-beta snapshots... |
ryoqun
commented
May 7, 2020
runtime/src/accounts_db.rs
Outdated
| @@ -1060,13 +1069,20 @@ impl AccountsDB { | |||
| hasher.result() | |||
| } | |||
|
|
|||
| pub fn include_owner_in_hash(slot: Slot) -> bool { | |||
| // Account hashing updated to include owner activates at this slot on the mainnet-beta | |||
| slot >= 10_000_000 | |||
There was a problem hiding this comment.
@mvines Well, I'd like want a rounded number; but I think this should be 11_000_000. The reason is two-fold:
- Relatively small upgrade time window: 32 hours (*)
- This happens Friday night in PT
11_000_000 is around 5/13-5/14 around the world (*)
(*):
$ solana --url http://api.mainnet-beta.solana.com epoch-info
Slot: 9705495
Epoch: 22
Epoch Slot Range: [9504000..9936000)
Epoch Completed Percent: 46.642%
Epoch Completed Slots: 201495/432000 (230505 remaining)
Epoch Completed Time: 22h 23m 18s/2days (1day 1h 36m 42s remaining)
$ pry
[1] pry(main)> ((10_000_000 - 9705495) / 2.5) / 3600
=> 32.72277777777778
[6] pry(main)> Time.now + ((11_000_000 - 9705495) / 2.5)
=> 2020-05-14 03:37:39 +0900
mvines
changed the title
|
Ok, I've finished all testing for mainnet-beta. It works as intended. And fortunately we're still in consensus without any bit-corrupt/malicious traces. :) I've compared two different snapshots from our trusted validators and I saw only the increase of normal accounts and there is no strange |
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.
manual backport of #9917 with gating logic for the v1.0.x / mainnet-beta
fixes #9916