[compiler-v2 framework] Fixed the error of function params signer is …

…reference (#4282)
starcoinorg · Nov 13, 2024 · 1f94920 · 1f94920
1 parent 19ee5d3
commit 1f94920
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/abi/decoder/src/lib.rs b/abi/decoder/src/lib.rs
@@ -206,7 +206,11 @@ fn decode_script_function_inner(
         let arg_abis = func_abi.args();
         let first_arg_is_signer = arg_abis
             .first()
-            .filter(|abi| abi.type_abi() == &TypeInstantiation::Signer)
+            .filter(|abi| {
+                abi.type_abi() == &TypeInstantiation::Signer
+                    || abi.type_abi()
+                        == &TypeInstantiation::Reference(false, Box::new(TypeInstantiation::Signer))
+            })
             .is_some();
         if first_arg_is_signer {
             &arg_abis[1..]

diff --git a/vm/vm-runtime/src/move_vm_ext/session.rs b/vm/vm-runtime/src/move_vm_ext/session.rs
@@ -545,10 +545,11 @@ impl<'r, 'l> SessionExt<'r, 'l> {
         args: Vec<Vec<u8>>,
         sender: AccountAddress,
     ) -> VMResult<Vec<Vec<u8>>> {
+        let signer_ref = Type::Reference(Box::new(Type::Signer));
         let has_signer = func
             .param_tys()
             .iter()
-            .position(|i| matches!(i, &Type::Signer))
+            .position(|i| i == &Type::Signer || i == &signer_ref)
             .map(|pos| {
                 if pos != 0 {
                     Err(

diff --git a/vm/vm-runtime/src/verifier/transaction_arg_validation.rs b/vm/vm-runtime/src/verifier/transaction_arg_validation.rs
@@ -99,7 +99,9 @@ pub(crate) fn validate_combine_singer_and_args(
         match ty {
             Type::Signer => signer_param_cnt += 1,
             Type::Reference(inner_type) => {
-                if matches!(&**inner_type, Type::Signer) {
+                let signer_ref_type = Type::Reference(Box::new(Type::Signer));
+                if matches!(&**inner_type, Type::Signer) || matches!(&**inner_type, signer_ref_type)
+                {
                     signer_param_cnt += 1;
                 }
             }