@ballkidz/defifa 0.0.5 → 0.0.7

package/src/DefifaHook.sol

@@ -266,8 +266,9 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
         if (context.cashOutCount > 0) revert JB721Hook_UnexpectedTokenCashedOut();
 
         // Fetch the cash out hook metadata using the corresponding metadata ID.
-        (bool metadataExists, bytes memory metadata) =
-            JBMetadataResolver.getDataFor(JBMetadataResolver.getId("cashOut", codeOrigin), context.metadata);
+        (bool metadataExists, bytes memory metadata) = JBMetadataResolver.getDataFor({
+            id: JBMetadataResolver.getId({purpose: "cashOut", target: codeOrigin}), metadata: context.metadata
+        });
 
         uint256[] memory decodedTokenIds;
 
@@ -283,7 +284,8 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
 
         // Use this contract as the only cash out hook.
         hookSpecifications = new JBCashOutHookSpecification[](1);
-        hookSpecifications[0] = JBCashOutHookSpecification(this, 0, abi.encode(_cumulativeMintPrice));
+        hookSpecifications[0] =
+            JBCashOutHookSpecification({hook: this, amount: 0, metadata: abi.encode(_cumulativeMintPrice)});
 
         // Compute the cash out count based on the game phase.
         cashOutCount = DefifaHookLib.computeCashOutCount({
@@ -573,7 +575,7 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
             _tokenId = _tokenIds[_i];
 
             // Mint the token.
-            _mint(_reservedTokenBeneficiary, _tokenId);
+            _mint({to: _reservedTokenBeneficiary, tokenId: _tokenId});
 
             emit MintReservedToken(_tokenId, tierId, _reservedTokenBeneficiary, msg.sender);
 
@@ -614,9 +616,10 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
         ) revert JB721Hook_InvalidCashOut();
 
         // Fetch the cash out hook metadata using the corresponding metadata ID.
-        (bool metadataExists, bytes memory metadata) = JBMetadataResolver.getDataFor(
-            JBMetadataResolver.getId("cashOut", METADATA_ID_TARGET), context.cashOutMetadata
-        );
+        (bool metadataExists, bytes memory metadata) = JBMetadataResolver.getDataFor({
+            id: JBMetadataResolver.getId({purpose: "cashOut", target: METADATA_ID_TARGET}),
+            metadata: context.cashOutMetadata
+        });
 
         if (!metadataExists) {
             revert();
@@ -865,7 +868,7 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
             _tokenId = _tokenIds[_i];
 
             // Mint the tokens.
-            _mint(_beneficiary, _tokenId);
+            _mint({to: _beneficiary, tokenId: _tokenId});
 
             emit Mint(_tokenId, _mintTierIds[_i], _beneficiary, _amount, msg.sender);
 
@@ -889,8 +892,9 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
             // Get the current amount for the sending delegate.
             uint208 _current = _delegateTierCheckpoints[_from][_tierId].latest();
             // Set the new amount for the sending delegate.
-            (uint256 _oldValue, uint256 _newValue) =
-                _delegateTierCheckpoints[_from][_tierId].push(uint48(block.timestamp), _current - uint208(_amount));
+            (uint256 _oldValue, uint256 _newValue) = _delegateTierCheckpoints[_from][_tierId].push({
+                key: uint48(block.timestamp), value: _current - uint208(_amount)
+            });
             emit TierDelegateAttestationsChanged(_from, _tierId, _oldValue, _newValue, msg.sender);
         }
 
@@ -899,8 +903,9 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
             // Get the current amount for the receiving delegate.
             uint208 _current = _delegateTierCheckpoints[_to][_tierId].latest();
             // Set the new amount for the receiving delegate.
-            (uint256 _oldValue, uint256 _newValue) =
-                _delegateTierCheckpoints[_to][_tierId].push(uint48(block.timestamp), _current + uint208(_amount));
+            (uint256 _oldValue, uint256 _newValue) = _delegateTierCheckpoints[_to][_tierId].push({
+                key: uint48(block.timestamp), value: _current + uint208(_amount)
+            });
             emit TierDelegateAttestationsChanged(_to, _tierId, _oldValue, _newValue, msg.sender);
         }
     }
@@ -912,8 +917,9 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
         if (context.amount.currency != pricingCurrency) revert DefifaHook_WrongCurrency();
 
         // Resolve the metadata.
-        (bool found, bytes memory metadata) =
-            JBMetadataResolver.getDataFor(JBMetadataResolver.getId("pay", codeOrigin), context.payerMetadata);
+        (bool found, bytes memory metadata) = JBMetadataResolver.getDataFor({
+            id: JBMetadataResolver.getId({purpose: "pay", target: codeOrigin}), metadata: context.payerMetadata
+        });
 
         if (!found) revert DefifaHook_NothingToMint();
 
@@ -987,13 +993,13 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
             // If minting, add to the total tier checkpoints.
             if (_from == address(0)) {
                 // slither-disable-next-line unused-return
-                _totalTierCheckpoints[_tierId].push(uint48(block.timestamp), _current + uint208(_amount));
+                _totalTierCheckpoints[_tierId].push({key: uint48(block.timestamp), value: _current + uint208(_amount)});
             }
 
             // If burning, subtract from the total tier checkpoints.
             if (_to == address(0)) {
                 // slither-disable-next-line unused-return
-                _totalTierCheckpoints[_tierId].push(uint48(block.timestamp), _current - uint208(_amount));
+                _totalTierCheckpoints[_tierId].push({key: uint48(block.timestamp), value: _current - uint208(_amount)});
             }
         }
 

package/src/DefifaTokenUriResolver.sol

@@ -160,8 +160,9 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
                 }
 
                 if (_gamePhase == DefifaGamePhase.SCORING || _gamePhase == DefifaGamePhase.COMPLETE) {
-                    uint256 _potPortion =
-                        mulDiv(_gamePot, _hook.cashOutWeightOf(_tokenId), _hook.TOTAL_CASHOUT_WEIGHT());
+                    uint256 _potPortion = mulDiv({
+                        x: _gamePot, y: _hook.cashOutWeightOf(_tokenId), denominator: _hook.TOTAL_CASHOUT_WEIGHT()
+                    });
                     _valueText = !_hook.cashOutWeightIsSet()
                         ? "Awaiting scorecard..."
                         : _formatBalance({

package/src/interfaces/IDefifaDeployer.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.26;
 
 import {DefifaLaunchProjectData} from "../structs/DefifaLaunchProjectData.sol";
-import {DefifaOpsData} from "../structs/DefifaOpsData.sol";
 import {IDefifaHook} from "./IDefifaHook.sol";
 import {IDefifaGovernor} from "./IDefifaGovernor.sol";
 

package/src/interfaces/IDefifaGovernor.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.26;
 
 import {DefifaScorecardState} from "../enums/DefifaScorecardState.sol";
 import {DefifaTierCashOutWeight} from "../structs/DefifaTierCashOutWeight.sol";
-import {IDefifaHook} from "./IDefifaHook.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 
 /// @notice Manages the ratification of Defifa scorecards through attestation-based governance.

package/src/interfaces/IDefifaTokenUriResolver.sol

@@ -2,8 +2,6 @@
 pragma solidity 0.8.26;
 
 import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
-import {IDefifaHook} from "./IDefifaHook.sol";
-import {IDefifaGamePhaseReporter} from "./IDefifaGamePhaseReporter.sol";
 
 interface IDefifaTokenUriResolver {
     function typeface() external view returns (ITypeface);

package/src/libraries/DefifaHookLib.sol

@@ -248,7 +248,9 @@ library DefifaHookLib {
             cashOutCount = cumulativeMintPrice;
         } else {
             // If the game is in its scoring or complete phase, reclaim amount is based on the tier weights.
-            cashOutCount = mulDiv(surplusValue + _amountRedeemed, cumulativeCashOutWeight, TOTAL_CASHOUT_WEIGHT);
+            cashOutCount = mulDiv({
+                x: surplusValue + _amountRedeemed, y: cumulativeCashOutWeight, denominator: TOTAL_CASHOUT_WEIGHT
+            });
         }
     }
 
@@ -348,8 +350,8 @@ library DefifaHookLib {
         uint256 defifaAmount = _defifaToken.balanceOf(address(this)) * shareToBeneficiary / outOfTotal;
 
         // If there is an amount we should send, send it.
-        if (defifaAmount != 0) _defifaToken.safeTransfer(_beneficiary, defifaAmount);
-        if (baseProtocolAmount != 0) _baseProtocolToken.safeTransfer(_beneficiary, baseProtocolAmount);
+        if (defifaAmount != 0) _defifaToken.safeTransfer({to: _beneficiary, value: defifaAmount});
+        if (baseProtocolAmount != 0) _baseProtocolToken.safeTransfer({to: _beneficiary, value: baseProtocolAmount});
 
         emit ClaimedTokens(_beneficiary, defifaAmount, baseProtocolAmount, msg.sender);
 

package/src/structs/DefifaLaunchProjectData.sol

@@ -2,9 +2,7 @@
 pragma solidity 0.8.26;
 
 import {DefifaTierParams} from "./DefifaTierParams.sol";
-import {DefifaOpsData} from "./DefifaOpsData.sol";
 
-import {JBLaunchProjectConfig} from "@bananapus/721-hook-v6/src/structs/JBLaunchProjectConfig.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
 import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookStore.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";

package/test/DefifaFeeAccounting.t.sol

@@ -463,7 +463,7 @@ contract DefifaFeeAccountingTest is JBTest, TestBaseWorkflow {
     /// @notice Mint 1 NFT per tier, set delegation, return array of user addresses.
     function _mintAllTiers(
         DefifaHook _nft,
-        DefifaGovernor _governor,
+        DefifaGovernor,
         uint256 projectId,
         uint8 nTiers
     )
@@ -499,7 +499,7 @@ contract DefifaFeeAccountingTest is JBTest, TestBaseWorkflow {
         address[] memory users,
         DefifaHook _nft,
         DefifaGovernor _governor,
-        uint256 projectId,
+        uint256,
         uint8 nTiers
     )
         internal
@@ -541,7 +541,7 @@ contract DefifaFeeAccountingTest is JBTest, TestBaseWorkflow {
         return (_tierId * 1_000_000_000) + _tokenNumber;
     }
 
-    function _buildPayMetadata(bytes memory metadata) internal returns (bytes memory) {
+    function _buildPayMetadata(bytes memory metadata) internal view returns (bytes memory) {
         bytes[] memory data = new bytes[](1);
         data[0] = metadata;
         bytes4[] memory ids = new bytes4[](1);
@@ -549,7 +549,7 @@ contract DefifaFeeAccountingTest is JBTest, TestBaseWorkflow {
         return metadataHelper().createMetadata(ids, data);
     }
 
-    function _buildCashOutMetadata(bytes memory metadata) internal returns (bytes memory) {
+    function _buildCashOutMetadata(bytes memory metadata) internal view returns (bytes memory) {
         bytes[] memory data = new bytes[](1);
         data[0] = metadata;
         bytes4[] memory ids = new bytes4[](1);

package/test/DefifaGovernor.t.sol

@@ -631,7 +631,6 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         JB721Tier memory _tier = _hook.store().tierOf(address(_hook), 1, false);
         uint256 _cost = _tier.price;
 
-        address _delegateUser = address(bytes20(keccak256("_delegateUser")));
         address _refundUser = address(bytes20(keccak256("refund_user")));
         // The user should have no balance
         assertEq(_hook.balanceOf(_refundUser), 0);
@@ -931,8 +930,6 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
             _durationUntilProjectLaunch > 2 && _mintPeriodDuration > 1 && _inBetweenMintAndFifa > 1 && _fifaDuration > 1
         );
         uint48 _launchProjectAt = uint48(block.timestamp) + _durationUntilProjectLaunch;
-        uint48 _end =
-            _launchProjectAt + uint48(_mintPeriodDuration) + uint48(_inBetweenMintAndFifa) + uint48(_fifaDuration);
         DefifaTierParams[] memory tierParams = new DefifaTierParams[](1);
         tierParams[0] = DefifaTierParams({
             reservedRate: 1001,
@@ -988,12 +985,10 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
 
     function testWhenScorecardIsSubmittedWithUnmintedTier() public {
         uint8 nTiers = 10;
-        address[] memory _users = new address[](nTiers);
         DefifaLaunchProjectData memory defifaData = getBasicDefifaLaunchData(nTiers);
-        (uint256 _projectId, DefifaHook _nft, DefifaGovernor _governor) = createDefifaProject(defifaData);
+        (,, DefifaGovernor _governor) = createDefifaProject(defifaData);
         // Phase 1: Mint
         vm.warp(defifaData.start - defifaData.mintPeriodDuration - defifaData.refundPeriodDuration);
-        //deployer.queueNextPhaseOf(_projectId);
 
         // Warp to scoring phase (past start time)
         vm.warp(defifaData.start + 1);
@@ -1007,7 +1002,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
 
         vm.expectRevert(abi.encodeWithSignature("DefifaGovernor_UnownedProposedCashoutValue()"));
         // Forward time so proposals can be created
-        uint256 _proposalId = _governor.submitScorecardFor(_gameId, scorecards);
+        _governor.submitScorecardFor(_gameId, scorecards);
     }
 
     // function testWhenPhaseIsAlreadyQueued() public {
@@ -1256,7 +1251,6 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         assertEq(_refundUser.balance, 0);
         // The user should have have a token
         assertEq(_hook.balanceOf(_refundUser), 1);
-        uint256 _numberBurned = _hook.store().numberOfBurnedFor(address(_hook), _tierId);
         // Craft the metadata: redeem the tokenId
         bytes memory cashOutMetadata;
         {
@@ -1305,7 +1299,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         return (_tierId * 1_000_000_000) + _tokenNumber;
     }
 
-    function _buildPayMetadata(bytes memory metadata) internal returns (bytes memory) {
+    function _buildPayMetadata(bytes memory metadata) internal view returns (bytes memory) {
         // Build the metadata using the tiers to mint and the overspending flag.
         bytes[] memory data = new bytes[](1);
         data[0] = metadata;
@@ -1318,7 +1312,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         return metadataHelper().createMetadata(ids, data);
     }
 
-    function _buildCashOutMetadata(bytes memory metadata) internal returns (bytes memory) {
+    function _buildCashOutMetadata(bytes memory metadata) internal view returns (bytes memory) {
         // Build the metadata using the tiers to mint and the overspending flag.
         bytes[] memory data = new bytes[](1);
         data[0] = metadata;

package/test/{DefifaHook_AuditFindings.t.sol → DefifaHookRegressions.t.sol}

@@ -30,18 +30,18 @@ import {DefifaTierParams} from "../src/structs/DefifaTierParams.sol";
 import {DefifaTierCashOutWeight} from "../src/structs/DefifaTierCashOutWeight.sol";
 
 /// @dev Helper to read block.timestamp via an external call, bypassing the via-ir optimizer's timestamp caching.
-contract TimestampReaderAudit {
+contract TimestampReaderRegressions {
     function timestamp() external view returns (uint256) {
         return block.timestamp;
     }
 }
 
-/// @title DefifaHook_AuditFindings
+/// @title DefifaHookRegressions
 /// @notice Regression tests for audit findings in DefifaHook.
-contract DefifaHook_AuditFindings is JBTest, TestBaseWorkflow {
+contract DefifaHookRegressions is JBTest, TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
-    TimestampReaderAudit private _tsReader = new TimestampReaderAudit();
+    TimestampReaderRegressions private _tsReader = new TimestampReaderRegressions();
 
     address _protocolFeeProjectTokenAccount;
     address _defifaProjectTokenAccount;
@@ -364,7 +364,7 @@ contract DefifaHook_AuditFindings is JBTest, TestBaseWorkflow {
         return (_tierId * 1_000_000_000) + _tokenNumber;
     }
 
-    function _buildPayMetadata(bytes memory metadata) internal returns (bytes memory) {
+    function _buildPayMetadata(bytes memory metadata) internal view returns (bytes memory) {
         bytes[] memory data = new bytes[](1);
         data[0] = metadata;
         bytes4[] memory ids = new bytes4[](1);

package/test/DefifaNoContest.t.sol

@@ -892,7 +892,7 @@ contract DefifaNoContestTest is JBTest, TestBaseWorkflow {
             });
     }
 
-    function _cashOutMeta(uint256 tid, uint256 tnum) internal returns (bytes memory) {
+    function _cashOutMeta(uint256 tid, uint256 tnum) internal view returns (bytes memory) {
         uint256[] memory cid = new uint256[](1);
         cid[0] = (tid * 1_000_000_000) + tnum;
         bytes[] memory data = new bytes[](1);

package/test/DefifaSecurity.t.sol

@@ -678,7 +678,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
             });
     }
 
-    function _cashOutMeta(uint256 tid, uint256 tnum) internal returns (bytes memory) {
+    function _cashOutMeta(uint256 tid, uint256 tnum) internal view returns (bytes memory) {
         uint256[] memory cid = new uint256[](1);
         cid[0] = (tid * 1_000_000_000) + tnum;
         bytes[] memory data = new bytes[](1);