do not impose limits on unmetered TXes (MystenLabs#8199)

Remove object runtime limits for system/unmetered TXes
Increase user object runtime limits to 2048

crates/sui-adapter-transactional-tests/tests/size_limits/deleted_id_limits_tests.exp

@@ -15,8 +15,8 @@ written: object(106)
 
 task 5 'run'. lines 45-47:
 Error: Transaction Effects Status: Move Primitive Runtime Error. Location: sui::tx_context::derive_id (function index 0) at offset 0. Arithmetic error, stack overflow, max value depth, etc.
-Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 1024 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 2048 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }
 
 task 6 'run'. lines 48-48:
 Error: Transaction Effects Status: Move Primitive Runtime Error. Location: sui::tx_context::derive_id (function index 0) at offset 0. Arithmetic error, stack overflow, max value depth, etc.
-Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 1024 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 2048 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }

crates/sui-adapter-transactional-tests/tests/size_limits/deleted_id_limits_tests.move

@@ -39,10 +39,10 @@ module Test::M1 {
 //# run Test::M1::delete_n_ids --args 256
 
 // run at run count limit should succeed
-//# run Test::M1::delete_n_ids --args 1024
+//# run Test::M1::delete_n_ids --args 2048
 
 // run above run count limit should fail
-//# run Test::M1::delete_n_ids --args 1025
+//# run Test::M1::delete_n_ids --args 2049
 
 // run above run count limit should fail
-//# run Test::M1::delete_n_ids --args 2048
+//# run Test::M1::delete_n_ids --args 4096

crates/sui-adapter-transactional-tests/tests/size_limits/new_id_limits_tests.exp

@@ -15,8 +15,8 @@ written: object(106)
 
 task 5 'run'. lines 44-46:
 Error: Transaction Effects Status: Move Primitive Runtime Error. Location: sui::tx_context::derive_id (function index 0) at offset 0. Arithmetic error, stack overflow, max value depth, etc.
-Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 1024 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 2048 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }
 
 task 6 'run'. lines 47-47:
 Error: Transaction Effects Status: Move Primitive Runtime Error. Location: sui::tx_context::derive_id (function index 0) at offset 0. Arithmetic error, stack overflow, max value depth, etc.
-Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 1024 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MovePrimitiveRuntimeError(Some(MoveLocation { module: ModuleId { address: sui, name: Identifier("tx_context") }, function: 0, instruction: 0, function_name: Some("derive_id") })), source: Some(VMError { major_status: MEMORY_LIMIT_EXCEEDED, sub_status: Some(2), message: Some("Creating more than 2048 IDs is not allowed"), exec_state: None, location: Module(ModuleId { address: sui, name: Identifier("tx_context") }), indices: [], offsets: [(FunctionDefinitionIndex(0), 0)] }) } }

crates/sui-adapter-transactional-tests/tests/size_limits/new_id_limits_tests.move

@@ -38,10 +38,10 @@ module Test::M1 {
 //# run Test::M1::create_n_ids --args 256
 
 // create at create count limit should succeed
-//# run Test::M1::create_n_ids --args 1024
+//# run Test::M1::create_n_ids --args 2048
 
 // create above create count limit should fail
-//# run Test::M1::create_n_ids --args 1025
+//# run Test::M1::create_n_ids --args 2049
 
 // create above create count limit should fail
-//# run Test::M1::create_n_ids --args 2048
+//# run Test::M1::create_n_ids --args 4096

crates/sui-adapter-transactional-tests/tests/size_limits/transfered_id_limits_tests.move

@@ -39,11 +39,11 @@ module Test::M1 {
 //# run Test::M1::transfer_n_ids --args 256
 
 // run at run count limit should succeed
-//# run Test::M1::transfer_n_ids --args 1024
+//# run Test::M1::transfer_n_ids --args 2048
 
 // run above run count limit should fail
-//# run Test::M1::transfer_n_ids --args 1025
+//# run Test::M1::transfer_n_ids --args 2049
 
 // run above run count limit should fail
-//# run Test::M1::transfer_n_ids --args 2048
+//# run Test::M1::transfer_n_ids --args 4096
 

crates/sui-adapter/src/adapter.rs

@@ -90,9 +90,14 @@ pub fn new_session<
     vm: &'v MoveVM,
     state_view: &'r S,
     input_objects: BTreeMap<ObjectID, (/* by_value */ bool, Owner)>,
+    is_metered: bool,
 ) -> Session<'r, 'v, S> {
     let mut extensions = NativeContextExtensions::default();
-    extensions.add(ObjectRuntime::new(Box::new(state_view), input_objects));
+    extensions.add(ObjectRuntime::new(
+        Box::new(state_view),
+        input_objects,
+        is_metered,
+    ));
     vm.new_session_with_extensions(state_view, extensions)
 }
 
@@ -208,7 +213,7 @@ fn execute_internal<
         .iter()
         .map(|(id, (owner, _))| (*id, (by_value_objects.contains(id), *owner)))
         .collect();
-    let mut session = new_session(vm, state_view, input_objects);
+    let mut session = new_session(vm, state_view, input_objects, gas_status.is_metered());
     // check type arguments separately for error conversion
     for (idx, ty) in type_args.iter().enumerate() {
         session
@@ -287,7 +292,7 @@ fn execute_internal<
         user_events,
         loaded_child_objects,
     } = object_runtime.finish()?;
-    let session = new_session(vm, &*state_view, BTreeMap::new());
+    let session = new_session(vm, &*state_view, BTreeMap::new(), gas_status.is_metered());
     let writes = writes
         .into_iter()
         .map(|(id, (write_kind, owner, ty, tag, value))| {
@@ -481,7 +486,7 @@ pub fn verify_and_link<
     // verifier may assume well-formedness conditions enforced by the Move verifier hold
     let vm = MoveVM::new(natives)
         .expect("VM creation only fails if natives are invalid, and we created the natives");
-    let mut session = new_session(&vm, state_view, BTreeMap::new());
+    let mut session = new_session(&vm, state_view, BTreeMap::new(), gas_status.is_metered());
     // TODO(https://github.com/MystenLabs/sui/issues/69): avoid this redundant serialization by exposing VM API that allows us to run the linker directly on `Vec<CompiledModule>`
     let new_module_bytes: Vec<_> = modules
         .iter()

crates/sui-cost-tables/src/bytecode_tables.rs

@@ -68,6 +68,10 @@ impl<'a> GasStatus<'a> {
         }
     }
 
+    pub fn is_metered(&self) -> bool {
+        self.charge
+    }
+
     /// Initialize the gas state with metering disabled.
     ///
     /// It should be used by clients in very specific cases and when executing system

crates/sui-framework/src/lib.rs

@@ -79,7 +79,11 @@ fn new_testing_object_runtime(ext: &mut NativeContextExtensions) {
         InputObjects::new(vec![]),
         TransactionDigest::random(),
     );
-    ext.add(ObjectRuntime::new(Box::new(state_view), BTreeMap::new()))
+    ext.add(ObjectRuntime::new(
+        Box::new(state_view),
+        BTreeMap::new(),
+        false,
+    ))
 }
 
 pub fn get_sui_framework() -> Vec<CompiledModule> {

crates/sui-framework/src/natives/object_runtime/mod.rs

@@ -84,6 +84,8 @@ pub struct ObjectRuntime<'a> {
     pub(crate) test_inventories: TestInventories,
     // the internal state
     pub(crate) state: ObjectRuntimeState,
+    // whether or not this TX is gas metered
+    is_metered: bool,
 }
 
 pub enum TransferResult {
@@ -102,6 +104,7 @@ impl<'a> ObjectRuntime<'a> {
     pub fn new(
         object_resolver: Box<dyn ChildObjectResolver + 'a>,
         input_objects: BTreeMap<ObjectID, (/* by_value */ bool, Owner)>,
+        is_metered: bool,
     ) -> Self {
         Self {
             object_store: ObjectStore::new(object_resolver),
@@ -113,11 +116,13 @@ impl<'a> ObjectRuntime<'a> {
                 transfers: LinkedHashMap::new(),
                 events: vec![],
             },
+            is_metered,
         }
     }
 
     pub fn new_id(&mut self, id: ObjectID) -> PartialVMResult<()> {
-        if self.state.new_ids.len() == MAX_NUM_NEW_MOVE_OBJECT_IDS {
+        // Metered transactions don't have limits for now
+        if self.is_metered && (self.state.new_ids.len() == MAX_NUM_NEW_MOVE_OBJECT_IDS) {
             return Err(PartialVMError::new(StatusCode::MEMORY_LIMIT_EXCEEDED)
                 .with_message(format!(
                     "Creating more than {MAX_NUM_NEW_MOVE_OBJECT_IDS} IDs is not allowed"
@@ -138,7 +143,8 @@ impl<'a> ObjectRuntime<'a> {
     pub fn delete_id(&mut self, id: ObjectID) -> PartialVMResult<()> {
         // This is defensive because `self.state.deleted_ids` may not indeed
         // be called based on the `was_new` flag
-        if self.state.deleted_ids.len() == MAX_NUM_DELETED_MOVE_OBJECT_IDS {
+        // Metered transactions don't have limits for now
+        if self.is_metered && (self.state.deleted_ids.len() == MAX_NUM_DELETED_MOVE_OBJECT_IDS) {
             return Err(PartialVMError::new(StatusCode::MEMORY_LIMIT_EXCEEDED)
                 .with_message(format!(
                     "Deleting more than {MAX_NUM_DELETED_MOVE_OBJECT_IDS} IDs is not allowed"
@@ -184,8 +190,9 @@ impl<'a> ObjectRuntime<'a> {
                 TransferResult::OwnerChanged
             };
 
-        // Todo: System objects should not be subject to such limits?
-        if (self.state.transfers.len() == MAX_NUM_TRANSFERED_MOVE_OBJECT_IDS)
+        // Metered transactions don't have limits for now
+        if self.is_metered
+            && (self.state.transfers.len() == MAX_NUM_TRANSFERED_MOVE_OBJECT_IDS)
             && (id != SUI_SYSTEM_STATE_OBJECT_ID)
         {
             return Err(PartialVMError::new(StatusCode::MEMORY_LIMIT_EXCEEDED)

crates/sui-protocol-constants/src/lib.rs

@@ -55,13 +55,13 @@ pub const MAX_DEPENDENCY_DEPTH: usize = 100;
 pub const MAX_NUM_EVENT_EMIT: u64 = 256;
 
 /// Maximum number of new IDs that a single transaction can create. Enforced by the VM during execution.
-pub const MAX_NUM_NEW_MOVE_OBJECT_IDS: usize = 1024;
+pub const MAX_NUM_NEW_MOVE_OBJECT_IDS: usize = 2048;
 
 /// Maximum number of IDs that a single transaction can delete. Enforced by the VM during execution.
-pub const MAX_NUM_DELETED_MOVE_OBJECT_IDS: usize = 1024;
+pub const MAX_NUM_DELETED_MOVE_OBJECT_IDS: usize = 2048;
 
 /// Maximum number of IDs that a single transaction can transfer. Enforced by the VM during execution.
-pub const MAX_NUM_TRANSFERED_MOVE_OBJECT_IDS: usize = 1024;
+pub const MAX_NUM_TRANSFERED_MOVE_OBJECT_IDS: usize = 2048;
 
 // === Execution gas costs ====
 // note: per-instruction and native function gas costs live in the sui-cost-tables crate