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.

Sign up for GitHub

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

Jump to bottom

refactor: include batch lockup contract in core #1084

Merged
merged 2 commits into from
Nov 20, 2024
Merged

refactor: include batch lockup contract in core #1084

merged 2 commits into from
Nov 20, 2024

Conversation

andreivladbrg
Copy link
Member

@andreivladbrg andreivladbrg commented Nov 12, 2024 •
edited
Loading

Depends on #1075 Closes #1073

@andreivladbrg andreivladbrg marked this pull request as draft November 12, 2024 16:39
@andreivladbrg andreivladbrg changed the base branch from main to staging November 12, 2024 16:39
@andreivladbrg andreivladbrg mentioned this pull request Nov 14, 2024
Closed
@andreivladbrg andreivladbrg changed the base branch from staging to feat/unlock-amounts November 14, 2024 12:25
@andreivladbrg andreivladbrg force-pushed the refactor/include-batch-core branch 3 times, most recently from cf3f2d1 to 7506fcf Compare November 14, 2024 13:20
@andreivladbrg andreivladbrg marked this pull request as ready for review November 14, 2024 13:21
@andreivladbrg
Copy link
Member Author

@smol-ninja the PR is ready for review, maybe partially reviewing it while working on #1072 would be useful

@andreivladbrg andreivladbrg mentioned this pull request Nov 14, 2024
Closed
@smol-ninja smol-ninja mentioned this pull request Nov 15, 2024
Merged
3 tasks
@smol-ninja
Copy link
Member

Since its built on top of #1075, I would like to give it a review after #1075 is merged.

Base automatically changed from feat/unlock-amounts to staging November 19, 2024 15:37
@andreivladbrg
refactor: move batch lockup contract in core
adcca88 
refactor: remove deploy periphery scripts
refactor: update scripts accordingly
chore: add SALT as immutable in BaseScript
test: move batch lockup tests in core
smol-ninja
smol-ninja approved these changes Nov 20, 2024
View reviewed changes
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.

LGTM.

Added a small commit: 45b1555

script/core/DeployDeterministicBatchLockup.t.sol Outdated Show resolved Hide resolved
script/periphery/DeployDeterministicMerkleFactory.s.sol Outdated Show resolved Hide resolved
@smol-ninja smol-ninja merged commit 4ce04be into staging Nov 20, 2024
9 checks passed
@smol-ninja smol-ninja deleted the refactor/include-batch-core branch November 20, 2024 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smol-ninja smol-ninja smol-ninja approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Place SablierBatchLockup and core contracts into src directory
2 participants
@andreivladbrg @smol-ninja