@ballkidz/defifa 0.0.28 → 0.0.30

package/src/DefifaProjectOwner.sol

@@ -17,7 +17,7 @@ contract DefifaProjectOwner is IERC721Receiver {
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    error DefifaProjectOwner_InvalidSender();
+    error DefifaProjectOwner_InvalidSender(address caller, address expectedSender);
 
     //*********************************************************************//
     // --------------- public immutable stored properties ---------------- //
@@ -64,7 +64,9 @@ contract DefifaProjectOwner is IERC721Receiver {
         operator;
 
         // Make sure the 721 received is the JBProjects contract.
-        if (msg.sender != address(PROJECTS)) revert DefifaProjectOwner_InvalidSender();
+        if (msg.sender != address(PROJECTS)) {
+            revert DefifaProjectOwner_InvalidSender({caller: msg.sender, expectedSender: address(PROJECTS)});
+        }
 
         // Set the correct permission.
         uint8[] memory permissionIds = new uint8[](1);

package/src/DefifaTokenUriResolver.sol

@@ -205,27 +205,30 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
                 gamePhaseText,
                 "</text>",
                 '<text x="10" y="85" style="font-size:26px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">',
-                _getSubstring(titleSvg, 0, 30),
+                _getSubstring({str: titleSvg, startIndex: 0, endIndex: 30}),
                 "</text>",
                 '<text x="10" y="120" style="font-size:26px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">',
-                _getSubstring(titleSvg, 30, 60),
+                _getSubstring({str: titleSvg, startIndex: 30, endIndex: 60}),
                 "</text>",
                 '<text x="10" y="205" style="font-size:80px; font-family: Capsules-700; font-weight:700; fill: #fea282;">',
-                bytes(_getSubstring(teamSvg, 20, 30)).length != 0 && bytes(_getSubstring(teamSvg, 10, 20)).length != 0
-                    ? _getSubstring(teamSvg, 0, 10)
+                bytes(_getSubstring({str: teamSvg, startIndex: 20, endIndex: 30})).length != 0
+                    && bytes(_getSubstring({str: teamSvg, startIndex: 10, endIndex: 20})).length != 0
+                    ? _getSubstring({str: teamSvg, startIndex: 0, endIndex: 10})
                     : "",
                 "</text>",
                 '<text x="10" y="295" style="font-size:80px; font-family: Capsules-700; font-weight:700; fill: #fea282;">',
-                bytes(_getSubstring(teamSvg, 20, 30)).length != 0
-                    ? _getSubstring(teamSvg, 10, 20)
-                    : bytes(_getSubstring(teamSvg, 10, 20)).length != 0 ? _getSubstring(teamSvg, 0, 10) : "",
+                bytes(_getSubstring({str: teamSvg, startIndex: 20, endIndex: 30})).length != 0
+                    ? _getSubstring({str: teamSvg, startIndex: 10, endIndex: 20})
+                    : bytes(_getSubstring({str: teamSvg, startIndex: 10, endIndex: 20})).length != 0
+                        ? _getSubstring({str: teamSvg, startIndex: 0, endIndex: 10})
+                        : "",
                 "</text>",
                 '<text x="10" y="385" style="font-size:80px; font-family: Capsules-700; font-weight:700; fill: #fea282;">',
-                bytes(_getSubstring(teamSvg, 20, 30)).length != 0
-                    ? _getSubstring(teamSvg, 20, 30)
-                    : bytes(_getSubstring(teamSvg, 10, 20)).length != 0
-                        ? _getSubstring(teamSvg, 10, 20)
-                        : _getSubstring(teamSvg, 0, 10),
+                bytes(_getSubstring({str: teamSvg, startIndex: 20, endIndex: 30})).length != 0
+                    ? _getSubstring({str: teamSvg, startIndex: 20, endIndex: 30})
+                    : bytes(_getSubstring({str: teamSvg, startIndex: 10, endIndex: 20})).length != 0
+                        ? _getSubstring({str: teamSvg, startIndex: 10, endIndex: 20})
+                        : _getSubstring({str: teamSvg, startIndex: 0, endIndex: 10}),
                 "</text>",
                 '<text x="10" y="430" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">TOKEN ID: ',
                 tokenId.toString(),
@@ -240,7 +243,6 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
             )
         );
         parts[3] = string('"}');
-        // slither-disable-next-line encode-packed-collision
         return string.concat(parts[0], Base64.encode(abi.encodePacked(parts[1], parts[2], parts[3])));
     }
 
@@ -282,9 +284,19 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
         }
 
         // Concatenate the strings
-        return isEth
-            ? string(abi.encodePacked("\u039E", integerPart, ".", decimalPartStr))
-            : string(abi.encodePacked(integerPart, ".", decimalPartStr, " ", IERC20Metadata(token).symbol()));
+        if (isEth) {
+            return string(abi.encodePacked("\u039E", integerPart, ".", decimalPartStr));
+        }
+
+        // Try to get the token symbol; fall back to a truncated hex address if the call reverts.
+        string memory tokenSymbol;
+        try IERC20Metadata(token).symbol() returns (string memory s) {
+            tokenSymbol = _escapeSvg(s);
+        } catch {
+            tokenSymbol = Strings.toHexString(uint160(token), 20);
+        }
+
+        return string(abi.encodePacked(integerPart, ".", decimalPartStr, " ", tokenSymbol));
     }
 
     /// @notice Gets a substring.

package/src/interfaces/IDefifaDeployer.sol

@@ -20,12 +20,6 @@ interface IDefifaDeployer {
     /// @param reason The revert reason bytes from the failed payout.
     event CommitmentPayoutFailed(uint256 indexed gameId, uint256 amount, bytes reason);
 
-    /// @notice Emitted when a split receives a portion of the game pot.
-    /// @param split The split that received funds.
-    /// @param amount The amount sent to the split.
-    /// @param caller The address that triggered the distribution.
-    event DistributeToSplit(JBSplit split, uint256 amount, address caller);
-
     /// @notice Emitted when a game's commitments have been fulfilled.
     /// @param gameId The ID of the fulfilled game.
     /// @param pot The total game pot that was fulfilled.
@@ -51,16 +45,6 @@ interface IDefifaDeployer {
     /// @param caller The address that queued the phase transition.
     event QueuedNoContest(uint256 indexed gameId, address caller);
 
-    /// @notice Emitted when a game is queued into its refund phase.
-    /// @param gameId The ID of the game.
-    /// @param caller The address that queued the phase transition.
-    event QueuedRefundPhase(uint256 indexed gameId, address caller);
-
-    /// @notice Emitted when a game is queued into its scoring phase.
-    /// @param gameId The ID of the game.
-    /// @param caller The address that queued the phase transition.
-    event QueuedScoringPhase(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);

package/src/interfaces/IDefifaHook.sol

@@ -193,10 +193,6 @@ interface IDefifaHook is IJB721Hook {
     /// @return The tier name.
     function tierNameOf(uint256 tierId) external view returns (string memory);
 
-    /// @notice The token allocations (Defifa token amount, base protocol token amount).
-    /// @return The Defifa token allocation and the base protocol token allocation.
-    function tokenAllocations() external view returns (uint256, uint256);
-
     /// @notice Get the claimable Defifa and base protocol tokens for a set of token IDs.
     /// @param tokenIds The token IDs to check.
     /// @return The claimable Defifa token amount and base protocol token amount.