fix runtime exception in native function

rooch-network · Apr 14, 2024 · f44c306 · f44c306
1 parent f4a65e8
commit f44c306
Show file tree

Hide file tree

Showing 20 changed files with 356 additions and 106 deletions.
diff --git a/frameworks/moveos-stdlib/src/lib.rs b/frameworks/moveos-stdlib/src/lib.rs
@@ -1,7 +1,11 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::moveos_stdlib::wasm::E_INCORRECT_LENGTH_OF_ARGS;
+use move_binary_format::errors::PartialVMResult;
 use move_core_types::account_address::AccountAddress;
+use move_core_types::gas_algebra::InternalGas;
+use move_vm_types::natives::function::NativeResult;
 use moveos_types::addresses::MOVEOS_NAMED_ADDRESS_MAPPING;
 use std::{collections::BTreeMap, str::FromStr};
 
@@ -22,3 +26,7 @@ pub fn moveos_stdlib_named_addresses() -> BTreeMap<String, AccountAddress> {
     );
     address_mapping
 }
+
+pub fn args_count_error(base_gas: InternalGas) -> PartialVMResult<NativeResult> {
+    Ok(NativeResult::err(base_gas, E_INCORRECT_LENGTH_OF_ARGS))
+}
diff --git a/frameworks/moveos-stdlib/src/natives/moveos_stdlib/account.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/account.rs
@@ -1,6 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::args_count_error;
 use move_binary_format::errors::PartialVMResult;
 use move_core_types::account_address::AccountAddress;
 use move_core_types::gas_algebra::InternalGas;
@@ -39,8 +40,13 @@ pub fn native_create_signer(
     ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert!(ty_args.is_empty());
-    debug_assert!(arguments.len() == 1);
+    if !ty_args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
+    if arguments.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
 
     let address = pop_arg!(arguments, AccountAddress);
     Ok(NativeResult::ok(

diff --git a/frameworks/moveos-stdlib/src/natives/moveos_stdlib/bcs.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/bcs.rs
@@ -1,6 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::args_count_error;
 use crate::natives::helpers::{make_module_natives, make_native};
 use move_binary_format::errors::{PartialVMError, PartialVMResult};
 use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
@@ -38,8 +39,13 @@ fn native_from_bytes(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert_eq!(ty_args.len(), 1);
-    debug_assert_eq!(args.len(), 1);
+    if ty_args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
 
     let mut cost = gas_params.base;
 

diff --git a/frameworks/moveos-stdlib/src/natives/moveos_stdlib/event.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/event.rs
@@ -1,6 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::args_count_error;
 use crate::natives::helpers;
 use better_any::{Tid, TidAble};
 use move_binary_format::errors::{PartialVMError, PartialVMResult};
@@ -55,8 +56,13 @@ pub fn native_emit(
     mut ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert!(ty_args.len() == 1);
-    debug_assert!(args.len() == 1);
+    if ty_args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
 
     let mut cost = gas_params.base;
 

diff --git a/frameworks/moveos-stdlib/src/natives/moveos_stdlib/json.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/json.rs
@@ -1,6 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::args_count_error;
 use crate::natives::helpers::{make_module_natives, make_native};
 use anyhow::Result;
 use log::debug;
@@ -235,8 +236,13 @@ fn native_from_json(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert_eq!(ty_args.len(), 1);
-    debug_assert_eq!(args.len(), 1);
+    if ty_args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
 
     let mut cost = gas_params.base;
     let type_param = &ty_args[0];

diff --git a/frameworks/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/move_module.rs
@@ -1,6 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::args_count_error;
 use crate::natives::helpers::{make_module_natives, make_native};
 use better_any::{Tid, TidAble};
 use framework_builder::dependency_order::sort_by_dependency_order;
@@ -73,6 +74,14 @@ fn native_module_id_inner(
     _ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
+    if !_ty_args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
+
     let byte_codes = pop_arg!(args, VectorRef);
     let byte_codes_ref = byte_codes.as_bytes_ref();
 
@@ -96,9 +105,17 @@ pub struct ModuleIdFromNameInnerGasParameters {
 fn native_module_id_from_name_inner(
     gas_params: &ModuleIdFromNameInnerGasParameters,
     _context: &mut NativeContext,
-    _ty_args: Vec<Type>,
+    ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
+    if !ty_args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
+
     let name = args.pop_back().unwrap();
     let name_ident = unpack_string_to_identifier(name)?;
     let account_address = pop_arg!(args, AccountAddress);
@@ -131,9 +148,17 @@ pub struct VerifyModulesGasParameters {
 fn native_sort_and_verify_modules_inner(
     gas_params: &VerifyModulesGasParameters,
     context: &mut NativeContext,
-    _ty_args: Vec<Type>,
+    ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
+    if !ty_args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() < 2 {
+        return args_count_error(gas_params.base);
+    }
+
     let mut cost = gas_params.base;
     let account_address = pop_arg!(args, AccountAddress);
     let mut bundle = vec![];
@@ -240,9 +265,17 @@ pub struct RequestInitFunctionsGasParameters {
 fn request_init_functions(
     gas_params: &RequestInitFunctionsGasParameters,
     context: &mut NativeContext,
-    _ty_args: Vec<Type>,
+    ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
+    if !ty_args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
     let mut cost = gas_params.base;
     let module_context = context.extensions_mut().get_mut::<NativeModuleContext>();
     for id_value in pop_arg!(args, Vec<Value>) {
@@ -276,9 +309,17 @@ pub struct CheckCompatibilityInnerGasParameters {
 fn check_compatibililty_inner(
     gas_params: &CheckCompatibilityInnerGasParameters,
     _context: &mut NativeContext,
-    _ty_args: Vec<Type>,
+    ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
+    if !ty_args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() < 2 {
+        return args_count_error(gas_params.base);
+    }
+
     let mut cost = gas_params.base;
     // TODO: config compatibility through global configuration
     let compat = Compatibility::full_check();
@@ -311,7 +352,7 @@ pub struct ModuleModifyGasParameters {
 fn module_replace_template<C, F, TF>(
     gas_params: &ModuleModifyGasParameters,
     _context: &mut NativeContext,
-    _ty_args: Vec<Type>,
+    ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
     element_type: Type,
     modify_fn: F,
@@ -322,7 +363,14 @@ where
     F: Fn(&mut CompiledModule, &HashMap<C, C>) -> PartialVMResult<()>,
     TF: Fn(Value) -> PartialVMResult<C>,
 {
-    debug_assert!(args.len() == 3, "Wrong number of arguments");
+    if !ty_args.is_empty() {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 3 {
+        return args_count_error(gas_params.base);
+    }
+
     let mut cost = gas_params.base;
     let new_vec = pop_arg!(args, Vector);
     let old_vec = pop_arg!(args, Vector);

diff --git a/frameworks/moveos-stdlib/src/natives/moveos_stdlib/object.rs b/frameworks/moveos-stdlib/src/natives/moveos_stdlib/object.rs
@@ -20,6 +20,7 @@ use moveos_types::{
 use smallvec::smallvec;
 use std::{collections::VecDeque, sync::Arc};
 
+use crate::args_count_error;
 pub use moveos_object_runtime::runtime::{
     ERROR_ALREADY_EXISTS, ERROR_NOT_FOUND, ERROR_OBJECT_ALREADY_BORROWED,
     ERROR_OBJECT_RUNTIME_ERROR, ERROR_TYPE_MISMATCH,
@@ -51,8 +52,13 @@ fn native_as_ref_inner(
     ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert!(ty_args.len() == 1);
-    debug_assert!(arguments.len() == 1);
+    if ty_args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
+
+    if arguments.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
 
     let object_id = arguments.pop_back().unwrap();
     let object_ref = borrow_object_reference(context, object_id, &ty_args[0])?;
@@ -89,8 +95,13 @@ fn native_as_mut_ref_inner(
     ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert!(ty_args.len() == 1);
-    debug_assert!(arguments.len() == 1);
+    if ty_args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
+
+    if arguments.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
 
     let object_id = arguments.pop_back().unwrap();
     let object_ref = borrow_object_reference(context, object_id, &ty_args[0])?;
@@ -207,8 +218,14 @@ fn native_borrow_root(
     ty_args: Vec<Type>,
     args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert_eq!(ty_args.len(), 0);
-    debug_assert_eq!(args.len(), 0);
+    if !ty_args.is_empty() {
+        return args_count_error(common_gas_params.load_base);
+    }
+
+    if !args.is_empty() {
+        return args_count_error(common_gas_params.load_base);
+    }
+
     let object_context = context.extensions().get::<ObjectRuntimeContext>();
     let object_runtime = object_context.object_runtime();
     let value = object_runtime.read().borrow_root()?;
@@ -239,9 +256,13 @@ fn native_add_field(
 ) -> PartialVMResult<NativeResult> {
     //0 K Type
     //1 V Type FieldValue or ObjectEntity
+    if ty_args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
 
-    debug_assert_eq!(ty_args.len(), 2);
-    debug_assert_eq!(args.len(), 3);
+    if args.len() != 3 {
+        return args_count_error(gas_params.base);
+    }
 
     let val = args.pop_back().unwrap();
     let key = args.pop_back().unwrap();
@@ -288,8 +309,13 @@ fn native_borrow_field(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert_eq!(ty_args.len(), 2);
-    debug_assert_eq!(args.len(), 2);
+    if ty_args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
 
     let key = args.pop_back().unwrap();
     let object_id = pop_object_id(&mut args)?;
@@ -334,8 +360,13 @@ fn native_contains_field(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert_eq!(ty_args.len(), 1);
-    debug_assert_eq!(args.len(), 2);
+    if ty_args.len() != 1 {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
 
     let key = args.pop_back().unwrap();
     let object_id = pop_object_id(&mut args)?;
@@ -371,8 +402,13 @@ fn native_contains_field_with_value_type(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert_eq!(ty_args.len(), 2);
-    debug_assert_eq!(args.len(), 2);
+    if ty_args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
 
     let key = args.pop_back().unwrap();
     let object_id = pop_object_id(&mut args)?;
@@ -423,8 +459,13 @@ fn native_remove_field(
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    debug_assert_eq!(ty_args.len(), 2);
-    debug_assert_eq!(args.len(), 2);
+    if ty_args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
+
+    if args.len() != 2 {
+        return args_count_error(gas_params.base);
+    }
 
     let key = args.pop_back().unwrap();
     let object_id = pop_object_id(&mut args)?;