updated to erc7399 (#8)

Co-authored-by: alcueca <alberto@yield.is>

.gitmodules

@@ -12,6 +12,6 @@
 [submodule "lib/erc3156"]
 	path = lib/erc3156
 	url = https://github.com/alcueca/erc3156
-[submodule "lib/erc3156pp"]
-	path = lib/erc3156pp
-	url = https://github.com/alcueca/erc3156pp
+[submodule "lib/erc7399"]
+	path = lib/erc7399
+	url = https://github.com/alcueca/erc7399

README.md

@@ -1,9 +1,9 @@
 # Foundry Template [![Open in Gitpod][gitpod-badge]][gitpod] [![Github Actions][gha-badge]][gha] [![Foundry][foundry-badge]][foundry] [![License: MIT][license-badge]][license]
 
-[gitpod]: https://gitpod.io/#https://github.com/alcueca/erc3156pp-wrappers
+[gitpod]: https://gitpod.io/#https://github.com/alcueca/erc7399-wrappers
 [gitpod-badge]: https://img.shields.io/badge/Gitpod-Open%20in%20Gitpod-FFB45B?logo=gitpod
-[gha]: https://github.com/alcueca/erc3156pp-wrappers/actions
-[gha-badge]: https://github.com/alcueca/erc3156pp-wrappers/actions/workflows/ci.yml/badge.svg
+[gha]: https://github.com/alcueca/erc7399-wrappers/actions
+[gha-badge]: https://github.com/alcueca/erc7399-wrappers/actions/workflows/ci.yml/badge.svg
 [foundry]: https://getfoundry.sh/
 [foundry-badge]: https://img.shields.io/badge/Built%20with-Foundry-FFDB1C.svg
 [license]: https://opensource.org/licenses/MIT

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@alcueca/erc3156pp-wrappers",
+  "name": "@alcueca/erc7399-wrappers",
   "description": "Wrappers for existing Flash Lenders to be accessible as ERC3156++ Flash Lenders",
   "version": "1.0.0",
   "author": {

src/BaseWrapper.sol

@@ -2,12 +2,12 @@
 // Thanks to ultrasecr.eth
 pragma solidity ^0.8.0;
 
-import { IERC3156PPFlashLender } from "lib/erc3156pp/src/interfaces/IERC3156PPFlashLender.sol";
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC7399 } from "lib/erc7399/src/interfaces/IERC7399.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 
 import { TransferHelper } from "./utils/TransferHelper.sol";
 
-abstract contract BaseWrapper is IERC3156PPFlashLender {
+abstract contract BaseWrapper is IERC7399 {
     using TransferHelper for IERC20;
 
     event GasUsed(uint256 gasUsed);
@@ -23,8 +23,8 @@ abstract contract BaseWrapper is IERC3156PPFlashLender {
 
     uint256 public expectedGas;
 
-    /// @inheritdoc IERC3156PPFlashLender
-    function flashLoan(
+    /// @inheritdoc IERC7399
+    function flash(
         address loanReceiver,
         IERC20 asset,
         uint256 amount,
@@ -91,9 +91,9 @@ abstract contract BaseWrapper is IERC3156PPFlashLender {
     }
 
     /// @dev Measure and record gas used in flash loans
-    function setExpectedGas(IERC20 asset) external returns (uint256 gasUsed){
+    function setExpectedGas(IERC20 asset) external returns (uint256 gasUsed) {
         uint256 gasLeftBefore = gasleft();
-        this.flashLoan(address(this), asset, 10 ** asset.decimals(), "", this.gasCallback);
+        this.flash(address(this), asset, 10 ** asset.decimals(), "", this.gasCallback);
 
         gasUsed = gasLeftBefore - gasleft();
         expectedGas = gasUsed;

src/aave/AaveWrapper.sol

@@ -8,7 +8,7 @@ import { ReserveConfiguration } from "./interfaces/ReserveConfiguration.sol";
 import { IPoolAddressesProvider } from "./interfaces/IPoolAddressesProvider.sol";
 import { IFlashLoanSimpleReceiver } from "./interfaces/IFlashLoanSimpleReceiver.sol";
 
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 import { FixedPointMathLib } from "lib/solmate/src/utils/FixedPointMathLib.sol";
 
 import { BaseWrapper } from "../BaseWrapper.sol";

src/balancer/BalancerWrapper.sol

@@ -8,7 +8,7 @@ import { IFlashLoaner } from "./interfaces/IFlashLoaner.sol";
 import { Arrays } from "../utils/Arrays.sol";
 
 import { FixedPointMathLib } from "lib/solmate/src/utils/FixedPointMathLib.sol";
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 
 import { BaseWrapper } from "../BaseWrapper.sol";
 

src/erc3156/ERC3156Wrapper.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import { IERC3156FlashLender } from "lib/erc3156/contracts/interfaces/IERC3156FlashLender.sol";
 import { IERC3156FlashBorrower } from "lib/erc3156/contracts/interfaces/IERC3156FlashBorrower.sol";
 
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 
 import { BaseWrapper } from "../BaseWrapper.sol";
 

src/uniswapV3/UniswapV3Wrapper.sol

@@ -6,7 +6,7 @@ import { IUniswapV3FlashCallback } from "./interfaces/callback/IUniswapV3FlashCa
 import { IUniswapV3Pool } from "./interfaces/IUniswapV3Pool.sol";
 import { PoolAddress } from "./interfaces/PoolAddress.sol";
 
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 
 import { BaseWrapper } from "../BaseWrapper.sol";
 
@@ -112,9 +112,11 @@ contract UniswapV3Wrapper is BaseWrapper, IUniswapV3FlashCallback {
         require(msg.sender == address(_activePool), "UniswapV3Wrapper: Only active pool");
 
         uint256 fee = fee0 > 0 ? fee0 : fee1;
-        IERC20 asset = IERC20(fee0 > 0 ? IUniswapV3Pool(msg.sender).token0() : IUniswapV3Pool(msg.sender).token1()); // TODO: Wouldn't it be cheaper to pass this on `params`?
+        IERC20 asset = IERC20(fee0 > 0 ? IUniswapV3Pool(msg.sender).token0() : IUniswapV3Pool(msg.sender).token1()); // TODO:
+            // Wouldn't it be cheaper to pass this on `params`?
         (uint256 amount, bytes memory data) = abi.decode(params, (uint256, bytes));
-        // uint256 amount = asset.balanceOf(address(this)); // TODO: This is not the amount we borrowed, but the amount we have in the contract. We should use the amount in data or calculate a delta
+        // uint256 amount = asset.balanceOf(address(this)); // TODO: This is not the amount we borrowed, but the amount
+        // we have in the contract. We should use the amount in data or calculate a delta
 
         bridgeToCallback(asset, amount, fee, data);
     }

src/utils/TransferHelper.sol

@@ -2,7 +2,7 @@
 // Taken from https://github.com/Uniswap/uniswap-lib/blob/master/src/libraries/TransferHelper.sol
 pragma solidity ^0.8.0;
 
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 import "./RevertMsgExtractor.sol";
 
 // helper methods for interacting with ERC20 tokens and sending ETH that do not consistently return true/false

test/AaveWrapper.t.sol

@@ -52,7 +52,7 @@ contract AaveWrapperTest is PRBTest, StdCheats {
 
         // Test the return values
         (bytes32 callbackReturn) = abi.decode(result, (bytes32));
-        assertEq(uint256(callbackReturn), uint256(borrower.ERC3156PP_CALLBACK_SUCCESS()), "Callback failed");
+        assertEq(uint256(callbackReturn), uint256(borrower.ERC7399_CALLBACK_SUCCESS()), "Callback failed");
 
         // Test the borrower state
         assertEq(borrower.flashInitiator(), address(borrower));

test/BalancerWrapper.t.sol

@@ -55,7 +55,7 @@ contract BalancerWrapperTest is PRBTest, StdCheats {
 
         // Test the return values
         (bytes32 callbackReturn) = abi.decode(result, (bytes32));
-        assertEq(uint256(callbackReturn), uint256(borrower.ERC3156PP_CALLBACK_SUCCESS()), "Callback failed");
+        assertEq(uint256(callbackReturn), uint256(borrower.ERC7399_CALLBACK_SUCCESS()), "Callback failed");
 
         // Test the borrower state
         assertEq(borrower.flashInitiator(), address(borrower));

test/BaseWrapper.t.sol

@@ -5,7 +5,7 @@ import { PRBTest } from "@prb/test/PRBTest.sol";
 import { console2 } from "forge-std/console2.sol";
 import { StdCheats } from "forge-std/StdCheats.sol";
 
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 import { FlashBorrower } from "./FlashBorrower.sol";
 
 import { BaseWrapper } from "src/BaseWrapper.sol";
@@ -45,7 +45,7 @@ contract BaseWrapperTest is PRBTest, StdCheats {
 
         // Test the return values
         (bytes32 callbackReturn) = abi.decode(result, (bytes32));
-        assertEq(uint256(callbackReturn), uint256(borrower.ERC3156PP_CALLBACK_SUCCESS()), "Callback failed");
+        assertEq(uint256(callbackReturn), uint256(borrower.ERC7399_CALLBACK_SUCCESS()), "Callback failed");
 
         // Test the wrapper state (return bytes should be cleaned up)
         assertEq(vm.load(address(wrapper), bytes32(uint256(0))), "");

test/ERC3156Wrapper.t.sol

@@ -54,7 +54,7 @@ contract ERC3156WrapperTest is PRBTest, StdCheats {
 
         // Test the return values
         (bytes32 callbackReturn) = abi.decode(result, (bytes32));
-        assertEq(uint256(callbackReturn), uint256(borrower.ERC3156PP_CALLBACK_SUCCESS()), "Callback failed");
+        assertEq(uint256(callbackReturn), uint256(borrower.ERC7399_CALLBACK_SUCCESS()), "Callback failed");
 
         // Test the borrower state
         assertEq(borrower.flashInitiator(), address(borrower));
@@ -71,7 +71,7 @@ contract ERC3156WrapperTest is PRBTest, StdCheats {
         uint256 loan = 1e18;
         uint256 fee = wrapper.flashFee(dai, loan);
         dai.transfer(address(wrapper), fee);
-        
+
         uint256 expectedGas = wrapper.setExpectedGas(dai);
 
         console2.log(expectedGas, "expectedGas");

test/FlashBorrower.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IERC3156PPFlashLender } from "lib/erc3156pp/src/interfaces/IERC3156PPFlashLender.sol";
-import { IERC20 } from "lib/erc3156pp/src/interfaces/IERC20.sol";
+import { IERC7399 } from "lib/erc7399/src/interfaces/IERC7399.sol";
+import { IERC20 } from "lib/erc7399/src/interfaces/IERC20.sol";
 
 contract LoanReceiver {
     function retrieve(IERC20 asset) external {
@@ -11,8 +11,8 @@ contract LoanReceiver {
 }
 
 contract FlashBorrower {
-    bytes32 public constant ERC3156PP_CALLBACK_SUCCESS = keccak256("ERC3156PP_CALLBACK_SUCCESS");
-    IERC3156PPFlashLender lender;
+    bytes32 public constant ERC7399_CALLBACK_SUCCESS = keccak256("ERC7399_CALLBACK_SUCCESS");
+    IERC7399 lender;
     LoanReceiver loanReceiver;
 
     uint256 public flashBalance;
@@ -21,7 +21,7 @@ contract FlashBorrower {
     uint256 public flashAmount;
     uint256 public flashFee;
 
-    constructor(IERC3156PPFlashLender lender_) {
+    constructor(IERC7399 lender_) {
         lender = lender_;
         loanReceiver = new LoanReceiver();
     }
@@ -49,7 +49,7 @@ contract FlashBorrower {
         flashBalance = IERC20(asset).balanceOf(address(this));
         asset.transfer(paymentReceiver, amount + fee);
 
-        return abi.encode(ERC3156PP_CALLBACK_SUCCESS);
+        return abi.encode(ERC7399_CALLBACK_SUCCESS);
     }
 
     function onSteal(
@@ -72,7 +72,7 @@ contract FlashBorrower {
 
         // do nothing
 
-        return abi.encode(ERC3156PP_CALLBACK_SUCCESS);
+        return abi.encode(ERC7399_CALLBACK_SUCCESS);
     }
 
     function onReenter(
@@ -100,7 +100,7 @@ contract FlashBorrower {
         flashAmount += amount;
         flashFee += fee;
 
-        return abi.encode(ERC3156PP_CALLBACK_SUCCESS);
+        return abi.encode(ERC7399_CALLBACK_SUCCESS);
     }
 
     function onFlashLoanVoid(
@@ -129,18 +129,18 @@ contract FlashBorrower {
     }
 
     function flashBorrow(IERC20 asset, uint256 amount) public returns (bytes memory) {
-        return lender.flashLoan(address(loanReceiver), asset, amount, "", this.onFlashLoan);
+        return lender.flash(address(loanReceiver), asset, amount, "", this.onFlashLoan);
     }
 
     function flashBorrowAndSteal(IERC20 asset, uint256 amount) public returns (bytes memory) {
-        return lender.flashLoan(address(loanReceiver), asset, amount, "", this.onSteal);
+        return lender.flash(address(loanReceiver), asset, amount, "", this.onSteal);
     }
 
     function flashBorrowAndReenter(IERC20 asset, uint256 amount) public returns (bytes memory) {
-        return lender.flashLoan(address(loanReceiver), asset, amount, "", this.onReenter);
+        return lender.flash(address(loanReceiver), asset, amount, "", this.onReenter);
     }
 
     function flashBorrowVoid(IERC20 asset, uint256 amount) public returns (bytes memory) {
-        return lender.flashLoan(address(loanReceiver), asset, amount, "", this.onFlashLoanVoid);
+        return lender.flash(address(loanReceiver), asset, amount, "", this.onFlashLoanVoid);
     }
 }

test/UniswapV3Wrapper.t.sol

@@ -60,7 +60,7 @@ contract UniswapV3WrapperTest is PRBTest, StdCheats {
 
         // Test the return values
         (bytes32 callbackReturn) = abi.decode(result, (bytes32));
-        assertEq(uint256(callbackReturn), uint256(borrower.ERC3156PP_CALLBACK_SUCCESS()), "Callback failed");
+        assertEq(uint256(callbackReturn), uint256(borrower.ERC7399_CALLBACK_SUCCESS()), "Callback failed");
 
         // Test the borrower state
         assertEq(borrower.flashInitiator(), address(borrower), "flashInitiator");