[vm] Use prod configs for aptos #13317
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
georgemitenkov
requested review from
msmouse,
lightmark,
grao1991,
davidiw,
wrwg,
zekun000 and
vgao1996
as code owners
georgemitenkov
changed the title
runtian-zhou
approved these changes
May 20, 2024
ziaptos
approved these changes
May 20, 2024
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
gelash
approved these changes
May 21, 2024
| // For historical reasons, we support still < gas version 5, but if a new caller don't specify | ||
| // the gas version, we default to 5, which was introduced in late '22. | ||
| let gas_feature_version = gas_feature_version_opt.unwrap_or(5); | ||
| if gas_feature_version < 5 { |
There was a problem hiding this comment.
HM, is there any invariant that we can check here? Seems like the only thing we need from that parameter is whether it's None or <5? what happens if some large number is provided? Couldn't we just pass a boolean instead?
There was a problem hiding this comment.
Updated to not take gas feature version into account
| let enable_invariant_violation_check_in_swap_loc = | ||
| !timed_features.is_enabled(TimedFeatureFlag::DisableInvariantViolationCheckInSwapLoc); | ||
|
|
||
| let mut type_max_cost = 0; |
There was a problem hiding this comment.
is max cost actually 0 or 0 is used as None here? the below ones make sense if not enabled means byte/base cost being actually 0.
There was a problem hiding this comment.
Yes, it is basically to ensure pseudo gas metering in type to tag conversion is not charged if feature is not enabled.
storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs
Outdated
Show resolved
Hide resolved
georgemitenkov
commented
May 22, 2024
| @@ -1388,12 +1386,12 @@ impl AptosVM { | |||
|
|
|||
| /// Deserialize a module bundle. | |||
| fn deserialize_module_bundle(&self, modules: &ModuleBundle) -> VMResult<Vec<CompiledModule>> { | |||
| let max_version = get_max_binary_format_version(self.features(), None); | |||
There was a problem hiding this comment.
@vgao1996 this is a bug, right? We default to 5 here because of passing None, but instead should select 5,6,7 based on feature flags
There was a problem hiding this comment.
Still looking at the code, but one thing I noticed here is that the Option passed in is NOT the binary format version, but the gas feature version.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #13317 +/- ##
========================================
Coverage 32.9% 33.0%
========================================
Files 1768 1764 -4
Lines 339264 339051 -213
========================================
- Hits 111949 111917 -32
+ Misses 227315 227134 -181 ☔ View full report in Codecov by Sentry. |
vgao1996
reviewed
May 22, 2024
| @@ -1388,12 +1386,12 @@ impl AptosVM { | |||
|
|
|||
| /// Deserialize a module bundle. | |||
| fn deserialize_module_bundle(&self, modules: &ModuleBundle) -> VMResult<Vec<CompiledModule>> { | |||
| let max_version = get_max_binary_format_version(self.features(), None); | |||
There was a problem hiding this comment.
Still looking at the code, but one thing I noticed here is that the Option passed in is NOT the binary format version, but the gas feature version.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
✅ Forge suite
|
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.
Description
This PR cherry picks a simple change from #13276 to have aptos production configs in one place and share them between the codebase. In particular:
Commit 1: introduce
aptos_prod_..._config()functions to have a single way of creating production configurations.Commit 2: move VM randomness config to the same crate to have all configs in a single place.
Type of Change
Which Components or Systems Does This Change Impact?
How Has This Been Tested?
Key Areas to Review
Checklist