Merge branch 'main' into main

Scarb.lock

@@ -58,9 +58,15 @@ name = "allo"
 version = "0.0.1"
 dependencies = [
  "alexandria_math",
+ "openzeppelin",
  "snforge_std",
 ]
 
+[[package]]
+name = "openzeppelin"
+version = "0.13.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.13.0#978b4e75209da355667d8954d2450e32bd71fe49"
+
 [[package]]
 name = "snforge_std"
 version = "0.23.0"

Scarb.toml

@@ -6,6 +6,7 @@ edition = "2023_11"
 [dependencies]
 starknet = "2.6.3"
 alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git" }
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.13.0" }
 
 [dev-dependencies]
 snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.23.0" }

src/core/libraries/errors.cairo

@@ -10,7 +10,7 @@ pub mod Errors {
     /// Thrown when user is not authorized
     pub const UNAUTHORIZED: felt252 = 'Not authorized';
     // // /// Thrown when address is the zero address
-    // const ZERO_ADDRESS : ContractAddress = contract_address_const::<'0'>();
+    pub const ZERO_ADDRESS: felt252 = 'Address is Zero';
     /// Thrown when the function is not implemented
     const NOT_IMPLEMENTED: felt252 = 'Not implemented';
     /// Thrown when the value is non-zero

src/core/registry.cairo

@@ -27,6 +27,26 @@ pub trait IRegistry<TContractState> {
 #[starknet::contract]
 pub mod Registry {
     use starknet::ContractAddress;
+    use core::poseidon::PoseidonTrait;
+    use core::hash::HashStateTrait;
+    use allo::core::libraries::errors::Errors;
+    use openzeppelin::access::accesscontrol::AccessControlComponent;
+    use openzeppelin::introspection::src5::SRC5Component;
+
+    component!(path: SRC5Component, storage: SRC5_supported_interfaces, event: SRC5ComponentEvent);
+
+    #[abi(embed_v0)]
+    impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;
+
+    component!(
+        path: AccessControlComponent, storage: accessControl, event: AccessControlComponentEvent
+    );
+
+    #[abi(embed_v0)]
+    impl AccessControlComponentImpl =
+        AccessControlComponent::AccessControlImpl<ContractState>;
+    impl AccessControlComponentInternalImpl = AccessControlComponent::InternalImpl<ContractState>;
+
     // ==========================
     // === Structs ==============
     // ==========================
@@ -52,22 +72,33 @@ pub mod Registry {
     #[storage]
     struct Storage {
         profiles_by_id: LegacyMap<u256, Profile>,
+        #[substorage(v0)]
+        SRC5_supported_interfaces: SRC5Component::Storage,
+        #[substorage(v0)]
+        accessControl: AccessControlComponent::Storage,
     }
 
     /// ======================
     /// ======= Events =======
     /// ======================
     #[event]
     #[derive(Drop, starknet::Event)]
-    enum Event {}
+    enum Event {
+        #[flat]
+        SRC5ComponentEvent: SRC5Component::Event,
+        #[flat]
+        AccessControlComponentEvent: AccessControlComponent::Event,
+    }
 
 
     #[constructor]
-    fn constructor(ref self: ContractState) { // Issue no #19
-    // https://github.com/allo-protocol/allo-v2/blob/4dd0ea34a504a16ac90e80f49a5570b8be9b30e9/contracts/core/Registry.sol#L78C40-L79C9
-    // Implement the functionality of making sure the address is not zero and
-    // grant the Allo owner role to the owner.
-    // You can use the posiedon hashing for hasing storing Allo owner
+    fn constructor(ref self: ContractState, _owner: ContractAddress) {
+        assert(_owner.into() == 0, Errors::ZERO_ADDRESS);
+
+        let allo_owner_role = PoseidonTrait::new().update('ALLO_OWNER').finalize();
+
+        self.accessControl.initializer();
+        self.accessControl._grant_role(allo_owner_role, _owner)
     }