@rev-net/core-v6 0.0.14 → 0.0.16

package/test/REVLoansSourced.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -756,14 +756,6 @@ contract REVLoansSourcedTests is TestBaseWorkflow {
 
         uint256 balanceBefore = _balanceOf(token, USER);
 
-        // Ensure that the hook was called.
-        vm.expectCall(address(REV_DEPLOYER), abi.encode(REVDeployer.beforeCashOutRecordedWith.selector));
-
-        // It only adds itself as a `after` cashoutHook if there is a cashout tax rate.
-        if (cashOutTaxRate > 0) {
-            vm.expectCall(address(REV_DEPLOYER), abi.encode(REVDeployer.afterCashOutRecordedWith.selector));
-        }
-
         // Perform a cashout.
         vm.prank(USER);
         jbMultiTerminal().cashOutTokensOf(USER, revnetProjectId, tokensToCashout, token, 0, payable(USER), bytes(""));

package/test/REVLoansUnSourced.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestBurnHeldTokens.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestCEIPattern.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestCashOutCallerValidation.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -22,8 +22,12 @@ import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
 import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
+import {JBCashOuts} from "@bananapus/core-v6/src/libraries/JBCashOuts.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBBeforeCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforeCashOutRecordedContext.sol";
+import {JBCashOutHookSpecification} from "@bananapus/core-v6/src/structs/JBCashOutHookSpecification.sol";
+import {JBTokenAmount} from "@bananapus/core-v6/src/structs/JBTokenAmount.sol";
 import {MockERC20} from "@bananapus/core-v6/test/mock/MockERC20.sol";
 import {REVLoans} from "../src/REVLoans.sol";
 import {REVStageConfig, REVAutoIssuance} from "../src/structs/REVStageConfig.sol";
@@ -302,6 +306,76 @@ contract TestCashOutCallerValidation is TestBaseWorkflow {
         assertGt(feeBalanceAfter, feeBalanceBefore, "Fee project balance should increase from cash out fee");
     }
 
+    /// @notice Revnet cash-out fees and buyback sell-side specs are composed together.
+    function test_beforeCashOutRecordedWith_proxiesIntoBuybackAndAppendsFeeSpec() public {
+        bytes memory buybackMetadata = abi.encode(uint256(123));
+        MOCK_BUYBACK.configureCashOutResult({
+            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
+            cashOutCount: 0,
+            totalSupply: 0,
+            hookAmount: 0,
+            hookMetadata: buybackMetadata
+        });
+
+        JBBeforeCashOutRecordedContext memory context = JBBeforeCashOutRecordedContext({
+            terminal: address(jbMultiTerminal()),
+            holder: USER,
+            projectId: REVNET_ID,
+            rulesetId: 0,
+            cashOutCount: 1000,
+            totalSupply: 10_000,
+            surplus: JBTokenAmount({
+                token: JBConstants.NATIVE_TOKEN,
+                value: 100 ether,
+                decimals: 18,
+                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+            }),
+            useTotalSurplus: true,
+            cashOutTaxRate: 3000,
+            beneficiaryIsFeeless: false,
+            metadata: ""
+        });
+
+        (
+            uint256 cashOutTaxRate,
+            uint256 cashOutCount,
+            uint256 totalSupply,
+            JBCashOutHookSpecification[] memory hookSpecifications
+        ) = REV_DEPLOYER.beforeCashOutRecordedWith(context);
+
+        uint256 feeCashOutCount = context.cashOutCount * REV_DEPLOYER.FEE() / JBConstants.MAX_FEE;
+        uint256 nonFeeCashOutCount = context.cashOutCount - feeCashOutCount;
+        uint256 postFeeReclaimedAmount = JBCashOuts.cashOutFrom({
+            surplus: context.surplus.value,
+            cashOutCount: nonFeeCashOutCount,
+            totalSupply: context.totalSupply,
+            cashOutTaxRate: context.cashOutTaxRate
+        });
+        uint256 feeAmount = JBCashOuts.cashOutFrom({
+            surplus: context.surplus.value - postFeeReclaimedAmount,
+            cashOutCount: feeCashOutCount,
+            totalSupply: context.totalSupply - nonFeeCashOutCount,
+            cashOutTaxRate: context.cashOutTaxRate
+        });
+
+        assertEq(cashOutTaxRate, JBConstants.MAX_CASH_OUT_TAX_RATE, "Buyback cash out tax rate should be forwarded");
+        assertEq(cashOutCount, nonFeeCashOutCount, "Buyback should receive the non-fee cash out count");
+        assertEq(totalSupply, context.totalSupply, "Total supply should pass through");
+        assertEq(hookSpecifications.length, 2, "Buyback spec and revnet fee spec should both be returned");
+
+        assertEq(address(hookSpecifications[0].hook), address(MOCK_BUYBACK), "First hook spec should come from buyback");
+        assertEq(hookSpecifications[0].amount, 0, "Buyback sell-side spec should preserve its forwarded amount");
+        assertEq(hookSpecifications[0].metadata, buybackMetadata, "Buyback metadata should be preserved");
+
+        assertEq(address(hookSpecifications[1].hook), address(REV_DEPLOYER), "Second hook spec should charge fee");
+        assertEq(hookSpecifications[1].amount, feeAmount, "Fee spec amount should match the revnet fee math");
+        assertEq(
+            hookSpecifications[1].metadata,
+            abi.encode(jbMultiTerminal()),
+            "Fee spec metadata should encode the fee terminal"
+        );
+    }
+
     /// @notice Test that afterCashOutRecordedWith has no access control — anyone can call it.
     /// A non-terminal caller would just be donating their own funds as fees.
     function test_nonTerminalCaller_justDonatesOwnFunds() public {

package/test/TestConversionDocumentation.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestCrossCurrencyReclaim.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestCrossSourceReallocation.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestERC2771MetaTx.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestEmptyBuybackSpecs.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestFlashLoanSurplus.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestHookArrayOOB.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestLiquidationBehavior.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestLoanSourceRotation.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestLongTailEconomics.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestLowFindings.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -627,7 +627,9 @@ contract TestLowFindings is TestBaseWorkflow {
         assertEq(borrowable, 0, "Borrowable amount for 1 wei of collateral should be 0");
 
         // Mock the BURN permission (permission ID 11) for the loans contract.
-        mockExpect(
+        // Use vm.mockCall only (not mockExpect which also adds vm.expectCall) because
+        // borrowFrom reverts with REVLoans_ZeroBorrowAmount before the permission check is reached.
+        vm.mockCall(
             address(jbPermissions()),
             abi.encodeCall(IJBPermissions.hasPermission, (address(LOANS_CONTRACT), USER, revnetId, 11, true, true)),
             abi.encode(true)

package/test/TestMixedFixes.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -240,14 +240,16 @@ contract TestMixedFixes is TestBaseWorkflow {
 
         REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);
 
-        // Warp to exactly LOAN_LIQUIDATION_DURATION after creation
-        vm.warp(loan.createdAt + LOANS_CONTRACT.LOAN_LIQUIDATION_DURATION());
+        // Warp to one second past LOAN_LIQUIDATION_DURATION after creation.
+        // The contract uses `>` (not `>=`) so the exact boundary is still repayable;
+        // we need to exceed the boundary by 1 second to trigger the revert.
+        vm.warp(loan.createdAt + LOANS_CONTRACT.LOAN_LIQUIDATION_DURATION() + 1);
 
-        // With the >= fix, this should revert because timeSinceLoanCreated == LOAN_LIQUIDATION_DURATION
+        // timeSinceLoanCreated > LOAN_LIQUIDATION_DURATION → revert
         vm.expectRevert(
             abi.encodeWithSelector(
                 REVLoans.REVLoans_LoanExpired.selector,
-                LOANS_CONTRACT.LOAN_LIQUIDATION_DURATION(),
+                LOANS_CONTRACT.LOAN_LIQUIDATION_DURATION() + 1,
                 LOANS_CONTRACT.LOAN_LIQUIDATION_DURATION()
             )
         );

package/test/TestPermit2Signatures.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestReallocationSandwich.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestRevnetRegressions.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestSplitWeightAdjustment.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -225,7 +225,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         // Mock 721 hook returning 0.3 ETH split on 1 ETH payment.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
-        hookSpecs[0] = JBPayHookSpecification({hook: IJBPayHook(mock721), amount: 0.3 ether, metadata: bytes("")});
+        hookSpecs[0] =
+            JBPayHookSpecification({hook: IJBPayHook(mock721), noop: false, amount: 0.3 ether, metadata: bytes("")});
         vm.mockCall(
             mock721,
             abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
@@ -267,7 +268,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         // Mock 721 hook returning full 1 ETH split.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
-        hookSpecs[0] = JBPayHookSpecification({hook: IJBPayHook(mock721), amount: 1 ether, metadata: bytes("")});
+        hookSpecs[0] =
+            JBPayHookSpecification({hook: IJBPayHook(mock721), noop: false, amount: 1 ether, metadata: bytes("")});
         vm.mockCall(
             mock721,
             abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
@@ -351,7 +353,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         // Mock 721 hook returning 0.4 ETH split on 1 ETH payment.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
-        hookSpecs[0] = JBPayHookSpecification({hook: IJBPayHook(mock721), amount: 0.4 ether, metadata: bytes("")});
+        hookSpecs[0] =
+            JBPayHookSpecification({hook: IJBPayHook(mock721), noop: false, amount: 0.4 ether, metadata: bytes("")});
         vm.mockCall(
             mock721,
             abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
@@ -400,7 +403,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         // Mock 721 hook returning 0.2 ETH split.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
-        hookSpecs[0] = JBPayHookSpecification({hook: IJBPayHook(mock721), amount: 0.2 ether, metadata: bytes("")});
+        hookSpecs[0] =
+            JBPayHookSpecification({hook: IJBPayHook(mock721), noop: false, amount: 0.2 ether, metadata: bytes("")});
         vm.mockCall(
             mock721,
             abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
@@ -449,7 +453,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
         // Mock 721 hook returning split amount with metadata.
         bytes memory splitMeta = abi.encode(uint256(42));
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
-        hookSpecs[0] = JBPayHookSpecification({hook: IJBPayHook(mock721), amount: 0.5 ether, metadata: splitMeta});
+        hookSpecs[0] =
+            JBPayHookSpecification({hook: IJBPayHook(mock721), noop: false, amount: 0.5 ether, metadata: splitMeta});
         vm.mockCall(
             mock721,
             abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),

package/test/TestSplitWeightE2E.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestSplitWeightFork.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -495,13 +495,12 @@ contract TestSplitWeightFork is TestBaseWorkflow {
             hooks: IHooks(address(0))
         });
 
-        // Pool is already initialized at 1:1 price by REVDeployer during deployment.
-        // Just add liquidity and mock the oracle.
-
-        // Fund LiquidityHelper with project tokens via JBTokens.mintFor (not deal).
-        // deal() skips ERC20Votes checkpoints, causing underflow when tokens are burned.
+        // Pool is already initialized at fair issuance price by REVDeployer during deployment.
+        // At high tick (~69078 for 1000 tokens/ETH), full-range liquidity needs ~32x more project tokens than ETH.
+        // Mint 50x project tokens and use a smaller liquidity delta to stay within budget.
+        // Use mintFor (not deal) so ERC20Votes checkpoints are updated.
         vm.prank(address(jbController()));
-        jbTokens().mintFor(address(liqHelper), revnetId, liquidityTokenAmount);
+        jbTokens().mintFor(address(liqHelper), revnetId, liquidityTokenAmount * 50);
         // Fund with ETH for the native currency side.
         vm.deal(address(liqHelper), liquidityTokenAmount);
 
@@ -512,12 +511,12 @@ contract TestSplitWeightFork is TestBaseWorkflow {
 
         // Add full-range liquidity.
         // forge-lint: disable-next-line(unsafe-typecast)
-        int256 liquidityDelta = int256(liquidityTokenAmount / 2);
+        int256 liquidityDelta = int256(liquidityTokenAmount / 50);
         vm.prank(address(liqHelper));
         liqHelper.addLiquidity{value: liquidityTokenAmount}(key, TICK_LOWER, TICK_UPPER, liquidityDelta);
 
-        // Mock the oracle at address(0) for hookless pools.
-        _mockOracle(liquidityDelta, 0, uint32(REV_DEPLOYER.DEFAULT_BUYBACK_TWAP_WINDOW()));
+        // Mock geomean oracle at tick 69078 (~1000 tokens/ETH, matching INITIAL_ISSUANCE).
+        _mockOracle(liquidityDelta, 69_078, uint32(REV_DEPLOYER.DEFAULT_BUYBACK_TWAP_WINDOW()));
     }
 
     /// @notice Mock the IGeomeanOracle at address(0) for hookless pools.

package/test/TestStageTransitionBorrowable.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestSwapTerminalPermission.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestUint112Overflow.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/TestZeroRepayment.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";