release-1.14.0

InfraBlockchain · Jul 25, 2024 · bca7708 · bca7708
1 parent 68930b1
commit bca7708
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/cumulus/pallets/parachain-system/src/lib.rs b/cumulus/pallets/parachain-system/src/lib.rs
@@ -621,7 +621,7 @@ pub mod pallet {
 				.read_active_system_config()
 				.expect("Error on reading infra system config in relay chain state proof");
 			T::UpdateRCConfig::update_system_config(infra_system_config);
-			
+
 			let update_weights = relay_state_proof
 				.read_updated_system_token_weight()
 				.expect("Error on reading updated system token weight");

diff --git a/cumulus/pallets/parachain-system/src/relay_state_snapshot.rs b/cumulus/pallets/parachain-system/src/relay_state_snapshot.rs
@@ -18,7 +18,7 @@
 
 use codec::{Decode, Encode};
 use cumulus_primitives_core::{
-	relay_chain, AbridgedHostConfiguration, AbridgedHrmpChannel, ParaId, Location
+	relay_chain, AbridgedHostConfiguration, AbridgedHrmpChannel, Location, ParaId,
 };
 use scale_info::TypeInfo;
 use sp_runtime::traits::HashingFor;

diff --git a/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
@@ -150,7 +150,7 @@ fn asset_hub_yosemite_like_local_config(
 #[cfg(feature = "infra-parachain")]
 pub fn asset_hub_yosemite_genesis_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("tokenSymbol".into(), "YOS".into());
+	properties.insert("tokenSymbol".into(), "BCL".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 	let para_id = 1000;
 	GenericChainSpec::builder(

diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
@@ -98,8 +98,9 @@ impl SubstrateCli for Cli {
 			path => {
 				let path = std::path::PathBuf::from(path);
 
-				let chain_spec = Box::new(polkadot_service::GenericChainSpec::from_json_file(path.clone())?)
-					as Box<dyn polkadot_service::ChainSpec>;
+				let chain_spec =
+					Box::new(polkadot_service::GenericChainSpec::from_json_file(path.clone())?)
+						as Box<dyn polkadot_service::ChainSpec>;
 
 				// When `force_*` is given or the file name starts with the name of one of the known
 				// chains, we use the chain spec for the specific chain.

diff --git a/polkadot/runtime/yosemite/src/genesis_config_presets.rs b/polkadot/runtime/yosemite/src/genesis_config_presets.rs
@@ -288,7 +288,7 @@ pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<sp_std::vec::Vec<
 		Ok("local_testnet") => yosemite_local_testnet_genesis(),
 		Ok("staging_testnet") => yosemite_local_testnet_genesis(),
 		Ok("mainnet") => yosemite_local_testnet_genesis(),
- 		_ => return None,
+		_ => return None,
 	};
 	Some(
 		serde_json::to_string(&patch)

diff --git a/substrate/frame/assets/src/functions.rs b/substrate/frame/assets/src/functions.rs
@@ -997,7 +997,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			symbol.clone().try_into().map_err(|_| Error::<T, I>::BadMetadata)?;
 
 		let d = Asset::<T, I>::get(&id).ok_or(Error::<T, I>::Unknown)?;
-		ensure!(d.status == AssetStatus::Live, Error::<T, I>::AssetNotLive);
+		ensure!(d.status == AssetStatus::Live || d.status == AssetStatus::InActive, Error::<T, I>::AssetNotLive);
 		ensure!(from == &d.owner, Error::<T, I>::NoPermission);
 
 		Metadata::<T, I>::try_mutate_exists(id.clone(), |metadata| {