@bananapus/721-hook-v6 0.0.32 → 0.0.34

package/test/audit/CodexRetroactiveReserveBeneficiaryDilution.t.sol

@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "../utils/UnitTestSetup.sol";
+import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
+import {JBAfterPayRecordedContext} from "@bananapus/core-v6/src/structs/JBAfterPayRecordedContext.sol";
+import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
+
+contract CodexRetroactiveReserveBeneficiaryDilution is UnitTestSetup {
+    function _buildPayMetadata(address hookAddress, uint16[] memory tierIdsToMint)
+        internal
+        view
+        returns (bytes memory)
+    {
+        bytes[] memory data = new bytes[](1);
+        data[0] = abi.encode(true, tierIdsToMint);
+        bytes4[] memory ids = new bytes4[](1);
+        ids[0] = metadataHelper.getId("pay", hookAddress);
+        return metadataHelper.createMetadata(ids, data);
+    }
+
+    function _afterPayContext(
+        address hookAddress,
+        uint256 amountValue,
+        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: 0,
+                decimals: 18,
+                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+            }),
+            weight: 10e18,
+            newlyIssuedTokenCount: 0,
+            beneficiary: beneficiary,
+            hookMetadata: "",
+            payerMetadata: _buildPayMetadata(hookAddress, tierIdsToMint)
+        });
+    }
+
+    function test_adjustTier_can_retroactively_create_reserves_for_existing_supply() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+
+        JB721TierConfig[] memory tier1 = new JB721TierConfig[](1);
+        tier1[0] = JB721TierConfig({
+            price: 1 ether,
+            initialSupply: 100,
+            votingUnits: 0,
+            reserveFrequency: 2,
+            reserveBeneficiary: address(0),
+            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: 0,
+            splits: new JBSplit[](0)
+        });
+
+        vm.prank(owner);
+        testHook.adjustTiers(tier1, new uint256[](0));
+
+        assertEq(
+            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
+            0,
+            "no beneficiary means no reserves are pending"
+        );
+
+        vm.mockCall(
+            mockJBDirectory,
+            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
+            abi.encode(true)
+        );
+
+        uint16[] memory mintIds = new uint16[](3);
+        mintIds[0] = 1;
+        mintIds[1] = 1;
+        mintIds[2] = 1;
+
+        JBAfterPayRecordedContext memory payContext = _afterPayContext(address(testHook), 3 ether, mintIds);
+        vm.prank(mockTerminalAddress);
+        testHook.afterPayRecordedWith(payContext);
+
+        assertEq(testHook.balanceOf(beneficiary), 3, "beneficiary should own the three paid NFTs");
+        assertEq(testHook.totalCashOutWeight(), 3 ether, "denominator initially reflects only sold NFTs");
+
+        JB721TierConfig[] memory tier2 = new JB721TierConfig[](1);
+        tier2[0] = JB721TierConfig({
+            price: 2 ether,
+            initialSupply: 100,
+            votingUnits: 0,
+            reserveFrequency: 1,
+            reserveBeneficiary: owner,
+            encodedIPFSUri: bytes32(uint256(0x5678)),
+            category: 2,
+            discountPercent: 0,
+            flags: JB721TierConfigFlags({
+                allowOwnerMint: false,
+                useReserveBeneficiaryAsDefault: true,
+                transfersPausable: false,
+                useVotingUnits: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false
+            }),
+            splitPercent: 0,
+            splits: new JBSplit[](0)
+        });
+
+        vm.prank(owner);
+        testHook.adjustTiers(tier2, new uint256[](0));
+
+        assertEq(
+            testHook.STORE().reserveBeneficiaryOf(address(testHook), 1),
+            owner,
+            "new default beneficiary retroactively applies to the old tier"
+        );
+        assertEq(
+            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
+            2,
+            "historical sales now generate retroactive pending reserves"
+        );
+        assertEq(
+            testHook.totalCashOutWeight(),
+            5 ether,
+            "existing holders are diluted before any new payment enters the system"
+        );
+
+        vm.prank(address(0xBEEF));
+        testHook.mintPendingReservesFor(1, 2);
+
+        assertEq(testHook.balanceOf(owner), 2, "retroactive reserves mint directly to the new default beneficiary");
+        assertEq(
+            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
+            0,
+            "all retroactive reserve entitlement can be extracted"
+        );
+    }
+}

package/test/audit/CodexSplitCreditsMismatch.t.sol

@@ -175,7 +175,8 @@ contract CodexSplitCreditsMismatch is UnitTestSetup {
         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.
-        (, uint256[] memory encodedAmounts) = abi.decode(specs[0].metadata, (uint16[], uint256[]));
+        (,, 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");
 

package/test/audit/CrossCurrencySplitNoPrices.t.sol

@@ -20,6 +20,7 @@ contract CrossCurrencySplitNoPrices is UnitTestSetup {
             IJBRulesets(mockJBRulesets),
             store,
             IJBSplits(mockJBSplits),
+            IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
             trustedForwarder
         );
 

package/test/audit/SameCurrencyDecimalMismatch.t.sol

@@ -0,0 +1,249 @@
+// 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/SplitFailureRedistribution.t.sol

@@ -59,7 +59,8 @@ contract SplitFailureRedistribution is UnitTestSetup {
         );
 
         bytes memory payerMetadata = _buildPayMetadata(address(testHook), uint16(tierIds[0]));
-        bytes memory hookMetadata = abi.encode(_singleTierId(uint16(tierIds[0])), _singleAmount(1 ether));
+        bytes memory hookMetadata =
+            abi.encode(beneficiary, beneficiary, abi.encode(_singleTierId(uint16(tierIds[0])), _singleAmount(1 ether)));
 
         JBAfterPayRecordedContext memory payContext = JBAfterPayRecordedContext({
             payer: beneficiary,

package/test/fork/ERC20CashOutFork.t.sol

@@ -70,6 +70,8 @@ import "../../src/JB721TiersHookDeployer.sol";
 import "../../src/JB721TiersHookProjectDeployer.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "../../src/JB721TiersHookStore.sol";
+import {JB721CheckpointsDeployer} from "../../src/JB721CheckpointsDeployer.sol";
+import {IJB721CheckpointsDeployer} from "../../src/interfaces/IJB721CheckpointsDeployer.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "../../src/interfaces/IJB721TiersHook.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
@@ -176,7 +178,7 @@ contract ERC20CashOutFork is Test {
         jbPermissions = new JBPermissions(address(0));
         jbProjects = new JBProjects(multisig, address(0), address(0));
         jbDirectory = new JBDirectory(jbPermissions, jbProjects, multisig);
-        JBERC20 jbErc20 = new JBERC20();
+        JBERC20 jbErc20 = new JBERC20(jbPermissions, jbProjects);
         jbTokens = new JBTokens(jbDirectory, jbErc20);
         jbRulesets = new JBRulesets(jbDirectory);
         jbPrices = new JBPrices(jbDirectory, jbPermissions, jbProjects, multisig, address(0));
@@ -217,7 +219,14 @@ contract ERC20CashOutFork is Test {
     function _deploy721Hook() internal {
         store = new JB721TiersHookStore();
         hookImpl = new JB721TiersHook(
-            jbDirectory, jbPermissions, jbPrices, jbRulesets, store, IJBSplits(address(jbSplits)), address(0)
+            jbDirectory,
+            jbPermissions,
+            jbPrices,
+            jbRulesets,
+            store,
+            IJBSplits(address(jbSplits)),
+            IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
+            address(0)
         );
         addressRegistry = new JBAddressRegistry();
         hookDeployer = new JB721TiersHookDeployer(hookImpl, store, addressRegistry, address(0));

package/test/fork/ERC20TierSplitFork.t.sol

@@ -70,6 +70,8 @@ import "../../src/JB721TiersHookDeployer.sol";
 import "../../src/JB721TiersHookProjectDeployer.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "../../src/JB721TiersHookStore.sol";
+import {JB721CheckpointsDeployer} from "../../src/JB721CheckpointsDeployer.sol";
+import {IJB721CheckpointsDeployer} from "../../src/interfaces/IJB721CheckpointsDeployer.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "../../src/interfaces/IJB721TiersHook.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
@@ -153,7 +155,7 @@ contract ERC20TierSplitFork is Test {
         jbPermissions = new JBPermissions(address(0));
         jbProjects = new JBProjects(multisig, address(0), address(0));
         jbDirectory = new JBDirectory(jbPermissions, jbProjects, multisig);
-        JBERC20 jbErc20 = new JBERC20();
+        JBERC20 jbErc20 = new JBERC20(jbPermissions, jbProjects);
         jbTokens = new JBTokens(jbDirectory, jbErc20);
         jbRulesets = new JBRulesets(jbDirectory);
         jbPrices = new JBPrices(jbDirectory, jbPermissions, jbProjects, multisig, address(0));
@@ -194,7 +196,14 @@ contract ERC20TierSplitFork is Test {
     function _deploy721Hook() internal {
         store = new JB721TiersHookStore();
         hookImpl = new JB721TiersHook(
-            jbDirectory, jbPermissions, jbPrices, jbRulesets, store, IJBSplits(address(jbSplits)), address(0)
+            jbDirectory,
+            jbPermissions,
+            jbPrices,
+            jbRulesets,
+            store,
+            IJBSplits(address(jbSplits)),
+            IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
+            address(0)
         );
         addressRegistry = new JBAddressRegistry();
         hookDeployer = new JB721TiersHookDeployer(hookImpl, store, addressRegistry, address(0));

package/test/fork/IssueTokensForSplitsFork.t.sol

@@ -68,6 +68,8 @@ import "../../src/JB721TiersHookDeployer.sol";
 import "../../src/JB721TiersHookProjectDeployer.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "../../src/JB721TiersHookStore.sol";
+import {JB721CheckpointsDeployer} from "../../src/JB721CheckpointsDeployer.sol";
+import {IJB721CheckpointsDeployer} from "../../src/interfaces/IJB721CheckpointsDeployer.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "../../src/interfaces/IJB721TiersHook.sol";
 // forge-lint: disable-next-line(unaliased-plain-import)
@@ -160,7 +162,7 @@ contract IssueTokensForSplitsFork is Test {
         jbPermissions = new JBPermissions(address(0));
         jbProjects = new JBProjects(multisig, address(0), address(0));
         jbDirectory = new JBDirectory(jbPermissions, jbProjects, multisig);
-        JBERC20 jbErc20 = new JBERC20();
+        JBERC20 jbErc20 = new JBERC20(jbPermissions, jbProjects);
         jbTokens = new JBTokens(jbDirectory, jbErc20);
         jbRulesets = new JBRulesets(jbDirectory);
         jbPrices = new JBPrices(jbDirectory, jbPermissions, jbProjects, multisig, address(0));
@@ -208,7 +210,14 @@ contract IssueTokensForSplitsFork is Test {
     function _deploy721Hook() internal {
         store = new JB721TiersHookStore();
         hookImpl = new JB721TiersHook(
-            jbDirectory, jbPermissions, jbPrices, jbRulesets, store, IJBSplits(address(jbSplits)), address(0)
+            jbDirectory,
+            jbPermissions,
+            jbPrices,
+            jbRulesets,
+            store,
+            IJBSplits(address(jbSplits)),
+            IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
+            address(0)
         );
         addressRegistry = new JBAddressRegistry();
         hookDeployer = new JB721TiersHookDeployer(hookImpl, store, addressRegistry, address(0));

package/test/regression/BrokenTerminalDoesNotDos.t.sol

@@ -69,7 +69,7 @@ contract Test_BrokenTerminalDoesNotDos is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
     }
@@ -163,7 +163,7 @@ contract Test_BrokenTerminalDoesNotDos is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 

package/test/regression/SplitDistributionBugs.t.sol

@@ -133,7 +133,7 @@ contract Test_SplitDistributionBugs is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 
@@ -350,7 +350,7 @@ contract Test_SplitDistributionBugs is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 
@@ -455,7 +455,7 @@ contract Test_SplitDistributionBugs is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 
@@ -566,7 +566,7 @@ contract Test_SplitDistributionBugs is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
     }
@@ -673,7 +673,7 @@ contract Test_SplitDistributionBugs is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 

package/test/regression/SplitNoBeneficiary.t.sol

@@ -112,7 +112,7 @@ contract Test_L36_SplitNoBeneficiary is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 

package/test/unit/AuditFixes_Unit.t.sol

@@ -115,9 +115,9 @@ contract Test_AuditFixes_Unit is UnitTestSetup {
         // The total forwarded amount must be capped at the payment value (may be up to 1 wei less due to rounding).
         assertApproxEqAbs(specs[0].amount, 2 ether, 1, "Total split should be capped at payment value");
 
-        // Decode the per-tier breakdown from hookMetadata.
-        (uint16[] memory resultTierIds, uint256[] memory resultAmounts) =
-            abi.decode(specs[0].metadata, (uint16[], uint256[]));
+        // Decode the per-tier breakdown from hookMetadata (unwrap beneficiary/payer wrapper first).
+        (,, bytes memory splitData) = abi.decode(specs[0].metadata, (address, address, bytes));
+        (uint16[] memory resultTierIds, uint256[] memory resultAmounts) = abi.decode(splitData, (uint16[], uint256[]));
 
         // Both tiers should be present in the metadata.
         assertEq(resultTierIds.length, 2, "Should have 2 tier entries");
@@ -260,7 +260,7 @@ contract Test_AuditFixes_Unit is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 
@@ -341,7 +341,7 @@ contract Test_AuditFixes_Unit is UnitTestSetup {
             weight: 10e18,
             newlyIssuedTokenCount: 0,
             beneficiary: beneficiary,
-            hookMetadata: abi.encode(splitTierIds, splitAmounts),
+            hookMetadata: abi.encode(beneficiary, beneficiary, abi.encode(splitTierIds, splitAmounts)),
             payerMetadata: payerMetadata
         });
 

package/test/unit/pay_CrossCurrency_Unit.t.sol

@@ -221,6 +221,7 @@ contract Test_crossCurrencyPay_Unit is UnitTestSetup {
             IJBRulesets(mockJBRulesets),
             IJB721TiersHookStore(store),
             IJBSplits(mockJBSplits),
+            IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
             trustedForwarder
         );
 

package/test/unit/pay_Unit.t.sol

@@ -1006,6 +1006,7 @@ contract Test_afterPayRecorded_Unit is UnitTestSetup {
             IJBRulesets(mockJBRulesets),
             IJB721TiersHookStore(store),
             IJBSplits(mockJBSplits),
+            IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
             trustedForwarder
         );
         address noPricesProxy = makeAddr("noPricesProxy2");