Merge pull request #24 from StabilityNexus/FrontendSar

Removed inactive tokens mapping and added a mapping in factory.

Author: Zahnentferner

contracts/src/Factory.sol

@@ -10,6 +10,7 @@ contract Factory {
     mapping(address => address[]) public deployedTNTs;
     mapping(address => address[]) public userTNTs;
     mapping(address => bool) public isDeployedTNT;
+    mapping(address => mapping(address => bool)) private userHasTNT;
 
     event TNTCreated(address indexed owner, address tntAddress);
     event TokenRegistered(address indexed user, address indexed tntAddress);
@@ -30,25 +31,23 @@ contract Factory {
     }
 
     function registerIssuedToken(address user, address tntAddr) external onlyDeployedTNT {
-        address[] storage userTokens = userTNTs[user];
-        uint256 len = userTokens.length;
-        
-        for (uint256 i = 0; i < len; i++) {
-            if (userTokens[i] == tntAddr) return;
-        }
-        
-        userTokens.push(tntAddr);
+        if (userHasTNT[user][tntAddr]) return;
+        userTNTs[user].push(tntAddr);
+        userHasTNT[user][tntAddr] = true;
         emit TokenRegistered(user, tntAddr);
     }
 
     function unregisterToken(address user, address tntAddr) external onlyDeployedTNT {
+        if (!userHasTNT[user][tntAddr]) return;
+        
         address[] storage userTokens = userTNTs[user];
         uint256 len = userTokens.length;
 
         for (uint256 i = 0; i < len; i++) {
             if (userTokens[i] == tntAddr) {
                 userTokens[i] = userTokens[len - 1];
                 userTokens.pop();
+                userHasTNT[user][tntAddr] = false;
                 emit TokenUnregistered(user, tntAddr);
                 break;
             }

contracts/src/TNT.sol

@@ -22,7 +22,6 @@ contract TNT is ERC721, AccessControl {
 
     uint256 private _nextTokenId;
     mapping(uint256 => address) public tokenIssuers;
-    mapping(address => uint256[]) public _tokensByRecipient;        
     mapping(address => uint256[]) public _activeTokensByRecipient;  
     address[] public _allRecipients;                                
     mapping(address => bool) public _isRecipient;                   
@@ -62,7 +61,6 @@ contract TNT is ERC721, AccessControl {
         _safeMint(recipient, tokenId);
         tokenIssuers[tokenId] = msg.sender;
         metadata[tokenId] = TokenMetadata(block.timestamp);
-        _tokensByRecipient[recipient].push(tokenId);
         _activeTokensByRecipient[recipient].push(tokenId);
 
         if (!_isRecipient[recipient]) {
@@ -112,17 +110,6 @@ contract TNT is ERC721, AccessControl {
         }
     }
 
-    function getAllIssuedTokens(address user) public view returns (uint256[] memory tokenIds, address[] memory issuers) {
-        uint256 len = _tokensByRecipient[user].length;
-        tokenIds = new uint256[](len);
-        issuers = new address[](len);
-
-        for (uint256 i = 0; i < len; i++) {
-            tokenIds[i] = _tokensByRecipient[user][i];
-            issuers[i] = tokenIssuers[tokenIds[i]];
-        }
-    }
-
     function getActiveTokens(address user) public view returns (uint256[] memory tokenIds, address[] memory issuers) {
         uint256 len = _activeTokensByRecipient[user].length;
         tokenIds = new uint256[](len);