[move] Full loader integration on MoveVM side (#14075)

aptos-move/aptos-release-builder/src/simulate.rs

@@ -66,7 +66,10 @@ use move_core_types::{
     language_storage::{ModuleId, StructTag},
     move_resource::MoveResource,
 };
-use move_vm_runtime::module_traversal::{TraversalContext, TraversalStorage};
+use move_vm_runtime::{
+    module_traversal::{TraversalContext, TraversalStorage},
+    DummyCodeStorage,
+};
 use move_vm_types::{gas::UnmeteredGasMeter, resolver::ModuleResolver};
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
@@ -480,6 +483,7 @@ fn force_end_epoch(state_view: &SimulationStateView<impl StateView>) -> Result<(
         vec![bcs::to_bytes(&AccountAddress::ONE)?],
         &mut UnmeteredGasMeter,
         &mut TraversalContext::new(&traversal_storage),
+        &DummyCodeStorage,
     )?;
     let (mut change_set, module_write_set) = sess.finish(&change_set_configs)?;
     change_set.try_materialize_aggregator_v1_delta_set(&resolver)?;

aptos-move/aptos-vm-profiling/src/bins/run_move.rs

@@ -12,7 +12,7 @@ use move_core_types::{account_address::AccountAddress, ident_str, identifier::Id
 use move_ir_compiler::Compiler;
 use move_vm_runtime::{
     module_traversal::*, move_vm::MoveVM, native_extensions::NativeContextExtensions,
-    native_functions::NativeFunction,
+    native_functions::NativeFunction, DummyCodeStorage,
 };
 use move_vm_test_utils::InMemoryStorage;
 use move_vm_types::{
@@ -176,6 +176,8 @@ fn main() -> Result<()> {
             args,
             &mut UnmeteredGasMeter,
             &mut TraversalContext::new(&traversal_storage),
+            &DummyCodeStorage,
+            &DummyCodeStorage,
         )?;
     } else {
         let module = Compiler::new(test_modules.iter().collect()).into_compiled_module(&src)?;
@@ -186,6 +188,7 @@ fn main() -> Result<()> {
             module_blob,
             *module.self_id().address(),
             &mut UnmeteredGasMeter,
+            &DummyCodeStorage,
         )?;
         let args: Vec<Vec<u8>> = vec![];
         let res = sess.execute_function_bypass_visibility(
@@ -195,6 +198,7 @@ fn main() -> Result<()> {
             args,
             &mut UnmeteredGasMeter,
             &mut TraversalContext::new(&traversal_storage),
+            &DummyCodeStorage,
         )?;
         println!("{:?}", res);
     }

aptos-move/aptos-vm/src/aptos_vm.rs

@@ -106,6 +106,7 @@ use move_core_types::{
 use move_vm_runtime::{
     logging::expect_no_verification_errors,
     module_traversal::{TraversalContext, TraversalStorage},
+    DummyCodeStorage,
 };
 use move_vm_types::gas::{GasMeter, UnmeteredGasMeter};
 use num_cpus;
@@ -731,13 +732,20 @@ impl AptosVM {
         //       the error semantics.
         if self.gas_feature_version >= 15 {
             session.check_script_dependencies_and_check_gas(
+                &DummyCodeStorage,
+                &DummyCodeStorage,
                 gas_meter,
                 traversal_context,
                 script.code(),
             )?;
         }
 
-        let func = session.load_script(script.code(), script.ty_args())?;
+        let func = session.load_script(
+            &DummyCodeStorage,
+            &DummyCodeStorage,
+            script.code(),
+            script.ty_args(),
+        )?;
 
         let compiled_script = match CompiledScript::deserialize_with_config(
             script.code(),
@@ -778,6 +786,8 @@ impl AptosVM {
             args,
             gas_meter,
             traversal_context,
+            &DummyCodeStorage,
+            &DummyCodeStorage,
         )?;
         Ok(())
     }
@@ -799,14 +809,20 @@ impl AptosVM {
             let module_id = traversal_context
                 .referenced_module_ids
                 .alloc(entry_fn.module().clone());
-            session.check_dependencies_and_charge_gas(gas_meter, traversal_context, [(
-                module_id.address(),
-                module_id.name(),
-            )])?;
+            session.check_dependencies_and_charge_gas(
+                &DummyCodeStorage,
+                gas_meter,
+                traversal_context,
+                [(module_id.address(), module_id.name())],
+            )?;
         }
 
-        let function =
-            session.load_function(entry_fn.module(), entry_fn.function(), entry_fn.ty_args())?;
+        let function = session.load_function(
+            &DummyCodeStorage,
+            entry_fn.module(),
+            entry_fn.function(),
+            entry_fn.ty_args(),
+        )?;
 
         // Native entry function is forbidden.
         if self
@@ -843,7 +859,13 @@ impl AptosVM {
             &function,
             struct_constructors_enabled,
         )?;
-        session.execute_entry_function(function, args, gas_meter, traversal_context)?;
+        session.execute_entry_function(
+            function,
+            args,
+            gas_meter,
+            traversal_context,
+            &DummyCodeStorage,
+        )?;
         Ok(())
     }
 
@@ -1103,6 +1125,7 @@ impl AptosVM {
                     ]),
                     gas_meter,
                     traversal_context,
+                    &DummyCodeStorage,
                 )
             })?
             .return_values
@@ -1201,6 +1224,7 @@ impl AptosVM {
                             cleanup_args,
                             &mut UnmeteredGasMeter,
                             traversal_context,
+                            &DummyCodeStorage,
                         )
                         .map_err(|e| e.into_vm_status())
                 })?;
@@ -1333,6 +1357,7 @@ impl AptosVM {
                     cleanup_args,
                     &mut UnmeteredGasMeter,
                     traversal_context,
+                    &DummyCodeStorage,
                 )
                 .map_err(|e| e.into_vm_status())
         })?;
@@ -1357,7 +1382,8 @@ impl AptosVM {
                 continue;
             }
             *new_published_modules_loaded = true;
-            let init_function = session.load_function(&module.self_id(), init_func_name, &[]);
+            let init_function =
+                session.load_function(&DummyCodeStorage, &module.self_id(), init_func_name, &[]);
             // it is ok to not have init_module function
             // init_module function should be (1) private and (2) has no return value
             // Note that for historic reasons, verification here is treated
@@ -1376,6 +1402,7 @@ impl AptosVM {
                         args,
                         gas_meter,
                         traversal_context,
+                        &DummyCodeStorage,
                     )?;
                 } else {
                     return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
@@ -1487,6 +1514,7 @@ impl AptosVM {
                         .collect::<BTreeSet<_>>();
 
                     session.check_dependencies_and_charge_gas(
+                        &DummyCodeStorage,
                         gas_meter,
                         traversal_context,
                         modules
@@ -1535,6 +1563,7 @@ impl AptosVM {
                     bundle.into_inner(),
                     destination,
                     gas_meter,
+                    &DummyCodeStorage,
                     Compatibility::new(
                         true,
                         !self
@@ -2131,6 +2160,7 @@ impl AptosVM {
                 args,
                 &mut gas_meter,
                 &mut TraversalContext::new(&storage),
+                &DummyCodeStorage,
             )
             .map(|_return_vals| ())
             .or_else(|e| {
@@ -2210,6 +2240,7 @@ impl AptosVM {
                 serialize_values(&args),
                 &mut gas_meter,
                 &mut TraversalContext::new(&storage),
+                &DummyCodeStorage,
             )
             .map(|_return_vals| ())
             .or_else(|e| {
@@ -2300,7 +2331,7 @@ impl AptosVM {
         arguments: Vec<Vec<u8>>,
         gas_meter: &mut impl AptosGasMeter,
     ) -> anyhow::Result<Vec<Vec<u8>>> {
-        let func = session.load_function(&module_id, &func_name, &type_args)?;
+        let func = session.load_function(&DummyCodeStorage, &module_id, &func_name, &type_args)?;
         let metadata = vm.extract_module_metadata(&module_id);
         let arguments = verifier::view_function::validate_view_function(
             session,
@@ -2321,6 +2352,7 @@ impl AptosVM {
                 arguments,
                 gas_meter,
                 &mut TraversalContext::new(&storage),
+                &DummyCodeStorage,
             )
             .map_err(|err| anyhow!("Failed to execute function: {:?}", err))?
             .return_values
@@ -2761,6 +2793,7 @@ fn create_account_if_does_not_exist(
             serialize_values(&vec![MoveValue::Address(account)]),
             gas_meter,
             traversal_context,
+            &DummyCodeStorage,
         )
         .map(|_return_vals| ())
 }

aptos-move/aptos-vm/src/move_vm_ext/session/mod.rs

@@ -288,6 +288,8 @@ impl<'r, 'l> SessionExt<'r, 'l> {
             let (modules, resources) = account_changeset.into_inner();
 
             for (struct_tag, blob_op) in resources {
+                // TODO(George): Use ModuleStorage to resolve module metadata directly.
+                #[allow(deprecated)]
                 let resource_group_tag = runtime
                     .with_module_metadata(&struct_tag.module_id(), |md| {
                         get_resource_group_member_from_metadata(&struct_tag, md)

aptos-move/aptos-vm/src/move_vm_ext/warm_vm_cache.rs

@@ -109,6 +109,7 @@ impl WarmVmCache {
         //
         // Loading up `0x1::account` should be sufficient as this is the most common module
         // used for prologue, epilogue and transfer functionality.
+        #[allow(deprecated)]
         let _ = vm.load_module(
             &ModuleId::new(CORE_CODE_ADDRESS, ident_str!("account").to_owned()),
             resolver,

aptos-move/aptos-vm/src/transaction_validation.rs

@@ -27,7 +27,9 @@ use move_core_types::{
     value::{serialize_values, MoveValue},
     vm_status::{AbortLocation, StatusCode, VMStatus},
 };
-use move_vm_runtime::{logging::expect_no_verification_errors, module_traversal::TraversalContext};
+use move_vm_runtime::{
+    logging::expect_no_verification_errors, module_traversal::TraversalContext, DummyCodeStorage,
+};
 use move_vm_types::gas::UnmeteredGasMeter;
 use once_cell::sync::Lazy;
 
@@ -142,6 +144,7 @@ pub(crate) fn run_script_prologue(
             serialize_values(&args),
             &mut gas_meter,
             traversal_context,
+            &DummyCodeStorage,
         )
         .map(|_return_vals| ())
         .map_err(expect_no_verification_errors)
@@ -185,6 +188,7 @@ pub(crate) fn run_multisig_prologue(
             ]),
             &mut UnmeteredGasMeter,
             traversal_context,
+            &DummyCodeStorage,
         )
         .map(|_return_vals| ())
         .map_err(expect_no_verification_errors)
@@ -226,6 +230,7 @@ fn run_epilogue(
             serialize_values(&args),
             &mut UnmeteredGasMeter,
             traversal_context,
+            &DummyCodeStorage,
         )
     } else {
         // Regular tx, run the normal epilogue
@@ -246,6 +251,7 @@ fn run_epilogue(
             serialize_values(&args),
             &mut UnmeteredGasMeter,
             traversal_context,
+            &DummyCodeStorage,
         )
     }
     .map(|_return_vals| ())
@@ -274,6 +280,7 @@ fn emit_fee_statement(
             vec![bcs::to_bytes(&fee_statement).expect("Failed to serialize fee statement")],
             &mut UnmeteredGasMeter,
             traversal_context,
+            &DummyCodeStorage,
         )
         .map(|_return_vals| ())
 }

aptos-move/aptos-vm/src/validator_txns/dkg.rs

@@ -25,7 +25,10 @@ use move_core_types::{
     value::{serialize_values, MoveValue},
     vm_status::{AbortLocation, StatusCode, VMStatus},
 };
-use move_vm_runtime::module_traversal::{TraversalContext, TraversalStorage};
+use move_vm_runtime::{
+    module_traversal::{TraversalContext, TraversalStorage},
+    DummyCodeStorage,
+};
 use move_vm_types::gas::UnmeteredGasMeter;
 
 #[derive(Debug)]
@@ -114,6 +117,7 @@ impl AptosVM {
                 serialize_values(&args),
                 &mut gas_meter,
                 &mut TraversalContext::new(&module_storage),
+                &DummyCodeStorage,
             )
             .map_err(|e| {
                 expect_only_successful_execution(e, FINISH_WITH_DKG_RESULT.as_str(), log_context)

aptos-move/aptos-vm/src/validator_txns/jwk.rs

@@ -31,7 +31,10 @@ use move_core_types::{
     value::{serialize_values, MoveValue},
     vm_status::{AbortLocation, StatusCode, VMStatus},
 };
-use move_vm_runtime::module_traversal::{TraversalContext, TraversalStorage};
+use move_vm_runtime::{
+    module_traversal::{TraversalContext, TraversalStorage},
+    DummyCodeStorage,
+};
 use move_vm_types::gas::UnmeteredGasMeter;
 use std::collections::HashMap;
 
@@ -144,6 +147,7 @@ impl AptosVM {
                 serialize_values(&args),
                 &mut gas_meter,
                 &mut TraversalContext::new(&module_storage),
+                &DummyCodeStorage,
             )
             .map_err(|e| {
                 expect_only_successful_execution(e, UPSERT_INTO_OBSERVED_JWKS.as_str(), log_context)

aptos-move/aptos-vm/src/verifier/event_validation.rs

@@ -120,13 +120,16 @@ pub(crate) fn extract_event_metadata_from_module(
     session: &mut SessionExt,
     module_id: &ModuleId,
 ) -> VMResult<HashSet<String>> {
-    let metadata = session.load_module(module_id).map(|module| {
-        CompiledModule::deserialize_with_config(
-            &module,
-            &session.get_vm_config().deserializer_config,
-        )
-        .map(|module| aptos_framework::get_metadata_from_compiled_module(&module))
-    });
+    #[allow(deprecated)]
+    let metadata = session
+        .fetch_module_from_data_store(module_id)
+        .map(|module| {
+            CompiledModule::deserialize_with_config(
+                &module,
+                &session.get_vm_config().deserializer_config,
+            )
+            .map(|module| aptos_framework::get_metadata_from_compiled_module(&module))
+        });
 
     if let Ok(Ok(Some(metadata))) = metadata {
         extract_event_metadata(&metadata)

aptos-move/aptos-vm/src/verifier/randomness.rs

@@ -11,6 +11,7 @@ pub(crate) fn get_randomness_annotation(
     session: &mut SessionExt,
     entry_fn: &EntryFunction,
 ) -> VMResult<Option<RandomnessAnnotation>> {
+    #[allow(deprecated)]
     let module = session
         .get_move_vm()
         .load_module(entry_fn.module(), resolver)?;

aptos-move/aptos-vm/src/verifier/resource_groups.rs

@@ -150,12 +150,15 @@ pub(crate) fn extract_resource_group_metadata_from_module(
     BTreeMap<String, StructTag>,
     BTreeSet<String>,
 )> {
-    let module = session.load_module(module_id).map(|module| {
-        CompiledModule::deserialize_with_config(
-            &module,
-            &session.get_vm_config().deserializer_config,
-        )
-    });
+    #[allow(deprecated)]
+    let module = session
+        .fetch_module_from_data_store(module_id)
+        .map(|module| {
+            CompiledModule::deserialize_with_config(
+                &module,
+                &session.get_vm_config().deserializer_config,
+            )
+        });
     let (metadata, module) = if let Ok(Ok(module)) = module {
         (
             aptos_framework::get_metadata_from_compiled_module(&module),