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/master collateral pool #138

Merged
merged 10 commits into from
Sep 28, 2018
Merged

Feature/master collateral pool #138

merged 10 commits into from
Sep 28, 2018

Commits on Sep 26, 2018

  1. first attempt at POC master collateral pool

    Phil Elsasser committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    21c442c View commit details
    Browse the repository at this point in the history

  2. clean up of docs

    Phil Elsasser committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    fd309c8 View commit details
    Browse the repository at this point in the history

  3. migrations updated with new collateral pool

    Phil Elsasser committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    ee37768 View commit details
    Browse the repository at this point in the history

  4. add function for getCollateralPoolBalance

    Phil Elsasser committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    d8268c4 View commit details
    Browse the repository at this point in the history

  5. Collateral pool tests passing

    Phil Elsasser committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    8c7ed0e View commit details
    Browse the repository at this point in the history

  6. fixed accounting tests

    Phil Elsasser committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    81e05ad View commit details
    Browse the repository at this point in the history

  7. market contract oraclize tests updated

    Phil Elsasser committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    8077f4a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. add tests for flipping pos

    Phil Elsasser committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    e803713 View commit details
    Browse the repository at this point in the history

  2. add require and tests

    Phil Elsasser committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    645bb2e View commit details
    Browse the repository at this point in the history

  3. add test for same order double fill

    Phil Elsasser committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    f89ffce View commit details
    Browse the repository at this point in the history