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.

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

V2 single currency market #130

Open
wants to merge 111 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
87796e1
made changes for matic
PremSOMISH Nov 13, 2020
df234bf
made changes in Market,MarketRegistry and tokenController contracts f…
PremSOMISH Nov 13, 2020
9462515
Added test case for meta transaction and added few util files
PremSOMISH Nov 18, 2020
fe66aea
renamed variable names
PremSOMISH Nov 18, 2020
7ee4c0f
inheriting IERC20 instead of ERC20 in poltxtoken
PremSOMISH Nov 18, 2020
9382ab4
Added testcases for token controller
PremSOMISH Nov 19, 2020
ad9dd37
reverted changes from function which are callable by contract addresses
PremSOMISH Nov 19, 2020
18d5169
added more test cases for meta Tx
PremSOMISH Nov 19, 2020
fb05752
Added V2 contracts
udkreddySomish Dec 16, 2020
517c20a
Added Basic Meta transaction file
udkreddySomish Dec 16, 2020
7e806d8
Inherit MetaTransaction contract in all markets
udkreddySomish Dec 16, 2020
9d9cf71
Removed redundant functions
udkreddySomish Dec 16, 2020
b8b345c
temporarily commented out the functions
udkreddySomish Dec 16, 2020
aa2dc40
Inherited Metatransaction for createMarket
udkreddySomish Dec 17, 2020
ef25b89
Copied metaTx code from outdated repo to this repo
PremSOMISH Dec 17, 2020
a2c081b
Changes made in market participation functions for metaTx
PremSOMISH Dec 18, 2020
f0f692e
Removed incentive related variables
udkreddySomish Dec 18, 2020
eee730c
gas optimisation
PremSOMISH Dec 18, 2020
598c7bc
optimization in signAndExecuteMetaTx.js
PremSOMISH Dec 18, 2020
4348777
Made changes 1n 10,11th files according to metaTx changes
PremSOMISH Dec 20, 2020
340e63b
Made changes for MEtaTx in deposit plotusWithBlot test cases
PremSOMISH Dec 20, 2020
4afd8ba
Added made changes in 11th file and multiplier files for meta tx
PremSOMISH Dec 23, 2020
87db8ec
Restrutured contracts
udkreddySomish Dec 28, 2020
19a9ffe
Changes to enable single currency participation
PremSOMISH Jan 4, 2021
733794e
Removed unnecessary files
PremSOMISH Jan 5, 2021
b94959d
Renamed term plot to generic token format
PremSOMISH Jan 7, 2021
d5102fe
handeling reward transfer separetly for plot and prediction currency
PremSOMISH Jan 11, 2021
05db11a
removing uniswap files
PremSOMISH Jan 11, 2021
5b8c1f9
Removed unused variables
PremSOMISH Jan 13, 2021
d348513
Fixed migration script
PremSOMISH Jan 13, 2021
680e577
Fixed initialising TC in MarketUtility
udkreddySomish Jan 13, 2021
75e2f47
Fixed minor issues in contracts
udkreddySomish Jan 13, 2021
599ea69
Fixed migrations and updated test cases for Bets-Multiple Options sheet
udkreddySomish Jan 13, 2021
5cd2f3b
Fixed governance testcases
udkreddySomish Jan 14, 2021
a14c37b
Corrected category to raise dispute
udkreddySomish Jan 14, 2021
cf1b650
Added relayer fee implementation
udkreddySomish Jan 15, 2021
0f8b12e
Added a cpnversion rate for asset and handle dispute resolution propo…
udkreddySomish Jan 15, 2021
03a0d5e
changes related to updated test sheet
PremSOMISH Jan 15, 2021
18f7d8f
Fixed issue deducting commission fee
udkreddySomish Jan 15, 2021
579169c
Merge branch 'v2-singleCurrencyMarket' of https://github.com/somish/P…
udkreddySomish Jan 15, 2021
a4cba2a
Fixed issue with orignated sender in relayer fees
PremSOMISH Jan 15, 2021
9610b2d
Fixed 10th test file
PremSOMISH Jan 15, 2021
b5e98c2
Fixed 12th test file
PremSOMISH Jan 15, 2021
4960ee6
fixed 11th test file
PremSOMISH Jan 15, 2021
8638ff4
Changed rewardPoolShareThreshold for testing
PremSOMISH Jan 15, 2021
6605008
Made changes related to meta tx in marketCreatorReward contract
PremSOMISH Jan 18, 2021
f09b6d4
Calling MarketCreationRewards functions with meta tx
PremSOMISH Jan 18, 2021
1b1453e
Removed all unnecessary files
PremSOMISH Jan 21, 2021
0b0dc1f
Allow multiple authorized addresses and added a function to settle ma…
udkreddySomish Jan 21, 2021
283e74e
Fixed initialisation in rewards contracts
udkreddySomish Jan 21, 2021
3a4fcea
Fixed migrations
udkreddySomish Jan 21, 2021
e391fc7
Added metatx in testcases
udkreddySomish Jan 21, 2021
43f4b32
Fixed minor issue and added metatx for raiseDispute
udkreddySomish Jan 22, 2021
ceb40ed
Fixed Dispute testcases
udkreddySomish Jan 22, 2021
0b3e65c
Updated category id's
udkreddySomish Jan 22, 2021
79b1a54
Updated testcases
udkreddySomish Jan 22, 2021
8ee2c2e
Fixed testcases
udkreddySomish Jan 22, 2021
d3c2f3e
Minor fixes
udkreddySomish Jan 22, 2021
cf0d601
Fixed meta tx issue in governance
udkreddySomish Jan 25, 2021
43c3293
Removed deposit function adn fixed incentives for market creration
udkreddySomish Jan 25, 2021
7368596
Fixed market creation testcases
udkreddySomish Jan 25, 2021
ca128c5
Added function to set user levels, set multiplier per level, provide …
udkreddySomish Jan 25, 2021
5a66302
Market cooldown time is now different for each market type
udkreddySomish Jan 25, 2021
311286f
Referral Feature, referrer and referee gets the percent of fee from p…
udkreddySomish Jan 27, 2021
2ad5084
Fixed issue deducting relayer fee
udkreddySomish Jan 27, 2021
963b32a
Transfer disputed proposal tokens to dao
udkreddySomish Jan 27, 2021
b953fe1
Fixed Multiplier testcases
udkreddySomish Jan 27, 2021
440e78e
Renamed multiplier testcase file and removed unused files
udkreddySomish Jan 27, 2021
6bbcdf9
Removed outdated testfiles
udkreddySomish Jan 27, 2021
f28ecc7
Removed outdated testfiles
udkreddySomish Jan 27, 2021
456dbbd
transfering buned tokens to DAO
PremSOMISH Jan 27, 2021
9a28e82
Added new Plot token file compatible with matic and made apt changes …
PremSOMISH Jan 27, 2021
7cb4d7e
Removed commission percentage
udkreddySomish Jan 27, 2021
18b52be
Minor changes
udkreddySomish Jan 27, 2021
92fb61b
Minor fix
udkreddySomish Jan 27, 2021
1ecc3a0
Removed unused variables and added new categories
udkreddySomish Jan 28, 2021
007c0f2
Fixed testcases
udkreddySomish Jan 28, 2021
af08c26
Updated testcases
udkreddySomish Jan 28, 2021
f16c821
Fixed testcases
udkreddySomish Jan 29, 2021
2e2329e
Changes related to option pricing
PremSOMISH Jan 29, 2021
b5a4aa0
optimized Contract to deploy allMarkets
PremSOMISH Jan 29, 2021
8ebaa40
Removed commented code
PremSOMISH Jan 29, 2021
9a93256
Added function to get option price for all options for market
PremSOMISH Jan 29, 2021
9ccdcd9
Minor changes in option pricing
PremSOMISH Feb 1, 2021
9dbd771
Minor changes and added multisig wallet
udkreddySomish Feb 2, 2021
e4b3a3a
Optimisations
udkreddySomish Feb 3, 2021
90fb095
Merged matic plot contract with existing PlotXtoken contract
udkreddySomish Feb 3, 2021
90332fc
Added test cases for option pricing
PremSOMISH Feb 3, 2021
b4fe0b8
Minor optimisations
udkreddySomish Feb 3, 2021
36bc574
Merge branch 'v2-singleCurrencyMarket' of https://github.com/somish/P…
udkreddySomish Feb 3, 2021
6fbed28
Renamed testcase files for daily and weekly files
PremSOMISH Feb 3, 2021
bf25a9a
Added getter for fetching feed addrress by curr name
PremSOMISH Feb 3, 2021
4bb874e
Changes for posting feed price manually by auth address and changed o…
PremSOMISH Feb 3, 2021
958bf4b
removing null address check for feed address in addNewCurrency
PremSOMISH Feb 3, 2021
6dbb9d6
Handeling getAssetPriceUSD(), calculateOptionRange() if feed address …
PremSOMISH Feb 3, 2021
8dec362
Reduced contract size
udkreddySomish Feb 4, 2021
1b5e35d
Replicated test case for option pricing for manual feed
PremSOMISH Feb 4, 2021
b9fc4e9
Removed marketTotalTokenStaked and using getTotalAssetsStaked() instead
PremSOMISH Feb 5, 2021
0334418
Minor Fixes and optimisations
udkreddySomish Feb 5, 2021
648c123
Updated testcases
udkreddySomish Feb 5, 2021
b3e0cdf
Linting changes and some optimizations
PremSOMISH Feb 5, 2021
ae856ed
Minor fixes
udkreddySomish Feb 5, 2021
f7528ba
Allocate fee for market creator in prediction amount instead of rewar…
udkreddySomish Feb 5, 2021
d795785
Merge branch 'v2-singleCurrencyMarket' of https://github.com/somish/P…
udkreddySomish Feb 5, 2021
79166b3
Implemented EIP 712 in all contracts following MetaTx
PremSOMISH Feb 5, 2021
345359c
Merge pull request #1 from somish/Implement-EIP712
PremSOMISH Feb 6, 2021
71612d1
Optimised contracts
udkreddySomish Feb 6, 2021
a513188
Fixed testcases
udkreddySomish Feb 6, 2021
6bdf9f7
Fixed fee deduction
udkreddySomish Feb 9, 2021
e22b300
Added fee params in MarketResult event
udkreddySomish Feb 9, 2021
56f0261
Updated multiplier testcases
udkreddySomish Feb 10, 2021
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
19 changes: 2 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,6 @@ Now, It's time to install the dependencies. Enter the smart-contracts directory
```
npm install
```
Make sure you delete folder `bitcore-lib` from node_modules inside modules `eth-lightwallet` and `bitcore-mnemonic`

We need to compile the contracts before deploying.
```
npm run compile
```
Now, You should start a private network on port 8545 using Ganache or something similar. To run the private network - </br>
On Windows, Execute file startGanache.bat present in smart-contracts/scripts directory </br>
On Linux or Mac OS Systems, run the startGanache.sh file while in smart-contracts/scripts directory
```
./startGanache.sh
```

Then, you can deploy Plotx contracts using the migrate script.
```
npm run deploy
```
If you want, you can run the test cases using
```
npm run test
Expand All @@ -59,6 +42,8 @@ npm run coverage
- PLOT Token: 0x72F020f8f3E8fd9382705723Cd26380f8D0c66Bb
- Master: 0x03c41c5Aff6D541EF7D4c51c8B2E32a5d4427275
- MarketRegistry: 0xE210330d6768030e816d223836335079C7A0c851
- AllMarkets: 0xb9448E3a0d95cFF578F9508084A0ed92D724c29A
- MarketCreationRewards: 0x22376814188De44e8B6f482daa98B050ac190B46
- MarketUtility: 0x2330058D49fA61D5C5405fA8B17fcD823c59F7Bb
- Governance: 0x16763F192d529B420F33B699dC72F39f16620717
- ProposalCategory: 0x2D90743ef134b35cE415855F1c38ca47d65b314C
Expand Down
6 changes: 3 additions & 3 deletions contracts/Airdrop.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.5.7;

import "./PlotXToken.sol";
import "./interfaces/IToken.sol";
import "./external/openzeppelin-solidity/math/SafeMath.sol";
import "./external/openzeppelin-solidity/token/ERC20/ERC20.sol";

Expand All @@ -12,7 +12,7 @@ contract Airdrop {

using SafeMath for uint256;
IbLOTToken bLotToken;
PlotXToken public plotToken;
IToken public plotToken;
address public owner;
uint public endDate;
uint public remainingbudget;
Expand Down Expand Up @@ -43,7 +43,7 @@ contract Airdrop {
require(_plotToken != address(0),"Can not be null address");
require(_bLotToken != address(0),"Can not be null address");
require(_endDate > now,"End date can not be past time");
plotToken = PlotXToken(_plotToken);
plotToken = IToken(_plotToken);
bLotToken = IbLOTToken(_bLotToken);
owner = msg.sender;
endDate = _endDate;
Expand Down
Loading