[Compiler-v2][VM] add metadata check for script #14099
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
rahxephon89
commented
Jul 23, 2024
aptos-move/aptos-vm/src/aptos_vm.rs
Outdated
| .features() | ||
| .is_enabled(FeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT) | ||
| { | ||
| let script = match CompiledScript::deserialize_with_config( |
There was a problem hiding this comment.
Can we cache the deserialization of compiled scripts here by bundling it with verify_no_event_emission_in_script (this also deserializes the script) under a single function which does the deserialization and then runs verification passes?
There was a problem hiding this comment.
Why else branch in the code below? I think having
// deserialize here
if feature_enabled {
self.reject_unstable_bytecode_for_script(&script)?;
}
verifier::event_validation::verify_no_event_emission_in_compiled_script(&script)?;
is sufficient?
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #14099 +/- ##
===========================================
- Coverage 70.7% 59.1% -11.7%
===========================================
Files 2338 827 -1511
Lines 466716 201015 -265701
===========================================
- Hits 330314 118830 -211484
+ Misses 136402 82185 -54217 ☔ View full report in Codecov by Sentry. |
rahxephon89
force-pushed
the
teng/add-metadata-check-for-script
branch
from
5d6e8af to
06aa2a8
Compare
rahxephon89
requested review from
davidiw,
movekevin,
wrwg,
zekun000 and
vgao1996
as code owners
georgemitenkov
approved these changes
Jul 23, 2024
aptos-move/aptos-vm/src/aptos_vm.rs
Outdated
| if metadata.unstable { | ||
| return Err(PartialVMError::new(StatusCode::UNSTABLE_BYTECODE_REJECTED) | ||
| .with_message("script marked unstable cannot be run on mainnet".to_string()) | ||
| .finish(Location::Undefined)); |
There was a problem hiding this comment.
nit: probably can use Location::Script
rahxephon89
force-pushed
the
teng/add-metadata-check-for-script
branch
from
06aa2a8 to
48ccde9
Compare
georgemitenkov
approved these changes
Jul 23, 2024
rahxephon89
force-pushed
the
teng/add-metadata-check-for-script
branch
from
48ccde9 to
3a0bb8e
Compare
rahxephon89
force-pushed
the
teng/add-metadata-check-for-script
branch
from
3a0bb8e to
f87d6b4
Compare
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 adds a check in the VM when running bytecode generated by an unstable compiler or containing unstable language feature on mainnet
Type of Change
Which Components or Systems Does This Change Impact?
How Has This Been Tested?
Added an e2e move test
Key Areas to Review
Checklist