feat: removed an external call to Core in DK.createDispute()

Author: jaybuidl

contracts/src/arbitration/KlerosCore.sol

@@ -683,7 +683,7 @@ contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
 
         sortitionModule.createDisputeHook(disputeID, 0); // Default round ID.
 
-        disputeKit.createDispute(disputeID, _numberOfChoices, _extraData, round.nbVotes);
+        disputeKit.createDispute(disputeID, 0, _numberOfChoices, _extraData, round.nbVotes);
         emit DisputeCreation(disputeID, IArbitrableV2(msg.sender));
     }
 
@@ -782,6 +782,7 @@ contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
 
         // Warning: the extra round must be created before calling disputeKit.createDispute()
         Round storage extraRound = dispute.rounds.push();
+        uint256 extraRoundID = dispute.rounds.length - 1;
 
         (uint96 newCourtID, uint256 newDisputeKitID, bool courtJump, ) = _getCourtAndDisputeKitJumps(
             dispute,
@@ -790,7 +791,7 @@ contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
             _disputeID
         );
         if (courtJump) {
-            emit CourtJump(_disputeID, dispute.rounds.length - 1, dispute.courtID, newCourtID);
+            emit CourtJump(_disputeID, extraRoundID, dispute.courtID, newCourtID);
         }
 
         dispute.courtID = newCourtID;
@@ -803,13 +804,14 @@ contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
         extraRound.totalFeesForJurors = msg.value;
         extraRound.disputeKitID = newDisputeKitID;
 
-        sortitionModule.createDisputeHook(_disputeID, dispute.rounds.length - 1);
+        sortitionModule.createDisputeHook(_disputeID, extraRoundID);
 
         // Dispute kit was changed, so create a dispute in the new DK contract.
         if (extraRound.disputeKitID != round.disputeKitID) {
             emit DisputeKitJump(_disputeID, dispute.rounds.length - 1, round.disputeKitID, extraRound.disputeKitID);
             disputeKits[extraRound.disputeKitID].createDispute(
                 _disputeID,
+                extraRoundID,
                 _numberOfChoices,
                 _extraData,
                 extraRound.nbVotes

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

@@ -200,6 +200,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
     /// @inheritdoc IDisputeKit
     function createDispute(
         uint256 _coreDisputeID,
+        uint256 _coreRoundID,
         uint256 _numberOfChoices,
         bytes calldata _extraData,
         uint256 /*_nbVotes*/
@@ -224,7 +225,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
         dispute.extraData = _extraData;
 
         // KlerosCore.Round must have been already created.
-        dispute.coreRoundIDToLocal[core.getNumberOfRounds(_coreDisputeID) - 1] = dispute.rounds.length;
+        dispute.coreRoundIDToLocal[_coreRoundID] = dispute.rounds.length;
         dispute.rounds.push().tied = true;
 
         emit DisputeCreation(_coreDisputeID, _numberOfChoices, _extraData);

contracts/src/arbitration/interfaces/IDisputeKit.sol

@@ -34,11 +34,13 @@ interface IDisputeKit {
     /// @dev Access restricted to Kleros Core only.
     /// @dev The new `KlerosCore.Round` must be created before calling this function.
     /// @param _coreDisputeID The ID of the dispute in Kleros Core, not in the Dispute Kit.
+    /// @param _coreRoundID The ID of the round in Kleros Core, not in the Dispute Kit.
     /// @param _numberOfChoices Number of choices of the dispute
     /// @param _extraData Additional info about the dispute, for possible use in future dispute kits.
     /// @param _nbVotes Maximal number of votes this dispute can get. Added for future-proofing.
     function createDispute(
         uint256 _coreDisputeID,
+        uint256 _coreRoundID,
         uint256 _numberOfChoices,
         bytes calldata _extraData,
         uint256 _nbVotes

contracts/src/arbitration/university/KlerosCoreUniversity.sol

@@ -531,7 +531,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
 
         sortitionModule.createDisputeHook(disputeID, 0); // Default round ID.
 
-        disputeKit.createDispute(disputeID, _numberOfChoices, _extraData, round.nbVotes);
+        disputeKit.createDispute(disputeID, 0, _numberOfChoices, _extraData, round.nbVotes);
         emit DisputeCreation(disputeID, IArbitrableV2(msg.sender));
     }
 
@@ -634,6 +634,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
 
         // Warning: the extra round must be created before calling disputeKit.createDispute()
         Round storage extraRound = dispute.rounds.push();
+        uint256 extraRoundID = dispute.rounds.length - 1;
 
         if (round.nbVotes >= courts[newCourtID].jurorsForCourtJump) {
             // Jump to parent court.
@@ -645,7 +646,7 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
             }
 
             if (newCourtID != dispute.courtID) {
-                emit CourtJump(_disputeID, dispute.rounds.length - 1, dispute.courtID, newCourtID);
+                emit CourtJump(_disputeID, extraRoundID, dispute.courtID, newCourtID);
             }
         }
 
@@ -659,13 +660,14 @@ contract KlerosCoreUniversity is IArbitratorV2, UUPSProxiable, Initializable {
         extraRound.totalFeesForJurors = msg.value;
         extraRound.disputeKitID = newDisputeKitID;
 
-        sortitionModule.createDisputeHook(_disputeID, dispute.rounds.length - 1);
+        sortitionModule.createDisputeHook(_disputeID, extraRoundID);
 
         // Dispute kit was changed, so create a dispute in the new DK contract.
         if (extraRound.disputeKitID != round.disputeKitID) {
             emit DisputeKitJump(_disputeID, dispute.rounds.length - 1, round.disputeKitID, extraRound.disputeKitID);
             disputeKits[extraRound.disputeKitID].createDispute(
                 _disputeID,
+                extraRoundID,
                 _numberOfChoices,
                 _extraData,
                 extraRound.nbVotes

contracts/test/arbitration/index.ts

@@ -74,7 +74,7 @@ describe("DisputeKitClassic", async () => {
 
   it("Should create a dispute", async () => {
     await expect(
-      disputeKit.connect(deployer).createDispute(0, 0, ethers.toBeHex(3), "0x00")
+      disputeKit.connect(deployer).createDispute(0, 0, 0, ethers.toBeHex(3), "0x00")
     ).to.be.revertedWithCustomError(disputeKit, "KlerosCoreOnly");
 
     const tx = await core