@bananapus/721-hook-v6 0.0.41 → 0.0.43

package/test/TestVotingUnitsLifecycle.t.sol

@@ -1,313 +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 {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-
-/// @title TestVotingUnitsLifecycle
-/// @notice Tests that voting units are correctly tracked through the full NFT lifecycle:
-/// mint, transfer, and burn. Verifies that the store's votingUnitsOf aggregation stays
-/// consistent as token ownership changes across tiers.
-contract TestVotingUnitsLifecycle is UnitTestSetup {
-    using stdStorage for StdStorage;
-
-    // ---------------------------------------------------------------
-    // Test 1: Mint -> Transfer -> Burn lifecycle for voting units
-    // ---------------------------------------------------------------
-    /// @notice Verifies that custom voting units (useVotingUnits=true) are correctly tracked
-    /// through the full lifecycle: mint to user A, transfer to user B, burn by user B.
-    function test_votingUnits_mintTransferBurn_lifecycle() public {
-        // Configure a tier with custom voting units.
-        defaultTierConfig.flags.allowOwnerMint = true;
-        defaultTierConfig.reserveFrequency = 0;
-        defaultTierConfig.flags.useVotingUnits = true;
-        defaultTierConfig.votingUnits = 100;
-
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(1);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        address userA = makeAddr("userA");
-        address userB = makeAddr("userB");
-
-        // --- Mint: NFT goes to userA ---
-        uint16[] memory tiersToMint = new uint16[](1);
-        tiersToMint[0] = 1;
-        vm.prank(owner);
-        testHook.mintFor(tiersToMint, userA);
-
-        uint256 tokenId = _generateTokenId(1, 1);
-
-        // Verify userA has 100 voting units.
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), userA), 100, "UserA should have 100 voting units after mint"
-        );
-        assertEq(hookStore.votingUnitsOf(address(testHook), userB), 0, "UserB should have 0 voting units after mint");
-
-        // --- Transfer: NFT from userA to userB ---
-        vm.prank(userA);
-        IERC721(address(testHook)).transferFrom(userA, userB, tokenId);
-
-        // Verify voting units moved from userA to userB.
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), userA), 0, "UserA should have 0 voting units after transfer"
-        );
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), userB), 100, "UserB should have 100 voting units after transfer"
-        );
-
-        // --- Burn: userB burns the NFT ---
-        uint256[] memory tokensToBurn = new uint256[](1);
-        tokensToBurn[0] = tokenId;
-        vm.prank(address(0)); // burn uses _burn internally via ForTest
-        testHook.burn(tokensToBurn);
-
-        // Verify both users have 0 voting units after burn.
-        assertEq(hookStore.votingUnitsOf(address(testHook), userA), 0, "UserA should have 0 voting units after burn");
-        assertEq(hookStore.votingUnitsOf(address(testHook), userB), 0, "UserB should have 0 voting units after burn");
-    }
-
-    // ---------------------------------------------------------------
-    // Test 2: Multi-tier voting units aggregation
-    // ---------------------------------------------------------------
-    /// @notice Verifies that voting units from multiple tiers aggregate correctly
-    /// and update properly when NFTs are transferred between users.
-    function test_votingUnits_multiTier_aggregation() public {
-        // Configure tiers with different custom voting units.
-        defaultTierConfig.flags.allowOwnerMint = true;
-        defaultTierConfig.reserveFrequency = 0;
-        defaultTierConfig.flags.useVotingUnits = true;
-
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(3);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        // Set custom voting units for each tier.
-        // Tier 1 = 100, Tier 2 = 200, Tier 3 = 500.
-        testHook.test_store().ForTest_setTierVotingUnits(address(testHook), 1, 100);
-        testHook.test_store().ForTest_setTierVotingUnits(address(testHook), 2, 200);
-        testHook.test_store().ForTest_setTierVotingUnits(address(testHook), 3, 500);
-
-        address user = makeAddr("user");
-        address recipient = makeAddr("recipient");
-
-        // --- Mint one NFT from each tier to the same user ---
-        uint16[] memory tier1 = new uint16[](1);
-        tier1[0] = 1;
-        uint16[] memory tier2 = new uint16[](1);
-        tier2[0] = 2;
-        uint16[] memory tier3 = new uint16[](1);
-        tier3[0] = 3;
-
-        vm.startPrank(owner);
-        testHook.mintFor(tier1, user);
-        testHook.mintFor(tier2, user);
-        testHook.mintFor(tier3, user);
-        vm.stopPrank();
-
-        // Verify total voting units = 100 + 200 + 500 = 800.
-        assertEq(hookStore.votingUnitsOf(address(testHook), user), 800, "User should have 800 voting units total");
-
-        // --- Transfer tier 3 NFT (500 units) to recipient ---
-        uint256 tier3TokenId = _generateTokenId(3, 1);
-        vm.prank(user);
-        IERC721(address(testHook)).transferFrom(user, recipient, tier3TokenId);
-
-        // Verify user now has 300, recipient has 500.
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), user),
-            300,
-            "User should have 300 voting units after transferring tier 3"
-        );
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), recipient),
-            500,
-            "Recipient should have 500 voting units from tier 3"
-        );
-
-        // --- Transfer tier 1 NFT (100 units) to recipient ---
-        uint256 tier1TokenId = _generateTokenId(1, 1);
-        vm.prank(user);
-        IERC721(address(testHook)).transferFrom(user, recipient, tier1TokenId);
-
-        // Verify user now has 200, recipient has 600.
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), user),
-            200,
-            "User should have 200 voting units after transferring tier 1"
-        );
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), recipient),
-            600,
-            "Recipient should have 600 voting units from tiers 1 and 3"
-        );
-    }
-
-    // ---------------------------------------------------------------
-    // Test 3: Price-based voting units (useVotingUnits=false)
-    // ---------------------------------------------------------------
-    /// @notice Verifies that when useVotingUnits is false, the tier price is used as voting power.
-    function test_votingUnits_priceBasedVoting_lifecycle() public {
-        // Configure tiers WITHOUT custom voting units (price-based voting).
-        defaultTierConfig.flags.allowOwnerMint = true;
-        defaultTierConfig.reserveFrequency = 0;
-        defaultTierConfig.flags.useVotingUnits = false;
-        defaultTierConfig.votingUnits = 0;
-
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(3);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        address user = makeAddr("user");
-        address recipient = makeAddr("recipient");
-
-        // Default tiers have prices: tier 1 = 10, tier 2 = 20, tier 3 = 30 (from _createTiers).
-        uint16[] memory tier1 = new uint16[](1);
-        tier1[0] = 1;
-        uint16[] memory tier2 = new uint16[](1);
-        tier2[0] = 2;
-        uint16[] memory tier3 = new uint16[](1);
-        tier3[0] = 3;
-
-        vm.startPrank(owner);
-        testHook.mintFor(tier1, user);
-        testHook.mintFor(tier2, user);
-        testHook.mintFor(tier3, user);
-        vm.stopPrank();
-
-        // Verify total voting units = 10 + 20 + 30 = 60 (prices).
-        assertEq(hookStore.votingUnitsOf(address(testHook), user), 60, "User should have 60 price-based voting units");
-
-        // Transfer tier 2 (price 20).
-        uint256 tier2TokenId = _generateTokenId(2, 1);
-        vm.prank(user);
-        IERC721(address(testHook)).transferFrom(user, recipient, tier2TokenId);
-
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), user),
-            40,
-            "User should have 40 voting units after transferring tier 2"
-        );
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), recipient),
-            20,
-            "Recipient should have 20 voting units from tier 2"
-        );
-    }
-
-    // ---------------------------------------------------------------
-    // Test 4: Multiple NFTs from the same tier
-    // ---------------------------------------------------------------
-    /// @notice Verifies that voting units scale correctly when a user owns multiple NFTs from one tier.
-    function test_votingUnits_multipleMintsSameTier() public {
-        // Configure tier with custom voting units.
-        defaultTierConfig.flags.allowOwnerMint = true;
-        defaultTierConfig.reserveFrequency = 0;
-        defaultTierConfig.flags.useVotingUnits = true;
-        defaultTierConfig.votingUnits = 50;
-
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(1);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        address user = makeAddr("user");
-
-        // Mint 3 NFTs from tier 1 to the same user.
-        uint16[] memory tiersToMint = new uint16[](3);
-        tiersToMint[0] = 1;
-        tiersToMint[1] = 1;
-        tiersToMint[2] = 1;
-
-        vm.prank(owner);
-        testHook.mintFor(tiersToMint, user);
-
-        // Verify total voting units = 50 * 3 = 150.
-        assertEq(hookStore.votingUnitsOf(address(testHook), user), 150, "User should have 150 voting units (3 x 50)");
-
-        // Transfer one NFT away.
-        address recipient = makeAddr("recipient");
-        uint256 tokenId1 = _generateTokenId(1, 1);
-        vm.prank(user);
-        IERC721(address(testHook)).transferFrom(user, recipient, tokenId1);
-
-        // Verify voting units: user = 100, recipient = 50.
-        assertEq(
-            hookStore.votingUnitsOf(address(testHook), user),
-            100,
-            "User should have 100 voting units after transferring 1"
-        );
-        assertEq(hookStore.votingUnitsOf(address(testHook), recipient), 50, "Recipient should have 50 voting units");
-    }
-
-    // ---------------------------------------------------------------
-    // Test 5: Voting units are zero for addresses with no NFTs
-    // ---------------------------------------------------------------
-    /// @notice Verifies that addresses with no NFTs always return 0 voting units.
-    function test_votingUnits_zeroForNonHolders() public {
-        defaultTierConfig.flags.useVotingUnits = true;
-        defaultTierConfig.votingUnits = 100;
-
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(5);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        address nonHolder = makeAddr("nonHolder");
-
-        // Verify zero voting units for an address that never held any NFTs.
-        assertEq(hookStore.votingUnitsOf(address(testHook), nonHolder), 0, "Non-holder should have 0 voting units");
-    }
-
-    // ---------------------------------------------------------------
-    // Test 6: Voting units with mixed tier configs
-    // ---------------------------------------------------------------
-    /// @notice Verifies that voting units work correctly when some tiers use custom voting units
-    /// and others use price-based voting. The tier with useVotingUnits=false should use price.
-    function test_votingUnits_mixedTierConfigs() public {
-        defaultTierConfig.flags.allowOwnerMint = true;
-        defaultTierConfig.reserveFrequency = 0;
-        defaultTierConfig.flags.useVotingUnits = true;
-        defaultTierConfig.votingUnits = 100;
-
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(3);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-
-        // Override tier 2 to NOT use custom voting units (price-based).
-        // Tier 2 price from _createTiers is 20.
-        testHook.test_store()
-            .ForTest_setTier(
-                address(testHook),
-                2,
-                JBStored721Tier({
-                    price: uint104(20),
-                    remainingSupply: uint32(100),
-                    initialSupply: uint32(100),
-                    reserveFrequency: uint16(0),
-                    category: uint24(100),
-                    discountPercent: uint8(0),
-                    packedBools: testHook.test_store().ForTest_packBools(true, false, false, false, false, false),
-                    splitPercent: 0
-                })
-            );
-        // Clear tier 2's custom voting units (so it falls back to price).
-        testHook.test_store().ForTest_setTierVotingUnits(address(testHook), 2, 0);
-
-        address user = makeAddr("user");
-
-        // Mint one NFT from each tier.
-        uint16[] memory tier1 = new uint16[](1);
-        tier1[0] = 1;
-        uint16[] memory tier2 = new uint16[](1);
-        tier2[0] = 2;
-        uint16[] memory tier3 = new uint16[](1);
-        tier3[0] = 3;
-
-        vm.startPrank(owner);
-        testHook.mintFor(tier1, user);
-        testHook.mintFor(tier2, user);
-        testHook.mintFor(tier3, user);
-        vm.stopPrank();
-
-        // Tier 1: custom voting units = 100
-        // Tier 2: price-based = 20 (useVotingUnits=false, so uses price)
-        // Tier 3: custom voting units = 100
-        // Total: 100 + 20 + 100 = 220
-        assertEq(hookStore.votingUnitsOf(address(testHook), user), 220, "User should have 220 mixed voting units");
-    }
-}

package/test/audit/AuditRegressions.t.sol

@@ -1,83 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// Import the shared unit test setup which deploys a hook clone with 10 tiers.
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../utils/UnitTestSetup.sol";
-
-// Import IERC2981 to compute its interface ID for the supportsInterface test.
-import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol";
-
-/// @notice Regression tests covering three audit findings for nana-721-hook-v6.
-contract AuditRegressions is UnitTestSetup {
-    // -----------------------------------------------------------------------
-    // 1. Double-initialization guard
-    // -----------------------------------------------------------------------
-
-    /// @notice Calling initialize on an already-initialized clone must revert.
-    function test_doubleInitialization_reverts() public {
-        // The `hook` from setUp() is already initialized via the deployer.
-        // Expect a revert with AlreadyInitialized carrying the existing project ID.
-        vm.expectRevert(abi.encodeWithSelector(JB721TiersHook.JB721TiersHook_AlreadyInitialized.selector, projectId));
-
-        // Attempt to initialize the hook again with valid parameters — must revert.
-        hook.initialize(
-            projectId,
-            "AnotherName",
-            "AN",
-            baseUri,
-            IJB721TokenUriResolver(mockTokenUriResolver),
-            contractUri,
-            JB721InitTiersConfig({
-                tiers: new JB721TierConfig[](0), currency: uint32(uint160(JBConstants.NATIVE_TOKEN)), decimals: 18
-            }),
-            JB721TiersHookFlags({
-                preventOverspending: false,
-                issueTokensForSplits: false,
-                noNewTiersWithReserves: false,
-                noNewTiersWithVotes: false,
-                noNewTiersWithOwnerMinting: false
-            })
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // 2. recordSetDiscountPercentOf on a removed tier must revert
-    // -----------------------------------------------------------------------
-
-    /// @notice Setting the discount percent on a tier that has been removed must revert.
-    function test_setDiscountPercent_removedTier_reverts() public {
-        // The hook from setUp() has 10 tiers (IDs 1-10). Remove tier 1.
-        uint256[] memory tierIdsToRemove = new uint256[](1);
-
-        // Select tier 1 to remove.
-        tierIdsToRemove[0] = 1;
-
-        // Remove tier 1 as the hook owner.
-        vm.prank(owner);
-        hook.adjustTiers(new JB721TierConfig[](0), tierIdsToRemove);
-
-        // Expect a revert with TierRemoved when setting discount on the removed tier.
-        vm.expectRevert(abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_TierRemoved.selector, 1));
-
-        // Attempt to set a discount on the removed tier — must revert.
-        vm.prank(owner);
-        hook.setDiscountPercentOf(1, 50);
-    }
-
-    // -----------------------------------------------------------------------
-    // 3. ERC-2981 supportsInterface returns false (support was removed)
-    // -----------------------------------------------------------------------
-
-    /// @notice supportsInterface must return false for IERC2981 since royalty support was removed.
-    function test_supportsInterface_erc2981_returnsFalse() public {
-        // Compute the IERC2981 interface ID from the imported interface.
-        bytes4 erc2981InterfaceId = type(IERC2981).interfaceId;
-
-        // Query supportsInterface on the hook.
-        bool supported = hook.supportsInterface(erc2981InterfaceId);
-
-        // Assert that ERC-2981 is NOT supported.
-        assertFalse(supported, "ERC-2981 must not be supported after royalty removal");
-    }
-}

package/test/audit/CrossCurrencySplitNoPrices.t.sol

@@ -1,123 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../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";
-
-contract CrossCurrencySplitNoPrices is UnitTestSetup {
-    function test_crossCurrencySplit_withoutPrices_locksForwardedNativeFunds() public {
-        JB721TiersHook noPricesOrigin = new JB721TiersHook(
-            IJBDirectory(mockJBDirectory),
-            IJBPermissions(mockJBPermissions),
-            IJBPrices(address(0)),
-            IJBRulesets(mockJBRulesets),
-            store,
-            IJBSplits(mockJBSplits),
-            IJB721CheckpointsDeployer(address(new JB721CheckpointsDeployer())),
-            trustedForwarder
-        );
-
-        address noPricesProxy = makeAddr("noPricesProxy");
-        vm.etch(noPricesProxy, address(noPricesOrigin).code);
-        JB721TiersHook crossHook = JB721TiersHook(noPricesProxy);
-
-        (JB721TierConfig[] memory tierConfigs,) = _createTiers(defaultTierConfig, 1);
-        tierConfigs[0].price = 1 ether;
-        tierConfigs[0].splitPercent = 500_000_000; // 50%
-
-        crossHook.initialize(
-            projectId,
-            name,
-            symbol,
-            baseUri,
-            IJB721TokenUriResolver(mockTokenUriResolver),
-            contractUri,
-            JB721InitTiersConfig({tiers: tierConfigs, currency: uint32(USD()), decimals: 18}),
-            JB721TiersHookFlags({
-                preventOverspending: false,
-                issueTokensForSplits: false,
-                noNewTiersWithReserves: false,
-                noNewTiersWithVotes: false,
-                noNewTiersWithOwnerMinting: false
-            })
-        );
-
-        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", crossHook.METADATA_ID_TARGET());
-        bytes memory payerMetadata = metadataHelper.createMetadata(ids, data);
-
-        (uint256 weight, JBPayHookSpecification[] memory hookSpecifications) = crossHook.beforePayRecordedWith(
-            JBBeforePayRecordedContext({
-                terminal: mockTerminalAddress,
-                payer: beneficiary,
-                amount: JBTokenAmount({
-                    token: JBConstants.NATIVE_TOKEN,
-                    value: 1 ether,
-                    decimals: 18,
-                    currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                }),
-                projectId: projectId,
-                rulesetId: 0,
-                beneficiary: beneficiary,
-                weight: 10e18,
-                reservedPercent: 0,
-                metadata: payerMetadata
-            })
-        );
-
-        // When PRICES is address(0) and currencies differ, convertAndCapSplitAmounts returns 0
-        // to avoid forwarding an unconverted amount in the wrong currency denomination.
-        // This means weight is NOT reduced (full weight) and no funds are forwarded.
-        assertEq(weight, 10e18, "weight unchanged when split conversion fails due to missing prices");
-        assertEq(hookSpecifications.length, 1, "one pay hook spec");
-        assertEq(hookSpecifications[0].amount, 0, "split amount is zero when prices unavailable for conversion");
-
-        mockAndExpect(
-            address(mockJBDirectory),
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        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: hookSpecifications[0].amount,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            weight: weight,
-            newlyIssuedTokenCount: 0,
-            beneficiary: beneficiary,
-            hookMetadata: hookSpecifications[0].metadata,
-            payerMetadata: payerMetadata
-        });
-
-        vm.deal(mockTerminalAddress, 1 ether);
-        vm.prank(mockTerminalAddress);
-        crossHook.afterPayRecordedWith{value: hookSpecifications[0].amount}(payContext);
-
-        assertEq(crossHook.balanceOf(beneficiary), 0, "no NFTs minted (currency mismatch, no prices)");
-        assertEq(crossHook.payCreditsOf(beneficiary), 0, "no credits accrued (currency mismatch, no prices)");
-        assertEq(address(crossHook).balance, 0, "no funds forwarded to hook when split conversion returns zero");
-    }
-}