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

Feature/crowdsale refactor #744

Merged
merged 66 commits into from
Feb 20, 2018
Merged

Feature/crowdsale refactor #744

merged 66 commits into from
Feb 20, 2018

Commits on Feb 15, 2018

  1. Basic idea

    @theethernaut
    theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    49b16cf View commit details
    Browse the repository at this point in the history

  2. Fine tuning idea

    @theethernaut
    theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    fc7af3c View commit details
    Browse the repository at this point in the history

  3. Add comments / tidy up Crowdsale base class

    @theethernaut
    theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    d54f799 View commit details
    Browse the repository at this point in the history

  4. fixed TimedCrowdsale constructor

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    f48c150 View commit details
    Browse the repository at this point in the history

  5. added simple crowdsale test

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    3f5680b View commit details
    Browse the repository at this point in the history

  6. added HODL directory under home to store unused contracts. ugly hack … 

    …to solve Crowdsale selection in tests, better way?
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    a8a14df View commit details
    Browse the repository at this point in the history

  7. Capped no longer inherits from Timed, added capReached() method (repl… 

    …acing hasEnded())
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    469a999 View commit details
    Browse the repository at this point in the history

  8. added SafeMath in TimedCrowdsale for safety, CHECK whether it is inhe… 

    …rited from Crowdsale
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    90f0973 View commit details
    Browse the repository at this point in the history

  9. several fixes related to separating Capped from Timed. functions rena… 

    …med, mocks changed. Capped tests passing
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    3ffe518 View commit details
    Browse the repository at this point in the history

  10. added TimedCrowdsaleImpl.sol, TimedCrowdsale tests, passed

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    a5aaf94 View commit details
    Browse the repository at this point in the history

  11. added Whitelisted implementation and test, passed.

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    8a3cfb9 View commit details
    Browse the repository at this point in the history

  12. removed unnecessary super constructor call in WhitelistedCrowdsale, r… 

    …emoved unused dependencies in tests
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    6343246 View commit details
    Browse the repository at this point in the history

  13. renamed UserCappedCrowdsale to IndividuallyCappedCrowdsale, implement… 

    …ed IndividuallyCappedCrowdsaleImpl.sol and corresponding tests, passed.
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    2c22337 View commit details
    Browse the repository at this point in the history

  14. homogeneized use of using SafeMath for uint256 across validation crow… 

    …dsales. checked that it IS indeed inherited, but leaving it there as per Frans suggestion.
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    8c8fed1 View commit details
    Browse the repository at this point in the history

  15. adding questions.md where I track questions, bugs and progress

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    962b5bc View commit details
    Browse the repository at this point in the history

  16. modified VariablePriceCrowdsale, added Impl.

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    bbb2dfa View commit details
    Browse the repository at this point in the history

  17. finished VariablePrice, fixed sign, added test, passing.

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    3fdb6da View commit details
    Browse the repository at this point in the history

  18. changed VariablePrice to IncreasingPrice, added corresponding require()

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    53ec3cc View commit details
    Browse the repository at this point in the history

  19. MintedCrowdsale done, mock implemented, test passing

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    2be5806 View commit details
    Browse the repository at this point in the history

  20. PremintedCrowdsale done, mocks, tests passing

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    b814a05 View commit details
    Browse the repository at this point in the history

  21. checked FinalizableCrowdsale

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    dd05925 View commit details
    Browse the repository at this point in the history

  22. PostDeliveryCrowdsale done, mock, tests passing.

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    120d277 View commit details
    Browse the repository at this point in the history

  23. RefundableCrowdsale done. Detached Vault. modified mock and test, pas… 

    …sing
    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    e677e33 View commit details
    Browse the repository at this point in the history

  24. renamed crowdsale-refactor to crowdsale in contracts and test

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    5873f8e View commit details
    Browse the repository at this point in the history

  25. deleted HODL old contracts

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    2fe239c View commit details
    Browse the repository at this point in the history

  26. polished variable names in tests

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    bf5e9dd View commit details
    Browse the repository at this point in the history

  27. fixed typos and removed comments in tests

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    cd0ba80 View commit details
    Browse the repository at this point in the history

  28. Renamed 'crowdsale-refactor' to 'crowdsale' in all imports

    @theethernaut
    theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    0487d25 View commit details
    Browse the repository at this point in the history

  29. Fix minor param naming issues in Crowdsale functions and added docume… 

    …ntation to Crowdsale.sol
    @theethernaut
    theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    c4a2f9c View commit details
    Browse the repository at this point in the history

  30. Added documentation to Crowdsale extensions

    @theethernaut
    theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    3ef55bc View commit details
    Browse the repository at this point in the history

  31. removed residual comments and progress tracking files

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    c1a41ae View commit details
    Browse the repository at this point in the history

  32. added docs for validation crowdsales

    @fiiiu @theethernaut
    fiiiu authored and theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    b455000 View commit details
    Browse the repository at this point in the history

  33. Made user promises in PostDeliveryCrowdsale public so that users can … 

    …query their promised token balance.
    @theethernaut
    theethernaut committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    a841691 View commit details
    Browse the repository at this point in the history

  34. added docs for distribution crowdsales

    @fiiiu
    fiiiu committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    3d4d41a View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. renamed PremintedCrowdsale to AllowanceCrowdsale

    @fiiiu
    fiiiu committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    8b6b342 View commit details
    Browse the repository at this point in the history

  2. added allowance check function and corresponding test. fixed filename… 

    … in AllowanceCrowdsale mock.
    @fiiiu
    fiiiu committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    1a2a5ec View commit details
    Browse the repository at this point in the history

  3. spilt Crowdsale _postValidatePurchase in _postValidatePurchase and _u… 

    …pdatePurchasingState. changed IndividuallyCappedCrowdsale accordingly.
    @fiiiu
    fiiiu committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    1680a18 View commit details
    Browse the repository at this point in the history

  4. polished tests for linter, salve Travis

    @fiiiu
    fiiiu committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    344bec6 View commit details
    Browse the repository at this point in the history

  5. polished IncreasingPriceCrowdsale.sol for linter.

    @fiiiu
    fiiiu committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    7d4035a View commit details
    Browse the repository at this point in the history

  6. renamed and polished for linter WhitelistedCrowdsale test.

    @fiiiu
    fiiiu committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    bcd0464 View commit details
    Browse the repository at this point in the history

  7. fixed indentation in IncreasingPriceCrowdsaleImpl.sol for linter

    @fiiiu
    fiiiu committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    51c0954 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2018

  1. fixed ignoring token.mint return value in MintedCrowdsale.sol

    @fiiiu
    fiiiu committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    cd15b41 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. expanded docs throughout, fixed minor issues

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    e716a22 View commit details
    Browse the repository at this point in the history

  2. extended test coverage for IndividuallyCappedCrowdsale

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    7134f0d View commit details
    Browse the repository at this point in the history

  3. Extended WhitelistedCrwodsale test coverage

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    f56116e View commit details
    Browse the repository at this point in the history

  4. roll back decoupling of RefundVault in RefundableCrowdsale

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    2a6dd9f View commit details
    Browse the repository at this point in the history

  5. moved cap exceedance checks in Capped and IndividuallyCapped crowdsal… 

    …es to _preValidatePurchase to save gas
    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    8e8e8cc View commit details
    Browse the repository at this point in the history

  6. revert name change, IndividuallyCapped to UserCapped

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    fa055a6 View commit details
    Browse the repository at this point in the history

  7. extended docs.

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    56e83b9 View commit details
    Browse the repository at this point in the history

  8. added crowd whitelisting with tests

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    1bf30f9 View commit details
    Browse the repository at this point in the history

  9. added group capping, plus tests

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    a70e3ed View commit details
    Browse the repository at this point in the history

  10. added modifiers in TimedCrowdsale and WhitelistedCrowdsale

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    5f4fc83 View commit details
    Browse the repository at this point in the history

  11. polished tests for linter

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    47ce79f View commit details
    Browse the repository at this point in the history

  12. moved check of whitelisted to modifier, mainly for testing coverage

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    5dab495 View commit details
    Browse the repository at this point in the history

  13. fixed minor ordering/polishingafter review

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    dd338f1 View commit details
    Browse the repository at this point in the history

  14. modified TimedCrowdsale modifier/constructor ordering

    @fiiiu
    fiiiu committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    8376baa View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2018

  1. unchanged truffle-config.js

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    8ad6a10 View commit details
    Browse the repository at this point in the history

  2. changed indentation of visibility modifier in mocks

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    107fdc4 View commit details
    Browse the repository at this point in the history

  3. changed naming of modifier and function to use Open/Closed for TimedC… 

    …rowdsale
    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    530d85d View commit details
    Browse the repository at this point in the history

  4. changed ordering of constructor calls in SampleCrowdsale

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    9fe61b8 View commit details
    Browse the repository at this point in the history

  5. changed startTime and endTime to openingTime and closingTime throughout

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    de8e88f View commit details
    Browse the repository at this point in the history

  6. fixed exceeding line lenght for linter

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    6c38f46 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into feature/crowdsale-refactor

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    33839c1 View commit details
    Browse the repository at this point in the history

  8. renamed _emitTokens to _deliverTokens

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    df03099 View commit details
    Browse the repository at this point in the history

  9. renamed addCrowdToWhitelist to addManyToWhitelist

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    c6def0e View commit details
    Browse the repository at this point in the history

  10. renamed UserCappedCrowdsale to IndividuallyCappedCrowdsale

    @fiiiu
    fiiiu committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    c177f01 View commit details
    Browse the repository at this point in the history