merge staging into main

.codecov.yml

@@ -5,5 +5,6 @@ coverage:
   status:
     patch: off
 ignore:
+  - "precompiles"
   - "script"
   - "test"

.env.example

@@ -1,4 +1,5 @@
 export API_KEY_INFURA="YOUR_API_KEY_INFURA"
+export EOA="YOUR_EOA_ADDRESS"
 export FOUNDRY_PROFILE="lite"
 export MNEMONIC="YOUR_MNEMONIC"
 export RPC_URL_MAINNET="YOUR_RPC_URL_MAINNET"

.github/workflows/ci.yml

@@ -29,6 +29,25 @@ jobs:
       match-path: "test/integration/**/*.sol"
       name: "Integration tests"
 
+  test-utils:
+    needs: ["lint", "build"]
+    uses: "sablier-labs/reusable-workflows/.github/workflows/forge-test.yml@main"
+    with:
+      foundry-profile: "test-optimized"
+      match-path: "test/utils/**/*.sol"
+      name: "Utils tests"
+
+  test-fork:
+    needs: ["lint", "build"]
+    secrets:
+      RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }}
+    uses: "sablier-labs/reusable-workflows/.github/workflows/forge-test.yml@main"
+    with:
+      foundry-fuzz-runs: 20
+      foundry-profile: "test-optimized"
+      match-path: "test/fork/**/*.sol"
+      name: "Fork tests"
+
   coverage:
     needs: ["lint", "build"]
     secrets:

.github/workflows/multibuild.yml

@@ -21,6 +21,6 @@ jobs:
       - name: "Check that V2 Periphery can be built with multiple Solidity versions"
         uses: "PaulRBerg/foundry-multibuild@v1"
         with:
-          min: "0.8.19"
-          max: "0.8.23"
+          min: "0.8.22"
+          max: "0.8.26"
           skip-test: "true"

.solhint.json

@@ -3,12 +3,12 @@
   "rules": {
     "avoid-low-level-calls": "off",
     "code-complexity": ["error", 8],
-    "compiler-version": ["error", ">=0.8.19"],
+    "compiler-version": ["error", ">=0.8.22"],
     "contract-name-camelcase": "off",
     "const-name-snakecase": "off",
-    "custom-errors": "off",
     "func-name-mixedcase": "off",
     "func-visibility": ["error", { "ignoreConstructors": true }],
+    "gas-custom-errors": "off",
     "max-line-length": ["error", 123],
     "named-parameters-mapping": "warn",
     "no-empty-blocks": "off",

.vscode/settings.json

@@ -9,5 +9,8 @@
     ".gas-snapshot": "julia"
   },
   "editor.formatOnSave": true,
+  "search.exclude": {
+    "**/node_modules": true
+  },
   "solidity.formatter": "forge"
 }

CHANGELOG.md

@@ -4,13 +4,39 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Common Changelog](https://common-changelog.org).
 
+[1.2.0]: https://github.com/sablier-labs/v2-periphery/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/sablier-labs/v2-periphery/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.3...v1.1.0
 [1.0.3]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/sablier-labs/v2-periphery/releases/tag/v1.0.0
 
+## [1.2.0] - 2024-07-04
+
+### Changed
+
+- Bump dependencies ([#283](https://github.com/sablier-labs/v2-periphery/pull/283),
+  [#351](https://github.com/sablier-labs/v2-periphery/pull/351),
+  [#363](https://github.com/sablier-labs/v2-periphery/pull/363))
+- Rename `Batch` to `BatchLockup` ([#322](https://github.com/sablier-labs/v2-periphery/pull/322))
+- Rename `MerkleStreamer` to `MerkleLockup` ([#268](https://github.com/sablier-labs/v2-periphery/pull/268))
+- Refactor `Range` to `Timestamps` ([#335](https://github.com/sablier-labs/v2-periphery/pull/335))
+- Switch to Bun ([#249](https://github.com/sablier-labs/v2-periphery/pull/249))
+- Use Solidity v0.8.26 ([#351](https://github.com/sablier-labs/v2-periphery/pull/351))
+
+### Added
+
+- And `BatchLockup` support for `LockupTranched` ([#300](https://github.com/sablier-labs/v2-periphery/pull/300))
+- Add grace period mechanism for `clawback` function ([#340](https://github.com/sablier-labs/v2-periphery/pull/340))
+- Add `MerkleLockup` support for `LockupTranched` ([#297](https://github.com/sablier-labs/v2-periphery/pull/297),
+  [#357](https://github.com/sablier-labs/v2-periphery/pull/357))
+- Add `precompiles` in the NPM release ([#302](https://github.com/sablier-labs/v2-periphery/pull/302))
+
+### Removed
+
+- **Breaking**: Remove protocol fee check in `MerkleLL` ([#257](https://github.com/sablier-labs/v2-periphery/pull/257))
+
 ## [1.1.1] - 2023-12-20
 
 ### Changed

SECURITY.md

@@ -31,8 +31,8 @@ The Program does NOT cover the following:
 
 Vulnerabilities contingent upon the occurrence of any of the following also are outside the scope of this Program:
 
-- Front-end bugs
-- DDOS attacks
+- Front-end bugs (clickjacking etc.)
+- DDoS attacks
 - Spamming
 - Phishing
 - Social engineering attacks
@@ -47,6 +47,8 @@ vulnerability, it must adhere to these assumptions as well:
 
 - [All assumptions](https://github.com/sablier-labs/v2-core/blob/main/SECURITY.md) in Sablier V2 Core apply to Sablier
   V2 Periphery as well.
+- In `SablierV2MerkleLT`, the tranche unlock percentages and the durations will be same for all airdrop claimers.
+- In `SablierV2MerkleLockupFactory`, there should be no need to create two Merkle campaigns with identical parameters.
 
 ### Rewards