Skip to content

Commit

Permalink
better imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@mejango
mejango committed Jun 14, 2023
1 parent a5884c8 commit 1db4780
Show file tree
Hide file tree
Showing 69 changed files with 45,964 additions and 45,449 deletions.
167 changes: 93 additions & 74 deletions contracts/DefifaDelegate.sol
View file

Large diffs are not rendered by default.

62 changes: 41 additions & 21 deletions contracts/DefifaDeployer.sol
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,43 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.16;

import "@openzeppelin/contracts/access/Ownable.sol";
import "@openzeppelin/contracts/proxy/Clones.sol";
import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
import "@openzeppelin/contracts/utils/Strings.sol";
import "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBConstants.sol";
import "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBTokens.sol";
import "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBSplitsGroups.sol";
import "@jbx-protocol/juice-contracts-v3/contracts/structs/JBFundAccessConstraints.sol";
import "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBPayoutRedemptionPaymentTerminal3_1.sol";
import "@jbx-protocol/juice-721-delegate/contracts/libraries/JBTiered721FundingCycleMetadataResolver.sol";
import "./enums/DefifaGamePhase.sol";
import "./interfaces/IDefifaDeployer.sol";
import "./interfaces/IDefifaGamePhaseReporter.sol";
import "./interfaces/IDefifaGamePotReporter.sol";
import "./structs/DefifaDistributionOpsData.sol";
import "./DefifaDelegate.sol";
import "./DefifaTokenUriResolver.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { Clones } from "@openzeppelin/contracts/proxy/Clones.sol";
import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { JBConstants } from "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBConstants.sol";
import { JBTokens } from "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBTokens.sol";
import { JBSplitsGroups } from "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBSplitsGroups.sol";
import { JBFundAccessConstraints } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBFundAccessConstraints.sol";
import { JBFundingCycle } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBFundingCycle.sol";
import { JBFundingCycleMetadata } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBFundingCycleMetadata.sol";
import { JBFundingCycleData } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBFundingCycleData.sol";
import { JBGlobalFundingCycleMetadata } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBGlobalFundingCycleMetadata.sol";
import { JBGroupedSplits } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBGroupedSplits.sol";
import { JBSplit } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBSplit.sol";
import { IJBPayoutRedemptionPaymentTerminal3_1 } from "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBPayoutRedemptionPaymentTerminal3_1.sol";
import { IJBSplitAllocator } from "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBSplitAllocator.sol";
import { IJBSingleTokenPaymentTerminal } from "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBSingleTokenPaymentTerminal.sol";
import { IJBController3_1 } from "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBController3_1.sol";
import { IJBFundingCycleBallot } from "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBFundingCycleBallot.sol";
import { IJBPaymentTerminal } from "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBPaymentTerminal.sol";
import { JBTiered721FundingCycleMetadataResolver } from "@jbx-protocol/juice-721-delegate/contracts/libraries/JBTiered721FundingCycleMetadataResolver.sol";
import { IJB721TokenUriResolver } from "@jbx-protocol/juice-721-delegate/contracts/interfaces/IJB721TokenUriResolver.sol";
import { JB721TierParams } from "@jbx-protocol/juice-721-delegate/contracts/structs/JB721TierParams.sol";
import { JBTiered721FundingCycleMetadata } from "@jbx-protocol/juice-721-delegate/contracts/structs/JBTiered721FundingCycleMetadata.sol";
import { IJBDelegatesRegistry } from "@jbx-protocol/juice-delegates-registry/src/interfaces/IJBDelegatesRegistry.sol";
import { DefifaGamePhase } from "./enums/DefifaGamePhase.sol";
import { IDefifaDeployer } from "./interfaces/IDefifaDeployer.sol";
import { IDefifaDelegate } from "./interfaces/IDefifaDelegate.sol";
import { IDefifaGamePhaseReporter } from "./interfaces/IDefifaGamePhaseReporter.sol";
import { IDefifaGamePotReporter } from "./interfaces/IDefifaGamePotReporter.sol";
import { IDefifaGovernor } from "./interfaces/IDefifaGovernor.sol";
import { DefifaDistributionOpsData } from "./structs/DefifaDistributionOpsData.sol";
import { DefifaLaunchProjectData } from "./structs/DefifaLaunchProjectData.sol";
import { DefifaTierParams } from "./structs/DefifaTierParams.sol";
import { DefifaTimeData } from "./structs/DefifaTimeData.sol";
import { DefifaDelegate } from "./DefifaDelegate.sol";
import { DefifaTokenUriResolver } from "./DefifaTokenUriResolver.sol";

/// @title DefifaDeployer
/// @notice Deploys and manages Defifa games.
Expand Down Expand Up @@ -369,7 +389,7 @@ contract DefifaDeployer is
_store: _launchProjectData.store,
_gamePhaseReporter: this,
_gamePotReporter: this,
_defaultVotingDelegate: _launchProjectData.defaultVotingDelegate,
_defaultAttestationDelegate: _launchProjectData.defaultAttestationDelegate,
_tierNames: _tierNames
});

Expand All @@ -383,9 +403,9 @@ contract DefifaDeployer is

// Clone and initialize the new governor.
governor.initializeGame({
_gameId: gameId,
_attestationStartTime: uint256(_launchProjectData.votingStartTime),
_attestationGracePeriod: uint256(_launchProjectData.votingPeriod)
gameId: gameId,
attestationStartTime: uint256(_launchProjectData.attestationStartTime),
attestationGracePeriod: uint256(_launchProjectData.attestationGracePeriod)
});

// Transfer ownership to the specified owner.
Expand Down
80 changes: 43 additions & 37 deletions contracts/DefifaGovernor.sol
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.16;

import "@paulrberg/contracts/math/PRBMath.sol";
import "@openzeppelin/contracts/access/Ownable.sol";
import "@openzeppelin/contracts/utils/Address.sol";
import "./interfaces/IDefifaGovernor.sol";
import "./structs/DefifaScorecard.sol";
import "./structs/DefifaAttestations.sol";
import "./DefifaDelegate.sol";
import { PRBMath } from "@paulrberg/contracts/math/PRBMath.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { JBFundingCycleMetadata } from "@jbx-protocol/juice-contracts-v3/contracts/structs/JBFundingCycleMetadata.sol";
import { IJBController3_1 } from "@jbx-protocol/juice-contracts-v3/contracts/interfaces/IJBController3_1.sol";
import { JB721Tier } from "@jbx-protocol/juice-721-delegate/contracts/structs/JB721Tier.sol";
import { IDefifaDelegate } from "./interfaces/IDefifaDelegate.sol";
import { IDefifaGovernor } from "./interfaces/IDefifaGovernor.sol";
import { DefifaScorecard } from "./structs/DefifaScorecard.sol";
import { DefifaAttestations } from "./structs/DefifaAttestations.sol";
import { DefifaTierRedemptionWeight } from "./structs/DefifaTierRedemptionWeight.sol";
import { DefifaScorecardState } from "./enums/DefifaScorecardState.sol";
import { DefifaDelegate } from "./DefifaDelegate.sol";

/// @title DefifaGovernor
/// @notice Manages the ratification of Defifa scorecards.
Expand Down Expand Up @@ -45,16 +51,16 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
// --------------------- internal stored properties ------------------ //
//*********************************************************************//

/// @notice The time the vote will be active for once it has started, measured in seconds.
/// _gameId The ID of the game for which the voting period applies.
/// @notice The scorecard information, packed into a uint256.
/// _gameId The ID of the game for which the scorecard info applies.
mapping(uint256 => uint256) internal _packedScorecardInfoOf;

//*********************************************************************//
// ------------------------ public constants ------------------------- //
//*********************************************************************//

/// @notice The max voting power each tier has if every token within the tier votes.
uint256 public constant override MAX_VOTING_POWER_TIER = 1_000_000_000;
/// @notice The max attestation power each tier has if every token within the tier attestations.
uint256 public constant override MAX_ATTESTATION_POWER_TIER = 1_000_000_000;

//*********************************************************************//
// --------------- public immutable stored properties ---------------- //
Expand All @@ -67,8 +73,8 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
// -------------------- public stored properties --------------------- //
//*********************************************************************//

/// @notice The latest proposal submitted by the default voting delegate.
/// _gameId The ID of the game of the default voting delegate proposal.
/// @notice The latest proposal submitted by the default attestation delegate.
/// _gameId The ID of the game of the default attestation delegate proposal.
mapping(uint256 => uint256) public override defaultAttestationDelegateProposalOf;

/// @notice The scorecard that has been ratified.
Expand Down Expand Up @@ -102,15 +108,15 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {

/// @notice A value representing the contents of a scorecard.
/// @param _gameDelegate The address where the game is being played.
/// @param _calldata The calldata that will be sent if the scorecard is ratified.
function hashScorecardOf(address _gameDelegate, bytes memory _calldata)
/// @param _data The calldata that will be sent if the scorecard is ratified.
function hashScorecardOf(address _gameDelegate, bytes memory _data)
public
pure
virtual
override
returns (uint256)
{
return uint256(keccak256(abi.encode(_gameDelegate, _calldata)));
return uint256(keccak256(abi.encode(_gameDelegate, _data)));
}

/// @notice The state of a proposal.
Expand Down Expand Up @@ -166,33 +172,33 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
}

/// @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 voting period of.
/// @return The voting period in number of blocks.
/// @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 voting units that must have participated in a proposal for it to be ratified.
/// @return The quorum number of votes.
/// @notice The number of attestation units that must have participated in a proposal for it to be ratified.
/// @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.
(, JBFundingCycleMetadata memory _metadata) = controller.currentFundingCycleOf(_gameId);

return (IDefifaDelegate(_metadata.dataSource).store().maxTierIdOf(_metadata.dataSource) / 2)
* MAX_VOTING_POWER_TIER;
* MAX_ATTESTATION_POWER_TIER;
}

/// @notice Gets an account's voting power given a number of tiers to look through.
/// @param _gameId The ID of the game for which votes are being counted.
/// @param _account The account to get votes for.
/// @param _blockNumber The block number to measure votes from.
/// @return votingPower The amount of voting power.
/// @notice Gets an account's attestation power given a number of tiers to look through.
/// @param _gameId The ID of the game for which attestations are being counted.
/// @param _account The account to get attestations for.
/// @param _blockNumber The block number to measure attestations from.
/// @return attestationPower The amount of attestation power of an account.
function getAttestationWeight(uint256 _gameId, address _account, uint256 _blockNumber)
public
view
virtual
returns (uint256 votingPower)
returns (uint256 attestationPower)
{
// Get the game's current funding cycle along with its metadata.
(, JBFundingCycleMetadata memory _metadata) = controller.currentFundingCycleOf(_gameId);
Expand All @@ -208,17 +214,17 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
// Tier's are 1 indexed;
_tierId = _i + 1;

// Keep a reference to the number of tier votes for the account.
uint256 _tierVotesForAccount =
IDefifaDelegate(_metadata.dataSource).getPastTierAttestationsOf(_account, _tierId, _blockNumber);
// Keep a reference to the number of tier attestations for the account.
uint256 _tierAttestationUnitsForAccount =
IDefifaDelegate(_metadata.dataSource).getPastTierAttestationUnitsOf(_account, _tierId, _blockNumber);

// If there is tier voting power, increment the result by the proportion of votes the account has to the total, multiplied by the tier's maximum vote power.
// If there is tier attestation power, increment the result by the proportion of attestations the account has to the total, multiplied by the tier's maximum attestation power.
unchecked {
if (_tierVotesForAccount != 0) {
votingPower += PRBMath.mulDiv(
MAX_VOTING_POWER_TIER,
_tierVotesForAccount,
IDefifaDelegate(_metadata.dataSource).getPastTierTotalAttestationsOf(_tierId, _blockNumber)
if (_tierAttestationUnitsForAccount != 0) {
attestationPower += PRBMath.mulDiv(
MAX_ATTESTATION_POWER_TIER,
_tierAttestationUnitsForAccount,
IDefifaDelegate(_metadata.dataSource).getPastTierTotalAttestationUnitsOf(_tierId, _blockNumber)
);
}
}
Expand Down Expand Up @@ -316,7 +322,7 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
_scorecard.gracePeriodEnds = uint48(block.number + attestationGracePeriodOf(_gameId) / _blockTime);

// Keep a reference to the default attestation delegate.
address _defaultAttestationDelegate = IDefifaDelegate(_metadata.dataSource).defaultVotingDelegate();
address _defaultAttestationDelegate = IDefifaDelegate(_metadata.dataSource).defaultAttestationDelegate();

// If the scorecard is being sent from the default attestation delegate, store it.
if (msg.sender == _defaultAttestationDelegate) {
Expand Down
12 changes: 6 additions & 6 deletions contracts/DefifaHTMLTokenUriResolver.sol
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.16;

import "@openzeppelin/contracts/utils/Strings.sol";
import "@jbx-protocol/juice-721-delegate/contracts/interfaces/IJB721TokenUriResolver.sol";
import "@jbx-protocol/juice-721-delegate/contracts/libraries/JBIpfsDecoder.sol";
import "lib/base64/base64.sol";
import "./interfaces/IDefifaDelegate.sol";
import "./interfaces/IDefifaTokenUriResolver.sol";
import "./libraries/DefifaFontImporter.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { IJB721TokenUriResolver } from "@jbx-protocol/juice-721-delegate/contracts/interfaces/IJB721TokenUriResolver.sol";
import { JBIpfsDecoder } from "@jbx-protocol/juice-721-delegate/contracts/libraries/JBIpfsDecoder.sol";
import { IDefifaDelegate } from "./interfaces/IDefifaDelegate.sol";
import { IDefifaTokenUriResolver } from "./interfaces/IDefifaTokenUriResolver.sol";
import { DefifaFontImporter } from "./libraries/DefifaFontImporter.sol";
import {
IScriptyBuilder,
InlineScriptRequest,
Expand Down
27 changes: 15 additions & 12 deletions contracts/DefifaTokenUriResolver.sol
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.16;

import "@paulrberg/contracts/math/PRBMath.sol";
import "@openzeppelin/contracts/utils/Strings.sol";
import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
import "@openzeppelin/contracts/utils/math/SafeMath.sol";
import "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBTokens.sol";
import "@jbx-protocol/juice-721-delegate/contracts/interfaces/IJB721TokenUriResolver.sol";
import "@jbx-protocol/juice-721-delegate/contracts/libraries/JBIpfsDecoder.sol";
import "lib/base64/base64.sol";
import "./interfaces/IDefifaDelegate.sol";
import "./interfaces/IDefifaTokenUriResolver.sol";
import "./libraries/DefifaFontImporter.sol";
import { PRBMath } from "@paulrberg/contracts/math/PRBMath.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
import { SafeMath } from "@openzeppelin/contracts/utils/math/SafeMath.sol";
import { JBTokens } from "@jbx-protocol/juice-contracts-v3/contracts/libraries/JBTokens.sol";
import { IJB721TokenUriResolver } from "@jbx-protocol/juice-721-delegate/contracts/interfaces/IJB721TokenUriResolver.sol";
import { JBIpfsDecoder } from "@jbx-protocol/juice-721-delegate/contracts/libraries/JBIpfsDecoder.sol";
import { JB721Tier } from "@jbx-protocol/juice-721-delegate/contracts/structs/JB721Tier.sol";
import { ITypeface } from "lib/typeface/contracts/interfaces/ITypeface.sol";
import { IDefifaDelegate } from "./interfaces/IDefifaDelegate.sol";
import { IDefifaTokenUriResolver } from "./interfaces/IDefifaTokenUriResolver.sol";
import { DefifaFontImporter } from "./libraries/DefifaFontImporter.sol";
import { DefifaGamePhase } from "./enums/DefifaGamePhase.sol";

/// @title DefifaTokenUriResolver
/// @notice Standard Token URIs for Defifa games.
Expand Down Expand Up @@ -172,7 +175,7 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
_gameId.toString(),
" | POT: ",
_potText,
" | PLAYERS: ",
" | MINTS: ",
_delegate.store().totalSupplyOf(address(_delegate)).toString(),
"</text>",
'<text x="10" y="50" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #ed017c;">',
Expand Down Expand Up @@ -207,7 +210,7 @@ contract DefifaTokenUriResolver is IDefifaTokenUriResolver, IJB721TokenUriResolv
'<text x="10" y="455" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">RARITY: ',
_rarityText,
"</text>",
'<text x="10" y="480" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">VALUE: ',
'<text x="10" y="480" style="font-size:16px; font-family: Capsules-500; font-weight:500; fill: #c0b3f1;">BACKED BY: ',
_valueText,
"</text>",
"</svg>"
Expand Down
Loading

0 comments on commit 1db4780

Please sign in to comment.