difftreelog
Merge branch 'develop' into feature/docker-base-img
in: master
11 files changed
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -176,7 +176,7 @@
key: property_key(p as usize),
value: property_value(),
}).collect::<Vec<_>>();
- }: {<Pallet<T>>::set_collection_properties(&collection, &owner, props)?}
+ }: {<Pallet<T>>::set_collection_properties(&collection, &owner, props.into_iter())?}
delete_collection_properties {
let b in 0..MAX_PROPERTIES_PER_ITEM;
@@ -188,7 +188,7 @@
key: property_key(p as usize),
value: property_value(),
}).collect::<Vec<_>>();
- <Pallet<T>>::set_collection_properties(&collection, &owner, props)?;
+ <Pallet<T>>::set_collection_properties(&collection, &owner, props.into_iter())?;
let to_delete = (0..b).map(|p| property_key(p as usize)).collect::<Vec<_>>();
- }: {<Pallet<T>>::delete_collection_properties(&collection, &owner, to_delete)?}
+ }: {<Pallet<T>>::delete_collection_properties(&collection, &owner, to_delete.into_iter())?}
}
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -125,7 +125,7 @@
.map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
- <Pallet<T>>::set_collection_properties(self, &caller, properties)
+ <Pallet<T>>::set_collection_properties(self, &caller, properties.into_iter())
.map_err(dispatch_to_evm::<T>)
}
@@ -158,7 +158,8 @@
})
.collect::<Result<Vec<_>>>()?;
- <Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)
+ <Pallet<T>>::delete_collection_properties(self, &caller, keys.into_iter())
+ .map_err(dispatch_to_evm::<T>)
}
/// Get collection property.
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1198,6 +1198,58 @@
Ok(())
}
+ /// This function sets or removes a collection properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
+ #[transactional]
+ fn modify_collection_properties(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ ) -> DispatchResult {
+ collection.check_is_owner_or_admin(sender)?;
+
+ let mut stored_properties = <CollectionProperties<T>>::get(collection.id);
+
+ for (key, value) in properties_updates {
+ match value {
+ Some(value) => {
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<Error<T>>::from)?;
+
+ Self::deposit_event(Event::CollectionPropertySet(collection.id, key));
+ <PalletEvm<T>>::deposit_log(
+ erc::CollectionHelpersEvents::CollectionChanged {
+ collection_id: eth::collection_id_to_address(collection.id),
+ }
+ .to_log(T::ContractAddress::get()),
+ );
+ }
+ None => {
+ stored_properties.remove(&key).map_err(<Error<T>>::from)?;
+
+ Self::deposit_event(Event::CollectionPropertyDeleted(collection.id, key));
+ <PalletEvm<T>>::deposit_log(
+ erc::CollectionHelpersEvents::CollectionChanged {
+ collection_id: eth::collection_id_to_address(collection.id),
+ }
+ .to_log(T::ContractAddress::get()),
+ );
+ }
+ }
+ }
+
+ <CollectionProperties<T>>::set(collection.id, stored_properties);
+
+ Ok(())
+ }
+
/// Set collection property.
///
/// * `collection` - Collection handler.
@@ -1208,23 +1260,7 @@
sender: &T::CrossAccountId,
property: Property,
) -> DispatchResult {
- collection.check_is_owner_or_admin(sender)?;
-
- CollectionProperties::<T>::try_mutate(collection.id, |properties| {
- let property = property.clone();
- properties.try_set(property.key, property.value)
- })
- .map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));
- <PalletEvm<T>>::deposit_log(
- erc::CollectionHelpersEvents::CollectionChanged {
- collection_id: eth::collection_id_to_address(collection.id),
- }
- .to_log(T::ContractAddress::get()),
- );
-
- Ok(())
+ Self::set_collection_properties(collection, sender, [property].into_iter())
}
/// Set a scoped collection property, where the scope is a special prefix
@@ -1270,17 +1306,16 @@
/// * `collection` - Collection handler.
/// * `sender` - The owner or administrator of the collection.
/// * `properties` - The properties to set.
- #[transactional]
pub fn set_collection_properties(
collection: &CollectionHandle<T>,
sender: &T::CrossAccountId,
- properties: Vec<Property>,
+ properties: impl Iterator<Item = Property>,
) -> DispatchResult {
- for property in properties {
- Self::set_collection_property(collection, sender, property)?;
- }
-
- Ok(())
+ Self::modify_collection_properties(
+ collection,
+ sender,
+ properties.map(|property| (property.key, Some(property.value))),
+ )
}
/// Delete collection property.
@@ -1293,25 +1328,7 @@
sender: &T::CrossAccountId,
property_key: PropertyKey,
) -> DispatchResult {
- collection.check_is_owner_or_admin(sender)?;
-
- CollectionProperties::<T>::try_mutate(collection.id, |properties| {
- properties.remove(&property_key)
- })
- .map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::CollectionPropertyDeleted(
- collection.id,
- property_key,
- ));
- <PalletEvm<T>>::deposit_log(
- erc::CollectionHelpersEvents::CollectionChanged {
- collection_id: eth::collection_id_to_address(collection.id),
- }
- .to_log(T::ContractAddress::get()),
- );
-
- Ok(())
+ Self::delete_collection_properties(collection, sender, [property_key].into_iter())
}
/// Delete collection properties.
@@ -1319,17 +1336,12 @@
/// * `collection` - Collection handler.
/// * `sender` - The owner or administrator of the collection.
/// * `properties` - The properties to delete.
- #[transactional]
pub fn delete_collection_properties(
collection: &CollectionHandle<T>,
sender: &T::CrossAccountId,
- property_keys: Vec<PropertyKey>,
+ property_keys: impl Iterator<Item = PropertyKey>,
) -> DispatchResult {
- for key in property_keys {
- Self::delete_collection_property(collection, sender, key)?;
- }
-
- Ok(())
+ Self::modify_collection_properties(collection, sender, property_keys.map(|key| (key, None)))
}
/// Set collection propetry permission without any checks.
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -266,7 +266,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
/// Delete properties of the collection, associated with the provided keys.
@@ -275,7 +275,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
/// Checks if collection has tokens. Return `true` if it has.
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -577,20 +577,29 @@
})
}
- /// Batch operation to add, edit or remove properties for the token
+ /// A batch operation to add, edit or remove properties for a token.
+ /// It sets or removes a token's properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
///
- /// All affected properties should have mutable permission and sender should have
- /// permission to edit those properties.
- ///
- /// - `nesting_budget`: Limit for searching parents in depth to check ownership.
+ /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
/// - `is_token_create`: Indicates that method is called during token initialization.
/// Allows to bypass ownership check.
+ ///
+ /// All affected properties should have `mutable` permission
+ /// to be **deleted** or to be **set more than once**,
+ /// and the sender should have permission to edit those properties.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
#[transactional]
fn modify_token_properties(
collection: &NonfungibleHandle<T>,
sender: &T::CrossAccountId,
token_id: TokenId,
- properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
is_token_create: bool,
nesting_budget: &dyn Budget,
) -> DispatchResult {
@@ -614,15 +623,16 @@
})
};
- for (key, value) in properties {
- let permission = <PalletCommon<T>>::property_permissions(collection.id)
+ let mut stored_properties = <TokenProperties<T>>::get((collection.id, token_id));
+ let permissions = <PalletCommon<T>>::property_permissions(collection.id);
+
+ for (key, value) in properties_updates {
+ let permission = permissions
.get(&key)
.cloned()
.unwrap_or_else(PropertyPermission::none);
- let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
- .get(&key)
- .is_some();
+ let is_property_exists = stored_properties.get(&key).is_some();
match permission {
PropertyPermission { mutable: false, .. } if is_property_exists => {
@@ -649,10 +659,9 @@
match value {
Some(value) => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.try_set(key.clone(), value)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
collection.id,
@@ -661,10 +670,9 @@
));
}
None => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.remove(&key)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .remove(&key)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
collection.id,
@@ -683,6 +691,8 @@
);
}
+ <TokenProperties<T>>::set((collection.id, token_id), stored_properties);
+
Ok(())
}
@@ -784,7 +794,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
/// Remove properties from the collection
@@ -793,7 +803,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
/// Set property permissions for the token.
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -184,21 +184,21 @@
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_361_000 as u64)
- // Standard Error: 5_349_868
- .saturating_add(Weight::from_ref_time(637_246_356 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(31_850_484 as u64)
+ // Standard Error: 9_618
+ .saturating_add(Weight::from_ref_time(4_721_947 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_489_000 as u64)
- // Standard Error: 5_738_954
- .saturating_add(Weight::from_ref_time(689_912_822 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_795_000 as u64)
+ // Standard Error: 28_239
+ .saturating_add(Weight::from_ref_time(12_840_446 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
@@ -354,21 +354,21 @@
.saturating_add(RocksDbWeight::get().reads(1 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_361_000 as u64)
- // Standard Error: 5_349_868
- .saturating_add(Weight::from_ref_time(637_246_356 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(31_850_484 as u64)
+ // Standard Error: 9_618
+ .saturating_add(Weight::from_ref_time(4_721_947 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_489_000 as u64)
- // Standard Error: 5_738_954
- .saturating_add(Weight::from_ref_time(689_912_822 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_795_000 as u64)
+ // Standard Error: 28_239
+ .saturating_add(Weight::from_ref_time(12_840_446 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -515,12 +515,29 @@
Ok(())
}
+ /// A batch operation to add, edit or remove properties for a token.
+ /// It sets or removes a token's properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
+ ///
+ /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
+ /// - `is_token_create`: Indicates that method is called during token initialization.
+ /// Allows to bypass ownership check.
+ ///
+ /// All affected properties should have `mutable` permission
+ /// to be **deleted** or to be **set more than once**,
+ /// and the sender should have permission to edit those properties.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
#[transactional]
fn modify_token_properties(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
token_id: TokenId,
- properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
is_token_create: bool,
nesting_budget: &dyn Budget,
) -> DispatchResult {
@@ -544,15 +561,16 @@
Ok(is_bundle_owner)
};
- for (key, value) in properties {
- let permission = <PalletCommon<T>>::property_permissions(collection.id)
+ let mut stored_properties = <TokenProperties<T>>::get((collection.id, token_id));
+ let permissions = <PalletCommon<T>>::property_permissions(collection.id);
+
+ for (key, value) in properties_updates {
+ let permission = permissions
.get(&key)
.cloned()
.unwrap_or_else(PropertyPermission::none);
- let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
- .get(&key)
- .is_some();
+ let is_property_exists = stored_properties.get(&key).is_some();
match permission {
PropertyPermission { mutable: false, .. } if is_property_exists => {
@@ -578,10 +596,9 @@
match value {
Some(value) => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.try_set(key.clone(), value)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
collection.id,
@@ -590,10 +607,9 @@
));
}
None => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.remove(&key)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .remove(&key)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
collection.id,
@@ -612,6 +628,8 @@
);
}
+ <TokenProperties<T>>::set((collection.id, token_id), stored_properties);
+
Ok(())
}
@@ -1353,7 +1371,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
pub fn delete_collection_properties(
@@ -1361,7 +1379,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
pub fn set_token_property_permissions(
pallets/refungible/src/weights.rsdiffbeforeafterboth1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_refungible4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-12-26, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// pallet13// --pallet14// pallet-refungible15// --wasm-execution16// compiled17// --extrinsic18// *19// --template20// .maintain/frame-weight-template.hbs21// --steps=5022// --repeat=8023// --heap-pages=409624// --output=./pallets/refungible/src/weights.rs2526#![cfg_attr(rustfmt, rustfmt_skip)]27#![allow(unused_parens)]28#![allow(unused_imports)]29#![allow(missing_docs)]30#![allow(clippy::unnecessary_cast)]3132use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};33use sp_std::marker::PhantomData;3435/// Weight functions needed for pallet_refungible.36pub trait WeightInfo {37 fn create_item() -> Weight;38 fn create_multiple_items(b: u32, ) -> Weight;39 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight;40 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight;41 fn burn_item_partial() -> Weight;42 fn burn_item_fully() -> Weight;43 fn transfer_normal() -> Weight;44 fn transfer_creating() -> Weight;45 fn transfer_removing() -> Weight;46 fn transfer_creating_removing() -> Weight;47 fn approve() -> Weight;48 fn approve_from() -> Weight;49 fn transfer_from_normal() -> Weight;50 fn transfer_from_creating() -> Weight;51 fn transfer_from_removing() -> Weight;52 fn transfer_from_creating_removing() -> Weight;53 fn burn_from() -> Weight;54 fn set_token_property_permissions(b: u32, ) -> Weight;55 fn set_token_properties(b: u32, ) -> Weight;56 fn delete_token_properties(b: u32, ) -> Weight;57 fn repartition_item() -> Weight;58 fn token_owner() -> Weight;59 fn set_allowance_for_all() -> Weight;60 fn allowance_for_all() -> Weight;61 fn repair_item() -> Weight;62}6364/// Weights for pallet_refungible using the Substrate node and recommended hardware.65pub struct SubstrateWeight<T>(PhantomData<T>);66impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {67 // Storage: Refungible TokensMinted (r:1 w:1)68 // Storage: Refungible AccountBalance (r:1 w:1)69 // Storage: Refungible Balance (r:0 w:1)70 // Storage: Refungible TotalSupply (r:0 w:1)71 // Storage: Refungible Owned (r:0 w:1)72 fn create_item() -> Weight {73 Weight::from_ref_time(32_864_000 as u64)74 .saturating_add(T::DbWeight::get().reads(2 as u64))75 .saturating_add(T::DbWeight::get().writes(5 as u64))76 }77 // Storage: Refungible TokensMinted (r:1 w:1)78 // Storage: Refungible AccountBalance (r:1 w:1)79 // Storage: Refungible Balance (r:0 w:4)80 // Storage: Refungible TotalSupply (r:0 w:4)81 // Storage: Refungible Owned (r:0 w:4)82 fn create_multiple_items(b: u32, ) -> Weight {83 Weight::from_ref_time(11_880_472 as u64)84 // Standard Error: 5_24085 .saturating_add(Weight::from_ref_time(6_556_575 as u64).saturating_mul(b as u64))86 .saturating_add(T::DbWeight::get().reads(2 as u64))87 .saturating_add(T::DbWeight::get().writes(2 as u64))88 .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(b as u64)))89 }90 // Storage: Refungible TokensMinted (r:1 w:1)91 // Storage: Refungible AccountBalance (r:4 w:4)92 // Storage: Refungible Balance (r:0 w:4)93 // Storage: Refungible TotalSupply (r:0 w:4)94 // Storage: Refungible Owned (r:0 w:4)95 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {96 Weight::from_ref_time(11_644_173 as u64)97 // Standard Error: 5_87698 .saturating_add(Weight::from_ref_time(8_214_607 as u64).saturating_mul(b as u64))99 .saturating_add(T::DbWeight::get().reads(1 as u64))100 .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))101 .saturating_add(T::DbWeight::get().writes(1 as u64))102 .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(b as u64)))103 }104 // Storage: Refungible TokensMinted (r:1 w:1)105 // Storage: Refungible TotalSupply (r:0 w:1)106 // Storage: Refungible AccountBalance (r:4 w:4)107 // Storage: Refungible Balance (r:0 w:4)108 // Storage: Refungible Owned (r:0 w:4)109 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {110 Weight::from_ref_time(21_817_067 as u64)111 // Standard Error: 5_215112 .saturating_add(Weight::from_ref_time(6_084_938 as u64).saturating_mul(b as u64))113 .saturating_add(T::DbWeight::get().reads(1 as u64))114 .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))115 .saturating_add(T::DbWeight::get().writes(2 as u64))116 .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(b as u64)))117 }118 // Storage: Refungible Balance (r:3 w:1)119 // Storage: Refungible TotalSupply (r:1 w:1)120 // Storage: Refungible AccountBalance (r:1 w:1)121 // Storage: Refungible Owned (r:0 w:1)122 fn burn_item_partial() -> Weight {123 Weight::from_ref_time(47_087_000 as u64)124 .saturating_add(T::DbWeight::get().reads(5 as u64))125 .saturating_add(T::DbWeight::get().writes(4 as u64))126 }127 // Storage: Refungible Balance (r:1 w:1)128 // Storage: Refungible TotalSupply (r:1 w:1)129 // Storage: Refungible AccountBalance (r:1 w:1)130 // Storage: Refungible TokensBurnt (r:1 w:1)131 // Storage: Refungible Owned (r:0 w:1)132 // Storage: Refungible TokenProperties (r:0 w:1)133 fn burn_item_fully() -> Weight {134 Weight::from_ref_time(40_135_000 as u64)135 .saturating_add(T::DbWeight::get().reads(4 as u64))136 .saturating_add(T::DbWeight::get().writes(6 as u64))137 }138 // Storage: Refungible Balance (r:2 w:2)139 // Storage: Refungible TotalSupply (r:1 w:0)140 fn transfer_normal() -> Weight {141 Weight::from_ref_time(30_749_000 as u64)142 .saturating_add(T::DbWeight::get().reads(3 as u64))143 .saturating_add(T::DbWeight::get().writes(2 as u64))144 }145 // Storage: Refungible Balance (r:2 w:2)146 // Storage: Refungible AccountBalance (r:1 w:1)147 // Storage: Refungible TotalSupply (r:1 w:0)148 // Storage: Refungible Owned (r:0 w:1)149 fn transfer_creating() -> Weight {150 Weight::from_ref_time(33_565_000 as u64)151 .saturating_add(T::DbWeight::get().reads(4 as u64))152 .saturating_add(T::DbWeight::get().writes(4 as u64))153 }154 // Storage: Refungible Balance (r:2 w:2)155 // Storage: Refungible AccountBalance (r:1 w:1)156 // Storage: Refungible TotalSupply (r:1 w:0)157 // Storage: Refungible Owned (r:0 w:1)158 fn transfer_removing() -> Weight {159 Weight::from_ref_time(37_406_000 as u64)160 .saturating_add(T::DbWeight::get().reads(4 as u64))161 .saturating_add(T::DbWeight::get().writes(4 as u64))162 }163 // Storage: Refungible Balance (r:2 w:2)164 // Storage: Refungible AccountBalance (r:2 w:2)165 // Storage: Refungible TotalSupply (r:1 w:0)166 // Storage: Refungible Owned (r:0 w:2)167 fn transfer_creating_removing() -> Weight {168 Weight::from_ref_time(36_689_000 as u64)169 .saturating_add(T::DbWeight::get().reads(5 as u64))170 .saturating_add(T::DbWeight::get().writes(6 as u64))171 }172 // Storage: Refungible Balance (r:1 w:0)173 // Storage: Refungible Allowance (r:0 w:1)174 fn approve() -> Weight {175 Weight::from_ref_time(23_177_000 as u64)176 .saturating_add(T::DbWeight::get().reads(1 as u64))177 .saturating_add(T::DbWeight::get().writes(1 as u64))178 }179 // Storage: Refungible Balance (r:1 w:0)180 // Storage: Refungible Allowance (r:0 w:1)181 fn approve_from() -> Weight {182 Weight::from_ref_time(20_649_000 as u64)183 .saturating_add(T::DbWeight::get().reads(1 as u64))184 .saturating_add(T::DbWeight::get().writes(1 as u64))185 }186 // Storage: Refungible Allowance (r:1 w:1)187 // Storage: Refungible CollectionAllowance (r:1 w:0)188 // Storage: Refungible Balance (r:2 w:2)189 // Storage: Refungible TotalSupply (r:1 w:0)190 fn transfer_from_normal() -> Weight {191 Weight::from_ref_time(41_288_000 as u64)192 .saturating_add(T::DbWeight::get().reads(5 as u64))193 .saturating_add(T::DbWeight::get().writes(3 as u64))194 }195 // Storage: Refungible Allowance (r:1 w:1)196 // Storage: Refungible CollectionAllowance (r:1 w:0)197 // Storage: Refungible Balance (r:2 w:2)198 // Storage: Refungible AccountBalance (r:1 w:1)199 // Storage: Refungible TotalSupply (r:1 w:0)200 // Storage: Refungible Owned (r:0 w:1)201 fn transfer_from_creating() -> Weight {202 Weight::from_ref_time(44_807_000 as u64)203 .saturating_add(T::DbWeight::get().reads(6 as u64))204 .saturating_add(T::DbWeight::get().writes(5 as u64))205 }206 // Storage: Refungible Allowance (r:1 w:1)207 // Storage: Refungible CollectionAllowance (r:1 w:0)208 // Storage: Refungible Balance (r:2 w:2)209 // Storage: Refungible AccountBalance (r:1 w:1)210 // Storage: Refungible TotalSupply (r:1 w:0)211 // Storage: Refungible Owned (r:0 w:1)212 fn transfer_from_removing() -> Weight {213 Weight::from_ref_time(47_297_000 as u64)214 .saturating_add(T::DbWeight::get().reads(6 as u64))215 .saturating_add(T::DbWeight::get().writes(5 as u64))216 }217 // Storage: Refungible Allowance (r:1 w:1)218 // Storage: Refungible CollectionAllowance (r:1 w:0)219 // Storage: Refungible Balance (r:2 w:2)220 // Storage: Refungible AccountBalance (r:2 w:2)221 // Storage: Refungible TotalSupply (r:1 w:0)222 // Storage: Refungible Owned (r:0 w:2)223 fn transfer_from_creating_removing() -> Weight {224 Weight::from_ref_time(47_566_000 as u64)225 .saturating_add(T::DbWeight::get().reads(7 as u64))226 .saturating_add(T::DbWeight::get().writes(7 as u64))227 }228 // Storage: Refungible Allowance (r:1 w:1)229 // Storage: Refungible CollectionAllowance (r:1 w:0)230 // Storage: Refungible Balance (r:1 w:1)231 // Storage: Refungible TotalSupply (r:1 w:1)232 // Storage: Refungible AccountBalance (r:1 w:1)233 // Storage: Refungible TokensBurnt (r:1 w:1)234 // Storage: Refungible Owned (r:0 w:1)235 // Storage: Refungible TokenProperties (r:0 w:1)236 fn burn_from() -> Weight {237 Weight::from_ref_time(53_074_000 as u64)238 .saturating_add(T::DbWeight::get().reads(6 as u64))239 .saturating_add(T::DbWeight::get().writes(7 as u64))240 }241 // Storage: Common CollectionPropertyPermissions (r:1 w:1)242 fn set_token_property_permissions(b: u32, ) -> Weight {243 Weight::from_ref_time(5_170_000 as u64)244 // Standard Error: 40_532245 .saturating_add(Weight::from_ref_time(11_948_016 as u64).saturating_mul(b as u64))246 .saturating_add(T::DbWeight::get().reads(1 as u64))247 .saturating_add(T::DbWeight::get().writes(1 as u64))248 }249 // Storage: Common CollectionPropertyPermissions (r:1 w:0)250 // Storage: Refungible TokenProperties (r:1 w:1)251 fn set_token_properties(b: u32, ) -> Weight {252 Weight::from_ref_time(4_578_000 as u64)253 // Standard Error: 5_396_287254 .saturating_add(Weight::from_ref_time(633_314_546 as u64).saturating_mul(b as u64))255 .saturating_add(T::DbWeight::get().reads(2 as u64))256 .saturating_add(T::DbWeight::get().writes(1 as u64))257 }258 // Storage: Common CollectionPropertyPermissions (r:1 w:0)259 // Storage: Refungible TokenProperties (r:1 w:1)260 fn delete_token_properties(b: u32, ) -> Weight {261 Weight::from_ref_time(4_583_000 as u64)262 // Standard Error: 5_762_380263 .saturating_add(Weight::from_ref_time(696_007_076 as u64).saturating_mul(b as u64))264 .saturating_add(T::DbWeight::get().reads(2 as u64))265 .saturating_add(T::DbWeight::get().writes(1 as u64))266 }267 // Storage: Refungible TotalSupply (r:1 w:1)268 // Storage: Refungible Balance (r:1 w:1)269 fn repartition_item() -> Weight {270 Weight::from_ref_time(25_574_000 as u64)271 .saturating_add(T::DbWeight::get().reads(2 as u64))272 .saturating_add(T::DbWeight::get().writes(2 as u64))273 }274 // Storage: Refungible Balance (r:2 w:0)275 fn token_owner() -> Weight {276 Weight::from_ref_time(9_819_000 as u64)277 .saturating_add(T::DbWeight::get().reads(2 as u64))278 }279 // Storage: Refungible CollectionAllowance (r:0 w:1)280 fn set_allowance_for_all() -> Weight {281 Weight::from_ref_time(16_228_000 as u64)282 .saturating_add(T::DbWeight::get().writes(1 as u64))283 }284 // Storage: Refungible CollectionAllowance (r:1 w:0)285 fn allowance_for_all() -> Weight {286 Weight::from_ref_time(5_374_000 as u64)287 .saturating_add(T::DbWeight::get().reads(1 as u64))288 }289 // Storage: Refungible TokenProperties (r:1 w:1)290 fn repair_item() -> Weight {291 Weight::from_ref_time(5_624_000 as u64)292 .saturating_add(T::DbWeight::get().reads(1 as u64))293 .saturating_add(T::DbWeight::get().writes(1 as u64))294 }295}296297// For backwards compatibility and tests298impl WeightInfo for () {299 // Storage: Refungible TokensMinted (r:1 w:1)300 // Storage: Refungible AccountBalance (r:1 w:1)301 // Storage: Refungible Balance (r:0 w:1)302 // Storage: Refungible TotalSupply (r:0 w:1)303 // Storage: Refungible Owned (r:0 w:1)304 fn create_item() -> Weight {305 Weight::from_ref_time(32_864_000 as u64)306 .saturating_add(RocksDbWeight::get().reads(2 as u64))307 .saturating_add(RocksDbWeight::get().writes(5 as u64))308 }309 // Storage: Refungible TokensMinted (r:1 w:1)310 // Storage: Refungible AccountBalance (r:1 w:1)311 // Storage: Refungible Balance (r:0 w:4)312 // Storage: Refungible TotalSupply (r:0 w:4)313 // Storage: Refungible Owned (r:0 w:4)314 fn create_multiple_items(b: u32, ) -> Weight {315 Weight::from_ref_time(11_880_472 as u64)316 // Standard Error: 5_240317 .saturating_add(Weight::from_ref_time(6_556_575 as u64).saturating_mul(b as u64))318 .saturating_add(RocksDbWeight::get().reads(2 as u64))319 .saturating_add(RocksDbWeight::get().writes(2 as u64))320 .saturating_add(RocksDbWeight::get().writes((3 as u64).saturating_mul(b as u64)))321 }322 // Storage: Refungible TokensMinted (r:1 w:1)323 // Storage: Refungible AccountBalance (r:4 w:4)324 // Storage: Refungible Balance (r:0 w:4)325 // Storage: Refungible TotalSupply (r:0 w:4)326 // Storage: Refungible Owned (r:0 w:4)327 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {328 Weight::from_ref_time(11_644_173 as u64)329 // Standard Error: 5_876330 .saturating_add(Weight::from_ref_time(8_214_607 as u64).saturating_mul(b as u64))331 .saturating_add(RocksDbWeight::get().reads(1 as u64))332 .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))333 .saturating_add(RocksDbWeight::get().writes(1 as u64))334 .saturating_add(RocksDbWeight::get().writes((4 as u64).saturating_mul(b as u64)))335 }336 // Storage: Refungible TokensMinted (r:1 w:1)337 // Storage: Refungible TotalSupply (r:0 w:1)338 // Storage: Refungible AccountBalance (r:4 w:4)339 // Storage: Refungible Balance (r:0 w:4)340 // Storage: Refungible Owned (r:0 w:4)341 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {342 Weight::from_ref_time(21_817_067 as u64)343 // Standard Error: 5_215344 .saturating_add(Weight::from_ref_time(6_084_938 as u64).saturating_mul(b as u64))345 .saturating_add(RocksDbWeight::get().reads(1 as u64))346 .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))347 .saturating_add(RocksDbWeight::get().writes(2 as u64))348 .saturating_add(RocksDbWeight::get().writes((3 as u64).saturating_mul(b as u64)))349 }350 // Storage: Refungible Balance (r:3 w:1)351 // Storage: Refungible TotalSupply (r:1 w:1)352 // Storage: Refungible AccountBalance (r:1 w:1)353 // Storage: Refungible Owned (r:0 w:1)354 fn burn_item_partial() -> Weight {355 Weight::from_ref_time(47_087_000 as u64)356 .saturating_add(RocksDbWeight::get().reads(5 as u64))357 .saturating_add(RocksDbWeight::get().writes(4 as u64))358 }359 // Storage: Refungible Balance (r:1 w:1)360 // Storage: Refungible TotalSupply (r:1 w:1)361 // Storage: Refungible AccountBalance (r:1 w:1)362 // Storage: Refungible TokensBurnt (r:1 w:1)363 // Storage: Refungible Owned (r:0 w:1)364 // Storage: Refungible TokenProperties (r:0 w:1)365 fn burn_item_fully() -> Weight {366 Weight::from_ref_time(40_135_000 as u64)367 .saturating_add(RocksDbWeight::get().reads(4 as u64))368 .saturating_add(RocksDbWeight::get().writes(6 as u64))369 }370 // Storage: Refungible Balance (r:2 w:2)371 // Storage: Refungible TotalSupply (r:1 w:0)372 fn transfer_normal() -> Weight {373 Weight::from_ref_time(30_749_000 as u64)374 .saturating_add(RocksDbWeight::get().reads(3 as u64))375 .saturating_add(RocksDbWeight::get().writes(2 as u64))376 }377 // Storage: Refungible Balance (r:2 w:2)378 // Storage: Refungible AccountBalance (r:1 w:1)379 // Storage: Refungible TotalSupply (r:1 w:0)380 // Storage: Refungible Owned (r:0 w:1)381 fn transfer_creating() -> Weight {382 Weight::from_ref_time(33_565_000 as u64)383 .saturating_add(RocksDbWeight::get().reads(4 as u64))384 .saturating_add(RocksDbWeight::get().writes(4 as u64))385 }386 // Storage: Refungible Balance (r:2 w:2)387 // Storage: Refungible AccountBalance (r:1 w:1)388 // Storage: Refungible TotalSupply (r:1 w:0)389 // Storage: Refungible Owned (r:0 w:1)390 fn transfer_removing() -> Weight {391 Weight::from_ref_time(37_406_000 as u64)392 .saturating_add(RocksDbWeight::get().reads(4 as u64))393 .saturating_add(RocksDbWeight::get().writes(4 as u64))394 }395 // Storage: Refungible Balance (r:2 w:2)396 // Storage: Refungible AccountBalance (r:2 w:2)397 // Storage: Refungible TotalSupply (r:1 w:0)398 // Storage: Refungible Owned (r:0 w:2)399 fn transfer_creating_removing() -> Weight {400 Weight::from_ref_time(36_689_000 as u64)401 .saturating_add(RocksDbWeight::get().reads(5 as u64))402 .saturating_add(RocksDbWeight::get().writes(6 as u64))403 }404 // Storage: Refungible Balance (r:1 w:0)405 // Storage: Refungible Allowance (r:0 w:1)406 fn approve() -> Weight {407 Weight::from_ref_time(23_177_000 as u64)408 .saturating_add(RocksDbWeight::get().reads(1 as u64))409 .saturating_add(RocksDbWeight::get().writes(1 as u64))410 }411 // Storage: Refungible Balance (r:1 w:0)412 // Storage: Refungible Allowance (r:0 w:1)413 fn approve_from() -> Weight {414 Weight::from_ref_time(20_649_000 as u64)415 .saturating_add(RocksDbWeight::get().reads(1 as u64))416 .saturating_add(RocksDbWeight::get().writes(1 as u64))417 }418 // Storage: Refungible Allowance (r:1 w:1)419 // Storage: Refungible CollectionAllowance (r:1 w:0)420 // Storage: Refungible Balance (r:2 w:2)421 // Storage: Refungible TotalSupply (r:1 w:0)422 fn transfer_from_normal() -> Weight {423 Weight::from_ref_time(41_288_000 as u64)424 .saturating_add(RocksDbWeight::get().reads(5 as u64))425 .saturating_add(RocksDbWeight::get().writes(3 as u64))426 }427 // Storage: Refungible Allowance (r:1 w:1)428 // Storage: Refungible CollectionAllowance (r:1 w:0)429 // Storage: Refungible Balance (r:2 w:2)430 // Storage: Refungible AccountBalance (r:1 w:1)431 // Storage: Refungible TotalSupply (r:1 w:0)432 // Storage: Refungible Owned (r:0 w:1)433 fn transfer_from_creating() -> Weight {434 Weight::from_ref_time(44_807_000 as u64)435 .saturating_add(RocksDbWeight::get().reads(6 as u64))436 .saturating_add(RocksDbWeight::get().writes(5 as u64))437 }438 // Storage: Refungible Allowance (r:1 w:1)439 // Storage: Refungible CollectionAllowance (r:1 w:0)440 // Storage: Refungible Balance (r:2 w:2)441 // Storage: Refungible AccountBalance (r:1 w:1)442 // Storage: Refungible TotalSupply (r:1 w:0)443 // Storage: Refungible Owned (r:0 w:1)444 fn transfer_from_removing() -> Weight {445 Weight::from_ref_time(47_297_000 as u64)446 .saturating_add(RocksDbWeight::get().reads(6 as u64))447 .saturating_add(RocksDbWeight::get().writes(5 as u64))448 }449 // Storage: Refungible Allowance (r:1 w:1)450 // Storage: Refungible CollectionAllowance (r:1 w:0)451 // Storage: Refungible Balance (r:2 w:2)452 // Storage: Refungible AccountBalance (r:2 w:2)453 // Storage: Refungible TotalSupply (r:1 w:0)454 // Storage: Refungible Owned (r:0 w:2)455 fn transfer_from_creating_removing() -> Weight {456 Weight::from_ref_time(47_566_000 as u64)457 .saturating_add(RocksDbWeight::get().reads(7 as u64))458 .saturating_add(RocksDbWeight::get().writes(7 as u64))459 }460 // Storage: Refungible Allowance (r:1 w:1)461 // Storage: Refungible CollectionAllowance (r:1 w:0)462 // Storage: Refungible Balance (r:1 w:1)463 // Storage: Refungible TotalSupply (r:1 w:1)464 // Storage: Refungible AccountBalance (r:1 w:1)465 // Storage: Refungible TokensBurnt (r:1 w:1)466 // Storage: Refungible Owned (r:0 w:1)467 // Storage: Refungible TokenProperties (r:0 w:1)468 fn burn_from() -> Weight {469 Weight::from_ref_time(53_074_000 as u64)470 .saturating_add(RocksDbWeight::get().reads(6 as u64))471 .saturating_add(RocksDbWeight::get().writes(7 as u64))472 }473 // Storage: Common CollectionPropertyPermissions (r:1 w:1)474 fn set_token_property_permissions(b: u32, ) -> Weight {475 Weight::from_ref_time(5_170_000 as u64)476 // Standard Error: 40_532477 .saturating_add(Weight::from_ref_time(11_948_016 as u64).saturating_mul(b as u64))478 .saturating_add(RocksDbWeight::get().reads(1 as u64))479 .saturating_add(RocksDbWeight::get().writes(1 as u64))480 }481 // Storage: Common CollectionPropertyPermissions (r:1 w:0)482 // Storage: Refungible TokenProperties (r:1 w:1)483 fn set_token_properties(b: u32, ) -> Weight {484 Weight::from_ref_time(4_578_000 as u64)485 // Standard Error: 5_396_287486 .saturating_add(Weight::from_ref_time(633_314_546 as u64).saturating_mul(b as u64))487 .saturating_add(RocksDbWeight::get().reads(2 as u64))488 .saturating_add(RocksDbWeight::get().writes(1 as u64))489 }490 // Storage: Common CollectionPropertyPermissions (r:1 w:0)491 // Storage: Refungible TokenProperties (r:1 w:1)492 fn delete_token_properties(b: u32, ) -> Weight {493 Weight::from_ref_time(4_583_000 as u64)494 // Standard Error: 5_762_380495 .saturating_add(Weight::from_ref_time(696_007_076 as u64).saturating_mul(b as u64))496 .saturating_add(RocksDbWeight::get().reads(2 as u64))497 .saturating_add(RocksDbWeight::get().writes(1 as u64))498 }499 // Storage: Refungible TotalSupply (r:1 w:1)500 // Storage: Refungible Balance (r:1 w:1)501 fn repartition_item() -> Weight {502 Weight::from_ref_time(25_574_000 as u64)503 .saturating_add(RocksDbWeight::get().reads(2 as u64))504 .saturating_add(RocksDbWeight::get().writes(2 as u64))505 }506 // Storage: Refungible Balance (r:2 w:0)507 fn token_owner() -> Weight {508 Weight::from_ref_time(9_819_000 as u64)509 .saturating_add(RocksDbWeight::get().reads(2 as u64))510 }511 // Storage: Refungible CollectionAllowance (r:0 w:1)512 fn set_allowance_for_all() -> Weight {513 Weight::from_ref_time(16_228_000 as u64)514 .saturating_add(RocksDbWeight::get().writes(1 as u64))515 }516 // Storage: Refungible CollectionAllowance (r:1 w:0)517 fn allowance_for_all() -> Weight {518 Weight::from_ref_time(5_374_000 as u64)519 .saturating_add(RocksDbWeight::get().reads(1 as u64))520 }521 // Storage: Refungible TokenProperties (r:1 w:1)522 fn repair_item() -> Weight {523 Weight::from_ref_time(5_624_000 as u64)524 .saturating_add(RocksDbWeight::get().reads(1 as u64))525 .saturating_add(RocksDbWeight::get().writes(1 as u64))526 }527}pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -33,7 +33,6 @@
};
use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
-use sp_std::vec;
use up_data_structs::{
CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix,
CreateCollectionData,
@@ -316,13 +315,14 @@
<PalletCommon<T>>::set_collection_properties(
&collection,
&caller,
- vec![up_data_structs::Property {
+ [up_data_structs::Property {
key: key::base_uri(),
value: base_uri
.into_bytes()
.try_into()
.map_err(|_| "base uri is too large")?,
- }],
+ }]
+ .into_iter(),
)
.map_err(dispatch_to_evm::<T>)?;
}
runtime/common/identity.rsdiffbeforeafterboth--- a/runtime/common/identity.rs
+++ b/runtime/common/identity.rs
@@ -24,6 +24,9 @@
transaction_validity::{TransactionValidity, ValidTransaction, TransactionValidityError},
};
+#[cfg(feature = "collator-selection")]
+use sp_runtime::transaction_validity::InvalidTransaction;
+
#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]
pub struct DisableIdentityCalls;
tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -651,6 +651,9 @@
try {
result = await this.signTransaction(sender, this.constructApiCall(extrinsic, params), options, extrinsic) as ITransactionResult;
events = this.eventHelper.extractEvents(result.result.events);
+ const errorEvent = events.find((event) => event.method == 'ExecutedFailed' || event.method == 'CreatedFailed');
+ if (errorEvent)
+ throw Error(errorEvent.method + ': ' + extrinsic);
}
catch(e) {
if(!(e as object).hasOwnProperty('status')) throw e;