Skip to content
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

Optimize nested mapping access in ERC721Enumerable #4545

Merged
merged 5 commits into from
Mar 25, 2024
Merged

Optimize nested mapping access in ERC721Enumerable #4545

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6b9784
Optimize nested mapping usage in ERC721Enumerable
0xVolosnikov Aug 28, 2023
4620087
Add changeset
0xVolosnikov Aug 28, 2023
bd3fcc9
Run prettier
0xVolosnikov Aug 28, 2023
1b4df2c
Merge branch 'master' into optimize-mapping-usage-in-ERC721Enumerable
Amxx Jan 18, 2024
0edf4db
Delete .changeset/curvy-fans-wave.md
Amxx Jan 18, 2024
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
8 changes: 5 additions & 3 deletions contracts/token/ERC721/extensions/ERC721Enumerable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,19 @@ abstract contract ERC721Enumerable is ERC721, IERC721Enumerable {
uint256 lastTokenIndex = balanceOf(from);
uint256 tokenIndex = _ownedTokensIndex[tokenId];

mapping(uint256 index => uint256) storage _ownedTokensByOwner = _ownedTokens[from];

// When the token to delete is the last token, the swap operation is unnecessary
if (tokenIndex != lastTokenIndex) {
uint256 lastTokenId = _ownedTokens[from][lastTokenIndex];
uint256 lastTokenId = _ownedTokensByOwner[lastTokenIndex];

_ownedTokens[from][tokenIndex] = lastTokenId; // Move the last token to the slot of the to-delete token
_ownedTokensByOwner[tokenIndex] = lastTokenId; // Move the last token to the slot of the to-delete token
_ownedTokensIndex[lastTokenId] = tokenIndex; // Update the moved token's index
}

// This also deletes the contents at the last position of the array
delete _ownedTokensIndex[tokenId];
delete _ownedTokens[from][lastTokenIndex];
delete _ownedTokensByOwner[lastTokenIndex];
}

/**
Expand Down
Loading