feat: MerkleVCA contract
#58
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
refactor: separate out parameters struct for Merkle Instant and Merkle Lockups refactor: refactor shape and camapign name as bytes32 in Merkle campaign constructor arguments chore: contract inheritance test: deploy factory locally for fork tests feat: merkle vca contract feat: add CreateMerkleVCA run script refactor: rename schedule to _vestingSchedule in MerkleVCA feat: add SablierMerkleVCA in prepare-artifacts bash script refactor: replace internal variables with private in non-abstract contracts refactor: 7 days claim window post vesting unlock fix: set sacrificedAmount to 0 in refundSacrificedAmount function refactor: error name feat: revert claim if vesting start time is in future feat: revert createMerkleVCA if either of vesting times is zero test: integration tests for createMerkleVCA fix: calculate claimable amount only if blocktime is in the vesting range test: add merkleVCA integration tests test: integration tests test: fork tests for merkleVCA test: remove Vars struct from merkle instant contructor test refactore: rename sacrifiedAmount to forgoneAmount
This comment was marked as resolved.
This comment was marked as resolved.
smol-ninja
force-pushed
the
feat/avca
branch
2 times, most recently
from
52474ad to
0f7a97f
Compare
|
This PR is now ready for your review @andreivladbrg. |
smol-ninja
force-pushed
the
feat/avca
branch
2 times, most recently
from
cb87898 to
320595e
Compare
Co-authored-by: Andrei Vlad Birgaoanu <[email protected]>
smol-ninja
force-pushed
the
feat/avca
branch
from
320595e to
e76d4e6
Compare
andreivladbrg
requested changes
Feb 14, 2025
There was a problem hiding this comment.
while reviewing, a question came to mind—should we allow creating a MerkleVCA campaign with an end time in the past? or should we revert and instead, recommend the user to create a MerkleInstant campaign?
this would mean adding the following check in the constructor:
if(endTime <= block.timestamp) {
revert();
}haven’t reviewed the tests yet, but in order to be more time-efficient, i’m going to leave these comments:
chore: use named args in transfer function chore: correct prepare artifacts interface
My reply is #58 (comment). |
This was referenced Feb 15, 2025
Co-authored-by: Andrei Vlad Birgaoanu <[email protected]>
smol-ninja
force-pushed
the
feat/avca
branch
2 times, most recently
from
c54bc79 to
8a9eb88
Compare
smol-ninja
force-pushed
the
feat/avca
branch
from
8a9eb88 to
156b3b1
Compare
tests/integration/concrete/factory/create-merkle-vca/createMerkleVCA.tree
Outdated
Show resolved
Hide resolved
test: rename dir to tokens small polishes
|
Added a new commit, 651f982, incorporating your feedback as well as fixing a bug in VCA fork tests. |
|
@andreivladbrg looking forward to your approval on this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #43
Note
The factory won't be able to deploy
SablierMerkleVCAcontract if the following requirements are not met:>= vesting.end + 7 days(follow this discussion).vesting.end>vesting.startUnlike other Merkle campaigns where users are incentivised to claim early, in
MerkleVCA, users are incentivised to claim late. That means, its entirely possible to see no claim until the vesting ends. So its important to check for the constraints during the deployment instead of the_claimfunction.Blocker
Related discussions