Skip to content

Conversation

@frangio
Copy link
Contributor

@frangio frangio commented Jul 11, 2023

As mentioned in https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4424/files#r1252471466, I'm not sure why we have separate ERC1155Receiver and ERC1155Holder contracts. This PR merges them into ERC1155Receiver.

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

changeset-bot bot commented Jul 11, 2023

🦋 Changeset detected

Latest commit: 1da446c

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 Author

frangio commented Jul 11, 2023

Storage check failing is expected because we removed one __gap.

@frangio frangio merged commit 3d0edbe into OpenZeppelin:master Jul 11, 2023
@frangio frangio deleted the remove-1155-receiver branch July 11, 2023 17:49
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