Continue modelling partial set security

cosmos · Jan 25, 2024 · 33ace67 · 33ace67
1 parent ec67531
commit 33ace67
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/tests/mbt/model/ccv.qnt b/tests/mbt/model/ccv.qnt
@@ -514,6 +514,7 @@ module ccv {
         // will be added automatically. 
         consumersToStop: Set[Chain]): Result = {
         val currentProviderState = currentState.providerState
+        val curValSet = currentProviderState.chainState.currentValidatorSet
 
         // check for vsc timeouts
         val timedOutConsumers = getRunningConsumers(currentProviderState).filter(
@@ -526,8 +527,8 @@ module ccv {
         val currentValSets = ConsumerChains.mapBy(
             (consumer) => 
             currentProviderState.applyKeyAssignmentToValSet(
-                consumer, 
-                currentProviderState.chainState.currentValidatorSet
+                consumer,
+                GetTopNValidatorSet(currentState, curValSet, consumer)
             )
         )
         val newKeyAssignedValSetHistory = currentValSets.keys().mapBy(

diff --git a/tests/mbt/model/ccv_pss.qnt b/tests/mbt/model/ccv_pss.qnt
@@ -67,15 +67,32 @@ module ccv_pss {
         res._1
     }
 
+    // Opts a validator in for a consumer chain the provider.
+    // Possible before the consumer chain starts running,
+    // and will then be applied when the consumer chain starts running.
     pure def OptIn(currentState: ProtocolState, consumer: Chain, validator: Node): Result = {
         pure val optedInVals = currentState.providerState.optedInVals.get(consumer)
         pure val newOptedInVals = optedInVals.union(Set(validator))
-        {
+        Ok({
             ...currentState,
             providerState: {
                 ...currentState.providerState,
                 optedInVals: currentState.providerState.optedInVals.put(consumer, newOptedInVals)
             }
-        }
+        })
+    }
+
+    // Opts a validator out. Safe to call before the consumer chain even runs.
+    // Will not stop the validator set from being forced to validate when in the top N.
+    pure def OptOut(currentState: ProtocolState, consumer: Chain, validator: Node): Result = {
+        pure val optedInVals = currentState.providerState.optedInVals.get(consumer)
+        pure val newOptedInVals = optedInVals.exclude(Set(validator))
+        Ok({
+            ...currentState,
+            providerState: {
+                ...currentState.providerState,
+                optedInVals: currentState.providerState.optedInVals.put(consumer, newOptedInVals)
+            }
+        })
     }
 }