Skip to content
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.

Sign up for GitHub

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

Jump to bottom

UPDATED: BuyTokens getting the token amount from a function instead of just multiplication. Useful for making Crowdsales with bonus periods #638

Merged
merged 8 commits into from
Jan 15, 2018
Merged

UPDATED: BuyTokens getting the token amount from a function instead of just multiplication. Useful for making Crowdsales with bonus periods #638

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ebdba08
Added overridable getTokenAmount function
Perseverance Jan 3, 2018
2f2ef68
Increased Minor Version
Perseverance Jan 3, 2018
0494621
Using the new overridable function
Perseverance Jan 3, 2018
5993f5b
reverted back the version
Perseverance Jan 4, 2018
7852583
reverted package.json file
Perseverance Jan 4, 2018
586c888
Changed constant to view and more expressive comment
Perseverance Jan 5, 2018
a240318
Merge branch 'master' into master
Perseverance Jan 7, 2018
13b75bd
Merge branch 'master' into master
frangio Jan 15, 2018
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
8 changes: 6 additions & 2 deletions contracts/crowdsale/Crowdsale.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,16 @@ contract Crowdsale {
return new MintableToken();
}


// fallback function can be used to buy tokens
function () external payable {
buyTokens(msg.sender);
}

// Override this function to create logic for periodization
function getTokenAmount(uint256 weiAmount) internal constant returns(uint256) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we change constant for view? They're aliases but we use view throughout the codebase.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch!

return weiAmount.mul(rate);
}

// low level token purchase function
function buyTokens(address beneficiary) public payable {
require(beneficiary != address(0));
Expand All @@ -73,7 +77,7 @@ contract Crowdsale {
uint256 weiAmount = msg.value;

// calculate token amount to be created
uint256 tokens = weiAmount.mul(rate);
uint256 tokens = getTokenAmount(weiAmount);

// update state
weiRaised = weiRaised.add(weiAmount);
Expand Down