feat: create refac nft contract and registry--prepare repo for odhack

.gitignore

@@ -2,4 +2,7 @@
 /frontend/node_modules
 /backend/env
 /backend/.env
-.DS_Store
+.DS_Store
+
+.snfoundry_cache/
+target/

land_registry/Scarb.lock

@@ -4,3 +4,97 @@ version = 1
 [[package]]
 name = "land_registry"
 version = "0.1.0"
+dependencies = [
+ "openzeppelin",
+]
+
+[[package]]
+name = "openzeppelin"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+dependencies = [
+ "openzeppelin_access",
+ "openzeppelin_account",
+ "openzeppelin_governance",
+ "openzeppelin_introspection",
+ "openzeppelin_merkle_tree",
+ "openzeppelin_presets",
+ "openzeppelin_security",
+ "openzeppelin_token",
+ "openzeppelin_upgrades",
+ "openzeppelin_utils",
+]
+
+[[package]]
+name = "openzeppelin_access"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+dependencies = [
+ "openzeppelin_introspection",
+ "openzeppelin_utils",
+]
+
+[[package]]
+name = "openzeppelin_account"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+dependencies = [
+ "openzeppelin_introspection",
+ "openzeppelin_utils",
+]
+
+[[package]]
+name = "openzeppelin_governance"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+dependencies = [
+ "openzeppelin_access",
+ "openzeppelin_introspection",
+]
+
+[[package]]
+name = "openzeppelin_introspection"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+
+[[package]]
+name = "openzeppelin_merkle_tree"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+
+[[package]]
+name = "openzeppelin_presets"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+dependencies = [
+ "openzeppelin_access",
+ "openzeppelin_account",
+ "openzeppelin_introspection",
+ "openzeppelin_token",
+ "openzeppelin_upgrades",
+]
+
+[[package]]
+name = "openzeppelin_security"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+
+[[package]]
+name = "openzeppelin_token"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+dependencies = [
+ "openzeppelin_account",
+ "openzeppelin_governance",
+ "openzeppelin_introspection",
+]
+
+[[package]]
+name = "openzeppelin_upgrades"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+
+[[package]]
+name = "openzeppelin_utils"
+version = "0.16.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"

land_registry/Scarb.toml

@@ -8,6 +8,7 @@ cairo-version = "2.8.2"
 
 [dependencies]
 starknet = ">=2.8.0"
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.16.0" }
 
 [dev-dependencies]
 cairo_test = "2.8.0"

land_registry/src/interface.cairo

@@ -6,17 +6,11 @@ pub struct Land {
     location: felt252,
     area: u256,
     land_use: LandUse,
+    is_approved: bool,
+    inspector: Option<ContractAddress>,
     last_transaction_timestamp: u64,
 }
 
-struct LandApprovalDetails {
-    ApprovedBy: felt252,
-    Agency: felt252,
-    land: Land,
-    land_id: u256,
-    timestamp: u64,
-}
-
 #[derive(Debug, Drop, Copy, Clone, Serde, starknet::Store, PartialEq)]
 pub enum LandUse {
     Residential,
@@ -43,13 +37,10 @@ pub trait ILandRegistry<TContractState> {
     ) -> u256;
     fn transfer_land(ref self: TContractState, land_id: u256, new_owner: ContractAddress);
     fn get_land(self: @TContractState, land_id: u256) -> Land;
-    //fn get_owner_lands(self: @TContractState, owner_lands: ContractAddress) -> Array<u256>;
-    //fn get_lands(self: @TContractState, owner: ContractAddress, location: felt252, land_use:
-    //felt252) -> Array<u256>;
-
     fn update_land(ref self: TContractState, land_id: u256, area: u256, land_use: LandUse);
-    // fn get_approved_lands
-
-    //fn approve_land
-//fn reject_land
+    fn approve_land(ref self: TContractState, land_id: u256);
+    fn reject_land(ref self: TContractState, land_id: u256);
+    fn is_inspector(self: @TContractState, address: ContractAddress) -> bool;
+    fn add_inspector(ref self: TContractState, inspector: ContractAddress);
+    fn remove_inspector(ref self: TContractState, inspector: ContractAddress);
 }

land_registry/src/land_nft.cairo

@@ -1,56 +1,77 @@
+use starknet::ContractAddress;
+use openzeppelin::token::erc721::ERC721Component;
+use openzeppelin::introspection::src5::SRC5Component;
+
 #[starknet::interface]
-pub trait ILandNFT<ContractState> {
-    fn mint(ref self: ContractState, to: ContractAddress, token_id: u256);
-    fn transfer(ref self: ContractState, from: ContractAddress, to: ContractAddress, token_id: u256);
-    use starknet::ContractAddress;
+pub trait ILandNFT<TContractState> {
+    fn mint(ref self: TContractState, to: ContractAddress, token_id: u256);
+    fn transfer(
+        ref self: TContractState, from: ContractAddress, to: ContractAddress, token_id: u256
+    );
 }
 
 #[starknet::contract]
 pub mod LandNFT {
+    use super::ILandNFT;
     use starknet::ContractAddress;
-    use openzeppelin::token::erc20::ERC20Component;
-    use starknet::storage::{Map, StorageMapWriteAccess, StorageMapReadAccess};
+    use openzeppelin::token::erc721::{ERC721Component, ERC721Component::InternalTrait};
+    use openzeppelin::introspection::src5::SRC5Component;
+    use openzeppelin::token::erc721::ERC721HooksEmptyImpl;
 
 
-    component!(path: ERC20Component, storage: erc20, event: ERC20Event);
+    component!(path: ERC721Component, storage: erc721, event: ERC721Event);
+    component!(path: SRC5Component, storage: src5, event: SRC5Event);
 
     #[abi(embed_v0)]
-    impl ERC20Impl = ERC20Component::ERC20Impl<ContractState>;
+    impl ERC721Impl = ERC721Component::ERC721Impl<ContractState>;
     #[abi(embed_v0)]
-    impl ERC20CamelOnlyImpl = ERC20Component::ERC20CamelOnlyImpl<ContractState>;
-    impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;
+    impl ERC721CamelOnlyImpl = ERC721Component::ERC721CamelOnlyImpl<ContractState>;
+    impl ERC721InternalImpl = ERC721Component::InternalImpl<ContractState>;
 
     #[storage]
     struct Storage {
         #[substorage(v0)]
-        erc20: ERC20Component::Storage,
+        erc721: ERC721Component::Storage,
+        #[substorage(v0)]
+        src5: SRC5Component::Storage,
         land_registry: ContractAddress,
     }
 
     #[event]
     #[derive(Drop, starknet::Event)]
     enum Event {
         #[flat]
-        ERC20Event: ERC20Component::Event
+        ERC721Event: ERC721Component::Event,
+        #[flat]
+        SRC5Event: SRC5Component::Event,
     }
 
     #[constructor]
     fn constructor(ref self: ContractState, land_registry: ContractAddress) {
-        self.erc20.initializer('Land NFT', 'LAND');
+        self.erc721.initializer("Land NFT", "LAND", format!(""));
         self.land_registry.write(land_registry);
     }
 
-    #[external(v0)]
-    fn mint(ref self: ContractState, to: ContractAddress, token_id: u256) {
-        // Only the land registry contract can mint NFTs
-        assert(starknet::get_caller_address() == self.land_registry.read(), 'Only land registry can mint');
-        self.erc20._mint(to, token_id);
-    }
+    #[abi(embed_v0)]
+    impl LandNFTImpl of ILandNFT<ContractState> {
+        fn mint(ref self: ContractState, to: ContractAddress, token_id: u256) {
+            // Only the land registry contract can mint NFTs
+            assert(
+                starknet::get_caller_address() == self.land_registry.read(),
+                'Only land registry can mint'
+            );
+            self.erc721.mint(to, token_id);
+        }
 
-    #[external(v0)]
-    fn transfer_land_nft(ref self: ContractState, from: ContractAddress, to: ContractAddress, token_id: u256) {
-        // Only the land registry contract can transfer NFTs
-        assert(starknet::get_caller_address() == self.land_registry.read(), 'Only land registry can transfer');
-        self.erc20._transfer(from, to, token_id);
+        fn transfer(
+            ref self: ContractState, from: ContractAddress, to: ContractAddress, token_id: u256
+        ) {
+            // Only the land registry contract can transfer NFTs
+            assert(
+                starknet::get_caller_address() == self.land_registry.read(),
+                'Only land registry can transfer'
+            );
+            self.erc721.transfer(from, to, token_id);
+        }
     }
 }