import permissionable component into account

horuslabsio · Aug 28, 2024 · a39f12a · a39f12a
1 parent 1a8d1a6
commit a39f12a
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/src/components/account/account.cairo b/src/components/account/account.cairo
@@ -21,6 +21,7 @@ pub mod AccountComponent {
     use token_bound_accounts::interfaces::IAccount::{
         IAccount, IAccountDispatcherTrait, IAccountDispatcher, TBA_INTERFACE_ID
     };
+    use token_bound_accounts::components::permissionable::permissionable::PermissionableComponent;
 
     // *************************************************************************
     //                              STORAGE
@@ -80,7 +81,8 @@ pub mod AccountComponent {
     // *************************************************************************
     #[embeddable_as(AccountImpl)]
     pub impl Account<
-        TContractState, +HasComponent<TContractState>, +Drop<TContractState>
+        TContractState, +HasComponent<TContractState>, +Drop<TContractState>,
+        impl Permissionable: PermissionableComponent::HasComponent<TContractState>
     > of IAccount<ComponentState<TContractState>> {
         /// @notice used for signature validation
         /// @param hash The message hash
@@ -140,7 +142,8 @@ pub mod AccountComponent {
     // *************************************************************************
     #[generate_trait]
     pub impl InternalImpl<
-        TContractState, +HasComponent<TContractState>, +Drop<TContractState>
+        TContractState, +HasComponent<TContractState>, +Drop<TContractState>,
+        impl Permissionable: PermissionableComponent::HasComponent<TContractState>
     > of InternalTrait<TContractState> {
         /// @notice initializes the account by setting the initial token contract and token id
         fn initializer(
@@ -240,11 +243,24 @@ pub mod AccountComponent {
         ) -> bool {
             let owner = self
                 ._get_owner(self.account_token_contract.read(), self.account_token_id.read());
-            if (signer == owner) {
+            let permissionable_comp = get_dep_component!(ref self, Permissionable); 
+
+            let has_permission =  permissionable_comp.has_permission(owner, signer);
+
+            if(signer == owner){
                 return true;
-            } else {
-                return false;
+            }  
+
+            if (has_permission){
+                return true
             }
+            return false;
+            // if (signer == owner) {
+            //     return true;
+            // } else {
+            //     // run the chek here
+            //     return false;
+            // }
         }
 
         /// @notice internal function for signature validation