Skip to content

Change behavior of unwrap to preserve wrapped token URI #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2022
Merged

Change behavior of unwrap to preserve wrapped token URI #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion contracts/feature/TokenBundle.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ abstract contract TokenBundle is ITokenBundle {

/// @dev Lets the calling contract delete a particular bundle.
function _deleteBundle(uint256 _bundleId) internal {
delete bundle[_bundleId];
for (uint256 i = 0; i < bundle[_bundleId].count; i += 1) {
delete bundle[_bundleId].tokens[i];
}
bundle[_bundleId].count = 0;
}
}
9 changes: 6 additions & 3 deletions src/test/Multiwrap.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,8 @@ contract MultiwrapTest is BaseTest {
vm.expectRevert("ERC721: owner query for nonexistent token");
multiwrap.ownerOf(expectedIdForWrappedToken);

assertEq("", multiwrap.tokenURI(expectedIdForWrappedToken));
assertEq(uriForWrappedToken, multiwrap.tokenURI(expectedIdForWrappedToken));
assertEq(0, multiwrap.getTokenCountOfBundle(expectedIdForWrappedToken));

ITokenBundle.Token[] memory contentsOfWrappedToken = multiwrap.getWrappedContents(expectedIdForWrappedToken);
assertEq(contentsOfWrappedToken.length, 0);
Expand Down Expand Up @@ -519,7 +520,8 @@ contract MultiwrapTest is BaseTest {
vm.expectRevert("ERC721: owner query for nonexistent token");
multiwrap.ownerOf(expectedIdForWrappedToken);

assertEq("", multiwrap.tokenURI(expectedIdForWrappedToken));
assertEq(uriForWrappedToken, multiwrap.tokenURI(expectedIdForWrappedToken));
assertEq(0, multiwrap.getTokenCountOfBundle(expectedIdForWrappedToken));

ITokenBundle.Token[] memory contentsOfWrappedToken = multiwrap.getWrappedContents(expectedIdForWrappedToken);
assertEq(contentsOfWrappedToken.length, 0);
Expand Down Expand Up @@ -750,7 +752,8 @@ contract MultiwrapTest is BaseTest {
vm.expectRevert("ERC721: owner query for nonexistent token");
multiwrap.ownerOf(expectedIdForWrappedToken);

assertEq("", multiwrap.tokenURI(expectedIdForWrappedToken));
assertEq(uriForWrappedToken, multiwrap.tokenURI(expectedIdForWrappedToken));
assertEq(0, multiwrap.getTokenCountOfBundle(expectedIdForWrappedToken));

ITokenBundle.Token[] memory contentsOfWrappedToken = multiwrap.getWrappedContents(expectedIdForWrappedToken);
assertEq(contentsOfWrappedToken.length, 0);
Expand Down