@bananapus/721-hook-v6 0.0.41 → 0.0.43

package/test/unit/redeem_Unit.t.sol

@@ -1,473 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../utils/UnitTestSetup.sol";
-
-contract Test_cashOut_Unit is UnitTestSetup {
-    using stdStorage for StdStorage;
-
-    function test_beforeCashOutContext_returnsCorrectAmount() public {
-        uint256 weight;
-        uint256 totalWeight;
-        ForTest_JB721TiersHook hook = _initializeForTestHook(10);
-
-        // Set up 10 tiers, with half of the supply minted for each one.
-        for (uint256 i = 1; i <= 10; i++) {
-            hook.test_store()
-                .ForTest_setTier(
-                    address(hook),
-                    i,
-                    JBStored721Tier({
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        price: uint104(i * 10),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        remainingSupply: uint32(10 * i - 5 * i),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        initialSupply: uint32(10 * i),
-                        reserveFrequency: uint16(0),
-                        category: uint24(100),
-                        discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
-                        splitPercent: 0
-                    })
-                );
-            totalWeight += (10 * i - 5 * i) * i * 10;
-        }
-
-        // Cash out as if the beneficiary has 1 NFT from each of the first five tiers.
-        uint256[] memory tokenList = new uint256[](5);
-        for (uint256 i; i < 5; i++) {
-            uint256 tokenId = _generateTokenId(i + 1, 1);
-            hook.ForTest_setOwnerOf(tokenId, beneficiary);
-            tokenList[i] = tokenId;
-            weight += (i + 1) * 10;
-        }
-
-        // Build the metadata with the tiers to cash out.
-        bytes[] memory data = new bytes[](1);
-        data[0] = abi.encode(tokenList);
-
-        // Pass the hook ID.
-        bytes4[] memory ids = new bytes4[](1);
-        ids[0] = metadataHelper.getId("cashOut", address(hookOrigin));
-
-        // Generate the metadata.
-        bytes memory hookMetadata = metadataHelper.createMetadata(ids, data);
-        (uint256 cashOutTaxRate,,,, JBCashOutHookSpecification[] memory returnedHook) = hook.beforeCashOutRecordedWith(
-            JBBeforeCashOutRecordedContext({
-                terminal: address(0),
-                holder: beneficiary,
-                projectId: projectId,
-                rulesetId: 0,
-                cashOutCount: 0,
-                totalSupply: 0,
-                surplus: JBTokenAmount({
-                    token: address(0), value: SURPLUS, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                useTotalSurplus: true,
-                cashOutTaxRate: CASH_OUT_TAX_RATE,
-                beneficiaryIsFeeless: false,
-                metadata: hookMetadata
-            })
-        );
-
-        // Check: does the reclaim amount match the expected value?
-        assertEq(cashOutTaxRate, CASH_OUT_TAX_RATE);
-        // Check: does the returned hook address match the expected value?
-        assertEq(address(returnedHook[0].hook), address(hook));
-    }
-
-    function test_beforeCashOutContext_returnsZeroAmountIfReserveFrequencyIsZero() public {
-        uint256 surplus = 10e18;
-        uint256 cashOutTaxRate = 0;
-        uint256 weight;
-        uint256 totalWeight;
-        JBCashOutHookSpecification[] memory returnedHook;
-
-        ForTest_JB721TiersHook hook = _initializeForTestHook(10);
-
-        // Set up 10 tiers, with half of the supply minted for each one.
-        for (uint256 i = 1; i <= 10; i++) {
-            hook.test_store()
-                .ForTest_setTier(
-                    address(hook),
-                    i,
-                    JBStored721Tier({
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        price: uint104(i * 10),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        remainingSupply: uint32(10 * i - 5 * i),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        initialSupply: uint32(10 * i),
-                        reserveFrequency: uint16(0),
-                        category: uint24(100),
-                        discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
-                        splitPercent: 0
-                    })
-                );
-            totalWeight += (10 * i - 5 * i) * i * 10;
-        }
-
-        // Cash out as if the beneficiary has 1 NFT from each of the first five tiers.
-        uint256[] memory tokenList = new uint256[](5);
-        for (uint256 i; i < 5; i++) {
-            hook.ForTest_setOwnerOf(i + 1, beneficiary);
-            tokenList[i] = i + 1;
-            weight += (i + 1) * (i + 1) * 10;
-        }
-
-        (cashOutTaxRate,,,, returnedHook) = hook.beforeCashOutRecordedWith(
-            JBBeforeCashOutRecordedContext({
-                terminal: address(0),
-                holder: beneficiary,
-                projectId: projectId,
-                rulesetId: 0,
-                cashOutCount: 0,
-                totalSupply: 0,
-                surplus: JBTokenAmount({
-                    token: address(0), value: surplus, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                useTotalSurplus: true,
-                cashOutTaxRate: cashOutTaxRate,
-                beneficiaryIsFeeless: false,
-                metadata: abi.encode(bytes32(0), type(IJB721TiersHook).interfaceId, tokenList)
-            })
-        );
-
-        // Check: is the cash out tax rate zero?
-        assertEq(cashOutTaxRate, 0);
-        // Check: does the returned hook address match the expected value?
-        assertEq(address(returnedHook[0].hook), address(hook));
-    }
-
-    function test_beforeCashOutContext_returnsPartOfOverflowOwnedIfCashOutTaxRateIsMaximum() public {
-        uint256 weight;
-        uint256 totalWeight;
-
-        ForTest_JB721TiersHook hook = _initializeForTestHook(10);
-
-        // Set up 10 tiers, with half of the supply minted for each one.
-        for (uint256 i = 1; i <= 10; i++) {
-            hook.test_store()
-                .ForTest_setTier(
-                    address(hook),
-                    i,
-                    JBStored721Tier({
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        price: uint104(i * 10),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        remainingSupply: uint32(10 * i - 5 * i),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        initialSupply: uint32(10 * i),
-                        reserveFrequency: uint16(0),
-                        category: uint24(100),
-                        discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
-                        splitPercent: 0
-                    })
-                );
-            totalWeight += (10 * i - 5 * i) * i * 10;
-        }
-
-        // Cash out as if the beneficiary has 1 NFT from each of the first five tiers.
-        uint256[] memory tokenList = new uint256[](5);
-        for (uint256 i; i < 5; i++) {
-            hook.ForTest_setOwnerOf(_generateTokenId(i + 1, 1), beneficiary);
-            tokenList[i] = _generateTokenId(i + 1, 1);
-            weight += (i + 1) * 10;
-        }
-
-        // Build the metadata with the tiers to cash out.
-        bytes[] memory data = new bytes[](1);
-        data[0] = abi.encode(tokenList);
-
-        // Pass the hook ID.
-        bytes4[] memory ids = new bytes4[](1);
-        ids[0] = metadataHelper.getId("cashOut", address(hookOrigin));
-
-        // Generate the metadata.
-        bytes memory hookMetadata = metadataHelper.createMetadata(ids, data);
-
-        JBBeforeCashOutRecordedContext memory beforeCashOutContext = JBBeforeCashOutRecordedContext({
-            terminal: address(0),
-            holder: beneficiary,
-            projectId: projectId,
-            rulesetId: 0,
-            cashOutCount: 0,
-            totalSupply: 0,
-            surplus: JBTokenAmount({
-                token: address(0), value: SURPLUS, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            useTotalSurplus: true,
-            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
-            beneficiaryIsFeeless: false,
-            metadata: hookMetadata
-        });
-
-        (uint256 cashOutTaxRate,,,, JBCashOutHookSpecification[] memory returnedHook) =
-            hook.beforeCashOutRecordedWith(beforeCashOutContext);
-
-        // Check: does the cash out tax rate match the expected value?
-        assertEq(cashOutTaxRate, JBConstants.MAX_CASH_OUT_TAX_RATE);
-        // Check: does the returned hook address match the expected value?
-        assertEq(address(returnedHook[0].hook), address(hook));
-    }
-
-    function test_beforeCashOutContext_revertIfNonZeroTokenCount(uint256 tokenCount) public {
-        vm.assume(tokenCount > 0);
-
-        // Expect a revert on account of the token count being non-zero while the total supply is zero.
-        vm.expectRevert(abi.encodeWithSelector(JB721Hook.JB721Hook_UnexpectedTokenCashedOut.selector));
-
-        hook.beforeCashOutRecordedWith(
-            JBBeforeCashOutRecordedContext({
-                terminal: address(0),
-                holder: beneficiary,
-                projectId: projectId,
-                rulesetId: 0,
-                cashOutCount: tokenCount,
-                totalSupply: 0,
-                surplus: JBTokenAmount({
-                    token: address(0), value: 100, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                useTotalSurplus: true,
-                cashOutTaxRate: 100,
-                beneficiaryIsFeeless: false,
-                metadata: new bytes(0)
-            })
-        );
-    }
-
-    function test_afterCashOutRecordedWith_burnCashOutNft(uint256 numberOfNfts) public {
-        ForTest_JB721TiersHook hook = _initializeForTestHook(5);
-
-        // Has to all fit in tier 1 (excluding reserve mints).
-        numberOfNfts = bound(numberOfNfts, 1, 90);
-
-        // Mock the directory call.
-        mockAndExpect(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        uint256[] memory tokenList = new uint256[](numberOfNfts);
-
-        bytes memory hookMetadata;
-        bytes[] memory data;
-        bytes4[] memory ids;
-
-        for (uint256 i; i < numberOfNfts; i++) {
-            uint16[] memory tierIdsToMint = new uint16[](1);
-            tierIdsToMint[0] = 1;
-
-            // Build the metadata using the tiers to mint and the overspending flag.
-            data = new bytes[](1);
-            data[0] = abi.encode(false, tierIdsToMint);
-
-            // Pass the hook ID.
-            ids = new bytes4[](1);
-            ids[0] = metadataHelper.getId("pay", address(hook));
-
-            // Generate the metadata.
-            hookMetadata = metadataHelper.createMetadata(ids, data);
-
-            // Mint the NFTs. Otherwise, the voting balance is not incremented,
-            // which leads to an underflow upon cash out.
-            vm.prank(mockTerminalAddress);
-            JBAfterPayRecordedContext memory afterPayContext = JBAfterPayRecordedContext({
-                payer: beneficiary,
-                projectId: projectId,
-                rulesetId: 0,
-                amount: JBTokenAmount({
-                    token: JBConstants.NATIVE_TOKEN,
-                    value: 10,
-                    decimals: 18,
-                    currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                forwardedAmount: JBTokenAmount({
-                    token: JBConstants.NATIVE_TOKEN,
-                    value: 0,
-                    decimals: 18,
-                    currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }), // 0
-                // Forward to the hook.
-                weight: 10 ** 18,
-                newlyIssuedTokenCount: 0,
-                beneficiary: beneficiary,
-                hookMetadata: new bytes(0),
-                payerMetadata: hookMetadata
-            });
-
-            hook.afterPayRecordedWith(afterPayContext);
-
-            tokenList[i] = _generateTokenId(1, i + 1);
-
-            // Check: was a new NFT minted?
-            assertEq(hook.balanceOf(beneficiary), i + 1);
-        }
-
-        // Build the metadata with the tiers to cash out.
-        data = new bytes[](1);
-        data[0] = abi.encode(tokenList);
-
-        // Pass the hook ID.
-        ids = new bytes4[](1);
-        ids[0] = metadataHelper.getId("cashOut", address(hook));
-
-        // Generate the metadata.
-        hookMetadata = metadataHelper.createMetadata(ids, data);
-
-        vm.prank(mockTerminalAddress);
-        hook.afterCashOutRecordedWith(
-            JBAfterCashOutRecordedContext({
-                holder: beneficiary,
-                projectId: projectId,
-                rulesetId: 1,
-                cashOutCount: 0,
-                reclaimedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                forwardedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }), // 0, forwarded to the hook.
-                cashOutTaxRate: 5000,
-                beneficiary: payable(beneficiary),
-                hookMetadata: bytes(""),
-                cashOutMetadata: hookMetadata
-            })
-        );
-
-        // Check: is the beneficiary's balance zero again?
-        assertEq(hook.balanceOf(beneficiary), 0);
-
-        // Check: was the number of burned NFTs recorded correctly (to match `numberOfNfts` in the first tier)?
-        assertEq(hook.test_store().numberOfBurnedFor(address(hook), 1), numberOfNfts);
-    }
-
-    function test_afterCashOutRecordedWith_revertIfNotCorrectProjectId(uint8 wrongProjectId) public {
-        vm.assume(wrongProjectId != projectId);
-
-        uint256[] memory tokenList = new uint256[](1);
-        tokenList[0] = 1;
-
-        // Mock the directory call.
-        mockAndExpect(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        // Expect to revert on account of the project ID being incorrect.
-        vm.expectRevert(abi.encodeWithSelector(JB721Hook.JB721Hook_InvalidCashOut.selector));
-
-        vm.prank(mockTerminalAddress);
-        hook.afterCashOutRecordedWith(
-            JBAfterCashOutRecordedContext({
-                holder: beneficiary,
-                projectId: wrongProjectId,
-                rulesetId: 1,
-                cashOutCount: 0,
-                reclaimedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                forwardedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }), // 0, forwarded to the hook.
-                cashOutTaxRate: 5000,
-                beneficiary: payable(beneficiary),
-                hookMetadata: bytes(""),
-                cashOutMetadata: abi.encode(type(IJB721TiersHook).interfaceId, tokenList)
-            })
-        );
-    }
-
-    function test_afterCashOutRecordedWith_revertIfCallerIsNotATerminalOfTheProject() public {
-        uint256[] memory tokenList = new uint256[](1);
-        tokenList[0] = 1;
-
-        // Mock the directory call.
-        mockAndExpect(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(false)
-        );
-
-        // Expect to revert on account of the caller not being a terminal of the project.
-        vm.expectRevert(abi.encodeWithSelector(JB721Hook.JB721Hook_InvalidCashOut.selector));
-
-        vm.prank(mockTerminalAddress);
-        hook.afterCashOutRecordedWith(
-            JBAfterCashOutRecordedContext({
-                holder: beneficiary,
-                projectId: projectId,
-                rulesetId: 1,
-                cashOutCount: 0,
-                reclaimedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                forwardedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }), // 0, forwarded to the hook.
-                cashOutTaxRate: 5000,
-                beneficiary: payable(beneficiary),
-                hookMetadata: bytes(""),
-                cashOutMetadata: abi.encode(type(IJB721TiersHook).interfaceId, tokenList)
-            })
-        );
-    }
-
-    function test_afterCashOutRecordedWith_revertIfWrongHolder(address wrongHolder, uint8 tokenId) public {
-        vm.assume(beneficiary != wrongHolder);
-        vm.assume(tokenId != 0);
-
-        ForTest_JB721TiersHook hook = _initializeForTestHook(1);
-
-        hook.ForTest_setOwnerOf(tokenId, beneficiary);
-
-        uint256[] memory tokenList = new uint256[](1);
-        tokenList[0] = tokenId;
-
-        // Build the metadata with the tiers to cash out.
-        bytes[] memory data = new bytes[](1);
-        data[0] = abi.encode(tokenList);
-
-        // Pass the hook ID.
-        bytes4[] memory ids = new bytes4[](1);
-        ids[0] = metadataHelper.getId("cashOut", address(hook));
-
-        // Generate the metadata.
-        bytes memory hookMetadata = metadataHelper.createMetadata(ids, data);
-
-        // Mock the directory call.
-        mockAndExpect(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        vm.expectRevert(abi.encodeWithSelector(JB721Hook.JB721Hook_UnauthorizedToken.selector, tokenId, wrongHolder));
-
-        vm.prank(mockTerminalAddress);
-        hook.afterCashOutRecordedWith(
-            JBAfterCashOutRecordedContext({
-                holder: wrongHolder,
-                projectId: projectId,
-                rulesetId: 1,
-                cashOutCount: 0,
-                reclaimedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                forwardedAmount: JBTokenAmount({
-                    token: address(0), value: 0, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }), // 0, forwarded to the hook.
-                cashOutTaxRate: 5000,
-                beneficiary: payable(wrongHolder),
-                hookMetadata: bytes(""),
-                cashOutMetadata: hookMetadata
-            })
-        );
-    }
-}

package/test/unit/relayBeneficiary_Unit.t.sol

@@ -1,182 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../utils/UnitTestSetup.sol";
-
-/// @notice Tests that the 721 hook resolves the relay beneficiary from payment metadata.
-contract Test_relayBeneficiary_Unit is UnitTestSetup {
-    /// @notice The metadata ID the 721 hook uses to look up the relay beneficiary.
-    /// Must match `_721_BENEFICIARY_METADATA_ID` in JB721TiersHook.
-    /// @notice Must match `BENEFICIARY_METADATA_ID` in JB721TiersHook.
-    bytes4 constant BENEFICIARY_METADATA_ID = bytes4(keccak256("JB_721_BENEFICIARY"));
-
-    address relayUser = makeAddr("relayUser");
-    address sucker = makeAddr("sucker");
-
-    function setUp() public override {
-        super.setUp();
-
-        // Mock directory: terminal is valid for all calls.
-        vm.mockCall(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-    }
-
-    /// @notice When metadata contains a relay beneficiary, the spec should use that address (not context.beneficiary).
-    function test_beforePay_relayBeneficiary_usedInSpec() public {
-        JB721TiersHook tiersHook = _initHookDefaultTiers(3);
-
-        // Build metadata with tier selection + relay beneficiary.
-        uint16[] memory tierIdsToMint = new uint16[](1);
-        tierIdsToMint[0] = 1;
-
-        // Encode tier selection metadata (for the hook's own metadata ID).
-        bytes memory tierData = abi.encode(false, tierIdsToMint, new bytes[](0));
-
-        // Build metadata with two entries: hook tier data + relay beneficiary.
-        bytes4[] memory ids = new bytes4[](2);
-        bytes[] memory datas = new bytes[](2);
-
-        ids[0] = JBMetadataResolver.getId({purpose: "pay", target: address(tiersHook)});
-        datas[0] = tierData;
-        ids[1] = BENEFICIARY_METADATA_ID;
-        datas[1] = abi.encode(relayUser);
-
-        bytes memory metadata = metadataHelper.createMetadata(ids, datas);
-
-        // Build pay context with sucker as beneficiary (simulating cross-chain payment).
-        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
-            terminal: mockTerminalAddress,
-            payer: sucker,
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 10,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            projectId: projectId,
-            rulesetId: block.timestamp,
-            beneficiary: sucker,
-            weight: 10e18,
-            reservedPercent: 5000,
-            metadata: metadata
-        });
-
-        (, JBPayHookSpecification[] memory specs) = tiersHook.beforePayRecordedWith(context);
-
-        // The spec's metadata should encode relayUser as the beneficiary, not sucker.
-        assertEq(specs.length, 1, "should return one spec");
-        (address specBeneficiary,,) = abi.decode(specs[0].metadata, (address, address, bytes));
-        assertEq(specBeneficiary, relayUser, "spec should use relay beneficiary, not context.beneficiary");
-    }
-
-    /// @notice When no relay metadata is present, the spec should use context.beneficiary as-is.
-    function test_beforePay_noRelayMetadata_usesContextBeneficiary() public {
-        JB721TiersHook tiersHook = _initHookDefaultTiers(3);
-
-        // Build metadata with only tier selection (no relay beneficiary).
-        uint16[] memory tierIdsToMint = new uint16[](1);
-        tierIdsToMint[0] = 1;
-        bytes memory tierData = abi.encode(false, tierIdsToMint, new bytes[](0));
-
-        bytes4[] memory ids = new bytes4[](1);
-        bytes[] memory datas = new bytes[](1);
-        ids[0] = JBMetadataResolver.getId({purpose: "pay", target: address(tiersHook)});
-        datas[0] = tierData;
-
-        bytes memory metadata = metadataHelper.createMetadata(ids, datas);
-
-        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
-            terminal: mockTerminalAddress,
-            payer: makeAddr("payer"),
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 10,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            projectId: projectId,
-            rulesetId: block.timestamp,
-            beneficiary: beneficiary,
-            weight: 10e18,
-            reservedPercent: 5000,
-            metadata: metadata
-        });
-
-        (, JBPayHookSpecification[] memory specs) = tiersHook.beforePayRecordedWith(context);
-
-        assertEq(specs.length, 1, "should return one spec");
-        (address specBeneficiary,,) = abi.decode(specs[0].metadata, (address, address, bytes));
-        assertEq(specBeneficiary, beneficiary, "spec should use context.beneficiary when no relay metadata");
-    }
-
-    /// @notice When relay metadata is present but the address is zero, fall back to context.beneficiary.
-    function test_beforePay_relayBeneficiaryZero_fallsBackToContext() public {
-        JB721TiersHook tiersHook = _initHookDefaultTiers(3);
-
-        uint16[] memory tierIdsToMint = new uint16[](1);
-        tierIdsToMint[0] = 1;
-        bytes memory tierData = abi.encode(false, tierIdsToMint, new bytes[](0));
-
-        bytes4[] memory ids = new bytes4[](2);
-        bytes[] memory datas = new bytes[](2);
-        ids[0] = JBMetadataResolver.getId({purpose: "pay", target: address(tiersHook)});
-        datas[0] = tierData;
-        ids[1] = BENEFICIARY_METADATA_ID;
-        datas[1] = abi.encode(address(0));
-
-        bytes memory metadata = metadataHelper.createMetadata(ids, datas);
-
-        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
-            terminal: mockTerminalAddress,
-            payer: sucker,
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 10,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            projectId: projectId,
-            rulesetId: block.timestamp,
-            beneficiary: beneficiary,
-            weight: 10e18,
-            reservedPercent: 5000,
-            metadata: metadata
-        });
-
-        (, JBPayHookSpecification[] memory specs) = tiersHook.beforePayRecordedWith(context);
-
-        (address specBeneficiary,,) = abi.decode(specs[0].metadata, (address, address, bytes));
-        assertEq(specBeneficiary, beneficiary, "zero relay address should fall back to context.beneficiary");
-    }
-
-    /// @notice When metadata is empty, use context.beneficiary.
-    function test_beforePay_emptyMetadata_usesContextBeneficiary() public {
-        JB721TiersHook tiersHook = _initHookDefaultTiers(3);
-
-        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
-            terminal: mockTerminalAddress,
-            payer: makeAddr("payer"),
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 10,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            projectId: projectId,
-            rulesetId: block.timestamp,
-            beneficiary: beneficiary,
-            weight: 10e18,
-            reservedPercent: 5000,
-            metadata: ""
-        });
-
-        (, JBPayHookSpecification[] memory specs) = tiersHook.beforePayRecordedWith(context);
-
-        (address specBeneficiary,,) = abi.decode(specs[0].metadata, (address, address, bytes));
-        assertEq(specBeneficiary, beneficiary, "empty metadata should use context.beneficiary");
-    }
-}