removed handling of bundleId from TokenBundle

Author: Yash

contracts/feature/TokenBundle.sol

@@ -4,11 +4,9 @@ pragma solidity ^0.8.0;
 import "./interface/ITokenBundle.sol";
 
 abstract contract TokenBundle is ITokenBundle {
-    uint256 public bundleId;
     mapping(uint256 => BundleInfo) public bundle;
-    mapping(uint256 => bool) public deletedBundle;
 
-    // function getNextTokenId() public virtual returns (uint256);
+    // function _getNextBundleId() internal virtual returns (uint256);
 
     function getTokenCount(uint256 _bundleId) public view returns (uint256) {
         return bundle[_bundleId].count;
@@ -22,23 +20,7 @@ abstract contract TokenBundle is ITokenBundle {
         return bundle[_bundleId].uri;
     }
 
-    function getNextBundleId() public view returns (uint256) {
-        return bundleId;
-    }
-
-    function _setBundle(Token[] calldata _tokensToBind) internal returns (uint256 _bundleId) {
-        require(_tokensToBind.length > 0, "no tokens to bind");
-        for (uint256 i = 0; i < _tokensToBind.length; i += 1) {
-            bundle[bundleId].tokens[i] = _tokensToBind[i];
-        }
-        bundle[bundleId].count = _tokensToBind.length;
-        _bundleId = bundleId;
-        bundleId += 1;
-    }
-
-    function _resetBundle(Token[] calldata _tokensToBind, uint256 _bundleId) internal {
-        require(_bundleId < bundleId, "bundle doesn't exist");
-        require(!deletedBundle[_bundleId], "this bundle was deleted");
+    function _setBundle(Token[] calldata _tokensToBind, uint256 _bundleId) internal {
         require(_tokensToBind.length > 0, "no tokens to bind");
         for (uint256 i = 0; i < _tokensToBind.length; i += 1) {
             bundle[_bundleId].tokens[i] = _tokensToBind[i];
@@ -50,25 +32,17 @@ abstract contract TokenBundle is ITokenBundle {
         Token memory _tokenToBind,
         uint256 _bundleId,
         uint256 index,
-        bool update
+        bool isUpdate
     ) internal {
-        require(_bundleId < bundleId, "bundle doesn't exist");
-        require(!deletedBundle[_bundleId], "this bundle was deleted");
         bundle[_bundleId].tokens[index] = _tokenToBind;
-        bundle[_bundleId].count += update ? 0 : 1;
+        bundle[_bundleId].count += isUpdate ? 0 : 1;
     }
 
     function _setUri(string calldata _uri, uint256 _bundleId) internal {
-        require(_bundleId < bundleId, "bundle doesn't exist");
-        require(!deletedBundle[_bundleId], "this bundle was deleted");
         bundle[_bundleId].uri = _uri;
     }
 
     function _deleteBundle(uint256 _bundleId) internal {
-        require(_bundleId < bundleId, "bundle doesn't exist");
-        require(!deletedBundle[_bundleId], "already deleted");
-
         delete bundle[_bundleId];
-        deletedBundle[_bundleId] = true;
     }
 }

contracts/multiwrap/TempMultiwrap.sol

@@ -95,9 +95,6 @@ contract TempMultiwrap is
     //mychange
     // mapping(uint256=>BundleInfo) private bundle;
 
-    //mychange
-    mapping(uint256 => uint256) private tokenToBundle;
-
     /*///////////////////////////////////////////////////////////////
                     Constructor + initializer logic
     //////////////////////////////////////////////////////////////*/
@@ -175,7 +172,7 @@ contract TempMultiwrap is
     /// @dev Returns the URI for a given tokenId.
     function tokenURI(uint256 _tokenId) public view override returns (string memory) {
         // return uri[_tokenId]; //mychange
-        return getUri(tokenToBundle[_tokenId]);
+        return getUri(_tokenId);
     }
 
     /// @dev See ERC 165
@@ -219,7 +216,7 @@ contract TempMultiwrap is
         //mychange
         // tokenId = _getNextTokenId();
 
-        tokenToBundle[tokenId] = _setBundle(_wrappedContents); //mychange
+        _setBundle(_wrappedContents, tokenId); //mychange
 
         //mychange
         // for (uint256 i = 0; i < _wrappedContents.length; i += 1) {
@@ -230,7 +227,7 @@ contract TempMultiwrap is
         //mychange
         // uri[tokenId] = _uriForWrappedToken;
 
-        _setUri(_uriForWrappedToken, tokenToBundle[tokenId]);
+        _setUri(_uriForWrappedToken, tokenId);
 
         _safeMint(_recipient, tokenId);
 
@@ -251,17 +248,17 @@ contract TempMultiwrap is
 
         // uint256 count = wrappedContents[_tokenId].count; //mychange
 
-        uint256 count = getTokenCount(tokenToBundle[_tokenId]);
+        uint256 count = getTokenCount(_tokenId);
         Token[] memory tokensUnwrapped = new Token[](count);
 
         for (uint256 i = 0; i < count; i += 1) {
             // tokensUnwrapped[i] = wrappedContents[_tokenId].token[i]; //mychange
-            tokensUnwrapped[i] = getToken(tokenToBundle[_tokenId], i);
+            tokensUnwrapped[i] = getToken(_tokenId, i);
             transferToken(address(this), _recipient, tokensUnwrapped[i]);
         }
 
         // delete wrappedContents[_tokenId]; //mychange
-        _deleteBundle(tokenToBundle[_tokenId]);
+        _deleteBundle(_tokenId);
 
         emit TokensUnwrapped(_msgSender(), _recipient, _tokenId, tokensUnwrapped);
     }
@@ -328,12 +325,12 @@ contract TempMultiwrap is
     /// @dev Returns the underlygin contents of a wrapped NFT.
     function getWrappedContents(uint256 _tokenId) external view returns (Token[] memory contents) {
         //mychange
-        uint256 total = getTokenCount(tokenToBundle[_tokenId]);
+        uint256 total = getTokenCount(_tokenId);
         contents = new Token[](total);
 
         //mychange
         for (uint256 i = 0; i < total; i += 1) {
-            contents[i] = getToken(tokenToBundle[_tokenId], i);
+            contents[i] = getToken(_tokenId, i);
         }
     }
 

docs/TempMultiwrap.md

@@ -89,23 +89,6 @@ function bundle(uint256) external view returns (uint256 count, string uri)
 | count | uint256 | undefined
 | uri | string | undefined
 
-### bundleId
-
-```solidity
-function bundleId() external view returns (uint256)
-```
-
-
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined
-
 ### contractType
 
 ```solidity
@@ -157,28 +140,6 @@ function contractVersion() external pure returns (uint8)
 |---|---|---|
 | _0 | uint8 | undefined
 
-### deletedBundle
-
-```solidity
-function deletedBundle(uint256) external view returns (bool)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | undefined
-
 ### getApproved
 
 ```solidity
@@ -219,23 +180,6 @@ function getDefaultRoyaltyInfo() external view returns (address, uint16)
 | _0 | address | undefined
 | _1 | uint16 | undefined
 
-### getNextBundleId
-
-```solidity
-function getNextBundleId() external view returns (uint256)
-```
-
-
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined
-
 ### getRoleAdmin
 
 ```solidity

docs/TokenBundle.md

@@ -33,62 +33,6 @@ function bundle(uint256) external view returns (uint256 count, string uri)
 | count | uint256 | undefined
 | uri | string | undefined
 
-### bundleId
-
-```solidity
-function bundleId() external view returns (uint256)
-```
-
-
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined
-
-### deletedBundle
-
-```solidity
-function deletedBundle(uint256) external view returns (bool)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | undefined
-
-### getNextBundleId
-
-```solidity
-function getNextBundleId() external view returns (uint256)
-```
-
-
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined
-
 ### getToken
 
 ```solidity