@bananapus/721-hook-v6 0.0.11 → 0.0.13

package/src/libraries/JB721TiersHookLib.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
@@ -31,7 +30,7 @@ library JB721TiersHookLib {
     /// @notice Handles the full tier adjustment logic: removes tiers, adds tiers, emits events, and sets splits.
     /// @dev Called via DELEGATECALL from the hook, so events are emitted from the hook's address.
     /// @param store The 721 tiers hook store.
-    /// @param directory The directory to look up controllers.
+    /// @param splits The splits contract to register tier split groups in.
     /// @param projectId The project ID.
     /// @param hookAddress The hook address.
     /// @param caller The msg.sender of the original call (for event emission).
@@ -39,7 +38,7 @@ library JB721TiersHookLib {
     /// @param tierIdsToRemove The tier IDs to remove.
     function adjustTiersFor(
         IJB721TiersHookStore store,
-        IJBDirectory directory,
+        IJBSplits splits,
         uint256 projectId,
         address hookAddress,
         address caller,
@@ -67,8 +66,37 @@ library JB721TiersHookLib {
             }
 
             // Set split groups for tiers that have splits configured.
-            _setSplitGroupsFor(directory, projectId, hookAddress, tiersToAdd, tierIdsAdded);
+            _setSplitGroupsFor(splits, projectId, hookAddress, tiersToAdd, tierIdsAdded);
+        }
+    }
+
+    /// @notice Records new tiers, emits events, and sets their split groups.
+    /// @dev Used during initialization when tier configs are in memory.
+    /// @param store The 721 tiers hook store.
+    /// @param splits The splits contract to register tier split groups in.
+    /// @param projectId The project ID.
+    /// @param hookAddress The hook address.
+    /// @param caller The msg.sender of the original call (for event emission).
+    /// @param tiersToAdd The tier configs to add.
+    function recordAddTiersFor(
+        IJB721TiersHookStore store,
+        IJBSplits splits,
+        uint256 projectId,
+        address hookAddress,
+        address caller,
+        JB721TierConfig[] memory tiersToAdd
+    )
+        external
+    {
+        uint256[] memory tierIdsAdded = store.recordAddTiers(tiersToAdd);
+
+        // slither-disable-next-line reentrancy-events
+        for (uint256 i; i < tiersToAdd.length; i++) {
+            emit AddTier({tierId: tierIdsAdded[i], tier: tiersToAdd[i], caller: caller});
         }
+
+        // Set split groups for tiers that have splits configured.
+        _setSplitGroupsFor(splits, projectId, hookAddress, tiersToAdd, tierIdsAdded);
     }
 
     /// @notice Normalizes a payment value based on the packed pricing context.
@@ -163,10 +191,10 @@ library JB721TiersHookLib {
 
     /// @notice Sets split groups in JBSplits for tiers that have splits configured.
     function _setSplitGroupsFor(
-        IJBDirectory directory,
+        IJBSplits splits,
         uint256 projectId,
         address hookAddress,
-        JB721TierConfig[] calldata tiersToAdd,
+        JB721TierConfig[] memory tiersToAdd,
         uint256[] memory tierIdsAdded
     )
         private
@@ -187,17 +215,19 @@ library JB721TiersHookLib {
                 groupIndex++;
             }
         }
-        IJBController(address(directory.controllerOf(projectId))).SPLITS().setSplitGroupsOf(projectId, 0, splitGroups);
+        splits.setSplitGroupsOf(projectId, 0, splitGroups);
     }
 
     /// @notice Distributes forwarded funds for all tiers in the hook metadata.
-    /// @param directory The directory to look up controllers and terminals.
+    /// @param directory The directory to look up terminals.
+    /// @param splits The splits contract to read tier split groups from.
     /// @param projectId The project ID of the hook.
     /// @param hookAddress The hook address (for computing split group IDs).
     /// @param token The token being distributed.
     /// @param encodedSplitData The encoded per-tier breakdown from hookMetadata.
     function distributeAll(
         IJBDirectory directory,
+        IJBSplits splits,
         uint256 projectId,
         address hookAddress,
         address token,
@@ -207,12 +237,10 @@ library JB721TiersHookLib {
     {
         (uint16[] memory tierIds, uint256[] memory amounts) = abi.decode(encodedSplitData, (uint16[], uint256[]));
 
-        IJBSplits splitsContract = IJBController(address(directory.controllerOf(projectId))).SPLITS();
-
         for (uint256 i; i < tierIds.length; i++) {
             if (amounts[i] == 0) continue;
             uint256 groupId = uint256(uint160(hookAddress)) | (uint256(tierIds[i]) << 160);
-            _distributeSingleSplit(directory, splitsContract, projectId, token, groupId, amounts[i]);
+            _distributeSingleSplit(directory, splits, projectId, token, groupId, amounts[i]);
         }
     }
 

package/test/E2E/Pay_Mint_Redeem_E2E.t.sol

@@ -59,7 +59,9 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
     function setUp() public override {
         super.setUp();
         store = new JB721TiersHookStore();
-        hook = new JB721TiersHook(jbDirectory, jbPermissions, jbRulesets, store, trustedForwarder);
+        hook = new JB721TiersHook(
+            jbDirectory, jbPermissions, jbRulesets, store, IJBSplits(address(jbSplits)), trustedForwarder
+        );
         addressRegistry = new JBAddressRegistry();
         JB721TiersHookDeployer hookDeployer = new JB721TiersHookDeployer(hook, store, addressRegistry, trustedForwarder);
         deployer = new JB721TiersHookProjectDeployer(