Merge remote-tracking branch 'origin/master' into at/contract-env

Author: parity-processbot

Cargo.lock

@@ -147,6 +147,9 @@ pub mod pallet {
 
 		/// Type that identifies either the native currency or a token class from `Assets`.
 		/// `Ord` is added because of `get_pool_id`.
+		///
+		/// The pool's `AccountId` is derived from this type. Any changes to the type may
+		/// necessitate a migration.
 		type MultiAssetId: AssetId + Ord + From<Self::AssetId>;
 
 		/// Type to convert an `AssetId` into `MultiAssetId`.
@@ -1193,7 +1196,9 @@ pub mod pallet {
 					()
 				);
 			} else {
-				let MultiAssetIdConversionResult::Converted(asset_id) = T::MultiAssetIdConverter::try_convert(asset) else {
+				let MultiAssetIdConversionResult::Converted(asset_id) =
+					T::MultiAssetIdConverter::try_convert(asset)
+				else {
 					return Err(())
 				};
 				let minimal = T::Assets::minimum_balance(asset_id);

frame/asset-conversion/src/lib.rs

@@ -66,7 +66,11 @@ fn pool_assets() -> Vec<u32> {
 
 fn create_tokens(owner: u128, tokens: Vec<NativeOrAssetId<u32>>) {
 	for token_id in tokens {
-		let MultiAssetIdConversionResult::Converted(asset_id) = NativeOrAssetIdConverter::try_convert(&token_id) else { unreachable!("invalid token") };
+		let MultiAssetIdConversionResult::Converted(asset_id) =
+			NativeOrAssetIdConverter::try_convert(&token_id)
+		else {
+			unreachable!("invalid token")
+		};
 		assert_ok!(Assets::force_create(RuntimeOrigin::root(), asset_id, owner, false, 1));
 	}
 }

frame/asset-conversion/src/tests.rs

@@ -21,6 +21,10 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_std::{cmp::Ordering, marker::PhantomData};
 
+/// Pool ID.
+///
+/// The pool's `AccountId` is derived from this type. Any changes to the type may necessitate a
+/// migration.
 pub(super) type PoolIdOf<T> = (<T as Config>::MultiAssetId, <T as Config>::MultiAssetId);
 
 /// Stores the lp_token asset id a particular pool has been assigned.

frame/asset-conversion/src/types.rs

@@ -662,7 +662,7 @@ pub mod pallet {
 		///
 		/// The origin must be Signed and the sender must have sufficient funds free.
 		///
-		/// `ItemDeposit` funds of sender are reserved.
+		/// `CollectionDeposit` funds of sender are reserved.
 		///
 		/// Parameters:
 		/// - `admin`: The admin of this collection. The admin is the initial address of each
@@ -844,6 +844,7 @@ pub mod pallet {
 						MintType::HolderOf(collection_id) => {
 							let MintWitness { owned_item, .. } =
 								witness_data.clone().ok_or(Error::<T, I>::WitnessRequired)?;
+							let owned_item = owned_item.ok_or(Error::<T, I>::BadWitness)?;
 
 							let owns_item = Account::<T, I>::contains_key((
 								&caller,

frame/nfts/src/lib.rs

@@ -427,7 +427,7 @@ fn mint_should_work() {
 				1,
 				42,
 				account(2),
-				Some(MintWitness { owned_item: 42, ..Default::default() })
+				Some(MintWitness { owned_item: Some(42), ..Default::default() })
 			),
 			Error::<Test>::BadWitness
 		);
@@ -436,7 +436,7 @@ fn mint_should_work() {
 			1,
 			42,
 			account(2),
-			Some(MintWitness { owned_item: 43, ..Default::default() })
+			Some(MintWitness { owned_item: Some(43), ..Default::default() })
 		));
 
 		// can't mint twice
@@ -446,7 +446,7 @@ fn mint_should_work() {
 				1,
 				46,
 				account(2),
-				Some(MintWitness { owned_item: 43, ..Default::default() })
+				Some(MintWitness { owned_item: Some(43), ..Default::default() })
 			),
 			Error::<Test>::AlreadyClaimed
 		);

frame/nfts/src/tests.rs

@@ -133,7 +133,7 @@ impl<AccountId, DepositBalance> CollectionDetails<AccountId, DepositBalance> {
 #[derive(Clone, Encode, Decode, Default, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub struct MintWitness<ItemId, Balance> {
 	/// Provide the id of the item in a required collection.
-	pub owned_item: ItemId,
+	pub owned_item: Option<ItemId>,
 	/// The price specified in mint settings.
 	pub mint_price: Option<Balance>,
 }

frame/nfts/src/types.rs

@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 derive-syn-parse = "0.1.5"
 Inflector = "0.11.4"
-cfg-expr = "0.15.1"
+cfg-expr = "0.15.4"
 itertools = "0.10.3"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"

frame/support/procedural/Cargo.toml

@@ -164,13 +164,13 @@ impl OnRuntimeUpgrade for Tuple {
 	/// that occur.
 	#[cfg(feature = "try-runtime")]
 	fn try_on_runtime_upgrade(checks: bool) -> Result<Weight, TryRuntimeError> {
-		let mut weight = Weight::zero();
+		let mut cumulative_weight = Weight::zero();
 
 		let mut errors = Vec::new();
 
 		for_tuples!(#(
 			match Tuple::try_on_runtime_upgrade(checks) {
-				Ok(weight) => { weight.saturating_add(weight); },
+				Ok(weight) => { cumulative_weight.saturating_accrue(weight); },
 				Err(err) => { errors.push(err); },
 			}
 		)*);
@@ -194,7 +194,7 @@ impl OnRuntimeUpgrade for Tuple {
 			return Err("Detected multiple errors while executing `try_on_runtime_upgrade`, check the logs!".into())
 		}
 
-		Ok(weight)
+		Ok(cumulative_weight)
 	}
 
 	/// [`OnRuntimeUpgrade::pre_upgrade`] should not be used on a tuple.

frame/support/src/traits/hooks.rs

@@ -33,9 +33,7 @@ tracing = { version = "0.1.29", default-features = false }
 tracing-core = { version = "0.1.28", default-features = false}
 
 # Required for backwards compatibility reason, but only used for verifying when `UseDalekExt` is set.
-ed25519-dalek = { version = "1.0.1", default-features = false, optional = true }
-# Force the usage of ed25519, this is being used in `ed25519-dalek`.
-ed25519 = { version = "1.5.2", optional = true }
+ed25519-dalek = { version = "2.0.0", default-features = false, optional = true }
 
 [build-dependencies]
 rustversion = "1.0.6"
@@ -58,7 +56,6 @@ std = [
 	"tracing-core/std",
 	"log",
 	"ed25519-dalek",
-	"ed25519",
 	"sp-keystore/std"
 ]