refactor(erc1155): modular facet architecture with exportSelectors#286
Draft
aapsi wants to merge 4 commits intoPerfect-Abstractions:mainfrom
Draft
refactor(erc1155): modular facet architecture with exportSelectors#286aapsi wants to merge 4 commits intoPerfect-Abstractions:mainfrom
aapsi wants to merge 4 commits intoPerfect-Abstractions:mainfrom
Conversation
…d selector discovery.
…nd renaming burn functions for clarity.
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
👷 Deploy request for compose-diamonds pending review.Visit the deploys page to approve it
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Refactors the ERC1155 implementation to match the modular facet pattern established by ERC20
and ERC721. Splits the monolithic
ERC1155Facet.solinto focused facets and modules perconcern, and adds
exportSelectors()to each facet as a selector discovery mechanism perEIP-8153.
Changes Made
ERC1155Facet.sol,ERC1155DataFacet.sol,ERC1155Mod.solApprove/ERC1155ApproveFacet.sol— externalsetApprovalForAllApprove/ERC1155ApproveMod.sol— internal free function for approval logicBurn/ERC1155BurnFacet.sol— externalburnERC1155andburnERC1155Batchwithowner/operator authorization
Burn/ERC1155BurnMod.sol— internal free functions for burn logicData/ERC1155DataFacet.sol— external read-only functions:balanceOf,balanceOfBatch,isApprovedForAllMetadata/ERC1155MetadataFacet.sol— externaluriwith per-token and base URIsupport
Metadata/ERC1155MetadataMod.sol— internal free functions:setURI,setBaseURI,setTokenURIMint/ERC1155MintMod.sol— internal free functions:mintERC1155,mintERC1155Batchwith ERC1155Receiver validationTransfer/ERC1155TransferFacet.sol— externalsafeTransferFromandsafeBatchTransferFromwith ERC1155Receiver validationTransfer/ERC1155TransferMod.sol— internal free functions for transfer logicexportSelectors()to all 5 facets (Approve, Burn, Data, Metadata, Transfer)mintERC1155,burnERC1155, etc.(consistent with
mintERC20,burnERC721)keccak256("erc1155")for core token data,keccak256("erc1155.metadata")for metadataChecklist
Before submitting this PR, please ensure:
Code follows the Solidity feature ban - No inheritance, constructors, modifiers,
public/private variables, external library functions,
using fordirectives, orselfdestructCode follows Design Principles - Readable, uses diamond storage, favors composition
over inheritance
Code matches the codebase style - Consistent formatting, documentation, and
patterns (e.g. ERC20Facet.sol)
Code is formatted with
forge fmtExisting tests pass - Run tests to be sure existing tests pass.
All tests pass - Run
forge testand ensure everything worksDocumentation updated - If applicable, update relevant documentation
Make sure to follow the
contributing guidelines.
Additional Notes
Existing test files still reference the deleted pre-refactor files and will need to be
updated.