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 Counters library and its usage #4281

Closed

Conversation

balajipachai
Copy link
Contributor

Fixes #4233

  • Deletes Counters.sol and its associated tests

  • Counters.sol was imported in below contracts:

    contracts/governance/utils/Votes.sol

    contracts/mocks/proxy/UUPSUpgradeableMock.sol

    contracts/token/ERC20/extensions/ERC20Permit.sol

    contracts/token/ERC20/extensions/ERC20Snapshot.sol

    contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoId.sol

removed usage of Counters in these contracts and updated the code accordingly.

PR Checklist

  • [All are passing] Tests
  • [None] Documentation
  • [Added relevant changeset file] Changeset entry (run npx changeset add)

bpachai added 2 commits May 25, 2023 22:20
* removes import statement from impacted smart contracts
* deletes Counters contract & tests
* updates contracts: Votes, UUPSUpgradeableMock, ERC20Permit, ERC20Snapshot & ERC721PresetMinterPauserAutoId
@changeset-bot
Copy link

changeset-bot bot commented May 25, 2023

🦋 Changeset detected

Latest commit: 6c1cc89

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
openzeppelin-solidity Major

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@frangio
Copy link
Contributor

frangio commented May 30, 2023

Sorry @balajipachai, just noticing we have a duplicate PR for this at #4289. 🙏

@frangio frangio closed this May 30, 2023
@balajipachai
Copy link
Contributor Author

@frangio the PR #4289 was made after #4281, thus, it is hard for me to understand why 4281 was closed and not 4289?

@Amxx
Copy link
Collaborator

Amxx commented May 30, 2023

This PR is based on the master branch, while 4281 is based on, and targets next-v5.0, which is the branch we are actively working on. Given the differences between these branches, using this PR would result in many conflicts.

@balajipachai
Copy link
Contributor Author

This PR is based on the master branch, while 4281 is based on, and targets next-v5.0, which is the branch we are actively working on. Given the differences between these branches, using this PR would result in many conflicts.

Does this mean all the issues cited in Milestone-5 should be targeted to next-v5.0 branch?
If I would have received a comment to make the PR targeting next-v5.0, I would have done that happily and solved most of the conflicts.

@frangio @Amxx

@Amxx
Copy link
Collaborator

Amxx commented May 30, 2023

Does this mean all the issues cited in Milestone-5 should be targeted to next-v5.0 branch?

Yes.

Considering we are currently working on a very tight schedule we are working on all the 5.0 issues internally.

@balajipachai
Copy link
Contributor Author

Can you assign me some of those issues with a deadline? I will complete and resolve all the assigned issues well within the deadline 100%

@frangio
Copy link
Contributor

frangio commented May 30, 2023

@balajipachai Yeah sorry about the confusion. We just merged the next-v5.0 and master branches. master is now again the main branch to work on so we will avoid this issue going forward.

I mentioned you in #3693.

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.

Remove Counters.sol
3 participants