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

Lockup Volume Restrictions #290

Merged
merged 33 commits into from
Oct 5, 2018
Merged

Lockup Volume Restrictions #290

merged 33 commits into from
Oct 5, 2018

Commits on Sep 25, 2018

  1. first commit. contracts compile, but need to write tests

    @glitch003
    glitch003 committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    65bcc50 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2018

  1. basic tests pass

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

  2. more tests

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

Commits on Sep 27, 2018

  1. more tests

    @glitch003
    glitch003 committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    9a69ab6 View commit details
    Browse the repository at this point in the history

  2. more tests

    @glitch003
    glitch003 committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    51a9d1f View commit details
    Browse the repository at this point in the history

  3. better tests

    @glitch003
    glitch003 committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    140bbf3 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. more coverage

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

  2. missed one branch of coverage. this should fix it

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

  3. put back old package-lock.json

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

  4. comment fix

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

  5. added one more test

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

  6. Merge branch 'development-1.5.0' into volume-restriction-transfer-man… 

    …ager
    @glitch003
    glitch003 authored Sep 28, 2018
    Configuration menu
    Copy the full SHA
    5e844d7 View commit details
    Browse the repository at this point in the history

  7. make transfer fail if lockup startTime hasn't passed yet

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

  8. Merge pull request #2 from PolymathNetwork/development-1.5.0 

    Development 1.5.0
    @glitch003
    glitch003 authored Sep 28, 2018
    Configuration menu
    Copy the full SHA
    6421e09 View commit details
    Browse the repository at this point in the history

  9. merged dev-1.5.0 latest in and fixed tests to work with that

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

  10. put back old package-lock.json

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

  11. add newline to end of package-lock.json to clean up PR

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

Commits on Oct 2, 2018

  1. code in place to track balances per lockup. but i don't think this wi… 

    …ll work long term so moving it into this branch
    @glitch003
    glitch003 committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    5781936 View commit details
    Browse the repository at this point in the history

  2. made changes requested

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

Commits on Oct 4, 2018

  1. changed to store withdrawn balances inside each lockup

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

  2. Merge branch 'volume-restriction-transfer-manager' into volume-restri… 

    …ction-transfer-manager-with-internal-withdrawn-balances
    @glitch003
    glitch003 authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    d935adf View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from deconet/volume-restriction-transfer-manage… 

    …r-with-internal-withdrawn-balances

Volume restriction transfer manager with internal withdrawn balances
    @glitch003
    glitch003 authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    5f725af View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from PolymathNetwork/development-1.5.0 

    Development 1.5.0
    @glitch003
    glitch003 authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    3904fa9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6 from deconet/development-1.5.0 

    Merge in latest dev-1.5.0 from polymath
    @glitch003
    glitch003 authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    52a3016 View commit details
    Browse the repository at this point in the history

  6. rename test

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

  7. updated before hook to use new stuff so that tests will run

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

  8. Added a test case

    @glitch003
    glitch003 committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    30bd69a View commit details
    Browse the repository at this point in the history

  9. make releaseFrequencySeconds a bit longer in a test so that the tests… 

    … are happier on travis
    @glitch003
    glitch003 committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    7b8d302 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'development-1.5.0' into volume-restriction-transfer-man… 

    …ager
    @adamdossa
    adamdossa authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    1343f65 View commit details
    Browse the repository at this point in the history

  11. Update VolumeRestrictionTransferManager.sol

    @adamdossa
    adamdossa authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    c392a12 View commit details
    Browse the repository at this point in the history

  12. Update w_volume_restriction_transfer_manager.js

    @adamdossa
    adamdossa authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    54393b0 View commit details
    Browse the repository at this point in the history

  13. fixed to work with latest dev-1.5.0 changes

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

Commits on Oct 5, 2018

  1. minor fixes

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