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

refactor: address feedback #1079

Merged
merged 6 commits into from
Nov 8, 2024

Conversation

andreivladbrg
Copy link
Member

This PR addresses my feedback in #1069.

Some of the changes will be discussed in the comments left under that PR.

@smol-ninja
Copy link
Member

Thanks for the PR @andreivladbrg. Since we have agreed to revert changes on the following two comments:

  1. feat: merge all lockups into a single contract #1069 (comment)
  2. feat: merge all lockups into a single contract #1069 (comment)

Can you please revert them? I would make it easy to review this given functions selection in Helpers would also change.

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function
@andreivladbrg
Copy link
Member Author

@smol-ninja just pushed a commit to revert the 2 things, and i've also moved the calculate segments/tranches in Helpers

Copy link
Member

@smol-ninja smol-ninja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making the changes. Comments below.

src/core/libraries/Helpers.sol Show resolved Hide resolved
src/core/LockupNFTDescriptor.sol Outdated Show resolved Hide resolved
src/core/SablierLockup.sol Show resolved Hide resolved
src/core/abstracts/SablierLockupBase.sol Outdated Show resolved Hide resolved
src/core/libraries/Helpers.sol Outdated Show resolved Hide resolved
src/core/types/DataTypes.sol Outdated Show resolved Hide resolved
@andreivladbrg andreivladbrg merged commit 5634eff into refactor/singleton-contract Nov 8, 2024
7 of 8 checks passed
@andreivladbrg andreivladbrg deleted the avb/singleton-feedback branch November 8, 2024 21:49
smol-ninja added a commit that referenced this pull request Nov 8, 2024
* refactor: address feedback

* refactor: move calculate segments/tranches in Helpers

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function

* refactor: polish code

* chore: remove unneeded import

* add stream id in _create

* use ISablierLockupBase.isTransferable

---------

Co-authored-by: smol-ninja <[email protected]>
andreivladbrg pushed a commit that referenced this pull request Nov 11, 2024
refactor: modifies Datatypes
refactor: deletes individual lockup contracts and interfaces

feat: adds SablierLockupBase and SablierLockup
feat: spin out VestingMath library out of Helpers library
refactor: update errors

refactor: make periphery and merkle lockup contracts compatible with singelton lockup

chore: update count of inherited components

chore: update deployment scripts

build: update shell scripts

chore: update precompiles contract

style: fix lint warnings

feat: include libraries in artifacts

fix: bug

refactor: move endTime check into helpers

refactor: address feedback (#1079)

* refactor: address feedback

* refactor: move calculate segments/tranches in Helpers

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function

* refactor: polish code

* chore: remove unneeded import

* add stream id in _create

* use ISablierLockupBase.isTransferable

---------

Co-authored-by: smol-ninja <[email protected]>

refactor: prefix errors name used in Helpers with SablierHelpers
smol-ninja added a commit that referenced this pull request Nov 11, 2024
refactor: modifies Datatypes
refactor: deletes individual lockup contracts and interfaces

feat: adds SablierLockupBase and SablierLockup
feat: spin out VestingMath library out of Helpers library
refactor: update errors

refactor: make periphery and merkle lockup contracts compatible with singelton lockup

chore: update count of inherited components

chore: update deployment scripts

build: update shell scripts

chore: update precompiles contract

style: fix lint warnings

feat: include libraries in artifacts

fix: bug

refactor: move endTime check into helpers

refactor: address feedback (#1079)

* refactor: address feedback

* refactor: move calculate segments/tranches in Helpers

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function

* refactor: polish code

* chore: remove unneeded import

* add stream id in _create

* use ISablierLockupBase.isTransferable

---------

Co-authored-by: smol-ninja <[email protected]>

refactor: prefix errors name used in Helpers with SablierHelpers
smol-ninja added a commit that referenced this pull request Nov 11, 2024
feat: adds ISablierLockup and ISablierLockupBase
refactor: modifies Datatypes
refactor: deletes individual lockup contracts and interfaces

feat: adds SablierLockupBase and SablierLockup
feat: spin out VestingMath library out of Helpers library
refactor: update errors

refactor: make periphery and merkle lockup contracts compatible with singelton lockup

chore: update count of inherited components

chore: update deployment scripts

build: update shell scripts

chore: update precompiles contract

style: fix lint warnings

feat: include libraries in artifacts

fix: bug

refactor: move endTime check into helpers

refactor: address feedback (#1079)

* refactor: address feedback

* refactor: move calculate segments/tranches in Helpers

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function

* refactor: polish code

* chore: remove unneeded import

* add stream id in _create

* use ISablierLockupBase.isTransferable

refactor: prefix errors name used in Helpers with SablierHelpers

---------

Co-authored-by: Andrei Vlad Birgaoanu <[email protected]>
andreivladbrg added a commit that referenced this pull request Nov 13, 2024
feat: adds ISablierLockup and ISablierLockupBase
refactor: modifies Datatypes
refactor: deletes individual lockup contracts and interfaces

feat: adds SablierLockupBase and SablierLockup
feat: spin out VestingMath library out of Helpers library
refactor: update errors

refactor: make periphery and merkle lockup contracts compatible with singelton lockup

chore: update count of inherited components

chore: update deployment scripts

build: update shell scripts

chore: update precompiles contract

style: fix lint warnings

feat: include libraries in artifacts

fix: bug

refactor: move endTime check into helpers

refactor: address feedback (#1079)

* refactor: address feedback

* refactor: move calculate segments/tranches in Helpers

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function

* refactor: polish code

* chore: remove unneeded import

* add stream id in _create

* use ISablierLockupBase.isTransferable

refactor: prefix errors name used in Helpers with SablierHelpers

---------

Co-authored-by: Andrei Vlad Birgaoanu <[email protected]>
andreivladbrg added a commit that referenced this pull request Nov 13, 2024
feat: adds ISablierLockup and ISablierLockupBase
refactor: modifies Datatypes
refactor: deletes individual lockup contracts and interfaces

feat: adds SablierLockupBase and SablierLockup
feat: spin out VestingMath library out of Helpers library
refactor: update errors

refactor: make periphery and merkle lockup contracts compatible with singelton lockup

chore: update count of inherited components

chore: update deployment scripts

build: update shell scripts

chore: update precompiles contract

style: fix lint warnings

feat: include libraries in artifacts

fix: bug

refactor: move endTime check into helpers

refactor: address feedback (#1079)

* refactor: address feedback

* refactor: move calculate segments/tranches in Helpers

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function

* refactor: polish code

* chore: remove unneeded import

* add stream id in _create

* use ISablierLockupBase.isTransferable

refactor: prefix errors name used in Helpers with SablierHelpers

---------

Co-authored-by: Andrei Vlad Birgaoanu <[email protected]>
andreivladbrg added a commit that referenced this pull request Jan 27, 2025
feat: adds ISablierLockup and ISablierLockupBase
refactor: modifies Datatypes
refactor: deletes individual lockup contracts and interfaces

feat: adds SablierLockupBase and SablierLockup
feat: spin out VestingMath library out of Helpers library
refactor: update errors

refactor: make periphery and merkle lockup contracts compatible with singelton lockup

chore: update count of inherited components

chore: update deployment scripts

build: update shell scripts

chore: update precompiles contract

style: fix lint warnings

feat: include libraries in artifacts

fix: bug

refactor: move endTime check into helpers

refactor: address feedback (#1079)

* refactor: address feedback

* refactor: move calculate segments/tranches in Helpers

refactor: revert constant in library change
refactor: re introduce _checkCliffAndEndTime function

* refactor: polish code

* chore: remove unneeded import

* add stream id in _create

* use ISablierLockupBase.isTransferable

refactor: prefix errors name used in Helpers with SablierHelpers

---------

Co-authored-by: Andrei Vlad Birgaoanu <[email protected]>
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.

2 participants