Merge branch 'develop' into release-1.10.0

skalenetwork · Mar 20, 2024 · a8c9231 · a8c9231
2 parents 42aff92 + 4b05269
commit a8c9231
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 28 deletions.
diff --git a/contracts/IContractManager.sol b/contracts/IContractManager.sol
@@ -39,4 +39,4 @@ interface IContractManager {
     function getTokenState() external view returns (address);
     function getPunisher() external view returns (address);
     function getContract(string calldata name) external view returns (address);
-}
+}
diff --git a/contracts/INodes.sol b/contracts/INodes.sol
@@ -119,7 +119,7 @@ interface INodes {
         bytes4 previousIP,
         bytes4 newIP
     );
-    
+
     function removeSpaceFromNode(uint nodeIndex, uint8 space) external returns (bool);
     function addSpaceToNode(uint nodeIndex, uint8 space) external;
     function changeNodeLastRewardDate(uint nodeIndex) external;
@@ -168,5 +168,7 @@ interface INodes {
     function isNodeExist(address from, uint nodeIndex) external view returns (bool);
     function isNodeActive(uint nodeIndex) external view returns (bool);
     function isNodeLeaving(uint nodeIndex) external view returns (bool);
+    function isNodeVisible(uint256 nodeIndex) external view returns (bool);
     function getLastChangeIpTime(uint nodeIndex) external view returns (uint);
+    function getFreeSpace(uint256 nodeIndex) external view returns (uint8 freeSpace);
 }
diff --git a/contracts/ISchainsInternal.sol b/contracts/ISchainsInternal.sol
@@ -66,7 +66,6 @@ interface ISchainsInternal {
     )
         external
         returns (uint[] memory);
-    function changeLifetime(bytes32 schainHash, uint lifetime, uint deposit) external;
     function removeSchain(bytes32 schainHash, address from) external;
     function removeNodeFromSchain(uint nodeIndex, bytes32 schainHash) external;
     function deleteGroup(bytes32 schainHash) external;

diff --git a/contracts/ISkaleDKG.sol b/contracts/ISkaleDKG.sol
@@ -60,7 +60,7 @@ interface ISkaleDKG {
         bytes32[2] publicKey;
         bytes32 share;
     }
-    
+
     /**
      * @dev Emitted when a channel is opened.
      */
@@ -115,7 +115,9 @@ interface ISkaleDKG {
      * @dev Emitted when a complaint is sent.
      */
     event ComplaintSent(bytes32 indexed schainHash, uint indexed fromNodeIndex, uint indexed toNodeIndex);
-
+
+    // External
+
     function alright(bytes32 schainHash, uint fromNodeIndex) external;
     function broadcast(
         bytes32 schainHash,
@@ -125,7 +127,11 @@ interface ISkaleDKG {
         uint rotationCounter
     )
         external;
+    function complaint(bytes32 schainHash, uint fromNodeIndex, uint toNodeIndex) external;
     function complaintBadData(bytes32 schainHash, uint fromNodeIndex, uint toNodeIndex) external;
+    function deleteChannel(bytes32 schainHash) external;
+    function finalizeSlashing(bytes32 schainHash, uint badNode) external;
+    function openChannel(bytes32 schainHash) external;
     function preResponse(
         bytes32 schainId,
         uint fromNodeIndex,
@@ -134,30 +140,39 @@ interface ISkaleDKG {
         KeyShare[] memory secretKeyContribution
     )
         external;
-    function complaint(bytes32 schainHash, uint fromNodeIndex, uint toNodeIndex) external;
+    function resetPendingToBeReplaced(bytes32 schainHash) external;
     function response(
         bytes32 schainHash,
         uint fromNodeIndex,
         uint secretNumber,
         G2Point memory multipliedShare
     )
         external;
-    function openChannel(bytes32 schainHash) external;
-    function deleteChannel(bytes32 schainHash) external;
-    function setStartAlrightTimestamp(bytes32 schainHash) external;
     function setBadNode(bytes32 schainHash, uint nodeIndex) external;
-    function finalizeSlashing(bytes32 schainHash, uint badNode) external;
-    function getChannelStartedTime(bytes32 schainHash) external view returns (uint);
+    function setStartAlrightTimestamp(bytes32 schainHash) external;
+
+    // External view
+
+    function checkAndReturnIndexInGroup(
+        bytes32 schainHash,
+        uint nodeIndex,
+        bool revertCheck
+    )
+        external
+        view
+        returns (uint, bool);
+    function getAlrightStartedTime(bytes32 schainHash) external view returns (uint);
     function getChannelStartedBlock(bytes32 schainHash) external view returns (uint);
+    function getChannelStartedTime(bytes32 schainHash) external view returns (uint);
+    function getComplaintData(bytes32 schainHash) external view returns (uint, uint);
+    function getComplaintStartedTime(bytes32 schainHash) external view returns (uint);
     function getNumberOfBroadcasted(bytes32 schainHash) external view returns (uint);
     function getNumberOfCompleted(bytes32 schainHash) external view returns (uint);
     function getTimeOfLastSuccessfulDKG(bytes32 schainHash) external view returns (uint);
-    function getComplaintData(bytes32 schainHash) external view returns (uint, uint);
-    function getComplaintStartedTime(bytes32 schainHash) external view returns (uint);
-    function getAlrightStartedTime(bytes32 schainHash) external view returns (uint);
-    function isChannelOpened(bytes32 schainHash) external view returns (bool);
-    function isLastDKGSuccessful(bytes32 groupIndex) external view returns (bool);
+    function isAllDataReceived(bytes32 schainHash, uint nodeIndex) external view returns (bool);
+    function isAlrightPossible(bytes32 schainHash, uint nodeIndex) external view returns (bool);
     function isBroadcastPossible(bytes32 schainHash, uint nodeIndex) external view returns (bool);
+    function isChannelOpened(bytes32 schainHash) external view returns (bool);
     function isComplaintPossible(
         bytes32 schainHash,
         uint fromNodeIndex,
@@ -166,20 +181,15 @@ interface ISkaleDKG {
         external
         view
         returns (bool);
-    function isAlrightPossible(bytes32 schainHash, uint nodeIndex) external view returns (bool);
+    function isEveryoneBroadcasted(bytes32 schainHash) external view returns (bool);
+    function isLastDKGSuccessful(bytes32 groupIndex) external view returns (bool);
+    function isNodeBroadcasted(bytes32 schainHash, uint nodeIndex) external view returns (bool);
     function isPreResponsePossible(bytes32 schainHash, uint nodeIndex) external view returns (bool);
     function isResponsePossible(bytes32 schainHash, uint nodeIndex) external view returns (bool);
-    function isNodeBroadcasted(bytes32 schainHash, uint nodeIndex) external view returns (bool);
-    function isAllDataReceived(bytes32 schainHash, uint nodeIndex) external view returns (bool);
-    function checkAndReturnIndexInGroup(
-        bytes32 schainHash,
-        uint nodeIndex,
-        bool revertCheck
-    )
-        external
-        view
-        returns (uint, bool);
-    function isEveryoneBroadcasted(bytes32 schainHash) external view returns (bool);
+    function pendingToBeReplaced(bytes32 schainHash) external view returns (uint256);
+
+    // External pure
+
     function hashData(
         KeyShare[] memory secretKeyContribution,
         G2Point[] memory verificationVector