Merge pull request #1981 from multiversx/bitflag-typeabi

typeabi bitflag - test

Author: andrei-marinica

Cargo.lock

@@ -20,3 +20,6 @@ path = "../../../framework/scenario"
 [dev-dependencies.multiversx-sc-meta-lib]
 version = "0.56.1"
 path = "../../../framework/meta-lib"
+
+[dependencies]
+bitflags = "=2.8.0"

contracts/feature-tests/abi-tester/Cargo.toml

@@ -332,6 +332,21 @@
                 }
             ]
         },
+        {
+            "name": "echo_permission",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "p",
+                    "type": "Permission"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Permission"
+                }
+            ]
+        },
         {
             "name": "item_for_array",
             "mutability": "readonly",
@@ -1021,6 +1036,15 @@
                     "name": "interrupted"
                 }
             ]
+        },
+        "Permission": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "0",
+                    "type": "u32"
+                }
+            ]
         }
     }
 }

contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json

@@ -641,6 +641,15 @@
                     "name": "interrupted"
                 }
             ]
+        },
+        "Permission": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "0",
+                    "type": "u32"
+                }
+            ]
         }
     }
 }

contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json

@@ -312,6 +312,19 @@ where
             .original_result()
     }
 
+    pub fn echo_permission<
+        Arg0: ProxyArg<Permission>,
+    >(
+        self,
+        p: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Permission> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("echo_permission")
+            .argument(&p)
+            .original_result()
+    }
+
     pub fn item_for_array<
         Arg0: ProxyArg<[OnlyShowsUpAsNestedInArray; 5]>,
     >(
@@ -520,6 +533,10 @@ pub struct AbiManagedVecItem {
     pub value2: u32,
 }
 
+#[type_abi]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, NestedDecode, NestedEncode, TopEncode, TopDecode)]
+pub struct Permission(u32);
+
 #[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct OnlyShowsUpAsNestedInArray {}

contracts/feature-tests/abi-tester/src/abi_proxy.rs

@@ -1,4 +1,5 @@
 use crate::only_nested::*;
+use bitflags::bitflags;
 use multiversx_sc::{
     api::ManagedTypeApi,
     typenum::U2,
@@ -60,3 +61,14 @@ pub struct AbiWithManagedBufferReadToEnd<M: ManagedTypeApi> {
     pub gas: u64,
     pub flush: ManagedBufferReadToEnd<M>,
 }
+
+bitflags! {
+    #[type_abi]
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, NestedDecode, NestedEncode, TopEncode, TopDecode)]
+    pub struct Permission: u32 {
+        const NONE = 0;
+        const OWNER = 1;
+        const ADMIN = 2;
+        const PAUSE = 4;
+    }
+}

contracts/feature-tests/abi-tester/src/abi_test_type.rs

@@ -152,6 +152,11 @@ pub trait AbiTester {
         ManagedVec::new()
     }
 
+    #[view]
+    fn echo_permission(&self, p: Permission) -> Permission {
+        p
+    }
+
     #[view]
     fn item_for_array(&self, _array: &[OnlyShowsUpAsNestedInArray; 5]) {}
 

contracts/feature-tests/abi-tester/src/abi_tester.rs

@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           30
+// Endpoints:                           31
 // Async Callback (empty):               1
-// Total number of exported functions:  33
+// Total number of exported functions:  34
 
 #![no_std]
 
@@ -39,6 +39,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         item_for_vec => item_for_vec
         item_for_array_vec => item_for_array_vec
         item_for_managed_vec => item_for_managed_vec
+        echo_permission => echo_permission
         item_for_array => item_for_array
         item_for_box => item_for_box
         item_for_boxed_slice => item_for_boxed_slice