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

Has roles #158

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Has roles #158

merged 2 commits into from
Sep 11, 2024

Conversation

GWSzeto
Copy link
Contributor

@GWSzeto GWSzeto commented Sep 11, 2024

No description provided.

@GWSzeto GWSzeto merged commit 3a4d98d into main Sep 11, 2024
5 checks passed
@GWSzeto GWSzeto deleted the has-roles branch September 11, 2024 14:57
GWSzeto added a commit that referenced this pull request Sep 11, 2024
* [L-4] Wrong function selector returned for the transfer validation function (#150)

* [L-4] Wrong function selector returned for the transfer validation function

* [Q-3] Move interface identifier for ERC165 to Core

* [Q-5] Royalty modules should inherit ICreatorToken interface

* [Q-6] Nitpicks

* removes duplicate supportsInterface (#156)

* Has roles (#158)

* created hasRole function in the roylaty module

* created tests

* removed duplicate constant in royaltyERC721
GWSzeto added a commit that referenced this pull request Sep 12, 2024
* renamed to nextTokenIdToMint in BatchMetadata (#141)

* fix: expectRevert on low-level call (#136)

* update batchMetadata logic to make each batchUris independent (#144)

* update batchMetadata logic to make each batchUris independent

* format

* Module Core Refactor (#145)

* separated out metadata functionality from mintable module

* built in signature mint into the core erc721 contract

* implemented in Mintable

* Implemented updateMetadata

* simplified parameters and structs

* all tests pass

* updated ERC721 initializable to match ERC721Core

* addressed the PR issues

* updated 1155 versions to now match 721 implementations

* completed all the tests

* Implemented parity in the ERC1155Initializable contract

* unified naming from quantity and value to amount

* slapped on a keccak256

* move OwnableRoles check on the signature

* removed double events being emitted

* tests pass

* updated ERC20 core

* implemented Claimable and Mintable on the ERC20 side

* tests pass

* updated based on PR feedback

* Fix getSupportedCallbackFunctions ub ERC721CoreInitializable (#149)

* implmented delayed functionality into batchMetadata (#148)

* implmented delayed functionality into batchMetadata

* created tests for BatchMetadata

* updated ERC1155 tests and updated from batchStartId to batchRange

* Implement tokenIdERC1155 module to handle tokenId management (#147)

* initial commit

* created tests for tokenIdERC1155

* updated to be optional

* updated naming and tests

* Transfer validator has roles (#143)

* created hasRole function in the roylaty module

* created tests

* Optimzed callback execution (#135)

* gas benchmark

* optimize execute callback function

* fix typo

* optimize execute callback view function

* optimize callback mode loop

* Implement Max per wallet (#151)

* implemented maxMintPerWallet

* tests pass

* maxMintPerWalletExceeded tests pass

* introduced base contracts for core and initilizable to inherit

* rename commit

* rename commit

* renamed from core to coreInitializable for the ERC1155 (#152)

* updated to now use 1e18 divided (#153)

* Remove double initializer in ERC721CoreInitializable (#154)

* rebase off of main (#157)

* [L-4] Wrong function selector returned for the transfer validation function (#150)

* [L-4] Wrong function selector returned for the transfer validation function

* [Q-3] Move interface identifier for ERC165 to Core

* [Q-5] Royalty modules should inherit ICreatorToken interface

* [Q-6] Nitpicks

* removes duplicate supportsInterface (#156)

* renamed to nextTokenIdToMint in BatchMetadata (#141)

* fix: expectRevert on low-level call (#136)

* update batchMetadata logic to make each batchUris independent (#144)

* update batchMetadata logic to make each batchUris independent

* format

* Module Core Refactor (#145)

* separated out metadata functionality from mintable module

* built in signature mint into the core erc721 contract

* implemented in Mintable

* Implemented updateMetadata

* simplified parameters and structs

* all tests pass

* updated ERC721 initializable to match ERC721Core

* addressed the PR issues

* updated 1155 versions to now match 721 implementations

* completed all the tests

* Implemented parity in the ERC1155Initializable contract

* unified naming from quantity and value to amount

* slapped on a keccak256

* move OwnableRoles check on the signature

* removed double events being emitted

* tests pass

* updated ERC20 core

* implemented Claimable and Mintable on the ERC20 side

* tests pass

* updated based on PR feedback

* Fix getSupportedCallbackFunctions ub ERC721CoreInitializable (#149)

* implmented delayed functionality into batchMetadata (#148)

* implmented delayed functionality into batchMetadata

* created tests for BatchMetadata

* updated ERC1155 tests and updated from batchStartId to batchRange

* Implement tokenIdERC1155 module to handle tokenId management (#147)

* initial commit

* created tests for tokenIdERC1155

* updated to be optional

* updated naming and tests

* Transfer validator has roles (#143)

* created hasRole function in the roylaty module

* created tests

* Optimzed callback execution (#135)

* gas benchmark

* optimize execute callback function

* fix typo

* optimize execute callback view function

* optimize callback mode loop

* Implement Max per wallet (#151)

* implemented maxMintPerWallet

* tests pass

* maxMintPerWalletExceeded tests pass

* introduced base contracts for core and initilizable to inherit

* rename commit

* rename commit

* renamed from core to coreInitializable for the ERC1155 (#152)

* updated to now use 1e18 divided (#153)

* Remove double initializer in ERC721CoreInitializable (#154)

---------

Co-authored-by: Pranav Garg <[email protected]>
Co-authored-by: Joaquim Verges <[email protected]>

* Duplicate constant (#161)

* [L-4] Wrong function selector returned for the transfer validation function (#150)

* [L-4] Wrong function selector returned for the transfer validation function

* [Q-3] Move interface identifier for ERC165 to Core

* [Q-5] Royalty modules should inherit ICreatorToken interface

* [Q-6] Nitpicks

* removes duplicate supportsInterface (#156)

* Has roles (#158)

* created hasRole function in the roylaty module

* created tests

* removed duplicate constant in royaltyERC721

* removed .vscode

* case sensitivity issue

---------

Co-authored-by: Pranav Garg <[email protected]>
Co-authored-by: Joaquim Verges <[email protected]>
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