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.

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

Fix non-determinism in account_hash_ignore_slot on genesis #33692

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Fix non-determinism in account_hash_ignore_slot on genesis #33692

merged 1 commit into from
Oct 16, 2023

Conversation

jeffwashington
Copy link
Contributor

@jeffwashington jeffwashington commented Oct 13, 2023 •
edited by brooksprumo
Loading

Problem

See #32801

until the account_hash_ignore_slot feature gets activated, there is some non-determinism in testing.

Summary of Changes

Remove non-determinism.

Fixes #32800

@jeffwashington
Copy link
Contributor Author

@ripatel-fd

@jeffwashington jeffwashington mentioned this pull request Oct 13, 2023
Closed
@codecov
Copy link

codecov bot commented Oct 13, 2023

Codecov Report

Merging #33692 (50a9bf8) into master (09e858d) will decrease coverage by 0.1%.
Report is 2 commits behind head on master.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##           master   #33692     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         806      806             
  Lines      217676   217679      +3     
=========================================
- Hits       178220   178200     -20     
- Misses      39456    39479     +23

@jeffwashington jeffwashington marked this pull request as ready for review October 13, 2023 21:21
ripatel-fd
ripatel-fd approved these changes Oct 13, 2023
View reviewed changes
Copy link
Contributor

@ripatel-fd ripatel-fd left a comment

Choose a reason for hiding this comment

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

This looks good. But it might be worth confirming that this behaves correctly in case feature activation is scheduled in a future slot. (Which I believe is the second parameter of the tuple here (pubkey, _))

@jeffwashington
Copy link
Contributor Author

This looks good. But it might be worth confirming that this behaves correctly in case feature activation is scheduled in a future slot. (Which I believe is the second parameter of the tuple here (pubkey, _))

tuple.1 is the account itself.

solana/sdk/src/genesis_config.rs

Line 92 in a60d185

pub accounts: BTreeMap<Pubkey, Account>,

brooksprumo
brooksprumo approved these changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@brooksprumo brooksprumo left a comment

Choose a reason for hiding this comment

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

Lgtm

@jeffwashington jeffwashington merged commit 69495f4 into solana-labs:master Oct 16, 2023
31 checks passed
@jeffwashington jeffwashington added the v1.17 PRs that should be backported to v1.17 label Oct 16, 2023
mergify bot pushed a commit that referenced this pull request Oct 16, 2023
@jeffwashington @mergify
Fix non-determinism in account_hash_ignore_slot on genesis (#33692)
5265ba3 
(cherry picked from commit 69495f4)
@mergify mergify bot mentioned this pull request Oct 16, 2023
Merged
jeffwashington added a commit that referenced this pull request Oct 16, 2023
@jeffwashington
Fix non-determinism in account_hash_ignore_slot on genesis (#33692)
a33122e 
(cherry picked from commit 69495f4)
@jeffwashington jeffwashington added the v1.16 PRs that should be backported to v1.16 label Oct 17, 2023
mergify bot pushed a commit that referenced this pull request Oct 17, 2023
@jeffwashington @mergify
Fix non-determinism in account_hash_ignore_slot on genesis (#33692)
3d95e07 
(cherry picked from commit 69495f4)
@mergify mergify bot mentioned this pull request Oct 17, 2023
Merged
jeffwashington added a commit that referenced this pull request Oct 19, 2023
@mergify @jeffwashington
v1.16: Fix non-determinism in account_hash_ignore_slot on genesis (ba…
f14d0ab 
…ckport of #33692) (#33728)

Fix non-determinism in account_hash_ignore_slot on genesis (#33692)

(cherry picked from commit 69495f4)

Co-authored-by: Jeff Washington (jwash) <jeff.washington@solana.com>
jeffwashington added a commit that referenced this pull request Oct 19, 2023
@mergify @jeffwashington
v1.17: Fix non-determinism in account_hash_ignore_slot on genesis (ba…
e76dd77 
…ckport of #33692) (#33720)

Fix non-determinism in account_hash_ignore_slot on genesis (#33692)

(cherry picked from commit 69495f4)

Co-authored-by: Jeff Washington (jwash) <jeff.washington@solana.com>
@HaoranYi HaoranYi mentioned this pull request Apr 8, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brooksprumo brooksprumo brooksprumo approved these changes

@ripatel-fd ripatel-fd ripatel-fd approved these changes

Assignees
No one assigned
Labels
v1.16 PRs that should be backported to v1.16 v1.17 PRs that should be backported to v1.17
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

account_hash_ignore_slot behaves incorrectly at genesis
3 participants
@jeffwashington @brooksprumo @ripatel-fd