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

add predictoor template #749

Merged
merged 136 commits into from
Jul 4, 2023
Merged

add predictoor template #749

Show file tree
Hide file tree
Changes from 113 commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
40405c7
add predictoor template
alexcos20 May 4, 2023
e4d4264
sync ERC20TemplatePredictoor
alexcos20 May 4, 2023
a07c311
Remove unused var
trizin May 4, 2023
956c3fd
Add a todo
trizin May 4, 2023
3e68c80
Arranging declarations
trizin May 5, 2023
c257db8
Add ERC20TemplatePredictoor tests
trizin May 5, 2023
2ea457c
Fix tests
trizin May 5, 2023
5f7b09d
Remove redundant test
trizin May 5, 2023
710e430
Remove unused events
trizin May 5, 2023
b321042
make stake_token public
alexcos20 May 5, 2023
b45a83a
more updates
alexcos20 May 5, 2023
8427101
more public vars
alexcos20 May 5, 2023
eeead33
more updates
alexcos20 May 5, 2023
2f04b50
Remove NewPaymentCollector event and add predictoor events
trizin May 5, 2023
70c1e8a
fix tests - still WIP
alexcos20 May 5, 2023
e66ef8c
Fix
trizin May 5, 2023
2789270
Merge branch 'test/dt3' of https://github.com/oceanprotocol/ocean-con…
trizin May 5, 2023
01ccb91
Fixes
trizin May 5, 2023
759052c
Don't let subscribers see individual predictions
trizin May 5, 2023
acc62f8
Add predictoor unit tests
trizin May 5, 2023
cae72cb
force compile
alexcos20 May 8, 2023
a19921b
more docker tweaks
alexcos20 May 8, 2023
9a75043
Update tests
trizin May 8, 2023
473c90d
Fix add_revenue loop
trizin May 8, 2023
0c4f52a
Fix
trizin May 8, 2023
466e248
move revenue to startOrder
alexcos20 May 8, 2023
0d0bb1a
add condition
alexcos20 May 9, 2023
6d875eb
Bug fix: should check <=
trizin May 9, 2023
d79dbf3
Use camelcase
trizin May 9, 2023
73cb231
Fix submit predval require logic and other improvements
trizin May 9, 2023
4e342d6
Make subscriptions public
trizin May 9, 2023
15a4558
Set vars as private
trizin May 9, 2023
88c5b8c
Remove predefined value
trizin May 9, 2023
18d96c7
Add revenue to soonest block
trizin May 9, 2023
b737c05
Go unit tests go!
trizin May 9, 2023
6b1e50f
Use current block number
trizin May 9, 2023
40a5725
add caller buys a subscription
alexcos20 May 9, 2023
a49946e
Merge branch 'test/dt3' of https://github.com/oceanprotocol/contracts…
alexcos20 May 9, 2023
b281774
prevent Reentrancy
alexcos20 May 9, 2023
9c6da8a
remove hardcoded events index
alexcos20 May 9, 2023
6f2dabc
Add multi payout function
trizin May 10, 2023
8fed545
Payout fix transfer
trizin May 10, 2023
ea3ed57
More tests for get_predval
trizin May 10, 2023
d9445e9
Fix payout formula
trizin May 10, 2023
dbd30a4
Predictoor gets paid test
trizin May 10, 2023
b0acc30
Add redeem_unused_sub_revenue admin func
trizin May 10, 2023
8342dad
add debug statements
alexcos20 May 10, 2023
9c23811
Merge branch 'test/dt3' of https://github.com/oceanprotocol/contracts…
alexcos20 May 10, 2023
4f44a06
Fix
trizin May 10, 2023
d8312ba
Merge
trizin May 10, 2023
4c2fc18
collectbt
alexcos20 May 10, 2023
b71d0ab
fix tests
alexcos20 May 10, 2023
b145479
cleanup
alexcos20 May 10, 2023
3fb10f9
cache compilers
alexcos20 May 10, 2023
12aba62
optimize
alexcos20 May 10, 2023
be4a380
revert Docker changes, will handle in another PR
alexcos20 May 10, 2023
f7e21df
Compare expected price
trizin May 10, 2023
d2a7e57
Merge
trizin May 10, 2023
bb2d224
add nonReentrant
alexcos20 May 11, 2023
0bedaeb
Merge branch 'test/dt3' of https://github.com/oceanprotocol/contracts…
alexcos20 May 11, 2023
62daed6
add misiing await
alexcos20 May 11, 2023
eb650d3
more tests fixed
alexcos20 May 11, 2023
f035847
enforce solidity math
alexcos20 May 11, 2023
79e0ded
add debug logs
alexcos20 May 11, 2023
b897e35
debug tests
alexcos20 May 11, 2023
88a06ab
fix tests
alexcos20 May 11, 2023
0b0b764
cleanup log msg
alexcos20 May 11, 2023
2c52729
optimize
alexcos20 May 11, 2023
9949e08
Make truval mappings public
trizin May 11, 2023
fdb466a
Optimization
trizin May 11, 2023
f5614ae
Add multi predictoor test
trizin May 11, 2023
1386a71
Remove comment
trizin May 11, 2023
69c8563
Bug fix
trizin May 11, 2023
162aaed
optimize docker
alexcos20 May 11, 2023
434393f
optimize more
alexcos20 May 11, 2023
947deee
Fix test math
trizin May 11, 2023
17009a6
Add tests for redeem_unused_sub_revenue
trizin May 11, 2023
1cda989
Merge
trizin May 11, 2023
3d375e9
fix Docker
alexcos20 May 11, 2023
fac9d59
Merge branch 'test/dt3' of https://github.com/oceanprotocol/contracts…
alexcos20 May 11, 2023
ac417c5
Make seconds global
trizin May 11, 2023
4bb473b
Merge
trizin May 11, 2023
2c0bed6
Fix number
trizin May 11, 2023
59be399
Fix comment
trizin May 11, 2023
e46c8a2
more docker
alexcos20 May 11, 2023
5044e42
Merge branch 'test/dt3' of https://github.com/oceanprotocol/contracts…
alexcos20 May 11, 2023
4c67bee
Check if predictoor has submitted in payout func
trizin May 11, 2023
cc753aa
Merge
trizin May 11, 2023
5bb2b74
Add test:predictoor can redeem stake if OPF does not submit
trizin May 11, 2023
974a333
fix
alexcos20 May 11, 2023
cf36d06
Fix expect reverts
trizin May 11, 2023
be533eb
Merge
trizin May 11, 2023
77fff1c
Fix test
trizin May 11, 2023
fc4d94d
Set payout amount to 0 if swe is 0
trizin May 11, 2023
d3969e4
more docker
alexcos20 May 11, 2023
51afc72
docker debug
alexcos20 May 11, 2023
a5873c4
restore original docker
alexcos20 May 11, 2023
550e46d
fix typo
alexcos20 May 11, 2023
cea3d38
fix typo
alexcos20 May 11, 2023
362dffe
Merge branch 'v2.0' into test/dt3
alexcos20 May 11, 2023
d6b8656
Merge branch 'v2.0' into test/dt3
alexcos20 May 11, 2023
e815d6f
Add tests for submit_trueval
trizin May 12, 2023
ec52843
Test subscription expire
trizin May 12, 2023
048a53e
Rename test
trizin May 12, 2023
524403e
Test payout_mul function
trizin May 12, 2023
4cfbd0e
Add TruevalSubmitted event
trizin May 12, 2023
a96a5c4
make buyFromFre internal
alexcos20 May 12, 2023
b103c0b
deploy on oasis_saphire_testnet
alexcos20 May 12, 2023
da8bb9f
changes, see comments
alexcos20 May 13, 2023
c4dd008
updates
alexcos20 May 13, 2023
3906605
remove console
alexcos20 May 13, 2023
37f80c9
add compat function bck
alexcos20 May 13, 2023
ca6b648
Merge PR #753 from oceanprotocol/feature/update_template3 into test/dt3
trentmc May 14, 2023
3984ead
comments fixes
alexcos20 May 14, 2023
d7c1504
remove payment managers + add event
alexcos20 May 14, 2023
6247931
optimize contract size
alexcos20 May 14, 2023
1cb4ecb
add RevenueAdded
alexcos20 May 14, 2023
e712605
use mixedCase
alexcos20 May 14, 2023
33926b6
more mixedCase
alexcos20 May 14, 2023
5a97487
fix tests
alexcos20 May 14, 2023
fb684c7
fix bug
alexcos20 May 14, 2023
0bab055
remove nonReentrant
alexcos20 May 18, 2023
1eb80e7
fix nonReentrant
alexcos20 May 18, 2023
510daa4
add floatValue
alexcos20 May 19, 2023
260ffb2
fix feeCollector & slash all edge case
alexcos20 May 19, 2023
958657a
disable Fre when contract is paused
alexcos20 May 19, 2023
0ee0fe5
fix tests
alexcos20 May 19, 2023
4167804
add cancel epoch test
alexcos20 May 19, 2023
20af082
add test for edge case
alexcos20 May 19, 2023
d4804c7
optimize
alexcos20 May 19, 2023
97c7ce8
some renames
alexcos20 May 19, 2023
97eb0d7
remove comment
alexcos20 May 19, 2023
e3a8660
fixes
alexcos20 May 19, 2023
2a5bf67
Merge pull request #755 from oceanprotocol/feature/predictoor_iterati…
alexcos20 May 19, 2023
fbd75ac
add test for buyFromFreAndOrder
alexcos20 Jul 3, 2023
0f0fff3
more tests
alexcos20 Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions addresses/address.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,5 +251,23 @@
},
"Dispenser": "0xDEfD0018969cd2d4E648209F876ADe184815f038",
"ERC721Factory": "0x9C9eE07b8Ce907D2f9244F8317C1Ed29A3193bAe"
},
"oasis_saphire_testnet": {
"chainId": 23295,
"Ocean": "0x4dD281EB67DED07E76E413Df16176D66ae69e240",
"OPFCommunityFeeCollector": "0xe8c6Dc39602031A152440311e364818ba25C2Bc1",
"startBlock": 1178607,
"Router": "0xA4E108a4fa07C931cFe4bF2c1c6f9C1579d5a819",
"FixedPrice": "0x41cee92fEA5E07F8E3D1Eaf9A19dE3D83e24FA53",
"ERC20Template": {
"1": "0x9b87E416a76d8bCAf59A5c746D5ceB57119F08Cb",
"2": "0x12bB8D85a091A69A07E22E52d4567dBB91568f52",
"3": "0x9497d1d64F2aFeBcd4f9916Eef3d9094E5Df962f"
},
"ERC721Template": {
"1": "0x7b0576CF01E868bce46cca91b2a8E674141b0355"
},
"Dispenser": "0x8389bC1306208488D665F939AFB4079adf6f5a06",
"ERC721Factory": "0xc97fa83746aDe91b0eeB16cb51326a0A980Af7c3"
}
}