@ballkidz/defifa 0.0.7 → 0.0.9

package/src/DefifaTokenUriResolver.sol

@@ -1,98 +1,99 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {Base64} from "lib/base64/base64.sol";
-import {mulDiv} from "@prb/math/src/Common.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
-import {IDefifaHook} from "./interfaces/IDefifaHook.sol";
-import {IDefifaTokenUriResolver} from "./interfaces/IDefifaTokenUriResolver.sol";
-import {DefifaFontImporter} from "./libraries/DefifaFontImporter.sol";
-import {DefifaGamePhase} from "./enums/DefifaGamePhase.sol";
+import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
 
-import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
-import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
 import {ERC721} from "@bananapus/721-hook-v6/src/abstract/ERC721.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
 import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
 import {JBIpfsDecoder} from "@bananapus/721-hook-v6/src/libraries/JBIpfsDecoder.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+
+import {Base64} from "lib/base64/base64.sol";
+import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
+
+import {DefifaFontImporter} from "./libraries/DefifaFontImporter.sol";
+import {DefifaGamePhase} from "./enums/DefifaGamePhase.sol";
+import {IDefifaHook} from "./interfaces/IDefifaHook.sol";
+import {IDefifaTokenUriResolver} from "./interfaces/IDefifaTokenUriResolver.sol";
 
-/// @title DefifaTokenUriResolver
 /// @notice Standard Token URIs for Defifa games.
 contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolver {
     using Strings for uint256;
 
     //*********************************************************************//
-    // -------------------- private constant properties ------------------ //
+    // ----------------------- internal constants ------------------------ //
     //*********************************************************************//
 
     /// @notice The fidelity of the decimal returned in the NFT image.
-    uint256 private constant _IMG_DECIMAL_FIDELITY = 5;
+    uint256 internal constant _IMG_DECIMAL_FIDELITY = 5;
 
     //*********************************************************************//
     // --------------- public immutable stored properties ---------------- //
     //*********************************************************************//
 
     /// @notice The typeface of the SVGs.
-    ITypeface public immutable override typeface;
+    ITypeface public immutable override TYPEFACE;
 
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    constructor(ITypeface _typeface) {
-        typeface = _typeface;
+    constructor(ITypeface typeface) {
+        TYPEFACE = typeface;
     }
 
     //*********************************************************************//
-    // ---------------------- external transactions ---------------------- //
+    // ----------------------- external views ---------------------------- //
     //*********************************************************************//
 
     /// @notice The metadata URI of the provided token ID.
     /// @dev Defer to the token's tier IPFS URI if set.
-    /// @param _nft The address of the nft the token URI should be oriented to.
-    /// @param _tokenId The ID of the token to get the tier URI for.
+    /// @param nft The address of the nft the token URI should be oriented to.
+    /// @param tokenId The ID of the token to get the tier URI for.
     /// @return The token URI corresponding with the tier.
-    function tokenUriOf(address _nft, uint256 _tokenId) external view override returns (string memory) {
+    function tokenUriOf(address nft, uint256 tokenId) external view override returns (string memory) {
         // Keep a reference to the hook.
-        IDefifaHook _hook = IDefifaHook(_nft);
+        IDefifaHook hook = IDefifaHook(nft);
 
         // Get the game ID.
-        uint256 _gameId = _hook.PROJECT_ID();
+        uint256 gameId = hook.PROJECT_ID();
 
         // Keep a reference to the game phase text.
-        string memory _gamePhaseText;
+        string memory gamePhaseText;
 
         // Keep a reference to the rarity text;
-        string memory _rarityText;
+        string memory rarityText;
 
         // Keep a reference to the rarity text;
-        string memory _valueText;
+        string memory valueText;
 
         // Keep a reference to the game's name.
         // TODO: Somehow make the `IDefifaHook` have the `name` function.
-        string memory _title = ERC721(address(_hook)).name();
+        string memory title = ERC721(address(hook)).name();
 
         // Keep a reference to the tier's name.
-        string memory _team;
+        string memory team;
 
         // Keep a reference to the SVG parts.
         string[] memory parts = new string[](4);
 
         // Keep a reference to the pot.
-        string memory _potText;
+        string memory potText;
 
         {
             // Get a reference to the tier.
-            JB721Tier memory _tier =
-                _hook.store().tierOfTokenId({hook: address(_hook), tokenId: _tokenId, includeResolvedUri: false});
+            JB721Tier memory tier =
+                hook.store().tierOfTokenId({hook: address(hook), tokenId: tokenId, includeResolvedUri: false});
 
             // Set the tier's name.
-            _team = _hook.tierNameOf(_tier.id);
+            team = hook.tierNameOf(tier.id);
 
             // Check to see if the tier has a URI. Return it if it does.
-            if (_tier.encodedIPFSUri != bytes32(0)) {
-                return JBIpfsDecoder.decode({baseUri: _hook.baseURI(), hexString: _tier.encodedIPFSUri});
+            if (tier.encodedIPFSUri != bytes32(0)) {
+                return JBIpfsDecoder.decode({baseUri: hook.baseURI(), hexString: tier.encodedIPFSUri});
             }
 
             parts[0] = string("data:application/json;base64,");
@@ -100,83 +101,80 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
             parts[1] = string(
                 abi.encodePacked(
                     '{"name":"',
-                    _team,
+                    team,
                     '", "id": "',
-                    uint256(_tier.id).toString(),
+                    uint256(tier.id).toString(),
                     '","description":"Team: ',
-                    _team,
+                    team,
                     ", ID: ",
-                    uint256(_tier.id).toString(),
+                    uint256(tier.id).toString(),
                     '.","image":"data:image/svg+xml;base64,'
                 )
             );
 
             {
                 // Get a reference to the game phase.
-                DefifaGamePhase _gamePhase = _hook.gamePhaseReporter().currentGamePhaseOf(_gameId);
+                DefifaGamePhase gamePhase = hook.gamePhaseReporter().currentGamePhaseOf(gameId);
 
                 // Keep a reference to the game pot.
-                (uint256 _gamePot, address _gamePotToken, uint256 _gamePotDecimals) =
-                    _hook.gamePotReporter().currentGamePotOf({gameId: _gameId, includeCommitments: false});
+                (uint256 gamePot, address gamePotToken, uint256 gamePotDecimals) =
+                    hook.gamePotReporter().currentGamePotOf({gameId: gameId, includeCommitments: false});
 
                 // Include the amount redeemed.
-                _gamePot = _gamePot + _hook.amountRedeemed();
+                gamePot = gamePot + hook.amountRedeemed();
 
                 // Set the pot text.
-                _potText = _formatBalance({
-                    _amount: _gamePot,
-                    _token: _gamePotToken,
-                    _decimals: _gamePotDecimals,
-                    _fidelity: _IMG_DECIMAL_FIDELITY
+                potText = _formatBalance({
+                    amount: gamePot, token: gamePotToken, decimals: gamePotDecimals, fidelity: _IMG_DECIMAL_FIDELITY
                 });
 
-                if (_gamePhase == DefifaGamePhase.COUNTDOWN) {
-                    _gamePhaseText = "Minting starts soon.";
-                } else if (_gamePhase == DefifaGamePhase.MINT) {
-                    _gamePhaseText = "Minting and refunds are open.";
-                } else if (_gamePhase == DefifaGamePhase.REFUND) {
-                    _gamePhaseText = "Minting is over. Refunds are ending.";
-                } else if (_gamePhase == DefifaGamePhase.SCORING) {
-                    _gamePhaseText = "Awaiting scorecard approval.";
-                } else if (_gamePhase == DefifaGamePhase.COMPLETE) {
-                    _gamePhaseText = "Scorecard locked in. Burn to claim reward.";
-                } else if (_gamePhase == DefifaGamePhase.NO_CONTEST) {
-                    _gamePhaseText = "No contest. Refunds open.";
+                if (gamePhase == DefifaGamePhase.COUNTDOWN) {
+                    gamePhaseText = "Minting starts soon.";
+                } else if (gamePhase == DefifaGamePhase.MINT) {
+                    gamePhaseText = "Minting and refunds are open.";
+                } else if (gamePhase == DefifaGamePhase.REFUND) {
+                    gamePhaseText = "Minting is over. Refunds are ending.";
+                } else if (gamePhase == DefifaGamePhase.SCORING) {
+                    gamePhaseText = "Awaiting scorecard approval.";
+                } else if (gamePhase == DefifaGamePhase.COMPLETE) {
+                    gamePhaseText = "Scorecard locked in. Burn to claim reward.";
+                } else if (gamePhase == DefifaGamePhase.NO_CONTEST) {
+                    gamePhaseText = "No contest. Refunds open.";
                 }
 
                 // Keep a reference to the number of tokens outstanding from this tier.
-                uint256 _totalMinted = _hook.currentSupplyOfTier(_tier.id);
+                uint256 totalMinted = hook.currentSupplyOfTier(tier.id);
 
-                if (_gamePhase == DefifaGamePhase.MINT) {
-                    _rarityText = string(
-                        abi.encodePacked(_totalMinted.toString(), _totalMinted == 1 ? " card so far" : " cards so far")
+                if (gamePhase == DefifaGamePhase.MINT) {
+                    rarityText = string(
+                        abi.encodePacked(totalMinted.toString(), totalMinted == 1 ? " card so far" : " cards so far")
                     );
                 } else {
-                    _rarityText = string(
+                    rarityText = string(
                         abi.encodePacked(
-                            _totalMinted.toString(), _totalMinted == 1 ? " card in existence" : " cards in existence"
+                            totalMinted.toString(), totalMinted == 1 ? " card in existence" : " cards in existence"
                         )
                     );
                 }
 
-                if (_gamePhase == DefifaGamePhase.SCORING || _gamePhase == DefifaGamePhase.COMPLETE) {
-                    uint256 _potPortion = mulDiv({
-                        x: _gamePot, y: _hook.cashOutWeightOf(_tokenId), denominator: _hook.TOTAL_CASHOUT_WEIGHT()
+                if (gamePhase == DefifaGamePhase.SCORING || gamePhase == DefifaGamePhase.COMPLETE) {
+                    uint256 potPortion = mulDiv({
+                        x: gamePot, y: hook.cashOutWeightOf(tokenId), denominator: hook.TOTAL_CASHOUT_WEIGHT()
                     });
-                    _valueText = !_hook.cashOutWeightIsSet()
+                    valueText = !hook.cashOutWeightIsSet()
                         ? "Awaiting scorecard..."
                         : _formatBalance({
-                            _amount: _potPortion,
-                            _token: _gamePotToken,
-                            _decimals: _gamePotDecimals,
-                            _fidelity: _IMG_DECIMAL_FIDELITY
+                            amount: potPortion,
+                            token: gamePotToken,
+                            decimals: gamePotDecimals,
+                            fidelity: _IMG_DECIMAL_FIDELITY
                         });
                 } else {
-                    _valueText = _formatBalance({
-                        _amount: _tier.price,
-                        _token: _gamePotToken,
-                        _decimals: _gamePotDecimals,
-                        _fidelity: _IMG_DECIMAL_FIDELITY
+                    valueText = _formatBalance({
+                        amount: tier.price,
+                        token: gamePotToken,
+                        decimals: gamePotDecimals,
+                        fidelity: _IMG_DECIMAL_FIDELITY
                     });
                 }
             }
@@ -185,54 +183,54 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
             abi.encodePacked(
                 '<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">',
                 '<style>@font-face{font-family:"Capsules-500";src:url(data:font/truetype;charset=utf-8;base64,',
-                DefifaFontImporter.getSkinnyFontSource(typeface),
+                DefifaFontImporter.getSkinnyFontSource(TYPEFACE),
                 ');format("opentype");}',
                 '@font-face{font-family:"Capsules-700";src:url(data:font/truetype;charset=utf-8;base64,',
-                DefifaFontImporter.getBeefyFontSource(typeface),
+                DefifaFontImporter.getBeefyFontSource(TYPEFACE),
                 ');format("opentype");}',
                 "text{white-space:pre-wrap; width:100%; }</style>",
                 '<rect width="100%" height="100%" fill="#181424"/>',
                 '<text x="10" y="30" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">GAME: ',
-                _gameId.toString(),
+                gameId.toString(),
                 " | POT: ",
-                _potText,
+                potText,
                 " | CARDS: ",
-                _hook.store().totalSupplyOf(address(_hook)).toString(),
+                hook.store().totalSupplyOf(address(hook)).toString(),
                 "</text>",
                 '<text x="10" y="50" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #ed017c;">',
-                _gamePhaseText,
+                gamePhaseText,
                 "</text>",
                 '<text x="10" y="85" style="font-size:26px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">',
-                _getSubstring(_title, 0, 30),
+                _getSubstring(title, 0, 30),
                 "</text>",
                 '<text x="10" y="120" style="font-size:26px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">',
-                _getSubstring(_title, 30, 60),
+                _getSubstring(title, 30, 60),
                 "</text>",
                 '<text x="10" y="205" style="font-size:80px; font-family: Capsules-700; font-weight:700; fill: #fea282;">',
-                bytes(_getSubstring(_team, 20, 30)).length != 0 && bytes(_getSubstring(_team, 10, 20)).length != 0
-                    ? _getSubstring(_team, 0, 10)
+                bytes(_getSubstring(team, 20, 30)).length != 0 && bytes(_getSubstring(team, 10, 20)).length != 0
+                    ? _getSubstring(team, 0, 10)
                     : "",
                 "</text>",
                 '<text x="10" y="295" style="font-size:80px; font-family: Capsules-700; font-weight:700; fill: #fea282;">',
-                bytes(_getSubstring(_team, 20, 30)).length != 0
-                    ? _getSubstring(_team, 10, 20)
-                    : bytes(_getSubstring(_team, 10, 20)).length != 0 ? _getSubstring(_team, 0, 10) : "",
+                bytes(_getSubstring(team, 20, 30)).length != 0
+                    ? _getSubstring(team, 10, 20)
+                    : bytes(_getSubstring(team, 10, 20)).length != 0 ? _getSubstring(team, 0, 10) : "",
                 "</text>",
                 '<text x="10" y="385" style="font-size:80px; font-family: Capsules-700; font-weight:700; fill: #fea282;">',
-                bytes(_getSubstring(_team, 20, 30)).length != 0
-                    ? _getSubstring(_team, 20, 30)
-                    : bytes(_getSubstring(_team, 10, 20)).length != 0
-                        ? _getSubstring(_team, 10, 20)
-                        : _getSubstring(_team, 0, 10),
+                bytes(_getSubstring(team, 20, 30)).length != 0
+                    ? _getSubstring(team, 20, 30)
+                    : bytes(_getSubstring(team, 10, 20)).length != 0
+                        ? _getSubstring(team, 10, 20)
+                        : _getSubstring(team, 0, 10),
                 "</text>",
                 '<text x="10" y="430" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">TOKEN ID: ',
-                _tokenId.toString(),
+                tokenId.toString(),
                 "</text>",
                 '<text x="10" y="455" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">RARITY: ',
-                _rarityText,
+                rarityText,
                 "</text>",
                 '<text x="10" y="480" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">BACKED BY: ',
-                _valueText,
+                valueText,
                 "</text>",
                 "</svg>"
             )
@@ -242,72 +240,76 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
         return string.concat(parts[0], Base64.encode(abi.encodePacked(parts[1], parts[2], parts[3])));
     }
 
+    //*********************************************************************//
+    // ----------------------- internal views ---------------------------- //
+    //*********************************************************************//
+
     /// @notice Formats a balance from a fixed point number to a string.
-    /// @param _amount The fixed point amount.
-    /// @param _token The token the amount is in.
-    /// @param _decimals The number of decimals in the fixed point amount.
-    /// @param _fidelity The number of decimals that should be returned in the formatted string.
+    /// @param amount The fixed point amount.
+    /// @param token The token the amount is in.
+    /// @param decimals The number of decimals in the fixed point amount.
+    /// @param fidelity The number of decimals that should be returned in the formatted string.
     /// @return The formatted balance.
     function _formatBalance(
-        uint256 _amount,
-        address _token,
-        uint256 _decimals,
-        uint256 _fidelity
+        uint256 amount,
+        address token,
+        uint256 decimals,
+        uint256 fidelity
     )
         internal
         view
         returns (string memory)
     {
-        bool _isEth = _token == JBConstants.NATIVE_TOKEN;
+        bool isEth = token == JBConstants.NATIVE_TOKEN;
 
-        uint256 _fixedPoint = 10 ** _decimals;
+        uint256 fixedPoint = 10 ** decimals;
 
         // Convert amount to a decimal format
-        string memory _integerPart = (_amount / _fixedPoint).toString();
+        string memory integerPart = (amount / fixedPoint).toString();
 
-        uint256 _remainder = _amount % _fixedPoint;
-        uint256 _scaledRemainder = _remainder * (10 ** _fidelity);
-        uint256 _decimalPart = _scaledRemainder / _fixedPoint;
+        uint256 remainder = amount % fixedPoint;
+        uint256 scaledRemainder = remainder * (10 ** fidelity);
+        uint256 decimalPart = scaledRemainder / fixedPoint;
 
         // Pad with zeros if necessary
-        string memory _decimalPartStr = _decimalPart.toString();
-        while (bytes(_decimalPartStr).length < _fidelity) {
-            _decimalPartStr = string(abi.encodePacked("0", _decimalPartStr));
+        string memory decimalPartStr = decimalPart.toString();
+        while (bytes(decimalPartStr).length < fidelity) {
+            decimalPartStr = string(abi.encodePacked("0", decimalPartStr));
         }
 
         // Concatenate the strings
-        return _isEth
-            ? string(abi.encodePacked("\u039E", _integerPart, ".", _decimalPartStr))
-            : string(abi.encodePacked(_integerPart, ".", _decimalPartStr, " ", IERC20Metadata(_token).symbol()));
+        return isEth
+            ? string(abi.encodePacked("\u039E", integerPart, ".", decimalPartStr))
+            : string(abi.encodePacked(integerPart, ".", decimalPartStr, " ", IERC20Metadata(token).symbol()));
     }
 
     /// @notice Gets a substring.
     /// @dev If the first character is a space, it is not included.
-    /// @param _str The string to get a substring of.
-    /// @param _startIndex The first index of the substring from within the string.
-    /// @param _endIndex The last index of the string from within the string.
+    /// @param str The string to get a substring of.
+    /// @param startIndex The first index of the substring from within the string.
+    /// @param endIndex The last index of the string from within the string.
     /// @return substring The substring.
     function _getSubstring(
-        string memory _str,
-        uint256 _startIndex,
-        uint256 _endIndex
+        string memory str,
+        uint256 startIndex,
+        uint256 endIndex
     )
         internal
         pure
         returns (string memory substring)
     {
-        bytes memory _strBytes = bytes(_str);
-        if (_startIndex >= _strBytes.length) return "";
-        if (_endIndex > _strBytes.length) _endIndex = _strBytes.length;
-        _startIndex = _strBytes[_startIndex] == bytes1(0x20) ? _startIndex + 1 : _startIndex;
-        if (_startIndex >= _endIndex) return "";
-        bytes memory _result = new bytes(_endIndex - _startIndex);
-        for (uint256 _i = _startIndex; _i < _endIndex;) {
-            _result[_i - _startIndex] = _strBytes[_i];
+        bytes memory strBytes = bytes(str);
+        if (startIndex >= strBytes.length) return "";
+        if (endIndex > strBytes.length) endIndex = strBytes.length;
+        startIndex = strBytes[startIndex] == bytes1(0x20) ? startIndex + 1 : startIndex;
+        if (startIndex >= endIndex) return "";
+        bytes memory result = new bytes(endIndex - startIndex);
+        for (uint256 i = startIndex; i < endIndex;) {
+            result[i - startIndex] = strBytes[i];
             unchecked {
-                ++_i;
+                ++i;
             }
         }
-        return string(_result);
+        return string(result);
     }
 }

package/src/enums/DefifaGamePhase.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.0;
 
 enum DefifaGamePhase {
     COUNTDOWN,

package/src/enums/DefifaScorecardState.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.0;
 
 enum DefifaScorecardState {
     PENDING,

package/src/interfaces/IDefifaDeployer.sol

@@ -1,18 +1,24 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
-
-import {DefifaLaunchProjectData} from "../structs/DefifaLaunchProjectData.sol";
-import {IDefifaHook} from "./IDefifaHook.sol";
-import {IDefifaGovernor} from "./IDefifaGovernor.sol";
+pragma solidity ^0.8.0;
 
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
-import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
-import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
+import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+
+import {DefifaLaunchProjectData} from "../structs/DefifaLaunchProjectData.sol";
+import {IDefifaGovernor} from "./IDefifaGovernor.sol";
+import {IDefifaHook} from "./IDefifaHook.sol";
 
 /// @notice Deploys and manages Defifa prediction games, including lifecycle phase transitions
 /// and commitment fulfillment.
 interface IDefifaDeployer {
+    event CommitmentPayoutFailed(uint256 indexed gameId, uint256 amount, bytes reason);
+
+    event DistributeToSplit(JBSplit split, uint256 amount, address caller);
+
+    event FulfilledCommitments(uint256 indexed gameId, uint256 pot, address caller);
+
     event LaunchGame(
         uint256 indexed gameId,
         IDefifaHook indexed hook,
@@ -21,55 +27,62 @@ interface IDefifaDeployer {
         address caller
     );
 
+    event QueuedNoContest(uint256 indexed gameId, address caller);
+
     event QueuedRefundPhase(uint256 indexed gameId, address caller);
 
     event QueuedScoringPhase(uint256 indexed gameId, address caller);
 
-    event QueuedNoContest(uint256 indexed gameId, address caller);
+    /// @notice The fee divisor for base protocol fees (100 / fee percent).
+    /// @return The fee divisor.
+    function BASE_PROTOCOL_FEE_DIVISOR() external view returns (uint256);
 
-    event FulfilledCommitments(uint256 indexed gameId, uint256 pot, address caller);
+    /// @notice The Juicebox project ID of the base protocol project.
+    /// @return The project ID.
+    function BASE_PROTOCOL_PROJECT_ID() external view returns (uint256);
 
-    event DistributeToSplit(JBSplit split, uint256 amount, address caller);
+    /// @notice The Juicebox controller used to manage projects.
+    /// @return The controller contract.
+    function CONTROLLER() external view returns (IJBController);
 
-    /// @notice The split group ID used for distributing game pot funds.
-    /// @return The split group.
-    function splitGroup() external view returns (uint256);
+    /// @notice The fee divisor for Defifa fees (100 / fee percent).
+    /// @return The fee divisor.
+    function DEFIFA_FEE_DIVISOR() external view returns (uint256);
 
     /// @notice The Juicebox project ID of the Defifa project.
     /// @return The project ID.
-    function defifaProjectId() external view returns (uint256);
-
-    /// @notice The Juicebox project ID of the base protocol project.
-    /// @return The project ID.
-    function baseProtocolProjectId() external view returns (uint256);
-
-    /// @notice The code origin address used as an implementation for hook clones.
-    /// @return The code origin address.
-    function hookCodeOrigin() external view returns (address);
-
-    /// @notice The token URI resolver used for game NFT metadata.
-    /// @return The token URI resolver contract.
-    function tokenUriResolver() external view returns (IJB721TokenUriResolver);
+    function DEFIFA_PROJECT_ID() external view returns (uint256);
 
     /// @notice The governor contract used for scorecard governance.
     /// @return The governor contract.
-    function governor() external view returns (IDefifaGovernor);
+    function GOVERNOR() external view returns (IDefifaGovernor);
 
-    /// @notice The Juicebox controller used to manage projects.
-    /// @return The controller contract.
-    function controller() external view returns (IJBController);
+    /// @notice The code origin address used as an implementation for hook clones.
+    /// @return The code origin address.
+    function HOOK_CODE_ORIGIN() external view returns (address);
 
     /// @notice The address registry used for content-addressable deployment lookups.
     /// @return The address registry contract.
-    function registry() external view returns (IJBAddressRegistry);
+    function REGISTRY() external view returns (IJBAddressRegistry);
 
-    /// @notice The fee divisor for Defifa fees (100 / fee percent).
-    /// @return The fee divisor.
-    function DEFIFA_FEE_DIVISOR() external view returns (uint256);
+    /// @notice The split group ID used for distributing game pot funds.
+    /// @return The split group.
+    function SPLIT_GROUP() external view returns (uint256);
 
-    /// @notice The fee divisor for base protocol fees (100 / fee percent).
-    /// @return The fee divisor.
-    function BASE_PROTOCOL_FEE_DIVISOR() external view returns (uint256);
+    /// @notice The token URI resolver used for game NFT metadata.
+    /// @return The token URI resolver contract.
+    function TOKEN_URI_RESOLVER() external view returns (IJB721TokenUriResolver);
+
+    /// @notice Whether the next game phase needs to be queued.
+    /// @param gameId The ID of the game.
+    /// @return True if the next phase needs queueing.
+    function nextPhaseNeedsQueueing(uint256 gameId) external view returns (bool);
+
+    /// @notice The safety parameters for a game.
+    /// @param gameId The ID of the game.
+    /// @return minParticipation The minimum participation threshold.
+    /// @return scorecardTimeout The scorecard timeout duration.
+    function safetyParamsOf(uint256 gameId) external view returns (uint256 minParticipation, uint32 scorecardTimeout);
 
     /// @notice The timing parameters for a game.
     /// @param gameId The ID of the game.
@@ -81,26 +94,15 @@ interface IDefifaDeployer {
     /// @return The token address.
     function tokenOf(uint256 gameId) external view returns (address);
 
-    /// @notice The safety parameters for a game.
-    /// @param gameId The ID of the game.
-    /// @return minParticipation The minimum participation threshold.
-    /// @return scorecardTimeout The scorecard timeout duration.
-    function safetyParamsOf(uint256 gameId) external view returns (uint256 minParticipation, uint32 scorecardTimeout);
-
-    /// @notice Whether the next game phase needs to be queued.
+    /// @notice Fulfill the commitments of a game by distributing the pot.
     /// @param gameId The ID of the game.
-    /// @return True if the next phase needs queueing.
-    function nextPhaseNeedsQueueing(uint256 gameId) external view returns (bool);
+    function fulfillCommitmentsOf(uint256 gameId) external;
 
     /// @notice Launch a new Defifa game.
     /// @param launchProjectData The configuration for launching the game.
     /// @return gameId The ID of the newly launched game.
     function launchGameWith(DefifaLaunchProjectData calldata launchProjectData) external returns (uint256 gameId);
 
-    /// @notice Fulfill the commitments of a game by distributing the pot.
-    /// @param gameId The ID of the game.
-    function fulfillCommitmentsOf(uint256 gameId) external;
-
     /// @notice Trigger a no-contest outcome for a game.
     /// @param gameId The ID of the game.
     function triggerNoContestFor(uint256 gameId) external;

package/src/interfaces/IDefifaGamePhaseReporter.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.0;
 
-import {DefifaGamePhase} from "./../enums/DefifaGamePhase.sol";
+import {DefifaGamePhase} from "../enums/DefifaGamePhase.sol";
 
 interface IDefifaGamePhaseReporter {
     function currentGamePhaseOf(uint256 gameId) external view returns (DefifaGamePhase);

package/src/interfaces/IDefifaGamePotReporter.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.0;
 
 interface IDefifaGamePotReporter {
     function fulfilledCommitmentsOf(uint256 gameId) external view returns (uint256);