Merge pull request #87 from 1inch/feat/imports

fix imports
1inch · Jul 16, 2024 · 2754dc4 · 2754dc4
2 parents 43ed00a + 334193a
commit 2754dc4
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 38 deletions.
diff --git a/contracts/BaseEscrow.sol b/contracts/BaseEscrow.sol
@@ -3,8 +3,8 @@
 pragma solidity 0.8.23;
 
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import { AddressLib, Address } from "solidity-utils/libraries/AddressLib.sol";
-import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol";
+import { AddressLib, Address } from "solidity-utils/contracts/libraries/AddressLib.sol";
+import { SafeERC20 } from "solidity-utils/contracts/libraries/SafeERC20.sol";
 
 import { ImmutablesLib } from "./libraries/ImmutablesLib.sol";
 import { Timelocks, TimelocksLib } from "./libraries/TimelocksLib.sol";

diff --git a/contracts/BaseEscrowFactory.sol b/contracts/BaseEscrowFactory.sol
@@ -5,12 +5,12 @@ pragma solidity 0.8.23;
 import { Clones } from "openzeppelin-contracts/contracts/proxy/Clones.sol";
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import { Create2 } from "openzeppelin-contracts/contracts/utils/Create2.sol";
-import { Address, AddressLib } from "solidity-utils/libraries/AddressLib.sol";
-import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol";
+import { Address, AddressLib } from "solidity-utils/contracts/libraries/AddressLib.sol";
+import { SafeERC20 } from "solidity-utils/contracts/libraries/SafeERC20.sol";
 
-import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol";
-import { MakerTraitsLib } from "limit-order-protocol/libraries/MakerTraitsLib.sol";
-import { ResolverValidationExtension } from "limit-order-settlement/extensions/ResolverValidationExtension.sol";
+import { IOrderMixin } from "limit-order-protocol/contracts/interfaces/IOrderMixin.sol";
+import { MakerTraitsLib } from "limit-order-protocol/contracts/libraries/MakerTraitsLib.sol";
+import { ResolverValidationExtension } from "limit-order-settlement/contracts/extensions/ResolverValidationExtension.sol";
 
 import { ImmutablesLib } from "./libraries/ImmutablesLib.sol";
 import { Timelocks, TimelocksLib } from "./libraries/TimelocksLib.sol";

diff --git a/contracts/EscrowDst.sol b/contracts/EscrowDst.sol
@@ -3,8 +3,8 @@
 pragma solidity 0.8.23;
 
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol";
-import { AddressLib, Address } from "solidity-utils/libraries/AddressLib.sol";
+import { SafeERC20 } from "solidity-utils/contracts/libraries/SafeERC20.sol";
+import { AddressLib, Address } from "solidity-utils/contracts/libraries/AddressLib.sol";
 
 import { Timelocks, TimelocksLib } from "./libraries/TimelocksLib.sol";
 

diff --git a/contracts/EscrowFactory.sol b/contracts/EscrowFactory.sol
@@ -4,8 +4,8 @@ pragma solidity 0.8.23;
 
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 
-import { BaseExtension } from "limit-order-settlement/extensions/BaseExtension.sol";
-import { ResolverValidationExtension } from "limit-order-settlement/extensions/ResolverValidationExtension.sol";
+import { BaseExtension } from "limit-order-settlement/contracts/extensions/BaseExtension.sol";
+import { ResolverValidationExtension } from "limit-order-settlement/contracts/extensions/ResolverValidationExtension.sol";
 
 import { ProxyHashLib } from "./libraries/ProxyHashLib.sol";
 
@@ -27,7 +27,7 @@ contract EscrowFactory is BaseEscrowFactory {
         address owner,
         uint32 rescueDelaySrc,
         uint32 rescueDelayDst
-    ) 
+    )
     BaseExtension(limitOrderProtocol)
     ResolverValidationExtension(feeToken, accessToken, owner)
     MerkleStorageInvalidator(limitOrderProtocol) {

diff --git a/contracts/EscrowSrc.sol b/contracts/EscrowSrc.sol
@@ -3,8 +3,8 @@
 pragma solidity 0.8.23;
 
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol";
-import { AddressLib, Address } from "solidity-utils/libraries/AddressLib.sol";
+import { SafeERC20 } from "solidity-utils/contracts/libraries/SafeERC20.sol";
+import { AddressLib, Address } from "solidity-utils/contracts/libraries/AddressLib.sol";
 
 import { Timelocks, TimelocksLib } from "./libraries/TimelocksLib.sol";
 import { ImmutablesLib } from "./libraries/ImmutablesLib.sol";

diff --git a/contracts/MerkleStorageInvalidator.sol b/contracts/MerkleStorageInvalidator.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.23;
 
-import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol";
-import { ITakerInteraction } from "limit-order-protocol/interfaces/ITakerInteraction.sol";
+import { IOrderMixin } from "limit-order-protocol/contracts/interfaces/IOrderMixin.sol";
+import { ITakerInteraction } from "limit-order-protocol/contracts/interfaces/ITakerInteraction.sol";
 import { MerkleProof } from "openzeppelin-contracts/contracts/utils/cryptography/MerkleProof.sol";
 
 import { IMerkleStorageInvalidator } from "./interfaces/IMerkleStorageInvalidator.sol";

diff --git a/contracts/interfaces/IBaseEscrow.sol b/contracts/interfaces/IBaseEscrow.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import { Address } from "solidity-utils/libraries/AddressLib.sol";
+import { Address } from "solidity-utils/contracts/libraries/AddressLib.sol";
 
 import { Timelocks } from "../libraries/TimelocksLib.sol";
 

diff --git a/contracts/interfaces/IEscrowFactory.sol b/contracts/interfaces/IEscrowFactory.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import { Address } from "solidity-utils/libraries/AddressLib.sol";
+import { Address } from "solidity-utils/contracts/libraries/AddressLib.sol";
 
 import { Timelocks } from "../libraries/TimelocksLib.sol";
 

diff --git a/contracts/interfaces/IResolverMock.sol b/contracts/interfaces/IResolverMock.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.23;
 
-import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol";
-import { TakerTraits } from "limit-order-protocol/libraries/TakerTraitsLib.sol";
+import { IOrderMixin } from "limit-order-protocol/contracts/interfaces/IOrderMixin.sol";
+import { TakerTraits } from "limit-order-protocol/contracts/libraries/TakerTraitsLib.sol";
 
 import { IBaseEscrow } from "../interfaces/IBaseEscrow.sol";
 

diff --git a/contracts/mocks/NoReceiveCaller.sol b/contracts/mocks/NoReceiveCaller.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.23;
 
-import { RevertReasonForwarder } from "solidity-utils/libraries/RevertReasonForwarder.sol";
+import { RevertReasonForwarder } from "solidity-utils/contracts/libraries/RevertReasonForwarder.sol";
 
 contract NoReceiveCaller {
     function arbitraryCall(address target, bytes calldata arguments) external {

diff --git a/contracts/mocks/ResolverMock.sol b/contracts/mocks/ResolverMock.sol
@@ -4,9 +4,9 @@ pragma solidity 0.8.23;
 
 import { Ownable } from "openzeppelin-contracts/contracts/access/Ownable.sol";
 
-import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol";
-import { TakerTraits } from "limit-order-protocol/libraries/TakerTraitsLib.sol";
-import { RevertReasonForwarder } from "solidity-utils/libraries/RevertReasonForwarder.sol";
+import { IOrderMixin } from "limit-order-protocol/contracts/interfaces/IOrderMixin.sol";
+import { TakerTraits } from "limit-order-protocol/contracts/libraries/TakerTraitsLib.sol";
+import { RevertReasonForwarder } from "solidity-utils/contracts/libraries/RevertReasonForwarder.sol";
 
 import { IBaseEscrow } from "../interfaces/IBaseEscrow.sol";
 import { IEscrowFactory } from "../interfaces/IEscrowFactory.sol";

diff --git a/contracts/zkSync/EscrowFactoryZkSync.sol b/contracts/zkSync/EscrowFactoryZkSync.sol
@@ -3,8 +3,8 @@
 pragma solidity 0.8.23;
 
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import { BaseExtension } from "limit-order-settlement/extensions/BaseExtension.sol";
-import { ResolverValidationExtension } from "limit-order-settlement/extensions/ResolverValidationExtension.sol";
+import { BaseExtension } from "limit-order-settlement/contracts/extensions/BaseExtension.sol";
+import { ResolverValidationExtension } from "limit-order-settlement/contracts/extensions/ResolverValidationExtension.sol";
 
 import { BaseEscrowFactory } from "../BaseEscrowFactory.sol";
 import { MerkleStorageInvalidator } from "../MerkleStorageInvalidator.sol";

diff --git a/remappings.txt b/remappings.txt
@@ -1,3 +1,6 @@
 @1inch/limit-order-protocol-contract/=lib/limit-order-protocol/
 @1inch/limit-order-settlement/=lib/limit-order-settlement/
 @1inch/solidity-utils/=lib/solidity-utils/
+solidity-utils/=lib/solidity-utils/
+limit-order-protocol/=lib/limit-order-protocol/
+limit-order-settlement/=lib/limit-order-settlement/
diff --git a/test/unit/Escrow.t.sol b/test/unit/Escrow.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.23;
 
-import { Address } from "solidity-utils/libraries/AddressLib.sol";
+import { Address } from "solidity-utils/contracts/libraries/AddressLib.sol";
 
 import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
 import { IEscrowFactory } from "../../contracts/interfaces/IEscrowFactory.sol";

diff --git a/test/unit/EscrowFactory.t.sol b/test/unit/EscrowFactory.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.23;
 
-import { ResolverValidationExtension } from "limit-order-settlement/extensions/ResolverValidationExtension.sol";
+import { ResolverValidationExtension } from "limit-order-settlement/contracts/extensions/ResolverValidationExtension.sol";
 import { Merkle } from "murky/src/Merkle.sol";
 
 import { EscrowDst } from "../../contracts/EscrowDst.sol";

diff --git a/test/unit/MerkleStorageInvalidator.t.sol b/test/unit/MerkleStorageInvalidator.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
 
 import { Merkle } from "murky/src/Merkle.sol";
 
-import { ITakerInteraction } from "limit-order-protocol/interfaces/ITakerInteraction.sol";
+import { ITakerInteraction } from "limit-order-protocol/contracts/interfaces/ITakerInteraction.sol";
 
 import { IMerkleStorageInvalidator } from "../../contracts/interfaces/IMerkleStorageInvalidator.sol";
 

diff --git a/test/utils/BaseSetup.sol b/test/utils/BaseSetup.sol
@@ -3,15 +3,15 @@ pragma solidity 0.8.23;
 
 import { Test } from "forge-std/Test.sol";
 
-import { IWETH, LimitOrderProtocol } from "limit-order-protocol/LimitOrderProtocol.sol";
-import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol";
-import { MakerTraits, MakerTraitsLib } from "limit-order-protocol/libraries/MakerTraitsLib.sol";
-import { TakerTraits } from "limit-order-protocol/libraries/TakerTraitsLib.sol";
-import { WrappedTokenMock } from "limit-order-protocol/mocks/WrappedTokenMock.sol";
-import { IFeeBank } from "limit-order-settlement/interfaces/IFeeBank.sol";
-import { Address, AddressLib } from "solidity-utils/libraries/AddressLib.sol";
-import { TokenCustomDecimalsMock } from "solidity-utils/mocks/TokenCustomDecimalsMock.sol";
-import { TokenMock } from "solidity-utils/mocks/TokenMock.sol";
+import { IWETH, LimitOrderProtocol } from "limit-order-protocol/contracts/LimitOrderProtocol.sol";
+import { IOrderMixin } from "limit-order-protocol/contracts/interfaces/IOrderMixin.sol";
+import { MakerTraits, MakerTraitsLib } from "limit-order-protocol/contracts/libraries/MakerTraitsLib.sol";
+import { TakerTraits } from "limit-order-protocol/contracts/libraries/TakerTraitsLib.sol";
+import { WrappedTokenMock } from "limit-order-protocol/contracts/mocks/WrappedTokenMock.sol";
+import { IFeeBank } from "limit-order-settlement/contracts/interfaces/IFeeBank.sol";
+import { Address, AddressLib } from "solidity-utils/contracts/libraries/AddressLib.sol";
+import { TokenCustomDecimalsMock } from "solidity-utils/contracts/mocks/TokenCustomDecimalsMock.sol";
+import { TokenMock } from "solidity-utils/contracts/mocks/TokenMock.sol";
 
 import { EscrowDst } from "../../contracts/EscrowDst.sol";
 import { EscrowSrc } from "../../contracts/EscrowSrc.sol";