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

Vesting Escrow Wallet #316

Closed
wants to merge 59 commits into from
Closed

Vesting Escrow Wallet #316

wants to merge 59 commits into from

Commits on Sep 26, 2018

  1. VestingWallet skeleton with initiate and cancel

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    6890efc View commit details
    Browse the repository at this point in the history

  2. Add collectTokens

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    2d47fe6 View commit details
    Browse the repository at this point in the history

  3. Add ability to bulk upload vesting schedules for users

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    c1c60bb View commit details
    Browse the repository at this point in the history

  4. Formatting fix

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    ba10ad0 View commit details
    Browse the repository at this point in the history

  5. Add comments, formatting, and a small refactor

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    1048cc0 View commit details
    Browse the repository at this point in the history

  6. Add VestingEscrowWalletFactory.sol and refactor

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    6157240 View commit details
    Browse the repository at this point in the history

  7. Removed old directory

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    fa06152 View commit details
    Browse the repository at this point in the history

  8. Update styling

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    0257564 View commit details
    Browse the repository at this point in the history

  9. Add tags

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    b26e784 View commit details
    Browse the repository at this point in the history

  10. Add interface

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    5ab925a View commit details
    Browse the repository at this point in the history

  11. Add ability to push tokens

    @shanefontaine
    shanefontaine committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    459a3e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. Add token transfers

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    0bce6a0 View commit details
    Browse the repository at this point in the history

  2. Add check to see if total allocation is a whole multiple of number of… 

    … tranches
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    b620851 View commit details
    Browse the repository at this point in the history

  3. Add ability to reclaim tokens from cancelled contract or to leave the… 

    …m in the contract
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    11698de View commit details
    Browse the repository at this point in the history

  4. Update event to reflect cancellation reclaim

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    30a1008 View commit details
    Browse the repository at this point in the history

  5. Update token distribution and logging upon cancellation and add treas… 

    …ury to configure function
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    f3dc779 View commit details
    Browse the repository at this point in the history

  6. Chagne tokensRemaining/tokensReleased to numVestedTokens/numUnvestedT… 

    …okens/numClaimedVestedTokens/numUnclaimedVestedTokens
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    273d787 View commit details
    Browse the repository at this point in the history

  7. Add ability to use existing tokens in contract as tokens for new vest… 

    …ing schedule
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    758bcbb View commit details
    Browse the repository at this point in the history

  8. Add templates

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    4f288e9 View commit details
    Browse the repository at this point in the history

  9. Update formatting and deployment

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    c3af9e8 View commit details
    Browse the repository at this point in the history

  10. Add initial tests and update deployment file to include VestingEscrow… 

    …WalletFactory
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    693bcce View commit details
    Browse the repository at this point in the history

  11. Add template creation tests

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    28a320f View commit details
    Browse the repository at this point in the history

  12. Update function name for clarity

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    38aca0f View commit details
    Browse the repository at this point in the history

  13. Remove requirement for tokens to have already been sent to the vestin… 

    …g contract
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    7309e64 View commit details
    Browse the repository at this point in the history

  14. Unvested token checks now happen after tokensToDistribute calculation

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    e411064 View commit details
    Browse the repository at this point in the history

  15. Abstract _distributeVestedTokesn from collecteVestedTokens and pushVe… 

    …stedTokens
    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    42f592c View commit details
    Browse the repository at this point in the history

  16. Add testing skeleton

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    ca9cc84 View commit details
    Browse the repository at this point in the history

  17. Remove loop bug

    @shanefontaine
    shanefontaine committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    34f80a0 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2018

  1. WIP - Add test code

    @shanefontaine
    shanefontaine committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    e1c706d View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Remove redundant declaration of securityToken

    @shanefontaine
    shanefontaine committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    8f74d93 View commit details
    Browse the repository at this point in the history

  2. Working test initialization

    @shanefontaine
    shanefontaine committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    693f615 View commit details
    Browse the repository at this point in the history

  3. Remove redundant mod check

    @shanefontaine
    shanefontaine committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    9f54aeb View commit details
    Browse the repository at this point in the history

  4. Fix issue where _totalAllocation was sent during schedule deployment … 

    …rather than _tokensToSend
    @shanefontaine
    shanefontaine committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    a3e237f View commit details
    Browse the repository at this point in the history

  5. Add numExcessTokens decrement in schedule creation

    @shanefontaine
    shanefontaine committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    2d44a4e View commit details
    Browse the repository at this point in the history

  6. Add initiateVestingSchedule tests

    @shanefontaine
    shanefontaine committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    929c2ef View commit details
    Browse the repository at this point in the history

  7. Add initiateVestingScheduleFromTemplate tests

    @shanefontaine
    shanefontaine committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    4ce400c View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2018

  1. Check to see if there are tokens to transfer before actually transfer… 

    …ring them
    @shanefontaine
    shanefontaine committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    fa1ccd9 View commit details
    Browse the repository at this point in the history

  2. Update transferFrom to transfer for contract -> payee transactions

    @shanefontaine
    shanefontaine committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    b294045 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2018

  1. Change transferFrom to transfer

    @shanefontaine
    shanefontaine committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    d75e4ad View commit details
    Browse the repository at this point in the history

  2. All tests complete

    @shanefontaine
    shanefontaine committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    51739e4 View commit details
    Browse the repository at this point in the history

  3. Clean up code

    @shanefontaine
    shanefontaine committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    357e134 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development-1.5.0' into development-1.5.0

    @shanefontaine
    shanefontaine authored Oct 5, 2018
    Configuration menu
    Copy the full SHA
    7059c94 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2018

  1. Add address typecast

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    e7b1a6a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development-1.5.0' of github.com:shanefontaine/polymath… 

    …-core into development-1.5.0
    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    608686a View commit details
    Browse the repository at this point in the history

  3. Add new initialization and checks

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    5c57020 View commit details
    Browse the repository at this point in the history

  4. Indexed templateNumber

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    cebe11a View commit details
    Browse the repository at this point in the history

  5. Remove event

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    eab0f5a View commit details
    Browse the repository at this point in the history

  6. Add withPerm() modifier to initiateVestingSchedule

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    85cabb4 View commit details
    Browse the repository at this point in the history

  7. Remove emitting of 0 values

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    baa5a88 View commit details
    Browse the repository at this point in the history

  8. Add withPerm() to initiateVestingScheduleFromTemplate

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    e94d110 View commit details
    Browse the repository at this point in the history

  9. Make initiateVestingScheduleIterate a public function with the withPe… 

    …rm() modifier
    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    c300610 View commit details
    Browse the repository at this point in the history

  10. Renamed _whichVestingSchedule to _vestingScheduleIndex

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    f9677a5 View commit details
    Browse the repository at this point in the history

  11. Renamed _isReclaiming to _revokeVestingSchedule

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    ffb5587 View commit details
    Browse the repository at this point in the history

  12. Add compatibleVersionRange

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    d20c799 View commit details
    Browse the repository at this point in the history

  13. Rename getType() to getTypes()

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    73d4a72 View commit details
    Browse the repository at this point in the history

  14. Update mappings

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    9ea1307 View commit details
    Browse the repository at this point in the history

  15. Remove extra comment

    @shanefontaine
    shanefontaine committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    07ec3ed View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2018

  1. Add ternary operator

    @shanefontaine
    shanefontaine committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    8dc4ad7 View commit details
    Browse the repository at this point in the history

  2. Update test to reflect latest standard

    @shanefontaine
    shanefontaine committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    90aa0da View commit details
    Browse the repository at this point in the history