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

Remove submodules except for the forge standard libraries and rely on npm #241

Merged
merged 2 commits into from
Feb 24, 2024

Conversation

edmundedgar
Copy link
Contributor

This removes the need to have duplicate settings in package.json (for hardhat) and .gitmodules / remappings.txt (for forge) by making forge use the hardhat method. It also lets us use git submodules less which is good because they tend to confuse the hell out of everyone.

Copy link
Collaborator

@josojo josojo left a comment

Choose a reason for hiding this comment

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

I think "@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#v3.0.0-RealityETH",
is older than the commit that we had in gitsubmodules.

Otherwise, looks good

@edmundedgar
Copy link
Contributor Author

edmundedgar commented Feb 24, 2024

The difference between v3.0.0-RealityETH just seems to be the package name etc, ie the version we're referencing in npm lacks this commit:
RealityETH/zkevm-contracts@c169730

We want to manage this with a tag, right? (I think specifying the version one way or another would be the sane thing to do it's, less likely to cause trouble with caches and things). If so I can do another PR to tag the current main as v3.0.1-RealityETH and update to that.

Alternatively maybe we just pin the commit for the time being, rather than tagging every time, that would save us a step.

@edmundedgar edmundedgar merged commit fcd2a19 into main Feb 24, 2024
2 checks passed
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