[SC-1020] Cross-chain settlement extension

contracts/EscrowFactory.sol

@@ -5,36 +5,29 @@ pragma solidity 0.8.23;
 import { IOrderMixin } from "@1inch/limit-order-protocol-contract/contracts/interfaces/IOrderMixin.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
+import { ExtensionBase } from "@1inch/limit-order-settlement/contracts/ExtensionBase.sol";
 import { Address, AddressLib } from "@1inch/solidity-utils/contracts/libraries/AddressLib.sol";
 import { SafeERC20 } from "@1inch/solidity-utils/contracts/libraries/SafeERC20.sol";
 import { ClonesWithImmutableArgs } from "clones-with-immutable-args/ClonesWithImmutableArgs.sol";
 
 import { IEscrowFactory } from "./interfaces/IEscrowFactory.sol";
 import { Escrow } from "./Escrow.sol";
 
-contract EscrowFactory is IEscrowFactory {
+contract EscrowFactory is IEscrowFactory, ExtensionBase {
     using AddressLib for Address;
     using ClonesWithImmutableArgs for address;
     using SafeERC20 for IERC20;
 
     address public immutable IMPLEMENTATION;
-    address public immutable LIMIT_ORDER_PROTOCOL;
 
-    /// @dev Modifier to check if the caller is the limit order protocol contract.
-    modifier onlyLimitOrderProtocol {
-        if (msg.sender != LIMIT_ORDER_PROTOCOL) revert OnlyLimitOrderProtocol();
-        _;
-    }
-
-    constructor(address implementation, address limitOrderProtocol) {
+    constructor(address implementation, address limitOrderProtocol) ExtensionBase(limitOrderProtocol) {
         IMPLEMENTATION = implementation;
-        LIMIT_ORDER_PROTOCOL = limitOrderProtocol;
     }
 
     /**
      * @dev Creates a new escrow contract for maker.
      */
-    function postInteraction(
+    function _postInteraction(
         IOrderMixin.Order calldata order,
         bytes calldata /* extension */,
         bytes32 orderHash,
@@ -43,7 +36,7 @@ contract EscrowFactory is IEscrowFactory {
         uint256 takingAmount,
         uint256 /* remainingMakingAmount */,
         bytes calldata extraData
-    ) external onlyLimitOrderProtocol {
+    ) internal override {
         bytes memory interactionParams = abi.encode(
             order.maker,
             taker,

contracts/interfaces/IEscrowFactory.sol

@@ -18,5 +18,4 @@ interface IEscrowFactory {
 
     error InsufficientEscrowBalance();
     error InvalidCreationTime();
-    error OnlyLimitOrderProtocol();
 }

hardhat.config.js

@@ -3,7 +3,7 @@ require('@nomicfoundation/hardhat-ethers');
 require('@nomicfoundation/hardhat-verify');
 require('dotenv').config();
 require('hardhat-dependency-compiler');
-// require('hardhat-deploy');
+require('hardhat-deploy');
 require('hardhat-gas-reporter');
 // require('hardhat-tracer');
 require('solidity-coverage');

package.json

@@ -8,9 +8,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@1inch/solidity-utils": "3.5.4",
+    "@1inch/solidity-utils": "3.5.5",
     "@openzeppelin/contracts": "5.0.1",
-    "@1inch/limit-order-protocol-contract": "4.0.0-prerelease-15"
+    "@1inch/limit-order-protocol-contract": "4.0.0-prerelease-16",
+    "@1inch/limit-order-settlement": "2.0.0-prerelease-3"
   },
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "2.0.2",