feat: add periphery contracts in src

feat: add core dir in src
sablier-labs · Jul 24, 2024 · 41524b5 · 41524b5
1 parent fe60d98
commit 41524b5
Show file tree

Hide file tree

Showing 45 changed files with 1,539 additions and 36 deletions.
diff --git a/script/DeployCore.s.sol b/script/DeployCore.s.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol";
-import { SablierV2LockupLinear } from "../src/SablierV2LockupLinear.sol";
-import { SablierV2LockupTranched } from "../src/SablierV2LockupTranched.sol";
-import { SablierV2NFTDescriptor } from "../src/SablierV2NFTDescriptor.sol";
+import { SablierV2LockupDynamic } from "../src/core/SablierV2LockupDynamic.sol";
+import { SablierV2LockupLinear } from "../src/core/SablierV2LockupLinear.sol";
+import { SablierV2LockupTranched } from "../src/core/SablierV2LockupTranched.sol";
+import { SablierV2NFTDescriptor } from "../src/core/SablierV2NFTDescriptor.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployCore2.s.sol b/script/DeployCore2.s.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol";
-import { SablierV2LockupLinear } from "../src/SablierV2LockupLinear.sol";
-import { SablierV2LockupTranched } from "../src/SablierV2LockupTranched.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupDynamic } from "../src/core/SablierV2LockupDynamic.sol";
+import { SablierV2LockupLinear } from "../src/core/SablierV2LockupLinear.sol";
+import { SablierV2LockupTranched } from "../src/core/SablierV2LockupTranched.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployDeterministicCore.s.sol b/script/DeployDeterministicCore.s.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol";
-import { SablierV2LockupLinear } from "../src/SablierV2LockupLinear.sol";
-import { SablierV2LockupTranched } from "../src/SablierV2LockupTranched.sol";
-import { SablierV2NFTDescriptor } from "../src/SablierV2NFTDescriptor.sol";
+import { SablierV2LockupDynamic } from "../src/core/SablierV2LockupDynamic.sol";
+import { SablierV2LockupLinear } from "../src/core/SablierV2LockupLinear.sol";
+import { SablierV2LockupTranched } from "../src/core/SablierV2LockupTranched.sol";
+import { SablierV2NFTDescriptor } from "../src/core/SablierV2NFTDescriptor.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployDeterministicCore2.s.sol b/script/DeployDeterministicCore2.s.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol";
-import { SablierV2LockupLinear } from "../src/SablierV2LockupLinear.sol";
-import { SablierV2LockupTranched } from "../src/SablierV2LockupTranched.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupDynamic } from "../src/core/SablierV2LockupDynamic.sol";
+import { SablierV2LockupLinear } from "../src/core/SablierV2LockupLinear.sol";
+import { SablierV2LockupTranched } from "../src/core/SablierV2LockupTranched.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployDeterministicLockupDynamic.s.sol b/script/DeployDeterministicLockupDynamic.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupDynamic } from "../src/core/SablierV2LockupDynamic.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployDeterministicLockupLinear.s.sol b/script/DeployDeterministicLockupLinear.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupLinear } from "../src/SablierV2LockupLinear.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupLinear } from "../src/core/SablierV2LockupLinear.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployDeterministicLockupTranched.s.sol b/script/DeployDeterministicLockupTranched.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupTranched } from "../src/SablierV2LockupTranched.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupTranched } from "../src/core/SablierV2LockupTranched.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployDeterministicNFTDescriptor.s.sol b/script/DeployDeterministicNFTDescriptor.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierV2NFTDescriptor } from "../src/SablierV2NFTDescriptor.sol";
+import { SablierV2NFTDescriptor } from "../src/core/SablierV2NFTDescriptor.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployLockupDynamic.s.sol b/script/DeployLockupDynamic.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupDynamic } from "../src/core/SablierV2LockupDynamic.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployLockupLinear.s.sol b/script/DeployLockupLinear.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupLinear } from "../src/SablierV2LockupLinear.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupLinear } from "../src/core/SablierV2LockupLinear.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployLockupTranched.s.sol b/script/DeployLockupTranched.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol";
-import { SablierV2LockupTranched } from "../src/SablierV2LockupTranched.sol";
+import { ISablierV2NFTDescriptor } from "../src/core/interfaces/ISablierV2NFTDescriptor.sol";
+import { SablierV2LockupTranched } from "../src/core/SablierV2LockupTranched.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/DeployNFTDescriptor.s.sol b/script/DeployNFTDescriptor.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22 <0.9.0;
 
-import { SablierV2NFTDescriptor } from "../src/SablierV2NFTDescriptor.sol";
+import { SablierV2NFTDescriptor } from "../src/core/SablierV2NFTDescriptor.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/GenerateSVG.s.sol b/script/GenerateSVG.s.sol
@@ -3,9 +3,9 @@ pragma solidity >=0.8.22 <0.9.0;
 
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
-import { NFTSVG } from "../src/libraries/NFTSVG.sol";
-import { SVGElements } from "../src/libraries/SVGElements.sol";
-import { SablierV2NFTDescriptor } from "../src/SablierV2NFTDescriptor.sol";
+import { NFTSVG } from "../src/core/libraries/NFTSVG.sol";
+import { SVGElements } from "../src/core/libraries/SVGElements.sol";
+import { SablierV2NFTDescriptor } from "../src/core/SablierV2NFTDescriptor.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/script/Init.s.sol b/script/Init.s.sol
@@ -7,9 +7,9 @@ import { ud60x18 } from "@prb/math/src/UD60x18.sol";
 
 import { Solarray } from "solarray/src/Solarray.sol";
 
-import { ISablierV2LockupDynamic } from "../src/interfaces/ISablierV2LockupDynamic.sol";
-import { ISablierV2LockupLinear } from "../src/interfaces/ISablierV2LockupLinear.sol";
-import { Broker, LockupDynamic, LockupLinear } from "../src/types/DataTypes.sol";
+import { ISablierV2LockupDynamic } from "../src/core/interfaces/ISablierV2LockupDynamic.sol";
+import { ISablierV2LockupLinear } from "../src/core/interfaces/ISablierV2LockupLinear.sol";
+import { Broker, LockupDynamic, LockupLinear } from "../src/core/types/DataTypes.sol";
 
 import { BaseScript } from "./Base.s.sol";
 

diff --git a/src/SablierV2LockupDynamic.sol → src/core/SablierV2LockupDynamic.sol b/src/SablierV2LockupDynamic.sol → src/core/SablierV2LockupDynamic.sol
diff --git a/src/SablierV2LockupLinear.sol → src/core/SablierV2LockupLinear.sol b/src/SablierV2LockupLinear.sol → src/core/SablierV2LockupLinear.sol
diff --git a/src/SablierV2LockupTranched.sol → src/core/SablierV2LockupTranched.sol b/src/SablierV2LockupTranched.sol → src/core/SablierV2LockupTranched.sol
diff --git a/src/SablierV2NFTDescriptor.sol → src/core/SablierV2NFTDescriptor.sol b/src/SablierV2NFTDescriptor.sol → src/core/SablierV2NFTDescriptor.sol
diff --git a/src/abstracts/Adminable.sol → src/core/abstracts/Adminable.sol b/src/abstracts/Adminable.sol → src/core/abstracts/Adminable.sol
diff --git a/src/abstracts/NoDelegateCall.sol → src/core/abstracts/NoDelegateCall.sol b/src/abstracts/NoDelegateCall.sol → src/core/abstracts/NoDelegateCall.sol
diff --git a/src/abstracts/SablierV2Lockup.sol → src/core/abstracts/SablierV2Lockup.sol b/src/abstracts/SablierV2Lockup.sol → src/core/abstracts/SablierV2Lockup.sol
diff --git a/src/interfaces/IAdminable.sol → src/core/interfaces/IAdminable.sol b/src/interfaces/IAdminable.sol → src/core/interfaces/IAdminable.sol
diff --git a/src/interfaces/ISablierLockupRecipient.sol → ...re/interfaces/ISablierLockupRecipient.sol b/src/interfaces/ISablierLockupRecipient.sol → ...re/interfaces/ISablierLockupRecipient.sol
diff --git a/src/interfaces/ISablierV2Lockup.sol → src/core/interfaces/ISablierV2Lockup.sol b/src/interfaces/ISablierV2Lockup.sol → src/core/interfaces/ISablierV2Lockup.sol
diff --git a/src/interfaces/ISablierV2LockupDynamic.sol → ...re/interfaces/ISablierV2LockupDynamic.sol b/src/interfaces/ISablierV2LockupDynamic.sol → ...re/interfaces/ISablierV2LockupDynamic.sol
diff --git a/src/interfaces/ISablierV2LockupLinear.sol → ...ore/interfaces/ISablierV2LockupLinear.sol b/src/interfaces/ISablierV2LockupLinear.sol → ...ore/interfaces/ISablierV2LockupLinear.sol
diff --git a/src/interfaces/ISablierV2LockupTranched.sol → ...e/interfaces/ISablierV2LockupTranched.sol b/src/interfaces/ISablierV2LockupTranched.sol → ...e/interfaces/ISablierV2LockupTranched.sol
diff --git a/src/interfaces/ISablierV2NFTDescriptor.sol → ...re/interfaces/ISablierV2NFTDescriptor.sol b/src/interfaces/ISablierV2NFTDescriptor.sol → ...re/interfaces/ISablierV2NFTDescriptor.sol
diff --git a/src/libraries/Errors.sol → src/core/libraries/Errors.sol b/src/libraries/Errors.sol → src/core/libraries/Errors.sol
diff --git a/src/libraries/Helpers.sol → src/core/libraries/Helpers.sol b/src/libraries/Helpers.sol → src/core/libraries/Helpers.sol
diff --git a/src/libraries/NFTSVG.sol → src/core/libraries/NFTSVG.sol b/src/libraries/NFTSVG.sol → src/core/libraries/NFTSVG.sol
diff --git a/src/libraries/SVGElements.sol → src/core/libraries/SVGElements.sol b/src/libraries/SVGElements.sol → src/core/libraries/SVGElements.sol
diff --git a/src/types/DataTypes.sol → src/core/types/DataTypes.sol b/src/types/DataTypes.sol → src/core/types/DataTypes.sol