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: sd as 18 decimals #312

Merged
merged 5 commits into from
Oct 16, 2024
Merged

refactor: sd as 18 decimals #312

merged 5 commits into from
Oct 16, 2024

Conversation

andreivladbrg
Copy link
Member

@andreivladbrg andreivladbrg commented Oct 15, 2024

Closes #302

Changes

  • store the snapshot debt as 18 decimals
  • rename ongoingDebt to ongoingDebtScaled
    • use only uint256 type in this function
  • rename snapshotDebt to snapshotDebtScaled
  • update withdraw function accordingly
  • reintroduce the scale/descale helpers functions
  • update depletionTime function
    • the biggest change here is that we need to add to the stream balance with scaled 1 value (i.e. for USDC it would be1e12)
  • use uint256 in scale/descale function from tests
    • the reason for this is that it safer to up cast from uint128 to uint256 compared to uint256 to uint128
  • add ONE_MONTH_DEBT_18D constant for snapshotDebt tests

@andreivladbrg andreivladbrg marked this pull request as draft October 15, 2024 11:38
@andreivladbrg andreivladbrg force-pushed the refactor/sd-18-decimals branch 2 times, most recently from 8521361 to 3ab42ac Compare October 15, 2024 12:12
test: update tests accordingly
@andreivladbrg andreivladbrg force-pushed the refactor/sd-18-decimals branch from 3ab42ac to 10834be Compare October 15, 2024 12:52
@andreivladbrg andreivladbrg marked this pull request as ready for review October 15, 2024 12:55
@andreivladbrg
Copy link
Member Author

@smol-ninja nevermind for now the fail inv test, we will change the eq to ineq as we decided in #307

src/libraries/Helpers.sol Outdated Show resolved Hide resolved
src/libraries/Helpers.sol Outdated Show resolved Hide resolved
src/libraries/Helpers.sol Outdated Show resolved Hide resolved
src/libraries/Helpers.sol Show resolved Hide resolved
src/SablierFlow.sol Outdated Show resolved Hide resolved
src/SablierFlow.sol Outdated Show resolved Hide resolved
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.

Thank you for making all these changes. Clearly this is a big PR and has more impacts than I imagined. A few comments:

  • I can see two variations of scaled naming: scaledABC and abcScaled. I suppose you are using abcScaled for function names (ongoingDebtScaledOf and getSnapshotDebtScaled) whereas scaledABC for variables names. If so, there are inconsistencies at a few places such as use of snapshotDebtScaled variable in getSnapshotDebtScaled function. Lets stick to one convention so that there is no confusion when deciding for a variable names that requires 18 decimal format.

My suggestion would be to either use scaledABC format or ABCScaled format for all variables and function naming and not both. Whats your preference?

  • Would it be more consistent if we use the same naming convention for snapshot debt getter as well i.e. snapshotDebtOf similar to ongoingDebtOf? Its the only function that looks out of touch since it leans more towards getters defined in ISablierFlow than ISablierFlowBase. If you are aligned, we can consider refactoring it in the next release of Flow.

@smol-ninja smol-ninja force-pushed the refactor/sd-18-decimals branch from 7ac5945 to 8793cf1 Compare October 15, 2024 21:08
@smol-ninja
Copy link
Member

smol-ninja commented Oct 15, 2024

One more comment: Technical doc is now outdated given that sd and od have been refactored to follow 18 decimal format. What do we do about it now? Here are some of the ideas:

  • Lets remove numbers from it as it would require to be re-calculated.
  • Only adds theory and formula as its easy to do.

Wdyt? if you think you want it to have numbers as well then we will have to update them as well as charts (I suppose charts are outdated too right?)

#314

@andreivladbrg
Copy link
Member Author

  • can see two variations of scaled naming: scaledABC and abcScaled

actually, my intention was to only have one, and that is abcScaled. the only exception, as you mentioned, is ongoingDebtOf, which would indeed end up in a situation where the function would have a sounded weird, "ongoingDebtOfScaled".

My suggestion would be to either use scaledABC format or ABCScaled format for all variables and function naming and not both. Whats your preference?

ofc, we should have just one, as said above. how would you keep consistency and still have a good function name? my preference is abcScaled

snapshotDebtOf similar to ongoingDebtOf

i think that would be misleading. snapshot debt is a state variable, while the other is a function that calculates an amount in real time. we should definitely keep the "get" keyword for all getters, as it only reads a state, and having "Of" points out that it’s different from the classic getters (dynamic function)

@smol-ninja
Copy link
Member

actually, my intention was to only have one, and that is abcScaled.

Got it. Then lets use abcScaled everywhere, and for ongoing debt, we can use ongoingDebtScaledOf.

@andreivladbrg andreivladbrg force-pushed the refactor/sd-18-decimals branch from 8793cf1 to 0eaef87 Compare October 16, 2024 13:12
test: use `ONE_MONTH_DEBT_18D` constant

Co-authored-by: smol-ninja <shubhamy2015@gmail.com>
@andreivladbrg andreivladbrg force-pushed the refactor/sd-18-decimals branch from 0eaef87 to 663e9e8 Compare October 16, 2024 13:17
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.

Last few suggestions then looks good here.

src/SablierFlow.sol Outdated Show resolved Hide resolved
src/SablierFlow.sol Outdated Show resolved Hide resolved
src/SablierFlow.sol Outdated Show resolved Hide resolved
src/SablierFlow.sol Outdated Show resolved Hide resolved
tests/integration/concrete/total-debt-of/totalDebtOf.tree Outdated Show resolved Hide resolved
tests/integration/fuzz/ongoingDebtOf.t.sol Outdated Show resolved Hide resolved
Co-authored-by: smol-ninja <shubhamy2015@gmail.com>
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.

Fanstatic. Less goooo 🚀

@andreivladbrg andreivladbrg merged commit 4ebdf2c into main Oct 16, 2024
7 checks passed
@smol-ninja smol-ninja deleted the refactor/sd-18-decimals branch October 16, 2024 14:17
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.

Store snapshot debt as a 18 decimal value
2 participants