diff --git a/contracts/BEBase.sol b/contracts/BEBase.sol index e9d89de..a243b9c 100644 --- a/contracts/BEBase.sol +++ b/contracts/BEBase.sol @@ -42,23 +42,7 @@ abstract contract BEBase is ERC721, AccessControlEnumerable, ERC721Enumerable, O } /** - * @dev See {IERC721-isApprovedForAll}. - */ - function isApprovedForAll(address owner, address operator) - public - view - override - returns (bool) - { - if (approvalWhitelists[operator]) { - return true; - } - - return super.isApprovedForAll(owner, operator); - } - - /** - * @dev Allow operation to reduce gas fee. + * @dev Allow operation to approval list. */ function addApprovalWhitelist(address proxy) external onlyOwner { require(!approvalWhitelists[proxy], "Invalid proxy address"); @@ -161,6 +145,7 @@ abstract contract BEBase is ERC721, AccessControlEnumerable, ERC721Enumerable, O "Must have burn role to burn" ); require(_exists(tokenId), "TokenId not exists"); + require(!lockedTokens[tokenId], "Can not burn locked token"); require( ownerOf(tokenId) == owner, "current address is not owner of this item now"