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

Use of namespaces for ERC721 & ERC721Enumerable #296

Merged
merged 25 commits into from
Jun 16, 2022
Merged

Use of namespaces for ERC721 & ERC721Enumerable #296

merged 25 commits into from
Jun 16, 2022

Conversation

Amxx
Copy link
Contributor

@Amxx Amxx commented Apr 29, 2022

No description provided.

andrew-fleming
andrew-fleming requested changes May 3, 2022
View reviewed changes
Copy link
Collaborator

@andrew-fleming andrew-fleming left a comment

Choose a reason for hiding this comment

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

This looks great! I left a couple of comments :)

src/openzeppelin/token/erc721/ERC721_Mintable_Burnable.cairo Outdated Show resolved Hide resolved
src/openzeppelin/token/erc721/library.cairo Outdated Show resolved Hide resolved
martriay
martriay reviewed May 5, 2022
View reviewed changes
tests/mocks/ERC721_SafeMintable_mock.cairo
@@ -209,17 +192,17 @@ func safeMint{
data: felt*
):
Ownable_only_owner()
ERC721_safeMint(to, tokenId, data_len, data)
ERC721._safe_mint(to, tokenId, data_len, data)
Copy link
Contributor

Choose a reason for hiding this comment

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

This tokenId, data_len bit is the most annoying code in the library. It's the next thing to tackle.

martriay
martriay suggested changes May 5, 2022
View reviewed changes
Copy link
Contributor

@martriay martriay left a comment

Choose a reason for hiding this comment

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

Please check the merge conflicts and update the docs with the new scoping!

@Amxx
Copy link
Contributor Author

Amxx commented May 5, 2022

@martriay Is that good ?

martriay
martriay suggested changes May 6, 2022
View reviewed changes
Copy link
Contributor

@martriay martriay left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I think we're still missing the API part of the docs, since the library methods are now snake_case, and probably a comment about the need to camelCase methods when exposing them.

docs/ERC721.md Outdated Show resolved Hide resolved
docs/ERC721.md Outdated Show resolved Hide resolved
docs/ERC721.md Outdated Show resolved Hide resolved
docs/ERC721.md Outdated Show resolved Hide resolved
@Amxx @martriay
Apply suggestions from code review
a2cf966 
Co-authored-by: Martín Triay <martriay@gmail.com>
@koloz193 koloz193 mentioned this pull request May 6, 2022
Closed
@JulissaDantes JulissaDantes changed the title Using namespaces for ERC721 & ERC721Enumerable Use of namespaces for ERC721 & ERC721Enumerable May 10, 2022
andrew-fleming
andrew-fleming reviewed May 24, 2022
View reviewed changes
Copy link
Collaborator

@andrew-fleming andrew-fleming left a comment

Choose a reason for hiding this comment

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

Excellent improvements! I left a minor comment; otherwise, I think this is ready to go!

src/openzeppelin/token/erc721/library.cairo Outdated Show resolved Hide resolved
docs/ERC721.md Show resolved Hide resolved
andrew-fleming
andrew-fleming approved these changes May 24, 2022
View reviewed changes
Copy link
Collaborator

@andrew-fleming andrew-fleming left a comment

Choose a reason for hiding this comment

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

Great work! 🎉🎉

andrew-fleming
andrew-fleming reviewed May 24, 2022
View reviewed changes
Copy link
Collaborator

@andrew-fleming andrew-fleming left a comment

Choose a reason for hiding this comment

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

@Amxx I take it back! 😅 I'm so sorry, I'm just catching this now: I'm thinking we should move the internal library functions (private in Solidity) outside of the namespace to protect them . What do you think?

src/openzeppelin/token/erc721/library.cairo Outdated Show resolved Hide resolved
src/openzeppelin/token/erc721_enumerable/library.cairo Outdated Show resolved Hide resolved
@Amxx
Copy link
Contributor Author

Amxx commented May 25, 2022

@Amxx I take it back! sweat_smile I'm so sorry, I'm just catching this now: I'm thinking we should move the internal library functions (private in Solidity) outside of the namespace to protect them . What do you think?

Yes, that sounds like the right way

andrew-fleming
andrew-fleming approved these changes May 25, 2022
View reviewed changes
Copy link
Collaborator

@andrew-fleming andrew-fleming left a comment

Choose a reason for hiding this comment

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

Great work, sir :)

src/openzeppelin/token/erc721_enumerable/library.cairo Outdated Show resolved Hide resolved
@martriay martriay merged commit b27101e into OpenZeppelin:main Jun 16, 2022
@Amxx Amxx deleted the feature/erc721/namespace branch June 17, 2022 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrew-fleming andrew-fleming andrew-fleming approved these changes

@martriay martriay martriay approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Amxx @martriay @andrew-fleming