@bananapus/721-hook-v6 0.0.41 → 0.0.43

package/test/audit/SameCurrencyDecimalMismatch.t.sol

@@ -1,249 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {UnitTestSetup} from "../utils/UnitTestSetup.sol";
-import {IJB721TokenUriResolver} from "../../src/interfaces/IJB721TokenUriResolver.sol";
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
-import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
-import {IJBRulesets} from "@bananapus/core-v6/src/interfaces/IJBRulesets.sol";
-import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
-import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
-import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
-import {JBTokenAmount} from "@bananapus/core-v6/src/structs/JBTokenAmount.sol";
-import {JB721TiersHook} from "../../src/JB721TiersHook.sol";
-import {JB721CheckpointsDeployer} from "../../src/JB721CheckpointsDeployer.sol";
-import {IJB721CheckpointsDeployer} from "../../src/interfaces/IJB721CheckpointsDeployer.sol";
-import {JB721TierConfig} from "../../src/structs/JB721TierConfig.sol";
-import {JB721InitTiersConfig} from "../../src/structs/JB721InitTiersConfig.sol";
-import {JB721TiersHookFlags} from "../../src/structs/JB721TiersHookFlags.sol";
-
-/// @notice Regression test for: same-currency decimal mismatch in split forwarding.
-/// @dev When pricing decimals differ from payment decimals but the currency is the same,
-/// `convertAndCapSplitAmounts` must rescale split amounts before comparing to `amountValue`.
-/// Without the fix, split amounts stay in pricing decimals (e.g. 18), the cap comparison uses
-/// payment decimals (e.g. 6), and the cap clips the split to 100% of the payment.
-contract SameCurrencyDecimalMismatch is UnitTestSetup {
-    // Shared constants.
-    address constant MOCK_TOKEN = address(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48);
-    // forge-lint: disable-next-line(unsafe-typecast)
-    uint32 constant CURRENCY = uint32(uint160(MOCK_TOKEN));
-
-    /// @notice Prove that a 50% split with same currency but different decimals (pricing=18, payment=6)
-    /// correctly forwards ~50% of the payment, not 100%.
-    function test_sameCurrency_differentDecimals_splitAmountScaledCorrectly() public {
-        // Deploy hook with PRICES=address(0), tier priced at 1e18 (18-decimal), 50% split.
-        JB721TiersHook testHook;
-        {
-            JB721TiersHook origin = new JB721TiersHook(
-                IJBDirectory(mockJBDirectory),
-                IJBPermissions(mockJBPermissions),
-                IJBPrices(address(0)),
-                IJBRulesets(mockJBRulesets),
-                store,
-                IJBSplits(mockJBSplits),
-                IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
-                trustedForwarder
-            );
-            address hookAddr = makeAddr("hook18to6");
-            vm.etch(hookAddr, address(origin).code);
-            testHook = JB721TiersHook(hookAddr);
-        }
-
-        {
-            (JB721TierConfig[] memory tierConfigs,) = _createTiers(defaultTierConfig, 1);
-            tierConfigs[0].price = 1e18;
-            tierConfigs[0].splitPercent = 500_000_000; // 50%.
-            testHook.initialize(
-                projectId,
-                name,
-                symbol,
-                baseUri,
-                IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri,
-                JB721InitTiersConfig({tiers: tierConfigs, currency: CURRENCY, decimals: 18}),
-                JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: false
-                })
-            );
-        }
-
-        // Build payer metadata requesting tier 1.
-        bytes memory payerMetadata;
-        {
-            uint16[] memory tierIdsToMint = new uint16[](1);
-            tierIdsToMint[0] = 1;
-            bytes[] memory data = new bytes[](1);
-            data[0] = abi.encode(true, tierIdsToMint);
-            bytes4[] memory ids = new bytes4[](1);
-            ids[0] = metadataHelper.getId("pay", testHook.METADATA_ID_TARGET());
-            payerMetadata = metadataHelper.createMetadata(ids, data);
-        }
-
-        // Pay 1.0 token reported as 6 decimals (value = 1e6). Same currency, different decimals.
-        (uint256 weight, JBPayHookSpecification[] memory hookSpecs) = testHook.beforePayRecordedWith(
-            JBBeforePayRecordedContext({
-                terminal: mockTerminalAddress,
-                payer: beneficiary,
-                amount: JBTokenAmount({token: MOCK_TOKEN, value: 1e6, decimals: 6, currency: CURRENCY}),
-                projectId: projectId,
-                rulesetId: 0,
-                beneficiary: beneficiary,
-                weight: 10e18,
-                reservedPercent: 0,
-                metadata: payerMetadata
-            })
-        );
-
-        // Without the fix: split amount (5e17 in 18-decimal pricing) is compared to amountValue (1e6),
-        // causing the cap to clip it to 1e6 (100% of payment) and weight becomes 0.
-        // With the fix: split is rescaled to 5e5 (50% of 1e6) and weight is 5e18.
-        assertEq(hookSpecs[0].amount, 5e5, "split should be 50% of payment (5e5), not capped to 100%");
-        assertEq(weight, 5e18, "weight should be 50% (half goes to splits)");
-    }
-
-    /// @notice Sanity check: same currency AND same decimals — no rescaling needed.
-    function test_sameCurrency_sameDecimals_splitAmountUnchanged() public {
-        JB721TiersHook testHook;
-        {
-            JB721TiersHook origin = new JB721TiersHook(
-                IJBDirectory(mockJBDirectory),
-                IJBPermissions(mockJBPermissions),
-                IJBPrices(address(0)),
-                IJBRulesets(mockJBRulesets),
-                store,
-                IJBSplits(mockJBSplits),
-                IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
-                trustedForwarder
-            );
-            address hookAddr = makeAddr("hook18to18");
-            vm.etch(hookAddr, address(origin).code);
-            testHook = JB721TiersHook(hookAddr);
-        }
-
-        {
-            (JB721TierConfig[] memory tierConfigs,) = _createTiers(defaultTierConfig, 1);
-            tierConfigs[0].price = 1e18;
-            tierConfigs[0].splitPercent = 500_000_000;
-            testHook.initialize(
-                projectId,
-                name,
-                symbol,
-                baseUri,
-                IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri,
-                JB721InitTiersConfig({tiers: tierConfigs, currency: CURRENCY, decimals: 18}),
-                JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: false
-                })
-            );
-        }
-
-        bytes memory payerMetadata;
-        {
-            uint16[] memory tierIdsToMint = new uint16[](1);
-            tierIdsToMint[0] = 1;
-            bytes[] memory data = new bytes[](1);
-            data[0] = abi.encode(true, tierIdsToMint);
-            bytes4[] memory ids = new bytes4[](1);
-            ids[0] = metadataHelper.getId("pay", testHook.METADATA_ID_TARGET());
-            payerMetadata = metadataHelper.createMetadata(ids, data);
-        }
-
-        (uint256 weight, JBPayHookSpecification[] memory hookSpecs) = testHook.beforePayRecordedWith(
-            JBBeforePayRecordedContext({
-                terminal: mockTerminalAddress,
-                payer: beneficiary,
-                amount: JBTokenAmount({token: MOCK_TOKEN, value: 1e18, decimals: 18, currency: CURRENCY}),
-                projectId: projectId,
-                rulesetId: 0,
-                beneficiary: beneficiary,
-                weight: 10e18,
-                reservedPercent: 0,
-                metadata: payerMetadata
-            })
-        );
-
-        assertEq(hookSpecs[0].amount, 5e17, "split should be 50% of payment");
-        assertEq(weight, 5e18, "weight should be 50%");
-    }
-
-    /// @notice Same currency, payment has MORE decimals than pricing (pricing=6, payment=18).
-    function test_sameCurrency_paymentMoreDecimals_splitScaledUp() public {
-        JB721TiersHook testHook;
-        {
-            JB721TiersHook origin = new JB721TiersHook(
-                IJBDirectory(mockJBDirectory),
-                IJBPermissions(mockJBPermissions),
-                IJBPrices(address(0)),
-                IJBRulesets(mockJBRulesets),
-                store,
-                IJBSplits(mockJBSplits),
-                IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
-                trustedForwarder
-            );
-            address hookAddr = makeAddr("hook6to18");
-            vm.etch(hookAddr, address(origin).code);
-            testHook = JB721TiersHook(hookAddr);
-        }
-
-        {
-            (JB721TierConfig[] memory tierConfigs,) = _createTiers(defaultTierConfig, 1);
-            tierConfigs[0].price = 1e6; // 1.0 token in 6-decimal pricing.
-            tierConfigs[0].splitPercent = 500_000_000;
-            testHook.initialize(
-                projectId,
-                name,
-                symbol,
-                baseUri,
-                IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri,
-                JB721InitTiersConfig({tiers: tierConfigs, currency: CURRENCY, decimals: 6}),
-                JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: false
-                })
-            );
-        }
-
-        bytes memory payerMetadata;
-        {
-            uint16[] memory tierIdsToMint = new uint16[](1);
-            tierIdsToMint[0] = 1;
-            bytes[] memory data = new bytes[](1);
-            data[0] = abi.encode(true, tierIdsToMint);
-            bytes4[] memory ids = new bytes4[](1);
-            ids[0] = metadataHelper.getId("pay", testHook.METADATA_ID_TARGET());
-            payerMetadata = metadataHelper.createMetadata(ids, data);
-        }
-
-        (uint256 weight, JBPayHookSpecification[] memory hookSpecs) = testHook.beforePayRecordedWith(
-            JBBeforePayRecordedContext({
-                terminal: mockTerminalAddress,
-                payer: beneficiary,
-                amount: JBTokenAmount({token: MOCK_TOKEN, value: 1e18, decimals: 18, currency: CURRENCY}),
-                projectId: projectId,
-                rulesetId: 0,
-                beneficiary: beneficiary,
-                weight: 10e18,
-                reservedPercent: 0,
-                metadata: payerMetadata
-            })
-        );
-
-        // 50% of 1.0 token in 18-decimal payment = 5e17.
-        assertEq(hookSpecs[0].amount, 5e17, "split scaled up to 18-decimal payment");
-        assertEq(weight, 5e18, "weight should be 50%");
-    }
-}

package/test/audit/SplitCreditsMismatch.t.sol

@@ -1,219 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../utils/UnitTestSetup.sol";
-import {IJB721TiersHookStore} from "../../src/interfaces/IJB721TiersHookStore.sol";
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
-import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
-import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
-import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
-import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
-import {IJBSplitHook} from "@bananapus/core-v6/src/interfaces/IJBSplitHook.sol";
-import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
-
-/// @notice Regression test: split metadata is proportionally scaled when credits fund a split-bearing tier mint.
-/// @dev Previously (pre-fix), the per-tier split amounts were left at the uncapped value, trapping forwarded ETH.
-/// After the F-2 fix, split amounts are scaled down to match the actual forwarded amount.
-contract SplitCreditsMismatch is UnitTestSetup {
-    address internal splitBeneficiary = makeAddr("splitBeneficiary");
-
-    function setUp() public override {
-        super.setUp();
-        vm.etch(mockJBSplits, new bytes(0x69));
-    }
-
-    function _buildPayMetadata(
-        address hookAddress,
-        bool allowOverspending,
-        uint16[] memory tierIdsToMint
-    )
-        internal
-        view
-        returns (bytes memory)
-    {
-        bytes[] memory data = new bytes[](1);
-        data[0] = abi.encode(allowOverspending, tierIdsToMint);
-        bytes4[] memory ids = new bytes4[](1);
-        ids[0] = metadataHelper.getId("pay", hookAddress);
-        return metadataHelper.createMetadata(ids, data);
-    }
-
-    function _beforePayContext(
-        address hookAddress,
-        uint256 amountValue,
-        uint16[] memory tierIdsToMint
-    )
-        internal
-        view
-        returns (JBBeforePayRecordedContext memory)
-    {
-        return JBBeforePayRecordedContext({
-            terminal: mockTerminalAddress,
-            payer: beneficiary,
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: amountValue,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            projectId: projectId,
-            rulesetId: 0,
-            beneficiary: beneficiary,
-            weight: 10e18,
-            reservedPercent: 5000,
-            metadata: _buildPayMetadata(hookAddress, false, tierIdsToMint)
-        });
-    }
-
-    function _afterPayContext(
-        address hookAddress,
-        uint256 amountValue,
-        uint256 forwardedAmountValue,
-        bytes memory hookMetadata,
-        uint16[] memory tierIdsToMint
-    )
-        internal
-        view
-        returns (JBAfterPayRecordedContext memory)
-    {
-        return JBAfterPayRecordedContext({
-            payer: beneficiary,
-            projectId: projectId,
-            rulesetId: 0,
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: amountValue,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            forwardedAmount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: forwardedAmountValue,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            weight: 10e18,
-            newlyIssuedTokenCount: 0,
-            beneficiary: beneficiary,
-            hookMetadata: hookMetadata,
-            payerMetadata: _buildPayMetadata(hookAddress, true, tierIdsToMint)
-        });
-    }
-
-    function test_payCreditsScaleSplitMetadata_andForwardEth() public {
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        vm.mockCall(
-            mockJBDirectory,
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        // Tier costs 1 ether and routes 100% of its effective price to splits.
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
-        tierConfigs[0] = JB721TierConfig({
-            price: 1 ether,
-            initialSupply: 100,
-            votingUnits: 0,
-            reserveFrequency: 0,
-            reserveBeneficiary: reserveBeneficiary,
-            encodedIPFSUri: bytes32(uint256(0x1234)),
-            category: 1,
-            discountPercent: 0,
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: false,
-                transfersPausable: false,
-                useVotingUnits: false,
-                cantBeRemoved: false,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 1_000_000_000,
-            splits: new JBSplit[](0)
-        });
-
-        vm.prank(address(testHook));
-        uint256[] memory tierIds = hookStore.recordAddTiers(tierConfigs);
-
-        // Seed 1 ether of pay credits with an earlier overpayment.
-        uint16[] memory noTiers = new uint16[](0);
-        JBAfterPayRecordedContext memory creditSeedContext = JBAfterPayRecordedContext({
-            payer: beneficiary,
-            projectId: projectId,
-            rulesetId: 0,
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 1 ether,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            forwardedAmount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 0,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            weight: 10e18,
-            newlyIssuedTokenCount: 0,
-            beneficiary: beneficiary,
-            hookMetadata: "",
-            payerMetadata: _buildPayMetadata(address(testHook), true, noTiers)
-        });
-        vm.prank(mockTerminalAddress);
-        testHook.afterPayRecordedWith(creditSeedContext);
-        assertEq(testHook.payCreditsOf(beneficiary), 1 ether, "setup: pay credits should be seeded");
-
-        uint16[] memory mintIds = new uint16[](1);
-        mintIds[0] = uint16(tierIds[0]);
-
-        // beforePay caps the forwarded amount to the actual payment...
-        (, JBPayHookSpecification[] memory specs) =
-            testHook.beforePayRecordedWith(_beforePayContext(address(testHook), 1, mintIds));
-        assertEq(specs[0].amount, 1, "forwarded amount should be capped to actual payment");
-
-        // ...and proportionally scales the encoded per-tier split amounts to match the capped total.
-        (,, bytes memory splitData) = abi.decode(specs[0].metadata, (address, address, bytes));
-        (, uint256[] memory encodedAmounts) = abi.decode(splitData, (uint16[], uint256[]));
-        assertEq(encodedAmounts.length, 1, "expected one encoded split amount");
-        assertEq(encodedAmounts[0], 1, "hook metadata should be scaled down to match forwarded amount");
-
-        // Route the split to a beneficiary and make project-balance fallback unavailable.
-        JBSplit[] memory splits = new JBSplit[](1);
-        splits[0] = JBSplit({
-            percent: 1_000_000_000,
-            projectId: 0,
-            beneficiary: payable(splitBeneficiary),
-            preferAddToBalance: false,
-            lockedUntil: 0,
-            hook: IJBSplitHook(address(0))
-        });
-
-        uint256 groupId = uint256(uint160(address(testHook))) | (uint256(tierIds[0]) << 160);
-        vm.mockCall(
-            mockJBSplits, abi.encodeWithSelector(IJBSplits.splitsOf.selector, projectId, 0, groupId), abi.encode(splits)
-        );
-        vm.mockCall(
-            mockJBDirectory,
-            abi.encodeWithSelector(IJBDirectory.primaryTerminalOf.selector, projectId, JBConstants.NATIVE_TOKEN),
-            abi.encode(address(0))
-        );
-
-        uint256 splitBeneficiaryBalanceBefore = splitBeneficiary.balance;
-
-        // The mint succeeds because pay credits cover the price. With the fix, the split IS honored.
-        JBAfterPayRecordedContext memory creditMintContext =
-            _afterPayContext(address(testHook), 1, 1, specs[0].metadata, mintIds);
-        vm.deal(mockTerminalAddress, 1);
-        vm.prank(mockTerminalAddress);
-        testHook.afterPayRecordedWith{value: 1}(creditMintContext);
-
-        assertEq(testHook.balanceOf(beneficiary), 1, "beneficiary should still receive the NFT");
-        assertEq(testHook.payCreditsOf(beneficiary), 1, "only 1 wei of credits should remain");
-        // After fix: split beneficiary receives the forwarded ETH, nothing trapped.
-        assertEq(splitBeneficiary.balance - splitBeneficiaryBalanceBefore, 1, "split beneficiary should receive 1 wei");
-        assertEq(address(testHook).balance, 0, "no ETH should be trapped in the hook");
-    }
-}

package/test/audit/SplitFailureRedistribution.t.sol

@@ -1,143 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../utils/UnitTestSetup.sol";
-import {IJB721TiersHookStore} from "../../src/interfaces/IJB721TiersHookStore.sol";
-import {IJBSplitHook} from "@bananapus/core-v6/src/interfaces/IJBSplitHook.sol";
-import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
-import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
-
-contract SplitFailureRedistribution is UnitTestSetup {
-    address internal alice = makeAddr("alice");
-    address internal bob = makeAddr("bob");
-
-    function test_failedEarlierSplit_doesNotOverpayLaterSplit() public {
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
-        tierConfigs[0].price = 1 ether;
-        tierConfigs[0].initialSupply = uint32(100);
-        tierConfigs[0].category = uint24(1);
-        tierConfigs[0].encodedIPFSUri = bytes32(uint256(0x1234));
-        tierConfigs[0].splitPercent = 1_000_000_000;
-
-        vm.prank(address(testHook));
-        uint256[] memory tierIds = hookStore.recordAddTiers(tierConfigs);
-
-        mockAndExpect(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        RevertOnReceive revertingBeneficiary = new RevertOnReceive();
-
-        JBSplit[] memory splits = new JBSplit[](2);
-        splits[0] = JBSplit({
-            percent: uint32(JBConstants.SPLITS_TOTAL_PERCENT / 2),
-            projectId: 0,
-            beneficiary: payable(address(revertingBeneficiary)),
-            preferAddToBalance: false,
-            lockedUntil: 0,
-            hook: IJBSplitHook(address(0))
-        });
-        splits[1] = JBSplit({
-            percent: uint32(JBConstants.SPLITS_TOTAL_PERCENT / 2),
-            projectId: 0,
-            beneficiary: payable(bob),
-            preferAddToBalance: false,
-            lockedUntil: 0,
-            hook: IJBSplitHook(address(0))
-        });
-
-        uint256 groupId = uint256(uint160(address(testHook))) | (uint256(tierIds[0]) << 160);
-        mockAndExpect(
-            mockJBSplits, abi.encodeWithSelector(IJBSplits.splitsOf.selector, projectId, 0, groupId), abi.encode(splits)
-        );
-
-        bytes memory payerMetadata = _buildPayMetadata(address(testHook), uint16(tierIds[0]));
-        bytes memory hookMetadata =
-            abi.encode(beneficiary, beneficiary, abi.encode(_singleTierId(uint16(tierIds[0])), _singleAmount(1 ether)));
-
-        JBAfterPayRecordedContext memory payContext = JBAfterPayRecordedContext({
-            payer: beneficiary,
-            projectId: projectId,
-            rulesetId: 0,
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 1 ether,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            forwardedAmount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 1 ether,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            weight: 10e18,
-            newlyIssuedTokenCount: 0,
-            beneficiary: beneficiary,
-            hookMetadata: hookMetadata,
-            payerMetadata: payerMetadata
-        });
-
-        // Mock primaryTerminalOf so the leftover (failed split amount) can be routed to the project balance.
-        address projectTerminal = makeAddr("projectTerminal");
-        vm.etch(projectTerminal, new bytes(0x69));
-        mockAndExpect(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.primaryTerminalOf.selector, projectId, JBConstants.NATIVE_TOKEN),
-            abi.encode(projectTerminal)
-        );
-        // Mock addToBalanceOf on the terminal so the leftover deposit succeeds.
-        vm.mockCall(
-            projectTerminal,
-            abi.encodeWithSelector(
-                IJBTerminal.addToBalanceOf.selector, projectId, JBConstants.NATIVE_TOKEN, 0.5 ether, false, "", ""
-            ),
-            ""
-        );
-
-        uint256 bobBalanceBefore = bob.balance;
-
-        vm.deal(mockTerminalAddress, 1 ether);
-        vm.prank(mockTerminalAddress);
-        testHook.afterPayRecordedWith{value: 1 ether}(payContext);
-
-        // With the fix, Bob only receives his fair 50% share. The failed split's 0.5 ether
-        // is routed to the project's balance via addToBalanceOf on the primary terminal.
-        assertEq(
-            bob.balance - bobBalanceBefore,
-            0.5 ether,
-            "later split should only receive its own allocation, not the failed split's share"
-        );
-    }
-
-    function _buildPayMetadata(address hookAddress, uint16 tierId) internal view returns (bytes memory) {
-        bytes[] memory data = new bytes[](1);
-        data[0] = abi.encode(false, _singleTierId(tierId));
-        bytes4[] memory ids = new bytes4[](1);
-        ids[0] = metadataHelper.getId("pay", hookAddress);
-        return metadataHelper.createMetadata(ids, data);
-    }
-
-    function _singleTierId(uint16 tierId) internal pure returns (uint16[] memory tierIds) {
-        tierIds = new uint16[](1);
-        tierIds[0] = tierId;
-    }
-
-    function _singleAmount(uint256 amount) internal pure returns (uint256[] memory amounts) {
-        amounts = new uint256[](1);
-        amounts[0] = amount;
-    }
-}
-
-contract RevertOnReceive {
-    receive() external payable {
-        revert("NO_ETH");
-    }
-}