Skip to content

harmonise from-allowed check across LibFlow.flowERC20/721/1155 #433

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
thedavidmeister merged 1 commit into from
Apr 29, 2026
Merged

harmonise from-allowed check across LibFlow.flowERC20/721/1155 #433

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
14 changes: 9 additions & 5 deletions src/lib/LibFlow.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,18 @@ library LibFlow {
ERC20Transfer memory transfer;
for (uint256 i = 0; i < flowTransfer.erc20.length; i++) {
transfer = flowTransfer.erc20[i];
// We don't support `from` as anyone other than `you` or `me`
// as this would allow for all kinds of issues re: approvals.
if (transfer.from != msg.sender && transfer.from != address(this)) {
revert UnsupportedERC20Flow();
}
// OZ ERC20 `transferFrom` consumes allowance even when
// `from == msg.sender`, so the self-flow branch must use
// `safeTransfer` instead.
if (transfer.from == msg.sender) {
IERC20(transfer.token).safeTransferFrom(msg.sender, transfer.to, transfer.amount);
} else if (transfer.from == address(this)) {
IERC20(transfer.token).safeTransfer(transfer.to, transfer.amount);
} else {
// We don't support `from` as anyone other than `you` or `me`
// as this would allow for all kinds of issues re: approvals.
revert UnsupportedERC20Flow();
IERC20(transfer.token).safeTransfer(transfer.to, transfer.amount);
}
}
}
Expand Down
Loading