Skip to content

fix: check ERC20 transfer return value in executeWithdrawal() #6

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

Open
FoxPink wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: check ERC20 transfer return value in executeWithdrawal() #6

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
3 changes: 2 additions & 1 deletion src/Treasury.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ contract Treasury is Initializable, UUPSUpgradeable, OwnableUpgradeable {
(bool success,) = request.to.call{value: request.amount}("");
if (!success) revert TransferFailed();
} else {
IERC20(request.token).transfer(request.to, request.amount);
bool success = IERC20(request.token).transfer(request.to, request.amount);
if (!success) revert TransferFailed();
}

emit WithdrawalExecuted(requestId);
Expand Down
10 changes: 6 additions & 4 deletions src/escrow/SafeBaseEscrowV1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ contract SafeBaseEscrowV1 is

emit EscrowCreated(escrowId, msg.sender, _seller, _token, _amount, _deadline);

if (registry != address(0)) {
IRegistry(registry).indexEscrow(escrowId, msg.sender, _seller, _amount, block.timestamp);
address registry_ = registry;
if (registry_ != address(0)) {
IRegistry(registry_).indexEscrow(escrowId, msg.sender, _seller, _amount, block.timestamp);
}

return escrowId;
Expand Down Expand Up @@ -369,8 +370,9 @@ contract SafeBaseEscrowV1 is
function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}

function _updateRegistryState(uint256 _escrowId) internal {
if (registry != address(0)) {
IRegistry(registry).updateEscrowState(_escrowId, uint8(escrows[_escrowId].state));
address registry_ = registry;
if (registry_ != address(0)) {
IRegistry(registry_).updateEscrowState(_escrowId, uint8(escrows[_escrowId].state));
}
}

Expand Down