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

Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
7a4b92c
add setFeeCollector
alexcos20 Jul 27, 2023
beb6d1a
fix lint
alexcos20 Jul 27, 2023
a0ccf2b
add zero address check
alexcos20 Jul 27, 2023
3117b51
Use timestamp instead on block number
trizin Jul 28, 2023
a9b0213
Update tests
trizin Jul 28, 2023
fc5a0cf
Fix
trizin Jul 28, 2023
8178b30
Use epoch to calculate everything
trizin Jul 28, 2023
6996fd9
Update tests
trizin Jul 28, 2023
03161e0
Update tests
trizin Jul 28, 2023
a36fd83
Fix updateSeconds(
trizin Jul 28, 2023
949e651
Update tests for change in `updateSeconds`
trizin Jul 28, 2023
b1638f7
Add missing semicolon
trizin Jul 28, 2023
82e7702
Adjustments for epoch and fixes
trizin Jul 28, 2023
32a1d19
Adjustments and fixes
trizin Jul 28, 2023
3fe82b8
More adjustments and fixes
trizin Jul 28, 2023
4b2f4e0
Update tests
trizin Jul 28, 2023
1d4e2e7
Start epoch from 0
trizin Jul 29, 2023
4042b9b
Remove unused function
trizin Jul 29, 2023
8f03ea9
Add more comments
trizin Jul 29, 2023
b32870e
Try fix
trizin Jul 29, 2023
8f8e18e
Fix overflow
trizin Jul 29, 2023
32dd2d5
Make starttime public
trizin Jul 29, 2023
62890d9
Test fixes
trizin Jul 29, 2023
738d2ef
Update tests
trizin Jul 29, 2023
3b7e58c
Define undefined secondsPerEpoch
trizin Jul 29, 2023
7364279
Update some events
trizin Jul 29, 2023
e9c8152
Remove -1
trizin Jul 29, 2023
9f5969a
Fix tests
trizin Jul 29, 2023
8d8178c
Update contracts/templates/ERC20Template3.sol
trizin Jul 31, 2023
3073543
Update contracts/templates/ERC20Template3.sol
trizin Jul 31, 2023
1a00726
Update contracts/templates/ERC20Template3.sol
trizin Jul 31, 2023
8768f53
Update contracts/templates/ERC20Template3.sol
trizin Jul 31, 2023
95cdc06
Use timestamp as epoch number
trizin Jul 31, 2023
016d982
Update tests
trizin Jul 31, 2023
6db94ec
Merge branch 'issue779-use-timestamp-instead-of-block-number-in-predi…
trizin Jul 31, 2023
443c895
Fix
trizin Jul 31, 2023
9bce114
Merge branch 'issue779-use-timestamp-instead-of-block-number-in-predi…
trizin Jul 31, 2023
cd90f40
Fix merge error
trizin Jul 31, 2023
fc20d19
_epoch => epoch_start
trizin Aug 1, 2023
97128fb
trueValSubmitTimeoutEpoch => trueValSubmitTimeout
trizin Aug 1, 2023
2deb98f
Fix
trizin Aug 1, 2023
b2f2d7f
Linter and readability
trizin Aug 1, 2023
796fe91
Merge pull request #776 from oceanprotocol/feature/feeCollector_setter
alexcos20 Aug 1, 2023
dd78e36
Update event param name
trizin Aug 2, 2023
e82057d
deployment
alexcos20 Aug 3, 2023
f57872f
Merge pull request #790 from oceanprotocol/feature/deploy_predictoor3…
alexcos20 Aug 3, 2023
deb2eb8
2.0.0-next.3
alexcos20 Aug 3, 2023
ccd6dcd
Add template 3 abi
trizin Aug 3, 2023
ed63008
Let predictoors update their prediction
trizin Aug 3, 2023
73342f9
cannot modify stake amt
trizin Aug 3, 2023
c97a037
Fix
trizin Aug 3, 2023
09386b1
Fix
trizin Aug 3, 2023
725740c
Lint
trizin Aug 3, 2023
7e19947
Add a test
trizin Aug 3, 2023
ecccae7
Emit an event on update
trizin Aug 3, 2023
e1e1acf
Add more tests
trizin Aug 3, 2023
e2598f7
Fix test
trizin Aug 3, 2023
fdbf61a
Remove event
trizin Aug 4, 2023
9734008
Merge pull request #792 from oceanprotocol/issue791-predictoor-update…
trizin Aug 4, 2023
e58562c
v2.0.0-next.4
alexcos20 Aug 4, 2023
f865627
Hide stake amounts for prediction epoch & allow predictoors modify th…
trizin Aug 5, 2023
82ffeca
Fix
trizin Aug 5, 2023
a9fc804
Fix
trizin Aug 5, 2023
a9a8d7b
Fix
trizin Aug 5, 2023
ba6b777
Update duplicate prediction tests
trizin Aug 5, 2023
eace40b
Update aggpredval test
trizin Aug 5, 2023
a005336
Fix
trizin Aug 5, 2023
0ee2bb8
Fix
trizin Aug 5, 2023
9a7fa6b
Add getTotalStake function
trizin Aug 5, 2023
60149d8
Require predictions not closed
trizin Aug 5, 2023
92d0248
Fix
trizin Aug 5, 2023
68891b8
Fix
trizin Aug 5, 2023
0f928ff
Fix
trizin Aug 5, 2023
e0f18bf
Fix
trizin Aug 5, 2023
53fbd6a
Remove require
trizin Aug 5, 2023
87871b2
Fix
trizin Aug 5, 2023
32f8911
Fix approval
trizin Aug 5, 2023
a8a2fd5
Fix test
trizin Aug 5, 2023
b56297b
Fix transfer
trizin Aug 5, 2023
bfeaad1
Fix epoch ts
trizin Aug 5, 2023
82466d2
Fix test
trizin Aug 5, 2023
a13cc15
await fastforward command
trizin Aug 5, 2023
cb5f72a
Add tests for total stake function
trizin Aug 5, 2023
d30cc1f
Fix type error
trizin Aug 5, 2023
54b4d30
Set seconds per epoch to 300
trizin Aug 5, 2023
e93a368
Add a test for toEpochStart
trizin Aug 5, 2023
720bc34
Fix testes where hardcoded values are used
trizin Aug 5, 2023
5e75797
Require s_per_subscription % s_per_epoch == 0
trizin Aug 5, 2023
e7afa9f
Fix test
trizin Aug 5, 2023
5ba4ff6
Reentrancy precaution
trizin Aug 5, 2023
1ec635f
Merge pull request #794 from oceanprotocol/issue793-hide-stake-amount…
alexcos20 Aug 7, 2023
04dbf29
v2.0.0-next.5
alexcos20 Aug 7, 2023
0007360
expose agg predval after trueval
alexcos20 Aug 16, 2023
eeff4f6
Merge pull request #796 from oceanprotocol/feature/expose_agg_preds_a…
alexcos20 Aug 16, 2023
ba9d21b
v2.0.0-next.6
alexcos20 Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading