Testnet Deploy 1.2

Testnet Deploy 1.2

.github/workflows/nextjs.yml

@@ -77,6 +77,7 @@ jobs:
         env:
             NEXT_PUBLIC_APP_ROOT: ${{ vars.NEXT_PUBLIC_APP_ROOT }}
             NEXT_PUBLIC_CHAIN_ID: ${{ vars.NEXT_PUBLIC_CHAIN_ID }}
+            NEXT_PUBLIC_FUND_MANAGER_ADDR: ${{ vars.NEXT_PUBLIC_FUND_MANAGER_ADDR }}
         run: |
           echo "Chain is ${{ vars.NEXT_PUBLIC_CHAIN_ID }}"
           ${{ steps.detect-package-manager.outputs.runner }} next build

contracts/src/constants.cairo

@@ -1,3 +1,5 @@
 pub mod funds;
 pub mod donator;
 pub mod errors;
+pub mod starknet;
+pub mod fund_manager;

contracts/src/constants/fund_manager.cairo

@@ -0,0 +1 @@
+pub mod fund_manager_constants;

contracts/src/constants/funds.cairo

@@ -1,4 +1,2 @@
-pub mod state_constants;
 pub mod fund_constants;
-pub mod fund_manager_constants;
-pub mod starknet_constants;
+

contracts/src/constants/funds/fund_constants.cairo

@@ -7,3 +7,20 @@ pub mod FundConstants {
     pub const INITIAL_GOAL: u256 = 0;
     pub const MINIMUM_GOAL: u256 = 500;
 }
+// *************************************************************************
+//                              FUND TYPES CONSTANTS
+// *************************************************************************
+pub mod FundTypeConstants {
+    pub const PROJECT: u8 = 1;
+    pub const CHARITY: u8 = 2;
+}
+// *************************************************************************
+//                            FUND STATES CONSTANTS
+// *************************************************************************
+pub mod FundStates {
+    pub const INNACTIVE: u8 = 0;
+    pub const RECOLLECTING_VOTES: u8 = 1;
+    pub const RECOLLECTING_DONATIONS: u8 = 2;
+    pub const CLOSED: u8 = 3;
+    pub const WITHDRAW: u8 = 4;
+}

contracts/src/constants/starknet.cairo

@@ -0,0 +1 @@
+pub mod starknet_constants;

contracts/src/fund.cairo

@@ -4,6 +4,7 @@ use starknet::ContractAddress;
 pub trait IFund<TContractState> {
     fn get_id(self: @TContractState) -> u128;
     fn get_owner(self: @TContractState) -> ContractAddress;
+    fn is_owner(self: @TContractState, caller: ContractAddress) -> bool;
     fn set_name(ref self: TContractState, name: ByteArray);
     fn get_name(self: @TContractState) -> ByteArray;
     fn set_reason(ref self: TContractState, reason: ByteArray);
@@ -16,12 +17,14 @@ pub trait IFund<TContractState> {
     fn get_current_goal_state(self: @TContractState) -> u256;
     fn set_state(ref self: TContractState, state: u8);
     fn get_state(self: @TContractState) -> u8;
-    fn get_voter(self: @TContractState) -> u32;
+    fn get_voter(self: @TContractState, user: ContractAddress) -> u32;
     fn withdraw(ref self: TContractState);
     fn set_evidence_link(ref self: TContractState, evidence: ByteArray);
     fn get_evidence_link(self: @TContractState) -> ByteArray;
     fn set_contact_handle(ref self: TContractState, contact_handle: ByteArray);
     fn get_contact_handle(self: @TContractState) -> ByteArray;
+    fn set_type(ref self: TContractState, fund_type: u8);
+    fn get_type(self: @TContractState) -> u8;
 }
 
 #[starknet::contract]
@@ -34,11 +37,10 @@ pub mod Fund {
     use starknet::contract_address_const;
     use starknet::get_contract_address;
     use openzeppelin::token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
-    use gostarkme::constants::{funds::{state_constants::FundStates},};
-    use gostarkme::constants::{
-        funds::{fund_constants::FundConstants, fund_manager_constants::FundManagerConstants},
-    };
-    use gostarkme::constants::{funds::{starknet_constants::StarknetConstants},};
+    use gostarkme::constants::{funds::{fund_constants::FundStates},};
+    use gostarkme::constants::{funds::{fund_constants::FundConstants},};
+    use gostarkme::constants::{fund_manager::{fund_manager_constants::FundManagerConstants},};
+    use gostarkme::constants::{starknet::{starknet_constants::StarknetConstants},};
 
     // *************************************************************************
     //                            EVENTS
@@ -89,7 +91,8 @@ pub mod Fund {
         goal: u256,
         state: u8,
         evidence_link: ByteArray,
-        contact_handle: ByteArray
+        contact_handle: ByteArray,
+        fund_type: u8,
     }
 
     // *************************************************************************
@@ -104,7 +107,8 @@ pub mod Fund {
         goal: u256,
         evidence_link: ByteArray,
         contact_handle: ByteArray,
-        reason: ByteArray
+        reason: ByteArray,
+        fund_type: u8,
     ) {
         self.id.write(id);
         self.owner.write(owner);
@@ -115,6 +119,7 @@ pub mod Fund {
         self.state.write(FundStates::RECOLLECTING_VOTES);
         self.evidence_link.write(evidence_link);
         self.contact_handle.write(contact_handle);
+        self.fund_type.write(fund_type);
     }
 
     // *************************************************************************
@@ -128,6 +133,9 @@ pub mod Fund {
         fn get_owner(self: @ContractState) -> ContractAddress {
             return self.owner.read();
         }
+        fn is_owner(self: @ContractState, caller: ContractAddress) -> bool {
+            return (self.owner.read() == caller);
+        }
         fn set_name(ref self: ContractState, name: ByteArray) {
             let caller = get_caller_address();
             let valid_address_1 = contract_address_const::<FundManagerConstants::VALID_ADDRESS_1>();
@@ -226,8 +234,9 @@ pub mod Fund {
         fn get_state(self: @ContractState) -> u8 {
             return self.state.read();
         }
-        fn get_voter(self: @ContractState) -> u32 {
-            return self.voters.read(get_caller_address());
+        fn get_voter(self: @ContractState, user: ContractAddress) -> u32 {
+            let voter = self.voters.read(user);
+            return voter;
         }
         fn withdraw(ref self: ContractState) {
             let caller = get_caller_address();
@@ -282,6 +291,19 @@ pub mod Fund {
         fn get_contact_handle(self: @ContractState) -> ByteArray {
             return self.contact_handle.read();
         }
+        fn set_type(ref self: ContractState, fund_type: u8) {
+            let caller = get_caller_address();
+            let valid_address_1 = contract_address_const::<FundManagerConstants::VALID_ADDRESS_1>();
+            let valid_address_2 = contract_address_const::<FundManagerConstants::VALID_ADDRESS_2>();
+            assert!(
+                valid_address_1 == caller || valid_address_2 == caller,
+                "Only Admins can change the fund type."
+            );
+            self.fund_type.write(fund_type);
+        }
+        fn get_type(self: @ContractState) -> u8 {
+            return self.fund_type.read();
+        }
     }
     // *************************************************************************
     //                            INTERNALS

contracts/src/fundManager.cairo → contracts/src/fund_manager.cairo

@@ -9,7 +9,8 @@ pub trait IFundManager<TContractState> {
         goal: u256,
         evidence_link: ByteArray,
         contact_handle: ByteArray,
-        reason: ByteArray
+        reason: ByteArray,
+        fund_type: u8,
     );
     fn get_current_id(self: @TContractState) -> u128;
     fn get_fund(self: @TContractState, id: u128) -> ContractAddress;
@@ -85,6 +86,7 @@ pub mod FundManager {
             evidence_link: ByteArray,
             contact_handle: ByteArray,
             reason: ByteArray,
+            fund_type: u8
         ) {
             assert(goal >= FundConstants::MINIMUM_GOAL, 'Goal must be at least 500');
             let mut call_data: Array<felt252> = array![];
@@ -95,6 +97,7 @@ pub mod FundManager {
             Serde::serialize(@evidence_link, ref call_data);
             Serde::serialize(@contact_handle, ref call_data);
             Serde::serialize(@reason, ref call_data);
+            Serde::serialize(@fund_type, ref call_data);
             let (new_fund_address, _) = deploy_syscall(
                 self.fund_class_hash.read(), 12345, call_data.span(), false
             )

contracts/src/lib.cairo

@@ -1,7 +1,7 @@
 pub mod constants;
 //  FUND
 pub mod fund;
-pub mod fundManager;
+pub mod fund_manager;
 //  DONATOR
-pub mod donatorManager;
+pub mod donator_manager;
 pub mod donator;

contracts/tests/test_donator.cairo

@@ -76,3 +76,4 @@ fn test_update_donator_values() {
     assert(total_stark_donations == 11, 'Invalid total stark donations');
     assert(max_stark_donations_to_next_level == 20, 'Invalid total stark donations');
 }
+

contracts/tests/test_donator_manager.cairo

@@ -12,7 +12,7 @@ use snforge_std::{
 
 use openzeppelin::utils::serde::SerializedAppend;
 
-use gostarkme::donatorManager::{
+use gostarkme::donator_manager::{
     DonatorManager, IDonatorManagerDispatcher, IDonatorManagerDispatcherTrait
 };
 

contracts/tests/test_fund.cairo

@@ -16,9 +16,10 @@ use openzeppelin::token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTr
 use gostarkme::fund::Fund;
 use gostarkme::fund::IFundDispatcher;
 use gostarkme::fund::IFundDispatcherTrait;
-use gostarkme::constants::{funds::{fund_manager_constants::FundManagerConstants},};
-use gostarkme::constants::{funds::{state_constants::FundStates},};
-use gostarkme::constants::{funds::{starknet_constants::StarknetConstants},};
+use gostarkme::constants::{fund_manager::{fund_manager_constants::FundManagerConstants},};
+use gostarkme::constants::{funds::{fund_constants::FundStates},};
+use gostarkme::constants::{funds::{fund_constants::FundTypeConstants},};
+use gostarkme::constants::{starknet::{starknet_constants::StarknetConstants},};
 
 const ONE_E18: u256 = 1000000000000000000_u256;
 fn ID() -> u128 {
@@ -73,6 +74,8 @@ fn _setup_() -> ContractAddress {
     calldata.append_serde(EVIDENCE_LINK_1());
     calldata.append_serde(CONTACT_HANDLE_1());
     calldata.append_serde(REASON_1());
+    calldata.append_serde(FundTypeConstants::PROJECT);
+
     let (contract_address, _) = contract.deploy(@calldata).unwrap();
     contract_address
 }
@@ -223,26 +226,27 @@ fn test_set_goal_unauthorized() {
 fn test_receive_vote_successful() {
     let contract_address = _setup_();
     let dispatcher = IFundDispatcher { contract_address };
+    start_cheat_caller_address_global(OTHER_USER());
     dispatcher.receive_vote();
-    let me = dispatcher.get_voter();
-    // Owner vote, fund have one vote
-    assert(me == 1, 'Owner is not in the voters');
-    let votes = dispatcher.get_up_votes();
-    assert(votes == 1, 'Vote unuseccessful');
+    let other_user_votes = dispatcher.get_voter(OTHER_USER());
+    assert(other_user_votes == 1, 'Other user is not in the voters');
+    let fund_votes = dispatcher.get_up_votes();
+    assert(fund_votes == 1, 'Vote unuseccessful');
 }
 
 #[test]
 #[should_panic(expected: ('User already voted!',))]
 fn test_receive_vote_unsuccessful_double_vote() {
     let contract_address = _setup_();
     let dispatcher = IFundDispatcher { contract_address };
+    start_cheat_caller_address_global(OTHER_USER());
     dispatcher.receive_vote();
-    let me = dispatcher.get_voter();
-    // Owner vote, fund have one vote
-    assert(me == 1, 'Owner is not in the voters');
+    let other_user_votes = dispatcher.get_voter(OTHER_USER());
+    // User vote, fund have one vote
+    assert(other_user_votes == 1, 'Owner is not in the voters');
     let votes = dispatcher.get_up_votes();
     assert(votes == 1, 'Vote unuseccessful');
-    // Owner vote, second time
+    // User vote, second time
     dispatcher.receive_vote();
 }
 
@@ -602,3 +606,18 @@ fn test_set_contact_handle_success() {
     assert(reverted_contact_handle == CONTACT_HANDLE_1(), ' revert ')
 }
 
+#[test]
+fn test_set_type() {
+    let contract_address = _setup_();
+    let dispatcher = IFundDispatcher { contract_address };
+    let current_type = dispatcher.get_type();
+    assert(current_type == FundTypeConstants::PROJECT, 'Invalid type');
+    start_cheat_caller_address(contract_address, VALID_ADDRESS_1());
+    dispatcher.set_type(FundTypeConstants::CHARITY);
+    let new_type = dispatcher.get_type();
+    assert(new_type == FundTypeConstants::CHARITY, 'Set type method not working');
+    start_cheat_caller_address(contract_address, VALID_ADDRESS_2());
+    dispatcher.set_type(FundTypeConstants::PROJECT);
+    let new_type = dispatcher.get_type();
+    assert(new_type == FundTypeConstants::PROJECT, 'Set type method not working');
+}

contracts/tests/test_fund_manager.cairo

@@ -12,9 +12,10 @@ use snforge_std::{
 
 use openzeppelin::utils::serde::SerializedAppend;
 
-use gostarkme::fundManager::IFundManagerDispatcher;
-use gostarkme::fundManager::IFundManagerDispatcherTrait;
-use gostarkme::fundManager::FundManager;
+use gostarkme::fund_manager::IFundManagerDispatcher;
+use gostarkme::fund_manager::IFundManagerDispatcherTrait;
+use gostarkme::fund_manager::FundManager;
+use gostarkme::constants::{funds::{fund_constants::FundTypeConstants},};
 
 fn ID() -> u128 {
     1
@@ -54,6 +55,7 @@ fn _setup_() -> (ContractAddress, ClassHash) {
     fund_calldata.append_serde(EVIDENCE_LINK());
     fund_calldata.append_serde(CONTACT_HANDLE());
     fund_calldata.append_serde(REASON());
+    fund_calldata.append_serde(FundTypeConstants::PROJECT);
 
     let (fund_contract_address, _) = fund.deploy(@fund_calldata).unwrap();
     let fund_class_hash = get_class_hash(fund_contract_address);
@@ -87,7 +89,10 @@ fn test_new_fund() {
     start_cheat_caller_address_global(OWNER());
     let (contract_address, fund_class_hash) = _setup_();
     let fund_manager_contract = IFundManagerDispatcher { contract_address };
-    fund_manager_contract.new_fund(NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON());
+    fund_manager_contract
+        .new_fund(
+            NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON(), FundTypeConstants::PROJECT
+        );
     let expected_fund_class_hash = get_class_hash(fund_manager_contract.get_fund(1));
     let current_id = fund_manager_contract.get_current_id();
     assert(expected_fund_class_hash == fund_class_hash, 'Invalid fund address');
@@ -100,7 +105,15 @@ fn test_new_fund_bad_goal() {
     start_cheat_caller_address_global(OWNER());
     let (contract_address, _) = _setup_();
     let fund_manager_contract = IFundManagerDispatcher { contract_address };
-    fund_manager_contract.new_fund(NAME(), BAD_GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON());
+    fund_manager_contract
+        .new_fund(
+            NAME(),
+            BAD_GOAL(),
+            EVIDENCE_LINK(),
+            CONTACT_HANDLE(),
+            REASON(),
+            FundTypeConstants::PROJECT
+        );
 }
 
 #[test]
@@ -113,7 +126,10 @@ fn test_fund_deployed_event() {
     let mut spy = spy_events();
 
     let current_id = fund_manager_contract.get_current_id();
-    fund_manager_contract.new_fund(NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON());
+    fund_manager_contract
+        .new_fund(
+            NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON(), FundTypeConstants::PROJECT
+        );
 
     let expected_fund_class_hash = fund_manager_contract.get_fund(1);