@rev-net/core-v6 0.0.7 → 0.0.9

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
         );

package/test/REVLoansAuditRegressions.t.sol

@@ -129,7 +129,7 @@ contract FakeTerminal is ERC165, IJBPayoutTerminal {
 }
 
 /// @notice Regression tests for REVLoans unvalidated source terminal.
-contract REVLoansRegressions_Local is TestBaseWorkflow, JBTest {
+contract REVLoansRegressions_Local is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 
@@ -157,7 +157,8 @@ contract REVLoansRegressions_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());
@@ -178,7 +179,7 @@ contract REVLoansRegressions_Local is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );
@@ -246,6 +247,9 @@ contract REVLoansRegressions_Local is TestBaseWorkflow, JBTest {
     ///         it is registered in the JBDirectory for the project.
     /// @dev The fake terminal's useAllowanceOf is called, showing no directory check occurs.
     ///      In production, a malicious terminal could return fake amounts or misroute funds.
+    /// @notice Verifies that borrowFrom now rejects unregistered terminals.
+    /// @dev Previously this test demonstrated the vulnerability. After the fix,
+    ///      borrowFrom reverts with REVLoans_InvalidTerminal before reaching the fake terminal.
     function test_unvalidatedSourceTerminal() public {
         // Step 1: User pays into the revnet to get tokens (collateral)
         vm.prank(USER);
@@ -265,9 +269,8 @@ contract REVLoansRegressions_Local is TestBaseWorkflow, JBTest {
         }
         assertFalse(found, "fake terminal should NOT be in the directory");
 
-        // Step 3: Try to borrow using the fake terminal as the source
-        // Vulnerability: REVLoans.borrowFrom does NOT check if the terminal
-        // is registered in the directory before calling useAllowanceOf on it.
+        // Step 3: Try to borrow using the fake terminal as the source.
+        // This now correctly reverts with REVLoans_InvalidTerminal.
         REVLoanSource memory fakeSource =
             REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: IJBPayoutTerminal(address(fakeTerminal))});
 
@@ -275,28 +278,14 @@ contract REVLoansRegressions_Local is TestBaseWorkflow, JBTest {
             LOANS_CONTRACT.borrowableAmountFrom(REVNET_ID, tokens, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
         assertGt(borrowable, 0, "should have borrowable amount");
 
-        // Use vm.expectCall to verify the fake terminal's useAllowanceOf
-        // is called. This works even if the outer call reverts, because expectCall
-        // records the call was made regardless.
-        // The code calls accountingContextForTokenOf first, then useAllowanceOf.
-        vm.expectCall(
-            address(fakeTerminal),
-            abi.encodeWithSelector(
-                IJBTerminal.accountingContextForTokenOf.selector, REVNET_ID, JBConstants.NATIVE_TOKEN
-            )
+        // The borrow should revert with REVLoans_InvalidTerminal because the fake terminal
+        // is not registered in the directory. The fake terminal is never called.
+        vm.expectRevert(
+            abi.encodeWithSelector(REVLoans.REVLoans_InvalidTerminal.selector, address(fakeTerminal), REVNET_ID)
         );
-        vm.expectCall(address(fakeTerminal), abi.encodeWithSelector(IJBPayoutTerminal.useAllowanceOf.selector));
 
-        // The borrow will reach the fake terminal (showing no validation),
-        // but will revert downstream when trying to transfer 0 - fees (underflow).
         vm.prank(USER);
-        vm.expectRevert();
         LOANS_CONTRACT.borrowFrom(REVNET_ID, fakeSource, borrowable, tokens, payable(USER), 500);
-
-        // If we reach here, both vm.expectCall checks passed:
-        // 1. accountingContextForTokenOf was called on the fake terminal
-        // 2. useAllowanceOf was called on the fake terminal
-        // This shows no directory validation before calling the source terminal
     }
 
     /// @notice Verify that the configured loan source (real terminal) is properly registered.

package/test/REVLoansFeeRecovery.t.sol

@@ -136,7 +136,7 @@ struct FeeRecoveryProjectConfig {
 /// @notice Tests for the fee payment error recovery in REVLoans._addTo().
 /// @dev When feeTerminal.pay() reverts, the borrower should receive the fee amount back
 ///      instead of losing it. For ERC-20 tokens, the dangling allowance must also be cleaned up.
-contract REVLoansFeeRecovery is TestBaseWorkflow, JBTest {
+contract REVLoansFeeRecovery is TestBaseWorkflow {
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
 
@@ -281,7 +281,8 @@ contract REVLoansFeeRecovery 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());
@@ -309,7 +310,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );

package/test/REVLoansSourced.t.sol

@@ -38,7 +38,7 @@ struct FeeProjectConfig {
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
 }
 
-contract REVLoansSourcedTests is TestBaseWorkflow, JBTest {
+contract REVLoansSourcedTests is TestBaseWorkflow {
     /// @notice the salts that are used to deploy the contracts.
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
@@ -262,7 +262,8 @@ contract REVLoansSourcedTests 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();
 
@@ -298,7 +299,7 @@ contract REVLoansSourcedTests is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );

package/test/REVLoansUnSourced.t.sol

@@ -35,7 +35,7 @@ struct FeeProjectConfig {
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
 }
 
-contract REVLoansUnsourcedTests is TestBaseWorkflow, JBTest {
+contract REVLoansUnsourcedTests is TestBaseWorkflow {
     /// @notice the salts that are used to deploy the contracts.
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
     bytes32 ERC20_SALT = "REV_TOKEN";
@@ -249,7 +249,8 @@ contract REVLoansUnsourcedTests 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();
 
@@ -273,7 +274,7 @@ contract REVLoansUnsourcedTests is TestBaseWorkflow, JBTest {
             FEE_PROJECT_ID,
             HOOK_DEPLOYER,
             PUBLISHER,
-            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
             TRUSTED_FORWARDER
         );