Merge pull request #86 from 1inch/chore/SC-1209-Unify-import-style

Unify import style
1inch · Jul 17, 2024 · b3acc0f · b3acc0f
2 parents 3911835 + 2754dc4
commit b3acc0f
Show file tree

Hide file tree

Showing 27 changed files with 103 additions and 101 deletions.
diff --git a/contracts/BaseEscrow.sol b/contracts/BaseEscrow.sol
@@ -2,9 +2,9 @@
 
 pragma solidity 0.8.23;
 
-import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
-import { AddressLib, Address } from "solidity-utils/libraries/AddressLib.sol";
-import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol";
+import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.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
@@ -2,15 +2,15 @@
 
 pragma solidity 0.8.23;
 
-import { Clones } from "openzeppelin-contracts/proxy/Clones.sol";
-import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
-import { Create2 } from "openzeppelin-contracts/utils/Create2.sol";
-import { Address, AddressLib } from "solidity-utils/libraries/AddressLib.sol";
-import { SafeERC20 } from "solidity-utils/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 { 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/contracts/libraries/AddressLib.sol";
+import { SafeERC20 } from "solidity-utils/contracts/libraries/SafeERC20.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/Escrow.sol b/contracts/Escrow.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.23;
 
-import { Create2 } from "openzeppelin-contracts/utils/Create2.sol";
+import { Create2 } from "openzeppelin-contracts/contracts/utils/Create2.sol";
 
 import { ImmutablesLib } from "./libraries/ImmutablesLib.sol";
 import { ProxyHashLib } from "./libraries/ProxyHashLib.sol";

diff --git a/contracts/EscrowDst.sol b/contracts/EscrowDst.sol
@@ -2,9 +2,9 @@
 
 pragma solidity 0.8.23;
 
-import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
-import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol";
-import { AddressLib, Address } from "solidity-utils/libraries/AddressLib.sol";
+import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.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
@@ -2,10 +2,10 @@
 
 pragma solidity 0.8.23;
 
-import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
+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
@@ -2,9 +2,9 @@
 
 pragma solidity 0.8.23;
 
-import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
-import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol";
-import { AddressLib, Address } from "solidity-utils/libraries/AddressLib.sol";
+import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.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,11 +2,11 @@
 
 pragma solidity 0.8.23;
 
-import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol";
-import { ITakerInteraction } from "limit-order-protocol/interfaces/ITakerInteraction.sol";
-import { MerkleProof } from "openzeppelin-contracts/utils/cryptography/MerkleProof.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 "contracts/interfaces/IMerkleStorageInvalidator.sol";
+import { IMerkleStorageInvalidator } from "./interfaces/IMerkleStorageInvalidator.sol";
 
 /**
  * @title Merkle Storage Invalidator contract

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
@@ -2,11 +2,11 @@
 
 pragma solidity 0.8.23;
 
-import { Ownable } from "openzeppelin-contracts/access/Ownable.sol";
+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/EscrowDstZkSync.sol b/contracts/zkSync/EscrowDstZkSync.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.23;
 
-import { Escrow, EscrowDst } from "contracts/EscrowDst.sol";
-import { EscrowZkSync } from "contracts/zkSync/EscrowZkSync.sol";
+import { Escrow, EscrowDst } from "../EscrowDst.sol";
+import { EscrowZkSync } from "./EscrowZkSync.sol";
 
 contract EscrowDstZkSync is EscrowDst, EscrowZkSync {
     constructor(uint32 rescueDelay) EscrowDst(rescueDelay) EscrowZkSync() {}

diff --git a/contracts/zkSync/EscrowFactoryZkSync.sol b/contracts/zkSync/EscrowFactoryZkSync.sol
@@ -2,19 +2,19 @@
 
 pragma solidity 0.8.23;
 
-import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
-import { BaseExtension } from "limit-order-settlement/extensions/BaseExtension.sol";
-import { ResolverValidationExtension } from "limit-order-settlement/extensions/ResolverValidationExtension.sol";
+import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import { BaseExtension } from "limit-order-settlement/contracts/extensions/BaseExtension.sol";
+import { ResolverValidationExtension } from "limit-order-settlement/contracts/extensions/ResolverValidationExtension.sol";
 
-import { BaseEscrowFactory } from "contracts/BaseEscrowFactory.sol";
-import { MerkleStorageInvalidator } from "contracts/MerkleStorageInvalidator.sol";
-import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol";
-import { ImmutablesLib } from "contracts/libraries/ImmutablesLib.sol";
+import { BaseEscrowFactory } from "../BaseEscrowFactory.sol";
+import { MerkleStorageInvalidator } from "../MerkleStorageInvalidator.sol";
+import { IBaseEscrow } from "../interfaces/IBaseEscrow.sol";
+import { ImmutablesLib } from "../libraries/ImmutablesLib.sol";
 
-import { EscrowDstZkSync } from "contracts/zkSync/EscrowDstZkSync.sol";
-import { EscrowSrcZkSync } from "contracts/zkSync/EscrowSrcZkSync.sol";
-import { MinimalProxyZkSync } from "contracts/zkSync/MinimalProxyZkSync.sol";
-import { ZkSyncLib } from "contracts/zkSync/ZkSyncLib.sol";
+import { EscrowDstZkSync } from "./EscrowDstZkSync.sol";
+import { EscrowSrcZkSync } from "./EscrowSrcZkSync.sol";
+import { MinimalProxyZkSync } from "./MinimalProxyZkSync.sol";
+import { ZkSyncLib } from "./ZkSyncLib.sol";
 
 /**
  * @title Escrow Factory contract
@@ -33,7 +33,7 @@ contract EscrowFactoryZkSync is BaseEscrowFactory {
         address owner,
         uint32 rescueDelaySrc,
         uint32 rescueDelayDst
-    ) 
+    )
     BaseExtension(limitOrderProtocol)
     ResolverValidationExtension(feeToken, accessToken, owner)
     MerkleStorageInvalidator(limitOrderProtocol) {

diff --git a/contracts/zkSync/EscrowSrcZkSync.sol b/contracts/zkSync/EscrowSrcZkSync.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.23;
 
-import { Escrow, EscrowSrc } from "contracts/EscrowSrc.sol";
-import { EscrowZkSync } from "contracts/zkSync/EscrowZkSync.sol";
+import { Escrow, EscrowSrc } from "../EscrowSrc.sol";
+import { EscrowZkSync } from "./EscrowZkSync.sol";
 
 contract EscrowSrcZkSync is EscrowSrc, EscrowZkSync {
     constructor(uint32 rescueDelay) EscrowSrc(rescueDelay) EscrowZkSync() {}

diff --git a/contracts/zkSync/EscrowZkSync.sol b/contracts/zkSync/EscrowZkSync.sol
@@ -2,10 +2,10 @@
 
 pragma solidity 0.8.23;
 
-import { BaseEscrow } from "contracts/BaseEscrow.sol";
+import { BaseEscrow } from "../BaseEscrow.sol";
 
-import { ImmutablesLib } from "contracts/libraries/ImmutablesLib.sol";
-import { ZkSyncLib } from "contracts/zkSync/ZkSyncLib.sol";
+import { ImmutablesLib } from "../libraries/ImmutablesLib.sol";
+import { ZkSyncLib } from "./ZkSyncLib.sol";
 
 abstract contract EscrowZkSync is BaseEscrow {
     using ImmutablesLib for Immutables;

diff --git a/remappings.txt b/remappings.txt
@@ -1,4 +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/
-openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
+solidity-utils/=lib/solidity-utils/
+limit-order-protocol/=lib/limit-order-protocol/
+limit-order-settlement/=lib/limit-order-settlement/
diff --git a/test/integration/EscrowFactory.t.sol b/test/integration/EscrowFactory.t.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.23;
 
-import { IEscrowFactory } from "contracts/interfaces/IEscrowFactory.sol";
-import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol";
+import { IEscrowFactory } from "../../contracts/interfaces/IEscrowFactory.sol";
+import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
 
 import { Address, AddressLib, BaseSetup, IOrderMixin, TakerTraits } from "../utils/BaseSetup.sol";
 

diff --git a/test/integration/MerkleStorageInvalidator.t.sol b/test/integration/MerkleStorageInvalidator.t.sol
@@ -3,9 +3,9 @@ pragma solidity 0.8.23;
 
 import { Merkle } from "murky/src/Merkle.sol";
 
-import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol";
-import { IEscrowFactory } from "contracts/interfaces/IEscrowFactory.sol";
-import { IMerkleStorageInvalidator } from "contracts/interfaces/IMerkleStorageInvalidator.sol";
+import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
+import { IEscrowFactory } from "../../contracts/interfaces/IEscrowFactory.sol";
+import { IMerkleStorageInvalidator } from "../../contracts/interfaces/IMerkleStorageInvalidator.sol";
 
 import { BaseSetup, EscrowSrc, IOrderMixin, TakerTraits } from "../utils/BaseSetup.sol";
 

diff --git a/test/integration/ResolverMock.t.sol b/test/integration/ResolverMock.t.sol
@@ -2,11 +2,11 @@
 
 pragma solidity 0.8.23;
 
-import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol";
-import { IEscrowDst } from "contracts/interfaces/IEscrowDst.sol";
-import { IEscrowSrc } from "contracts/interfaces/IEscrowSrc.sol";
-import { Timelocks } from "contracts/libraries/TimelocksLib.sol";
-import { IResolverMock, ResolverMock } from "contracts/mocks/ResolverMock.sol";
+import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
+import { IEscrowDst } from "../../contracts/interfaces/IEscrowDst.sol";
+import { IEscrowSrc } from "../../contracts/interfaces/IEscrowSrc.sol";
+import { Timelocks } from "../../contracts/libraries/TimelocksLib.sol";
+import { IResolverMock, ResolverMock } from "../../contracts/mocks/ResolverMock.sol";
 import { BaseSetup, IOrderMixin, TakerTraits } from "../utils/BaseSetup.sol";
 
 contract IntegrationResolverMockTest is BaseSetup {

diff --git a/test/libraries/TimelocksLib.t.sol b/test/libraries/TimelocksLib.t.sol
@@ -3,10 +3,10 @@ pragma solidity 0.8.23;
 
 import { stdError } from "forge-std/StdError.sol";
 
-import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol";
-import { IEscrowDst } from "contracts/interfaces/IEscrowDst.sol";
+import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
+import { IEscrowDst } from "../../contracts/interfaces/IEscrowDst.sol";
 
-import { Timelocks } from "contracts/libraries/TimelocksLib.sol";
+import { Timelocks } from "../../contracts/libraries/TimelocksLib.sol";
 import { TimelocksSettersLib } from "../utils/libraries/TimelocksSettersLib.sol";
 
 import { BaseSetup } from "../utils/BaseSetup.sol";

diff --git a/test/unit/Escrow.t.sol b/test/unit/Escrow.t.sol
@@ -1,13 +1,13 @@
 // 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";
-import { IEscrowSrc } from "contracts/interfaces/IEscrowSrc.sol";
-import { IEscrowDst } from "contracts/interfaces/IEscrowDst.sol";
-import { NoReceiveCaller } from "contracts/mocks/NoReceiveCaller.sol";
+import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
+import { IEscrowFactory } from "../../contracts/interfaces/IEscrowFactory.sol";
+import { IEscrowSrc } from "../../contracts/interfaces/IEscrowSrc.sol";
+import { IEscrowDst } from "../../contracts/interfaces/IEscrowDst.sol";
+import { NoReceiveCaller } from "../../contracts/mocks/NoReceiveCaller.sol";
 
 import { BaseSetup, IOrderMixin } from "../utils/BaseSetup.sol";
 

diff --git a/test/unit/EscrowFactory.t.sol b/test/unit/EscrowFactory.t.sol
@@ -1,13 +1,13 @@
 // 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";
-import { IEscrowFactory } from "contracts/interfaces/IEscrowFactory.sol";
-import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol";
-import { Timelocks, TimelocksLib } from "contracts/libraries/TimelocksLib.sol";
+import { EscrowDst } from "../../contracts/EscrowDst.sol";
+import { IEscrowFactory } from "../../contracts/interfaces/IEscrowFactory.sol";
+import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
+import { Timelocks, TimelocksLib } from "../../contracts/libraries/TimelocksLib.sol";
 
 import { Address, AddressLib, BaseSetup, EscrowSrc, IOrderMixin } from "../utils/BaseSetup.sol";
 

diff --git a/test/unit/MerkleStorageInvalidator.t.sol b/test/unit/MerkleStorageInvalidator.t.sol
@@ -3,9 +3,9 @@ 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";
+import { IMerkleStorageInvalidator } from "../../contracts/interfaces/IMerkleStorageInvalidator.sol";
 
 import { Address, BaseSetup, IOrderMixin, MakerTraits } from "../utils/BaseSetup.sol";
 

diff --git a/test/utils/BaseSetup.sol b/test/utils/BaseSetup.sol
@@ -3,23 +3,23 @@ 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 { EscrowDst } from "contracts/EscrowDst.sol";
-import { EscrowSrc } from "contracts/EscrowSrc.sol";
-import { BaseEscrowFactory } from "contracts/BaseEscrowFactory.sol";
-import { EscrowFactory } from "contracts/EscrowFactory.sol";
-import { ERC20True } from "contracts/mocks/ERC20True.sol";
-import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol";
-import { EscrowFactoryZkSync } from "contracts/zkSync/EscrowFactoryZkSync.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";
+import { BaseEscrowFactory } from "../../contracts/BaseEscrowFactory.sol";
+import { EscrowFactory } from "../../contracts/EscrowFactory.sol";
+import { ERC20True } from "../../contracts/mocks/ERC20True.sol";
+import { IBaseEscrow } from "../../contracts/interfaces/IBaseEscrow.sol";
+import { EscrowFactoryZkSync } from "../../contracts/zkSync/EscrowFactoryZkSync.sol";
 import { Timelocks, TimelocksSettersLib } from "./libraries/TimelocksSettersLib.sol";