fix(precompiles): validate V1/V2 activity state in initialize_if_migrated (ZELLIC-64)

crates/contracts/src/precompiles/validator_config_v2.rs

@@ -123,6 +123,7 @@ crate::sol! {
         error InvalidSignature();
         error InvalidSignatureFormat();
         error InvalidValidatorAddress();
+        error MigrationStateMismatch(uint64 idx);
         error MigrationNotComplete();
         error NotInitialized();
         error NotIp(string input, string backtrace);
@@ -180,6 +181,10 @@ impl ValidatorConfigV2Error {
         Self::AlreadyInitialized(IValidatorConfigV2::AlreadyInitialized {})
     }
 
+    pub const fn migration_state_mismatch(idx: u64) -> Self {
+        Self::MigrationStateMismatch(IValidatorConfigV2::MigrationStateMismatch { idx })
+    }
+
     pub const fn migration_not_complete() -> Self {
         Self::MigrationNotComplete(IValidatorConfigV2::MigrationNotComplete {})
     }

crates/precompiles/src/validator_config_v2/mod.rs

@@ -611,10 +611,23 @@ impl ValidatorConfigV2 {
 
         // NOTE: this count comparison is sufficient because `add_validator` and
         // `rotate_validator` are blocked until the contract is initialized.
-        if self.validator_count()? < v1.validator_count()? {
+        let v2_count = self.validator_count()?;
+        let v1_count = v1.validator_count()?;
+        if v2_count < v1_count {
             Err(ValidatorConfigV2Error::migration_not_complete())?
         }
 
+        for i in 0..v1_count {
+            let v1_val = v1.validators(v1.validators_array(i)?)?;
+            let v2_val = self.validators[i as usize].read()?;
+            if v1_val.active && v2_val.deactivated_at_height != 0 {
+                Err(ValidatorConfigV2Error::migration_state_mismatch(i))?
+            }
+            if !v1_val.active && v2_val.deactivated_at_height == 0 {
+                Err(ValidatorConfigV2Error::migration_state_mismatch(i))?
+            }
+        }
+
         let v1_next_dkg = v1.get_next_full_dkg_ceremony()?;
         self.next_dkg_ceremony.write(v1_next_dkg)?;
 

tips/ref-impls/src/ValidatorConfigV2.sol

@@ -356,6 +356,17 @@ contract ValidatorConfigV2 is IValidatorConfigV2 {
             revert MigrationNotComplete();
         }
 
+        for (uint64 i = 0; i < v1Validators.length; i++) {
+            bool v1Active = v1Validators[i].active;
+            uint64 v2Deactivated = validatorsArray[i].deactivatedAtHeight;
+            if (v1Active && v2Deactivated != 0) {
+                revert MigrationStateMismatch(i);
+            }
+            if (!v1Active && v2Deactivated == 0) {
+                revert MigrationStateMismatch(i);
+            }
+        }
+
         nextDkgCeremony = v1.getNextFullDkgCeremony();
 
         _initialized = true;

tips/ref-impls/src/interfaces/IValidatorConfigV2.sol

@@ -51,6 +51,10 @@ interface IValidatorConfigV2 {
     /// @notice Thrown when migration is not complete (not all V1 validators migrated)
     error MigrationNotComplete();
 
+    /// @notice Thrown when a migrated validator's active/deactivated state does not match V1
+    /// @param idx The index of the validator with mismatched state
+    error MigrationStateMismatch(uint64 idx);
+
     /// @notice Thrown when migration index is out of order
     error InvalidMigrationIndex();