build: install core as package and bump it to v1.1.1

build: remove git modules
chore: update remappings and imports accordingly
ci: cache the node_modules in build job to re-use it other jobs

.github/workflows/ci-deep.yml

@@ -53,12 +53,24 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
 
+      - name: "Install Pnpm"
+        uses: "pnpm/action-setup@v2"
+        with:
+          version: "8"
+
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          cache: "pnpm"
+          node-version: "lts/*"
+
+      - name: "Install the Node.js dependencies"
+        run: "pnpm install"
+
       - name: "Produce an optimized build with --via-ir"
         run: "FOUNDRY_PROFILE=optimized forge build"
 

.github/workflows/ci.yml

@@ -51,8 +51,6 @@ jobs:
       steps:
         - name: "Check out the repo"
           uses: "actions/checkout@v3"
-          with:
-            submodules: "recursive"
 
         - name: "Install Foundry"
           uses: "foundry-rs/foundry-toolchain@v1"
@@ -80,12 +78,13 @@ jobs:
         - name: "Build the test contracts"
           run: "FOUNDRY_PROFILE=test-optimized forge build"   
 
-        - name: "Cache the build so that it can be re-used by the other jobs"
+        - name: "Cache the build and the node modules so that they can be re-used by the other jobs"
           uses: "actions/cache/save@v3"
           with:
-            key: "foundry-build-${{ github.sha }}"
+            key: "build-and-modules-${{ github.sha }}"
             path: |
               cache
+              node_modules
               out
               out-optimized
 
@@ -106,33 +105,18 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
 
-      - name: "Install Pnpm"
-        uses: "pnpm/action-setup@v2"
-        with:
-          version: "8"
-
-      - name: "Install Node.js"
-        uses: "actions/setup-node@v3"
-        with:
-          cache: "pnpm"
-          node-version: "lts/*"
-
-      - name: "Install the Node.js dependencies"
-        run: "pnpm install"
-
-      - name: "Restore the cached build"
+      - name: "Restore the cached build and the node modules"
         uses: "actions/cache/restore@v3"
         with:
           fail-on-cache-miss: true
-          key: "foundry-build-${{ github.sha }}"
+          key: "build-and-modules-${{ github.sha }}"
           path: |
             cache
+            node_modules
             out
             out-optimized
 
@@ -150,33 +134,18 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
-
-      - name: "Install Pnpm"
-        uses: "pnpm/action-setup@v2"
-        with:
-          version: "8"
-
-      - name: "Install Node.js"
-        uses: "actions/setup-node@v3"
-        with:
-          cache: "pnpm"
-          node-version: "lts/*"
-
-      - name: "Install the Node.js dependencies"
-        run: "pnpm install"
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
 
-      - name: "Restore the cached build"
+      - name: "Restore the cached build and the node modules"
         uses: "actions/cache/restore@v3"
         with:
           fail-on-cache-miss: true
-          key: "foundry-build-${{ github.sha }}"
+          key: "build-and-modules-${{ github.sha }}"
           path: |
             cache
+            node_modules
             out
             out-optimized
 
@@ -194,33 +163,18 @@ jobs:
     steps:
       - name: "Check out the repo"
         uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
-
-      - name: "Install Pnpm"
-        uses: "pnpm/action-setup@v2"
-        with:
-          version: "8"
-
-      - name: "Install Node.js"
-        uses: "actions/setup-node@v3"
-        with:
-          cache: "pnpm"
-          node-version: "lts/*"
-
-      - name: "Install the Node.js dependencies"
-        run: "pnpm install" 
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
 
-      - name: "Restore the cached build"
+      - name: "Restore the cached build and the node modules"
         uses: "actions/cache/restore@v3"
         with:
           fail-on-cache-miss: true
-          key: "foundry-build-${{ github.sha }}"
+          key: "build-and-modules-${{ github.sha }}"
           path: |
             cache
+            node_modules
             out
             out-optimized
 
@@ -241,23 +195,18 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
-        with:
-          submodules: "recursive"
-
-      - name: "Install Pnpm"
-        uses: "pnpm/action-setup@v2"
-        with:
-          version: "8"
+        uses: "actions/checkout@v3"  
 
-      - name: "Install Node.js"
-        uses: "actions/setup-node@v3"
+      - name: "Restore the cached build and the node modules"
+        uses: "actions/cache/restore@v3"
         with:
-          cache: "pnpm"
-          node-version: "lts/*"
-
-      - name: "Install the Node.js dependencies"
-        run: "pnpm install"    
+          fail-on-cache-miss: true
+          key: "build-and-modules-${{ github.sha }}"
+          path: |
+            cache
+            node_modules
+            out
+            out-optimized
 
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"

package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@openzeppelin/contracts": "4.9.2",
     "@prb/math": "4.0.2",
-    "@sablier/v2-core": "1.0.2"
+    "@sablier/v2-core": "1.1.1"
   },
   "devDependencies": {
     "@prb/test": "0.6.4",
@@ -24,6 +24,7 @@
   "files": [
     "artifacts",
     "src",
+    "test/utils",
     "CHANGELOG.md"
   ],
   "homepage": "https://github.com/sablier-labs/v2-periphery#readme",
@@ -48,7 +49,7 @@
     "web3"
   ],
   "peerDependencies": {
-    "@sablier/v2-core": "1.0.2"
+    "@sablier/v2-core": "1.1.1"
   },
   "publishConfig": {
     "access": "public"

remappings.txt

@@ -1,7 +1,6 @@
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
 @prb/math/=node_modules/@prb/math/
 @prb/test/=node_modules/@prb/test/
-@sablier/v2-core/=lib/v2-core/
-@sablier/v2-core-test/=lib/v2-core/test/
+@sablier/v2-core/=node_modules/@sablier/v2-core/
 forge-std/=node_modules/forge-std/
 solady/=node_modules/solady/

test/Base.t.sol

@@ -10,8 +10,8 @@ import { ISablierV2LockupDynamic } from "@sablier/v2-core/src/interfaces/ISablie
 import { ISablierV2LockupLinear } from "@sablier/v2-core/src/interfaces/ISablierV2LockupLinear.sol";
 import { LockupDynamic, LockupLinear } from "@sablier/v2-core/src/types/DataTypes.sol";
 
-import { Assertions as V2CoreAssertions } from "@sablier/v2-core-test/utils/Assertions.sol";
-import { Utils as V2CoreUtils } from "@sablier/v2-core-test/utils/Utils.sol";
+import { Assertions as V2CoreAssertions } from "@sablier/v2-core/test/utils/Assertions.sol";
+import { Utils as V2CoreUtils } from "@sablier/v2-core/test/utils/Utils.sol";
 
 import { ISablierV2Batch } from "src/interfaces/ISablierV2Batch.sol";
 import { ISablierV2MerkleStreamerFactory } from "src/interfaces/ISablierV2MerkleStreamerFactory.sol";

test/fork/Fork.t.sol

@@ -4,9 +4,9 @@ pragma solidity >=0.8.19 <0.9.0;
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 // import { ISablierV2LockupDynamic } from "@sablier/v2-core/src/interfaces/ISablierV2LockupDynamic.sol";
 // import { ISablierV2LockupLinear } from "@sablier/v2-core/src/interfaces/ISablierV2LockupLinear.sol";
-import { Precompiles as V2CorePrecompiles } from "@sablier/v2-core-test/utils/Precompiles.sol";
+import { Precompiles as V2CorePrecompiles } from "@sablier/v2-core/test/utils/Precompiles.sol";
 
-import { Fuzzers as V2CoreFuzzers } from "@sablier/v2-core-test/utils/Fuzzers.sol";
+import { Fuzzers as V2CoreFuzzers } from "@sablier/v2-core/test/utils/Fuzzers.sol";
 
 import { Defaults } from "../utils/Defaults.sol";
 import { Base_Test } from "../Base.t.sol";

test/integration/Integration.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.19 <0.9.0;
 
-import { Precompiles as V2CorePrecompiles } from "@sablier/v2-core-test/utils/Precompiles.sol";
+import { Precompiles as V2CorePrecompiles } from "@sablier/v2-core/test/utils/Precompiles.sol";
 
 import { Defaults } from "../utils/Defaults.sol";
 import { Base_Test } from "../Base.t.sol";