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

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

Conversation

piobab
Copy link
Contributor

@piobab piobab commented Jul 2, 2024

No description provided.

bobthebuidlr and others added 30 commits April 23, 2024 13:39
@bobthebuidlr
v2 market(s) query: add underlying collateral and debt
24856bb
@bobthebuidlr
update schema and typescript types
7f70c73
@bobthebuidlr
marketv2: update utilization rate + new pagination
dbd5062
@bobthebuidlr
update tests
a371d8e
@bobthebuidlr
rebase on master + generate types
d564ee6
@piobab
MP-2365. Acc creation if not created (#373)
ca3695f 
* Acc creation in update credit account msg.

* Create new account in  msg.

* Update schema.
@bobthebuidlr
add account_kind to CM (tests not done)
49b887c
@bobthebuidlr
rename MarketV2 fields, solidify tests
7ad65d6
@bobthebuidlr
update types
de50cb6
@bobthebuidlr
Merge pull request #360 from mars-protocol/mp-2187-add-underlyingliqu…
27bd88f 
…idity-and-underlyingdebt-into-the-markets

v2 market(s) query: add underlying collateral and debt
@piobab
MP-2342. Pricing xyk lp (#374)
2c785af 
* 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
MP-1975. Remove uncollateralized limit (#372)
1f5b383 
* Remove credit lines.

* Fix test builds.

* Fix tests.

* Update schema.

* Remove unused errors.

* Update liquidation test cases.

* Return better errors.

* Bump cosmwasm std.
@bobthebuidlr
update tests
3ba1174
@bobthebuidlr
generate types
a07365c
@bobthebuidlr
Merge pull request #377 from mars-protocol/mp-2185-combine-accountkin…
af0ce13 
…d-into-positions

Mp 2185 combine accountkind into positions
@bobthebuidlr
add all_total_deposits_v2
fafa093
@bobthebuidlr
rebase on dev
a6fefaa
@bobthebuidlr
updated types
cbef0ab
@bobthebuidlr
Merge pull request #378 from mars-protocol/mp-2186-enable-pagination-…
3c3b295 
…for-totaldeposit-or-combine-with

add `all_total_deposits_v2`
@piobab
MP-2341. Astro zapper (#376)
748f846 
* 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 @bobthebuidlr
MP-2371. Trade any asset (#381)
a6c1980 
* 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
MP-2364. Migration (#379)
f68e9fe 
* AP migration.

* Update ntrn migration.

* Incentives migration.

* Swapper migration.

* Fix migration.

* Remove unused config from incentives.

* Update schema.
@piobab
MP-2390. Account custom token (#383)
c9a4e5c 
* 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
MP-2381. Fund manager acc (#384)
e71a2ef 
* 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
Fix test case for at least one letter in token_id. (#386)
90c382e
@bobthebuidlr
add PCL pricing
a21cfb9
@bobthebuidlr
generate types
d97feff
@bobthebuidlr
move pcl to wasm, denominate in usd, add test
680e31b
@bobthebuidlr
take decimals into account
e9f201a
@bobthebuidlr
take decimals into account
4fdecdf
piobab and others added 24 commits June 3, 2024 18:04
@piobab
MP-2385. Vault performance fee (#393)
9ee7d28 
* 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
Fix astro deps in incentives. (#395)
96715dd
@piobab
General cleanup (#398)
9572675 
* Clean fixme.

* Bump JS deps.

* Fix deployment.

* Bump cw deps.
@markonmars @piobab
Mp 2347 integrate astro staking into credit manager (#394)
1fb38b1 
* 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]>
@piobab
Astro LP liquidation. (#397)
5ed5673 
* Astro LP liquidation.

* StakedLp liquidation test cases.

* Review comments.

* Rename to staked_astro_lps.

* Update schema.
@bobthebuidlr
remove example-react and add new collaborators (#401)
cccd636
@piobab
Vault improvements (#400)
cfcca53 
* Remove unused code.

* Query for vault bindings.

* Code reorganization.

* Naming consistency.

* Perf fee naming cleanup.

* Update schema.

* Update schema.
@piobab
Merge master -> dev.
9bc664b
@piobab
Bump rust version.
d365dd1
@piobab
Update deployment on pion.
204ea96
@piobab
Merge pull request #402 from mars-protocol/merge-master
3d59ad3 
Merge master to dev. Bump rust. New pion deployment.
@piobab
Update pion 1 deployment (#404)
a416593 
* 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
Improve vault unlocks (#405)
cf750ee 
* Update unlocks state key.

* Update test cases.

* Update schema.

* Update comment.
@piobab
Fix Oak no. 1 - liquidatees staking rewards. (#410)
266122a 
* Fix Oak no. 1 - liquidatees staking rewards.

* Ignore audit warn.

* Remove file.
@markonmars
Fix Oak no. 2 - incorrect LP total state accounting (#411)
247c9fc 
* fix: incorrectly adding to lp amount rather than subtracting

* improvements
@piobab
Query addresses from CM. (#414)
269b3db
@piobab
Fix Oak 11 13 15 17 (#415)
906f99b 
* Oak 11 - add consistency to type conversion.

* Oak 13 - fix comment.

* Oak 15 - unnecessary addr lookup.

* Oak 17 - remove redundant code.
@markonmars
Fix Oak no. 3 - stake lp when no existing position (#412)
1737ca7 
* fix: handle staking when no lp has yet been staked

* improve comments

* improve test
@markonmars
Fix Oak no. 6 - incorrect Unstake exact LP (#413)
47b271e 
* fix: unstake exact

* naming
@bobthebuidlr
fix issues oak audit no 16 (#417)
500a75f
@piobab
Allow to send more vault for redeem (refund later). Fix naming in eve…
6d8fad1 
…nts etc. (#418)
@piobab
MP-2435. Keep claimed rewards in the account (#406)
2ca10f6 
* 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
MP-2448. Astro lp deposit cap (#409)
cfbecdd 
* 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.
@markonmars @piobab
add staked lp to prop tests (#416)
52b1488 
* add staked lp to prop tests

* add astro_lp_coin generation to prop tests

* Format

---------

Co-authored-by: piobab <[email protected]>
@piobab piobab merged commit 0499bb9 into master Jul 2, 2024
5 checks passed
@piobab piobab deleted the dev branch August 21, 2024 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobthebuidlr bobthebuidlr bobthebuidlr approved these changes

@markonmars markonmars markonmars approved these changes

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
@piobab @bobthebuidlr @markonmars