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

Make ERC3156Wrapper more flexible #44

Merged
merged 1 commit into from
May 6, 2024
Merged

Make ERC3156Wrapper more flexible #44

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
2 changes: 1 addition & 1 deletion .forge-snapshots/MakerDAO.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
313172
313302
2 changes: 1 addition & 1 deletion .forge-snapshots/MorphoPendle.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
558536
558528
13 changes: 9 additions & 4 deletions src/erc3156/ERC3156Wrapper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ contract ERC3156Wrapper is BaseWrapper, IERC3156FlashBorrower {

/// @inheritdoc IERC7399
function maxFlashLoan(address asset) external view returns (uint256) {
IERC3156FlashLender lender = lenders[asset];
IERC3156FlashLender lender = _lender(asset);
return address(lender) != address(0) ? _maxFlashLoan(lender, asset) : 0;
}

/// @inheritdoc IERC7399
function flashFee(address asset, uint256 amount) external view returns (uint256) {
IERC3156FlashLender lender = lenders[asset];
IERC3156FlashLender lender = _lender(asset);
require(address(lender) != address(0), "Unsupported currency");
return amount >= _maxFlashLoan(lender, asset) ? type(uint256).max : _flashFee(lender, asset, amount);
}
Expand All @@ -52,15 +52,15 @@ contract ERC3156Wrapper is BaseWrapper, IERC3156FlashBorrower {
returns (bytes32)
{
require(erc3156initiator == address(this), "External loan initiator");
require(msg.sender == address(lenders[asset]), "Unknown lender");
require(msg.sender == address(_lender(asset)), "Unknown lender");

_bridgeToCallback(asset, amount, fee, params);

return CALLBACK_SUCCESS;
}

function _flashLoan(address asset, uint256 amount, bytes memory data) internal override {
IERC3156FlashLender lender = lenders[asset];
IERC3156FlashLender lender = _lender(asset);
require(address(lender) != address(0), "Unsupported currency");

// We get funds from an ERC3156 lender to serve the ERC7399 flash loan in our ERC3156 callback
Expand All @@ -74,4 +74,9 @@ contract ERC3156Wrapper is BaseWrapper, IERC3156FlashBorrower {
function _flashFee(IERC3156FlashLender lender, address asset, uint256 amount) internal view returns (uint256) {
return lender.flashFee(asset, amount);
}

function _lender(address asset) internal view returns (IERC3156FlashLender lender) {
lender = lenders[asset];
if (address(lender) == address(0)) lender = IERC3156FlashLender(asset);
}
}
1 change: 0 additions & 1 deletion test/ERC3156Wrapper.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ pragma solidity >=0.8.19 <0.9.0;

import { Test } from "forge-std/Test.sol";
import { console2 } from "forge-std/console2.sol";
import { StdCheats } from "forge-std/StdCheats.sol";
import { IERC3156FlashLender } from "lib/erc3156/contracts/interfaces/IERC3156FlashLender.sol";

import { IERC20Metadata as IERC20 } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
Expand Down
Loading