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

fix: adjust system contracts directories #270

Merged
merged 5 commits into from
Mar 15, 2024
Merged

Conversation

cfsdes
Copy link
Contributor

@cfsdes cfsdes commented Mar 14, 2024

What 💻

  • The hardcoded path from system_contracts.rs was updated from etc/system-contracts to contracts/system-contracts.
  • The hardcoded path used in fee_estimate_impersonating_contracts() function was also updated

Why ✋

The system_contracts.rs was reading some artifacts from the etc/ directory.

However, when system contracts (such as era contracts) are compiled, their artifacts are usually stored in the same path as their contracts. Therefore, to avoid errors, the hardcoded path was updated from etc/system-contracts to contracts/system-contracts.

Also, the fee_estimate_impersonating_contracts() function was using an invalid directory, so it was also updated.

Evidence 📷

The image below is an evidence of the era_test_node being executed correctly with era-contracts.

PS: In order for the tool to work properly, the system-contracts/ directory was moved to inside the contracts/ directory.

Screenshot 2024-03-13 at 22 32 40

@cfsdes cfsdes requested a review from a team as a code owner March 14, 2024 02:59
@cfsdes cfsdes changed the title Fix: Adjust System Contracts Directories fix: adjust system contracts directories Mar 14, 2024
@dutterbutter
Copy link
Collaborator

@cfsdes can you please address the failed lint job.

@cfsdes
Copy link
Contributor Author

cfsdes commented Mar 15, 2024

Sure @dutterbutter. Now it should be working well :)

Copy link
Collaborator

@MexicanAce MexicanAce left a comment

Choose a reason for hiding this comment

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

LGTM

@MexicanAce MexicanAce merged commit 574c0d8 into matter-labs:main Mar 15, 2024
10 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.

3 participants