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

Deployment of PricerRule and It's interactions #66

Merged
merged 20 commits into from
Feb 6, 2019
Merged

Deployment of PricerRule and It's interactions #66

merged 20 commits into from
Feb 6, 2019

Commits on Feb 3, 2019

  1. Deployment of PricerRule contract

    @abhayks1
    abhayks1 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    cc4f410 View commit details
    Browse the repository at this point in the history

  2. TokenRules variable fix

    @abhayks1
    abhayks1 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    0e9c963 View commit details
    Browse the repository at this point in the history

  3. Updated abi/bin of PriceRule

    @abhayks1
    abhayks1 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    6fd701b View commit details
    Browse the repository at this point in the history

  4. PriceRule deployment implementation

    @abhayks1
    abhayks1 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    48e898c View commit details
    Browse the repository at this point in the history

  5. Implementation of PriceRule deployment

    @abhayks1
    abhayks1 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    1e5cdfc View commit details
    Browse the repository at this point in the history

  6. small update

    @abhayks1
    abhayks1 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    b3a081b View commit details
    Browse the repository at this point in the history

  7. txOptions not needed for creating contract instance

    @abhayks1
    abhayks1 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    f39582d View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. Merge remote-tracking branch 'remotes/upstream/develop' into rule_deploy 

    # Conflicts:
#	dist/openst.js
#	dist/openst.min.js
#	lib/helper/User.js
#	lib/setup/TokenRules.js
    @abhayks1
    abhayks1 committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    12d8b2d View commit details
    Browse the repository at this point in the history

  2. PricerRule implementation

    @abhayks1
    abhayks1 committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    3ba8465 View commit details
    Browse the repository at this point in the history

  3. PricerRule implementation in progress

    @abhayks1
    abhayks1 committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    f2962cd View commit details
    Browse the repository at this point in the history

  4. PricerRule setup implementation

    @abhayks1
    abhayks1 committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    577ce57 View commit details
    Browse the repository at this point in the history

  5. PricerRule setup implementation

    @abhayks1
    abhayks1 committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    7cc2b31 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. Merge remote-tracking branch 'remotes/upstream/develop' into rule_deploy 

    # Conflicts:
#	dist/openst.js
#	dist/openst.min.js
#	index.js
#	lib/helper/User.js
#	test/integration/ExecuteRule.js
#	test/utils/configReader.js
    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    02ed91c View commit details
    Browse the repository at this point in the history

  2. DirectTransfer integration test completed

    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    f1234d1 View commit details
    Browse the repository at this point in the history

  3. DirectTransfer integration test clean

    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    5335576 View commit details
    Browse the repository at this point in the history

  4. ChangeLog update

    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    225fc0e View commit details
    Browse the repository at this point in the history

  5. PR Review changes

    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    ed6732f View commit details
    Browse the repository at this point in the history

  6. PR Review changes

    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    c0c1cac View commit details
    Browse the repository at this point in the history

  7. PR Review changes

    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    8a5b4d8 View commit details
    Browse the repository at this point in the history

  8. PR Review changes

    @abhayks1
    abhayks1 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    5dc2697 View commit details
    Browse the repository at this point in the history