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

fix(protocol): use safeTransfer in TaikoInbox (reported by OpenZeppelin) #18848

Merged
merged 7 commits into from
Jan 30, 2025
Merged

fix(protocol): use safeTransfer in TaikoInbox (reported by OpenZeppelin) #18848

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce14f3f
SafeERC20
dantaik Jan 29, 2025
494f5fd
Update TaikoInbox.sol
dantaik Jan 29, 2025
240c6eb
fix
dantaik Jan 30, 2025
44b9ed6
more
dantaik Jan 30, 2025
cbc4166
Update protocol.yml
dantaik Jan 30, 2025
a85a33c
Update InboxTest_EtherAsBond.t.sol
dantaik Jan 30, 2025
2567eaa
Update InboxTest_EtherAsBond.t.sol
dantaik Jan 30, 2025
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
27 changes: 19 additions & 8 deletions packages/protocol/contracts/layer1/based/TaikoInbox.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;

import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import "src/shared/common/EssentialContract.sol";
import "src/shared/based/ITaiko.sol";
import "src/shared/libs/LibAddress.sol";
Expand All @@ -27,6 +27,7 @@ import "./ITaikoInbox.sol";
/// @custom:security-contact [email protected]
abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
using LibMath for uint256;
using SafeERC20 for IERC20;

State public state; // storage layout much match Ontake fork
uint256[50] private __gap;
Expand Down Expand Up @@ -369,8 +370,7 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {

/// @inheritdoc ITaikoInbox
function depositBond(uint256 _amount) external payable whenNotPaused {
state.bondBalance[msg.sender] += _amount;
_handleDeposit(msg.sender, _amount);
state.bondBalance[msg.sender] += _handleDeposit(msg.sender, _amount);
}

/// @inheritdoc ITaikoInbox
Expand All @@ -384,7 +384,7 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {

address bond = bondToken();
if (bond != address(0)) {
IERC20(bond).transfer(msg.sender, _amount);
IERC20(bond).safeTransfer(msg.sender, _amount);
} else {
LibAddress.sendEtherAndVerify(msg.sender, _amount);
}
Expand Down Expand Up @@ -684,7 +684,8 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
state.bondBalance[_user] = balance - _amount;
}
} else {
_handleDeposit(_user, _amount);
uint256 amountDeposited = _handleDeposit(_user, _amount);
require(amountDeposited == _amount, InsufficientBond());
}
emit BondDebited(_user, _amount);
}
Expand All @@ -697,16 +698,26 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
emit BondCredited(_user, _amount);
}

function _handleDeposit(address _user, uint256 _amount) private {
function _handleDeposit(
address _user,
uint256 _amount
)
private
returns (uint256 amountDeposited_)
{
address bond = bondToken();

if (bond != address(0)) {
require(msg.value == 0, MsgValueNotZero());
IERC20(bond).transferFrom(_user, address(this), _amount);

uint256 balance = IERC20(bond).balanceOf(address(this));
IERC20(bond).safeTransferFrom(_user, address(this), _amount);
amountDeposited_ = IERC20(bond).balanceOf(address(this)) - balance;
} else {
require(msg.value == _amount, EtherNotPaidAsBond());
amountDeposited_ = _amount;
}
emit BondDeposited(_user, _amount);
emit BondDeposited(_user, amountDeposited_);
}

function _validateBatchParams(
Expand Down
Loading