feat: common roles component

packages/utils/src/components.cairo

@@ -1,4 +1,5 @@
 pub mod blocklist;
+pub mod common_roles;
 pub mod deposit;
 pub mod nonce;
 pub mod pausable;

packages/utils/src/components/blocklist/blocklist.cairo

@@ -1,13 +1,13 @@
 #[starknet::component]
 pub mod blocklist {
-    use RolesComponent::InternalTrait as RolesInternalTrait;
+    use CommonRolesComponent::InternalTrait as CommonRolesInternalTrait;
     use openzeppelin::access::accesscontrol::AccessControlComponent;
     use openzeppelin::introspection::src5::SRC5Component;
     use starknet::storage::{Map, StorageMapReadAccess, StorageMapWriteAccess};
     use starknet::{ContractAddress, get_caller_address};
     use starkware_utils::components::blocklist::events::{Blocklisted, Unblocklisted};
     use starkware_utils::components::blocklist::interface::IBlocklist;
-    use starkware_utils::components::roles::RolesComponent;
+    use starkware_utils::components::common_roles::CommonRolesComponent;
 
     #[storage]
     pub struct Storage {
@@ -30,7 +30,7 @@ pub mod blocklist {
         TContractState,
         +HasComponent<TContractState>,
         +Drop<TContractState>,
-        impl Roles: RolesComponent::HasComponent<TContractState>,
+        impl CommonRoles: CommonRolesComponent::HasComponent<TContractState>,
         +AccessControlComponent::HasComponent<TContractState>,
         +SRC5Component::HasComponent<TContractState>,
     > of IBlocklist<ComponentState<TContractState>> {
@@ -43,8 +43,8 @@ pub mod blocklist {
         ///
         /// Can be called only by security admin.
         fn add_to_blocklist(ref self: ComponentState<TContractState>, account: ContractAddress) {
-            let roles = get_dep_component!(@self, Roles);
-            roles.only_security_admin();
+            let common_roles = get_dep_component!(@self, CommonRoles);
+            common_roles.only_security_admin();
             self.blocklist.write(account, true);
             self.emit(Blocklisted { account, caller: get_caller_address() });
         }
@@ -55,8 +55,8 @@ pub mod blocklist {
         fn remove_from_blocklist(
             ref self: ComponentState<TContractState>, account: ContractAddress,
         ) {
-            let roles = get_dep_component!(@self, Roles);
-            roles.only_security_admin();
+            let common_roles = get_dep_component!(@self, CommonRoles);
+            common_roles.only_security_admin();
             self.blocklist.write(account, false);
             self.emit(Unblocklisted { account, caller: get_caller_address() });
         }

packages/utils/src/components/blocklist/mock_contract.cairo

@@ -6,13 +6,15 @@ pub mod blocklist_mock_contract {
     use starknet::ContractAddress;
     use starkware_utils::components::blocklist::blocklist::blocklist as BlocklistComponent;
     use starkware_utils::components::blocklist::blocklist::blocklist::InternalTrait as BlocklistInternalTrait;
+    use starkware_utils::components::common_roles::CommonRolesComponent;
     use starkware_utils::components::roles::RolesComponent;
     use starkware_utils::components::roles::RolesComponent::InternalTrait as RolesInternalTrait;
     use starkware_utils::interfaces::mintable_token::IMintableToken;
 
     component!(path: ERC20Component, storage: erc20, event: ERC20Event);
     component!(path: BlocklistComponent, storage: blocklist, event: BlocklistEvent);
     component!(path: RolesComponent, storage: roles, event: RolesEvent);
+    component!(path: CommonRolesComponent, storage: common_roles, event: CommonRolesEvent);
     component!(path: AccessControlComponent, storage: access_control, event: AccessControlEvent);
     component!(path: SRC5Component, storage: src5, event: SRC5Event);
 
@@ -21,7 +23,6 @@ pub mod blocklist_mock_contract {
     #[abi(embed_v0)]
     impl ERC20MetadataImpl = ERC20Component::ERC20MetadataImpl<ContractState>;
 
-
     #[abi(embed_v0)]
     impl BlocklistImpl = BlocklistComponent::BlocklistImpl<ContractState>;
     #[abi(embed_v0)]
@@ -39,6 +40,8 @@ pub mod blocklist_mock_contract {
         #[substorage(v0)]
         roles: RolesComponent::Storage,
         #[substorage(v0)]
+        common_roles: CommonRolesComponent::Storage,
+        #[substorage(v0)]
         access_control: AccessControlComponent::Storage,
         #[substorage(v0)]
         src5: SRC5Component::Storage,
@@ -54,6 +57,8 @@ pub mod blocklist_mock_contract {
         #[flat]
         RolesEvent: RolesComponent::Event,
         #[flat]
+        CommonRolesEvent: CommonRolesComponent::Event,
+        #[flat]
         AccessControlEvent: AccessControlComponent::Event,
         #[flat]
         SRC5Event: SRC5Component::Event,

packages/utils/src/components/common_roles.cairo

@@ -0,0 +1,9 @@
+pub(crate) mod common_roles;
+
+pub use common_roles::CommonRolesComponent;
+
+#[cfg(test)]
+pub(crate) mod mock_contract;
+
+#[cfg(test)]
+mod test;