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

feat(Cellar): add support for multiple positions and multiple assets #38

Merged
merged 73 commits into from
Jul 7, 2022
Merged

feat(Cellar): add support for multiple positions and multiple assets #38

merged 73 commits into from
Jul 7, 2022

Conversation

0xble
Copy link
Contributor

@0xble 0xble commented Jun 17, 2022

Closes #32.

@0xble 0xble linked an issue Jun 17, 2022 that may be closed by this pull request
feat(Cellar): add support for multiple positions and multiple assets #32
Open
0xble and others added 28 commits June 17, 2022 08:36
@0xble
Merge branch 'feat/cellar-architecture' of https://github.com/PeggyJV…
a666f3f 
…/cellar-contracts into feat/multiposition-multiasset
@0xble
feat(Cellar): add ability for enterPosition to handle converting betw…
65e0708 
…een assets
@0xble
perf(Cellar): add an internal getter function to fetch data efficiently
ab1ebcd
@0xble
refactor(Cellar): initialize cellar with positions
e67a354
@0xble
tests(Cellar): update test
f7683f3
@0xble
feat(Cellar): add ability to handle assets of different decimals
a584281
@0xble
build: add chainlink dependency
ab301e3
@0xble
feat(PriceRouter): add price router
8e3d393
@0xble
fix(Cellar): fix stack errors, fix decimal conversions, optimize data…
b923f42 
… fetching
@0xble
refactor(PriceRouter): change getExchangeRate to return data in decim…
4bbb67d 
…als of quote
@0xble
refactor(Cellar): fix pullFromPositions logic
f1792c6
@0xble
feat(Mocks): add mock price router
f01ee46
@0xble
tests(Cellar): add test for withdrawFromPositions
e098b84
@crispymangoes
Merge branch 'main' of https://github.com/PeggyJV/cellar-contracts in…
2d5e083 
…to feat/multiposition-multiasset
@crispymangoes
Merge branch 'main' of https://github.com/PeggyJV/cellar-contracts in…
519e7a9 
…to feat/withdraw-into-single-asset
@crispymangoes
build: change remaining 0.8.13 to 0.8.15
3e1dcb0
@crispymangoes
fix(CellarRouter): withdrawFromPositionsIntoSingleAsset failed compil…
6b80a03 
…ing with stack too deep errors, memory vars removed to fix it
@crispymangoes
test(CellarRouter): add tests to Cellar.t.sol to check that withdrawi…
8be75ad 
…ng form multiple positions into one position works
@crispymangoes
Merge branch 'feat/cellar-architecture' of https://github.com/PeggyJV…
c46168f 
…/cellar-contracts into feat/withdraw-into-single-asset
@crispymangoes
style(SwapRouter): removed unused code
70a02d2
@crispymangoes
Merge branch 'feat/cellar-architecture' of https://github.com/PeggyJV…
d6b2e4b 
…/cellar-contracts into feat/withdraw-into-single-asset
@0xble
Merge branch 'feat/cellar-architecture' of https://github.com/PeggyJV…
8847727 
…/cellar-contracts into feat/multiposition-multiasset
@crispymangoes
feat(SwapRouter): add multiSwap function to allow for swaps at mult…
de4272a 
…iple exchanges
@crispymangoes
docs(CellarRouter): updated natspec for `withdrawFromPositionsIntoSin…
c83e52b 
…gleAsset`
@crispymangoes
style(SwapRouter): remove unused console and test import
955af79
@0xble
refactor(Cellar): merge enterPosition and exitPosition into rebalance…
efef140 
…, add high watermark fee accounting
@0xble
tests(Cellar): add test for accrue
7270309
@0xble
build: add remapping for ds-test
7a68af2
crispymangoes and others added 28 commits June 29, 2022 15:17
@crispymangoes
refactor(CellarRouter): refactor cellar router to use the swap router
5f53365
@0xble
refactor(CellarRouter): allow withdrawing and swapping into multiple …
95c9558 
…assets
@0xble
Merge branch 'feat/withdraw-into-single-asset' of https://github.com/…
ba900d2 
…PeggyJV/cellar-contracts into feat/withdraw-into-single-asset
@crispymangoes
fix(CellarRouter): missed approve calls before swaps, so tests were f…
528a37d 
…ailing
@crispymangoes
Merge branch 'feat/withdraw-into-single-asset' of https://github.com/…
6cf519b 
…PeggyJV/cellar-contracts into feat/withdraw-into-single-asset
@crispymangoes
Merge branch 'feat/multiposition-multiasset' of https://github.com/Pe…
442b12e 
…ggyJV/cellar-contracts into feat/withdraw-into-single-asset
@crispymangoes
refactory(CellarRouter): use swap router in cellar router
cc62459
@crispymangoes
Merge branch 'feat/cellar-architecture' of https://github.com/PeggyJV…
a5fc988 
…/cellar-contracts into feat/multiposition-multiasset
@crispymangoes
refactor(Cellar): change cellar swap function to work with new swap r…
d64a11a 
…outer
@crispymangoes
Merge branch 'feat/cellar-architecture' of https://github.com/PeggyJV…
ea8e5dc 
…/cellar-contracts into feat/multiposition-multiasset
@0xble
Merge branch 'feat/cellar-architecture' of https://github.com/PeggyJV…
9af9be6 
…/cellar-contracts into feat/multiposition-multiasset
@0xble
Merge branch 'feat/multiposition-multiasset' of https://github.com/Pe…
c310993 
…ggyJV/cellar-contracts into feat/withdraw-into-single-asset
@0xble
chore: remove old TODOs
efb0ce0
@0xble
refactor(Cellar): remove withdrawFromPositions function
53a549a
@0xble
Merge branch 'feat/multiposition-multiasset' of https://github.com/Pe…
db0aba2 
…ggyJV/cellar-contracts into feat/multiposition-multiasset
@0xble
Merge branch 'feat/multiposition-multiasset' of https://github.com/Pe…
9d414a9 
…ggyJV/cellar-contracts into feat/withdraw-into-single-asset
@crispymangoes
style(Swap/PriceRouter): add in natspec comments and titles
d276d46
@0xble
refactor(CellarRouter): combine withdrawAndSwap with withdrawFromAndSwap
6777b67
@0xble
Merge branch 'feat/multiposition-multiasset' of https://github.com/Pe…
a4ea100 
…ggyJV/cellar-contracts into style/clean-up-swap-and-price-router
@0xble
docs: fix typos in contract natspec
ce243bb
@0xble
docs: fix natspec in PriceRouter and SwapRouter
2b1940e
@0xble
docs: fix natspec title of PriceRouter and SwapRouter
b2b2c5f
@0xble
docs(Cellar): add natspec
b37cf19
@0xble
tests(Cellar): fix build errors
bcb8f9f
@crispymangoes
docs(CellarRouter): fix natspec, and add natspec to cellar router
87aa5e3
@crispymangoes
Merge branch 'style/clean-up-swap-and-price-router' of https://github…
2b49b0a 
….com/PeggyJV/cellar-contracts into style/clean-up-swap-and-price-router
@crispymangoes
docs(CellarRouter): fix natspec in cellar router
057d0f1
@0xble
docs(CellarRouter): revise contract natspec
2dcd6d0
@0xble 0xble merged commit 2dcd6d0 into feat/cellar-architecture Jul 7, 2022
@0xble 0xble deleted the feat/multiposition-multiasset branch July 7, 2022 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

feat(Cellar): add support for multiple positions and multiple assets
2 participants
@0xble @crispymangoes