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

Amm liquidity pool #256

Merged
merged 78 commits into from
Mar 7, 2023
Merged

Amm liquidity pool #256

merged 78 commits into from
Mar 7, 2023

Commits on Dec 23, 2022

  1. get this rolling

    @danijelthales
    danijelthales committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    5803cd9 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2022

  1. store progress

    @danijelthales
    danijelthales committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    fcbd244 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2022

  1. store before merge

    @danijelthales
    danijelthales committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    1af24c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2022

  1. store progress

    @danijelthales
    danijelthales committed Dec 31, 2022
    Configuration menu
    Copy the full SHA
    f904c95 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. store progress

    @danijelthales
    danijelthales committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    8af23de View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. store progress

    @danijelthales
    danijelthales committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    86f8003 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. fix regression tests

    @danijelthales
    danijelthales committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    b656014 View commit details
    Browse the repository at this point in the history

  2. fix regression tests

    @danijelthales
    danijelthales committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    d19d813 View commit details
    Browse the repository at this point in the history

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

    … amm-liquidity-pool

# Conflicts:
#	contracts/SportMarkets/SportsAMM.sol
    @danijelthales
    danijelthales committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    cbc91a5 View commit details
    Browse the repository at this point in the history

  4. prep fix tests

    @danijelthales
    danijelthales committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    d5b262f View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. store progress

    @danijelthales
    danijelthales committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    c52eef4 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. remove redundant tests

    @danijelthales
    danijelthales committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    240b045 View commit details
    Browse the repository at this point in the history

  2. fix test

    @danijelthales
    danijelthales committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    b3bd81c View commit details
    Browse the repository at this point in the history

  3. fix test

    @danijelthales
    danijelthales committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    bf3bf5e View commit details
    Browse the repository at this point in the history

  4. fix test

    @danijelthales
    danijelthales committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    e015861 View commit details
    Browse the repository at this point in the history

  5. fix test

    @danijelthales
    danijelthales committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    e5bce81 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2023

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

    … amm-liquidity-pool

# Conflicts:
#	test/contracts/SportMarkets/SportsAMMDiscounts2.js
#	test/contracts/SportMarkets/SportsAMMDiscounts3.js
    @danijelthales
    danijelthales committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    053bdfc View commit details
    Browse the repository at this point in the history

  2. reduce contract size

    @danijelthales
    danijelthales committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    5b24af3 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. fix tests

    @danijelthales
    danijelthales committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    8e78e6f View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. added more test logic

    @danijelthales
    danijelthales committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    6582864 View commit details
    Browse the repository at this point in the history

  2. test fix

    @danijelthales
    danijelthales committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    cf4d12c View commit details
    Browse the repository at this point in the history

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

    … amm-liquidity-pool
    @danijelthales
    danijelthales committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    cd6c005 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. added tests for stakingThales rules in Overtime LP

    @danijelthales
    danijelthales committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    febd545 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

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

    … amm-liquidity-pool

# Conflicts:
#	contracts/SportMarkets/SportsAMM.sol
    @danijelthales
    danijelthales committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    385b046 View commit details
    Browse the repository at this point in the history

  2. buy the other side in the test

    @danijelthales
    danijelthales committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    1940b32 View commit details
    Browse the repository at this point in the history

  3. exercise made public so it can be called during the round to reduce g… 

    …as usage on closing
    @danijelthales
    danijelthales committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    391987a View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. fix tests

    @danijelthales
    danijelthales committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    2cb103b View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. setup main version for the merge, then add new code manually

    @danijelthales
    danijelthales committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    b115a59 View commit details
    Browse the repository at this point in the history

  2. setup main version for the merge, then add new code manually

    @danijelthales
    danijelthales committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    6cc22f4 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. return old code

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    f5da563 View commit details
    Browse the repository at this point in the history

  2. prep merge

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    ddd8ab2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into amm-liquidity-pool 

    # Conflicts:
#	contracts/interfaces/ISportsAMM.sol
#	scripts/abi/ISportsAMM.json
    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    53fa3f4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'arbitrum-deployments' into amm-liquidity-pool

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    83ba27b View commit details
    Browse the repository at this point in the history

  5. reduce contract size

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    d8691af View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/main' into amm-liquidity-pool

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    b5aa51a View commit details
    Browse the repository at this point in the history

  7. fix some tests

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    baf3fe5 View commit details
    Browse the repository at this point in the history

  8. fix some tests

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    40d6bdf View commit details
    Browse the repository at this point in the history

  9. fixed arbi related overtime tests

    @danijelthales
    danijelthales committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    d41e08f View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Merge remote-tracking branch 'origin/main' into amm-liquidity-pool

    @danijelthales
    danijelthales committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    66c6799 View commit details
    Browse the repository at this point in the history

  2. decouple tests

    @danijelthales
    danijelthales committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    9117311 View commit details
    Browse the repository at this point in the history

  3. decouple tests

    @danijelthales
    danijelthales committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    148f5ed View commit details
    Browse the repository at this point in the history

  4. revert

    @danijelthales
    danijelthales committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    2a18665 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. test fix

    @danijelthales
    danijelthales committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    56aa350 View commit details
    Browse the repository at this point in the history

  2. rename to SportsAMMLiquidityPool

    @danijelthales
    danijelthales committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    b5a5212 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into amm-liquidity-pool

    @danijelthales
    danijelthales committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    85f658a View commit details
    Browse the repository at this point in the history

  4. deploy scripts and deployed on goerli

    @danijelthales
    danijelthales committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    53250bf View commit details
    Browse the repository at this point in the history

  5. new goerli staking impl and fix tests

    @danijelthales
    danijelthales committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    b5ed263 View commit details
    Browse the repository at this point in the history

  6. fix test

    @danijelthales
    danijelthales committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    2d2e929 View commit details
    Browse the repository at this point in the history

  7. fix test

    @danijelthales
    danijelthales committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    11c4826 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. add convenience methods for deposit/withdraw

    @danijelthales
    danijelthales committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    339e102 View commit details
    Browse the repository at this point in the history

  2. add convenience methods for deposit/withdraw

    @danijelthales
    danijelthales committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    4b0c0cb View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. new upgrade

    @danijelthales
    danijelthales committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    2d1828b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into amm-liquidity-pool

    @danijelthales
    danijelthales committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    4830cfa View commit details
    Browse the repository at this point in the history

  3. added default liquidity provider as a contract

    @danijelthales
    danijelthales committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    6057677 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. upgrade

    @danijelthales
    danijelthales committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    0255b60 View commit details
    Browse the repository at this point in the history

  2. fix for sUSD logic and a new deployment

    @danijelthales
    danijelthales committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    e977def View commit details
    Browse the repository at this point in the history

  3. fix tests

    @danijelthales
    danijelthales committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    5b5a3a8 View commit details
    Browse the repository at this point in the history

  4. fix double chance commit trade

    @danijelthales
    danijelthales committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    64099cd View commit details
    Browse the repository at this point in the history

  5. dont send zero balances

    @danijelthales
    danijelthales committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    2b99cd6 View commit details
    Browse the repository at this point in the history

  6. ensure even double chance markets are exercised well

    @danijelthales
    danijelthales committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    a272b8a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. block unstake if user is in LP

    @danijelthales
    danijelthales committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    a9339c3 View commit details
    Browse the repository at this point in the history

  2. fix tests

    @danijelthales
    danijelthales committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    36048fb View commit details
    Browse the repository at this point in the history

  3. fix tests

    @danijelthales
    danijelthales committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    2a2b0f4 View commit details
    Browse the repository at this point in the history

  4. fix for isUserLPing method

    @danijelthales
    danijelthales committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    a127806 View commit details
    Browse the repository at this point in the history

  5. prep merge

    @danijelthales
    danijelthales committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    c21113d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into amm-liquidity-pool 

    # Conflicts:
#	.openzeppelin/unknown-420.json
#	contracts/EscrowAndStaking/StakingThales.sol
    @danijelthales
    danijelthales committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    d6faa43 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. multiply min_spread by 1.5 for 2 positional sports

    @danijelthales
    danijelthales committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    6dd2f64 View commit details
    Browse the repository at this point in the history

  2. fix test

    @danijelthales
    danijelthales committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    ae66767 View commit details
    Browse the repository at this point in the history

  3. fix tests

    @danijelthales
    danijelthales committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    48829cd View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. added logic to only allowed whitelisted stakers for the release

    @danijelthales
    danijelthales committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    daad703 View commit details
    Browse the repository at this point in the history

  2. added tests for new functionality

    @danijelthales
    danijelthales committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    8fe5d87 View commit details
    Browse the repository at this point in the history

  3. typos

    @danijelthales
    danijelthales committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    1f91f5b View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. upgrade contracts

    @danijelthales
    danijelthales committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    1525b54 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

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

    …tract
    @grujawork
    grujawork committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    8433e4c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #290 from thales-markets/normalized_odds_change 

    refactor obtainer to use normalized odds from storage also resize contract
    @danijelthales
    danijelthales committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    557fee4 View commit details
    Browse the repository at this point in the history

  3. add USDC support

    @danijelthales
    danijelthales committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    dbaa7d2 View commit details
    Browse the repository at this point in the history

  4. new deployments

    @danijelthales
    danijelthales committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    5758af4 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. prep release

    @danijelthales
    danijelthales committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    ec5adac View commit details
    Browse the repository at this point in the history