@ballkidz/defifa 0.0.17 → 0.0.19

package/src/interfaces/IDefifaGovernor.sol

@@ -8,6 +8,12 @@ import {DefifaTierCashOutWeight} from "../structs/DefifaTierCashOutWeight.sol";
 
 /// @notice Manages the ratification of Defifa scorecards through attestation-based governance.
 interface IDefifaGovernor {
+    /// @notice Emitted when governance is initialized for a game.
+    /// @param gameId The ID of the game.
+    /// @param attestationStartTime The timestamp when attestation begins.
+    /// @param attestationGracePeriod The grace period after attestation begins.
+    /// @param timelockDuration The timelock duration after quorum is met.
+    /// @param caller The address that initialized the game.
     event GameInitialized(
         uint256 indexed gameId,
         uint256 attestationStartTime,
@@ -16,10 +22,25 @@ interface IDefifaGovernor {
         address caller
     );
 
+    /// @notice Emitted when an account attests to a scorecard.
+    /// @param gameId The ID of the game.
+    /// @param scorecardId The ID of the scorecard being attested to.
+    /// @param weight The attestation weight applied.
+    /// @param caller The address that submitted the attestation.
     event ScorecardAttested(uint256 indexed gameId, uint256 indexed scorecardId, uint256 weight, address caller);
 
+    /// @notice Emitted when a scorecard is ratified.
+    /// @param gameId The ID of the game.
+    /// @param scorecardId The ID of the ratified scorecard.
+    /// @param caller The address that ratified the scorecard.
     event ScorecardRatified(uint256 indexed gameId, uint256 indexed scorecardId, address caller);
 
+    /// @notice Emitted when a scorecard is submitted for attestation.
+    /// @param gameId The ID of the game.
+    /// @param scorecardId The ID of the submitted scorecard.
+    /// @param tierWeights The proposed tier cash out weights.
+    /// @param isDefaultAttestationDelegate Whether the submitter is the default attestation delegate.
+    /// @param caller The address that submitted the scorecard.
     event ScorecardSubmitted(
         uint256 indexed gameId,
         uint256 indexed scorecardId,
@@ -28,6 +49,11 @@ interface IDefifaGovernor {
         address caller
     );
 
+    /// @notice Emitted when an attestation is revoked from a scorecard.
+    /// @param gameId The ID of the game.
+    /// @param scorecardId The ID of the scorecard.
+    /// @param account The address whose attestation was revoked.
+    /// @param weight The revoked attestation weight.
     event AttestationRevoked(uint256 indexed gameId, uint256 indexed scorecardId, address account, uint256 weight);
 
     /// @notice The number of attestations for a scorecard.

package/src/interfaces/IDefifaHook.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IJB721Hook} from "@bananapus/721-hook-v6/src/interfaces/IJB721Hook.sol";
 import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookStore.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {IJB721Hook} from "@bananapus/721-hook-v6/src/interfaces/IJB721Hook.sol";
 import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfig.sol";
 import {JB721TiersMintReservesConfig} from "@bananapus/721-hook-v6/src/structs/JB721TiersMintReservesConfig.sol";
 import {IJBRulesets} from "@bananapus/core-v6/src/interfaces/IJBRulesets.sol";
@@ -17,6 +17,12 @@ import {IDefifaGamePotReporter} from "./IDefifaGamePotReporter.sol";
 /// @notice The hook interface for Defifa games, extending the 721 hook with game-specific attestation delegation,
 /// scorecard-based cash out weights, and token claiming.
 interface IDefifaHook is IJB721Hook {
+    /// @notice Emitted when an NFT is minted from a contribution.
+    /// @param tokenId The token ID of the minted NFT.
+    /// @param tierId The tier the NFT was minted from.
+    /// @param beneficiary The address that received the NFT.
+    /// @param totalAmountContributed The total amount contributed in the minting transaction.
+    /// @param caller The address that triggered the mint.
     event Mint(
         uint256 indexed tokenId,
         uint256 indexed tierId,
@@ -25,20 +31,43 @@ interface IDefifaHook is IJB721Hook {
         address caller
     );
 
+    /// @notice Emitted when a reserved token is minted.
+    /// @param tokenId The token ID of the minted reserved token.
+    /// @param tierId The tier the reserved token was minted from.
+    /// @param beneficiary The address that received the reserved token.
+    /// @param caller The address that triggered the mint.
     event MintReservedToken(
         uint256 indexed tokenId, uint256 indexed tierId, address indexed beneficiary, address caller
     );
 
+    /// @notice Emitted when a delegate's attestation balance changes for a tier.
+    /// @param delegate The delegate whose attestation balance changed.
+    /// @param tierId The tier whose attestation balance changed.
+    /// @param previousBalance The prior attestation balance.
+    /// @param newBalance The updated attestation balance.
+    /// @param caller The address that triggered the change.
     event TierDelegateAttestationsChanged(
         address indexed delegate, uint256 indexed tierId, uint256 previousBalance, uint256 newBalance, address caller
     );
 
+    /// @notice Emitted when a delegator changes delegates for a tier.
+    /// @param delegator The address changing its delegate.
+    /// @param fromDelegate The previous delegate.
+    /// @param toDelegate The new delegate.
     event DelegateChanged(address indexed delegator, address indexed fromDelegate, address indexed toDelegate);
 
+    /// @notice Emitted when claimable game tokens are claimed.
+    /// @param beneficiary The address receiving the claimed tokens.
+    /// @param defifaTokenAmount The amount of Defifa tokens claimed.
+    /// @param baseProtocolTokenAmount The amount of base protocol tokens claimed.
+    /// @param caller The address that triggered the claim.
     event ClaimedTokens(
         address indexed beneficiary, uint256 defifaTokenAmount, uint256 baseProtocolTokenAmount, address caller
     );
 
+    /// @notice Emitted when tier cash out weights are set.
+    /// @param tierWeights The cash out weights that were set for each tier.
+    /// @param caller The address that set the tier weights.
     event TierCashOutWeightsSet(DefifaTierCashOutWeight[] tierWeights, address caller);
 
     /// @notice The total amount redeemed from this game (refunds not counted).

package/src/libraries/DefifaHookLib.sol

@@ -62,6 +62,7 @@ library DefifaHookLib {
             lastTierId = tierWeights[i].id;
 
             // Get the tier.
+            // slither-disable-next-line calls-loop
             tier = hookStore.tierOf({hook: hook, id: tierWeights[i].id, includeResolvedUri: false});
 
             // Can't set a cashOut weight for tiers not in category 0.
@@ -104,9 +105,11 @@ library DefifaHookLib {
         returns (uint256)
     {
         // Keep a reference to the token's tier ID.
+        // slither-disable-next-line calls-loop
         uint256 tierId = hookStore.tierIdOfToken(tokenId);
 
         // Keep a reference to the tier.
+        // slither-disable-next-line calls-loop
         JB721Tier memory tier = hookStore.tierOf({hook: hook, id: tierId, includeResolvedUri: false});
 
         // Get the tier's weight.
@@ -116,6 +119,7 @@ library DefifaHookLib {
         if (weight == 0) return 0;
 
         // Get the amount of tokens that have already been burned.
+        // slither-disable-next-line calls-loop
         uint256 burnedTokens = hookStore.numberOfBurnedFor({hook: hook, tierId: tierId});
 
         // If no tiers were minted, nothing to redeem.
@@ -129,6 +133,7 @@ library DefifaHookLib {
         // could cash out before reserves are minted and extract value that should be diluted across
         // both paid and reserved holders. By counting pending reserves, each token's share of the
         // tier weight is computed against the full eventual supply.
+        // slither-disable-next-line calls-loop
         uint256 pendingReserves = hookStore.numberOfPendingReservesFor({hook: hook, tierId: tierId});
         totalTokensForCashoutInTier += pendingReserves;
 
@@ -202,6 +207,7 @@ library DefifaHookLib {
         // Calculate the amount paid to mint the tokens that are being burned.
         uint256 cumulativeMintPrice;
         for (uint256 i; i < numberOfTokens; i++) {
+            // slither-disable-next-line calls-loop
             cumulativeMintPrice += hookStore.tierOfTokenId({
                 hook: hook, tokenId: tokenIds[i], includeResolvedUri: false
             })
@@ -229,6 +235,7 @@ library DefifaHookLib {
     {
         uint256 numberOfTokenIds = tokenIds.length;
         for (uint256 i; i < numberOfTokenIds; i++) {
+            // slither-disable-next-line calls-loop
             cumulativeMintPrice += hookStore.tierOfTokenId({
                 hook: hook, tokenId: tokenIds[i], includeResolvedUri: false
             })
@@ -323,6 +330,7 @@ library DefifaHookLib {
                 }
                 if (tierIdsToMint[i] < currentTierId) revert DefifaHook_BadTierOrder();
                 currentTierId = tierIdsToMint[i];
+                // slither-disable-next-line calls-loop
                 attestationUnits =
                 hookStore.tierOf({hook: hook, id: currentTierId, includeResolvedUri: false}).votingUnits;
                 accumulated = attestationUnits;

package/test/DefifaGovernor.t.sol

@@ -433,7 +433,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         // We can't have a neutral outcome, so we only give shares to tiers that are an even number (in our array)
         for (uint256 i = 0; i < scorecards.length; i++) {
             scorecards[i].id = i + 1;
-            scorecards[i].cashOutWeight = i % 2 == 0 ? 1_000_000_000 / (scorecards.length / 2) : 0;
+            scorecards[i].cashOutWeight = i % 2 == 0 ? 1e18 / (scorecards.length / 2) : 0;
         }
         // Forward time so proposals can be created
         uint256 _proposalId = _governor.submitScorecardFor(_gameId, scorecards);
@@ -1019,7 +1019,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         // We can't have a neutral outcome, so we only give shares to tiers that are an even number (in our array)
         for (uint256 i = 0; i < scorecards.length; i++) {
             scorecards[i].id = i + 1;
-            scorecards[i].cashOutWeight = i % 2 == 0 ? 1_000_000_000 / (scorecards.length / 2) : 0;
+            scorecards[i].cashOutWeight = i % 2 == 0 ? 1e18 / (scorecards.length / 2) : 0;
         }
 
         vm.expectRevert(abi.encodeWithSignature("DefifaGovernor_UnownedProposedCashoutValue()"));
@@ -1111,7 +1111,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         // We can't have a neutral outcome, so we only give shares to tiers that are an even number (in our array)
         for (uint256 i = 0; i < scorecards.length; i++) {
             scorecards[i].id = i + 1;
-            scorecards[i].cashOutWeight = i % 2 == 0 ? 1_000_000_000 / (scorecards.length / 2) : 0;
+            scorecards[i].cashOutWeight = i % 2 == 0 ? 1e18 / (scorecards.length / 2) : 0;
         }
         // Forward time so proposals can be created
         uint256 _proposalId = _governor.submitScorecardFor(_gameId, scorecards);
@@ -1132,80 +1132,103 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         // As a sanity check we let it also run for less than 10 to see if it does not error in that case.
         nTiers = uint8(bound(nTiers, 2, 20));
 
+        // With exact-weight validation, only nTiers == 10 produces weights that sum to TOTAL_CASHOUT_WEIGHT.
+        // Delegate to separate helpers to avoid stack-too-deep.
+        if (nTiers == 10) {
+            _testCashOutWeightExact(nTiers);
+        } else {
+            _testCashOutWeightInvalid(nTiers);
+        }
+    }
+
+    /// @dev nTiers == 10: all weights valid, full flow (submit → vote → ratify).
+    function _testCashOutWeightExact(uint8 nTiers) internal {
         address[] memory _users = new address[](nTiers);
         DefifaLaunchProjectData memory defifaData = getBasicDefifaLaunchData(nTiers);
         (uint256 _projectId, DefifaHook _nft, DefifaGovernor _governor) = createDefifaProject(defifaData);
 
         uint256 cashOutWeight = _nft.TOTAL_CASHOUT_WEIGHT() / 10;
 
-        // Phase 1: Mint
         vm.warp(defifaData.start - defifaData.mintPeriodDuration - defifaData.refundPeriodDuration);
-        //deployer.queueNextPhaseOf(_projectId);
         for (uint256 i = 0; i < nTiers; i++) {
-            // Generate a new address for each tier
             _users[i] = address(bytes20(keccak256(abi.encode("user", Strings.toString(i)))));
-            // fund user
             vm.deal(_users[i], 1 ether);
-            // Build metadata to buy specific NFT
             uint16[] memory rawMetadata = new uint16[](1);
             // forge-lint: disable-next-line(unsafe-typecast)
-            rawMetadata[0] = uint16(i + 1); // reward tier, 1 indexed
+            rawMetadata[0] = uint16(i + 1);
             bytes memory metadata = _buildPayMetadata(abi.encode(_users[i], rawMetadata));
-            // Pay to the project and mint an NFT
             vm.prank(_users[i]);
             jbMultiTerminal().pay{value: 1 ether}(
                 _projectId, JBConstants.NATIVE_TOKEN, 1 ether, _users[i], 0, "", metadata
             );
-            // Set the delegate as the user themselves
             DefifaDelegation[] memory tiered721SetDelegatesData = new DefifaDelegation[](1);
             tiered721SetDelegatesData[0] = DefifaDelegation({delegatee: _users[i], tierId: uint256(i + 1)});
             vm.prank(_users[i]);
             _nft.setTierDelegatesTo(tiered721SetDelegatesData);
-            // Forward 1 block, user should receive all the voting power of the tier, as its the only NFT
             assertEq(
                 _governor.MAX_ATTESTATION_POWER_TIER(),
                 // forge-lint: disable-next-line(unsafe-typecast)
                 _governor.getAttestationWeight(_gameId, _users[i], uint48(block.timestamp))
             );
         }
-        // Warp to scoring phase (past start time)
         vm.warp(defifaData.start + 1);
 
-        // Generate the scorecards
         DefifaTierCashOutWeight[] memory scorecards = new DefifaTierCashOutWeight[](nTiers);
-
-        // We can't have a neutral outcome, so we only give shares to tiers that are an even number (in our array)
         for (uint256 i = 0; i < scorecards.length; i++) {
             scorecards[i].id = i + 1;
             scorecards[i].cashOutWeight = cashOutWeight;
         }
 
-        // Forward time so proposals can be created
         uint256 _proposalId = _governor.submitScorecardFor(_gameId, scorecards);
-        // Forward time so voting becomes active
         vm.warp(block.timestamp + _governor.attestationStartTimeOf(_gameId));
-        // No voting delay after the initial voting delay has passed in
-        // assertEq(_governor.attestationStartTimeOf(_gameId), 0);
-        // All the users vote
-        // 0 = Against
-        // 1 = For
-        // 2 = Abstain
         for (uint256 i = 0; i < _users.length; i++) {
             vm.prank(_users[i]);
             _governor.attestToScorecardFrom(_gameId, _proposalId);
         }
-
-        // Forward the amount of blocks needed to reach the end (and round up)
         vm.warp(block.timestamp + _governor.attestationGracePeriodOf(_gameId) + 1);
+        _governor.ratifyScorecardFrom(_gameId, scorecards);
+    }
+
+    /// @dev nTiers != 10: weights don't sum to TOTAL_CASHOUT_WEIGHT, submitScorecardFor reverts.
+    function _testCashOutWeightInvalid(uint8 nTiers) internal {
+        address[] memory _users = new address[](nTiers);
+        DefifaLaunchProjectData memory defifaData = getBasicDefifaLaunchData(nTiers);
+        (uint256 _projectId, DefifaHook _nft, DefifaGovernor _governor) = createDefifaProject(defifaData);
 
-        // With exact-weight validation, only nTiers == 10 produces an exact sum.
-        // Any other count (under or over) triggers INVALID_CASHOUT_WEIGHTS.
-        if (nTiers != 10) {
-            vm.expectRevert(DefifaHook.DefifaHook_InvalidCashoutWeights.selector);
+        uint256 cashOutWeight = _nft.TOTAL_CASHOUT_WEIGHT() / 10;
+
+        vm.warp(defifaData.start - defifaData.mintPeriodDuration - defifaData.refundPeriodDuration);
+        for (uint256 i = 0; i < nTiers; i++) {
+            _users[i] = address(bytes20(keccak256(abi.encode("user", Strings.toString(i)))));
+            vm.deal(_users[i], 1 ether);
+            uint16[] memory rawMetadata = new uint16[](1);
+            // forge-lint: disable-next-line(unsafe-typecast)
+            rawMetadata[0] = uint16(i + 1);
+            bytes memory metadata = _buildPayMetadata(abi.encode(_users[i], rawMetadata));
+            vm.prank(_users[i]);
+            jbMultiTerminal().pay{value: 1 ether}(
+                _projectId, JBConstants.NATIVE_TOKEN, 1 ether, _users[i], 0, "", metadata
+            );
+            DefifaDelegation[] memory tiered721SetDelegatesData = new DefifaDelegation[](1);
+            tiered721SetDelegatesData[0] = DefifaDelegation({delegatee: _users[i], tierId: uint256(i + 1)});
+            vm.prank(_users[i]);
+            _nft.setTierDelegatesTo(tiered721SetDelegatesData);
+            assertEq(
+                _governor.MAX_ATTESTATION_POWER_TIER(),
+                // forge-lint: disable-next-line(unsafe-typecast)
+                _governor.getAttestationWeight(_gameId, _users[i], uint48(block.timestamp))
+            );
         }
+        vm.warp(defifaData.start + 1);
 
-        // Execute the proposal
-        _governor.ratifyScorecardFrom(_gameId, scorecards);
+        DefifaTierCashOutWeight[] memory scorecards = new DefifaTierCashOutWeight[](nTiers);
+        for (uint256 i = 0; i < scorecards.length; i++) {
+            scorecards[i].id = i + 1;
+            scorecards[i].cashOutWeight = cashOutWeight;
+        }
+
+        vm.expectRevert(DefifaHook.DefifaHook_InvalidCashoutWeights.selector);
+        _governor.submitScorecardFor(_gameId, scorecards);
     }
 
     function getBasicDefifaLaunchData(uint8 nTiers) internal returns (DefifaLaunchProjectData memory) {

package/test/DefifaSecurity.t.sol

@@ -253,10 +253,8 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
             sc[i].cashOutWeight = (_nft.TOTAL_CASHOUT_WEIGHT() * 30) / 100; // 120% total
         }
 
-        uint256 pid = _gov.submitScorecardFor(_gameId, sc);
-        _attestAllFor(pid);
         vm.expectRevert(DefifaHook.DefifaHook_InvalidCashoutWeights.selector);
-        _gov.ratifyScorecardFrom(_gameId, sc);
+        _gov.submitScorecardFor(_gameId, sc);
     }
 
     // =========================================================================

package/test/Fork.t.sol

@@ -339,10 +339,8 @@ contract DefifaForkTest is JBTest, TestBaseWorkflow {
             sc[i].cashOutWeight = (_nft.TOTAL_CASHOUT_WEIGHT() * 30) / 100; // 120% total
         }
 
-        uint256 pid = _gov.submitScorecardFor(_gameId, sc);
-        _attestAllFor(pid);
         vm.expectRevert(DefifaHook.DefifaHook_InvalidCashoutWeights.selector);
-        _gov.ratifyScorecardFrom(_gameId, sc);
+        _gov.submitScorecardFor(_gameId, sc);
     }
 
     // =========================================================================
@@ -358,10 +356,8 @@ contract DefifaForkTest is JBTest, TestBaseWorkflow {
             sc[i].cashOutWeight = (_nft.TOTAL_CASHOUT_WEIGHT() * 20) / 100; // 80% total
         }
 
-        uint256 pid = _gov.submitScorecardFor(_gameId, sc);
-        _attestAllFor(pid);
         vm.expectRevert(DefifaHook.DefifaHook_InvalidCashoutWeights.selector);
-        _gov.ratifyScorecardFrom(_gameId, sc);
+        _gov.submitScorecardFor(_gameId, sc);
     }
 
     // =========================================================================
@@ -2010,10 +2006,8 @@ contract DefifaForkTest is JBTest, TestBaseWorkflow {
         sc[2] = DefifaTierCashOutWeight({id: 2, cashOutWeight: _nft.TOTAL_CASHOUT_WEIGHT() / 4});
         sc[3] = DefifaTierCashOutWeight({id: 4, cashOutWeight: _nft.TOTAL_CASHOUT_WEIGHT() / 4});
 
-        uint256 pid = _gov.submitScorecardFor(_gameId, sc);
-        _attestAllFor(pid);
         vm.expectRevert(DefifaHookLib.DefifaHook_BadTierOrder.selector);
-        _gov.ratifyScorecardFrom(_gameId, sc);
+        _gov.submitScorecardFor(_gameId, sc);
     }
 
     // =========================================================================

package/test/audit/CodexRegistryMismatch.t.sol

@@ -0,0 +1,191 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.28;
+
+import {DefifaDeployer} from "../../src/DefifaDeployer.sol";
+import {DefifaGovernor} from "../../src/DefifaGovernor.sol";
+import {DefifaHook} from "../../src/DefifaHook.sol";
+import {DefifaTokenUriResolver} from "../../src/DefifaTokenUriResolver.sol";
+import {DefifaLaunchProjectData} from "../../src/structs/DefifaLaunchProjectData.sol";
+import {DefifaTierParams} from "../../src/structs/DefifaTierParams.sol";
+
+import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
+import {TestBaseWorkflow} from "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
+import {JBFundAccessLimitGroup} from "@bananapus/core-v6/src/structs/JBFundAccessLimitGroup.sol";
+import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
+import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
+import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesets.sol";
+
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
+
+contract CodexRegistryMismatchTest is JBTest, TestBaseWorkflow {
+    JBAddressRegistry internal registry;
+    DefifaDeployer internal deployer;
+
+    function setUp() public virtual override {
+        super.setUp();
+
+        JBAccountingContext[] memory tokens = new JBAccountingContext[](1);
+        tokens[0] = JBAccountingContext({token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: JBCurrencyIds.ETH});
+
+        JBTerminalConfig[] memory terminalConfigs = new JBTerminalConfig[](1);
+        terminalConfigs[0] = JBTerminalConfig({terminal: jbMultiTerminal(), accountingContextsToAccept: tokens});
+
+        JBRulesetConfig[] memory rulesetConfigs = new JBRulesetConfig[](1);
+        rulesetConfigs[0] = JBRulesetConfig({
+            mustStartAtOrAfter: 0,
+            duration: 10 days,
+            weight: 1e18,
+            weightCutPercent: 0,
+            approvalHook: IJBRulesetApprovalHook(address(0)),
+            metadata: JBRulesetMetadata({
+                reservedPercent: 0,
+                cashOutTaxRate: 0,
+                baseCurrency: JBCurrencyIds.ETH,
+                pausePay: false,
+                pauseCreditTransfers: false,
+                allowOwnerMinting: false,
+                allowSetCustomToken: false,
+                allowTerminalMigration: false,
+                allowSetTerminals: false,
+                allowSetController: false,
+                allowAddAccountingContext: false,
+                allowAddPriceFeed: false,
+                ownerMustSendPayouts: false,
+                holdFees: false,
+                useTotalSurplusForCashOuts: false,
+                useDataHookForPay: true,
+                useDataHookForCashOut: true,
+                dataHook: address(0),
+                metadata: 0
+            }),
+            splitGroups: new JBSplitGroup[](0),
+            fundAccessLimitGroups: new JBFundAccessLimitGroup[](0)
+        });
+
+        address projectOwner = address(bytes20(keccak256("projectOwner")));
+        uint256 protocolFeeProjectId =
+            jbController().launchProjectFor(projectOwner, "", rulesetConfigs, terminalConfigs, "");
+        vm.prank(projectOwner);
+        address nanaToken =
+            address(jbController().deployERC20For(protocolFeeProjectId, "Bananapus", "NANA", bytes32(0)));
+
+        uint256 defifaProjectId = jbController().launchProjectFor(projectOwner, "", rulesetConfigs, terminalConfigs, "");
+        vm.prank(projectOwner);
+        address defifaToken = address(jbController().deployERC20For(defifaProjectId, "Defifa", "DEFIFA", bytes32(0)));
+
+        DefifaHook hookCodeOrigin = new DefifaHook(jbDirectory(), IERC20(defifaToken), IERC20(nanaToken));
+        DefifaGovernor governor = new DefifaGovernor(jbController(), address(this));
+        registry = new JBAddressRegistry();
+        deployer = new DefifaDeployer(
+            address(hookCodeOrigin),
+            new DefifaTokenUriResolver(ITypeface(address(0))),
+            governor,
+            jbController(),
+            registry,
+            defifaProjectId,
+            protocolFeeProjectId
+        );
+
+        hookCodeOrigin.transferOwnership(address(deployer));
+        governor.transferOwnership(address(deployer));
+    }
+
+    function test_launchRegistersActualHookAddressInRegistry() external {
+        uint256 projectId = deployer.launchGameWith(_launchData());
+        (, JBRulesetMetadata memory metadata,) = jbController().latestQueuedRulesetOf(projectId);
+        address actualHook = metadata.dataHook;
+
+        address expectedCreateAddress = _createAddress(address(deployer), 1);
+
+        assertNotEq(actualHook, address(0), "queued ruleset should reference the deployed hook");
+        assertNotEq(actualHook, expectedCreateAddress, "cloneDeterministic did not use CREATE");
+        assertEq(registry.deployerOf(actualHook), address(deployer), "actual hook should be registered");
+        assertEq(
+            registry.deployerOf(expectedCreateAddress), address(0), "legacy CREATE address should stay unregistered"
+        );
+    }
+
+    function _launchData() internal returns (DefifaLaunchProjectData memory) {
+        DefifaTierParams[] memory tiers = new DefifaTierParams[](1);
+        tiers[0] = DefifaTierParams({
+            name: "Team 1",
+            reservedRate: 0,
+            reservedTokenBeneficiary: address(0),
+            encodedIPFSUri: bytes32(0),
+            shouldUseReservedTokenBeneficiaryAsDefault: false
+        });
+
+        return DefifaLaunchProjectData({
+            name: "DEFIFA",
+            projectUri: "",
+            contractUri: "",
+            baseUri: "",
+            tiers: tiers,
+            tierPrice: 1 ether,
+            token: JBAccountingContext({token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: JBCurrencyIds.ETH}),
+            mintPeriodDuration: 1 days,
+            refundPeriodDuration: 1 days,
+            start: uint48(block.timestamp + 3 days),
+            splits: new JBSplit[](0),
+            attestationStartTime: 0,
+            attestationGracePeriod: 100_381,
+            defaultAttestationDelegate: address(0),
+            defaultTokenUriResolver: IJB721TokenUriResolver(address(0)),
+            terminal: jbMultiTerminal(),
+            store: new JB721TiersHookStore(),
+            minParticipation: 0,
+            scorecardTimeout: 0,
+            timelockDuration: 0
+        });
+    }
+
+    function _createAddress(address origin, uint256 nonce) internal pure returns (address addr) {
+        bytes memory data;
+        if (nonce == 0x00) {
+            data = abi.encodePacked(bytes1(0xd6), bytes1(0x94), origin, bytes1(0x80));
+        } else if (nonce <= 0x7f) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xd6), bytes1(0x94), origin, uint8(nonce));
+        } else if (nonce <= 0xff) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xd7), bytes1(0x94), origin, bytes1(0x81), uint8(nonce));
+        } else if (nonce <= 0xffff) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xd8), bytes1(0x94), origin, bytes1(0x82), uint16(nonce));
+        } else if (nonce <= 0xffffff) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xd9), bytes1(0x94), origin, bytes1(0x83), uint24(nonce));
+        } else if (nonce <= 0xffffffff) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xda), bytes1(0x94), origin, bytes1(0x84), uint32(nonce));
+        } else if (nonce <= 0xffffffffff) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xdb), bytes1(0x94), origin, bytes1(0x85), uint40(nonce));
+        } else if (nonce <= 0xffffffffffff) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xdc), bytes1(0x94), origin, bytes1(0x86), uint48(nonce));
+        } else if (nonce <= 0xffffffffffffff) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xdd), bytes1(0x94), origin, bytes1(0x87), uint56(nonce));
+        } else {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            data = abi.encodePacked(bytes1(0xde), bytes1(0x94), origin, bytes1(0x88), uint64(nonce));
+        }
+
+        bytes32 hash = keccak256(data);
+        assembly {
+            mstore(0, hash)
+            addr := mload(0)
+        }
+    }
+}

package/test/audit/PendingReserveSnapshotBypass.t.sol

@@ -193,6 +193,45 @@ contract PendingReserveSnapshotBypassTest is JBTest, TestBaseWorkflow {
         );
     }
 
+    /// @notice Pending reserve mints in the delayed-attestation window must not change BWA power.
+    function test_mintingPendingReserveBeforeDelayedAttestationDoesNotChangeBWA() external {
+        DefifaLaunchProjectData memory data = _launchData();
+        data.attestationStartTime = uint48(block.timestamp + 5 days);
+
+        (_pid, _nft, _gov) = _launch(data);
+
+        vm.warp(block.timestamp + 1 days + 1);
+        _mint(_player0, 1);
+        _mint(_player1, 2);
+        _mint(_player2, 3);
+        _mint(_player3, 4);
+        _delegateSelf(_player0, 1);
+        _delegateSelf(_player1, 2);
+        _delegateSelf(_player2, 3);
+        _delegateSelf(_player3, 4);
+
+        vm.warp(block.timestamp + 2 days);
+
+        DefifaTierCashOutWeight[] memory scorecard = _evenScorecard();
+        uint256 scorecardId = _gov.submitScorecardFor(_gameId, scorecard);
+        uint48 futureSnapshotTime = uint48(_gov.attestationStartTimeOf(_gameId) - 1);
+
+        uint256 preRaw = _gov.getAttestationWeight(_gameId, _player0, futureSnapshotTime);
+        uint256 preBwa = _gov.getBWAAttestationWeight(_gameId, scorecardId, _player0, futureSnapshotTime);
+
+        JB721TiersMintReservesConfig[] memory reserveConfigs = new JB721TiersMintReservesConfig[](1);
+        reserveConfigs[0] = JB721TiersMintReservesConfig({tierId: 1, count: 1});
+        _nft.mintReservesFor(reserveConfigs);
+
+        uint256 postRaw = _gov.getAttestationWeight(_gameId, _player0, futureSnapshotTime);
+        uint256 postBwa = _gov.getBWAAttestationWeight(_gameId, scorecardId, _player0, futureSnapshotTime);
+
+        assertEq(preRaw, 500_000_000, "future raw snapshot includes the pending reserve exactly once");
+        assertEq(preBwa, 375_000_000, "future BWA starts from the reserve-adjusted submission denominator");
+        assertEq(postRaw, preRaw, "future raw power stays frozen before attestation begins");
+        assertEq(postBwa, preBwa, "reserve mint in delayed window must not change BWA power");
+    }
+
     function _evenScorecard() internal view returns (DefifaTierCashOutWeight[] memory scorecard) {
         scorecard = new DefifaTierCashOutWeight[](4);
         uint256 totalWeight = _nft.TOTAL_CASHOUT_WEIGHT();
@@ -259,6 +298,7 @@ contract PendingReserveSnapshotBypassTest is JBTest, TestBaseWorkflow {
     function _mint(address user, uint256 tierId) internal {
         vm.deal(user, 1 ether);
         uint16[] memory tiers = new uint16[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         tiers[0] = uint16(tierId);
         bytes[] memory data = new bytes[](1);
         data[0] = abi.encode(user, tiers);

package/test/regression/AttestationDelegateBeneficiary.t.sol

@@ -178,8 +178,8 @@ contract AttestationDelegateBeneficiary is JBTest, TestBaseWorkflow {
         assertEq(delegate, user, "Default delegate should be self when payer == beneficiary");
     }
 
-    /// @notice When an explicit delegate is set, it should be used regardless of payer/beneficiary.
-    function test_explicitDelegateOverridesDefault() public {
+    /// @notice A third-party payer cannot override the beneficiary's delegate.
+    function test_explicitDelegateFromThirdPartyDoesNotOverrideBeneficiaryDefault() public {
         address payer = address(bytes20(keccak256("payer2")));
         address beneficiary = address(bytes20(keccak256("beneficiary2")));
         address explicitDelegate = address(bytes20(keccak256("explicitDelegate")));
@@ -204,10 +204,8 @@ contract AttestationDelegateBeneficiary is JBTest, TestBaseWorkflow {
             metadata: metadata
         });
 
-        // With the fix, delegation is stored on the beneficiary's account, not the payer's.
         address beneficiaryDelegate = _nft.getTierDelegateOf(beneficiary, 1);
-        assertEq(beneficiaryDelegate, explicitDelegate, "Explicit delegate should override default on beneficiary");
-        // Payer should have no delegation.
+        assertEq(beneficiaryDelegate, beneficiary, "third-party payer cannot overwrite beneficiary delegation");
         address payerDelegate = _nft.getTierDelegateOf(payer, 1);
         assertEq(payerDelegate, address(0), "Payer should have no delegation when payer != beneficiary");
     }