Merge branch 'development' into feat_upgrade_polkadot_1.3.0

Author: renauter

substrate-node/Cargo.toml

@@ -23,7 +23,7 @@ resolver = "2"
 # External (without extra features and with default disabled if necessary)
 base58 = {version = "0.2.0", default-features = false}
 bitflags = {version = "1.3.2", default-features = false}
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.4", features = ["derive"] }
 parity-scale-codec = { version = "3.6.1", default-features = false }
 env_logger = "0.10.0"
 futures = {version = "0.3.21", default-features = false}

substrate-node/pallets/pallet-tft-bridge/src/migrations/v2.rs

@@ -18,7 +18,7 @@ impl<T: Config> OnRuntimeUpgrade for MigrateBurnTransactionsV2<T> {
     fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
         info!("current pallet version: {:?}", PalletVersion::<T>::get());
         ensure!(
-            PalletVersion::<T>::get() == types::StorageVersion::V1,
+            PalletVersion::<T>::get() >= types::StorageVersion::V1,
             DispatchError::Other("Unexpected pallet version")
         );
 
@@ -36,7 +36,7 @@ impl<T: Config> OnRuntimeUpgrade for MigrateBurnTransactionsV2<T> {
             executed_burn_transactions_count
         );
 
-        info!("👥  TFT-BRIDGE pallet to V1 passes PRE migrate checks ✅",);
+        info!("👥  TFT-BRIDGE pallet to V2 passes PRE migrate checks ✅",);
         Ok(Vec::<u8>::new())
     }
 
@@ -55,7 +55,7 @@ impl<T: Config> OnRuntimeUpgrade for MigrateBurnTransactionsV2<T> {
     ) -> Result<(), sp_runtime::TryRuntimeError> {
         info!("current pallet version: {:?}", PalletVersion::<T>::get());
         ensure!(
-            PalletVersion::<T>::get() == types::StorageVersion::V2,
+            PalletVersion::<T>::get() >= types::StorageVersion::V2,
             DispatchError::Other("Unexpected pallet version")
         );