Skip to content

Adds only code and no tests #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions truffle-contracts/contracts/GitFundedGrant.sol
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ contract GitFundedGrant {
*/
enum Role {
ADMIN,
MEMBER,
SHAREHOLDER,
CONTRIBUTOR

}
Expand Down Expand Up @@ -146,7 +146,7 @@ contract GitFundedGrant {

Expense memory expense = Expense(_title, _amount, 0, msg.sender, ExpenseStatus.PENDING,0);
expenses.push(expense);
dao.submitProposal(applicant,sharesRequested,lootRequested,tributeOffered,tributeToken,paymentRequested,paymentToken,details);
dao.submitProposal(sharesRequested,tributeOffered,tributeToken,paymentRequested,paymentToken,details);

}

Expand All @@ -169,9 +169,6 @@ contract GitFundedGrant {
expenses[expenseIndex].recipient.transfer(amount);

}
function sponsorExpense (uint expenseIndex) public {
expenses[expenseIndex].proposalIndex = dao.sponsorProposal(expenseIndex);
}


// TODO: Merge this logic with the acceptExpense by overloading the function
Expand Down
2 changes: 0 additions & 2 deletions truffle-contracts/contracts/GitFundedGrantFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ contract GitFundedGrantFactory {
bountyAddress,
tokenAddress
);
// bytes32 label=keccak256(abi.encode(title));
// bytes32 label1=keccak256("testRepo title");
esr.createName(label,msg.sender);

projects[msg.sender].push(address(project));
Expand Down
2 changes: 1 addition & 1 deletion truffle-contracts/contracts/dao/DAOFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ contract DAOFactory {

function newDAO(address _admin) public returns (address) {

Governance dao = new Governance(_admin, [tokenAddress], 17280, 35, 35, 35, 70, 10, 3, 1);
Governance dao = new Governance(_admin, [tokenAddress], 17280, 35);

daos[msg.sender].push(address(dao));
daoCount += 1;
Expand Down
Loading