redeploy with more fixes

pauldev20 · Nov 16, 2024 · cda9efa · cda9efa
1 parent 01ab7bd
commit cda9efa
Show file tree

Hide file tree

Showing 7 changed files with 218 additions and 38 deletions.
diff --git a/packages/foundry/broadcast/Deploy.s.sol/480/run-1731777622.json b/packages/foundry/broadcast/Deploy.s.sol/480/run-1731777622.json
diff --git a/packages/foundry/broadcast/Deploy.s.sol/480/run-1731777900.json b/packages/foundry/broadcast/Deploy.s.sol/480/run-1731777900.json
diff --git a/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json b/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json
diff --git a/packages/foundry/contracts/HumanOracle.sol b/packages/foundry/contracts/HumanOracle.sol
@@ -104,12 +104,13 @@ contract HumanOracle {
 		_;
 	}
 
-	modifier userOldEnough(uint256 voteId) {
-		if (users[address(msg.sender)].createdAtBlock > getVoteStartBlock(voteId)) {
-			revert("user was created after voting begun");
-		}
-		_;
-	}
+	// security measurement
+	// modifier userOldEnough(uint256 voteId) {
+	// 	if (users[address(msg.sender)].createdAtBlock > getVoteStartBlock(voteId)) {
+	// 		revert("user was created after voting begun");
+	// 	}
+	// 	_;
+	// }
 
 	// ====================
 	// === Constructor ====
@@ -151,7 +152,7 @@ contract HumanOracle {
 		emit UserRegistered(userAddr, users[userAddr].nullifierHash, users[userAddr].createdAtBlock);
 	}
 
-	function submitVotingDecisionWithStake(uint256 voteId, uint256 answerIndex, uint256 amount) userOldEnough(voteId) userExists() hasNotVoted(voteId) voteActive(voteId) external {
+	function submitVotingDecisionWithStake(uint256 voteId, uint256 answerIndex, uint256 amount) userExists() hasNotVoted(voteId) voteActive(voteId) external {
 		require(amount <= 5, "max staking amount is 5");
 		address userAddr = address(msg.sender);
 		stakeForAnswer(userAddr, voteId, answerIndex, amount);
@@ -160,6 +161,7 @@ contract HumanOracle {
 
 	function claimRewardForVote(uint256 voteId) voteEnded(voteId) external returns (uint256) {
 		address userAddr = address(msg.sender);
+		require(!hasUserClaimedForVote(userAddr, voteId), "user already claimed");
 		setUserHasClaimedToTrueForVote(userAddr, voteId);
 		uint256 payout = getStakeResolvedUserAmount(userAddr, voteId);
 		emit RewardClaimed(userAddr, voteId, payout);
@@ -187,7 +189,7 @@ contract HumanOracle {
 
 		createNewStake(voteId, bounty);
 
-		emit VoteCreated(votes[voteId].id, votes[voteId].question, votes[voteId].startBlock, votes[voteId].durationInBlocks);
+		emit VoteCreated(voteId, getVoteQuestion(voteId), getVoteStartBlock(voteId), getVoteDurationInBlocks(voteId));
 	}
 
 	function getVotingPage(uint256 voteId) external view returns (
@@ -244,19 +246,25 @@ contract HumanOracle {
 		return false;
 	}
 
-	function hasUserClaimedForVote(address userAddr, uint256 voteId) external view returns (bool) {
+	function hasUserClaimedForVote(address userAddr, uint256 voteId) public view returns (bool) {
 		return stakesForVoteIds[voteId].hasUserClaimed[userAddr];
 	}
 
+	function getUserPayoutForVote(address userAddr, uint256 voteId) public view returns (uint256 payout) {
+		return getStakeResolvedUserAmount(userAddr, voteId);
+	}
+
 	// internal
 
 	// stake related
 	function createNewStake(uint256 voteId, uint256 initialStake) internal {
 		Stake storage newStake = stakesForVoteIds[voteId];
 		newStake.totalStake = initialStake;
 		uint256 answerCount = votes[voteId].answers.length;
+		uint256 initialStakePerAnswer = initialStake / answerCount;
 		for (uint i = 0; i < answerCount; i++) {
 			newStake.answers.push();
+			newStake.answers[i].totalStake = initialStakePerAnswer;
 		}
 	}
 

diff --git a/packages/foundry/contractsToVerify/HumanOracle.sol b/packages/foundry/contractsToVerify/HumanOracle.sol
@@ -104,12 +104,13 @@ contract HumanOracle {
 		_;
 	}
 
-	modifier userOldEnough(uint256 voteId) {
-		if (users[address(msg.sender)].createdAtBlock > getVoteStartBlock(voteId)) {
-			revert("user was created after voting begun");
-		}
-		_;
-	}
+	// security measurement
+	// modifier userOldEnough(uint256 voteId) {
+	// 	if (users[address(msg.sender)].createdAtBlock > getVoteStartBlock(voteId)) {
+	// 		revert("user was created after voting begun");
+	// 	}
+	// 	_;
+	// }
 
 	// ====================
 	// === Constructor ====
@@ -151,7 +152,7 @@ contract HumanOracle {
 		emit UserRegistered(userAddr, users[userAddr].nullifierHash, users[userAddr].createdAtBlock);
 	}
 
-	function submitVotingDecisionWithStake(uint256 voteId, uint256 answerIndex, uint256 amount) userOldEnough(voteId) userExists() hasNotVoted(voteId) voteActive(voteId) external {
+	function submitVotingDecisionWithStake(uint256 voteId, uint256 answerIndex, uint256 amount) userExists() hasNotVoted(voteId) voteActive(voteId) external {
 		require(amount <= 5, "max staking amount is 5");
 		address userAddr = address(msg.sender);
 		stakeForAnswer(userAddr, voteId, answerIndex, amount);
@@ -160,6 +161,7 @@ contract HumanOracle {
 
 	function claimRewardForVote(uint256 voteId) voteEnded(voteId) external returns (uint256) {
 		address userAddr = address(msg.sender);
+		require(!hasUserClaimedForVote(userAddr, voteId), "user already claimed");
 		setUserHasClaimedToTrueForVote(userAddr, voteId);
 		uint256 payout = getStakeResolvedUserAmount(userAddr, voteId);
 		emit RewardClaimed(userAddr, voteId, payout);
@@ -187,7 +189,7 @@ contract HumanOracle {
 
 		createNewStake(voteId, bounty);
 
-		emit VoteCreated(votes[voteId].id, votes[voteId].question, votes[voteId].startBlock, votes[voteId].durationInBlocks);
+		emit VoteCreated(voteId, getVoteQuestion(voteId), getVoteStartBlock(voteId), getVoteDurationInBlocks(voteId));
 	}
 
 	function getVotingPage(uint256 voteId) external view returns (
@@ -244,19 +246,25 @@ contract HumanOracle {
 		return false;
 	}
 
-	function hasUserClaimedForVote(address userAddr, uint256 voteId) external view returns (bool) {
+	function hasUserClaimedForVote(address userAddr, uint256 voteId) public view returns (bool) {
 		return stakesForVoteIds[voteId].hasUserClaimed[userAddr];
 	}
 
+	function getUserPayoutForVote(address userAddr, uint256 voteId) public view returns (uint256 payout) {
+		return getStakeResolvedUserAmount(userAddr, voteId);
+	}
+
 	// internal
 
 	// stake related
 	function createNewStake(uint256 voteId, uint256 initialStake) internal {
 		Stake storage newStake = stakesForVoteIds[voteId];
 		newStake.totalStake = initialStake;
 		uint256 answerCount = votes[voteId].answers.length;
+		uint256 initialStakePerAnswer = initialStake / answerCount;
 		for (uint i = 0; i < answerCount; i++) {
 			newStake.answers.push();
+			newStake.answers[i].totalStake = initialStakePerAnswer;
 		}
 	}
 

diff --git a/packages/nextjs-app/src/contracts/deployedContracts.ts b/packages/nextjs-app/src/contracts/deployedContracts.ts
@@ -289,7 +289,7 @@ const deployedContracts = {
   },
   480: {
     HumanOracle: {
-      address: "0x909ebe9c98afa1a685603584ed2eea91a20d5311",
+      address: "0xaacd5df051fe64da91422a0a2bf4f99a14732bda",
       abi: [
         {
           type: "constructor",
@@ -369,6 +369,30 @@ const deployedContracts = {
           outputs: [],
           stateMutability: "nonpayable",
         },
+        {
+          type: "function",
+          name: "getUserPayoutForVote",
+          inputs: [
+            {
+              name: "userAddr",
+              type: "address",
+              internalType: "address",
+            },
+            {
+              name: "voteId",
+              type: "uint256",
+              internalType: "uint256",
+            },
+          ],
+          outputs: [
+            {
+              name: "payout",
+              type: "uint256",
+              internalType: "uint256",
+            },
+          ],
+          stateMutability: "view",
+        },
         {
           type: "function",
           name: "getVotingList",

diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
@@ -290,7 +290,7 @@ const deployedContracts = {
   },
   480: {
     HumanOracle: {
-      address: "0x909ebe9c98afa1a685603584ed2eea91a20d5311",
+      address: "0xaacd5df051fe64da91422a0a2bf4f99a14732bda",
       abi: [
         {
           type: "constructor",
@@ -370,6 +370,30 @@ const deployedContracts = {
           outputs: [],
           stateMutability: "nonpayable",
         },
+        {
+          type: "function",
+          name: "getUserPayoutForVote",
+          inputs: [
+            {
+              name: "userAddr",
+              type: "address",
+              internalType: "address",
+            },
+            {
+              name: "voteId",
+              type: "uint256",
+              internalType: "uint256",
+            },
+          ],
+          outputs: [
+            {
+              name: "payout",
+              type: "uint256",
+              internalType: "uint256",
+            },
+          ],
+          stateMutability: "view",
+        },
         {
           type: "function",
           name: "getVotingList",