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

Use timestamp instead of block number in predictoor #780

Merged
merged 95 commits into from
Aug 16, 2023
Merged

Use timestamp instead of block number in predictoor #780

merged 95 commits into from
Aug 16, 2023

Commits on Jul 27, 2023

  1. add setFeeCollector

    @alexcos20
    alexcos20 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    7a4b92c View commit details
    Browse the repository at this point in the history

  2. fix lint

    @alexcos20
    alexcos20 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    beb6d1a View commit details
    Browse the repository at this point in the history

  3. add zero address check

    @alexcos20
    alexcos20 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    a0ccf2b View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. Use timestamp instead on block number

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    3117b51 View commit details
    Browse the repository at this point in the history

  2. Update tests

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    a9b0213 View commit details
    Browse the repository at this point in the history

  3. Fix

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    fc5a0cf View commit details
    Browse the repository at this point in the history

  4. Use epoch to calculate everything

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    8178b30 View commit details
    Browse the repository at this point in the history

  5. Update tests

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    6996fd9 View commit details
    Browse the repository at this point in the history

  6. Update tests

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    03161e0 View commit details
    Browse the repository at this point in the history

  7. Fix updateSeconds(

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    a36fd83 View commit details
    Browse the repository at this point in the history

  8. Update tests for change in updateSeconds

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    949e651 View commit details
    Browse the repository at this point in the history

  9. Add missing semicolon

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    b1638f7 View commit details
    Browse the repository at this point in the history

  10. Adjustments for epoch and fixes

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    82e7702 View commit details
    Browse the repository at this point in the history

  11. Adjustments and fixes

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    32a1d19 View commit details
    Browse the repository at this point in the history

  12. More adjustments and fixes

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    3fe82b8 View commit details
    Browse the repository at this point in the history

  13. Update tests

    @trizin
    trizin authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    4b2f4e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. Start epoch from 0

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    1d4e2e7 View commit details
    Browse the repository at this point in the history

  2. Remove unused function

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    4042b9b View commit details
    Browse the repository at this point in the history

  3. Add more comments

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    8f03ea9 View commit details
    Browse the repository at this point in the history

  4. Try fix

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    b32870e View commit details
    Browse the repository at this point in the history

  5. Fix overflow

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    8f8e18e View commit details
    Browse the repository at this point in the history

  6. Make starttime public

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    32dd2d5 View commit details
    Browse the repository at this point in the history

  7. Test fixes

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    62890d9 View commit details
    Browse the repository at this point in the history

  8. Update tests

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    738d2ef View commit details
    Browse the repository at this point in the history

  9. Define undefined secondsPerEpoch

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    3b7e58c View commit details
    Browse the repository at this point in the history

  10. Update some events

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    7364279 View commit details
    Browse the repository at this point in the history

  11. Remove -1

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    e9c8152 View commit details
    Browse the repository at this point in the history

  12. Fix tests

    @trizin
    trizin authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    9f5969a View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Update contracts/templates/ERC20Template3.sol 

    Co-authored-by: Alex Coseru <alex.coseru@gmail.com>
    @trizin @alexcos20
    trizin and alexcos20 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    8d8178c View commit details
    Browse the repository at this point in the history

  2. Update contracts/templates/ERC20Template3.sol 

    Co-authored-by: Alex Coseru <alex.coseru@gmail.com>
    @trizin @alexcos20
    trizin and alexcos20 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    3073543 View commit details
    Browse the repository at this point in the history

  3. Update contracts/templates/ERC20Template3.sol 

    Co-authored-by: Alex Coseru <alex.coseru@gmail.com>
    @trizin @alexcos20
    trizin and alexcos20 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    1a00726 View commit details
    Browse the repository at this point in the history

  4. Update contracts/templates/ERC20Template3.sol 

    Co-authored-by: Alex Coseru <alex.coseru@gmail.com>
    @trizin @alexcos20
    trizin and alexcos20 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    8768f53 View commit details
    Browse the repository at this point in the history

  5. Use timestamp as epoch number

    @trizin
    trizin authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    95cdc06 View commit details
    Browse the repository at this point in the history

  6. Update tests

    @trizin
    trizin authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    016d982 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'issue779-use-timestamp-instead-of-block-number-in-predi… 

    …ctoor' of https://github.com/oceanprotocol/contracts into issue779-use-timestamp-instead-of-block-number-in-predictoor
    @trizin
    trizin authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    6db94ec View commit details
    Browse the repository at this point in the history

  8. Fix

    @trizin
    trizin authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    443c895 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'issue779-use-timestamp-instead-of-block-number-in-predi… 

    …ctoor' of https://github.com/oceanprotocol/contracts into issue779-use-timestamp-instead-of-block-number-in-predictoor
    @trizin
    trizin authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    9bce114 View commit details
    Browse the repository at this point in the history

  10. Fix merge error

    @trizin
    trizin authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    cd90f40 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. _epoch => epoch_start

    @trizin
    trizin authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    fc20d19 View commit details
    Browse the repository at this point in the history

  2. trueValSubmitTimeoutEpoch => trueValSubmitTimeout

    @trizin
    trizin authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    97128fb View commit details
    Browse the repository at this point in the history

  3. Fix

    @trizin
    trizin authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    2deb98f View commit details
    Browse the repository at this point in the history

  4. Linter and readability

    @trizin
    trizin authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    b2f2d7f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #776 from oceanprotocol/feature/feeCollector_setter 

    add setFeeCollector
    @alexcos20
    alexcos20 authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    796fe91 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Update event param name

    @trizin
    trizin authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    dd78e36 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. deployment

    @alexcos20
    alexcos20 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    e82057d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #790 from oceanprotocol/feature/deploy_predictoor3… 

    …_to_testnet

deployment on testnet
    @alexcos20
    alexcos20 authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    f57872f View commit details
    Browse the repository at this point in the history

  3. 2.0.0-next.3

    @alexcos20
    alexcos20 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    deb2eb8 View commit details
    Browse the repository at this point in the history

  4. Add template 3 abi

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ccd6dcd View commit details
    Browse the repository at this point in the history

  5. Let predictoors update their prediction

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ed63008 View commit details
    Browse the repository at this point in the history

  6. cannot modify stake amt

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    73342f9 View commit details
    Browse the repository at this point in the history

  7. Fix

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    c97a037 View commit details
    Browse the repository at this point in the history

  8. Fix

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    09386b1 View commit details
    Browse the repository at this point in the history

  9. Lint

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    725740c View commit details
    Browse the repository at this point in the history

  10. Add a test

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    7e19947 View commit details
    Browse the repository at this point in the history

  11. Emit an event on update

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ecccae7 View commit details
    Browse the repository at this point in the history

  12. Add more tests

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    e1e1acf View commit details
    Browse the repository at this point in the history

  13. Fix test

    @trizin
    trizin authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    e2598f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Remove event

    @trizin
    trizin authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    fdbf61a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #792 from oceanprotocol/issue791-predictoor-update… 

    …-existing-prediction-if-exists

Allow predictoors to update their prediction before epoch closes
    @trizin
    trizin authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    9734008 View commit details
    Browse the repository at this point in the history

  3. v2.0.0-next.4

    @alexcos20
    alexcos20 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e58562c View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. Hide stake amounts for prediction epoch & allow predictoors modify th… 

    …eir stake amount
    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    f865627 View commit details
    Browse the repository at this point in the history

  2. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    82ffeca View commit details
    Browse the repository at this point in the history

  3. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    a9fc804 View commit details
    Browse the repository at this point in the history

  4. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    a9a8d7b View commit details
    Browse the repository at this point in the history

  5. Update duplicate prediction tests

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    ba6b777 View commit details
    Browse the repository at this point in the history

  6. Update aggpredval test

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    eace40b View commit details
    Browse the repository at this point in the history

  7. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    a005336 View commit details
    Browse the repository at this point in the history

  8. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    0ee2bb8 View commit details
    Browse the repository at this point in the history

  9. Add getTotalStake function

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    9a7fa6b View commit details
    Browse the repository at this point in the history

  10. Require predictions not closed

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    60149d8 View commit details
    Browse the repository at this point in the history

  11. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    92d0248 View commit details
    Browse the repository at this point in the history

  12. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    68891b8 View commit details
    Browse the repository at this point in the history

  13. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    0f928ff View commit details
    Browse the repository at this point in the history

  14. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    e0f18bf View commit details
    Browse the repository at this point in the history

  15. Remove require

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    53fbd6a View commit details
    Browse the repository at this point in the history

  16. Fix

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    87871b2 View commit details
    Browse the repository at this point in the history

  17. Fix approval

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    32f8911 View commit details
    Browse the repository at this point in the history

  18. Fix test

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    a8a2fd5 View commit details
    Browse the repository at this point in the history

  19. Fix transfer

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    b56297b View commit details
    Browse the repository at this point in the history

  20. Fix epoch ts

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    bfeaad1 View commit details
    Browse the repository at this point in the history

  21. Fix test

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    82466d2 View commit details
    Browse the repository at this point in the history

  22. await fastforward command

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    a13cc15 View commit details
    Browse the repository at this point in the history

  23. Add tests for total stake function

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    cb5f72a View commit details
    Browse the repository at this point in the history

  24. Fix type error

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    d30cc1f View commit details
    Browse the repository at this point in the history

  25. Set seconds per epoch to 300

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    54b4d30 View commit details
    Browse the repository at this point in the history

  26. Add a test for toEpochStart

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    e93a368 View commit details
    Browse the repository at this point in the history

  27. Fix testes where hardcoded values are used

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    720bc34 View commit details
    Browse the repository at this point in the history

  28. Require s_per_subscription % s_per_epoch == 0

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    5e75797 View commit details
    Browse the repository at this point in the history

  29. Fix test

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    e7afa9f View commit details
    Browse the repository at this point in the history

  30. Reentrancy precaution

    @trizin
    trizin authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    5ba4ff6 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Merge pull request #794 from oceanprotocol/issue793-hide-stake-amount… 

    …s-for-prediction

Hide stake amounts for prediction epoch & Allow predictoors modify their stake amount
    @alexcos20
    alexcos20 authored Aug 7, 2023
    Configuration menu
    Copy the full SHA
    1ec635f View commit details
    Browse the repository at this point in the history

  2. v2.0.0-next.5

    @alexcos20
    alexcos20 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    04dbf29 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. expose agg predval after trueval

    @alexcos20
    alexcos20 committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    0007360 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #796 from oceanprotocol/feature/expose_agg_preds_a… 

    …fter_trueval

expose agg predval after trueval
    @alexcos20
    alexcos20 authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    eeff4f6 View commit details
    Browse the repository at this point in the history

  3. v2.0.0-next.6

    @alexcos20
    alexcos20 committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    ba9d21b View commit details
    Browse the repository at this point in the history