refactor: batch function

sablier-labs · Dec 31, 2024 · ab3f0eb · ab3f0eb
1 parent b5df197
commit ab3f0eb
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 217 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "5.0.2",
-    "@prb/math": "4.1.0"
+    "@prb/math": "4.1.0",
+    "@sablier/lockup": "github:sablier-labs/v2-core#f890214"
   },
   "devDependencies": {
     "forge-std": "github:foundry-rs/forge-std#v1.8.2",

diff --git a/remappings.txt b/remappings.txt
@@ -1,4 +1,5 @@
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
 @prb/math/=node_modules/@prb/math/
-forge-std/=node_modules/forge-std/ 
-solady/=node_modules/solady/
+@sablier/lockup/=node_modules/@sablier/lockup/
+forge-std/=node_modules/forge-std/
+solady/=node_modules/solady/
diff --git a/src/SablierFlow.sol b/src/SablierFlow.sol
@@ -8,8 +8,8 @@ import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 import { ud21x18, UD21x18 } from "@prb/math/src/UD21x18.sol";
 import { UD60x18, ZERO } from "@prb/math/src/UD60x18.sol";
+import { Batch } from "@sablier/lockup/src/abstracts/Batch.sol";
 
-import { Batch } from "./abstracts/Batch.sol";
 import { NoDelegateCall } from "./abstracts/NoDelegateCall.sol";
 import { SablierFlowBase } from "./abstracts/SablierFlowBase.sol";
 import { IFlowNFTDescriptor } from "./interfaces/IFlowNFTDescriptor.sol";

diff --git a/src/abstracts/Batch.sol b/src/abstracts/Batch.sol
diff --git a/src/interfaces/IBatch.sol b/src/interfaces/IBatch.sol
diff --git a/src/interfaces/ISablierFlow.sol b/src/interfaces/ISablierFlow.sol
@@ -3,9 +3,9 @@ pragma solidity >=0.8.22;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { UD21x18 } from "@prb/math/src/UD21x18.sol";
+import { IBatch } from "@sablier/lockup/src/interfaces/IBatch.sol";
 
 import { Broker, Flow } from "./../types/DataTypes.sol";
-import { IBatch } from "./IBatch.sol";
 import { ISablierFlowBase } from "./ISablierFlowBase.sol";
 
 /// @title ISablierFlow

diff --git a/tests/fork/Fork.t.sol b/tests/fork/Fork.t.sol
@@ -3,7 +3,6 @@ pragma solidity >=0.8.22;
 
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { ISablierFlow } from "src/interfaces/ISablierFlow.sol";
 import { SablierFlow } from "src/SablierFlow.sol";
 
 import { Base_Test } from "../Base.t.sol";