[gas] pass address & type to the gas meter when loading resources

Author: vgao1996

language/move-vm/runtime/src/interpreter.rs

@@ -526,6 +526,7 @@ impl Interpreter {
 
     /// Loads a resource from the data store and return the number of bytes read from the storage.
     fn load_resource<'b>(
+        loader: &Loader,
         gas_meter: &mut impl GasMeter,
         data_store: &'b mut impl DataStore,
         addr: AccountAddress,
@@ -547,7 +548,7 @@ impl Interpreter {
                         }
                         None => None,
                     };
-                    gas_meter.charge_load_resource(opt)?;
+                    gas_meter.charge_load_resource(addr, TypeWithLoader { ty, loader }, opt)?;
                 }
                 Ok(gv)
             }
@@ -572,7 +573,7 @@ impl Interpreter {
         addr: AccountAddress,
         ty: &Type,
     ) -> PartialVMResult<()> {
-        let res = Self::load_resource(gas_meter, data_store, addr, ty)?.borrow_global();
+        let res = Self::load_resource(loader, gas_meter, data_store, addr, ty)?.borrow_global();
         gas_meter.charge_borrow_global(
             is_mut,
             is_generic,
@@ -593,7 +594,7 @@ impl Interpreter {
         addr: AccountAddress,
         ty: &Type,
     ) -> PartialVMResult<()> {
-        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        let gv = Self::load_resource(loader, gas_meter, data_store, addr, ty)?;
         let exists = gv.exists()?;
         gas_meter.charge_exists(is_generic, TypeWithLoader { ty, loader }, exists)?;
         self.operand_stack.push(Value::bool(exists))?;
@@ -610,21 +611,22 @@ impl Interpreter {
         addr: AccountAddress,
         ty: &Type,
     ) -> PartialVMResult<()> {
-        let resource = match Self::load_resource(gas_meter, data_store, addr, ty)?.move_from() {
-            Ok(resource) => {
-                gas_meter.charge_move_from(
-                    is_generic,
-                    TypeWithLoader { ty, loader },
-                    Some(&resource),
-                )?;
-                resource
-            }
-            Err(err) => {
-                let val: Option<&Value> = None;
-                gas_meter.charge_move_from(is_generic, TypeWithLoader { ty, loader }, val)?;
-                return Err(err);
-            }
-        };
+        let resource =
+            match Self::load_resource(loader, gas_meter, data_store, addr, ty)?.move_from() {
+                Ok(resource) => {
+                    gas_meter.charge_move_from(
+                        is_generic,
+                        TypeWithLoader { ty, loader },
+                        Some(&resource),
+                    )?;
+                    resource
+                }
+                Err(err) => {
+                    let val: Option<&Value> = None;
+                    gas_meter.charge_move_from(is_generic, TypeWithLoader { ty, loader }, val)?;
+                    return Err(err);
+                }
+            };
         self.operand_stack.push(resource)?;
         Ok(())
     }
@@ -640,7 +642,7 @@ impl Interpreter {
         ty: &Type,
         resource: Value,
     ) -> PartialVMResult<()> {
-        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        let gv = Self::load_resource(loader, gas_meter, data_store, addr, ty)?;
         // NOTE(Gas): To maintain backward compatibility, we need to charge gas after attempting
         //            the move_to operation.
         match gv.move_to(resource) {

language/move-vm/test-utils/src/gas_schedule.rs

@@ -17,6 +17,7 @@ use move_binary_format::{
     file_format_common::{instruction_key, Opcodes},
 };
 use move_core_types::{
+    account_address::AccountAddress,
     gas_algebra::{
         AbstractMemorySize, GasQuantity, InternalGas, InternalGasPerAbstractMemoryUnit,
         InternalGasUnit, NumArgs, NumBytes, ToUnit, ToUnitFractional,
@@ -409,6 +410,8 @@ impl<'b> GasMeter for GasStatus<'b> {
 
     fn charge_load_resource(
         &mut self,
+        _addr: AccountAddress,
+        _ty: impl TypeView,
         _loaded: Option<(NumBytes, impl ValueView)>,
     ) -> PartialVMResult<()> {
         Ok(())

language/move-vm/types/src/gas.rs

@@ -4,6 +4,7 @@
 use crate::views::{TypeView, ValueView};
 use move_binary_format::{errors::PartialVMResult, file_format::CodeOffset};
 use move_core_types::{
+    account_address::AccountAddress,
     gas_algebra::{InternalGas, NumArgs, NumBytes},
     language_storage::ModuleId,
 };
@@ -209,6 +210,8 @@ pub trait GasMeter {
     /// session -- identical transactions can have different gas costs. Use at your own risk.
     fn charge_load_resource(
         &mut self,
+        addr: AccountAddress,
+        ty: impl TypeView,
         loaded: Option<(NumBytes, impl ValueView)>,
     ) -> PartialVMResult<()>;
 
@@ -435,6 +438,8 @@ impl GasMeter for UnmeteredGasMeter {
 
     fn charge_load_resource(
         &mut self,
+        _addr: AccountAddress,
+        _ty: impl TypeView,
         _loaded: Option<(NumBytes, impl ValueView)>,
     ) -> PartialVMResult<()> {
         Ok(())