fixup! fixup! [6/n][vm-rewrite][sui-execution] Update object runtime to use type tags instead of runtime VM types.

Author: tzakian

sui-execution/latest/sui-move-natives/src/config.rs

@@ -19,7 +19,6 @@ use move_vm_runtime::{
     pop_arg,
 };
 use smallvec::smallvec;
-use std::cell::RefMut;
 use std::collections::VecDeque;
 use sui_types::{base_types::MoveObjectType, TypeTag};
 use tracing::{error, instrument};
@@ -87,22 +86,25 @@ pub fn read_setting_impl(
             E_BCS_SERIALIZATION_FAILURE,
         ));
     };
-    let object_runtime: RefMut<ObjectRuntime> = context
-        .extensions_mut()
-        .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
-
-    let read_value_opt = consistent_value_before_current_epoch(
-        object_runtime,
-        field_setting_tag,
-        &field_setting_layout,
-        &setting_value_ty,
-        &setting_data_value_ty,
-        &value_ty,
-        config_addr,
-        name_df_addr,
-        current_epoch,
-    )?;
+
+    let read_value_opt = {
+        let object_runtime: &mut ObjectRuntime = &mut context
+            .extensions_mut()
+            .get::<NativeContextMut<ObjectRuntime>>()
+            .borrow_mut();
+
+        consistent_value_before_current_epoch(
+            object_runtime,
+            field_setting_tag,
+            &field_setting_layout,
+            &setting_value_ty,
+            &setting_data_value_ty,
+            &value_ty,
+            config_addr,
+            name_df_addr,
+            current_epoch,
+        )?
+    };
 
     native_charge_gas_early_exit!(
         context,
@@ -116,7 +118,7 @@ pub fn read_setting_impl(
 }
 
 fn consistent_value_before_current_epoch(
-    mut object_runtime: RefMut<ObjectRuntime>,
+    object_runtime: &mut ObjectRuntime,
     field_setting_tag: StructTag,
     field_setting_layout: &R::MoveTypeLayout,
     _setting_value_ty: &Type,

sui-execution/latest/sui-move-natives/src/dynamic_field.rs

@@ -24,7 +24,7 @@ use move_vm_runtime::{
 };
 use move_vm_runtime::{native_charge_gas_early_exit, natives::extensions::NativeContextMut};
 use smallvec::smallvec;
-use std::{cell::RefMut, collections::VecDeque};
+use std::collections::VecDeque;
 use sui_types::{base_types::MoveObjectType, dynamic_field::derive_dynamic_field_id};
 use tracing::instrument;
 
@@ -231,10 +231,10 @@ pub fn add_child_object(
     );
 
     {
-        let mut object_runtime: RefMut<ObjectRuntime> = context
+        let object_runtime: &mut ObjectRuntime = &mut context
             .extensions_mut()
             .get::<NativeContextMut<ObjectRuntime>>()
-            .get_mut();
+            .borrow_mut();
         object_runtime.add_child_object(parent, child_id, MoveObjectType::from(tag), child)?;
     };
     Ok(NativeResult::ok(context.gas_used(), smallvec![]))
@@ -290,7 +290,7 @@ pub fn borrow_child_object(
     // `get_or_fetch_object` so that the lifetime of the returned object is tied to the lifetime of
     // the runtime reference we are creating here and the borrow checker will be happy with us.
     let object_runtime: &NativeContextMut<'_, ObjectRuntime<'_>> = context.extensions().get();
-    let mut object_runtime_mut: RefMut<ObjectRuntime> = object_runtime.get_mut();
+    let object_runtime_mut: &mut ObjectRuntime = &mut object_runtime.borrow_mut();
     let global_value_result = get_or_fetch_object!(
         context,
         object_runtime_mut,
@@ -364,7 +364,7 @@ pub fn remove_child_object(
     // `get_or_fetch_object` so that the lifetime of the returned object is tied to the lifetime of
     // the runtime reference we are creating here and the borrow checker will be happy with us.
     let object_runtime: &NativeContextMut<'_, ObjectRuntime<'_>> = context.extensions().get();
-    let mut object_runtime_mut: RefMut<ObjectRuntime> = object_runtime.get_mut();
+    let object_runtime_mut: &mut ObjectRuntime = &mut object_runtime.borrow_mut();
     let global_value_result = get_or_fetch_object!(
         context,
         object_runtime_mut,
@@ -429,7 +429,7 @@ pub fn has_child_object(
     let child_id = pop_arg!(args, AccountAddress).into();
     let parent = pop_arg!(args, AccountAddress).into();
     let has_child = {
-        let mut object_runtime: RefMut<ObjectRuntime> = context.extensions().get::<NativeContextMut<ObjectRuntime>>().get_mut();
+        let object_runtime: &mut ObjectRuntime = &mut context.extensions().get::<NativeContextMut<ObjectRuntime>>().borrow_mut();
         object_runtime.child_object_exists(parent, child_id)?
     };
 
@@ -502,7 +502,7 @@ pub fn has_child_object_with_ty(
     );
 
     let has_child = {
-        let mut object_runtime: RefMut<ObjectRuntime> = context.extensions().get::<NativeContextMut<ObjectRuntime>>().get_mut();
+        let object_runtime: &mut ObjectRuntime = &mut context.extensions().get::<NativeContextMut<ObjectRuntime>>().borrow_mut();
         object_runtime.child_object_exists_and_has_type(parent, child_id, &MoveObjectType::from(tag))?
     };
 

sui-execution/latest/sui-move-natives/src/event.rs

@@ -10,7 +10,7 @@ use move_vm_runtime::{
 };
 use move_vm_runtime::{native_charge_gas_early_exit, natives::functions::NativeContext};
 use smallvec::smallvec;
-use std::{cell::RefMut, collections::VecDeque};
+use std::collections::VecDeque;
 use sui_types::error::VMMemoryLimitExceededSubStatusCode;
 
 #[derive(Clone, Debug)]
@@ -75,10 +75,10 @@ pub fn emit(
             * u64::from(tag_size).into()
     );
 
-    let mut obj_runtime: RefMut<ObjectRuntime> = context
+    let obj_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let max_event_emit_size = obj_runtime.protocol_config.max_event_emit_size();
     let ev_size = u64::from(tag_size + event_value_size);
     // Check if the event size is within the limit

sui-execution/latest/sui-move-natives/src/object.rs

@@ -14,7 +14,7 @@ use move_vm_runtime::{
 };
 use move_vm_runtime::{native_charge_gas_early_exit, natives::functions::NativeContext};
 use smallvec::smallvec;
-use std::{cell::RefMut, collections::VecDeque};
+use std::collections::VecDeque;
 
 #[derive(Clone)]
 pub struct BorrowUidCostParams {
@@ -80,10 +80,10 @@ pub fn delete_impl(
     // unwrap safe because the interface of native function guarantees it.
     let uid_bytes = pop_arg!(args, AccountAddress);
 
-    let mut obj_runtime: RefMut<ObjectRuntime> = context
+    let obj_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     obj_runtime.delete_id(uid_bytes.into())?;
     Ok(NativeResult::ok(context.gas_used(), smallvec![]))
 }
@@ -120,10 +120,10 @@ pub fn record_new_uid(
     // unwrap safe because the interface of native function guarantees it.
     let uid_bytes = pop_arg!(args, AccountAddress);
 
-    let mut obj_runtime: RefMut<ObjectRuntime> = context
+    let obj_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     obj_runtime.new_id(uid_bytes.into())?;
     Ok(NativeResult::ok(context.gas_used(), smallvec![]))
 }

sui-execution/latest/sui-move-natives/src/test_scenario.rs

@@ -29,7 +29,7 @@ use move_vm_runtime::{
 use smallvec::smallvec;
 use std::{
     borrow::Borrow,
-    cell::{RefCell, RefMut},
+    cell::RefCell,
     collections::{BTreeMap, BTreeSet, VecDeque},
     thread::LocalKey,
 };
@@ -100,10 +100,10 @@ pub fn end_transaction(
 ) -> PartialVMResult<NativeResult> {
     assert!(ty_args.is_empty());
     assert!(args.is_empty());
-    let mut object_runtime_ref: RefMut<ObjectRuntime> = context
+    let object_runtime_ref: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let taken_shared_or_imm: BTreeMap<_, _> = object_runtime_ref
         .test_inventories
         .taken
@@ -275,10 +275,10 @@ pub fn end_transaction(
     }
     // find all wrapped objects
     let mut all_wrapped = BTreeSet::new();
-    let mut object_runtime_ref: RefMut<ObjectRuntime> = context
+    let object_runtime_ref: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     find_all_wrapped_objects(
         context,
         &mut all_wrapped,
@@ -392,7 +392,7 @@ pub fn take_from_address_by_id(
     let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let res = take_from_inventory(
         |x| {
@@ -425,10 +425,10 @@ pub fn ids_for_address(
     let account: SuiAddress = pop_arg!(args, AccountAddress).into();
     assert!(args.is_empty());
     let specified_obj_ty = context.type_to_type_tag(&specified_ty)?;
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let ids = inventories
         .address_inventories
@@ -450,10 +450,10 @@ pub fn most_recent_id_for_address(
     let account: SuiAddress = pop_arg!(args, AccountAddress).into();
     assert!(args.is_empty());
     let specified_obj_ty = context.type_to_type_tag(&specified_ty)?;
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let most_recent_id = match inventories.address_inventories.get(&account) {
         None => pack_option(None),
@@ -475,10 +475,10 @@ pub fn was_taken_from_address(
     let id = pop_id(&mut args)?;
     let account: SuiAddress = pop_arg!(args, AccountAddress).into();
     assert!(args.is_empty());
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let was_taken = inventories
         .taken
@@ -505,7 +505,7 @@ pub fn take_immutable_by_id(
     let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let res = take_from_inventory(
         |x| {
@@ -543,10 +543,10 @@ pub fn most_recent_immutable_id(
     let specified_ty = get_specified_ty(ty_args);
     assert!(args.is_empty());
     let specified_obj_ty = context.type_to_type_tag(&specified_ty)?;
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let most_recent_id = most_recent_at_ty(
         &inventories.taken,
@@ -568,10 +568,10 @@ pub fn was_taken_immutable(
     assert!(ty_args.is_empty());
     let id = pop_id(&mut args)?;
     assert!(args.is_empty());
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let was_taken = inventories
         .taken
@@ -598,7 +598,7 @@ pub fn take_shared_by_id(
     let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let res = take_from_inventory(
         |x| {
@@ -629,10 +629,10 @@ pub fn most_recent_id_shared(
     let specified_ty = get_specified_ty(ty_args);
     assert!(args.is_empty());
     let specified_obj_ty = context.type_to_type_tag(&specified_ty)?;
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let most_recent_id = most_recent_at_ty(
         &inventories.taken,
@@ -654,10 +654,10 @@ pub fn was_taken_shared(
     assert!(ty_args.is_empty());
     let id = pop_id(&mut args)?;
     assert!(args.is_empty());
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     let was_taken = inventories
         .taken
@@ -685,10 +685,10 @@ pub fn allocate_receiving_ticket_for_object(
             E_UNABLE_TO_ALLOCATE_RECEIVING_TICKET,
         ));
     };
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let object_version = SequenceNumber::new();
     let inventories = &mut object_runtime.test_inventories;
     if inventories.allocated_tickets.contains_key(&id) {
@@ -765,10 +765,10 @@ pub fn deallocate_receiving_ticket_for_object(
 ) -> PartialVMResult<NativeResult> {
     let id = pop_id(&mut args)?;
 
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let inventories = &mut object_runtime.test_inventories;
     // Deallocate the ticket -- we should never hit this scenario
     let Some((_, value)) = inventories.allocated_tickets.remove(&id) else {

sui-execution/latest/sui-move-natives/src/transfer.rs

@@ -17,7 +17,6 @@ use move_vm_runtime::{
 };
 use move_vm_runtime::{native_charge_gas_early_exit, natives::functions::NativeContext};
 use smallvec::smallvec;
-use std::cell::RefMut;
 use std::collections::VecDeque;
 use sui_types::{
     base_types::{MoveObjectType, ObjectID, SequenceNumber},
@@ -76,10 +75,10 @@ pub fn receive_object_internal(
         ));
     };
 
-    let mut object_runtime: RefMut<ObjectRuntime> = context
+    let object_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     let child = match object_runtime.receive_object(
         parent,
         child_id,
@@ -248,9 +247,9 @@ fn object_runtime_transfer(
         }
     };
 
-    let mut obj_runtime: RefMut<ObjectRuntime> = context
+    let obj_runtime: &mut ObjectRuntime = &mut context
         .extensions()
         .get::<NativeContextMut<ObjectRuntime>>()
-        .get_mut();
+        .borrow_mut();
     obj_runtime.transfer(owner, object_type, obj)
 }