[block-stm] versioned entry tests and basic generic interface

aptos-move/block-executor/src/captured_reads.rs

@@ -22,7 +22,8 @@ use aptos_mvhashmap::{
 };
 use aptos_types::{
     delayed_fields::PanicError, state_store::state_value::StateValueMetadata,
-    transaction::BlockExecutableTransaction as Transaction, write_set::TransactionWrite,
+    transaction::BlockExecutableTransaction as Transaction, vm::modules::ModuleStorageEntry,
+    write_set::TransactionWrite,
 };
 use aptos_vm_types::resolver::ResourceGroupSize;
 use derivative::Derivative;
@@ -302,7 +303,7 @@ pub(crate) struct CapturedReads<T: Transaction> {
     /// Captured module reads if V1 loader is used.
     pub(crate) module_reads: Vec<T::Key>,
     /// Captured module reads if V2 loader is used.
-    module_storage_reads: HashMap<T::Key, ModuleStorageRead>,
+    module_storage_reads: HashMap<T::Key, ModuleStorageRead<ModuleStorageEntry>>,
 
     delayed_field_reads: HashMap<T::Identifier, DelayedFieldRead>,
 
@@ -481,14 +482,17 @@ impl<T: Transaction> CapturedReads<T> {
     pub(crate) fn get_captured_module_storage_read(
         &self,
         key: &T::Key,
-    ) -> Option<&ModuleStorageRead> {
+    ) -> Option<&ModuleStorageRead<ModuleStorageEntry>> {
         self.module_storage_reads.get(key)
     }
 
     /// Captures the read of a module storage entry.
-    pub(crate) fn capture_module_storage_read(&mut self, key: T::Key, read: ModuleStorageRead) {
-        let _prev = self.module_storage_reads.insert(key, read);
-        // assert!(prev.is_none() || prev.is_some_and(|e| e.));
+    pub(crate) fn capture_module_storage_read(
+        &mut self,
+        key: T::Key,
+        read: ModuleStorageRead<ModuleStorageEntry>,
+    ) {
+        self.module_storage_reads.insert(key, read);
     }
 
     pub(crate) fn capture_delayed_field_read(
@@ -605,7 +609,7 @@ impl<T: Transaction> CapturedReads<T> {
     ///      also have the same version X.
     pub(crate) fn validate_module_reads(
         &self,
-        module_storage: &VersionedModuleStorage<T::Key>,
+        module_storage: &VersionedModuleStorage<T::Key, ModuleStorageEntry>,
         idx_to_validate: TxnIndex,
     ) -> bool {
         if self.speculative_failure {

aptos-move/block-executor/src/modules_and_scripts.rs

@@ -7,7 +7,7 @@ use aptos_types::{
     executable::{Executable, ModulePath},
     state_store::{state_key::StateKey, state_value::StateValueMetadata, TStateView},
     transaction::BlockExecutableTransaction as Transaction,
-    vm::modules::ModuleStorageEntry,
+    vm::modules::{ModuleStorageEntry, ModuleStorageEntryInterface},
 };
 use aptos_vm_types::module_and_script_storage::{
     code_storage::AptosCodeStorage, module_storage::AptosModuleStorage,
@@ -162,7 +162,10 @@ impl<'a, T: Transaction, S: TStateView<Key = T::Key>, X: Executable> LatestView<
 
     /// Returns the module storage entry built from the current view. If it is not in
     /// multi-version or non-sync data structures, fetches it from the base view.
-    fn read_module_storage_by_key(&self, key: &T::Key) -> VMResult<ModuleStorageRead> {
+    fn read_module_storage_by_key(
+        &self,
+        key: &T::Key,
+    ) -> VMResult<ModuleStorageRead<ModuleStorageEntry>> {
         match &self.latest_view {
             ViewState::Sync(state) => {
                 // If the module read has been previously cached, return early.
@@ -211,7 +214,7 @@ impl<'a, T: Transaction, S: TStateView<Key = T::Key>, X: Executable> LatestView<
         &self,
         address: &AccountAddress,
         module_name: &IdentStr,
-    ) -> VMResult<ModuleStorageRead> {
+    ) -> VMResult<ModuleStorageRead<ModuleStorageEntry>> {
         let key = T::Key::from_address_and_module_name(address, module_name);
         self.read_module_storage_by_key(&key)
     }
@@ -251,7 +254,7 @@ impl<'a, T: Transaction, S: TStateView<Key = T::Key>, X: Executable> LatestView<
         //  2. Entry exists at this index.
 
         // Otherwise, run the local verification first.
-        let size = entry.bytes().len();
+        let size = entry.size_in_bytes();
         let cm = entry.as_compiled_module();
         let partially_verified_module = self
             .runtime_environment

aptos-move/mvhashmap/Cargo.toml

@@ -30,6 +30,7 @@ serde = { workspace = true }
 
 [dev-dependencies]
 aptos-aggregator = { workspace = true, features = ["testing"] }
+move-vm-runtime = { workspace = true }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
 rayon = { workspace = true }

aptos-move/mvhashmap/src/lib.rs

@@ -9,6 +9,7 @@ use crate::{
 };
 use aptos_types::{
     executable::{Executable, ModulePath},
+    vm::modules::ModuleStorageEntry,
     write_set::TransactionWrite,
 };
 use serde::Serialize;
@@ -39,7 +40,7 @@ pub struct MVHashMap<K, T, V: TransactionWrite, X: Executable, I: Clone> {
     group_data: VersionedGroupData<K, T, V>,
     delayed_fields: VersionedDelayedFields<I>,
     modules: VersionedModules<K, V, X>,
-    module_storage: VersionedModuleStorage<K>,
+    module_storage: VersionedModuleStorage<K, ModuleStorageEntry>,
 }
 
 impl<
@@ -94,7 +95,7 @@ impl<
         &self.modules
     }
 
-    pub fn module_storage(&self) -> &VersionedModuleStorage<K> {
+    pub fn module_storage(&self) -> &VersionedModuleStorage<K, ModuleStorageEntry> {
         &self.module_storage
     }
 }