@ballkidz/defifa 0.0.1 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ballkidz/defifa",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "license": "MIT",
   "engines": {
     "node": ">=20.0.0"
@@ -13,10 +13,10 @@
     "url": "https://github.com/BallKidz/defifa-collection-deployer"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.8",
-    "@bananapus/address-registry-v6": "^0.0.3",
-    "@bananapus/core-v6": "^0.0.6",
-    "@bananapus/permission-ids-v6": "^0.0.3",
+    "@bananapus/721-hook-v6": "^0.0.9",
+    "@bananapus/address-registry-v6": "^0.0.4",
+    "@bananapus/core-v6": "^0.0.10",
+    "@bananapus/permission-ids-v6": "^0.0.5",
     "@openzeppelin/contracts": "5.2.0",
     "@prb/math": "^4.1.1",
     "scripty.sol": "^2.1.1"

package/src/DefifaDeployer.sol

@@ -135,37 +135,6 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
 
-    /// @notice The game times.
-    /// @param gameId The ID of the game for which the game times apply.
-    /// @return The game's start time, as a unix timestamp.
-    /// @return The game's minting period duration, in seconds.
-    /// @return The game's refund period duration, in seconds.
-    function timesFor(uint256 gameId) external view override returns (uint48, uint24, uint24) {
-        DefifaOpsData memory _ops = _opsOf[gameId];
-        return (_ops.start, _ops.mintPeriodDuration, _ops.refundPeriodDuration);
-    }
-
-    /// @notice The token of a game.
-    /// @param gameId The ID of the game to get the token of.
-    /// @return The game's token.
-    function tokenOf(uint256 gameId) external view override returns (address) {
-        return _opsOf[gameId].token;
-    }
-
-    /// @notice The safety mechanism parameters of a game.
-    /// @param gameId The ID of the game to get the safety params of.
-    /// @return minParticipation The minimum treasury balance for the game to proceed to scoring.
-    /// @return scorecardTimeout The maximum time after scoring begins for a scorecard to be ratified.
-    function safetyParamsOf(uint256 gameId)
-        external
-        view
-        override
-        returns (uint256 minParticipation, uint32 scorecardTimeout)
-    {
-        DefifaOpsData memory _ops = _opsOf[gameId];
-        return (_ops.minParticipation, _ops.scorecardTimeout);
-    }
-
     /// @notice The current pot the game is being played with.
     /// @param gameId The ID of the game for which the pot applies.
     /// @param includeCommitments A flag indicating if the portion of the pot committed to fulfill preprogrammed
@@ -214,6 +183,37 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
         return _currentRuleset.duration != 0 && _currentRuleset.id == _queuedRuleset.id;
     }
 
+    /// @notice The safety mechanism parameters of a game.
+    /// @param gameId The ID of the game to get the safety params of.
+    /// @return minParticipation The minimum treasury balance for the game to proceed to scoring.
+    /// @return scorecardTimeout The maximum time after scoring begins for a scorecard to be ratified.
+    function safetyParamsOf(uint256 gameId)
+        external
+        view
+        override
+        returns (uint256 minParticipation, uint32 scorecardTimeout)
+    {
+        DefifaOpsData memory _ops = _opsOf[gameId];
+        return (_ops.minParticipation, _ops.scorecardTimeout);
+    }
+
+    /// @notice The game times.
+    /// @param gameId The ID of the game for which the game times apply.
+    /// @return The game's start time, as a unix timestamp.
+    /// @return The game's minting period duration, in seconds.
+    /// @return The game's refund period duration, in seconds.
+    function timesFor(uint256 gameId) external view override returns (uint48, uint24, uint24) {
+        DefifaOpsData memory _ops = _opsOf[gameId];
+        return (_ops.start, _ops.mintPeriodDuration, _ops.refundPeriodDuration);
+    }
+
+    /// @notice The token of a game.
+    /// @param gameId The ID of the game to get the token of.
+    /// @return The game's token.
+    function tokenOf(uint256 gameId) external view override returns (address) {
+        return _opsOf[gameId].token;
+    }
+
     //*********************************************************************//
     // -------------------------- public views --------------------------- //
     //*********************************************************************//
@@ -297,6 +297,96 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
 
+    /// @notice Fulfill split amounts between all splits for a game.
+    /// @param gameId The ID of the game to fulfill splits for.
+    function fulfillCommitmentsOf(uint256 gameId) external virtual override {
+        // Make sure commitments haven't already been fulfilled.
+        if (fulfilledCommitmentsOf[gameId] != 0) return;
+
+        // Get the game's current funding cycle along with its metadata.
+        // slither-disable-next-line unused-return
+        (, JBRulesetMetadata memory _metadata) = controller.currentRulesetOf(gameId);
+
+        // Make sure the game's commitments can be fulfilled.
+        if (!IDefifaHook(_metadata.dataHook).cashOutWeightIsSet()) {
+            revert DefifaDeployer_CantFulfillYet();
+        }
+
+        // Get the game token and the terminal.
+        address _token = _opsOf[gameId].token;
+        IJBMultiTerminal _terminal =
+            IJBMultiTerminal(address(controller.DIRECTORY().primaryTerminalOf({projectId: gameId, token: _token})));
+
+        // Get the current pot and store it. This also prevents re-entrance since the check above will return early.
+        uint256 _pot = _terminal.STORE().balanceOf({terminal: address(_terminal), projectId: gameId, token: _token});
+        // slither-disable-next-line incorrect-equality
+        if (_pot == 0) revert DefifaDeployer_NothingToFulfill();
+
+        // Compute the fee amount based on the total absolute split percent stored at game creation.
+        uint256 _feeAmount = mulDiv(_pot, _commitmentPercentOf[gameId], JBConstants.SPLITS_TOTAL_PERCENT);
+
+        // Store the actual fee amount for accurate currentGamePotOf reporting.
+        // Use max(feeAmount, 1) to preserve the reentrancy guard when pot is 0.
+        fulfilledCommitmentsOf[gameId] = _feeAmount > 0 ? _feeAmount : 1;
+
+        // Send only the fee portion as payouts. The remaining balance stays as surplus for cash-outs.
+        // slither-disable-next-line unused-return
+        _terminal.sendPayoutsOf({
+            projectId: gameId,
+            token: _token,
+            amount: _feeAmount,
+            currency: _token == JBConstants.NATIVE_TOKEN ? _metadata.baseCurrency : uint32(uint160(_token)),
+            minTokensPaidOut: _feeAmount
+        });
+
+        // Queue the final ruleset.
+        JBRulesetConfig[] memory rulesetConfigs = new JBRulesetConfig[](1);
+        rulesetConfigs[0] = JBRulesetConfig({
+            mustStartAtOrAfter: 0,
+            duration: 0,
+            weight: 0,
+            weightCutPercent: 0,
+            approvalHook: IJBRulesetApprovalHook(address(0)),
+            metadata: JBRulesetMetadata({
+                reservedPercent: 0,
+                cashOutTaxRate: 0,
+                baseCurrency: _metadata.baseCurrency,
+                pausePay: true,
+                pauseCreditTransfers: false,
+                allowOwnerMinting: false,
+                allowSetCustomToken: false,
+                allowTerminalMigration: false,
+                allowSetTerminals: false,
+                allowSetController: false,
+                allowAddAccountingContext: false,
+                allowAddPriceFeed: false,
+                // Set this to true so only the deployer can fulfill the commitments.
+                ownerMustSendPayouts: true,
+                holdFees: false,
+                useTotalSurplusForCashOuts: false,
+                useDataHookForPay: true,
+                useDataHookForCashOut: true,
+                dataHook: _metadata.dataHook,
+                metadata: uint16(
+                    JB721TiersRulesetMetadataResolver.pack721TiersRulesetMetadata(
+                        JB721TiersRulesetMetadata({pauseTransfers: false, pauseMintPendingReserves: false})
+                    )
+                )
+            }),
+            // No more payouts.
+            splitGroups: new JBSplitGroup[](0),
+            fundAccessLimitGroups: new JBFundAccessLimitGroup[](0)
+        });
+
+        // Update the ruleset to the final one.
+        // slither-disable-next-line unused-return
+        controller.queueRulesetsOf({
+            projectId: gameId, rulesetConfigurations: rulesetConfigs, memo: "Defifa game has finished."
+        });
+
+        emit FulfilledCommitments({gameId: gameId, pot: _pot, caller: msg.sender});
+    }
+
     /// @notice Launches a new game owned by this contract with a DefifaHook attached.
     /// @param launchProjectData Data necessary to fulfill the transaction to launch a game.
     /// @return gameId The ID of the newly configured game.
@@ -311,6 +401,7 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
                 uint48(block.timestamp + launchProjectData.mintPeriodDuration + launchProjectData.refundPeriodDuration);
         }
         // Start minting right away if a start time isn't provided.
+        // slither-disable-next-line incorrect-equality
         else if (
             launchProjectData.mintPeriodDuration == 0
                 && launchProjectData.start > block.timestamp + launchProjectData.refundPeriodDuration
@@ -481,94 +572,9 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
         emit LaunchGame(gameId, _hook, governor, _uriResolver, msg.sender);
     }
 
-    /// @notice Fulfill split amounts between all splits for a game.
-    /// @param gameId The ID of the game to fulfill splits for.
-    function fulfillCommitmentsOf(uint256 gameId) external virtual override {
-        // Make sure commitments haven't already been fulfilled.
-        if (fulfilledCommitmentsOf[gameId] != 0) return;
-
-        // Get the game's current funding cycle along with its metadata.
-        // slither-disable-next-line unused-return
-        (, JBRulesetMetadata memory _metadata) = controller.currentRulesetOf(gameId);
-
-        // Make sure the game's commitments can be fulfilled.
-        if (!IDefifaHook(_metadata.dataHook).cashOutWeightIsSet()) {
-            revert DefifaDeployer_CantFulfillYet();
-        }
-
-        // Get the game token and the terminal.
-        address _token = _opsOf[gameId].token;
-        IJBMultiTerminal _terminal =
-            IJBMultiTerminal(address(controller.DIRECTORY().primaryTerminalOf({projectId: gameId, token: _token})));
-
-        // Get the current pot and store it. This also prevents re-entrance since the check above will return early.
-        uint256 _pot = _terminal.STORE().balanceOf({terminal: address(_terminal), projectId: gameId, token: _token});
-        // slither-disable-next-line incorrect-equality
-        if (_pot == 0) revert DefifaDeployer_NothingToFulfill();
-
-        // Compute the fee amount based on the total absolute split percent stored at game creation.
-        uint256 _feeAmount = mulDiv(_pot, _commitmentPercentOf[gameId], JBConstants.SPLITS_TOTAL_PERCENT);
-
-        // Store the actual fee amount for accurate currentGamePotOf reporting.
-        // Use max(feeAmount, 1) to preserve the reentrancy guard when pot is 0.
-        fulfilledCommitmentsOf[gameId] = _feeAmount > 0 ? _feeAmount : 1;
-
-        // Send only the fee portion as payouts. The remaining balance stays as surplus for cash-outs.
-        // slither-disable-next-line unused-return
-        _terminal.sendPayoutsOf({
-            projectId: gameId,
-            token: _token,
-            amount: _feeAmount,
-            currency: _token == JBConstants.NATIVE_TOKEN ? _metadata.baseCurrency : uint32(uint160(_token)),
-            minTokensPaidOut: _feeAmount
-        });
-
-        // Queue the final ruleset.
-        JBRulesetConfig[] memory rulesetConfigs = new JBRulesetConfig[](1);
-        rulesetConfigs[0] = JBRulesetConfig({
-            mustStartAtOrAfter: 0,
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: JBRulesetMetadata({
-                reservedPercent: 0,
-                cashOutTaxRate: 0,
-                baseCurrency: _metadata.baseCurrency,
-                pausePay: true,
-                pauseCreditTransfers: false,
-                allowOwnerMinting: false,
-                allowSetCustomToken: false,
-                allowTerminalMigration: false,
-                allowSetTerminals: false,
-                allowSetController: false,
-                allowAddAccountingContext: false,
-                allowAddPriceFeed: false,
-                // Set this to true so only the deployer can fulfill the commitments.
-                ownerMustSendPayouts: true,
-                holdFees: false,
-                useTotalSurplusForCashOuts: false,
-                useDataHookForPay: true,
-                useDataHookForCashOut: true,
-                dataHook: _metadata.dataHook,
-                metadata: uint16(
-                    JB721TiersRulesetMetadataResolver.pack721TiersRulesetMetadata(
-                        JB721TiersRulesetMetadata({pauseTransfers: false, pauseMintPendingReserves: false})
-                    )
-                )
-            }),
-            // No more payouts.
-            splitGroups: new JBSplitGroup[](0),
-            fundAccessLimitGroups: new JBFundAccessLimitGroup[](0)
-        });
-
-        // Update the ruleset to the final one.
-        // slither-disable-next-line unused-return
-        controller.queueRulesetsOf({
-            projectId: gameId, rulesetConfigurations: rulesetConfigs, memo: "Defifa game has finished."
-        });
-
-        emit FulfilledCommitments({gameId: gameId, pot: _pot, caller: msg.sender});
+    /// @notice Allows this contract to receive 721s.
+    function onERC721Received(address, address, uint256, bytes calldata) external pure override returns (bytes4) {
+        return IERC721Receiver.onERC721Received.selector;
     }
 
     /// @notice Triggers the no-contest refund mechanism for a game.
@@ -638,11 +644,6 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
         emit QueuedNoContest(gameId, msg.sender);
     }
 
-    /// @notice Allows this contract to receive 721s.
-    function onERC721Received(address, address, uint256, bytes calldata) external pure override returns (bytes4) {
-        return IERC721Receiver.onERC721Received.selector;
-    }
-
     //*********************************************************************//
     // ------------------------ internal functions ----------------------- //
     //*********************************************************************//

package/src/DefifaGovernor.sol

@@ -123,43 +123,12 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
     // -------------------------- public views --------------------------- //
     //*********************************************************************//
 
-    /// @notice The state of a proposal.
-    /// @param gameId The ID of the game to get a proposal state of.
-    /// @param scorecardId The ID of the proposal to get the state of.
-    /// @return The state.
-    function stateOf(uint256 gameId, uint256 scorecardId) public view virtual override returns (DefifaScorecardState) {
-        // Keep a reference to the ratified scorecard ID.
-        uint256 _ratifiedScorecardId = ratifiedScorecardIdOf[gameId];
-
-        // If the game has already ratified a scorecard, return succeeded if the ratified proposal is being checked.
-        // Else return defeated.
-        if (_ratifiedScorecardId != 0) {
-            return _ratifiedScorecardId == scorecardId ? DefifaScorecardState.RATIFIED : DefifaScorecardState.DEFEATED;
-        }
-
-        // Get a reference to the scorecard.
-        DefifaScorecard memory _scorecard = _scorecardOf[gameId][scorecardId];
-
-        // Make sure the proposal is known.
-        // slither-disable-next-line incorrect-equality
-        if (_scorecard.attestationsBegin == 0) {
-            revert DefifaGovernor_UnknownProposal();
-        }
-
-        // If the scorecard has attestations beginning in the future, the state is PENDING.
-        if (_scorecard.attestationsBegin >= block.timestamp) {
-            return DefifaScorecardState.PENDING;
-        }
-
-        // If the scorecard has a grace period expiring in the future, the state is ACTIVE.
-        if (_scorecard.gracePeriodEnds >= block.timestamp) {
-            return DefifaScorecardState.ACTIVE;
-        }
-
-        // If quorum has been reached, the state is SUCCEEDED, otherwise it is ACTIVE.
-        return quorum(gameId) <= _scorecardAttestationsOf[gameId][scorecardId].count
-            ? DefifaScorecardState.SUCCEEDED
-            : DefifaScorecardState.ACTIVE;
+    /// @notice The amount of time that must go by before a scorecard can be ratified.
+    /// @param gameId The ID of the game to get the attestation period of.
+    /// @return The attestation period in number of blocks.
+    function attestationGracePeriodOf(uint256 gameId) public view override returns (uint256) {
+        // attestation grace period in bits 48-95 (48 bits).
+        return uint256(uint48(_packedScorecardInfoOf[gameId] >> 48));
     }
 
     /// @notice The amount of time between a scorecard being submitted and attestations to it being enabled, measured in
@@ -173,43 +142,6 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
         return uint256(uint48(_packedScorecardInfoOf[gameId]));
     }
 
-    /// @notice The amount of time that must go by before a scorecard can be ratified.
-    /// @param gameId The ID of the game to get the attestation period of.
-    /// @return The attestation period in number of blocks.
-    function attestationGracePeriodOf(uint256 gameId) public view override returns (uint256) {
-        // attestation grace period in bits 48-95 (48 bits).
-        return uint256(uint48(_packedScorecardInfoOf[gameId] >> 48));
-    }
-
-    /// @notice The number of attestation units that must have participated in a proposal for it to be ratified.
-    /// @dev Each tier with at least one minted token contributes MAX_ATTESTATION_POWER_TIER to the total
-    /// eligible weight. Quorum is 50% of this total. Because every tier has equal max attestation power
-    /// regardless of supply, each tier's community has equal influence — a tier with 1 token and a tier
-    /// with 100 tokens both cap at MAX_ATTESTATION_POWER_TIER when fully attested. This prevents
-    /// high-supply tiers from dominating governance, keeping the game fair across all outcomes.
-    /// @return The quorum number of attestations.
-    function quorum(uint256 gameId) public view override returns (uint256) {
-        // Get the game's current funding cycle along with its metadata.
-        // slither-disable-next-line unused-return
-        (, JBRulesetMetadata memory _metadata) = controller.currentRulesetOf(gameId);
-
-        // Get a reference to the number of tiers.
-        uint256 _numberOfTiers = IDefifaHook(_metadata.dataHook).store().maxTierIdOf(_metadata.dataHook);
-
-        // Keep a reference to the total eligible tier weight.
-        uint256 _eligibleTierWeights;
-
-        for (uint256 _i; _i < _numberOfTiers; _i++) {
-            // Each minted tier contributes MAX_ATTESTATION_POWER_TIER to the quorum denominator.
-            if (IDefifaHook(_metadata.dataHook).currentSupplyOfTier(_i + 1) != 0) {
-                _eligibleTierWeights += MAX_ATTESTATION_POWER_TIER;
-            }
-        }
-
-        // Quorum = 50% of all minted tiers' attestation power.
-        return _eligibleTierWeights / 2;
-    }
-
     /// @notice Gets an account's attestation power given a number of tiers to look through.
     /// @dev An account's power per tier = MAX_ATTESTATION_POWER_TIER * (account's units / tier's total units).
     /// This means within a tier, power is proportional to token holdings, but across tiers, each tier's
@@ -261,6 +193,80 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
         }
     }
 
+    /// @notice The number of attestation units that must have participated in a proposal for it to be ratified.
+    /// @dev Each tier with at least one minted token contributes MAX_ATTESTATION_POWER_TIER to the total
+    /// eligible weight. Quorum is 50% of this total. Because every tier has equal max attestation power
+    /// regardless of supply, each tier's community has equal influence — a tier with 1 token and a tier
+    /// with 100 tokens both cap at MAX_ATTESTATION_POWER_TIER when fully attested. This prevents
+    /// high-supply tiers from dominating governance, keeping the game fair across all outcomes.
+    /// @return The quorum number of attestations.
+    function quorum(uint256 gameId) public view override returns (uint256) {
+        // Get the game's current funding cycle along with its metadata.
+        // slither-disable-next-line unused-return
+        (, JBRulesetMetadata memory _metadata) = controller.currentRulesetOf(gameId);
+
+        // Get a reference to the number of tiers.
+        uint256 _numberOfTiers = IDefifaHook(_metadata.dataHook).store().maxTierIdOf(_metadata.dataHook);
+
+        // Keep a reference to the total eligible tier weight.
+        uint256 _eligibleTierWeights;
+
+        for (uint256 _i; _i < _numberOfTiers; _i++) {
+            // Each minted tier contributes MAX_ATTESTATION_POWER_TIER to the quorum denominator.
+            if (IDefifaHook(_metadata.dataHook).currentSupplyOfTier(_i + 1) != 0) {
+                _eligibleTierWeights += MAX_ATTESTATION_POWER_TIER;
+            }
+        }
+
+        // Quorum = 50% of all minted tiers' attestation power.
+        return _eligibleTierWeights / 2;
+    }
+
+    /// @notice The state of a proposal.
+    /// @param gameId The ID of the game to get a proposal state of.
+    /// @param scorecardId The ID of the proposal to get the state of.
+    /// @return The state.
+    /// @dev Boundary semantics (inclusive):
+    ///   - At exactly `attestationsBegin`, the state transitions from PENDING to ACTIVE (attestations are open).
+    ///   - At exactly `gracePeriodEnds`, the grace period has elapsed and the state transitions from ACTIVE to
+    ///     SUCCEEDED (if quorum is met) or remains ACTIVE (if not).
+    function stateOf(uint256 gameId, uint256 scorecardId) public view virtual override returns (DefifaScorecardState) {
+        // Keep a reference to the ratified scorecard ID.
+        uint256 _ratifiedScorecardId = ratifiedScorecardIdOf[gameId];
+
+        // If the game has already ratified a scorecard, return succeeded if the ratified proposal is being checked.
+        // Else return defeated.
+        if (_ratifiedScorecardId != 0) {
+            return _ratifiedScorecardId == scorecardId ? DefifaScorecardState.RATIFIED : DefifaScorecardState.DEFEATED;
+        }
+
+        // Get a reference to the scorecard.
+        DefifaScorecard memory _scorecard = _scorecardOf[gameId][scorecardId];
+
+        // Make sure the proposal is known.
+        // slither-disable-next-line incorrect-equality
+        if (_scorecard.attestationsBegin == 0) {
+            revert DefifaGovernor_UnknownProposal();
+        }
+
+        // If the scorecard has attestations beginning in the future, the state is PENDING.
+        // At exactly `attestationsBegin`, attestations are open so the state is ACTIVE.
+        if (_scorecard.attestationsBegin > block.timestamp) {
+            return DefifaScorecardState.PENDING;
+        }
+
+        // If the scorecard's grace period has not yet ended, the state is ACTIVE.
+        // At exactly `gracePeriodEnds`, the grace period has elapsed so we fall through to the quorum check.
+        if (_scorecard.gracePeriodEnds > block.timestamp) {
+            return DefifaScorecardState.ACTIVE;
+        }
+
+        // If quorum has been reached, the state is SUCCEEDED, otherwise it is ACTIVE.
+        return quorum(gameId) <= _scorecardAttestationsOf[gameId][scorecardId].count
+            ? DefifaScorecardState.SUCCEEDED
+            : DefifaScorecardState.ACTIVE;
+    }
+
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
@@ -310,75 +316,6 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
 
-    /// @notice Submits a scorecard to be attested to.
-    /// @param _tierWeights The weights of each tier in the scorecard.
-    /// @return scorecardId The scorecard's ID.
-    function submitScorecardFor(
-        uint256 _gameId,
-        DefifaTierCashOutWeight[] calldata _tierWeights
-    )
-        external
-        override
-        returns (uint256 scorecardId)
-    {
-        // Make sure a proposal hasn't yet been ratified.
-        if (ratifiedScorecardIdOf[_gameId] != 0) revert DefifaGovernor_AlreadyRatified();
-
-        // Make sure the game has been initialized.
-        // slither-disable-next-line incorrect-equality
-        if (_packedScorecardInfoOf[_gameId] == 0) revert DefifaGovernor_GameNotFound();
-
-        // Make sure no weight is assigned to an unowned tier.
-        uint256 _numberOfTierWeights = _tierWeights.length;
-
-        // Get the game's current funding cycle along with its metadata.
-        // slither-disable-next-line unused-return
-        (, JBRulesetMetadata memory _metadata) = controller.currentRulesetOf(_gameId);
-
-        // Make sure the game is in its scoring phase.
-        if (IDefifaHook(_metadata.dataHook).gamePhaseReporter().currentGamePhaseOf(_gameId) != DefifaGamePhase.SCORING)
-        {
-            revert DefifaGovernor_NotAllowed();
-        }
-
-        // If there's a weight assigned to the tier, make sure there is a token backed by it.
-        for (uint256 _i; _i < _numberOfTierWeights; _i++) {
-            if (
-                _tierWeights[_i].cashOutWeight > 0
-                    && IDefifaHook(_metadata.dataHook).currentSupplyOfTier(_tierWeights[_i].id) == 0
-            ) {
-                revert DefifaGovernor_UnownedProposedCashoutValue();
-            }
-        }
-
-        // Hash the scorecard.
-        scorecardId =
-            _hashScorecardOf({_gameHook: _metadata.dataHook, _calldata: _buildScorecardCalldataFor(_tierWeights)});
-
-        // Store the scorecard
-        DefifaScorecard storage _scorecard = _scorecardOf[_gameId][scorecardId];
-        if (_scorecard.attestationsBegin != 0) revert DefifaGovernor_DuplicateScorecard();
-
-        uint256 _attestationStartTime = attestationStartTimeOf(_gameId);
-        uint256 _timeUntilAttestationsBegin =
-            block.timestamp > _attestationStartTime ? 0 : _attestationStartTime - block.timestamp;
-
-        _scorecard.attestationsBegin = uint48(block.timestamp + _timeUntilAttestationsBegin);
-        _scorecard.gracePeriodEnds = uint48(block.timestamp + attestationGracePeriodOf(_gameId));
-
-        // Keep a reference to the default attestation delegate.
-        address _defaultAttestationDelegate = IDefifaHook(_metadata.dataHook).defaultAttestationDelegate();
-
-        // If the scorecard is being sent from the default attestation delegate, store it.
-        if (msg.sender == _defaultAttestationDelegate) {
-            defaultAttestationDelegateProposalOf[_gameId] = scorecardId;
-        }
-
-        emit ScorecardSubmitted(
-            _gameId, scorecardId, _tierWeights, msg.sender == _defaultAttestationDelegate, msg.sender
-        );
-    }
-
     /// @notice Attests to a scorecard.
     /// @param gameId The ID of the game to which the scorecard belongs.
     /// @param scorecardId The scorecard ID.
@@ -459,12 +396,90 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
         // slither-disable-next-line unused-return
         Address.verifyCallResult({success: success, returndata: returndata});
 
-        // Fulfill any commitments for the game.
-        IDefifaDeployer(controller.PROJECTS().ownerOf(gameId)).fulfillCommitmentsOf(gameId);
+        // Fulfill any commitments for the game. Wrapped in try-catch so that a fulfillment
+        // failure (e.g. from sendPayoutsOf reverting) does not permanently block ratification.
+        // Fulfillment can be retried separately by calling fulfillCommitmentsOf directly.
+        try IDefifaDeployer(controller.PROJECTS().ownerOf(gameId)).fulfillCommitmentsOf(gameId) {}
+        catch (bytes memory reason) {
+            emit FulfillmentFailed(gameId, reason);
+        }
 
         emit ScorecardRatified(gameId, scorecardId, msg.sender);
     }
 
+    /// @notice Submits a scorecard to be attested to.
+    /// @param _tierWeights The weights of each tier in the scorecard.
+    /// @return scorecardId The scorecard's ID.
+    function submitScorecardFor(
+        uint256 _gameId,
+        DefifaTierCashOutWeight[] calldata _tierWeights
+    )
+        external
+        override
+        returns (uint256 scorecardId)
+    {
+        // Make sure a proposal hasn't yet been ratified.
+        if (ratifiedScorecardIdOf[_gameId] != 0) revert DefifaGovernor_AlreadyRatified();
+
+        // Make sure the game has been initialized.
+        // slither-disable-next-line incorrect-equality
+        if (_packedScorecardInfoOf[_gameId] == 0) revert DefifaGovernor_GameNotFound();
+
+        // Make sure no weight is assigned to an unowned tier.
+        uint256 _numberOfTierWeights = _tierWeights.length;
+
+        // Get the game's current funding cycle along with its metadata.
+        // slither-disable-next-line unused-return
+        (, JBRulesetMetadata memory _metadata) = controller.currentRulesetOf(_gameId);
+
+        // Make sure the game is in its scoring phase.
+        if (IDefifaHook(_metadata.dataHook).gamePhaseReporter().currentGamePhaseOf(_gameId) != DefifaGamePhase.SCORING)
+        {
+            revert DefifaGovernor_NotAllowed();
+        }
+
+        // If there's a weight assigned to the tier, make sure there is a token backed by it.
+        for (uint256 _i; _i < _numberOfTierWeights; _i++) {
+            if (
+                _tierWeights[_i].cashOutWeight > 0
+                    && IDefifaHook(_metadata.dataHook).currentSupplyOfTier(_tierWeights[_i].id) == 0
+            ) {
+                revert DefifaGovernor_UnownedProposedCashoutValue();
+            }
+        }
+
+        // Hash the scorecard.
+        scorecardId =
+            _hashScorecardOf({_gameHook: _metadata.dataHook, _calldata: _buildScorecardCalldataFor(_tierWeights)});
+
+        // Store the scorecard
+        DefifaScorecard storage _scorecard = _scorecardOf[_gameId][scorecardId];
+        if (_scorecard.attestationsBegin != 0) revert DefifaGovernor_DuplicateScorecard();
+
+        uint256 _attestationStartTime = attestationStartTimeOf(_gameId);
+        uint256 _timeUntilAttestationsBegin =
+            block.timestamp > _attestationStartTime ? 0 : _attestationStartTime - block.timestamp;
+
+        uint48 _attestationsBegin = uint48(block.timestamp + _timeUntilAttestationsBegin);
+        _scorecard.attestationsBegin = _attestationsBegin;
+        // Grace period extends from when attestations begin, not from submission time.
+        // This prevents the grace period from expiring before attestations even start
+        // when a scorecard is submitted early.
+        _scorecard.gracePeriodEnds = uint48(_attestationsBegin + attestationGracePeriodOf(_gameId));
+
+        // Keep a reference to the default attestation delegate.
+        address _defaultAttestationDelegate = IDefifaHook(_metadata.dataHook).defaultAttestationDelegate();
+
+        // If the scorecard is being sent from the default attestation delegate, store it.
+        if (msg.sender == _defaultAttestationDelegate) {
+            defaultAttestationDelegateProposalOf[_gameId] = scorecardId;
+        }
+
+        emit ScorecardSubmitted(
+            _gameId, scorecardId, _tierWeights, msg.sender == _defaultAttestationDelegate, msg.sender
+        );
+    }
+
     //*********************************************************************//
     // ------------------------ internal functions ----------------------- //
     //*********************************************************************//