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

Add replacements for TokenApprovalRef #15

Merged
merged 2 commits into from
Jul 21, 2022

Conversation

Vectorized
Copy link
Collaborator

@Vectorized Vectorized commented Jul 20, 2022

Fixes #14.

This regex thingy doesn't look the cleanest though, but I don't think we will ever need to touch the TokenApprovalRef.

The regex is also general enough to allow for one line of comment above the struct.

I'd prefer fixing it in this repo than the main repo. Cuz the other way about it is to create a whole new .sol file with a werid name just for this one struct.

May want to do a tiny version bump from 4.2.0 -> 4.2.1 for the Upgradeable repo.


@jovijovi can you help confirm that this will fix the issue?

@jovijovi
Copy link

jovijovi commented Jul 21, 2022

Fixed. hardhat flatten works.
👍 👍 👍

@Vectorized Vectorized merged commit a4754df into chiru-labs:main Jul 21, 2022
@Vectorized Vectorized deleted the fix-cycle branch July 22, 2022 13:54
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.

Cyclic dependencies in ERC721AUpgradeable.sol and ERC721AStorage.sol
2 participants