@@ -19,7 +19,7 @@ contract Join is
19
19
using SafeERC20 for IERC20 ;
20
20
using StringUtil for string ;
21
21
22
- enum MemeberState { None, Candidate, Accepted, Rejected, ReputationRedeemed }
22
+ enum MemberState { None, Candidate, Accepted, Rejected, ReputationRedeemed }
23
23
24
24
event JoinInProposal (
25
25
address indexed _avatar ,
@@ -47,7 +47,7 @@ contract Join is
47
47
}
48
48
49
49
mapping (bytes32 => Proposal) public proposals;
50
- mapping (address => MemeberState ) public membersState;
50
+ mapping (address => MemberState ) public membersState;
51
51
52
52
IERC20 public fundingToken;
53
53
uint256 public minFeeToJoin;
@@ -104,12 +104,12 @@ contract Join is
104
104
returns (bool ) {
105
105
Proposal memory proposal = proposals[_proposalId];
106
106
require (proposal.proposedMember != address (0 ), "not a valid proposal " );
107
- require (membersState[proposal.proposedMember] == MemeberState .Candidate, "proposal already been executed " );
107
+ require (membersState[proposal.proposedMember] == MemberState .Candidate, "member is not a cadidate " );
108
108
109
109
bool success;
110
110
// Check if vote was successful:
111
111
if ((_decision == 1 ) && (avatar.nativeReputation ().balanceOf (proposal.proposedMember) == 0 )) {
112
- membersState[proposal.proposedMember] = MemeberState .Accepted;
112
+ membersState[proposal.proposedMember] = MemberState .Accepted;
113
113
totalDonation = totalDonation.add (proposal.funding);
114
114
if (fundingToken == IERC20 (0 )) {
115
115
// solhint-disable-next-line
@@ -121,7 +121,7 @@ contract Join is
121
121
//this should be called/check after the transfer to the avatar.
122
122
setFundingGoalReachedFlag ();
123
123
} else {
124
- membersState[proposal.proposedMember] = MemeberState .Rejected;
124
+ membersState[proposal.proposedMember] = MemberState .Rejected;
125
125
if (fundingToken == IERC20 (0 )) {
126
126
// solhint-disable-next-line
127
127
(success, ) = proposal.proposedMember.call {value:proposal.funding}("" );
@@ -150,11 +150,11 @@ contract Join is
150
150
returns (bytes32 )
151
151
{
152
152
address proposer = msg .sender ;
153
- require (membersState[proposer] != MemeberState .Candidate, "already a candidate " );
154
- require (membersState[proposer] != MemeberState .Accepted, "accepted and not redeemed yet " );
155
- require (avatar.nativeReputation ().balanceOf (proposer) == 0 , "already a member " );
156
- require (_feeAmount >= minFeeToJoin, "_feeAmount should be >= then the minFeeToJoin " );
157
- membersState[proposer] = MemeberState .Candidate;
153
+ require (membersState[proposer] != MemberState .Candidate, "proposer is already a candidate " );
154
+ require (membersState[proposer] != MemberState .Accepted, "proposer is accepted and not redeemed yet " );
155
+ require (avatar.nativeReputation ().balanceOf (proposer) == 0 , "proposer is already a member " );
156
+ require (_feeAmount >= minFeeToJoin, "_feeAmount should be >= than the minFeeToJoin " );
157
+ membersState[proposer] = MemberState .Candidate;
158
158
if (fundingToken == IERC20 (0 )) {
159
159
require (_feeAmount == msg .value , "ETH received should match the _feeAmount " );
160
160
} else {
@@ -188,11 +188,11 @@ contract Join is
188
188
function redeemReputation (bytes32 _proposalId ) public returns (uint256 reputation ) {
189
189
Proposal memory proposal = proposals[_proposalId];
190
190
require (proposal.proposedMember != address (0 ), "no member to redeem " );
191
- require (membersState[proposal.proposedMember] == MemeberState .Accepted, "member not accepeted " );
191
+ require (membersState[proposal.proposedMember] == MemberState .Accepted, "member not accepted " );
192
192
//set proposal proposedMember to zero to prevent reentrancy attack.
193
193
proposals[_proposalId].proposedMember = address (0 );
194
194
proposals[_proposalId].proposedMember = address (0 );
195
- membersState[proposal.proposedMember] = MemeberState .ReputationRedeemed;
195
+ membersState[proposal.proposedMember] = MemberState .ReputationRedeemed;
196
196
if (memberReputation == 0 ) {
197
197
reputation = proposal.funding;
198
198
} else {
0 commit comments