feat: added the current dispute kit as parameter to getNbVotesAfterAppeal()

Author: jaybuidl

contracts/src/arbitration/KlerosCoreBase.sol

@@ -930,7 +930,10 @@ abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable
 
  (, uint256 newDisputeKitID, bool courtJump, ) = _getCourtAndDisputeKitJumps(dispute, round, court, _disputeID);
 
- uint256 nbVotesAfterAppeal = disputeKits[newDisputeKitID].getNbVotesAfterAppeal(round.nbVotes);
+ uint256 nbVotesAfterAppeal = disputeKits[newDisputeKitID].getNbVotesAfterAppeal(
+ disputeKits[round.disputeKitID],
+ round.nbVotes
+ );
 
  if (courtJump) {
  // Jump to parent court.

contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol

@@ -636,7 +636,10 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
  /// @dev Returns the number of votes after the appeal.
  /// @param _currentNbVotes The number of votes before the appeal.
  /// @return The number of votes after the appeal.
- function getNbVotesAfterAppeal(uint256 _currentNbVotes) external pure override returns (uint256) {
+ function getNbVotesAfterAppeal(
+ IDisputeKit /* _previousDisputeKit */,
+ uint256 _currentNbVotes
+ ) external pure override returns (uint256) {
  return (_currentNbVotes * 2) + 1;
  }
 

contracts/src/arbitration/interfaces/IDisputeKit.sol

@@ -119,9 +119,13 @@ interface IDisputeKit {
  function earlyCourtJump(uint256 _coreDisputeID) external view returns (bool);
 
  /// @dev Returns the number of votes after the appeal.
+ /// @param _previousDisputeKit The previous Dispute Kit.
  /// @param _currentNbVotes The number of votes before the appeal.
  /// @return The number of votes after the appeal.
- function getNbVotesAfterAppeal(uint256 _currentNbVotes) external view returns (uint256);
+ function getNbVotesAfterAppeal(
+ IDisputeKit _previousDisputeKit,
+ uint256 _currentNbVotes
+ ) external view returns (uint256); // TODO: remove previousDisputeKit
 
  /// @dev Returns true if the specified voter was active in this round.
  /// @param _coreDisputeID The ID of the dispute in Kleros Core, not in the Dispute Kit.