fixed remappings

yieldnest · Sep 18, 2024 · 452cc07 · 452cc07
1 parent 21398ee
commit 452cc07
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 26 deletions.
diff --git a/remappings.txt b/remappings.txt
@@ -2,25 +2,18 @@
 @layerzerolabs/lz-evm-v1-0.7/=node_modules/@layerzerolabs/lz-evm-v1-0.7/
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
 @openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
+
+solidity-bytes-utils/=node_modules/solidity-bytes-utils/
+hardhat-deploy/=node_modules/hardhat-deploy/
+
 @/=src/
-@factory/=src/factory/
-@interfaces/=src/interfaces/
 
 @layerzerolabs/lz-evm-oapp-v2/contracts-upgradeable/=lib/LayerZero-v2/oapp/contracts/
 @layerzerolabs/lz-evm-protocol-v2/contracts/=lib/LayerZero-v2/protocol/contracts/
 @layerzerolabs/lz-evm-messagelib-v2/contracts/=lib/LayerZero-v2/messagelib/contracts/
 @layerzerolabs/lz-evm-oapp-v2/test/=lib/LayerZero-v2/oapp/test/
 
-@solmate/=lib/solmate/src/
-@forge-safe/=lib/forge-safe/src/
-@forge-std/=lib/forge-std/src/
-
-solidity-stringutils/=lib/surl/lib/solidity-stringutils/src/
+forge-std/=lib/forge-std/src/
 solmate/=lib/solmate/src/
 surl/=lib/surl/src/
-
-forge-std/=lib/forge-std/src/
-ds-test/=lib/forge-safe/lib/ds-test/src/
-
-solidity-bytes-utils/=node_modules/solidity-bytes-utils/
-hardhat-deploy/=node_modules/hardhat-deploy/
+solidity-stringutils/=lib/surl/lib/solidity-stringutils/src/
diff --git a/script/BaseScript.s.sol b/script/BaseScript.s.sol
@@ -5,13 +5,14 @@ pragma solidity ^0.8.24;
 import {BaseData} from "./BaseData.s.sol";
 
 import {L1YnOFTAdapterUpgradeable} from "@/L1YnOFTAdapterUpgradeable.sol";
-import {ImmutableMultiChainDeployer} from "@factory/ImmutableMultiChainDeployer.sol";
+import {ImmutableMultiChainDeployer} from "@/factory/ImmutableMultiChainDeployer.sol";
 import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/RateLimiter.sol";
 import {EndpointV2} from "@layerzerolabs/lz-evm-protocol-v2/contracts/EndpointV2.sol";
 import {TransparentUpgradeableProxy} from
     "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {Bytes32AddressLib} from "@solmate/utils/Bytes32AddressLib.sol";
+
 import {console} from "forge-std/console.sol";
+import {Bytes32AddressLib} from "solmate/utils/Bytes32AddressLib.sol";
 
 struct RateLimitConfig {
     uint256 limit;

diff --git a/src/L2YnERC20Upgradeable.sol b/src/L2YnERC20Upgradeable.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.24;
 import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
 
-import {IMintableBurnableERC20} from "./interfaces/IMintableBurnableERC20.sol";
+import {IMintableBurnableERC20} from "@/interfaces/IMintableBurnableERC20.sol";
 
 /// @title L2YnERC20Upgradeable
 /// @notice This contract implements an upgradeable ERC20 token with minting and burning capabilities, controlled

diff --git a/src/L2YnOFTAdapterUpgradeable.sol b/src/L2YnOFTAdapterUpgradeable.sol
@@ -7,7 +7,7 @@ import {OFTUpgradeable} from "@layerzerolabs/lz-evm-oapp-v2/contracts-upgradeabl
 
 import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/RateLimiter.sol";
 
-import {IMintableBurnableERC20} from "./interfaces/IMintableBurnableERC20.sol";
+import {IMintableBurnableERC20} from "@/interfaces/IMintableBurnableERC20.sol";
 
 contract L2YnOFTAdapterUpgradeable is OFTAdapterUpgradeable, RateLimiter {
     /**

diff --git a/src/factory/ImmutableMultiChainDeployer.sol b/src/factory/ImmutableMultiChainDeployer.sol
@@ -3,11 +3,11 @@ pragma solidity ^0.8.24;
 
 import {L2YnERC20Upgradeable} from "@/L2YnERC20Upgradeable.sol";
 import {L2YnOFTAdapterUpgradeable} from "@/L2YnOFTAdapterUpgradeable.sol";
-import {IImmutableMultiChainDeployer} from "@interfaces/IImmutableMultiChainDeployer.sol";
+import {IImmutableMultiChainDeployer} from "@/interfaces/IImmutableMultiChainDeployer.sol";
 import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import {TransparentUpgradeableProxy} from
     "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {CREATE3} from "@solmate/utils/CREATE3.sol";
+import {CREATE3} from "solmate/utils/CREATE3.sol";
 
 contract ImmutableMultiChainDeployer is IImmutableMultiChainDeployer {
     /// @notice Emitted when a new contract is deployed

diff --git a/test/CrossChainBaseTest.t.sol b/test/CrossChainBaseTest.t.sol
@@ -5,8 +5,8 @@ pragma solidity ^0.8.24;
 import {L1YnOFTAdapterUpgradeable} from "@/L1YnOFTAdapterUpgradeable.sol";
 import {L2YnERC20Upgradeable} from "@/L2YnERC20Upgradeable.sol";
 import {L2YnOFTAdapterUpgradeable} from "@/L2YnOFTAdapterUpgradeable.sol";
-import {ImmutableMultiChainDeployer} from "@factory/ImmutableMultiChainDeployer.sol";
-import {IMintableBurnableERC20} from "@interfaces/IMintableBurnableERC20.sol";
+import {ImmutableMultiChainDeployer} from "@/factory/ImmutableMultiChainDeployer.sol";
+import {IMintableBurnableERC20} from "@/interfaces/IMintableBurnableERC20.sol";
 import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/RateLimiter.sol";
 import {ERC20Mock} from "@layerzerolabs/lz-evm-oapp-v2/test/mocks/ERC20Mock.sol";
 import {EndpointV2} from "@layerzerolabs/lz-evm-protocol-v2/contracts/EndpointV2.sol";

diff --git a/test/MultiChainDeployer.t.sol b/test/MultiChainDeployer.t.sol
@@ -6,8 +6,8 @@ import {CrossChainBaseTest} from "./CrossChainBaseTest.t.sol";
 import {L1YnOFTAdapterUpgradeable} from "@/L1YnOFTAdapterUpgradeable.sol";
 import {L2YnERC20Upgradeable} from "@/L2YnERC20Upgradeable.sol";
 import {L2YnOFTAdapterUpgradeable} from "@/L2YnOFTAdapterUpgradeable.sol";
-import {ImmutableMultiChainDeployer} from "@factory/ImmutableMultiChainDeployer.sol";
-import {IMintableBurnableERC20} from "@interfaces/IMintableBurnableERC20.sol";
+import {ImmutableMultiChainDeployer} from "@/factory/ImmutableMultiChainDeployer.sol";
+import {IMintableBurnableERC20} from "@/interfaces/IMintableBurnableERC20.sol";
 import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/RateLimiter.sol";
 
 contract Test_ImmutableMultiChainDeployer is CrossChainBaseTest {

diff --git a/test/OFT.t.sol b/test/OFT.t.sol
@@ -32,7 +32,7 @@ import {IERC20} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metad
 import {L1OFTAdapterMock} from "./mocks/L1OFTAdapterMock.sol";
 import {L2OFTAdapterMock} from "./mocks/L2OFTAdapterMock.sol";
 import {Initializable, TestHelper} from "@layerzerolabs/lz-evm-oapp-v2/test/TestHelper.sol";
-import "forge-std/console.sol";
+import {console} from "forge-std/console.sol";
 
 import {L2YnERC20Upgradeable as L2YnERC20} from "@/L2YnERC20Upgradeable.sol";
 

diff --git a/test/OFTCrossChain.t.sol b/test/OFTCrossChain.t.sol
@@ -6,8 +6,8 @@ import {CrossChainBaseTest} from "./CrossChainBaseTest.t.sol";
 import {L1YnOFTAdapterUpgradeable} from "@/L1YnOFTAdapterUpgradeable.sol";
 import {L2YnERC20Upgradeable} from "@/L2YnERC20Upgradeable.sol";
 import {L2YnOFTAdapterUpgradeable} from "@/L2YnOFTAdapterUpgradeable.sol";
-import {ImmutableMultiChainDeployer} from "@factory/ImmutableMultiChainDeployer.sol";
-import {IMintableBurnableERC20} from "@interfaces/IMintableBurnableERC20.sol";
+import {ImmutableMultiChainDeployer} from "@/factory/ImmutableMultiChainDeployer.sol";
+import {IMintableBurnableERC20} from "@/interfaces/IMintableBurnableERC20.sol";
 
 import {OptionsBuilder} from "@layerzerolabs/lz-evm-oapp-v2/contracts-upgradeable/oapp/libs/OptionsBuilder.sol";
 import {