diff --git a/aptos-move/e2e-move-tests/src/tests/code_publishing.rs b/aptos-move/e2e-move-tests/src/tests/code_publishing.rs index 82bc299a0e1b1..b2be91feeff8e 100644 --- a/aptos-move/e2e-move-tests/src/tests/code_publishing.rs +++ b/aptos-move/e2e-move-tests/src/tests/code_publishing.rs @@ -427,7 +427,6 @@ fn test_module_publishing_does_not_fallback() { executor.disable_block_executor_fallback(); let mut h = MoveHarness::new_with_executor(executor); - h.enable_features(vec![FeatureFlag::ENABLE_LOADER_V2], vec![]); let addr = AccountAddress::from_hex_literal("0x123").unwrap(); let account = h.new_account_at(addr); @@ -530,7 +529,6 @@ fn test_module_publishing_does_not_leak_speculative_information() { executor.disable_block_executor_fallback(); let mut h = MoveHarness::new_with_executor(executor); - h.enable_features(vec![FeatureFlag::ENABLE_LOADER_V2], vec![]); let addr = AccountAddress::random(); let account = h.new_account_at(addr); diff --git a/third_party/move/move-vm/runtime/src/config.rs b/third_party/move/move-vm/runtime/src/config.rs index 5eebeba504cbe..9166733251667 100644 --- a/third_party/move/move-vm/runtime/src/config.rs +++ b/third_party/move/move-vm/runtime/src/config.rs @@ -44,7 +44,7 @@ impl Default for VMConfig { ty_builder: TypeBuilder::with_limits(128, 20), disallow_dispatch_for_native: true, use_compatibility_checker_v2: true, - use_loader_v2: false, + use_loader_v2: true, } } } diff --git a/types/src/on_chain_config/aptos_features.rs b/types/src/on_chain_config/aptos_features.rs index d1297014ad21f..b5e6bfe0ea3f8 100644 --- a/types/src/on_chain_config/aptos_features.rs +++ b/types/src/on_chain_config/aptos_features.rs @@ -174,8 +174,7 @@ impl FeatureFlag { FeatureFlag::ENABLE_RESOURCE_ACCESS_CONTROL, FeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT, FeatureFlag::TRANSACTION_SIMULATION_ENHANCEMENT, - // TODO(loader_v2): Enable V2 loader. - // FeatureFlag::ENABLE_LOADER_V2, + FeatureFlag::ENABLE_LOADER_V2, ] } }