Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/aguilar1x/gostarkme into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@aguilar1x
aguilar1x committed Nov 13, 2024
2 parents d0af7f0 + 098ddad commit 0a5e9ac
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 180 deletions.
16 changes: 12 additions & 4 deletions contracts/src/fund.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ pub mod Fund {
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 state.");
assert!(
valid_address_1 == caller || valid_address_2 == caller,
"Only Admins can change the fund state."
);
self.state.write(state);
}
fn getState(self: @ContractState) -> u8 {
Expand All @@ -216,15 +219,20 @@ pub mod Fund {
assert(
self.get_current_goal_state() >= self.getGoal(), 'Fund hasnt reached its goal yet'
);

let valid_address = contract_address_const::<FundManagerConstants::VALID_ADDRESS_1>();
let withdrawn_amount = self.get_current_goal_state() * 95 / 100;
let fund_manager_amount = self.get_current_goal_state() * 5 / 100;
let withdrawn_amount = (self.get_current_goal_state() * 95) / 100;
let fund_manager_amount = (self.get_current_goal_state() * 5) / 100;

self.token_dispatcher().approve(self.getOwner(), withdrawn_amount);
self.token_dispatcher().transfer(self.getOwner(), withdrawn_amount);

self.token_dispatcher().approve(valid_address, fund_manager_amount);
self.token_dispatcher().transfer(valid_address, fund_manager_amount);

assert(self.get_current_goal_state() == 0, 'Pending stks to withdraw');
self.setState(4);
self.state.write(FundStates::WITHDRAW);

self
.emit(
DonationWithdraw {
Expand Down
231 changes: 55 additions & 176 deletions contracts/tests/test_fund.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use starknet::syscalls::call_contract_syscall;

use snforge_std::{
declare, ContractClassTrait, start_cheat_caller_address_global, start_cheat_caller_address,
cheat_caller_address, CheatSpan, spy_events, EventSpyAssertionsTrait
stop_cheat_caller_address, cheat_caller_address, CheatSpan, spy_events, EventSpyAssertionsTrait
};

use openzeppelin::utils::serde::SerializedAppend;
Expand All @@ -20,7 +20,7 @@ use gostarkme::constants::{funds::{fund_manager_constants::FundManagerConstants}
use gostarkme::constants::{funds::{state_constants::FundStates},};
use gostarkme::constants::{funds::{starknet_constants::StarknetConstants},};


const ONE_E18: u256 = 1000000000000000000_u256;
fn ID() -> u128 {
1
}
Expand Down Expand Up @@ -162,49 +162,6 @@ fn test_receive_vote_unsuccessful_double_vote() {
dispatcher.receiveVote();
}

// #[test]
// #[fork("Mainnet")]
// fn test_receive_donation_successful() {
// let contract_address = _setup_();
// let dispatcher = IFundDispatcher { contract_address };
// let goal: u256 = 10;
// let minter_address = contract_address_const::<StarknetConstants::STRK_TOKEN_MINTER_ADDRESS>();
// let token_address = contract_address_const::<StarknetConstants::STRK_TOKEN_ADDRESS>();
// let token_dispatcher = IERC20Dispatcher { contract_address: token_address };
// // Put state as recollecting dons
// dispatcher.setState(2);
// // Put 10 strks as goal, only fund manager
// start_cheat_caller_address(contract_address, FUND_MANAGER());
// dispatcher.setGoal(goal);
// // fund the manager with STRK token
// cheat_caller_address(token_address, minter_address, CheatSpan::TargetCalls(1));
// let mut calldata = array![];
// calldata.append_serde(FUND_MANAGER());
// calldata.append_serde(goal);
// call_contract_syscall(token_address, selector!("permissioned_mint"), calldata.span()).unwrap();
// // approve
// cheat_caller_address(token_address, FUND_MANAGER(), CheatSpan::TargetCalls(1));
// token_dispatcher.approve(contract_address, goal);
// // Donate 5 strks
// dispatcher.update_receive_donation(goal / 2);
// let current_goal_state = dispatcher.get_current_goal_state();
// assert(current_goal_state == goal / 2, 'Receive donation not working');
// // Donate 5 strks, the goal is done
// dispatcher.update_receive_donation(goal / 2);
// let state = dispatcher.getState();
// assert(state == 3, 'State should be close');
// }

#[test]
#[should_panic(expected: ("You are not the fund manager",))]
fn test_set_goal_unauthorized() {
let contract_address = _setup_();
let dispatcher = IFundDispatcher { contract_address };
// Change the goal without being the fund manager
dispatcher.setGoal(22);
}


#[test]
fn test_new_vote_received_event_emitted_successful() {
let contract_address = _setup_();
Expand All @@ -230,59 +187,15 @@ fn test_new_vote_received_event_emitted_successful() {
);
}

// #[test]
// #[fork("Mainnet")]
// fn test_emit_event_donation_withdraw() {
// //Set up contract addresses
// let contract_address = _setup_();
// let goal: u256 = 10;

// let dispatcher = IFundDispatcher { contract_address };
// let minter_address = contract_address_const::<StarknetConstants::STRK_TOKEN_MINTER_ADDRESS>();
// let token_address = contract_address_const::<StarknetConstants::STRK_TOKEN_ADDRESS>();
// let token_dispatcher = IERC20Dispatcher { contract_address: token_address };

// //Set up donation call
// dispatcher.setState(2);
// // Put 10 strks as goal, only fund manager
// start_cheat_caller_address(contract_address, FUND_MANAGER());
// dispatcher.setGoal(goal);
// // fund the manager with STRK token
// cheat_caller_address(token_address, minter_address, CheatSpan::TargetCalls(1));
// let mut calldata = array![];
// calldata.append_serde(FUND_MANAGER());
// calldata.append_serde(goal);
// call_contract_syscall(token_address, selector!("permissioned_mint"), calldata.span()).unwrap();
// // approve
// cheat_caller_address(token_address, FUND_MANAGER(), CheatSpan::TargetCalls(1));
// token_dispatcher.approve(contract_address, goal);

// dispatcher.update_receive_donation(goal);

// start_cheat_caller_address_global(OWNER());
// cheat_caller_address(token_address, OWNER(), CheatSpan::TargetCalls(1));

// // Spy on emitted events and call the withdraw function
// let mut spy = spy_events();
// dispatcher.withdraw();

// // Verify the expected event was emitted with the correct values
// spy
// .assert_emitted(
// @array![
// (
// contract_address,
// Fund::Event::DonationWithdraw(
// Fund::DonationWithdraw {
// owner_address: OWNER(),
// fund_contract_address: contract_address,
// withdrawn_amount: 10
// }
// )
// )
// ]
// );
// }
#[test]
#[should_panic(expected: ("You are not the fund manager",))]
fn test_set_goal_unauthorized() {
let contract_address = _setup_();
let dispatcher = IFundDispatcher { contract_address };
// Change the goal without being the fund manager
dispatcher.setGoal(22);
}


#[test]
#[should_panic(expected: ("You are not the owner",))]
Expand All @@ -309,101 +222,71 @@ fn test_withdraw_with_non_closed_state() {
fund_dispatcher.withdraw();
}

// #[test]
// #[fork("Mainnet")]
// fn test_withdraw() {
// let contract_address = _setup_();
// let goal: u256 = 500;

// let dispatcher = IFundDispatcher { contract_address };
// let minter_address = contract_address_const::<StarknetConstants::STRK_TOKEN_MINTER_ADDRESS>();
// let token_address = contract_address_const::<StarknetConstants::STRK_TOKEN_ADDRESS>();
// let token_dispatcher = IERC20Dispatcher { contract_address: token_address };

// //Set donation state
// dispatcher.setState(2);

// start_cheat_caller_address(contract_address, FUND_MANAGER());
// dispatcher.setGoal(goal);

// cheat_caller_address(token_address, minter_address, CheatSpan::TargetCalls(1));
// let mut calldata = array![];
// calldata.append_serde(FUND_MANAGER());
// calldata.append_serde(goal);
// call_contract_syscall(token_address, selector!("permissioned_mint"), calldata.span()).unwrap();

// cheat_caller_address(token_address, FUND_MANAGER(), CheatSpan::TargetCalls(1));
// token_dispatcher.approve(contract_address, goal);

// dispatcher.update_receive_donation(goal);

// start_cheat_caller_address_global(OWNER());
// cheat_caller_address(token_address, OWNER(), CheatSpan::TargetCalls(1));

// let owner_balance_before = token_dispatcher.balance_of(OWNER());
// let fund_balance_before = token_dispatcher.balance_of(contract_address);

// // withdraw
// dispatcher.withdraw();

// let owner_balance_after = token_dispatcher.balance_of(OWNER());
// let fund_balance_after = token_dispatcher.balance_of(contract_address);

// assert(owner_balance_after == (owner_balance_before + goal), 'wrong owner balance');
// assert((fund_balance_before - goal) == fund_balance_after, 'wrong fund balance');
// }

#[test]
#[fork("Mainnet")]
fn test_emit_event_donation_received() {
//Initial configuration of contract addresses and donation targets
fn test_withdraw() {
let contract_address = _setup_();
let goal: u256 = 10;
let goal: u256 = 500 * ONE_E18;

let dispatcher = IFundDispatcher { contract_address };
let minter_address = contract_address_const::<StarknetConstants::STRK_TOKEN_MINTER_ADDRESS>();
let token_address = contract_address_const::<StarknetConstants::STRK_TOKEN_ADDRESS>();
let token_dispatcher = IERC20Dispatcher { contract_address: token_address };

//Donation target configuration in the dispatcher
//Set donation state
start_cheat_caller_address(contract_address, VALID_ADDRESS_1());
dispatcher.setState(2);
stop_cheat_caller_address(contract_address);

start_cheat_caller_address(contract_address, FUND_MANAGER());
dispatcher.setGoal(goal);
stop_cheat_caller_address(contract_address);

//Provision of STRK token to the fund manager
cheat_caller_address(token_address, minter_address, CheatSpan::TargetCalls(1));
start_cheat_caller_address(token_address, minter_address);
let mut calldata = array![];
calldata.append_serde(FUND_MANAGER());
calldata.append_serde(goal);
call_contract_syscall(token_address, selector!("permissioned_mint"), calldata.span()).unwrap();
stop_cheat_caller_address(token_address);

//Approve
cheat_caller_address(token_address, FUND_MANAGER(), CheatSpan::TargetCalls(1));
token_dispatcher.approve(contract_address, goal);
let mut spy = spy_events();
assert(token_dispatcher.balance_of(FUND_MANAGER()) == goal, 'invalid balance');

start_cheat_caller_address(token_address, FUND_MANAGER());
token_dispatcher.transfer(contract_address, goal);
stop_cheat_caller_address(token_address);

//Receipt of the donation at the dispatcher
assert(token_dispatcher.balance_of(contract_address) == goal, 'transfer failed');

start_cheat_caller_address(contract_address, FUND_MANAGER());
dispatcher.update_receive_donation(goal);
start_cheat_caller_address_global(FUND_MANAGER());
stop_cheat_caller_address(contract_address);

//Verification of the current balance and issuance of the expected event
let current_balance = dispatcher.get_current_goal_state();
spy
.assert_emitted(
@array![
(
contract_address,
Fund::Event::DonationReceived(
Fund::DonationReceived {
current_balance,
donated_strks: goal,
donator_address: FUND_MANAGER(),
fund_contract_address: contract_address,
}
)
)
]
);
assert(dispatcher.getState() == FundStates::CLOSED, 'state is not closed');
assert(dispatcher.get_current_goal_state() == goal, 'goal not reached');

start_cheat_caller_address(contract_address, OWNER());

let withdrawn_amount = (goal * 95) / 100;
let fund_manager_amount = (goal * 5) / 100;

let owner_balance_before = token_dispatcher.balance_of(OWNER());
let fund_balance_before = token_dispatcher.balance_of(contract_address);

// withdraw
dispatcher.withdraw();

let owner_balance_after = token_dispatcher.balance_of(OWNER());
let fund_balance_after = token_dispatcher.balance_of(contract_address);

assert(
owner_balance_after == (owner_balance_before + withdrawn_amount),
'wrong owner balance after'
);
assert(
(fund_balance_before - (withdrawn_amount + fund_manager_amount)) == fund_balance_after,
'wrong fund balance'
);
assert(token_dispatcher.balance_of(VALID_ADDRESS_1()) == fund_manager_amount, 'wrong balance');
}

#[test]
Expand All @@ -422,8 +305,6 @@ fn test_set_evidence_link() {
#[should_panic(expected: ("You are not the owner",))]
fn test_set_evidence_link_wrong_owner() {
let contract_address = _setup_();

// call set_evidence_link fn with wrong owner
start_cheat_caller_address_global(OTHER_USER());
IFundDispatcher { contract_address }.set_evidence_link(EVIDENCE_LINK_2());
}
Expand All @@ -444,8 +325,6 @@ fn test_set_contact_handle() {
#[should_panic(expected: ("You are not the owner",))]
fn test_set_contact_handle_wrong_owner() {
let contract_address = _setup_();

// call set_contact_handle fn with wrong owner
start_cheat_caller_address_global(OTHER_USER());
IFundDispatcher { contract_address }.set_contact_handle(CONTACT_HANDLE_2());
}

0 comments on commit 0a5e9ac

Please sign in to comment.