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

Jump to bottom

fix(protocol): revert "add batch transfer and burn for BridgedERC721 (#17058) #17066

Merged
merged 1 commit into from
May 9, 2024
Merged

fix(protocol): revert "add batch transfer and burn for BridgedERC721 (#17058) #17066

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
30 changes: 11 additions & 19 deletions packages/protocol/contracts/tokenvault/BridgedERC721.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,41 +51,33 @@ contract BridgedERC721 is EssentialContract, ERC721Upgradeable {

/// @dev Mints tokens.
/// @param _account Address to receive the minted token.
/// @param _tokenIds IDs of the tokens to mint.
function batchMint(
/// @param _tokenId ID of the token to mint.
function mint(
address _account,
uint256[] memory _tokenIds
uint256 _tokenId
)
external
whenNotPaused
onlyFromNamed(LibStrings.B_ERC721_VAULT)
nonReentrant
{
for (uint256 i; i < _tokenIds.length; ++i) {
_safeMint(_account, _tokenIds[i]);
}
_safeMint(_account, _tokenId);
}

/// @dev Burns tokens.
/// @param _tokenIds IDs of the tokens to burn.
function batchBurn(uint256[] memory _tokenIds)
/// @param _tokenId ID of the token to burn.
function burn(uint256 _tokenId)
external
whenNotPaused
onlyFromNamed(LibStrings.B_ERC721_VAULT)
nonReentrant
{
for (uint256 i; i < _tokenIds.length; ++i) {
// Check if the caller is the owner of the token. Somehow this is not done inside the
// _burn() function below.
if (ownerOf(_tokenIds[i]) != msg.sender) revert BTOKEN_INVALID_BURN();
_burn(_tokenIds[i]);
}
}

function safeBatchTransferFrom(address _from, address _to, uint256[] memory _tokenIds) public {
for (uint256 i; i < _tokenIds.length; ++i) {
safeTransferFrom(_from, _to, _tokenIds[i], "");
// Check if the caller is the owner of the token. Somehow this is not done inside the
// _burn() function below.
if (ownerOf(_tokenId) != msg.sender) {
revert BTOKEN_INVALID_BURN();
}
_burn(_tokenId);
}

/// @notice Gets the source token and source chain ID being bridged.
Expand Down
18 changes: 12 additions & 6 deletions packages/protocol/contracts/tokenvault/ERC721Vault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@ contract ERC721Vault is BaseNFTVault, IERC721Receiver {
}
} else {
token_ = _getOrDeployBridgedToken(_ctoken);
BridgedERC721(token_).batchMint(_to, _tokenIds);
for (uint256 i; i < _tokenIds.length; ++i) {
BridgedERC721(token_).mint(_to, _tokenIds[i]);
}
}
}

Expand All @@ -194,10 +196,12 @@ contract ERC721Vault is BaseNFTVault, IERC721Receiver {
CanonicalNFT storage _ctoken = bridgedToCanonical[_op.token];
if (_ctoken.addr != address(0)) {
ctoken_ = _ctoken;
BridgedERC721(_op.token).safeBatchTransferFrom(
msg.sender, address(this), _op.tokenIds
);
BridgedERC721(_op.token).batchBurn(_op.tokenIds);
for (uint256 i; i < _op.tokenIds.length; ++i) {
BridgedERC721(_op.token).safeTransferFrom(
msg.sender, address(this), _op.tokenIds[i]
);
BridgedERC721(_op.token).burn(_op.tokenIds[i]);
}
} else {
ctoken_ = CanonicalNFT({
chainId: uint64(block.chainid),
Expand All @@ -207,7 +211,9 @@ contract ERC721Vault is BaseNFTVault, IERC721Receiver {
});

for (uint256 i; i < _op.tokenIds.length; ++i) {
IERC721(_op.token).safeTransferFrom(msg.sender, address(this), _op.tokenIds[i]);
ERC721Upgradeable(_op.token).safeTransferFrom(
msg.sender, address(this), _op.tokenIds[i]
);
}
}
}
Expand Down
5 changes: 1 addition & 4 deletions packages/protocol/test/tokenvault/ERC721Vault.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,10 +907,7 @@ contract ERC721VaultTest is TaikoTest {
// Also Vault cannot burn tokens it does not own (even if the priv key compromised)
vm.prank(address(destChainErc721Vault), address(destChainErc721Vault));
vm.expectRevert(BridgedERC721.BTOKEN_INVALID_BURN.selector);

tokenIds = new uint256[](1);
tokenIds[0] = 1;
BridgedERC721(deployedContract).batchBurn(tokenIds);
BridgedERC721(deployedContract).burn(1);

// After approve() ERC721Vault can transfer and burn
vm.prank(Alice, Alice);
Expand Down