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

Soldeer Packaging #222

Merged
merged 35 commits into from
Jul 17, 2024
Merged

Soldeer Packaging #222

merged 35 commits into from
Jul 17, 2024

Conversation

0xJem
Copy link
Contributor

@0xJem 0xJem commented Jul 12, 2024

Oighty and others added 30 commits July 11, 2024 15:23
Staging: Develop -> Master
feat: use implicit imports in interfaces to avoid type errors when importing as library
# Conflicts:
#	script/salts/salts.json
#	src/modules/derivatives/LinearVesting.sol
@0xJem 0xJem linked an issue Jul 15, 2024 that may be closed by this pull request
@0xJem 0xJem self-assigned this Jul 15, 2024
@0xJem 0xJem marked this pull request as ready for review July 15, 2024 11:11
@0xJem 0xJem requested a review from Oighty July 15, 2024 11:11
@Oighty
Copy link
Contributor

Oighty commented Jul 16, 2024

It looks like master needs to be merged into develop since my interface updates aren't reflected there.

@0xJem
Copy link
Contributor Author

0xJem commented Jul 16, 2024

I merged master into this branch, actually. So it's included. Merge this down to develop?

@Oighty Oighty merged commit e19ca19 into develop Jul 17, 2024
1 check passed
@Oighty Oighty deleted the soldeer branch July 17, 2024 14:58
@Oighty Oighty restored the soldeer branch July 18, 2024 01:49
@Oighty Oighty deleted the soldeer branch July 18, 2024 01:49
@Oighty Oighty restored the soldeer branch December 13, 2024 20:59
@Oighty Oighty deleted the soldeer branch December 13, 2024 21:00
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.

Look at using soldeer instead of git submodules for dependencies
2 participants