-
Notifications
You must be signed in to change notification settings - Fork 12.4k
Feature/crowdsale refactor #744
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
Merged
maraoz
merged 66 commits into
OpenZeppelin:master
from
eternauta1337:feature/crowdsale-refactor
Feb 20, 2018
Merged
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit
Hold shift + click to select a range
49b16cf
Basic idea
eternauta1337 fc7af3c
Fine tuning idea
eternauta1337 d54f799
Add comments / tidy up Crowdsale base class
eternauta1337 f48c150
fixed TimedCrowdsale constructor
fiiiu 3f5680b
added simple crowdsale test
fiiiu a8a14df
added HODL directory under home to store unused contracts. ugly hack β¦
fiiiu 469a999
Capped no longer inherits from Timed, added capReached() method (replβ¦
fiiiu 90f0973
added SafeMath in TimedCrowdsale for safety, CHECK whether it is inheβ¦
fiiiu 3ffe518
several fixes related to separating Capped from Timed. functions renaβ¦
fiiiu a5aaf94
added TimedCrowdsaleImpl.sol, TimedCrowdsale tests, passed
fiiiu 8a3cfb9
added Whitelisted implementation and test, passed.
fiiiu 6343246
removed unnecessary super constructor call in WhitelistedCrowdsale, rβ¦
fiiiu 2c22337
renamed UserCappedCrowdsale to IndividuallyCappedCrowdsale, implementβ¦
fiiiu 8c8fed1
homogeneized use of using SafeMath for uint256 across validation crowβ¦
fiiiu 962b5bc
adding questions.md where I track questions, bugs and progress
fiiiu bbb2dfa
modified VariablePriceCrowdsale, added Impl.
fiiiu 3fdb6da
finished VariablePrice, fixed sign, added test, passing.
fiiiu 53ec3cc
changed VariablePrice to IncreasingPrice, added corresponding require()
fiiiu 2be5806
MintedCrowdsale done, mock implemented, test passing
fiiiu b814a05
PremintedCrowdsale done, mocks, tests passing
fiiiu dd05925
checked FinalizableCrowdsale
fiiiu 120d277
PostDeliveryCrowdsale done, mock, tests passing.
fiiiu e677e33
RefundableCrowdsale done. Detached Vault. modified mock and test, pasβ¦
fiiiu 5873f8e
renamed crowdsale-refactor to crowdsale in contracts and test
fiiiu 2fe239c
deleted HODL old contracts
fiiiu bf5e9dd
polished variable names in tests
fiiiu cd0ba80
fixed typos and removed comments in tests
fiiiu 0487d25
Renamed 'crowdsale-refactor' to 'crowdsale' in all imports
eternauta1337 c4a2f9c
Fix minor param naming issues in Crowdsale functions and added documeβ¦
eternauta1337 3ef55bc
Added documentation to Crowdsale extensions
eternauta1337 c1a41ae
removed residual comments and progress tracking files
fiiiu b455000
added docs for validation crowdsales
fiiiu a841691
Made user promises in PostDeliveryCrowdsale public so that users can β¦
eternauta1337 3d4d41a
added docs for distribution crowdsales
fiiiu 8b6b342
renamed PremintedCrowdsale to AllowanceCrowdsale
fiiiu 1a2a5ec
added allowance check function and corresponding test. fixed filenameβ¦
fiiiu 1680a18
spilt Crowdsale _postValidatePurchase in _postValidatePurchase and _uβ¦
fiiiu 344bec6
polished tests for linter, salve Travis
fiiiu 7d4035a
polished IncreasingPriceCrowdsale.sol for linter.
fiiiu bcd0464
renamed and polished for linter WhitelistedCrowdsale test.
fiiiu 51c0954
fixed indentation in IncreasingPriceCrowdsaleImpl.sol for linter
fiiiu cd15b41
fixed ignoring token.mint return value in MintedCrowdsale.sol
fiiiu e716a22
expanded docs throughout, fixed minor issues
fiiiu 7134f0d
extended test coverage for IndividuallyCappedCrowdsale
fiiiu f56116e
Extended WhitelistedCrwodsale test coverage
fiiiu 2a6dd9f
roll back decoupling of RefundVault in RefundableCrowdsale
fiiiu 8e8e8cc
moved cap exceedance checks in Capped and IndividuallyCapped crowdsalβ¦
fiiiu fa055a6
revert name change, IndividuallyCapped to UserCapped
fiiiu 56e83b9
extended docs.
fiiiu 1bf30f9
added crowd whitelisting with tests
fiiiu a70e3ed
added group capping, plus tests
fiiiu 5f4fc83
added modifiers in TimedCrowdsale and WhitelistedCrowdsale
fiiiu 47ce79f
polished tests for linter
fiiiu 5dab495
moved check of whitelisted to modifier, mainly for testing coverage
fiiiu dd338f1
fixed minor ordering/polishingafter review
fiiiu 8376baa
modified TimedCrowdsale modifier/constructor ordering
fiiiu 8ad6a10
unchanged truffle-config.js
fiiiu 107fdc4
changed indentation of visibility modifier in mocks
fiiiu 530d85d
changed naming of modifier and function to use Open/Closed for TimedCβ¦
fiiiu 9fe61b8
changed ordering of constructor calls in SampleCrowdsale
fiiiu de8e88f
changed startTime and endTime to openingTime and closingTime throughout
fiiiu 6c38f46
fixed exceeding line lenght for linter
fiiiu 33839c1
Merge branch 'master' into feature/crowdsale-refactor
fiiiu df03099
renamed _emitTokens to _deliverTokens
fiiiu c6def0e
renamed addCrowdToWhitelist to addManyToWhitelist
fiiiu c177f01
renamed UserCappedCrowdsale to IndividuallyCappedCrowdsale
fiiiu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev
Previous commit
renamed UserCappedCrowdsale to IndividuallyCappedCrowdsale
- Loading branch information
commit c177f01a1eae803fbc15fa5eaefddf2902e32091
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
contracts/mocks/UserCappedCrowdsale.sol β ...mocks/IndividuallyCappedCrowdsaleImpl.sol
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't be more appropriate to say
UserCappedCrowdsale? see the names of the functions belowThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, this was @ajsantander's original proposal, I changed it because this sounded to me like "capped by the user", but we can go back if you all favor this :)