re-org

Author: hoytech

src/EulerSwap.sol

@@ -9,10 +9,10 @@ import {IEVault} from "evk/EVault/IEVault.sol";
 
 import {IEulerSwap} from "./interfaces/IEulerSwap.sol";
 import {UniswapHook} from "./UniswapHook.sol";
-import {CtxLib} from "./CtxLib.sol";
-import {FundsLib} from "./FundsLib.sol";
-import {CurveLib} from "./CurveLib.sol";
-import {QuoteLib} from "./QuoteLib.sol";
+import {CtxLib} from "./libraries/CtxLib.sol";
+import {FundsLib} from "./libraries/FundsLib.sol";
+import {CurveLib} from "./libraries/CurveLib.sol";
+import {QuoteLib} from "./libraries/QuoteLib.sol";
 
 contract EulerSwap is IEulerSwap, EVCUtil, UniswapHook {
     bytes32 public constant curve = bytes32("EulerSwap v1");

src/EulerSwapFactory.sol

@@ -7,7 +7,7 @@ import {GenericFactory} from "evk/GenericFactory/GenericFactory.sol";
 
 import {EulerSwap} from "./EulerSwap.sol";
 import {ProtocolFee} from "./utils/ProtocolFee.sol";
-import {MetaProxyDeployer} from "./MetaProxyDeployer.sol";
+import {MetaProxyDeployer} from "./utils/MetaProxyDeployer.sol";
 
 /// @title EulerSwapFactory contract
 /// @custom:security-contact [email protected]

src/UniswapHook.sol

@@ -15,10 +15,10 @@ import {
 import {IEVault} from "evk/EVault/IEVault.sol";
 
 import {IEulerSwap} from "./interfaces/IEulerSwap.sol";
-import {CtxLib} from "./CtxLib.sol";
-import {QuoteLib} from "./QuoteLib.sol";
-import {CurveLib} from "./CurveLib.sol";
-import {FundsLib} from "./FundsLib.sol";
+import {CtxLib} from "./libraries/CtxLib.sol";
+import {QuoteLib} from "./libraries/QuoteLib.sol";
+import {CurveLib} from "./libraries/CurveLib.sol";
+import {FundsLib} from "./libraries/FundsLib.sol";
 
 contract UniswapHook is BaseHook {
     using SafeCast for uint256;

src/CtxLib.sol renamed to src/libraries/CtxLib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.27;
 
-import {IEulerSwap} from "./interfaces/IEulerSwap.sol";
+import {IEulerSwap} from "../interfaces/IEulerSwap.sol";
 
 library CtxLib {
     struct Storage {

src/CurveLib.sol renamed to src/libraries/CurveLib.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.27;
 
 import {Math} from "openzeppelin-contracts/utils/math/Math.sol";
 
-import {IEulerSwap} from "./interfaces/IEulerSwap.sol";
+import {IEulerSwap} from "../interfaces/IEulerSwap.sol";
 
 library CurveLib {
     error Overflow();

src/FundsLib.sol renamed to src/libraries/FundsLib.sol

@@ -8,7 +8,7 @@ import {IEVC} from "evc/interfaces/IEthereumVaultConnector.sol";
 import {IEVault, IBorrowing, IERC4626, IRiskManager} from "evk/EVault/IEVault.sol";
 import {Errors as EVKErrors} from "evk/EVault/shared/Errors.sol";
 
-import {IEulerSwap} from "./interfaces/IEulerSwap.sol";
+import {IEulerSwap} from "../interfaces/IEulerSwap.sol";
 
 library FundsLib {
     using SafeERC20 for IERC20;

src/QuoteLib.sol renamed to src/libraries/QuoteLib.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.27;
 
 import {IEVC} from "evc/interfaces/IEthereumVaultConnector.sol";
 import {IEVault} from "evk/EVault/IEVault.sol";
-import {IEulerSwap} from "./interfaces/IEulerSwap.sol";
+import {IEulerSwap} from "../interfaces/IEulerSwap.sol";
 import {CtxLib} from "./CtxLib.sol";
 import {CurveLib} from "./CurveLib.sol";
 

src/MetaProxyDeployer.sol renamed to src/utils/MetaProxyDeployer.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import {EulerSwapTestBase, IEulerSwap} from "./EulerSwapTestBase.t.sol";
-import {CtxLib} from "../src/CtxLib.sol";
+import {CtxLib} from "../src/libraries/CtxLib.sol";
 
 contract CtxTest is EulerSwapTestBase {
     function setUp() public virtual override {

test/Ctx.t.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.24;
 import {IEVault, IEulerSwap, EulerSwapTestBase, EulerSwap, TestERC20} from "./EulerSwapTestBase.t.sol";
 import {IRMTestFixed} from "evk-test/mocks/IRMTestFixed.sol";
 import {Errors as EVKErrors} from "evk/EVault/shared/Errors.sol";
-import {FundsLib} from "../src/FundsLib.sol";
+import {FundsLib} from "../src/libraries/FundsLib.sol";
 import "evk/EVault/shared/Constants.sol" as EVKConstants;
 
 contract DepositFailuresTest is EulerSwapTestBase {