-
Notifications
You must be signed in to change notification settings - Fork 316
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 ERC1155 mixin #941
Merged
andrew-fleming
merged 21 commits into
OpenZeppelin:main
from
andrew-fleming:add-erc1155-mixin
Mar 22, 2024
Merged
Add ERC1155 mixin #941
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
d201c1d
add erc1155 mixin
andrew-fleming 8920b48
update changelog
andrew-fleming 8b28beb
add missing semicolon
andrew-fleming 3b0c360
Apply suggestions from code review
andrew-fleming cf08272
Merge branch 'main' into add-erc1155-mixin
andrew-fleming 07dc536
fix constructor in code block
andrew-fleming ed61180
fix name, consolidate snake and camel blocks
andrew-fleming b479ede
fix param name
andrew-fleming 6024cf6
add mixin block
andrew-fleming 43d3fd7
embed mixin in mock
andrew-fleming d68ccbb
add erc1155receiver mixin
andrew-fleming e55b721
add changelog entry
andrew-fleming d3374ee
fix conflicts
andrew-fleming 80cea2b
fix formatting
andrew-fleming ba7b072
remove i from mixin interface
andrew-fleming e5b2d50
add self to receiver API fns
andrew-fleming 1000a4a
Merge branch 'main' into add-erc1155-mixin
andrew-fleming 3146271
remove src5 camel
andrew-fleming 271cc41
fix interface imports
andrew-fleming 5372371
fix formatting
andrew-fleming 9e138c4
fix conflicts
andrew-fleming File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to move this now to the Unreleased section.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I created a separate entry specifically for ERC115 and ERC1155Receiver in Unreleased