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

Reward calculation clean up for zero gas. #527

Merged
merged 48 commits into from
Dec 19, 2018
Merged

Reward calculation clean up for zero gas. #527

merged 48 commits into from
Dec 19, 2018

Commits on Dec 6, 2018

  1. Reward is not transferred to facilitator if reward is 0.

    @gulshanvasnani
    gulshanvasnani committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    c019299 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    Deepesh Kumar Nath authored Dec 6, 2018
    Configuration menu
    Copy the full SHA
    3fb87c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2018

  1. Added getter to calculate penalty amount

    @gulshanvasnani
    gulshanvasnani committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    ad2723d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    d5d8cb3 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    @0xsarvesh
    0xsarvesh authored Dec 10, 2018
    Configuration menu
    Copy the full SHA
    c8609cf View commit details
    Browse the repository at this point in the history

  2. Added unit test cases to verify that mint was called only for non-zer… 

    …o reward to facilitator
    @gulshanvasnani
    gulshanvasnani committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    a2eff7f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    b71ac3a View commit details
    Browse the repository at this point in the history

  4. Added test to verify the reward amount for facilitator

    @gulshanvasnani
    gulshanvasnani committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    251451d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    @0xsarvesh
    0xsarvesh authored Dec 10, 2018
    Configuration menu
    Copy the full SHA
    f889087 View commit details
    Browse the repository at this point in the history

  6. Removed getPenalty method

    @gulshanvasnani
    gulshanvasnani committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    5043148 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    95a21f5 View commit details
    Browse the repository at this point in the history

  8. Removed getPenalty method

    @gulshanvasnani
    gulshanvasnani committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    7913fd3 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2018

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

    …gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    1caf80a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    Deepesh Kumar Nath authored Dec 11, 2018
    Configuration menu
    Copy the full SHA
    12513e8 View commit details
    Browse the repository at this point in the history

  3. PR feedback changes

    @gulshanvasnani
    gulshanvasnani committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    03c98d0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    e102ebf View commit details
    Browse the repository at this point in the history

  5. Changed parameter type to StateRootInterface

    @gulshanvasnani
    gulshanvasnani committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    f6d379f View commit details
    Browse the repository at this point in the history

  6. Added documentation for zero reward.

    @gulshanvasnani
    gulshanvasnani committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    b579027 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    660c7c9 View commit details
    Browse the repository at this point in the history

  8. Changes done to incorporate MockSafeCore

    @gulshanvasnani
    gulshanvasnani committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    1b22697 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2018

  1. Indentation changes

    @gulshanvasnani
    gulshanvasnani committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    0bca4d2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    Deepesh Kumar Nath authored Dec 12, 2018
    Configuration menu
    Copy the full SHA
    b49953c View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2018

  1. Mocking for mint method is removed and correct unlockSecret value is … 

    …passed from progressMint method
    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    e64bac5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    8ef75ae View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into gulshan/gh_495_r… 

    …eward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    5091ba2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    @0xsarvesh
    0xsarvesh authored Dec 13, 2018
    Configuration menu
    Copy the full SHA
    7bb84d1 View commit details
    Browse the repository at this point in the history

  5. Added test case when message hash is zero

    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    c06ddd9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    8786e41 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    @schemar
    schemar authored Dec 13, 2018
    Configuration menu
    Copy the full SHA
    e246e8b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    Deepesh Kumar Nath authored Dec 13, 2018
    Configuration menu
    Copy the full SHA
    983eb23 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/develop' into gulshan/gh_495_r… 

    …eward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    c4a442f View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/develop' into gulshan/gh_495_r… 

    …eward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    b6f7184 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    53189b2 View commit details
    Browse the repository at this point in the history

  12. Added test-cases

    @gulshanvasnani
    gulshanvasnani committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    695b646 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. Renamed the MockUtilityToken to TestUtilityToken,added documentation … 

    …and moved the setting up of message in before each
    @gulshanvasnani
    gulshanvasnani committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    15c32c6 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Code cleanup and updated the documentation

    @gulshanvasnani
    gulshanvasnani committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    6336a6c View commit details
    Browse the repository at this point in the history

  2. Updated test-case statements

    @gulshanvasnani
    gulshanvasnani committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    8c6232f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into gulshan/gh_495_r… 

    …eward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    5b0af8f View commit details
    Browse the repository at this point in the history

  4. Removed TestUtilityToken under test directory, updated unit test-case… 

    … statements, passing false for _proofProgress param for progressMintInternal
    @gulshanvasnani
    gulshanvasnani committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    0d15dd3 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. Merge branch 'develop' into gulshan/gh_495_reward_calculation_cleanup… 

    …_zero_gas
    @gulshanvasnani
    gulshanvasnani authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    4729b01 View commit details
    Browse the repository at this point in the history

  2. Used MockUtilityToken instead of TestUtilityToken

    @gulshanvasnani
    gulshanvasnani committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    b495fbd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gulshan/gh_495_reward_calculation_cleanup_zero_gas' of h… 

    …ttps://github.com/gulshanvasnani/mosaic-contracts into gulshan/gh_495_reward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    4cd0600 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/develop' into gulshan/gh_495_r… 

    …eward_calculation_cleanup_zero_gas
    @gulshanvasnani
    gulshanvasnani committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    12e43c7 View commit details
    Browse the repository at this point in the history

  5. Added MockUtilityToken instead of TestUtilityToken

    @gulshanvasnani
    gulshanvasnani committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    71e4534 View commit details
    Browse the repository at this point in the history

  6. Corrected indentation of constructor

    @gulshanvasnani
    gulshanvasnani committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    514dd56 View commit details
    Browse the repository at this point in the history

  7. Updated documentation of MockUtilityToken

    @gulshanvasnani
    gulshanvasnani committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    b167ec9 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. Indentation fixes of constructor

    @gulshanvasnani
    gulshanvasnani committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    e7a0f12 View commit details
    Browse the repository at this point in the history

  2. Removed setCoGateway and getNonce method from helper

    @gulshanvasnani
    gulshanvasnani committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    cfa941c View commit details
    Browse the repository at this point in the history