Skip to content

Commit

Permalink
rollback loader v2 force enable
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemitenkov committed Nov 9, 2024
1 parent e0dc552 commit 56187b6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions aptos-move/aptos-vm-environment/src/environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use aptos_vm_types::storage::StorageGasParameters;
use move_vm_runtime::{config::VMConfig, RuntimeEnvironment, WithRuntimeEnvironment};
use sha3::{Digest, Sha3_256};
use std::sync::Arc;
use aptos_types::on_chain_config::FeatureFlag;

/// A runtime environment which can be used for VM initialization and more. Contains features
/// used by execution, gas parameters, VM configs and global caches. Note that it is the user's
Expand Down Expand Up @@ -176,9 +175,8 @@ impl Environment {
) -> Self {
// We compute and store a hash of configs in order to distinguish different environments.
let mut sha3_256 = Sha3_256::new();
let mut features =
let features =
fetch_config_and_update_hash::<Features>(&mut sha3_256, state_view).unwrap_or_default();
features.enable(FeatureFlag::ENABLE_LOADER_V2);

// If no chain ID is in storage, we assume we are in a testing environment.
let chain_id = fetch_config_and_update_hash::<ChainId>(&mut sha3_256, state_view)
Expand Down
1 change: 0 additions & 1 deletion types/src/on_chain_config/aptos_features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ impl Default for Features {
for feature in FeatureFlag::default_features() {
features.enable(feature);
}
features.enable(FeatureFlag::ENABLE_LOADER_V2);
features
}
}
Expand Down

0 comments on commit 56187b6

Please sign in to comment.