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

Reallocate by withdrawals + sink #5

Merged
merged 42 commits into from
Feb 16, 2024
Merged

Reallocate by withdrawals + sink #5

merged 42 commits into from
Feb 16, 2024

Conversation

adhusson
Copy link
Contributor

@adhusson adhusson commented Feb 13, 2024 •
edited

TODO

  • adapt tests

Based on @MathisGD's suggestion, reallocate by specifying:

  • A list of withdrawals as (market,amount) pairs
  • A "sink" market that will receive all the withdrawn liquidity

Notes:

  • reallocate has been renamed withdrawTo
  • You still need to call Morpho

Pros:

  • Less sensitive to asynchrony/frontrunning
  • Exact in assets

Cons:

  • Slightly more complex code
  • Less flexible than full reallocation array / full flows array

@adhusson adhusson changed the base branch from main to feat/flows-and-eth-fee February 13, 2024 15:51
@adhusson adhusson mentioned this pull request Feb 13, 2024
Merged
@adhusson adhusson marked this pull request as ready for review February 13, 2024 17:49
QGarchery
QGarchery reviewed Feb 15, 2024
View reviewed changes
src/PublicAllocator.sol Outdated Show resolved Hide resolved
QGarchery
QGarchery reviewed Feb 15, 2024
View reviewed changes
src/PublicAllocator.sol Outdated Show resolved Hide resolved
src/PublicAllocator.sol Outdated Show resolved Hide resolved
MathisGD
MathisGD reviewed Feb 16, 2024
View reviewed changes
src/libraries/EventsLib.sol Show resolved Hide resolved
src/libraries/EventsLib.sol Outdated Show resolved Hide resolved
src/PublicAllocator.sol Outdated Show resolved Hide resolved
src/PublicAllocator.sol Outdated Show resolved Hide resolved
QGarchery and others added 13 commits February 16, 2024 12:26
@QGarchery
feat: max settable flow cap as an integer
fc3c880
@adhusson
Merge pull request #9 from morpho-org/feat/safe-max-flow-cap
c5a55f7 
Safe max value for flow caps
@adhusson
refactor: rename depositAssets -> depositMarketAssets
ce71ee7
@MathisGD
refactor: alternative fix for duplicates
9b75c1c
@adhusson
rename depositMarketAssets -> vaultSupplyInMarket
96443b7
@adhusson
Merge branch 'feat/reallocate-by-flow' into fix/duplicates-in-realloc…
102b1eb 
…ate-by-flow
@adhusson
Merge branch 'feat/flows-and-eth-fee' into feat/reallocate-by-flow
e63d942
@adhusson
Merge branch 'feat/reallocate-by-flow' into fix/duplicates-in-realloc…
87d45ff 
…ate-by-flow
@adhusson
Merge branch 'fix/duplicates-in-reallocate-by-flow' into fix/duplicat…
bc945f4 
…es-2
@adhusson
feat: accrue interest before computing expect supply assets
eb9eeb4
@MathisGD
Merge remote-tracking branch 'origin/feat/flows-and-eth-fee' into fea…
2ff7a7f 
…t/reallocate-by-flow
@MathisGD
Merge remote-tracking branch 'origin/feat/reallocate-by-flow' into fe…
fbdcf06 
…at/reallocate-by-flow
@MathisGD
feat: remove clamp
86fd595
@MathisGD MathisGD self-assigned this Feb 16, 2024
@MathisGD MathisGD mentioned this pull request Feb 16, 2024
Closed
MathisGD and others added 3 commits February 16, 2024 14:54
@MathisGD
Merge branch 'feat/reallocate-by-flow' into fix/duplicates-2
d9bbfc5 
Signed-off-by: MathisGD <74971347+MathisGD@users.noreply.github.com>
@MathisGD
chore: fmt
de0022a
@MathisGD
Merge pull request #11 from morpho-org/fix/duplicates-2
cfadc41 
alternative fix
@MathisGD MathisGD merged commit e9bbf5e into feat/flows-and-eth-fee Feb 16, 2024
1 check passed
@MathisGD MathisGD deleted the feat/reallocate-by-flow branch February 16, 2024 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QGarchery QGarchery QGarchery approved these changes

@MathisGD MathisGD MathisGD approved these changes

Assignees

@MathisGD MathisGD

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@adhusson @QGarchery @MathisGD