refactor: move batch lockup contract in core

precompiles/Precompiles.sol

@@ -3,9 +3,9 @@
 pragma solidity >=0.8.22;
 
 import { ILockupNFTDescriptor } from "./../src/core/interfaces/ILockupNFTDescriptor.sol";
+import { ISablierBatchLockup } from "./../src/core/interfaces/ISablierBatchLockup.sol";
 import { ISablierLockup } from "./../src/core/interfaces/ISablierLockup.sol";
 import { LockupNFTDescriptor } from "./../src/core/LockupNFTDescriptor.sol";
-import { ISablierBatchLockup } from "./../src/periphery/interfaces/ISablierBatchLockup.sol";
 import { ISablierMerkleFactory } from "./../src/periphery/interfaces/ISablierMerkleFactory.sol";
 
 /// @notice This is useful for external integrations seeking to test against the exact deployed bytecode, as recompiling

script/periphery/DeployBatchLockup.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol";
+import { SablierBatchLockup } from "../../src/core/SablierBatchLockup.sol";
 
 import { BaseScript } from "../Base.s.sol";
 

script/periphery/DeployDeterministicBatchLockup.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol";
+import { SablierBatchLockup } from "../../src/core/SablierBatchLockup.sol";
 
 import { BaseScript } from "../Base.s.sol";
 

script/periphery/DeployDeterministicPeriphery.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol";
+import { SablierBatchLockup } from "../../src/core/SablierBatchLockup.sol";
 import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol";
 
 import { BaseScript } from "../Base.s.sol";

script/periphery/DeployPeriphery.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierBatchLockup } from "./../../src/periphery/SablierBatchLockup.sol";
+import { SablierBatchLockup } from "./../../src/core/SablierBatchLockup.sol";
 import { SablierMerkleFactory } from "./../../src/periphery/SablierMerkleFactory.sol";
 import { BaseScript } from "./../Base.s.sol";
 

script/protocol/DeployDeterministicProtocol.s.sol

@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { LockupNFTDescriptor } from "../../src/core/LockupNFTDescriptor.sol";
-import { SablierLockup } from "../../src/core/SablierLockup.sol";
-import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol";
-import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol";
-
+import { LockupNFTDescriptor } from "./../../src/core/LockupNFTDescriptor.sol";
+import { SablierBatchLockup } from "./../../src/core/SablierBatchLockup.sol";
+import { SablierLockup } from "./../../src/core/SablierLockup.sol";
+import { SablierMerkleFactory } from "./../../src/periphery/SablierMerkleFactory.sol";
 import { DeploymentLogger } from "./DeploymentLogger.s.sol";
 
 /// @notice Deploys the Lockup Protocol at deterministic addresses across chains.

script/protocol/DeployProtocol.s.sol

@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { LockupNFTDescriptor } from "../../src/core/LockupNFTDescriptor.sol";
-import { SablierLockup } from "../../src/core/SablierLockup.sol";
-import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol";
-import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol";
-
+import { LockupNFTDescriptor } from "./../../src/core/LockupNFTDescriptor.sol";
+import { SablierBatchLockup } from "./../../src/core/SablierBatchLockup.sol";
+import { SablierLockup } from "./../../src/core/SablierLockup.sol";
+import { SablierMerkleFactory } from "./../../src/periphery/SablierMerkleFactory.sol";
 import { DeploymentLogger } from "./DeploymentLogger.s.sol";
 
 /// @notice Deploys the Lockup Protocol.

src/periphery/SablierBatchLockup.sol → src/core/SablierBatchLockup.sol

@@ -4,12 +4,10 @@ pragma solidity >=0.8.22;
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import { ISablierLockup } from "../core/interfaces/ISablierLockup.sol";
-import { Lockup } from "../core/types/DataTypes.sol";
-
 import { ISablierBatchLockup } from "./interfaces/ISablierBatchLockup.sol";
+import { ISablierLockup } from "./interfaces/ISablierLockup.sol";
 import { Errors } from "./libraries/Errors.sol";
-import { BatchLockup } from "./types/DataTypes.sol";
+import { BatchLockup, Lockup } from "./types/DataTypes.sol";
 
 /// @title SablierBatchLockup
 /// @notice See the documentation in {ISablierBatchLockup}.

src/core/libraries/Errors.sol

@@ -20,8 +20,15 @@ library Errors {
     error CallerNotAdmin(address admin, address caller);
 
     /// @notice Thrown when trying to delegate call to a function that disallows delegate calls.
+
     error DelegateCall();
 
+    /*//////////////////////////////////////////////////////////////////////////
+                                SABLIER-BATCH-LOCKUP
+    //////////////////////////////////////////////////////////////////////////*/
+
+    error SablierBatchLockup_BatchSizeZero();
+
     /*//////////////////////////////////////////////////////////////////////////
                                LOCKUP-NFT-DESCRIPTOR
     //////////////////////////////////////////////////////////////////////////*/

src/core/types/DataTypes.sol

@@ -216,3 +216,74 @@ library LockupTranched {
         uint40 duration;
     }
 }
+
+library BatchLockup {
+    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithDurationsLD} except for the asset.
+    struct CreateWithDurationsLD {
+        address sender;
+        address recipient;
+        uint128 totalAmount;
+        bool cancelable;
+        bool transferable;
+        LockupDynamic.SegmentWithDuration[] segmentsWithDuration;
+        Broker broker;
+    }
+
+    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithDurationsLL} except for the asset.
+    struct CreateWithDurationsLL {
+        address sender;
+        address recipient;
+        uint128 totalAmount;
+        bool cancelable;
+        bool transferable;
+        LockupLinear.Durations durations;
+        Broker broker;
+    }
+
+    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithDurationsLT} except for the asset.
+    struct CreateWithDurationsLT {
+        address sender;
+        address recipient;
+        uint128 totalAmount;
+        bool cancelable;
+        bool transferable;
+        LockupTranched.TrancheWithDuration[] tranchesWithDuration;
+        Broker broker;
+    }
+
+    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithTimestampsLD} except for the asset.
+    struct CreateWithTimestampsLD {
+        address sender;
+        address recipient;
+        uint128 totalAmount;
+        bool cancelable;
+        bool transferable;
+        uint40 startTime;
+        LockupDynamic.Segment[] segments;
+        Broker broker;
+    }
+
+    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithTimestampsLL} except for the asset.
+    struct CreateWithTimestampsLL {
+        address sender;
+        address recipient;
+        uint128 totalAmount;
+        bool cancelable;
+        bool transferable;
+        Lockup.Timestamps timestamps;
+        uint40 cliffTime;
+        Broker broker;
+    }
+
+    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithTimestampsLT} except for the asset.
+    struct CreateWithTimestampsLT {
+        address sender;
+        address recipient;
+        uint128 totalAmount;
+        bool cancelable;
+        bool transferable;
+        uint40 startTime;
+        LockupTranched.Tranche[] tranches;
+        Broker broker;
+    }
+}

src/periphery/libraries/Errors.sol

@@ -4,12 +4,6 @@ pragma solidity >=0.8.22;
 /// @title Errors
 /// @notice Library containing all custom errors the protocol may revert with.
 library Errors {
-    /*//////////////////////////////////////////////////////////////////////////
-                                SABLIER-BATCH-LOCKUP
-    //////////////////////////////////////////////////////////////////////////*/
-
-    error SablierBatchLockup_BatchSizeZero();
-
     /*//////////////////////////////////////////////////////////////////////////
                               SABLIER-MERKLE-FACTORY
     //////////////////////////////////////////////////////////////////////////*/

src/periphery/types/DataTypes.sol

@@ -4,79 +4,6 @@ pragma solidity >=0.8.22;
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { UD2x18 } from "@prb/math/src/UD2x18.sol";
 
-import { Broker, Lockup, LockupDynamic, LockupLinear, LockupTranched } from "../../core/types/DataTypes.sol";
-
-library BatchLockup {
-    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithDurationsLD} except for the asset.
-    struct CreateWithDurationsLD {
-        address sender;
-        address recipient;
-        uint128 totalAmount;
-        bool cancelable;
-        bool transferable;
-        LockupDynamic.SegmentWithDuration[] segmentsWithDuration;
-        Broker broker;
-    }
-
-    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithDurationsLL} except for the asset.
-    struct CreateWithDurationsLL {
-        address sender;
-        address recipient;
-        uint128 totalAmount;
-        bool cancelable;
-        bool transferable;
-        LockupLinear.Durations durations;
-        Broker broker;
-    }
-
-    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithDurationsLT} except for the asset.
-    struct CreateWithDurationsLT {
-        address sender;
-        address recipient;
-        uint128 totalAmount;
-        bool cancelable;
-        bool transferable;
-        LockupTranched.TrancheWithDuration[] tranchesWithDuration;
-        Broker broker;
-    }
-
-    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithTimestampsLD} except for the asset.
-    struct CreateWithTimestampsLD {
-        address sender;
-        address recipient;
-        uint128 totalAmount;
-        bool cancelable;
-        bool transferable;
-        uint40 startTime;
-        LockupDynamic.Segment[] segments;
-        Broker broker;
-    }
-
-    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithTimestampsLL} except for the asset.
-    struct CreateWithTimestampsLL {
-        address sender;
-        address recipient;
-        uint128 totalAmount;
-        bool cancelable;
-        bool transferable;
-        Lockup.Timestamps timestamps;
-        uint40 cliffTime;
-        Broker broker;
-    }
-
-    /// @notice A struct encapsulating all parameters of {SablierLockup.createWithTimestampsLT} except for the asset.
-    struct CreateWithTimestampsLT {
-        address sender;
-        address recipient;
-        uint128 totalAmount;
-        bool cancelable;
-        bool transferable;
-        uint40 startTime;
-        LockupTranched.Tranche[] tranches;
-        Broker broker;
-    }
-}
-
 library MerkleBase {
     /// @notice Struct encapsulating the base constructor parameters of a Merkle campaign.
     /// @param asset The contract address of the ERC-20 asset to be distributed.