diff --git a/pallets/salp-lite/src/lib.rs b/pallets/salp-lite/src/lib.rs index eb90da5d4d..7576653e2a 100644 --- a/pallets/salp-lite/src/lib.rs +++ b/pallets/salp-lite/src/lib.rs @@ -504,11 +504,7 @@ pub mod pallet { let raised = fund.raised.checked_add(&value).ok_or(Error::::Overflow)?; ensure!(raised <= fund.cap, Error::::CapExceeded); - let (contributed, status) = Self::contribution(fund.trie_index, &who); - ensure!( - status == ContributionStatus::Idle || status == ContributionStatus::MigrateToIdle, - Error::::InvalidContributionStatus - ); + let (contributed, _) = Self::contribution(fund.trie_index, &who); let (vs_token, vs_bond) = Self::vsAssets(index, fund.first_slot, fund.last_slot); diff --git a/pallets/salp/src/lib.rs b/pallets/salp/src/lib.rs index 04883061e9..8e45a60600 100644 --- a/pallets/salp/src/lib.rs +++ b/pallets/salp/src/lib.rs @@ -592,7 +592,8 @@ pub mod pallet { ensure!( status == ContributionStatus::Idle || status == ContributionStatus::Refunded || - status == ContributionStatus::Redeemed, + status == ContributionStatus::Redeemed || + status == ContributionStatus::Unlocked, Error::::InvalidContributionStatus ); diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index 9e76efe41e..a06102b61a 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -2013,18 +2013,13 @@ impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn pre_upgrade() -> Result<(), &'static str> { #[allow(unused_imports)] use frame_support::{migration, Identity}; - log::info!("Asgard `pre_upgrade`..."); - - bifrost_salp::migration::migrate(); - Ok(()) } #[cfg(feature = "try-runtime")] fn on_runtime_upgrade() -> Weight { log::info!("Asgard `on_runtime_upgrade`..."); - let _ = PolkadotXcm::force_default_xcm_version(Origin::root(), Some(2)); log::info!("Asgard `on_runtime_upgrade finished`"); RocksDbWeight::get().writes(1) } diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 5b1fce9b40..2187fc9a93 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -1935,16 +1935,13 @@ impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn pre_upgrade() -> Result<(), &'static str> { #[allow(unused_imports)] use frame_support::{migration, Identity}; - log::info!("Bifrost `pre_upgrade`..."); - Ok(()) } #[cfg(feature = "try-runtime")] fn on_runtime_upgrade() -> Weight { log::info!("Bifrost `on_runtime_upgrade`..."); - let _ = PolkadotXcm::force_default_xcm_version(Origin::root(), Some(2)); log::info!("Bifrost `on_runtime_upgrade finished`"); RocksDbWeight::get().writes(1) }