yep

rabbitholegg · Dec 1, 2023 · 7471341 · 7471341
1 parent 5b7f1c1
commit 7471341
Show file tree

Hide file tree

Showing 16 changed files with 1,130 additions and 73 deletions.
diff --git a/broadcast/Quest.s.sol/11155111/run-1701415478.json b/broadcast/Quest.s.sol/11155111/run-1701415478.json
diff --git a/broadcast/Quest.s.sol/11155111/run-1701415490.json b/broadcast/Quest.s.sol/11155111/run-1701415490.json
diff --git a/broadcast/Quest.s.sol/11155111/run-1701415519.json b/broadcast/Quest.s.sol/11155111/run-1701415519.json
diff --git a/broadcast/Quest.s.sol/11155111/run-1701415670.json b/broadcast/Quest.s.sol/11155111/run-1701415670.json
diff --git a/broadcast/Quest.s.sol/11155111/run-1701415684.json b/broadcast/Quest.s.sol/11155111/run-1701415684.json
diff --git a/broadcast/Quest.s.sol/11155111/run-1701415712.json b/broadcast/Quest.s.sol/11155111/run-1701415712.json
diff --git a/broadcast/Quest.s.sol/11155111/run-latest.json b/broadcast/Quest.s.sol/11155111/run-latest.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1701414274.json b/broadcast/QuestFactory.s.sol/11155111/run-1701414274.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1701414293.json b/broadcast/QuestFactory.s.sol/11155111/run-1701414293.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1701414312.json b/broadcast/QuestFactory.s.sol/11155111/run-1701414312.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1701415329.json b/broadcast/QuestFactory.s.sol/11155111/run-1701415329.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1701415336.json b/broadcast/QuestFactory.s.sol/11155111/run-1701415336.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1701415365.json b/broadcast/QuestFactory.s.sol/11155111/run-1701415365.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-latest.json b/broadcast/QuestFactory.s.sol/11155111/run-latest.json
diff --git a/contracts/Quest1155.sol b/contracts/Quest1155.sol
@@ -116,7 +116,6 @@ contract Quest1155 is ERC1155Holder, ReentrancyGuardUpgradeable, PausableUpgrade
         if (IERC1155(rewardToken).balanceOf(address(this), tokenId) < totalParticipants) {
             revert InsufficientTokenBalance();
         }
-        if (address(this).balance < this.maxProtocolReward()) revert InsufficientETHBalance();
         queued = true;
         emit Queued(block.timestamp);
     }

diff --git a/contracts/QuestFactory.sol b/contracts/QuestFactory.sol
@@ -159,14 +159,12 @@ contract QuestFactory is Initializable, LegacyStorage, OwnableRoles, IQuestFacto
     ) external payable nonReentrant returns (address) {
         Quest storage currentQuest = quests[questId_];
 
-        if (msg.value < totalQuestNFTFee(totalParticipants_)) revert MsgValueLessThanQuestNFTFee();
         if (currentQuest.questAddress != address(0)) revert QuestIdUsed();
 
         address payable newQuest =
             payable(erc1155QuestAddress.cloneDeterministic(keccak256(abi.encodePacked(msg.sender, block.chainid, block.timestamp))));
         currentQuest.questAddress = address(newQuest);
         currentQuest.totalParticipants = totalParticipants_;
-        currentQuest.questAddress.safeTransferETH(msg.value);
         currentQuest.questType = "erc1155";
         currentQuest.questCreator = msg.sender;
         IQuest1155Ownable questContract = IQuest1155Ownable(newQuest);