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

V2 single currency market #130

Open
wants to merge 111 commits into
base: master
Choose a base branch
from
Open

V2 single currency market #130

wants to merge 111 commits into from

Conversation

udkreddySomish
Copy link
Collaborator

Refer this sheet, for the list of changes made to the contracts

PremSOMISH and others added 30 commits November 13, 2020 12:24
@PremSOMISH
made changes for matic
87796e1
@PremSOMISH
made changes in Market,MarketRegistry and tokenController contracts f…
df234bf 
…or matic
@PremSOMISH
Added test case for meta transaction and added few util files
9462515
@PremSOMISH
renamed variable names
fe66aea
@PremSOMISH
inheriting IERC20 instead of ERC20 in poltxtoken
7ee4c0f 
Added more test cases
@PremSOMISH
Added testcases for token controller
9382ab4
@PremSOMISH
reverted changes from function which are callable by contract addresses
ad9dd37
@PremSOMISH
added more test cases for meta Tx
18d5169
@udkreddySomish
Added V2 contracts
fb05752
@udkreddySomish
Added Basic Meta transaction file
517c20a
@udkreddySomish
Inherit MetaTransaction contract in all markets
7e806d8
@udkreddySomish
Removed redundant functions
9d9cf71
@udkreddySomish
temporarily commented out the functions
b8b345c
@udkreddySomish
Inherited Metatransaction for createMarket
aa2dc40
@PremSOMISH
Copied metaTx code from outdated repo to this repo
ef25b89
@PremSOMISH
Changes made in market participation functions for metaTx
a2c081b
@udkreddySomish
Removed incentive related variables
f0f692e
@PremSOMISH
gas optimisation
eee730c
@PremSOMISH
optimization in signAndExecuteMetaTx.js
598c7bc
@PremSOMISH
Made changes 1n 10,11th files according to metaTx changes
4348777
@PremSOMISH
Made changes for MEtaTx in deposit plotusWithBlot test cases
340e63b
@PremSOMISH
Added made changes in 11th file and multiplier files for meta tx
4afd8ba 
changed way of converting buffer to hex in signAndExecuteMetaTx
@udkreddySomish
Restrutured contracts
87db8ec
@PremSOMISH
Changes to enable single currency participation
19a9ffe
@PremSOMISH
Removed unnecessary files
733794e
@PremSOMISH
Renamed term plot to generic token format
b94959d
@PremSOMISH
handeling reward transfer separetly for plot and prediction currency
d5102fe
@PremSOMISH
removing uniswap files
05db11a
@PremSOMISH
Removed unused variables
5b8c1f9
@PremSOMISH
Fixed migration script
d348513
udkreddySomish and others added 26 commits February 3, 2021 10:02
@udkreddySomish
Optimisations
e4b3a3a
@udkreddySomish
Merged matic plot contract with existing PlotXtoken contract
90fb095
@PremSOMISH
Added test cases for option pricing
90332fc 
Fixed issues with option pricing fomula
@udkreddySomish
Minor optimisations
b4fe0b8
@udkreddySomish
Merge branch 'v2-singleCurrencyMarket' of https://github.com/somish/P…
36bc574 
…lotxContract into v2-singleCurrencyMarket
@PremSOMISH
Renamed testcase files for daily and weekly files
6fbed28
@PremSOMISH
Added getter for fetching feed addrress by curr name
bf25a9a
@PremSOMISH
Changes for posting feed price manually by auth address and changed o…
4bb874e 
…ption pricing function accordingly

shifted AllMarket interface to interface file
@PremSOMISH
removing null address check for feed address in addNewCurrency
958bf4b 
Skipping settleMarket if feed address is null

Handeling create market if feed address is null
@PremSOMISH
Handeling getAssetPriceUSD(), calculateOptionRange() if feed address …
6dbb9d6 
…is null

removed commented code
@udkreddySomish
Reduced contract size
8dec362
@PremSOMISH
Replicated test case for option pricing for manual feed
1b5e35d
@PremSOMISH
Removed marketTotalTokenStaked and using getTotalAssetsStaked() instead
b9fc4e9
@udkreddySomish
Minor Fixes and optimisations
0334418
@udkreddySomish
Updated testcases
648c123
@PremSOMISH
Linting changes and some optimizations
b3e0cdf
@udkreddySomish
Minor fixes
ae856ed
@udkreddySomish
Allocate fee for market creator in prediction amount instead of rewar…
f7528ba 
…d pool share
@udkreddySomish
Merge branch 'v2-singleCurrencyMarket' of https://github.com/somish/P…
d795785 
…lotxContract into v2-singleCurrencyMarket
@PremSOMISH
Implemented EIP 712 in all contracts following MetaTx
79166b3 
Fixed script responsible for signing the meta tx

took contracts out of plotxToken.sol

Fixed test cases broke due to EIP changes
@PremSOMISH
Merge pull request #1 from somish/Implement-EIP712
345359c 
Implemented EIP 712 in all contracts following MetaTx
@udkreddySomish
Optimised contracts
71612d1
@udkreddySomish
Fixed testcases
a513188
@udkreddySomish
Fixed fee deduction
6bdf9f7
@udkreddySomish
Added fee params in MarketResult event
e22b300
@udkreddySomish
Updated multiplier testcases
56f0261
@maxsam4
Copy link
Collaborator

maxsam4 commented Feb 16, 2021

msg.sender is still being used at a lot of places. Please replace msg.sender with the meta tx's _msgSender wherever applicable.

@udkreddySomish
Copy link
Collaborator Author

Yes, msg.sender is added intentionally wherever the particular function is to be called by any contract or the relayer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxsam4 maxsam4 Awaiting requested review from maxsam4

@nitika-goel nitika-goel Awaiting requested review from nitika-goel

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@udkreddySomish @maxsam4 @PremSOMISH