Skip to content

Commit 5e849c2

Browse files
committed
Merge remote-tracking branch 'origin/main' into devnet-ready
2 parents ff7c531 + 4d3a7ab commit 5e849c2

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

pallets/swap/src/pallet/mod.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,18 +609,19 @@ mod pallet {
609609
pub fn disable_lp(origin: OriginFor<T>) -> DispatchResult {
610610
ensure_root(origin)?;
611611

612-
for netuid in 1..128 {
612+
for netuid in 1..=128 {
613613
let netuid = NetUid::from(netuid as u16);
614614
if EnabledUserLiquidity::<T>::get(netuid) {
615615
EnabledUserLiquidity::<T>::insert(netuid, false);
616616
Self::deposit_event(Event::UserLiquidityToggled {
617617
netuid,
618618
enable: false,
619619
});
620-
621-
// Remove provided liquidity
622-
// Self::do_dissolve_all_liquidity_providers(netuid)?;
623620
}
621+
622+
// Remove provided liquidity unconditionally because the network may have
623+
// user liquidity previously disabled
624+
Self::do_dissolve_all_liquidity_providers(netuid)?;
624625
}
625626

626627
Ok(())

runtime/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
237237
// `spec_version`, and `authoring_version` are the same between Wasm and native.
238238
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
239239
// the compatible custom types.
240-
spec_version: 359,
240+
spec_version: 350,
241241
impl_version: 1,
242242
apis: RUNTIME_API_VERSIONS,
243243
transaction_version: 1,

0 commit comments

Comments
 (0)