Skip to content

minor fixes to contract logic #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nuel-ikwuoma wants to merge 1 commit into
base: main
Choose a base branch
from
Open

minor fixes to contract logic #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions packages/hardhat/contracts/AavegotchiChainStory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import "hardhat/console.sol";
// import "@openzeppelin/contracts/access/Ownable.sol";

/**
* A smart contract that allows changing a state variable of the contract and tracking the changes
* It also allows the owner to withdraw the Ether in the contract
* @author BuidlGuidl
* A smart contract implementation for the Aavegotchi Chain Story
* @author Nick Mudge
*/
contract AavegotchiChainStory {

Expand Down Expand Up @@ -124,6 +123,7 @@ contract AavegotchiChainStory {
author.publishedStoryPartId = storyPartId;
author.storyPartIds.push(storyPartId);
s.winningSubmissionStoryPartId = type(uint24).max;
GLTR_ERC20_TOKEN.transferFrom(msg.sender, address(this), _gltrAmount);

emit StoryPartPublished(0, storyPartId, msg.sender);
}
Expand All @@ -142,7 +142,7 @@ contract AavegotchiChainStory {
}

function canSubmitStoryPartAfterFourteenDays() internal view returns(bool can_) {
return block.timestamp > s.submissionStartTime + 14;
return block.timestamp > s.submissionStartTime + 14 days;
}

function internalCanSubmitStoryPart() internal view returns(bool can_) {
Expand Down Expand Up @@ -176,12 +176,12 @@ contract AavegotchiChainStory {
if(s.newSubmissionInRound) {
newRounds = (block.timestamp - (submissionStartTime_ + 14 days)) / 7 days;
round_ += newRounds;
submissionStartTime_ = block.timestamp + (submissionStartTime_ + 14 days) + (newRounds * 7 days);
submissionStartTime_ = (submissionStartTime_ + 14 days) + (newRounds * 7 days);
}
else {
newRounds = (block.timestamp - (submissionStartTime_ + 7 days)) / 7 days;
round_ += newRounds;
submissionStartTime_ = block.timestamp + (submissionStartTime_ + 7 days) + (newRounds * 7 days);
submissionStartTime_ = (submissionStartTime_ + 7 days) + (newRounds * 7 days);
}
round_++;
}
Expand All @@ -201,7 +201,7 @@ contract AavegotchiChainStory {
(round_, submissionStartTime_) = getRoundSubmissionData();
submissionEndTime_ = submissionStartTime_ + 7 days;
if(s.newSubmissionInRound) {
voteStartTime_ + submissionEndTime_;
voteStartTime_ = submissionEndTime_;
voteEndTime_ = voteStartTime_ + 7 days;
}
}
Expand Down Expand Up @@ -330,6 +330,7 @@ contract AavegotchiChainStory {
}
emit SubmissionVote(msg.sender, round, _storyPartId);
uint256 numPublishedAuthors = s.publishedStoryParts.length;
author.roundsVoted[round] = true;
totalAuthorsVoted++;
s.totalAuthorsVoted = uint16(totalAuthorsVoted);
if(numPublishedAuthors == totalAuthorsVoted) {
Expand Down Expand Up @@ -408,7 +409,7 @@ contract AavegotchiChainStory {
if(canSubmitStoryPartAfterFourteenDays() && _round == s.round && s.newSubmissionInRound) {
winningStoryPartId = s.winningSubmissionStoryPartId;
StoryPart storage winningStoryPart = s.storyParts[winningStoryPartId];
// If there were no voes this is false
// If there were no votes this is false
if(winningStoryPart.voteScore > s.noSubmissionVoteScore) {
reportWinningStoryPart = true;
}
Expand Down Expand Up @@ -500,6 +501,7 @@ contract AavegotchiChainStory {
}
s.gltrMinimum = uint104(_newGltrMinimum);
}

function getGltrMinimum() external view returns(uint256) {
return s.gltrMinimum;
}
Expand Down