git.delta.rocks / unique-network / refs/commits / 27f22a5bc9e8

20	pallet_prelude::*,
21	transactional,
22	BoundedVec,
23	dispatch::DispatchResult,
24};
25use frame_system::{pallet_prelude::*, ensure_signed};20use frame_system::{pallet_prelude::*, ensure_signed};
26use sp_runtime::{DispatchError, Permill, traits::StaticLookup};21use sp_runtime::{DispatchError, Permill, traits::StaticLookup};
27use sp_std::{vec::Vec, collections::{btree_set::BTreeSet, btree_map::BTreeMap}};22use sp_std::{
23	vec::Vec,
24	collections::{btree_set::BTreeSet, btree_map::BTreeMap},
25};
28use up_data_structs::{*, mapping::TokenAddressMapping};26use up_data_structs::{*, mapping::TokenAddressMapping};
29use pallet_common::{27use pallet_common::{
702			)?;700			)?;
703701
704			match pending_target {702			match pending_target {
705				Some(pending_target) => Self::remove_pending_child(pending_target, (rmrk_collection_id, rmrk_nft_id))?,703				Some(pending_target) => {
704					Self::remove_pending_child(pending_target, (rmrk_collection_id, rmrk_nft_id))?
705				}
706				None => return Err(<Error<T>>::CannotRejectNonPendingNft.into()),706				None => return Err(<Error<T>>::CannotRejectNonPendingNft.into()),
707			}707			}
708708
995				|value| -> DispatchResult {995				|value| -> DispatchResult {
996					let mut bases: BasesMap = match value {996					let mut bases: BasesMap = match value {
997						Some(value) => Self::decode_property(value)?,997						Some(value) => Self::decode_property(value)?,
998						None => BasesMap::new()998						None => BasesMap::new(),
999					};999					};
1000	1000
1001					*bases.entry(base_id).or_insert(0) += 1;1001					*bases.entry(base_id).or_insert(0) += 1;
1002	1002
1003					*value = Some(Self::encode_property(&bases)?);1003					*value = Some(Self::encode_property(&bases)?);
1004					Ok(())1004					Ok(())
1005				}1005				},
1006			)?;1006			)?;
10071007
1008			Self::deposit_event(Event::ResourceAdded {1008			Self::deposit_event(Event::ResourceAdded {
1254			collection_id,1257			collection_id,
1255			nft_id,1258			nft_id,
1256			PropertyScope::Rmrk,1259			PropertyScope::Rmrk,
1257			Self::rmrk_property_key(PendingChildren)?1260			Self::rmrk_property_key(PendingChildren)?,
1258		));1261		));
12591262
1260		let pending_children = match property {1263		let pending_children = match property {
1345			collection_id,1348			collection_id,
1346			nft_id,1349			nft_id,
1347			scope,1350			scope,
1348			resource_id_key.clone()1351			resource_id_key.clone(),
1349		)).ok_or(<Error<T>>::ResourceDoesntExist)?;1352		))
1353		.ok_or(<Error<T>>::ResourceDoesntExist)?;
13501354
1392			|value| -> DispatchResult {1396			|value| -> DispatchResult {
1393				let mut bases: BasesMap = match value {1397				let mut bases: BasesMap = match value {
1394					Some(value) => Self::decode_property(value)?,1398					Some(value) => Self::decode_property(value)?,
1395					None => BasesMap::new()1399					None => BasesMap::new(),
1396				};1400				};
13971401
1398				let remaining = bases.get(&base_id);1402				let remaining = bases.get(&base_id);
14051409
1406				*value = Some(Self::encode_property(&bases)?);1410				*value = Some(Self::encode_property(&bases)?);
1407				Ok(())1411				Ok(())
1408			}1412			},
1409		)1413		)
1410	}1414	}
14111415

--- a/pallets/proxy-rmrk-core/src/property.rs
+++ b/pallets/proxy-rmrk-core/src/property.rs
@@ -98,8 +98,11 @@
 	let key_prefix = PropertyKey::try_from(prefix.as_bytes().to_vec()).ok()?;
 	let key_prefix = PropertyScope::Rmrk.apply(key_prefix).ok()?;
 
-	key.as_slice().strip_prefix(key_prefix.as_slice())?
-		.to_vec().try_into().ok()
+	key.as_slice()
+		.strip_prefix(key_prefix.as_slice())?
+		.to_vec()
+		.try_into()
+		.ok()
 }
 
 pub fn is_valid_key_prefix(key: &PropertyKey, prefix: &str) -> bool {

--- a/pallets/proxy-rmrk-core/src/rpc.rs
+++ b/pallets/proxy-rmrk-core/src/rpc.rs
@@ -141,11 +141,12 @@
 				})
 			})
 			.chain(
-				<Pallet<T>>::iterate_pending_children(collection_id, nft_id)?
-					.map(|(child_collection, child_nft_id)| RmrkNftChild {
+				<Pallet<T>>::iterate_pending_children(collection_id, nft_id)?.map(
+					|(child_collection, child_nft_id)| RmrkNftChild {
 						collection_id: child_collection,
 						nft_id: child_nft_id,
-					})
+					},
+				),
 			)
 			.collect(),
 	)