Revert "refactor!: remove VaultStatus::CommittedTheft and add migration"

This reverts commit 78bdebb.

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>

crates/vault-registry/src/lib.rs

@@ -601,6 +601,8 @@ pub mod pallet {
         MaxNominationRatioViolation,
         /// The collateral ceiling would be exceeded for the vault's currency.
         CurrencyCeilingExceeded,
+        /// Vault is no longer usable as it was liquidated due to theft.
+        VaultCommittedTheft,
         /// Vault is no longer usable as it was liquidated due to undercollateralization.
         VaultLiquidated,
         /// Vault must be either liquidated or flagged for theft.
@@ -844,6 +846,7 @@ impl<T: Config> Pallet<T> {
         match vault.status {
             VaultStatus::Active(_) => Ok(vault),
             VaultStatus::Liquidated => Err(Error::<T>::VaultLiquidated.into()),
+            VaultStatus::CommittedTheft => Err(Error::<T>::VaultCommittedTheft.into()),
         }
     }
 

crates/vault-registry/src/types.rs

@@ -190,28 +190,6 @@ pub mod liquidation_vault_fix {
 pub mod v4 {
     use super::*;
 
-    #[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, Debug, TypeInfo, MaxEncodedLen)]
-    pub enum VaultStatusV4 {
-        /// Vault is active - bool=true indicates that the vault accepts new issue requests
-        Active(bool),
-
-        /// Vault has been liquidated
-        Liquidated,
-
-        /// Vault theft has been reported
-        CommittedTheft,
-    }
-
-    impl Into<VaultStatus> for VaultStatusV4 {
-        fn into(self) -> VaultStatus {
-            match self {
-                VaultStatusV4::Active(accept_issue) => VaultStatus::Active(accept_issue),
-                VaultStatusV4::Liquidated => VaultStatus::Liquidated,
-                VaultStatusV4::CommittedTheft => VaultStatus::Liquidated,
-            }
-        }
-    }
-
     #[derive(Encode, Decode, Clone, PartialEq, Eq, TypeInfo)]
     #[cfg_attr(feature = "std", derive(Debug))]
     pub struct VaultV4<AccountId, BlockNumber, Balance, CurrencyId: Copy> {
@@ -220,7 +198,7 @@ pub mod v4 {
         /// Bitcoin address of this Vault (P2PKH, P2SH, P2WPKH, P2WSH)
         pub wallet: Wallet,
         /// Current status of the vault
-        pub status: VaultStatusV4,
+        pub status: VaultStatus,
         /// Block height until which this Vault is banned from being used for
         /// Issue, Redeem (except during automatic liquidation) and Replace.
         pub banned_until: Option<BlockNumber>,
@@ -268,7 +246,7 @@ pub mod v4 {
             Some(Vault {
                 id: vault_v4.id,
                 wallet: vault_v4.wallet,
-                status: vault_v4.status.into(),
+                status: vault_v4.status,
                 banned_until: vault_v4.banned_until,
                 secure_collateral_threshold: None,
                 to_be_issued_tokens: vault_v4.to_be_issued_tokens,
@@ -315,7 +293,7 @@ pub mod v4 {
                     .into(),
                 },
                 banned_until: None,
-                status: VaultStatusV4::Active(true),
+                status: VaultStatus::Active(true),
                 issued_tokens: Default::default(),
                 liquidated_collateral: Default::default(),
                 replace_collateral: Default::default(),
@@ -338,7 +316,7 @@ pub mod v4 {
                 wallet: Wallet {
                     addresses: vault.wallet.addresses.clone(),
                 },
-                status: vault.status.into(),
+                status: vault.status.clone(),
                 banned_until: vault.banned_until,
                 secure_collateral_threshold: None,
                 to_be_issued_tokens: vault.to_be_issued_tokens,
@@ -392,6 +370,10 @@ pub enum VaultStatus {
 
     /// Vault has been liquidated
     Liquidated,
+
+    /// Vault theft has been reported
+    // TODO: remove this, requires migration
+    CommittedTheft,
 }
 
 impl Default for VaultStatus {
@@ -478,7 +460,7 @@ impl<
     }
 
     pub fn is_liquidated(&self) -> bool {
-        matches!(self.status, VaultStatus::Liquidated)
+        matches!(self.status, VaultStatus::Liquidated | VaultStatus::CommittedTheft)
     }
 }