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.

Sign up for GitHub

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

Jump to bottom

Remove "available since" comments #4424

Merged
merged 9 commits into from
Jul 6, 2023
Merged

Remove "available since" comments #4424

merged 9 commits into from
Jul 6, 2023

Conversation

frangio
Copy link
Contributor

@frangio frangio commented Jul 5, 2023 •
edited
Loading

The documentation includes comments saying "Available since vX.Y" meant to indicate that a feature was introduced in a minor, because the docs are only versioned by major. We don't need this since we're moving to 5.0.

Blocked by #4423 because the changes to upgradeable.patch conflict.

Fixes LIB-948

@frangio frangio requested a review from a team July 5, 2023 02:23
@changeset-bot
Copy link

changeset-bot bot commented Jul 5, 2023 •
edited
Loading

⚠️ No Changeset found

Latest commit: 128e06d

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

frangio
frangio commented Jul 5, 2023
View reviewed changes
contracts/token/ERC1155/utils/ERC1155Receiver.sol
Comment on lines +12 to 14
* NOTE: This contract does not suffice to receive tokens. See {ERC1155Holder}.
*/
abstract contract ERC1155Receiver is ERC165, IERC1155Receiver {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't really understand why we have separate ERC1155Receiver and ERC1155Holder contracts. I think we should merge them, and only keep ERC1155Holder.

@frangio frangio marked this pull request as draft July 5, 2023 02:25
@frangio frangio mentioned this pull request Jul 5, 2023
Merged
@frangio frangio marked this pull request as ready for review July 5, 2023 21:42
@frangio frangio requested a review from a team July 5, 2023 21:42
ernestognw
ernestognw previously approved these changes Jul 5, 2023
View reviewed changes
Copy link
Member

@ernestognw ernestognw left a comment

Choose a reason for hiding this comment

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

There's a missing import to remove from scripts/generate/templates/SafeCast.js that might require another commit but LGTM, let me know if you need reapproving

@frangio frangio requested a review from ernestognw July 5, 2023 22:39
@frangio frangio requested a review from Amxx July 6, 2023 01:20
@Amxx Amxx merged commit 6bf68a4 into OpenZeppelin:master Jul 6, 2023
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Amxx Amxx Amxx approved these changes

@ernestognw ernestognw ernestognw approved these changes

Assignees
No one assigned
Labels
ignore-changeset
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@frangio @Amxx @ernestognw