@rev-net/core-v6 0.0.8 → 0.0.9

package/src/REVDeployer.sol

@@ -9,10 +9,9 @@ import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Recei
 import {mulDiv} from "@prb/math/src/Common.sol";
 import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookDeployer.sol";
-import {IJBBuybackHook} from "@bananapus/buyback-hook-v6/src/interfaces/IJBBuybackHook.sol";
-import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";
-import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol";
-import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
+import {JB721TiersHookFlags} from "@bananapus/721-hook-v6/src/structs/JB721TiersHookFlags.sol";
+import {JBDeploy721TiersHookConfig} from "@bananapus/721-hook-v6/src/structs/JBDeploy721TiersHookConfig.sol";
+import {IJBBuybackHookRegistry} from "@bananapus/buyback-hook-v6/src/interfaces/IJBBuybackHookRegistry.sol";
 import {IJBCashOutHook} from "@bananapus/core-v6/src/interfaces/IJBCashOutHook.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
@@ -40,6 +39,7 @@ import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
 import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+import {JBTokenAmount} from "@bananapus/core-v6/src/structs/JBTokenAmount.sol";
 import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
 import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
@@ -111,7 +111,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     //*********************************************************************//
 
     /// @notice The buyback hook used as a data hook to route payments through buyback pools.
-    IJBRulesetDataHook public immutable override BUYBACK_HOOK;
+    IJBBuybackHookRegistry public immutable override BUYBACK_HOOK;
 
     /// @notice The controller used to create and manage Juicebox projects for revnets.
     IJBController public immutable override CONTROLLER;
@@ -200,7 +200,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         uint256 feeRevnetId,
         IJB721TiersHookDeployer hookDeployer,
         CTPublisher publisher,
-        IJBRulesetDataHook buybackHook,
+        IJBBuybackHookRegistry buybackHook,
         address loans,
         address trustedForwarder
     )
@@ -225,6 +225,9 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
 
         // Give the loan contract permission to use the surplus allowance of all revnets.
         _setPermission({operator: LOANS, revnetId: 0, permissionId: JBPermissionIds.USE_ALLOWANCE});
+
+        // Give the buyback hook (registry) permission to configure pools on all revnets.
+        _setPermission({operator: address(BUYBACK_HOOK), revnetId: 0, permissionId: JBPermissionIds.SET_BUYBACK_POOL});
     }
 
     //*********************************************************************//
@@ -316,34 +319,48 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         override
         returns (uint256 weight, JBPayHookSpecification[] memory hookSpecifications)
     {
-        // Keep a reference to the specifications provided by the buyback hook.
-        JBPayHookSpecification[] memory buybackHookSpecifications;
-
-        // Read the weight and specifications from the buyback hook.
-        (weight, buybackHookSpecifications) = BUYBACK_HOOK.beforePayRecordedWith(context);
-
-        // Keep a reference to the revnet's tiered ERC-721 hook.
+        // Get the 721 hook's spec and total split amount.
         IJB721TiersHook tiered721Hook = tiered721HookOf[context.projectId];
-
-        // Is there a tiered ERC-721 hook?
+        JBPayHookSpecification memory tiered721HookSpec;
+        uint256 totalSplitAmount;
         bool usesTiered721Hook = address(tiered721Hook) != address(0);
+        if (usesTiered721Hook) {
+            JBPayHookSpecification[] memory specs;
+            (, specs) = IJBRulesetDataHook(address(tiered721Hook)).beforePayRecordedWith(context);
+            // The 721 hook returns a single spec (itself) whose amount is the total split amount.
+            if (specs.length > 0) {
+                tiered721HookSpec = specs[0];
+                totalSplitAmount = tiered721HookSpec.amount;
+            }
+        }
 
-        // Did the buyback hook return any specifications? (It won't when direct minting is cheaper than swapping.)
-        bool usesBuybackHook = buybackHookSpecifications.length > 0;
-
-        // Initialize the returned specification array with only the hooks that are present.
-        hookSpecifications = new JBPayHookSpecification[]((usesTiered721Hook ? 1 : 0) + (usesBuybackHook ? 1 : 0));
+        // The amount entering the project after tier splits.
+        uint256 projectAmount = totalSplitAmount >= context.amount.value ? 0 : context.amount.value - totalSplitAmount;
 
-        // If we have a tiered ERC-721 hook, add it to the array.
-        if (usesTiered721Hook) {
-            hookSpecifications[0] =
-                JBPayHookSpecification({hook: IJBPayHook(address(tiered721Hook)), amount: 0, metadata: bytes("")});
+        // Get the buyback hook's weight and specs. Reduce the amount so it only considers funds entering the project.
+        JBPayHookSpecification[] memory buybackHookSpecs;
+        {
+            JBBeforePayRecordedContext memory buybackHookContext = context;
+            buybackHookContext.amount.value = projectAmount;
+            (weight, buybackHookSpecs) = BUYBACK_HOOK.beforePayRecordedWith(buybackHookContext);
         }
 
-        // Add the buyback hook specification if present.
-        if (usesBuybackHook) {
-            hookSpecifications[usesTiered721Hook ? 1 : 0] = buybackHookSpecifications[0];
+        // Scale the buyback hook's weight for splits so the terminal mints tokens only for the project's share.
+        // The terminal uses the full context.amount.value for minting (tokenCount = amount * weight / weightRatio),
+        // but only projectAmount actually enters the project. Without scaling, payers get token credit for the split
+        // portion too. Preserves weight=0 from the buyback hook (buying back, not minting).
+        if (projectAmount == 0) {
+            weight = 0;
+        } else if (projectAmount < context.amount.value) {
+            weight = mulDiv(weight, projectAmount, context.amount.value);
         }
+
+        // Merge hook specifications: 721 hook spec first, then buyback hook spec.
+        bool usesBuybackHook = buybackHookSpecs.length > 0;
+        hookSpecifications = new JBPayHookSpecification[]((usesTiered721Hook ? 1 : 0) + (usesBuybackHook ? 1 : 0));
+
+        if (usesTiered721Hook) hookSpecifications[0] = tiered721HookSpec;
+        if (usesBuybackHook) hookSpecifications[usesTiered721Hook ? 1 : 0] = buybackHookSpecs[0];
     }
 
     /// @notice A flag indicating whether an address has permission to mint a revnet's tokens on-demand.
@@ -477,31 +494,16 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     /// @param revnetId The ID of the revnet.
     /// @param terminalToken The terminal token to configure a buyback pool for.
     function _trySetBuybackPoolFor(uint256 revnetId, address terminalToken) internal {
-        // Normalize the terminal token (use WETH for native) and get the project token.
-        address normalizedTerminalToken = terminalToken == JBConstants.NATIVE_TOKEN
-            ? address(IJBBuybackHook(address(BUYBACK_HOOK)).WETH())
-            : terminalToken;
-        address projectToken = address(CONTROLLER.TOKENS().tokenOf(revnetId));
-
-        // Sort currencies numerically for the pool key (lower address = currency0).
-        (Currency currency0, Currency currency1) = normalizedTerminalToken < projectToken
-            ? (Currency.wrap(normalizedTerminalToken), Currency.wrap(projectToken))
-            : (Currency.wrap(projectToken), Currency.wrap(normalizedTerminalToken));
-
         // Try to set the pool — if the pool isn't initialized in the PoolManager yet, this will revert and be caught.
-        try IJBBuybackHook(address(BUYBACK_HOOK))
-            .setPoolFor({
-                projectId: revnetId,
-                poolKey: PoolKey({
-                    currency0: currency0,
-                    currency1: currency1,
-                    fee: DEFAULT_BUYBACK_POOL_FEE,
-                    tickSpacing: DEFAULT_BUYBACK_TICK_SPACING,
-                    hooks: IHooks(address(0))
-                }),
-                twapWindow: DEFAULT_BUYBACK_TWAP_WINDOW,
-                terminalToken: terminalToken
-            }) {}
+        // The buyback hook constructs the PoolKey internally from the project token, terminal token, and pool params.
+        // slither-disable-next-line calls-loop
+        try BUYBACK_HOOK.setPoolFor({
+            projectId: revnetId,
+            fee: DEFAULT_BUYBACK_POOL_FEE,
+            tickSpacing: DEFAULT_BUYBACK_TICK_SPACING,
+            twapWindow: DEFAULT_BUYBACK_TWAP_WINDOW,
+            terminalToken: terminalToken
+        }) {}
             catch {} // Pool may not be initialized yet — that's OK.
     }
 
@@ -886,11 +888,32 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             revnetId: revnetId, configuration: configuration, terminalConfigurations: terminalConfigurations
         });
 
+        // Convert the REVBaseline721HookConfig to JBDeploy721TiersHookConfig, forcing issueTokensForSplits to false.
+        // Revnets do their own weight adjustment for splits, so the 721 hook must not also adjust.
+        JBDeploy721TiersHookConfig memory hookConfig = JBDeploy721TiersHookConfig({
+            name: tiered721HookConfiguration.baseline721HookConfiguration.name,
+            symbol: tiered721HookConfiguration.baseline721HookConfiguration.symbol,
+            baseUri: tiered721HookConfiguration.baseline721HookConfiguration.baseUri,
+            tokenUriResolver: tiered721HookConfiguration.baseline721HookConfiguration.tokenUriResolver,
+            contractUri: tiered721HookConfiguration.baseline721HookConfiguration.contractUri,
+            tiersConfig: tiered721HookConfiguration.baseline721HookConfiguration.tiersConfig,
+            reserveBeneficiary: tiered721HookConfiguration.baseline721HookConfiguration.reserveBeneficiary,
+            flags: JB721TiersHookFlags({
+                noNewTiersWithReserves: tiered721HookConfiguration.baseline721HookConfiguration.flags
+                .noNewTiersWithReserves,
+                noNewTiersWithVotes: tiered721HookConfiguration.baseline721HookConfiguration.flags.noNewTiersWithVotes,
+                noNewTiersWithOwnerMinting: tiered721HookConfiguration.baseline721HookConfiguration.flags
+                .noNewTiersWithOwnerMinting,
+                preventOverspending: tiered721HookConfiguration.baseline721HookConfiguration.flags.preventOverspending,
+                issueTokensForSplits: false
+            })
+        });
+
         // Deploy the tiered ERC-721 hook contract.
         // slither-disable-next-line reentrancy-benign
         hook = HOOK_DEPLOYER.deployHookFor({
             projectId: revnetId,
-            deployTiersHookConfig: tiered721HookConfiguration.baseline721HookConfiguration,
+            deployTiersHookConfig: hookConfig,
             salt: keccak256(abi.encode(tiered721HookConfiguration.salt, encodedConfigurationHash, _msgSender()))
         });
 

package/src/REVLoans.sol

@@ -57,6 +57,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
 
     error REVLoans_CollateralExceedsLoan(uint256 collateralToReturn, uint256 loanCollateral);
     error REVLoans_InvalidPrepaidFeePercent(uint256 prepaidFeePercent, uint256 min, uint256 max);
+    error REVLoans_InvalidTerminal(address terminal, uint256 revnetId);
     error REVLoans_LoanExpired(uint256 timeSinceLoanCreated, uint256 loanLiquidationDuration);
     error REVLoans_NewBorrowAmountGreaterThanLoanAmount(uint256 newBorrowAmount, uint256 loanAmount);
     error REVLoans_NoMsgValueAllowed();
@@ -556,6 +557,11 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         // A loan needs to have collateral.
         if (collateralCount == 0) revert REVLoans_ZeroCollateralLoanIsInvalid();
 
+        // Make sure the source terminal is registered in the directory for this revnet.
+        if (!DIRECTORY.isTerminalOf(revnetId, IJBTerminal(address(source.terminal)))) {
+            revert REVLoans_InvalidTerminal(address(source.terminal), revnetId);
+        }
+
         // Make sure the prepaid fee percent is between `MIN_PREPAID_FEE_PERCENT` and `MAX_PREPAID_FEE_PERCENT`. Meaning
         // an 16 year loan can be paid upfront with a
         // payment of 50% of the borrowed assets, the cheapest possible rate.
@@ -1218,6 +1224,9 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         // If the loan will carry no more amount or collateral, store its changes directly.
         // slither-disable-next-line incorrect-equality
         if (collateralCountToReturn == loan.collateral) {
+            // Snapshot the loan to memory BEFORE _adjust zeroes the storage pointer.
+            REVLoan memory loanSnapshot = loan;
+
             // Borrow in.
             _adjust({
                 loan: loan,
@@ -1228,15 +1237,15 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
                 beneficiary: beneficiary
             });
 
-            // Snapshot the loan to memory before deleting storage.
-            REVLoan memory loanSnapshot = loan;
+            // Snapshot the zeroed loan for the return value (reflects post-repay state).
+            REVLoan memory paidOffSnapshot = loan;
 
             emit RepayLoan({
                 loanId: loanId,
                 revnetId: revnetId,
                 paidOffLoanId: loanId,
                 loan: loanSnapshot,
-                paidOffLoan: loanSnapshot,
+                paidOffLoan: paidOffSnapshot,
                 repayBorrowAmount: repayBorrowAmount,
                 sourceFeeAmount: sourceFeeAmount,
                 collateralCountToReturn: collateralCountToReturn,
@@ -1247,7 +1256,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             // Clear stale loan data for gas refund.
             delete _loanOf[loanId];
 
-            return (loanId, loanSnapshot);
+            return (loanId, paidOffSnapshot);
         } else {
             // Make a new loan with the remaining amount and collateral.
             // Get a reference to the replacement loan ID.

package/src/interfaces/IREVDeployer.sol

@@ -7,6 +7,7 @@ import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
 import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
+import {IJBBuybackHookRegistry} from "@bananapus/buyback-hook-v6/src/interfaces/IJBBuybackHookRegistry.sol";
 import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
 import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
 import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
@@ -96,7 +97,7 @@ interface IREVDeployer {
 
     /// @notice The buyback hook used as a data hook to route payments through buyback pools.
     /// @return The buyback hook contract.
-    function BUYBACK_HOOK() external view returns (IJBRulesetDataHook);
+    function BUYBACK_HOOK() external view returns (IJBBuybackHookRegistry);
 
     /// @notice The number of seconds until a revnet's participants can cash out after deploying to a new network.
     /// @return The cash out delay in seconds.

package/src/structs/REV721TiersHookFlags.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @custom:member noNewTiersWithReserves A flag indicating if new tiers with non-zero reserve frequency are forbidden.
+/// @custom:member noNewTiersWithVotes A flag indicating if new tiers with voting units are forbidden.
+/// @custom:member noNewTiersWithOwnerMinting A flag indicating if new tiers with owner minting are forbidden.
+/// @custom:member preventOverspending A flag indicating if payments exceeding the price of minted NFTs should be
+/// prevented.
+struct REV721TiersHookFlags {
+    bool noNewTiersWithReserves;
+    bool noNewTiersWithVotes;
+    bool noNewTiersWithOwnerMinting;
+    bool preventOverspending;
+}

package/src/structs/REVBaseline721HookConfig.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {JB721InitTiersConfig} from "@bananapus/721-hook-v6/src/structs/JB721InitTiersConfig.sol";
+
+import {REV721TiersHookFlags} from "./REV721TiersHookFlags.sol";
+
+/// @custom:member name The name of the NFT collection.
+/// @custom:member symbol The symbol of the NFT collection.
+/// @custom:member baseUri The base URI for the NFT collection.
+/// @custom:member tokenUriResolver The token URI resolver for the NFT collection.
+/// @custom:member contractUri The contract URI for the NFT collection.
+/// @custom:member tiersConfig The tier configuration for the NFT collection.
+/// @custom:member reserveBeneficiary The default reserve beneficiary for the NFT collection.
+/// @custom:member flags A set of flags that configure the 721 hook. Omits `issueTokensForSplits` since revnets
+/// always force it to `false`.
+struct REVBaseline721HookConfig {
+    string name;
+    string symbol;
+    string baseUri;
+    IJB721TokenUriResolver tokenUriResolver;
+    string contractUri;
+    JB721InitTiersConfig tiersConfig;
+    address reserveBeneficiary;
+    REV721TiersHookFlags flags;
+}

package/src/structs/REVDeploy721TiersHookConfig.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {JBDeploy721TiersHookConfig} from "@bananapus/721-hook-v6/src/structs/JBDeploy721TiersHookConfig.sol";
+import {REVBaseline721HookConfig} from "./REVBaseline721HookConfig.sol";
 
 /// @custom:member baseline721HookConfiguration The baseline config.
 /// @custom:member salt The salt to base the collection's address on.
@@ -16,7 +16,7 @@ import {JBDeploy721TiersHookConfig} from "@bananapus/721-hook-v6/src/structs/JBD
 /// the
 /// discount of a tier.
 struct REVDeploy721TiersHookConfig {
-    JBDeploy721TiersHookConfig baseline721HookConfiguration;
+    REVBaseline721HookConfig baseline721HookConfiguration;
     bytes32 salt;
     bool splitOperatorCanAdjustTiers;
     bool splitOperatorCanUpdateMetadata;

package/test/REV.integrations.t.sol

@@ -38,7 +38,7 @@ struct FeeProjectConfig {
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
 }
 
-contract REVnet_Integrations is TestBaseWorkflow, JBTest {
+contract REVnet_Integrations is TestBaseWorkflow {
     /// @notice the salts that are used to deploy the contracts.
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
@@ -177,7 +177,8 @@ contract REVnet_Integrations is TestBaseWorkflow, JBTest {
 
         HOOK_STORE = new JB721TiersHookStore();
 
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
 
         ADDRESS_REGISTRY = new JBAddressRegistry();
 
@@ -192,7 +193,7 @@ contract REVnet_Integrations is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             makeAddr("loans"),
             TRUSTED_FORWARDER
         );

package/test/REVAutoIssuanceFuzz.t.sol

@@ -30,7 +30,7 @@ import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/
 /// @notice Fuzz tests for REVDeployer multi-stage auto-issuance.
 /// Tests stage ID computation consistency and multi-stage claiming behavior.
 /// Stage IDs use block.timestamp + i which may mismatch actual ruleset IDs.
-contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow, JBTest {
+contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
 
     REVDeployer REV_DEPLOYER;
@@ -55,7 +55,8 @@ contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow, JBTest {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -67,7 +68,7 @@ contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             makeAddr("loans"),
             TRUSTED_FORWARDER
         );
@@ -165,9 +166,12 @@ contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow, JBTest {
 
     /// @notice Deploy 3-stage revnet, advance time, claim auto-issuance from each stage.
     function test_multiStage_allStagesClaimable() external {
+        // Save the deploy timestamp for absolute warp targets.
+        uint256 deployTs = block.timestamp;
+
         (uint256 revnetId, uint256[] memory stageIds) = _deployMultiStageRevnet(3);
 
-        // Stage 0 starts at block.timestamp — immediately claimable.
+        // Stage 0 starts at deploy time — immediately claimable.
         REV_DEPLOYER.autoIssueFor(revnetId, stageIds[0], multisig());
 
         uint256 stage0Amount = (10_000) * decimalMultiplier;
@@ -175,8 +179,8 @@ contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow, JBTest {
             IJBToken(jbTokens().tokenOf(revnetId)).balanceOf(multisig()), stage0Amount, "Stage 0 auto-issuance claimed"
         );
 
-        // Stage 1 starts at block.timestamp + 180 days.
-        vm.warp(block.timestamp + 180 days);
+        // Stage 1 starts at deployTs + 180 days.
+        vm.warp(deployTs + 180 days);
         REV_DEPLOYER.autoIssueFor(revnetId, stageIds[1], multisig());
 
         uint256 stage1Amount = (11_000) * decimalMultiplier;
@@ -186,8 +190,8 @@ contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow, JBTest {
             "Stage 1 auto-issuance claimed"
         );
 
-        // Stage 2 starts at block.timestamp + 360 days.
-        vm.warp(block.timestamp + 180 days);
+        // Stage 2 starts at deployTs + 360 days.
+        vm.warp(deployTs + 360 days);
         REV_DEPLOYER.autoIssueFor(revnetId, stageIds[2], multisig());
 
         uint256 stage2Amount = (12_000) * decimalMultiplier;

package/test/REVDeployerAuditRegressions.t.sol

@@ -29,7 +29,7 @@ import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressReg
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 
 /// @notice Regression tests for REVDeployer.
-contract REVDeployerRegressions_Local is TestBaseWorkflow, JBTest {
+contract REVDeployerRegressions_Local is TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
@@ -56,7 +56,8 @@ contract REVDeployerRegressions_Local is TestBaseWorkflow, JBTest {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -77,7 +78,7 @@ contract REVDeployerRegressions_Local is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );

package/test/REVInvincibility.t.sol

@@ -53,7 +53,7 @@ struct InvincibilityProjectConfig {
 // =========================================================================
 // Section A + B: Property Verification & Economic Tests
 // =========================================================================
-contract REVInvincibility_PropertyTests is TestBaseWorkflow, JBTest {
+contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
@@ -202,7 +202,8 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow, JBTest {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -224,7 +225,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );
@@ -922,7 +923,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow, JBTest {
 // =========================================================================
 // Section C: Invariant Properties (6 invariants)
 // =========================================================================
-contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow, JBTest {
+contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
     bytes32 REV_DEPLOYER_SALT = "REVDeployer_INV";
@@ -956,7 +957,8 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow, JBTest {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -977,7 +979,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );

package/test/REVInvincibilityHandler.sol

@@ -11,6 +11,7 @@ import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IREVLoans} from "../src/interfaces/IREVLoans.sol";
 import {REVLoan} from "../src/structs/REVLoan.sol";
 import {REVLoanSource} from "../src/structs/REVLoanSource.sol";
+import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
 
 /// @title REVInvincibilityHandler
 /// @notice Stateful fuzzing handler for the revnet + loans interaction surface.

package/test/REVLifecycle.t.sol

@@ -30,7 +30,7 @@ import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressReg
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 
 /// @notice Full revnet lifecycle E2E: deploy 3-stage -> pay -> advance stages -> cash out.
-contract REVLifecycle_Local is TestBaseWorkflow, JBTest {
+contract REVLifecycle_Local is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 
@@ -61,7 +61,8 @@ contract REVLifecycle_Local is TestBaseWorkflow, JBTest {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -82,7 +83,7 @@ contract REVLifecycle_Local is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );

package/test/REVLoans.invariants.t.sol

@@ -31,6 +31,7 @@ import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
+import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
 
 struct FeeProjectConfig {
     REVConfig configuration;
@@ -252,7 +253,7 @@ contract REVLoansCallHandler is JBTest {
     }
 }
 
-contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow, JBTest {
+contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
     // A library that parses the packed ruleset metadata into a friendlier format.
     using JBRulesetMetadataResolver for JBRuleset;
 
@@ -475,7 +476,8 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow, JBTest {
 
         HOOK_STORE = new JB721TiersHookStore();
 
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
 
         ADDRESS_REGISTRY = new JBAddressRegistry();
 
@@ -499,7 +501,7 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );

package/test/REVLoansAttacks.t.sol

@@ -176,7 +176,7 @@ struct AttackProjectConfig {
 /// @title REVLoansAttacks
 /// @notice Attack tests for REVLoans covering uint112 truncation, reentrancy,
 ///         collateral race conditions, liquidation edge cases, and fuzz testing.
-contract REVLoansAttacks is TestBaseWorkflow, JBTest {
+contract REVLoansAttacks is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 
@@ -318,7 +318,8 @@ contract REVLoansAttacks is TestBaseWorkflow, JBTest {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK = new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, multisig());
+        EXAMPLE_HOOK =
+            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -345,7 +346,7 @@ contract REVLoansAttacks is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );