fix: statemind - inconsistent reset hooks

symbioticfi · Dec 27, 2024 · 3305e47 · 3305e47
1 parent 2d75430
commit 3305e47
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/src/contracts/fullRestakeDelegator/FullRestakeResetHook.sol b/src/contracts/fullRestakeDelegator/FullRestakeResetHook.sol
@@ -24,8 +24,10 @@ contract FullRestakeResetHook is IFullRestakeResetHook {
      */
     uint256 public immutable SLASH_COUNT;
 
-    mapping(address vault => mapping(address operator => CircularBuffer.Bytes32CircularBuffer buffer)) private
-        _slashings;
+    mapping(
+        address vault
+            => mapping(bytes32 subnetwork => mapping(address operator => CircularBuffer.Bytes32CircularBuffer buffer))
+    ) private _slashings;
 
     constructor(uint48 period, uint256 slashCount) {
         if (slashCount == 0) {
@@ -56,19 +58,19 @@ contract FullRestakeResetHook is IFullRestakeResetHook {
             revert NotVaultDelegator();
         }
 
-        if (_slashings[vault][operator].count() == 0) {
-            _slashings[vault][operator].setup(SLASH_COUNT);
+        if (_slashings[vault][subnetwork][operator].count() == 0) {
+            _slashings[vault][subnetwork][operator].setup(SLASH_COUNT);
         }
 
         if (IFullRestakeDelegator(msg.sender).operatorNetworkLimit(subnetwork, operator) == 0) {
             return;
         }
 
-        _slashings[vault][operator].push(bytes32(uint256(Time.timestamp())));
+        _slashings[vault][subnetwork][operator].push(bytes32(uint256(Time.timestamp())));
 
         if (
-            _slashings[vault][operator].count() == SLASH_COUNT
-                && Time.timestamp() - uint256(_slashings[vault][operator].last(SLASH_COUNT - 1)) <= PERIOD
+            _slashings[vault][subnetwork][operator].count() == SLASH_COUNT
+                && Time.timestamp() - uint256(_slashings[vault][subnetwork][operator].last(SLASH_COUNT - 1)) <= PERIOD
         ) {
             IFullRestakeDelegator(msg.sender).setOperatorNetworkLimit(subnetwork, operator, 0);
         }

diff --git a/src/contracts/networkRestakeDelegator/NetworkRestakeResetHook.sol b/src/contracts/networkRestakeDelegator/NetworkRestakeResetHook.sol
@@ -24,8 +24,10 @@ contract NetworkRestakeResetHook is INetworkRestakeResetHook {
      */
     uint256 public immutable SLASH_COUNT;
 
-    mapping(address vault => mapping(address operator => CircularBuffer.Bytes32CircularBuffer buffer)) private
-        _slashings;
+    mapping(
+        address vault
+            => mapping(bytes32 subnetwork => mapping(address operator => CircularBuffer.Bytes32CircularBuffer buffer))
+    ) private _slashings;
 
     constructor(uint48 period, uint256 slashCount) {
         if (slashCount == 0) {
@@ -56,19 +58,19 @@ contract NetworkRestakeResetHook is INetworkRestakeResetHook {
             revert NotVaultDelegator();
         }
 
-        if (_slashings[vault][operator].count() == 0) {
-            _slashings[vault][operator].setup(SLASH_COUNT);
+        if (_slashings[vault][subnetwork][operator].count() == 0) {
+            _slashings[vault][subnetwork][operator].setup(SLASH_COUNT);
         }
 
         if (INetworkRestakeDelegator(msg.sender).operatorNetworkShares(subnetwork, operator) == 0) {
             return;
         }
 
-        _slashings[vault][operator].push(bytes32(uint256(Time.timestamp())));
+        _slashings[vault][subnetwork][operator].push(bytes32(uint256(Time.timestamp())));
 
         if (
-            _slashings[vault][operator].count() == SLASH_COUNT
-                && Time.timestamp() - uint256(_slashings[vault][operator].last(SLASH_COUNT - 1)) <= PERIOD
+            _slashings[vault][subnetwork][operator].count() == SLASH_COUNT
+                && Time.timestamp() - uint256(_slashings[vault][subnetwork][operator].last(SLASH_COUNT - 1)) <= PERIOD
         ) {
             INetworkRestakeDelegator(msg.sender).setOperatorNetworkShares(subnetwork, operator, 0);
         }

diff --git a/src/contracts/operatorSpecificDelegator/OperatorSpecificResetHook.sol b/src/contracts/operatorSpecificDelegator/OperatorSpecificResetHook.sol
@@ -24,7 +24,8 @@ contract OperatorSpecificResetHook is IOperatorSpecificResetHook {
      */
     uint256 public immutable SLASH_COUNT;
 
-    mapping(address vault => CircularBuffer.Bytes32CircularBuffer buffer) private _slashings;
+    mapping(address vault => mapping(bytes32 subnetwork => CircularBuffer.Bytes32CircularBuffer buffer)) private
+        _slashings;
 
     constructor(uint48 period, uint256 slashCount) {
         if (slashCount == 0) {
@@ -55,19 +56,19 @@ contract OperatorSpecificResetHook is IOperatorSpecificResetHook {
             revert NotVaultDelegator();
         }
 
-        if (_slashings[vault].count() == 0) {
-            _slashings[vault].setup(SLASH_COUNT);
+        if (_slashings[vault][subnetwork].count() == 0) {
+            _slashings[vault][subnetwork].setup(SLASH_COUNT);
         }
 
         if (IOperatorSpecificDelegator(msg.sender).networkLimit(subnetwork) == 0) {
             return;
         }
 
-        _slashings[vault].push(bytes32(uint256(Time.timestamp())));
+        _slashings[vault][subnetwork].push(bytes32(uint256(Time.timestamp())));
 
         if (
-            _slashings[vault].count() == SLASH_COUNT
-                && Time.timestamp() - uint256(_slashings[vault].last(SLASH_COUNT - 1)) <= PERIOD
+            _slashings[vault][subnetwork].count() == SLASH_COUNT
+                && Time.timestamp() - uint256(_slashings[vault][subnetwork].last(SLASH_COUNT - 1)) <= PERIOD
         ) {
             IOperatorSpecificDelegator(msg.sender).setNetworkLimit(subnetwork, 0);
         }