feat: sablier fee on Airstreams claim

.lintstagedrc.yml

@@ -1,4 +1,4 @@
 "*.{json,md,svg,yml}": "prettier --write"
 "*.sol":
-  - "bun solhint --fix --noPrompt"
+  - "bun solhint {benchmark,precompiles,script,src,test}/**/*.sol --fix --noPrompt"
   - "forge fmt"

precompiles/Precompiles.sol

@@ -182,9 +182,7 @@ contract Precompiles {
     }
 
     /// @notice Deploys all Core contracts.
-    function deployCore(
-        address initialAdmin
-    )
+    function deployCore(address initialAdmin)
         public
         returns (
             ILockupNFTDescriptor nftDescriptor,
@@ -213,8 +211,8 @@ contract Precompiles {
     }
 
     /// @notice Deploys {SablierMerkleFactory} from precompiled bytecode.
-    function deployMerkleFactory() public returns (ISablierMerkleFactory factory) {
-        bytes memory creationBytecode = BYTECODE_MERKLE_FACTORY;
+    function deployMerkleFactory(address initialAdmin) public returns (ISablierMerkleFactory factory) {
+        bytes memory creationBytecode = bytes.concat(BYTECODE_MERKLE_FACTORY, abi.encode(initialAdmin));
         assembly {
             factory := create(0, add(creationBytecode, 0x20), mload(creationBytecode))
         }
@@ -225,9 +223,12 @@ contract Precompiles {
     ///
     /// 1. {SablierBatchLockup}
     /// 2. {SablierMerkleFactory}
-    function deployPeriphery() public returns (ISablierBatchLockup batchLockup, ISablierMerkleFactory merkleFactory) {
+    function deployPeriphery(address initialAdmin)
+        public
+        returns (ISablierBatchLockup batchLockup, ISablierMerkleFactory merkleFactory)
+    {
         batchLockup = deployBatchLockup();
-        merkleFactory = deployMerkleFactory();
+        merkleFactory = deployMerkleFactory(initialAdmin);
     }
 
     /// @notice Deploys the entire Lockup Protocol from precompiled bytecode.
@@ -238,9 +239,7 @@ contract Precompiles {
     /// 4. {SablierLockupTranched}
     /// 5. {SablierBatchLockup}
     /// 6. {SablierMerkleFactory}
-    function deployProtocol(
-        address initialAdmin
-    )
+    function deployProtocol(address initialAdmin)
         public
         returns (
             ILockupNFTDescriptor nftDescriptor,
@@ -255,6 +254,6 @@ contract Precompiles {
         (nftDescriptor, lockupDynamic, lockupLinear, lockupTranched) = deployCore(initialAdmin);
 
         // Deploy Periphery.
-        (batchLockup, merkleFactory) = deployPeriphery();
+        (batchLockup, merkleFactory) = deployPeriphery(initialAdmin);
     }
 }

script/periphery/DeployDeterministicPeriphery.s.sol

@@ -14,14 +14,14 @@ import { BaseScript } from "../Base.s.sol";
 /// @dev Reverts if any contract has already been deployed.
 contract DeployDeterministicPeriphery is BaseScript {
     /// @dev Deploy via Forge.
-    function run()
+    function run(address initialAdmin)
         public
         virtual
         broadcast
         returns (SablierBatchLockup batchLockup, SablierMerkleFactory merkleFactory)
     {
         bytes32 salt = constructCreate2Salt();
         batchLockup = new SablierBatchLockup{ salt: salt }();
-        merkleFactory = new SablierMerkleFactory{ salt: salt }();
+        merkleFactory = new SablierMerkleFactory{ salt: salt }(initialAdmin);
     }
 }

script/periphery/DeployMerkleFactory.s.sol

@@ -7,7 +7,7 @@ import { BaseScript } from "../Base.s.sol";
 
 contract DeployMerkleFactory is BaseScript {
     /// @dev Deploy via Forge.
-    function run() public virtual broadcast returns (SablierMerkleFactory merkleFactory) {
-        merkleFactory = new SablierMerkleFactory();
+    function run(address initialAdmin) public virtual broadcast returns (SablierMerkleFactory merkleFactory) {
+        merkleFactory = new SablierMerkleFactory(initialAdmin);
     }
 }

script/periphery/DeployPeriphery.s.sol

@@ -11,13 +11,13 @@ import { BaseScript } from "./../Base.s.sol";
 /// 2. {SablierMerkleFactory}
 contract DeployPeriphery is BaseScript {
     /// @dev Deploy via Forge.
-    function run()
+    function run(address initialAdmin)
         public
         virtual
         broadcast
         returns (SablierBatchLockup batchLockup, SablierMerkleFactory merkleFactory)
     {
         batchLockup = new SablierBatchLockup();
-        merkleFactory = new SablierMerkleFactory();
+        merkleFactory = new SablierMerkleFactory(initialAdmin);
     }
 }

script/protocol/DeployDeterministicProtocol.s.sol

@@ -5,8 +5,8 @@ import { LockupNFTDescriptor } from "../../src/core/LockupNFTDescriptor.sol";
 import { SablierLockupDynamic } from "../../src/core/SablierLockupDynamic.sol";
 import { SablierLockupLinear } from "../../src/core/SablierLockupLinear.sol";
 import { SablierLockupTranched } from "../../src/core/SablierLockupTranched.sol";
-import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol";
 import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol";
+import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol";
 
 import { DeploymentLogger } from "./DeploymentLogger.s.sol";
 
@@ -72,7 +72,7 @@ contract DeployDeterministicProtocol is DeploymentLogger("deterministic") {
 
         // Deploy Periphery.
         batchLockup = new SablierBatchLockup{ salt: salt }();
-        merkleLockupFactory = new SablierMerkleFactory{ salt: salt }();
+        merkleLockupFactory = new SablierMerkleFactory{ salt: salt }(initialAdmin);
 
         appendToFileDeployedAddresses(
             address(lockupDynamic),

script/protocol/DeployProtocol.s.sol

@@ -5,8 +5,8 @@ import { LockupNFTDescriptor } from "../../src/core/LockupNFTDescriptor.sol";
 import { SablierLockupDynamic } from "../../src/core/SablierLockupDynamic.sol";
 import { SablierLockupLinear } from "../../src/core/SablierLockupLinear.sol";
 import { SablierLockupTranched } from "../../src/core/SablierLockupTranched.sol";
-import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol";
 import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol";
+import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol";
 
 import { DeploymentLogger } from "./DeploymentLogger.s.sol";
 
@@ -65,7 +65,7 @@ contract DeployProtocol is DeploymentLogger("non_deterministic") {
         lockupLinear = new SablierLockupLinear(initialAdmin, nftDescriptor);
         lockupTranched = new SablierLockupTranched(initialAdmin, nftDescriptor, trancheCountMap[block.chainid]);
         batchLockup = new SablierBatchLockup();
-        merkleLockupFactory = new SablierMerkleFactory();
+        merkleLockupFactory = new SablierMerkleFactory(initialAdmin);
 
         appendToFileDeployedAddresses(
             address(lockupDynamic),

script/protocol/DeploymentLogger.s.sol

@@ -2,7 +2,6 @@
 pragma solidity >=0.8.22 <0.9.0;
 
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { stdJson } from "forge-std/src/StdJson.sol";
 
 import { BaseScript } from "../Base.s.sol";
 

src/core/SablierLockupDynamic.sol

@@ -56,7 +56,6 @@ contract SablierLockupDynamic is
                                      CONSTRUCTOR
     //////////////////////////////////////////////////////////////////////////*/
 
-    /// @dev Emits a {TransferAdmin} event.
     /// @param initialAdmin The address of the initial contract admin.
     /// @param initialNFTDescriptor The address of the NFT descriptor contract.
     /// @param maxSegmentCount The maximum number of segments allowed in a stream.

src/core/SablierLockupLinear.sol

@@ -50,7 +50,6 @@ contract SablierLockupLinear is
                                      CONSTRUCTOR
     //////////////////////////////////////////////////////////////////////////*/
 
-    /// @dev Emits a {TransferAdmin} event.
     /// @param initialAdmin The address of the initial contract admin.
     /// @param initialNFTDescriptor The address of the initial NFT descriptor.
     constructor(

src/core/SablierLockupTranched.sol

@@ -51,7 +51,6 @@ contract SablierLockupTranched is
                                      CONSTRUCTOR
     //////////////////////////////////////////////////////////////////////////*/
 
-    /// @dev Emits a {TransferAdmin} event.
     /// @param initialAdmin The address of the initial contract admin.
     /// @param initialNFTDescriptor The address of the NFT descriptor contract.
     /// @param maxTrancheCount The maximum number of tranches allowed in a stream.

src/core/abstracts/Adminable.sol

@@ -26,6 +26,17 @@ abstract contract Adminable is IAdminable {
         _;
     }
 
+    /*//////////////////////////////////////////////////////////////////////////
+                                     CONSTRUCTOR
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /// @dev Emits a {TransferAdmin} event.
+    /// @param initialAdmin The address of the initial admin.
+    constructor(address initialAdmin) {
+        admin = initialAdmin;
+        emit TransferAdmin({ oldAdmin: address(0), newAdmin: initialAdmin });
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
                          USER-FACING NON-CONSTANT FUNCTIONS
     //////////////////////////////////////////////////////////////////////////*/

src/core/abstracts/SablierLockup.sol

@@ -48,13 +48,10 @@ abstract contract SablierLockup is
                                      CONSTRUCTOR
     //////////////////////////////////////////////////////////////////////////*/
 
-    /// @dev Emits a {TransferAdmin} event.
     /// @param initialAdmin The address of the initial contract admin.
     /// @param initialNFTDescriptor The address of the initial NFT descriptor.
-    constructor(address initialAdmin, ILockupNFTDescriptor initialNFTDescriptor) {
-        admin = initialAdmin;
+    constructor(address initialAdmin, ILockupNFTDescriptor initialNFTDescriptor) Adminable(initialAdmin) {
         nftDescriptor = initialNFTDescriptor;
-        emit TransferAdmin({ oldAdmin: address(0), newAdmin: initialAdmin });
     }
 
     /*//////////////////////////////////////////////////////////////////////////