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

Mars v2 ntrn release #420

Merged
merged 62 commits into from
Jul 2, 2024
Merged

Mars v2 ntrn release #420

merged 62 commits into from
Jul 2, 2024

Commits on Apr 23, 2024

  1. Configuration menu
    Copy the full SHA
    24856bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7f70c73 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dbd5062 View commit details
    Browse the repository at this point in the history
  4. update tests

    bobthebuidlr committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a371d8e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d564ee6 View commit details
    Browse the repository at this point in the history
  6. MP-2365. Acc creation if not created (#373)

    * Acc creation in update credit account msg.
    
    * Create new account in  msg.
    
    * Update schema.
    piobab authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    ca3695f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    49b887c View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Configuration menu
    Copy the full SHA
    7ad65d6 View commit details
    Browse the repository at this point in the history
  2. update types

    bobthebuidlr committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    de50cb6 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #360 from mars-protocol/mp-2187-add-underlyingliqu…

    …idity-and-underlyingdebt-into-the-markets
    
    v2 market(s) query: add underlying collateral and debt
    bobthebuidlr authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    27bd88f View commit details
    Browse the repository at this point in the history
  4. MP-2342. Pricing xyk lp (#374)

    * Add xyk lp pricing for astro.
    
    * Init test cases for astro xyk.
    
    * Update xyk lp test cases.
    
    * Move xyk pricing to common file.
    
    * Update schema.
    
    * Rename package.
    
    * Remove duplicated comments.
    piobab authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    2c785af View commit details
    Browse the repository at this point in the history
  5. MP-1975. Remove uncollateralized limit (#372)

    * Remove credit lines.
    
    * Fix test builds.
    
    * Fix tests.
    
    * Update schema.
    
    * Remove unused errors.
    
    * Update liquidation test cases.
    
    * Return better errors.
    
    * Bump cosmwasm std.
    piobab authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    1f5b383 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. update tests

    bobthebuidlr committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    3ba1174 View commit details
    Browse the repository at this point in the history
  2. generate types

    bobthebuidlr committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    a07365c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #377 from mars-protocol/mp-2185-combine-accountkin…

    …d-into-positions
    
    Mp 2185 combine accountkind into positions
    bobthebuidlr authored Apr 25, 2024
    Configuration menu
    Copy the full SHA
    af0ce13 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Configuration menu
    Copy the full SHA
    fafa093 View commit details
    Browse the repository at this point in the history
  2. rebase on dev

    bobthebuidlr committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a6fefaa View commit details
    Browse the repository at this point in the history
  3. updated types

    bobthebuidlr committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    cbef0ab View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Merge pull request #378 from mars-protocol/mp-2186-enable-pagination-…

    …for-totaldeposit-or-combine-with
    
    add `all_total_deposits_v2`
    bobthebuidlr authored May 1, 2024
    Configuration menu
    Copy the full SHA
    3c3b295 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. MP-2341. Astro zapper (#376)

    * Init astro zapper.
    
    * Clean up CW20.
    
    * Pass astro params to zapper.
    
    * Use Astro token factory version.
    
    * Use Astro pools.
    
    * Rename zapper.
    
    * Fix tests.
    
    * Bump astro rc release. Make build happy.
    
    * Fix todo.
    
    * Extract pair addr from lp denom.
    
    * Remove custom astro params for zapper.
    piobab authored May 9, 2024
    Configuration menu
    Copy the full SHA
    748f846 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. MP-2371. Trade any asset (#381)

    * Allow to deposit and swap any asset.
    
    * Update Health computer to allow not whitelisted/supported assets.
    
    * Update schema.
    
    * Fix test.
    
    * Update contracts/credit-manager/tests/tests/test_deposit.rs
    
    Co-authored-by: Bob van der Helm <[email protected]>
    
    * Update contracts/health/tests/tests/test_health_values.rs
    
    Co-authored-by: Bob van der Helm <[email protected]>
    
    * Review comment.
    
    ---------
    
    Co-authored-by: Bob van der Helm <[email protected]>
    piobab and bobthebuidlr authored May 13, 2024
    Configuration menu
    Copy the full SHA
    a6c1980 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. MP-2364. Migration (#379)

    * AP migration.
    
    * Update ntrn migration.
    
    * Incentives migration.
    
    * Swapper migration.
    
    * Fix migration.
    
    * Remove unused config from incentives.
    
    * Update schema.
    piobab authored May 14, 2024
    Configuration menu
    Copy the full SHA
    f68e9fe View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. MP-2390. Account custom token (#383)

    * Use custom token_id for new NFT.
    
    * Add test cases for account-nft.
    
    * CM test cases for new type of account create.
    
    * Update schema.
    
    * Don't overlap with automatically generated token_id.
    piobab authored May 21, 2024
    Configuration menu
    Copy the full SHA
    c9a4e5c View commit details
    Browse the repository at this point in the history
  2. MP-2381. Fund manager acc (#384)

    * Add FundManager account.
    
    * Extract function.
    
    * Add validate for fund manager vault addr.
    
    * Add tests.
    
    * Extend test cases for fund manager.
    
    * Update schema.
    
    * Add test for unauthorized addr. Fix clippy.
    
    * Cover FundManager account in health scenarios.
    piobab authored May 21, 2024
    Configuration menu
    Copy the full SHA
    e71a2ef View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    90c382e View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. add PCL pricing

    bobthebuidlr committed May 24, 2024
    Configuration menu
    Copy the full SHA
    a21cfb9 View commit details
    Browse the repository at this point in the history
  2. generate types

    bobthebuidlr committed May 24, 2024
    Configuration menu
    Copy the full SHA
    d97feff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    680e31b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e9f201a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4fdecdf View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Configuration menu
    Copy the full SHA
    5eb3464 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Configuration menu
    Copy the full SHA
    faae879 View commit details
    Browse the repository at this point in the history
  2. MP-2382. Managed vault (#388)

    * Init vault logic.
    
    * Vault init tests with TF.
    
    * Extract TokenFactory module for multitest.
    
    * Modify test setup in CM with managed vault.
    
    * Initialize vault test case.
    
    * Bind credit manager acc to vault.
    
    * Deposit test cases.
    
    * Withdraw to wallet support.
    
    * Redeem test cases.
    
    * Update schema.
    
    * Review comments.
    
    * Review comments.
    piobab authored May 28, 2024
    Configuration menu
    Copy the full SHA
    2bcae96 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #382 from mars-protocol/mp-2344-pricing-astro-pcl-…

    …lp-pools
    
    add PCL pricing
    bobthebuidlr authored May 28, 2024
    Configuration menu
    Copy the full SHA
    9c0d2da View commit details
    Browse the repository at this point in the history
  4. Reorganize tests (#390)

    * Extract CM test helpers.
    
    * Move vault tests.
    
    * Organize vault tests cases.
    
    * Remove unused deps.
    piobab authored May 28, 2024
    Configuration menu
    Copy the full SHA
    08863b0 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. added stableswap pricing (#392)

    * added stableswap pricing
    
    * added comments, small code improvements
    bobthebuidlr authored May 30, 2024
    Configuration menu
    Copy the full SHA
    38d16ec View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. MP-2384. Withdraw from vault (#391)

    * Unlock init.
    
    * Add borrow action if not enough funds to withdraw.
    
    * Missing Cargo update.
    
    * Fix tests.
    
    * Unlock test cases.
    
    * Redeem with unlocks test cases.
    
    * Redeem success test case.
    
    * Improve test.
    
    * Use only fund account amounts.
    
    * Update schema.
    piobab authored May 31, 2024
    Configuration menu
    Copy the full SHA
    79a949f View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Integrate Astroport LP incentives into mars LP positions (#385)

    * feat: stake lp in astroport incentives
    
    * tidy
    
    * move mars / astroport incentives to individual files
    
    * correctly add files for previous commit
    
    * fmt
    
    * fix tests
    
    * add missing import
    
    * don't swallow errors, update naming
    
    * update credit_manager assertion
    
    * use action coin, fix accounting error, add pagination query
    
    * linting
    
    * fix merge
    
    * fix imports
    markonmars authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    01013f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. MP-2385. Vault performance fee (#393)

    * Init perf fee impl.
    
    * Withdraw perf fee.
    
    * Performance fee tests.
    
    * Compare with perf state.
    
    * Use new perf fee after withdraw.
    
    * Add spreadsheet with perf fee scenarios.
    
    * Perf fee withdraw errors tests.
    
    * Update test to check if fee is applied every 1h.
    
    * Validate perf fee config.
    
    * Cleanup.
    
    * Update schema.
    
    * Don't subtract mgmt fee when deposit/redeem.
    
    * Fix comment.
    piobab authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9ee7d28 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Configuration menu
    Copy the full SHA
    96715dd View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. General cleanup (#398)

    * Clean fixme.
    
    * Bump JS deps.
    
    * Fix deployment.
    
    * Bump cw deps.
    piobab authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9572675 View commit details
    Browse the repository at this point in the history
  2. Mp 2347 integrate astro staking into credit manager (#394)

    * feat: stake lp in astroport incentives
    
    * tidy
    
    * move mars / astroport incentives to individual files
    
    * correctly add files for previous commit
    
    * fmt
    
    * fix tests
    
    * add missing import
    
    * don't swallow errors, update naming
    
    * update credit_manager assertion
    
    * credit manager astroport incentives implementation
    
    * fix lp rewards query
    
    * Mock astroport incentives dependency
    
    * tidy structure
    
    * astro_lp incentives integration test
    
    * add lp rewards query
    
    * tidy
    
    * additional tests
    
    * fmt
    
    * add cm tests for astro incentives
    
    * Fix astro deps in incentives.
    
    * add rewards recieved to event attributes
    
    * fix - increment not decrement
    
    * error if lp balance lt requested
    
    * improve tests
    
    * fix staking issue
    
    * add unstake tests
    
    * Add staked lp to account collateral
    
    * clippy + fmt
    
    * schema
    
    * fix deps
    
    * add staked lp to positions
    
    * remove redundant code
    
    * improve test coverage
    
    * generate types
    
    * add incentive query tests
    
    * naming
    
    * generate schema
    
    * comments
    
    * add incentives documentation (#399)
    
    * add incentives documentation
    
    * remove todo
    
    * better error handling
    
    * rename files
    
    * add rewards as attribute
    
    * improve naming, attributes on response
    
    * improve test_claim_lp_rewards
    
    * improve test_stake_astro_lp
    
    * improve test_unstake_astro_lp
    
    * improve test_querying
    
    * small fixes and naming
    
    * improve test_astro_lp_incentives
    
    * more naming
    
    * improve tests
    
    * update types
    
    * merge 'dev' into MP-2347-integrate-astro-staking
    
    * updated types
    
    * Reorder in tests.
    
    * Rename claming test case for astro.
    
    ---------
    
    Co-authored-by: piobab <[email protected]>
    markonmars and piobab authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1fb38b1 View commit details
    Browse the repository at this point in the history
  3. Astro LP liquidation. (#397)

    * Astro LP liquidation.
    
    * StakedLp liquidation test cases.
    
    * Review comments.
    
    * Rename to staked_astro_lps.
    
    * Update schema.
    piobab authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    5ed5673 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cccd636 View commit details
    Browse the repository at this point in the history
  5. Vault improvements (#400)

    * Remove unused code.
    
    * Query for vault bindings.
    
    * Code reorganization.
    
    * Naming consistency.
    
    * Perf fee naming cleanup.
    
    * Update schema.
    
    * Update schema.
    piobab authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    cfcca53 View commit details
    Browse the repository at this point in the history
  6. Merge master -> dev.

    piobab committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9bc664b View commit details
    Browse the repository at this point in the history
  7. Bump rust version.

    piobab committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    d365dd1 View commit details
    Browse the repository at this point in the history
  8. Update deployment on pion.

    piobab committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    204ea96 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #402 from mars-protocol/merge-master

    Merge master to dev. Bump rust. New pion deployment.
    piobab authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    3d59ad3 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Update pion 1 deployment (#404)

    * Update pion-1 deployment.
    
    * Add PCL lp config.
    
    * Fixes to deployment.
    
    * Use astro v5 for oracle.
    
    * Use astro v5 for swapper.
    
    * New deployment.
    
    * PCL LP should not be borrowable.
    piobab authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a416593 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Improve vault unlocks (#405)

    * Update unlocks state key.
    
    * Update test cases.
    
    * Update schema.
    
    * Update comment.
    piobab authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    cf750ee View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Fix Oak no. 1 - liquidatees staking rewards. (#410)

    * Fix Oak no. 1 - liquidatees staking rewards.
    
    * Ignore audit warn.
    
    * Remove file.
    piobab authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    266122a View commit details
    Browse the repository at this point in the history
  2. Fix Oak no. 2 - incorrect LP total state accounting (#411)

    * fix: incorrectly adding to lp amount rather than subtracting
    
    * improvements
    markonmars authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    247c9fc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    269b3db View commit details
    Browse the repository at this point in the history
  4. Fix Oak 11 13 15 17 (#415)

    * Oak 11 - add consistency to type conversion.
    
    * Oak 13 - fix comment.
    
    * Oak 15 - unnecessary addr lookup.
    
    * Oak 17 - remove redundant code.
    piobab authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    906f99b View commit details
    Browse the repository at this point in the history
  5. Fix Oak no. 3 - stake lp when no existing position (#412)

    * fix: handle staking when no lp has yet been staked
    
    * improve comments
    
    * improve test
    markonmars authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    1737ca7 View commit details
    Browse the repository at this point in the history
  6. Fix Oak no. 6 - incorrect Unstake exact LP (#413)

    * fix: unstake exact
    
    * naming
    markonmars authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    47b271e View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Configuration menu
    Copy the full SHA
    500a75f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6d8fad1 View commit details
    Browse the repository at this point in the history
  3. MP-2435. Keep claimed rewards in the account (#406)

    * Claim rewards to the account.
    
    * HLS - allow to keep non-correlated deposits.
    
    * Update HLS rule for staked astro lp.
    
    * Update schema.
    
    * Refactor HLS collaterals.
    
    * Review comments.
    
    * Ignore audit warn.
    piobab authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    2ca10f6 View commit details
    Browse the repository at this point in the history
  4. MP-2448. Astro lp deposit cap (#409)

    * Add astroport incentives check for lp deposits.
    
    * Update deposit test case.
    
    * Update paginated deposit cap.
    
    * Update Astro incentives mock contract.
    
    * Provide liquidity deposit cap check.
    
    * Update comment.
    piobab authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    cfbecdd View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. add staked lp to prop tests (#416)

    * add staked lp to prop tests
    
    * add astro_lp_coin generation to prop tests
    
    * Format
    
    ---------
    
    Co-authored-by: piobab <[email protected]>
    markonmars and piobab authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    52b1488 View commit details
    Browse the repository at this point in the history