Skip to content

fix(ShutterDK): tie recovery commit #2175

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

Closed
wants to merge 2 commits into from
Closed

fix(ShutterDK): tie recovery commit #2175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8af1ba0
fix(ShutterDK): tie recovery commit
unknownunknown1 Oct 14, 2025
5666931
fix(DK): hash justification
unknownunknown1 Oct 14, 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
13 changes: 7 additions & 6 deletions contracts/src/arbitration/dispute-kits/DisputeKitGatedShutter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ contract DisputeKitGatedShutter is DisputeKitClassicBase {
///
/// @param _coreDisputeID The ID of the dispute in Kleros Core.
/// @param _voteIDs The IDs of the votes.
/// @param _commit The commitment hash including the justification.
/// @param _recoveryCommit The commitment hash without the justification.
/// @param _justificationHash Hash of the justification of the choice.
/// @param _identity The Shutter identity used for encryption.
/// @param _encryptedVote The Shutter encrypted vote.
function castCommitShutter(
uint256 _coreDisputeID,
uint256[] calldata _voteIDs,
bytes32 _commit,
bytes32 _recoveryCommit,
bytes32 _justificationHash,
bytes32 _identity,
bytes calldata _encryptedVote
) external notJumped(_coreDisputeID) {
Expand All @@ -127,10 +127,11 @@ contract DisputeKitGatedShutter is DisputeKitClassicBase {
for (uint256 i = 0; i < _voteIDs.length; i++) {
recoveryCommitments[localDisputeID][localRoundID][_voteIDs[i]] = _recoveryCommit;
}

// Construct Shutter commit out of recovery commit + justification.
bytes32 commit = keccak256(abi.encode(_recoveryCommit, _justificationHash));
// `_castCommit()` ensures that the caller owns the vote
_castCommit(_coreDisputeID, _voteIDs, _commit);
emit CommitCastShutter(_coreDisputeID, msg.sender, _commit, _recoveryCommit, _identity, _encryptedVote);
_castCommit(_coreDisputeID, _voteIDs, commit);
emit CommitCastShutter(_coreDisputeID, msg.sender, commit, _recoveryCommit, _identity, _encryptedVote);
}

/// @notice Version of the `castVote` function designed specifically for Shutter.
Expand Down Expand Up @@ -178,7 +179,7 @@ contract DisputeKitGatedShutter is DisputeKitClassicBase {
} else {
// Caller is not the juror, hash with `_justification`.
bytes32 justificationHash = keccak256(bytes(_justification));
return keccak256(abi.encode(_choice, _salt, justificationHash));
return keccak256(abi.encode(keccak256(abi.encodePacked(_choice, _salt)), justificationHash));
}
}

Expand Down
14 changes: 8 additions & 6 deletions contracts/src/arbitration/dispute-kits/DisputeKitShutter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ contract DisputeKitShutter is DisputeKitClassicBase {
///
/// @param _coreDisputeID The ID of the dispute in Kleros Core.
/// @param _voteIDs The IDs of the votes.
/// @param _commit The commitment hash including the justification.
/// @param _recoveryCommit The commitment hash without the justification.
/// @param _justification Justification of the choice.
/// @param _identity The Shutter identity used for encryption.
/// @param _encryptedVote The Shutter encrypted vote.
function castCommitShutter(
uint256 _coreDisputeID,
uint256[] calldata _voteIDs,
bytes32 _commit,
bytes32 _recoveryCommit,
string memory _justification,
bytes32 _identity,
bytes calldata _encryptedVote
) external notJumped(_coreDisputeID) {
Expand All @@ -111,10 +111,12 @@ contract DisputeKitShutter is DisputeKitClassicBase {
for (uint256 i = 0; i < _voteIDs.length; i++) {
recoveryCommitments[localDisputeID][localRoundID][_voteIDs[i]] = _recoveryCommit;
}

// Construct Shutter commit out of recovery commit + justification.
bytes32 justificationHash = keccak256(bytes(_justification));
bytes32 commit = keccak256(abi.encode(_recoveryCommit, justificationHash));
// `_castCommit()` ensures that the caller owns the vote
_castCommit(_coreDisputeID, _voteIDs, _commit);
emit CommitCastShutter(_coreDisputeID, msg.sender, _commit, _recoveryCommit, _identity, _encryptedVote);
_castCommit(_coreDisputeID, _voteIDs, commit);
emit CommitCastShutter(_coreDisputeID, msg.sender, commit, _recoveryCommit, _identity, _encryptedVote);
}

/// @notice Version of `castVote` function designed specifically for Shutter.
Expand Down Expand Up @@ -162,7 +164,7 @@ contract DisputeKitShutter is DisputeKitClassicBase {
} else {
// Caller is not the juror, hash with `_justification`.
bytes32 justificationHash = keccak256(bytes(_justification));
return keccak256(abi.encode(_choice, _salt, justificationHash));
return keccak256(abi.encode(keccak256(abi.encodePacked(_choice, _salt)), justificationHash));
}
}

Expand Down
51 changes: 27 additions & 24 deletions contracts/test/arbitration/dispute-kit-shutter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe("DisputeKitShutter", async () => {
// Full commitment: hash(choice, salt, justificationHash)
const justificationHash = ethers.keccak256(ethers.toUtf8Bytes(justification));
const fullCommit = ethers.keccak256(
ethers.AbiCoder.defaultAbiCoder().encode(["uint256", "uint256", "bytes32"], [choice, salt, justificationHash])
ethers.AbiCoder.defaultAbiCoder().encode(["bytes32", "bytes32"], [recoveryCommit, justificationHash])
);

return { fullCommit, recoveryCommit };
Expand Down Expand Up @@ -221,7 +221,7 @@ describe("DisputeKitShutter", async () => {
await expect(
disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote)
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote)
)
.to.emit(disputeKitShutter, "CommitCastShutter")
.withArgs(disputeId, juror1.address, fullCommit, recoveryCommit, identity, encryptedVote);
Expand All @@ -243,7 +243,7 @@ describe("DisputeKitShutter", async () => {
const { fullCommit: commit1, recoveryCommit: recovery1 } = generateCommitments(1n, 111n, "First justification");
await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, commit1, recovery1, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recovery1, "First justification", identity, encryptedVote);

// Second commitment (overwrites first)
const { fullCommit: commit2, recoveryCommit: recovery2 } = generateCommitments(
Expand All @@ -253,7 +253,7 @@ describe("DisputeKitShutter", async () => {
);
await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, commit2, recovery2, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recovery2, "Second justification", identity, encryptedVote);

// Verify only the second commitment is stored
const localDisputeId = await disputeKitShutter.coreDisputeIDToLocal(disputeId);
Expand All @@ -269,14 +269,13 @@ describe("DisputeKitShutter", async () => {
await advanceToCommitPeriod(disputeId);

const voteIDs = await getVoteIDsForJuror(disputeId, juror1);
const { fullCommit } = generateCommitments(choice, salt, justification);

await expect(
disputeKitShutter.connect(juror1).castCommitShutter(
disputeId,
voteIDs,
fullCommit,
ethers.ZeroHash, // Empty recovery commit
justification,
identity,
encryptedVote
)
Expand All @@ -294,7 +293,7 @@ describe("DisputeKitShutter", async () => {
await expect(
disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote)
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote)
).to.be.revertedWithCustomError(disputeKitShutter, "NotCommitPeriod");
});

Expand All @@ -310,8 +309,8 @@ describe("DisputeKitShutter", async () => {
disputeKitShutter.connect(juror2).castCommitShutter(
disputeId,
voteIDs, // Using juror1's vote IDs
fullCommit,
recoveryCommit,
justification,
identity,
encryptedVote
)
Expand All @@ -333,7 +332,7 @@ describe("DisputeKitShutter", async () => {
// Juror commits
await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand All @@ -360,7 +359,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand All @@ -386,7 +385,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand All @@ -412,7 +411,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand All @@ -438,7 +437,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand Down Expand Up @@ -466,7 +465,7 @@ describe("DisputeKitShutter", async () => {
// Juror commits
await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand Down Expand Up @@ -500,7 +499,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand Down Expand Up @@ -529,7 +528,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand All @@ -555,7 +554,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand All @@ -581,7 +580,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand Down Expand Up @@ -609,7 +608,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDs, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDs, recoveryCommit, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand All @@ -624,8 +623,12 @@ describe("DisputeKitShutter", async () => {
it("Should correctly compute hash for normal flow", async () => {
// Test hashVote function directly
const justificationHash = ethers.keccak256(ethers.toUtf8Bytes(justification));
const recoveryCommit = ethers.keccak256(
ethers.AbiCoder.defaultAbiCoder().encode(["uint256", "uint256"], [choice, salt])
);

const expectedHash = ethers.keccak256(
ethers.AbiCoder.defaultAbiCoder().encode(["uint256", "uint256", "bytes32"], [choice, salt, justificationHash])
ethers.AbiCoder.defaultAbiCoder().encode(["bytes32", "bytes32"], [recoveryCommit, justificationHash])
);

// When called by non-juror (normal case), should include justification
Expand All @@ -648,11 +651,11 @@ describe("DisputeKitShutter", async () => {
// Both jurors commit
await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDsJuror1, commit1, recovery1, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDsJuror1, recovery1, "Juror 1 justification", identity, encryptedVote);

await disputeKitShutter
.connect(juror2)
.castCommitShutter(disputeId, voteIDsJuror2, commit2, recovery2, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDsJuror2, recovery2, "Juror 2 justification", identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand Down Expand Up @@ -693,7 +696,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror1)
.castCommitShutter(disputeId, voteIDsJuror1, fullCommit, recoveryCommit, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDsJuror1, recoveryCommit, justification, identity, encryptedVote);

// Juror2 commits with a different choice
const differentChoice = 2n;
Expand All @@ -706,7 +709,7 @@ describe("DisputeKitShutter", async () => {

await disputeKitShutter
.connect(juror2)
.castCommitShutter(disputeId, voteIDsJuror2, commit2, recovery2, identity, encryptedVote);
.castCommitShutter(disputeId, voteIDsJuror2, recovery2, justification, identity, encryptedVote);

await advanceToVotePeriod(disputeId);

Expand Down
Loading