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

depositViaBroker and createAndDepositViaBroker functions #100

Merged
merged 4 commits into from
May 24, 2024

Conversation

smol-ninja
Copy link
Member

@smol-ninja smol-ninja commented May 21, 2024

Changelogs

PR dependencies

Side note

  • Tests are generated using bulloak but keeping the shared modifiers.
  • Question: Modifiers in Modifiers.sol are very unorganized. Should we remove categories and just simply make them in alphabetical order?

@smol-ninja smol-ninja requested a review from andreivladbrg May 22, 2024 11:53
@smol-ninja smol-ninja force-pushed the feat/broker branch 2 times, most recently from ff43ea3 to 8707297 Compare May 22, 2024 21:28
src/SablierV2OpenEnded.sol Show resolved Hide resolved
src/SablierV2OpenEnded.sol Show resolved Hide resolved
src/interfaces/ISablierV2OpenEnded.sol Outdated Show resolved Hide resolved
src/interfaces/ISablierV2OpenEnded.sol Outdated Show resolved Hide resolved
src/interfaces/ISablierV2OpenEnded.sol Outdated Show resolved Hide resolved
test/utils/Constants.sol Outdated Show resolved Hide resolved
test/utils/Modifiers.sol Show resolved Hide resolved
test/utils/Modifiers.sol Show resolved Hide resolved
test/utils/Modifiers.sol Outdated Show resolved Hide resolved
test: depositViaBroker

test: createAnddepositViaBroker

refactor: address pr review

test: move broker function from Base to Integration

test: remove duplicated modifiers

test: remove unneeded tree branches

test: fix CreateAndDepositViaBroker_Integration_Test
test: rename whenRecipientNonZeroAddress to whenRecipientIsNotZeroAddress
@smol-ninja
Copy link
Member Author

@andreivladbrg I have addressed the merge conflicts. In doing so, I am sorry that I overwrote your commits because I first squashed them followed by cherry-pick. Next time, will find a way of squashing without changing the co-author.

There is one question that I asked in the PR description:

Question: Modifiers in Modifiers.sol are very unorganized. Should we remove categories and just simply make them in alphabetical order?

Otherwise if everything looks good, please lmk.

test: order modifiers alphabetically
test: add delegate call test for withdrawMax
test: merge pause modifiers into a single one
@andreivladbrg
Copy link
Member

I am sorry that I overwrote your commits because I first squashed them followed by cherry-pick

nothing to be sorry about

just simply make them in alphabetical order?

yes, we should that, addressed in this commit 0264355


i have pushed a new commit, you can see it's message what's about, it is self explanatory, lmk if it looks, otherwise it can be merged on my side

@smol-ninja
Copy link
Member Author

LGTM.

@smol-ninja smol-ninja merged commit cafd893 into main May 24, 2024
6 checks passed
@smol-ninja smol-ninja deleted the feat/broker branch May 24, 2024 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a new mock assets: usdc and tokenWithoutDecimal Implement broker fee
2 participants