Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into ERC1155-array-unsafe-memory-access-optimiz…
…ation
  • Loading branch information
frangio authored Jun 15, 2023
commit c57b2215a20b09a2fe919b56e9f2e903e431ca98
3 changes: 2 additions & 1 deletion contracts/token/ERC1155/ERC1155.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import "./extensions/IERC1155MetadataURI.sol";
import "../../utils/Context.sol";
import "../../utils/introspection/ERC165.sol";
import "../../utils/Arrays.sol";
import "../../interfaces/draft-IERC6093.sol";

/**
* @dev Implementation of the basic standard multi-token.
Expand All @@ -17,7 +18,7 @@ import "../../utils/Arrays.sol";
*
* _Available since v3.1._
*/
contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI {
abstract contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI, IERC1155Errors {
using Arrays for uint256[];
using Arrays for address[];

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.