diff --git a/node/src/command.rs b/node/src/command.rs index 523b2ab39..d88562e23 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -353,12 +353,12 @@ pub fn run_with(cli: Cli) -> Result { None => { let runner = cli.create_runner(&cli.run.normalize())?; let chain_spec = &runner.config().chain_spec; - let is_dev = chain_spec.is_localdev(); + let is_localdev = chain_spec.is_localdev(); info!("id:{}", chain_spec.id()); let collator_options = cli.run.collator_options(); runner.run_node_until_exit(|config| async move { - if is_dev { + if is_localdev { info!("⚠️ DEV STANDALONE MODE."); return Err("Dev mode not support for current chain".into()); } diff --git a/pallets/vesting/Cargo.toml b/pallets/vesting/Cargo.toml index f385e354d..05c6c2023 100644 --- a/pallets/vesting/Cargo.toml +++ b/pallets/vesting/Cargo.toml @@ -35,6 +35,8 @@ runtime-benchmarks = [ 'frame-system/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', 'pallet-balances/runtime-benchmarks', + 'sp-runtime/runtime-benchmarks', + 'manta-primitives/runtime-benchmarks', ] std = [ "codec/std", diff --git a/runtime/calamari/src/migrations/mod.rs b/runtime/calamari/src/migrations/mod.rs index 10f573696..cbb525359 100644 --- a/runtime/calamari/src/migrations/mod.rs +++ b/runtime/calamari/src/migrations/mod.rs @@ -14,4 +14,4 @@ // You should have received a copy of the GNU General Public License // along with Manta. If not, see . -pub mod sudo; +// put runtime migrations here. View git history for old migrations diff --git a/runtime/calamari/src/migrations/sudo.rs b/runtime/calamari/src/migrations/sudo.rs deleted file mode 100644 index 231355c6a..000000000 --- a/runtime/calamari/src/migrations/sudo.rs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2020-2024 Manta Network. -// This file is part of Manta. -// -// Manta is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Manta is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Manta. If not, see . - -#![allow(clippy::unnecessary_cast)] - -use core::marker::PhantomData; -#[allow(deprecated)] -use frame_support::migration::remove_storage_prefix; -use frame_support::{ - migration::have_storage_value, - pallet_prelude::*, - traits::{Get, OnRuntimeUpgrade}, -}; -#[cfg(feature = "try-runtime")] -use sp_runtime::DispatchError; - -pub struct RemoveSudo(PhantomData); -impl OnRuntimeUpgrade for RemoveSudo { - fn on_runtime_upgrade() -> Weight { - if have_storage_value(b"Sudo", b"Key", b"") { - #[allow(deprecated)] - remove_storage_prefix(b"Sudo", b"Key", b""); - #[allow(deprecated)] - remove_storage_prefix(b"Sudo", b":__STORAGE_VERSION__:", b""); - log::info!(target: "OnRuntimeUpgrade", "✅ Sudo key has been removed."); - log::info!(target: "OnRuntimeUpgrade", "✅ The pallet version has been removed."); - T::DbWeight::get() - .reads(1) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } else { - T::DbWeight::get().reads(1) - } - } - - #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, DispatchError> { - if have_storage_value(b"Sudo", b"Key", b"") { - log::info!(target: "OnRuntimeUpgrade", "✅ Sudo key will be removed soon."); - log::info!(target: "OnRuntimeUpgrade", "✅ The pallet version will be removed soon."); - Ok(Vec::new()) - } else { - Err(DispatchError::Other("Sudo doesn't exist.")) - } - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade(_state: Vec) -> Result<(), DispatchError> { - if have_storage_value(b"Sudo", b"Key", b"") { - Err(DispatchError::Other("Failed to remove sudo module.")) - } else { - Ok(()) - } - } -}