Skip to content

fix(DK): multiple commit fix #2145

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

Merged
merged 3 commits into from
Sep 30, 2025
+17 −1
Merged

fix(DK): multiple commit fix #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b74ebc
fix(DK): multiple commit fix
unknownunknown1 Sep 24, 2025
df07fbb
fix(DK): allow recommits without changing counter
unknownunknown1 Sep 30, 2025
5b35be9
Merge branch 'dev' into fix/dk-multiple-commits
jaybuidl Sep 30, 2025
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
7 changes: 6 additions & 1 deletion contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,16 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi

Dispute storage dispute = disputes[coreDisputeIDToLocal[_coreDisputeID]];
Round storage round = dispute.rounds[dispute.rounds.length - 1];
// Introduce a counter so we don't count a re-commited votes.
uint256 commitCount;
for (uint256 i = 0; i < _voteIDs.length; i++) {
if (round.votes[_voteIDs[i]].account != msg.sender) revert JurorHasToOwnTheVote();
if (round.votes[_voteIDs[i]].commit == bytes32(0)) {
commitCount++;
}
round.votes[_voteIDs[i]].commit = _commit;
}
round.totalCommitted += _voteIDs.length;
round.totalCommitted += commitCount;
emit CommitCast(_coreDisputeID, msg.sender, _voteIDs, _commit);
}

Expand Down
11 changes: 11 additions & 0 deletions contracts/test/foundry/KlerosCore_Voting.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
sortitionModule.passPhase(); // Drawing phase
core.draw(disputeID, DEFAULT_NB_OF_JURORS);

uint256 NO = 0;
uint256 YES = 1;
uint256 salt = 123455678;
uint256[] memory voteIDs = new uint256[](1);
Expand Down Expand Up @@ -79,6 +80,16 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
(, bytes32 commitStored, , ) = disputeKit.getVoteInfo(0, 0, 0);
assertEq(commitStored, keccak256(abi.encodePacked(YES, salt)), "Incorrect commit");

// Cast again with the same voteID to check that the count doesn't increase.
bytes32 newCommit = keccak256(abi.encodePacked(NO, salt));
vm.prank(staker1);
disputeKit.castCommit(disputeID, voteIDs, newCommit);

(, , , totalCommited, , ) = disputeKit.getRoundInfo(disputeID, 0, 0);
assertEq(totalCommited, 1, "totalCommited should still be 1");
(, commitStored, , ) = disputeKit.getVoteInfo(0, 0, 0);
assertEq(commitStored, keccak256(abi.encodePacked(NO, salt)), "Incorrect commit after recommitting");

voteIDs = new uint256[](2); // Create the leftover votes subset
voteIDs[0] = 1;
voteIDs[1] = 2;
Expand Down
Loading