-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Refactoring: Unify account_deps and accounts #17898
Merged
Lichtso
merged 11 commits into
solana-labs:master
from
Lichtso:refactor/unify_account_deps
Jul 5, 2021
Merged
Refactoring: Unify account_deps and accounts #17898
Lichtso
merged 11 commits into
solana-labs:master
from
Lichtso:refactor/unify_account_deps
Jul 5, 2021
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
Lichtso
force-pushed
the
refactor/unify_account_deps
branch
2 times, most recently
from
June 11, 2021 20:13
d4b350c
to
06119f3
Compare
Codecov Report
@@ Coverage Diff @@
## master #17898 +/- ##
=======================================
Coverage 82.3% 82.3%
=======================================
Files 433 433
Lines 121157 121163 +6
=======================================
+ Hits 99813 99827 +14
+ Misses 21344 21336 -8 |
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. |
stale
bot
added
the
stale
[bot only] Added to stale content; results in auto-close after a week.
label
Jun 22, 2021
Lichtso
removed
the
stale
[bot only] Added to stale content; results in auto-close after a week.
label
Jun 22, 2021
Lichtso
force-pushed
the
refactor/unify_account_deps
branch
2 times, most recently
from
June 23, 2021 18:54
b69a46d
to
0964dc7
Compare
Lichtso
force-pushed
the
refactor/unify_account_deps
branch
from
June 29, 2021 10:08
3fd3ec0
to
0d35872
Compare
Lichtso
force-pushed
the
refactor/unify_account_deps
branch
from
July 1, 2021 11:40
038de3d
to
e46ed5b
Compare
Lichtso
force-pushed
the
refactor/unify_account_deps
branch
from
July 2, 2021 12:09
736faba
to
d619984
Compare
mergify bot
pushed a commit
that referenced
this pull request
Jul 7, 2021
* Changes ThisInvokeContext::get_account() to use accounts instead of pre_accounts. * Adds explicit keys to accounts to make them symmetric to account_deps. * Appends account_deps to accounts in transaction loading and removes account_deps everywhere else. (cherry picked from commit 7462c27) # Conflicts: # program-test/src/lib.rs # runtime/src/bank.rs # runtime/src/message_processor.rs
mergify bot
added a commit
that referenced
this pull request
Jul 7, 2021
* Refactoring: Unify account_deps and accounts (#17898) * Changes ThisInvokeContext::get_account() to use accounts instead of pre_accounts. * Adds explicit keys to accounts to make them symmetric to account_deps. * Appends account_deps to accounts in transaction loading and removes account_deps everywhere else. (cherry picked from commit 7462c27) # Conflicts: # program-test/src/lib.rs # runtime/src/bank.rs # runtime/src/message_processor.rs * fix conflicts Co-authored-by: Alexander Meißner <[email protected]> Co-authored-by: Justin Starry <[email protected]>
Closed
Closed
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.
Problem
account_deps
travel along slightly different code paths than the "normal"accounts
do.This makes mapping
accounts
into the VM memory harder and should thus be resolved first.Summary of Changes
ThisInvokeContext::get_account()
to useaccounts
instead ofpre_accounts
. So now, thepre_accounts
are only used inMessageProcessor::verify_and_update()
andMessageProcessor::verify()
.accounts
as tuples, the same way as it is withaccount_deps
.account_deps
at the end of theaccounts
slice and use themessage.account_keys.len()
as border between both subslices / ranges.Fixes #