Antti/add mapping to conf

certora/confs/BaseConfForInheritance.conf

@@ -27,7 +27,8 @@
         "ethereum-vault-connector=lib/ethereum-vault-connector/src",
         "euler-vault-kit=lib/euler-vault-kit/src",
         "forge-std=lib/forge-std/src",
-        "solmate=lib/euler-vault-kit/lib/permit2/lib/solmate"
+        "solmate=lib/euler-vault-kit/lib/permit2/lib/solmate",
+        "openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/"
     ],
     "compiler_map": {
         "EulerEarnHarness": "solc-0.8.26",

certora/harnesses/ERC20Helper.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity 0.8.26;
 
-import {SafeERC20, IERC20} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {SafeERC20, IERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract ERC20Helper {
     using SafeERC20 for IERC20;

certora/mocks/Token0.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.21;
 
-import {ERC20} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
+import {ERC20} from "openzeppelin-contracts/token/ERC20/ERC20.sol";
 
 contract Token0 is ERC20 {
    constructor() ERC20("Token0", "TOK0") {}

certora/mocks/VaultMock0.sol

@@ -7,7 +7,7 @@ import {
     ERC20,
     ERC4626,
     Math
-} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC4626.sol";
+} from "openzeppelin-contracts/token/ERC20/extensions/ERC4626.sol";
 
 contract VaultMock0 is ERC4626 {
    constructor(IERC20 asset) ERC4626(asset) ERC20("VaultMock0", "V0") {}

certora/mocks/VaultMock1.sol

@@ -7,7 +7,7 @@ import {
     ERC20,
     ERC4626,
     Math
-} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC4626.sol";
+} from "openzeppelin-contracts/token/ERC20/extensions/ERC4626.sol";
 
 contract VaultMock1 is ERC4626 {
    constructor(IERC20 asset) ERC4626(asset) ERC20("VaultMock1", "V1") {}

remappings.txt

@@ -1 +1,2 @@
+openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
 ethereum-vault-connector/=lib/ethereum-vault-connector/src/

src/EulerEarn.sol

@@ -17,21 +17,21 @@ import {ErrorsLib} from "./libraries/ErrorsLib.sol";
 import {EventsLib} from "./libraries/EventsLib.sol";
 import {SafeERC20Permit2Lib} from "./libraries/SafeERC20Permit2Lib.sol";
 import {UtilsLib, WAD} from "./libraries/UtilsLib.sol";
-import {SafeCast} from "../lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
-import {IERC20Metadata} from "../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {SafeCast} from "openzeppelin-contracts/utils/math/SafeCast.sol";
+import {IERC20Metadata} from "openzeppelin-contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {Context} from "../lib/openzeppelin-contracts/contracts/utils/Context.sol";
-import {ReentrancyGuard} from "../lib/openzeppelin-contracts/contracts/utils/ReentrancyGuard.sol";
-import {Ownable2Step, Ownable} from "../lib/openzeppelin-contracts/contracts/access/Ownable2Step.sol";
+import {Context} from "openzeppelin-contracts/utils/Context.sol";
+import {ReentrancyGuard} from "openzeppelin-contracts/utils/ReentrancyGuard.sol";
+import {Ownable2Step, Ownable} from "openzeppelin-contracts/access/Ownable2Step.sol";
 import {
     IERC20,
     IERC4626,
     ERC20,
     ERC4626,
     Math,
     SafeERC20
-} from "../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC4626.sol";
-import {EVCUtil} from "../lib/ethereum-vault-connector/src/utils/EVCUtil.sol";
+} from "openzeppelin-contracts/token/ERC20/extensions/ERC4626.sol";
+import {EVCUtil} from "ethereum-vault-connector/utils/EVCUtil.sol";
 
 /// @title EulerEarn
 /// @author Forked with gratitude from Morpho Labs. Inspired by Silo Labs.

src/EulerEarnFactory.sol

@@ -10,8 +10,8 @@ import {ErrorsLib} from "./libraries/ErrorsLib.sol";
 
 import {EulerEarn} from "./EulerEarn.sol";
 
-import {Ownable, Context} from "../lib/openzeppelin-contracts/contracts/access/Ownable.sol";
-import {EVCUtil} from "../lib/ethereum-vault-connector/src/utils/EVCUtil.sol";
+import {Ownable, Context} from "openzeppelin-contracts/access/Ownable.sol";
+import {EVCUtil} from "ethereum-vault-connector/utils/EVCUtil.sol";
 
 /// @title EulerEarnFactory
 /// @author Forked with gratitude from Morpho Labs. Inspired by Silo Labs.

src/PublicAllocator.sol

@@ -14,8 +14,8 @@ import {IEulerEarn, MarketAllocation} from "./interfaces/IEulerEarn.sol";
 import {ErrorsLib} from "./libraries/ErrorsLib.sol";
 import {EventsLib} from "./libraries/EventsLib.sol";
 
-import {IERC4626} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
-import {EVCUtil} from "../lib/ethereum-vault-connector/src/utils/EVCUtil.sol";
+import {IERC4626} from "openzeppelin-contracts/interfaces/IERC4626.sol";
+import {EVCUtil} from "ethereum-vault-connector/utils/EVCUtil.sol";
 
 /// @title PublicAllocator
 /// @author Forked with gratitude from Morpho Labs. Inspired by Silo Labs.

src/interfaces/IEulerEarn.sol

@@ -3,8 +3,8 @@ pragma solidity >=0.5.0;
 
 import {IEulerEarnFactory} from "./IEulerEarnFactory.sol";
 
-import {IERC4626} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
-import {IERC20Permit} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
+import {IERC4626} from "openzeppelin-contracts/interfaces/IERC4626.sol";
+import {IERC20Permit} from "openzeppelin-contracts/token/ERC20/extensions/IERC20Permit.sol";
 
 import {MarketConfig, PendingUint136, PendingAddress} from "../libraries/PendingLib.sol";
 

src/interfaces/IPublicAllocator.sol

@@ -3,7 +3,7 @@ pragma solidity >=0.5.0;
 
 import {MarketAllocation} from "./IEulerEarn.sol";
 
-import {IERC4626} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
+import {IERC4626} from "openzeppelin-contracts/interfaces/IERC4626.sol";
 
 /// @dev Max settable flow cap, such that caps can always be stored on 128 bits.
 /// @dev The actual max possible flow cap is type(uint128).max-1.

src/libraries/ErrorsLib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {IERC4626} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
+import {IERC4626} from "openzeppelin-contracts/interfaces/IERC4626.sol";
 
 /// @title ErrorsLib
 /// @author Forked with gratitude from Morpho Labs. Inspired by Silo Labs.

src/libraries/EventsLib.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import {FlowCapsConfig} from "../interfaces/IPublicAllocator.sol";
 
-import {IERC4626} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
+import {IERC4626} from "openzeppelin-contracts/interfaces/IERC4626.sol";
 
 import {PendingAddress} from "./PendingLib.sol";
 

src/libraries/SafeERC20Permit2Lib.sol

@@ -3,8 +3,8 @@
 pragma solidity ^0.8.0;
 
 import {IAllowanceTransfer} from "../interfaces/IAllowanceTransfer.sol";
-import {IERC20} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
-import {SafeERC20} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "openzeppelin-contracts/token/ERC20/ERC20.sol";
+import {SafeERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
 
 /// @title SafeERC20Permit2Lib Library
 /// @custom:security-contact security@euler.xyz

test/ERC4626Test.sol

@@ -531,7 +531,7 @@ contract ERC4626Test is IntegrationTest {
 
         // max deposit is 0
         assertEq(vault.maxDeposit(SUPPLIER), 0);
-        // although cap still allows 1 wei 
+        // although cap still allows 1 wei
         assertEq(vault.totalAssets(), cap - 1);
         // because depositing 1 wei would throw zero shares
         vm.prank(SUPPLIER);