Amm liquidity pool #256

danijelthales · 2023-01-17T09:42:38Z

Release steps:

Pause amm and parlay amm trading -- done
Turn off sport exerciser bot. --done
Deploy Liquidity pool and Liquidity Pool mastercopy -- done
Set onlyWhitelistedStakers allowed in LiquidityPool -- done
Set mastercopy in liquidity pool -- done
Deploy new AMM Utils -- done
Upgrade SportsAMM -- done
upgrade odds obtainer -- done
upgrade consumer -- done
Set new utils in SportsAMM -- done
Set LiquidityPool in SportsAMM -- done
Set staking and staking multiplier in LPPool -- done
Makes sure that round length is 7 days in LPPool -- done
Deploy default liquidity provider contract and seed it with sUSD -- done
add LP contract to whitelisted vaults in staking thales so it can update volume -- done
send all options and sUSD out of Amm contract to EOA -- done
deposit at least 100k from a treasury EOA or directly from treasury -- done
Upgrade staking contract -- done
Set LP address in staking contract -- done
configure new fee variables (SB, min_spread and parlayAMM pays SportsAMM) -- done
set pDAO as owner of LP pool contract -- done
start pool -- done
unpause and run final test -- done
implement a new bot that calls exercise on LP pool whenever there are markets to exerise

… amm-liquidity-pool # Conflicts: # contracts/SportMarkets/SportsAMM.sol

… amm-liquidity-pool # Conflicts: # test/contracts/SportMarkets/SportsAMMDiscounts2.js # test/contracts/SportMarkets/SportsAMMDiscounts3.js

… amm-liquidity-pool

danijelthales · 2023-01-17T09:53:32Z

https://github.com/thales-markets/thales-improvement-proposals/blob/main/TIPs/TIP-99.md

codecov · 2023-01-17T10:23:19Z

Codecov Report

Patch coverage: 80.98% and project coverage change: -0.65 ⚠️

Comparison is base (1c2ca46) 85.66% compared to head (ec5adac) 85.02%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #256      +/-   ##
==========================================
- Coverage   85.66%   85.02%   -0.65%     
==========================================
  Files          71       74       +3     
  Lines        2163     2203      +40     
  Branches     1092     1115      +23     
==========================================
+ Hits         1853     1873      +20     
- Misses        310      330      +20

Impacted Files	Coverage Δ
contracts/AMM/SafeBox.sol	`100.00% <ø> (ø)`
...Markets/LiquidityPool/DefaultLiquidityProvider.sol	`0.00% <0.00%> (ø)`
contracts/SportMarkets/Parlay/ParlayMarketsAMM.sol	`98.52% <ø> (+1.26%)`	⬆️
contracts/SportMarkets/Parlay/ParlayVerifier.sol	`96.66% <ø> (ø)`
...tracts/SportMarkets/Rundown/TherundownConsumer.sol	`99.00% <ø> (ø)`
contracts/EscrowAndStaking/StakingThales.sol	`86.20% <66.66%> (-0.64%)`	⬇️
...ntracts/SportMarkets/Rundown/GamesOddsObtainer.sol	`89.06% <78.57%> (-1.08%)`	⬇️
...ortMarkets/LiquidityPool/SportAMMLiquidityPool.sol	`80.41% <80.41%> (ø)`
contracts/SportMarkets/SportsAMM.sol	`92.59% <86.95%> (+3.50%)`	⬆️
contracts/SportMarkets/SportsAMMUtils.sol	`84.78% <88.88%> (-7.33%)`	⬇️
... and 6 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

kirilaa · 2023-01-18T16:54:46Z

contracts/SportMarkets/LiquidityPool/AMMLiquidityPool.sol

+
+    /// @notice Deposit funds from user into pool for the next round
+    /// @param amount Value to be deposited
+    function deposit(uint amount) external canDeposit(amount) nonReentrant whenNotPaused {


although is cleaner, modifier used only once might produce higher contract size

Its a reused approach from the vaults code

kirilaa

Seems good to me.
There is also a room for the borrowing staked amount.

… amm-liquidity-pool # Conflicts: # contracts/SportMarkets/SportsAMM.sol

The base branch was changed.

# Conflicts: # .openzeppelin/unknown-420.json # contracts/EscrowAndStaking/StakingThales.sol

…tract

hinkypunks · 2023-03-03T11:52:09Z

contracts/SportMarkets/LiquidityPool/SportAMMLiquidityPool.sol

+    /// @notice Return the end time of the passed round
+    /// @param round number
+    /// @return uint the end time of the given round
+    function getRoundEndTime(uint round) public view returns (uint) {


Change to uint _round since round is a state variable.

hinkypunks · 2023-03-03T11:52:11Z

contracts/SportMarkets/LiquidityPool/SportAMMLiquidityPool.sol

+    /// @notice Return the start time of the passed round
+    /// @param round number
+    /// @return uint the start time of the given round
+    function getRoundStartTime(uint round) public view returns (uint) {


Change to uint _round since round is a state variable

hinkypunks · 2023-03-03T11:52:21Z

contracts/SportMarkets/LiquidityPool/SportAMMLiquidityPool.sol

+            );
+        }
+
+        uint nextRound = round + 1;


Unused variable, delete if not needed.

grujawork · 2023-03-03T12:15:15Z

contracts/SportMarkets/LiquidityPool/SportAMMLiquidityPoolRound.sol

+        uint _roundStartTime,
+        uint _roundEndTime
+    ) external {
+        require(!initialized, "Ranged Market already initialized");


grujawork · 2023-03-03T12:40:24Z

contracts/SportMarkets/LiquidityPool/SportAMMLiquidityPool.sol

+    /// @param sUSDAmount amount to get for mint
+    function commitTrade(address market, uint sUSDAmount) external nonReentrant whenNotPaused onlyAMM {
+        require(started, "Pool has not started");
+        require(sUSDAmount > 0, "Can't commit a zero trade");


add require ! zero address for market market

i know it will fail due to ISportPositionalMarket marketContract = ISportPositionalMarket(market); in getMarketRound

There is trust assumed as onlyAMM can call it

grujawork · 2023-03-03T12:46:39Z

contracts/SportMarkets/LiquidityPool/SportAMMLiquidityPool.sol

+    /* ========== STATE VARIABLES ========== */
+
+    ISportsAMM public sportsAMM;
+    IERC20Upgradeable public sUSD;


we are only using sUSD? and on ARBI it is USDC right? 1e18 both? if not that case was covered right?

I think there isnt much work to support USDC, I'll try to implement it

Added USDC support

refactor obtainer to use normalized odds from storage also resize contract

danijelthales added 23 commits December 23, 2022 22:55

get this rolling

5803cd9

store progress

fcbd244

store before merge

1af24c4

store progress

f904c95

store progress

8af23de

store progress

86f8003

fix regression tests

b656014

fix regression tests

d19d813

Merge remote-tracking branch 'origin/feat/double-chance-markets' into…

cbc91a5

… amm-liquidity-pool # Conflicts: # contracts/SportMarkets/SportsAMM.sol

prep fix tests

d5b262f

store progress

c52eef4

remove redundant tests

240b045

fix test

b3bd81c

fix test

bf3bf5e

fix test

e015861

fix test

e5bce81

Merge remote-tracking branch 'origin/feat/double-chance-markets' into…

053bdfc

… amm-liquidity-pool # Conflicts: # test/contracts/SportMarkets/SportsAMMDiscounts2.js # test/contracts/SportMarkets/SportsAMMDiscounts3.js

reduce contract size

5b24af3

fix tests

8e78e6f

added more test logic

6582864

test fix

cf4d12c

Merge remote-tracking branch 'origin/feat/double-chance-markets' into…

cd6c005

… amm-liquidity-pool

added tests for stakingThales rules in Overtime LP

febd545

grujawork assigned danijelthales Jan 17, 2023

grujawork added the overtime label Jan 17, 2023

kirilaa reviewed Jan 18, 2023

View reviewed changes

kirilaa previously approved these changes Jan 18, 2023

View reviewed changes

Merge remote-tracking branch 'origin/feat/double-chance-markets' into…

385b046

… amm-liquidity-pool # Conflicts: # contracts/SportMarkets/SportsAMM.sol

danijelthales added 6 commits February 23, 2023 20:03

fix double chance commit trade

64099cd

dont send zero balances

2b99cd6

ensure even double chance markets are exercised well

a272b8a

block unstake if user is in LP

a9339c3

fix tests

36048fb

fix tests

2a2b0f4

danijelthales changed the base branch from feat/double-chance-markets to main February 27, 2023 13:18

danijelthales and others added 11 commits February 28, 2023 00:24

fix for isUserLPing method

a127806

prep merge

c21113d

Merge branch 'main' into amm-liquidity-pool

d6faa43

# Conflicts: # .openzeppelin/unknown-420.json # contracts/EscrowAndStaking/StakingThales.sol

multiply min_spread by 1.5 for 2 positional sports

6dd2f64

fix test

ae66767

fix tests

48829cd

added logic to only allowed whitelisted stakers for the release

daad703

added tests for new functionality

8fe5d87

typos

1f91f5b

upgrade contracts

1525b54

refactor obtainer to use normalized odds from storage also resize con…

8433e4c

…tract

hinkypunks reviewed Mar 3, 2023

View reviewed changes

grujawork reviewed Mar 3, 2023

View reviewed changes

danijelthales added 4 commits March 3, 2023 17:46

Merge pull request #290 from thales-markets/normalized_odds_change

557fee4

refactor obtainer to use normalized odds from storage also resize contract

add USDC support

dbaa7d2

new deployments

5758af4

prep release

ec5adac

grujawork approved these changes Mar 7, 2023

View reviewed changes

grujawork merged commit 9a57a1f into main Mar 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Amm liquidity pool #256

Amm liquidity pool #256

danijelthales commented Jan 17, 2023 •

edited

Loading

danijelthales commented Jan 17, 2023

codecov bot commented Jan 17, 2023 •

edited

Loading

kirilaa Jan 18, 2023

danijelthales Feb 20, 2023

kirilaa left a comment

hinkypunks Mar 3, 2023

danijelthales Mar 3, 2023

hinkypunks Mar 3, 2023

danijelthales Mar 3, 2023

hinkypunks Mar 3, 2023

danijelthales Mar 3, 2023

grujawork Mar 3, 2023

danijelthales Mar 3, 2023

grujawork Mar 3, 2023

danijelthales Mar 3, 2023

grujawork Mar 3, 2023

danijelthales Mar 3, 2023

danijelthales Mar 3, 2023

Amm liquidity pool #256

Amm liquidity pool #256

Conversation

danijelthales commented Jan 17, 2023 • edited Loading

danijelthales commented Jan 17, 2023

codecov bot commented Jan 17, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kirilaa left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danijelthales commented Jan 17, 2023 •

edited

Loading

codecov bot commented Jan 17, 2023 •

edited

Loading