Merge pull request #1 from aji70/main

feat: added the pause, unpause and whitelist functionality

Author: joeephwild

.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: Build and Test
+
+on: [push, pull_request]
+permissions: read-all
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: 2.8.4
+      - name: Check cairo format
+        run: scarb fmt --check
+      - name: Build cairo programs
+        run: scarb build
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: 2.8.4
+      - uses: foundry-rs/setup-snfoundry@v3
+        with:
+          starknet-foundry-version: 0.37.0
+      - name: Run cairo tests
+        run: snforge test

src/interfaces.cairo

@@ -7,7 +7,11 @@ use loop_starknet::factory::TribesNftFactory::Collection;
 #[starknet::interface]
 pub trait IERC721<TContractState> {
     fn mint_ticket_nft(ref self: TContractState, recipient: ContractAddress, token_id: u256);
-    fn burn_nft(ref self: TContractState, token_id: u256); 
+    fn burn_nft(ref self: TContractState, token_id: u256);
+    fn pause(ref self: TContractState);
+    fn unpause(ref self: TContractState);
+    fn whitelist_address(ref self: TContractState, address: ContractAddress);
+    fn is_whitelisted(ref self: TContractState, address: ContractAddress) -> bool;
 }
 
 
@@ -46,7 +50,7 @@ pub trait IVault<TContractState> {
     );
     fn burn_expired_pass(ref self: TContractState, token_id: u32, user: ContractAddress);
 
-    fn check_pass_status(self: @TContractState,user: ContractAddress, token_id: u32) -> bool;
+    fn check_pass_status(self: @TContractState, user: ContractAddress, token_id: u32) -> bool;
     fn get_validity(self: @TContractState, token_id: u32) -> TribePassValidity;
     fn get_artist_info(self: @TContractState, artist_address: ContractAddress) -> ArtistDetails;
     fn get_user_pass(self: @TContractState, user: ContractAddress) -> PassDetails;

src/nfts/tribes_nft.cairo

@@ -1,11 +1,10 @@
-
 const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");
 const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");
 
 #[starknet::contract]
 pub mod TribesNFT {
     use starknet::{ContractAddress, get_caller_address};
-    use starknet::storage::{StoragePointerWriteAccess, StoragePointerReadAccess};
+    use starknet::storage::{Map, StorageMapReadAccess, StorageMapWriteAccess,};
     use core::num::traits::Zero;
     use openzeppelin::access::accesscontrol::AccessControlComponent;
     use openzeppelin::introspection::src5::SRC5Component;
@@ -44,7 +43,8 @@ pub mod TribesNFT {
         pausable: PausableComponent::Storage,
         #[substorage(v0)]
         accesscontrol: AccessControlComponent::Storage,
-        next_token_id: u256
+        next_token_id: u256,
+        whitelist: Map<ContractAddress, bool>,
     }
 
     #[event]
@@ -93,33 +93,60 @@ pub mod TribesNFT {
     #[abi(embed_v0)]
     impl IERC721Impl of IERC721<ContractState> {
         fn burn_nft(ref self: ContractState, token_id: u256) {
+            let owner = self.erc721.ownerOf(token_id);
+            self.whitelist.write(owner, false);
             self.erc721.update(Zero::zero(), token_id, get_caller_address());
         }
 
         fn mint_ticket_nft(ref self: ContractState, recipient: ContractAddress, token_id: u256) {
+            let is_whitelisted = self.whitelist.read(recipient);
+            assert(is_whitelisted, 'Not Whitelisted');
             let balance = self.erc721.balance_of(recipient);
             assert(balance.is_zero(), 'ALREADY_MINTED');
 
             self._mint(recipient, token_id);
         }
-    }
 
-    // Additional functions not part of the IERC721 interface
-    #[generate_trait]
-    #[abi(per_item)]
-    impl ExternalImpl of ExternalTrait {
-        #[external(v0)]
         fn pause(ref self: ContractState) {
             self.accesscontrol.assert_only_role(PAUSER_ROLE);
             self.pausable.pause();
         }
 
-        #[external(v0)]
+
         fn unpause(ref self: ContractState) {
             self.accesscontrol.assert_only_role(PAUSER_ROLE);
             self.pausable.unpause();
         }
 
+        fn whitelist_address(ref self: ContractState, address: ContractAddress) {
+            self.accesscontrol.assert_only_role(PAUSER_ROLE);
+            let is_whitelisted = self.whitelist.read(address);
+            assert(!is_whitelisted, 'Already Whitelisted');
+            self.whitelist.write(address, true);
+        }
+
+        fn is_whitelisted(ref self: ContractState, address: ContractAddress) -> bool {
+            let is_whitelisted = self.whitelist.read(address);
+            is_whitelisted
+        }
+    }
+
+    // Additional functions not part of the IERC721 interface
+    #[generate_trait]
+    #[abi(per_item)]
+    impl ExternalImpl of ExternalTrait {
+        // #[external(v0)]
+        // fn pause(ref self: ContractState) {
+        //     self.accesscontrol.assert_only_role(PAUSER_ROLE);
+        //     self.pausable.pause();
+        // }
+
+        // #[external(v0)]
+        // fn unpause(ref self: ContractState) {
+        //     self.accesscontrol.assert_only_role(PAUSER_ROLE);
+        //     self.pausable.unpause();
+        // }
+
         #[external(v0)]
         fn _mint(ref self: ContractState, recipient: ContractAddress, token_id: u256,) {
             // self.accesscontrol.assert_only_role(MINTER_ROLE);
@@ -137,4 +164,4 @@ pub mod TribesNFT {
             self.erc721.safe_mint(recipient, token_id, data);
         }
     }
-}
+}