Update EIP-6672: Move to Last Call

EIPS/eip-6672.md

@@ -2,9 +2,10 @@
 eip: 6672
 title: Multi-redeemable NFTs
 description: An extension of ERC-721 which enables an NFT to be redeemed in multiple scenarios for either a physical or digital object
-author: RE:DREAMER Lab <[email protected]>, Archie Chang (@ArchieR7) <[email protected]>, Kai Yu (@chihkaiyu) <[email protected]>, Yonathan Randyanto (@Randyanto) <[email protected]>
+author: RE:DREAMER Lab <[email protected]>, Archie Chang (@ArchieR7) <[email protected]>, Kai Yu (@chihkaiyu) <[email protected]>, Yonathan Randyanto (@Randyanto) <[email protected]>, Boyu Chu (@chuboyu) <[email protected]>
 discussions-to: https://ethereum-magicians.org/t/eip-6672-multi-redeemable-nfts/13276
-status: Review
+status: Last Call
+last-call-deadline: 2023-05-16
 type: Standards Track
 category: ERC
 created: 2023-02-21

assets/eip-6672/contracts/ERC6672.sol

@@ -11,49 +11,109 @@ abstract contract ERC6672 is ERC721, IERC6672 {
     bytes4 public constant IERC6672_ID = type(IERC6672).interfaceId;
 
     mapping(address => mapping(uint256 => mapping(bytes32 => bool))) redemptionStatus;
-    mapping(address => mapping(uint256 => mapping(bytes32 => string))) public memos;
+    mapping(address => mapping(uint256 => mapping(bytes32 => string)))
+        public memos;
     mapping(address => mapping(uint256 => EnumerableSet.Bytes32Set)) redemptions;
 
     constructor() ERC721("Multiple RedeemableNFT", "mrNFT") {}
 
-    function isRedeemed(address _operator, bytes32 _redemptionId, uint256 _tokenId) external view returns (bool) {
+    function isRedeemed(
+        address _operator,
+        bytes32 _redemptionId,
+        uint256 _tokenId
+    ) external view returns (bool) {
         return _isRedeemed(_operator, _redemptionId, _tokenId);
     }
 
-    function getRedemptionIds(address _operator, uint256 _tokenId) external view returns (bytes32[] memory) {
-        require(redemptions[_operator][_tokenId].length() > 0, "ERC6672: token doesn't have any redemptions.");
+    function getRedemptionIds(
+        address _operator,
+        uint256 _tokenId
+    ) external view returns (bytes32[] memory) {
+        require(
+            redemptions[_operator][_tokenId].length() > 0,
+            "ERC6672: token doesn't have any redemptions."
+        );
         return redemptions[_operator][_tokenId].values();
     }
-
-    function redeem(bytes32 _redemptionId, uint256 _tokenId, string memory _memo) external {
+
+    function redeem(
+        bytes32 _redemptionId,
+        uint256 _tokenId,
+        string memory _memo
+    ) external {
         address _operator = msg.sender;
-        require(!_isRedeemed(_operator, _redemptionId, _tokenId), "ERC6672: token already redeemed.");
+        require(
+            !_isRedeemed(_operator, _redemptionId, _tokenId),
+            "ERC6672: token already redeemed."
+        );
         _update(_operator, _redemptionId, _tokenId, _memo, true);
         redemptions[_operator][_tokenId].add(_redemptionId);
+        emit Redeem(
+            _operator,
+            _tokenId,
+            ownerOf(_tokenId),
+            _redemptionId,
+            _memo
+        );
     }
 
-    function cancel(bytes32 _redemptionId, uint256 _tokenId, string memory _memo) external {
+    function cancel(
+        bytes32 _redemptionId,
+        uint256 _tokenId,
+        string memory _memo
+    ) external {
         address _operator = msg.sender;
-        require(_isRedeemed(_operator, _redemptionId, _tokenId), "ERC6672: token doesn't redeemed.");
+        require(
+            _isRedeemed(_operator, _redemptionId, _tokenId),
+            "ERC6672: token doesn't redeemed."
+        );
         _update(_operator, _redemptionId, _tokenId, _memo, false);
         _removeRedemption(_operator, _redemptionId, _tokenId);
+        emit Cancel(_operator, _tokenId, _redemptionId, _memo);
     }
 
-    function _isRedeemed(address _operator, bytes32 _redemptionId, uint256 _tokenId) internal view returns (bool) {
+    function _isRedeemed(
+        address _operator,
+        bytes32 _redemptionId,
+        uint256 _tokenId
+    ) internal view returns (bool) {
         require(_exists(_tokenId), "ERC6672: token doesn't exists.");
         return redemptionStatus[_operator][_tokenId][_redemptionId];
     }
 
-    function _update(address _operator, bytes32 _redemptionId, uint256 _tokenId, string memory _memo, bool isRedeemed_) internal {
+    function _update(
+        address _operator,
+        bytes32 _redemptionId,
+        uint256 _tokenId,
+        string memory _memo,
+        bool isRedeemed_
+    ) internal {
         redemptionStatus[_operator][_tokenId][_redemptionId] = isRedeemed_;
         memos[_operator][_tokenId][_redemptionId] = _memo;
+        if (isRedeemed_) {
+            emit Redeem(
+                _operator,
+                _tokenId,
+                ownerOf(_tokenId),
+                _redemptionId,
+                _memo
+            );
+        } else {
+            emit Cancel(_operator, _tokenId, _redemptionId, _memo);
+        }
     }
 
-    function _removeRedemption(address _operator, bytes32 _redemptionId, uint256 _tokenId) internal {
+    function _removeRedemption(
+        address _operator,
+        bytes32 _redemptionId,
+        uint256 _tokenId
+    ) internal {
         redemptions[_operator][_tokenId].remove(_redemptionId);
     }
 
-    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC721, IERC165) returns (bool) {
+    function supportsInterface(
+        bytes4 interfaceId
+    ) public view virtual override(ERC721, IERC165) returns (bool) {
         return
             interfaceId == type(IERC721).interfaceId ||
             interfaceId == type(IERC6672).interfaceId ||

assets/eip-6672/contracts/interfaces/IERC6672.sol

@@ -4,8 +4,41 @@ pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 interface IERC6672 is IERC721 {
-    function isRedeemed(address _operator, bytes32 _redemptionId, uint256 _tokenId) external view returns (bool);
-    function getRedemptionIds(address _operator, uint256 _tokenId) external view returns (bytes32[] memory);
-    function redeem(bytes32 _redemptionId, uint256 _tokenId, string memory _memo) external;
-    function cancel(bytes32 _redemptionId, uint256 _tokenId, string memory _memo) external;
+    event Redeem(
+        address indexed _operator,
+        uint256 indexed _tokenId,
+        address redeemer,
+        bytes32 _redemptionId,
+        string _memo
+    );
+
+    event Cancel(
+        address indexed _operator,
+        uint256 indexed _tokenId,
+        bytes32 _redemptionId,
+        string _memo
+    );
+
+    function isRedeemed(
+        address _operator,
+        bytes32 _redemptionId,
+        uint256 _tokenId
+    ) external view returns (bool);
+
+    function getRedemptionIds(
+        address _operator,
+        uint256 _tokenId
+    ) external view returns (bytes32[] memory);
+
+    function redeem(
+        bytes32 _redemptionId,
+        uint256 _tokenId,
+        string memory _memo
+    ) external;
+
+    function cancel(
+        bytes32 _redemptionId,
+        uint256 _tokenId,
+        string memory _memo
+    ) external;
 }