Skip to content

Allowance check added considering issue 362 #371

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
advock wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allowance check added considering issue 362 #371

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
23 changes: 7 additions & 16 deletions src/mixins/ERC4626.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ abstract contract ERC4626 is ERC20 {

ERC20 public immutable asset;

constructor(
ERC20 _asset,
string memory _name,
string memory _symbol
) ERC20(_name, _symbol, _asset.decimals()) {
constructor(ERC20 _asset, string memory _name, string memory _symbol) ERC20(_name, _symbol, _asset.decimals()) {
asset = _asset;
}

Expand Down Expand Up @@ -70,17 +66,16 @@ abstract contract ERC4626 is ERC20 {
afterDeposit(assets, shares);
}

function withdraw(
uint256 assets,
address receiver,
address owner
) public virtual returns (uint256 shares) {
function withdraw(uint256 assets, address receiver, address owner) public virtual returns (uint256 shares) {
shares = previewWithdraw(assets); // No need to check for rounding error, previewWithdraw rounds up.

if (msg.sender != owner) {
uint256 allowed = allowance[owner][msg.sender]; // Saves gas for limited approvals.

if (allowed != type(uint256).max) allowance[owner][msg.sender] = allowed - shares;
if (allowed != type(uint256).max) {
require(assets <= allowance[owner][msg.sender], "amount to be withdraw is more than allowed");
allowance[owner][msg.sender] = allowed - shares;
}
}

beforeWithdraw(assets, shares);
Expand All @@ -92,11 +87,7 @@ abstract contract ERC4626 is ERC20 {
asset.safeTransfer(receiver, assets);
}

function redeem(
uint256 shares,
address receiver,
address owner
) public virtual returns (uint256 assets) {
function redeem(uint256 shares, address receiver, address owner) public virtual returns (uint256 assets) {
if (msg.sender != owner) {
uint256 allowed = allowance[owner][msg.sender]; // Saves gas for limited approvals.

Expand Down