Cherry-pick: limits & gas for dependencies #12166
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
vgao1996
added
CICD:run-execution-performance-test
vgao1996
force-pushed
the
deps-gas
branch
3 times, most recently
from
f71050f to
d61b6bf
Compare
vgao1996
added
the
CICD:run-e2e-tests
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #12166 +/- ##
=========================================
- Coverage 64.1% 63.9% -0.2%
=========================================
Files 798 799 +1
Lines 177110 177623 +513
=========================================
+ Hits 113534 113628 +94
- Misses 63576 63995 +419 ☔ View full report in Codecov by Sentry. |
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.
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.
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.
runtian-zhou
approved these changes
Mar 4, 2024
| // the error semantics. | ||
| if self.gas_feature_version >= 14 { | ||
| // Charge old versions of the modules, in case of upgrades. | ||
| session.check_dependencies_and_charge_gas_non_recursive_optional( |
There was a problem hiding this comment.
Yea can the logic here cause double charge?
vgao1996
dismissed
georgemitenkov’s stale review
To unblock for landing. Already addressed all issues raised
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
vgao1996
added a commit
to vgao1996/aptos-core
that referenced
this pull request
Mar 5, 2024
* [gas] add gas charges for dependencies * [gas] optimize dependency gas by avoid allocating new ModuleId * [gas] fix dependency gas for module publishing + minor gas profiler improvements * [loader] Test gas charging logic for transitive deps --------- Co-authored-by: Runtian Zhou <[email protected]>
msmouse
reviewed
Mar 6, 2024
| @@ -200,6 +200,26 @@ crate::gas_schedule::macros::define_gas_parameters!( | |||
| { 7.. => "max_storage_fee" }, | |||
| 2_0000_0000, // 2 APT | |||
| ], | |||
| [ | |||
| dependency_per_module: InternalGas, | |||
| { 14.. => "dependency_per_module" }, | |||
There was a problem hiding this comment.
Is it intentional that we bumped the LATEST_GAS_VERSION to 15 but these are added to 14?
There was a problem hiding this comment.
Ah good catch. I forgot to change these. Will get them fixed
gelash
reviewed
Mar 11, 2024
| module_store: &ModuleStorageAdapter, | ||
| data_store: &mut TransactionDataCache, | ||
| gas_meter: &mut impl GasMeter, | ||
| visited: &mut BTreeMap<(&'a AccountAddress, &'a IdentStr), ()>, |
There was a problem hiding this comment.
Why is this BTreeMap and not BTreeSet?
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.
This introduces hard limits and gas metering for dependencies.