Skip to content

Contracts review feedback - round 1 #2154

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
jaybuidl merged 6 commits into from
Oct 6, 2025
Merged

Contracts review feedback - round 1 #2154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
615effc
refactor: renamed error AppealPeriodIsOver into NotAppealPeriod
jaybuidl Oct 2, 2025
11f84f7
fix: typos, natspec, small gas optimisation
jaybuidl Oct 2, 2025
ec9e89c
fix: minor KlerosCore improvements from reviews
jaybuidl Oct 6, 2025
40d2240
docs: natspec fixes
jaybuidl Oct 6, 2025
45bcd0f
docs: natspec fixes
jaybuidl Oct 6, 2025
06cccaa
refactor: minor improvement to the DisputeResolver
jaybuidl Oct 6, 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
8 changes: 4 additions & 4 deletions contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
if (!coreDisputeIDToActive[_coreDisputeID]) revert NotActiveForCoreDisputeID();

(uint256 appealPeriodStart, uint256 appealPeriodEnd) = core.appealPeriod(_coreDisputeID);
if (block.timestamp < appealPeriodStart || block.timestamp >= appealPeriodEnd) revert AppealPeriodIsOver();
if (block.timestamp < appealPeriodStart || block.timestamp >= appealPeriodEnd) revert NotAppealPeriod();

uint256 multiplier;
(uint256 ruling, , ) = this.currentRuling(_coreDisputeID);
Expand All @@ -381,7 +381,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
block.timestamp - appealPeriodStart >=
((appealPeriodEnd - appealPeriodStart) * LOSER_APPEAL_PERIOD_MULTIPLIER) / ONE_BASIS_POINT
) {
revert AppealPeriodIsOverForLoser();
revert NotAppealPeriodForLoser();
}
multiplier = LOSER_STAKE_MULTIPLIER;
}
Expand Down Expand Up @@ -759,8 +759,8 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
error ChoiceOutOfBounds();
error HashDoesNotMatchHiddenVoteCommitment();
error VoteAlreadyCast();
error AppealPeriodIsOver();
error AppealPeriodIsOverForLoser();
error NotAppealPeriod();
error NotAppealPeriodForLoser();
error AppealFeeIsAlreadyPaid();
error DisputeNotResolved();
error CoreIsPaused();
Expand Down
6 changes: 3 additions & 3 deletions contracts/test/foundry/KlerosCore_Appeals.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,22 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
disputeKit.castVote(disputeID, voteIDs, 2, 0, "XYZ");

vm.prank(crowdfunder1);
vm.expectRevert(DisputeKitClassicBase.AppealPeriodIsOver.selector);
vm.expectRevert(DisputeKitClassicBase.NotAppealPeriod.selector);
disputeKit.fundAppeal{value: 0.1 ether}(disputeID, 1);
core.passPeriod(disputeID);

(uint256 start, uint256 end) = core.appealPeriod(0);

vm.prank(crowdfunder1);
vm.warp(block.timestamp + ((end - start) / 2 + 1));
vm.expectRevert(DisputeKitClassicBase.AppealPeriodIsOverForLoser.selector);
vm.expectRevert(DisputeKitClassicBase.NotAppealPeriodForLoser.selector);
disputeKit.fundAppeal{value: 0.1 ether}(disputeID, 1); // Losing choice

disputeKit.fundAppeal(disputeID, 2); // Winning choice funding should not revert yet

vm.prank(crowdfunder1);
vm.warp(block.timestamp + (end - start) / 2); // Warp one more to cover the whole period
vm.expectRevert(DisputeKitClassicBase.AppealPeriodIsOver.selector);
vm.expectRevert(DisputeKitClassicBase.NotAppealPeriod.selector);
disputeKit.fundAppeal{value: 0.1 ether}(disputeID, 2);
}

Expand Down
Loading