v2-core icon indicating copy to clipboard operation
v2-core copied to clipboard

feat: sablier fee on Airstreams claim

Open smol-ninja opened this issue 1 year ago • 5 comments

Changelog

  • Closes https://github.com/sablier-labs/v2-core/issues/1032
  • Closes https://github.com/sablier-labs/v2-core/issues/1040
    • SablierFee struct
  • Adds a new user: campaignOwner in struct Users
  • Adds BUSL-1.1 license to SablierMerkleFactory

smol-ninja avatar Sep 09 '24 09:09 smol-ninja

This PR is now ready for review pending conclusion in https://github.com/sablier-labs/v2-core/discussions/1039.

smol-ninja avatar Sep 10 '24 12:09 smol-ninja

Thanks, @smol-ninja!

We need to implement some additional functionality, unfortunately.

https://github.com/sablier-labs/v2-core/issues/1040

PaulRBerg avatar Sep 10 '24 16:09 PaulRBerg

We need to implement some additional functionality, unfortunately

No problem. ~How do we proceed @andreivladbrg? Should I close this PR then or should we review and merge it and then work on top of it?~ https://github.com/sablier-labs/v2-core/issues/1040#issuecomment-2341449108

smol-ninja avatar Sep 10 '24 16:09 smol-ninja

~I think reviewing and merging would be better as I have already worked on some of the changes that would be required for https://github.com/sablier-labs/v2-core/issues/1040 or the other PR can be merged into feat/claim-fee-airstream.~ https://github.com/sablier-labs/v2-core/issues/1040#issuecomment-2341449108

smol-ninja avatar Sep 10 '24 16:09 smol-ninja

@andreivladbrg You can review this PR now. Its completed from my end.

smol-ninja avatar Sep 11 '24 16:09 smol-ninja

Bumping this up @andreivladbrg so that you can add it to your to do task.

smol-ninja avatar Oct 07 '24 20:10 smol-ninja

I’m sorry, @smol-ninja 😞. I rebased on staging from main, and it caused a lot of conflicts in this PR. I didn’t realize the consequences. I will help you fixing them

andreivladbrg avatar Oct 08 '24 13:10 andreivladbrg

git reflog

PaulRBerg avatar Oct 08 '24 13:10 PaulRBerg

I’m sorry, @smol-ninja 😞. I rebased on staging from main, and it caused a lot of conflicts in this PR. I didn’t realize the consequences. I will help you fixing them

No problem @andreivladbrg. I am sure it wont take more than 2 mins to fix it. These ain't as scary as they look in Github UI.

smol-ninja avatar Oct 08 '24 16:10 smol-ninja

Finally. Thanks for the partial review @andreivladbrg. Appreciate it!

Also, why campaignOwner and not campaignAdmin?

No reason just https://github.com/sablier-labs/v2-core/issues/1032#issuecomment-2337907316: campaignAdmin didn't come to my mind when I was proposing this. Paul was fine with anything as long as it is prefixed with campaign and you didn't object as well.

smol-ninja avatar Oct 12 '24 22:10 smol-ninja

As per Slack conversation between @razgraf and @andreivladbrg, its beneficial for the UI to include sablierFee in the CreateMerkle events. However, to be able to include sablierFee in CreateMerkleLT event, I would either have to merge _deployMerkleLT code into createMerkleLT or return sablierFee in _deployMerkleLT to then access it in the event log.

@andreivladbrg, which one would you go for? I’d like to go with the first approach as _deployMerkleLT is anyways only called in createMerkleLT so why not include the code directly and avoid having returned value. But I do not remember why we decided to have a separate function _deployMerkleLT.

smol-ninja avatar Oct 13 '24 16:10 smol-ninja

@andreivladbrg, which one would you go for? I’d like to go with the first approach as _deployMerkleLT is anyways only called in createMerkleLT so why not include the code directly and avoid having returned value. But I do not remember why we decided to have a separate function _deployMerkleLT.

@smol-ninja I have missed this one. Do what you think is best.

The reason I introduced the internal function for deployment was due to a "stack too deep" error. If you can manage to abstract the logic into a single function, feel free to go for it.

andreivladbrg avatar Oct 24 '24 14:10 andreivladbrg