difftreelog
feat(rmrk-rpc) decoding properties
in: master
3 files changed
pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -420,7 +420,7 @@
Ok(())
}
- fn get_typed_nft_collection(
+ pub fn get_typed_nft_collection(
collection_id: CollectionId,
collection_type: CollectionType
) -> Result<NonfungibleHandle<T>, DispatchError> {
pallets/proxy-rmrk-core/src/misc.rsdiffbeforeafterboth1use super::*;2use codec::{Encode, Decode};3use pallet_nonfungible::{NonfungibleHandle, ItemData};45macro_rules! impl_rmrk_value {6 ($enum_name:path, decode_error: $error:ident) => {7 impl TryFrom<&PropertyValue> for $enum_name {8 type Error = MiscError;910 fn try_from(value: &PropertyValue) -> Result<Self, Self::Error> {11 let mut value = value.as_slice();1213 <$enum_name>::decode(&mut value)14 .map_err(|_| MiscError::$error)15 }16 }1718 };19}2021#[macro_export]22macro_rules! map_common_err_to_proxy {23 (match $err:ident { $($common_err:ident => $proxy_err:ident),+ }) => {24 $(25 if $err == <CommonError<T>>::$common_err.into() {26 return <Error<T>>::$proxy_err.into()27 } else28 )+ {29 $err30 }31 };32}3334pub enum MiscError {35 RmrkPropertyValueIsTooLong,36 CorruptedCollectionType,37}3839impl<T: Config> From<MiscError> for Error<T> {40 fn from(error: MiscError) -> Self {41 match error {42 MiscError::RmrkPropertyValueIsTooLong => Self::RmrkPropertyValueIsTooLong,43 MiscError::CorruptedCollectionType => Self::CorruptedCollectionType,44 }45 }46}4748pub trait IntoNftCollection<T: Config> {49 fn into_nft_collection(self) -> Result<NonfungibleHandle<T>, Error<T>>;50}5152impl<T: Config> IntoNftCollection<T> for CollectionHandle<T> {53 fn into_nft_collection(self) -> Result<NonfungibleHandle<T>, Error<T>> {54 match self.mode {55 CollectionMode::NFT => Ok(NonfungibleHandle::cast(self)),56 _ => Err(<Error<T>>::CollectionUnknown)57 }58 }59}6061pub trait IntoPropertyValue {62 fn into_property_value(self) -> Result<PropertyValue, MiscError>;63}6465impl<T: Encode> IntoPropertyValue for T {66 fn into_property_value(self) -> Result<PropertyValue, MiscError> {67 self.encode()68 .try_into()69 .map_err(|_| MiscError::RmrkPropertyValueIsTooLong)70 }71}7273pub trait RmrkNft {74 fn rmrk_nft_type(&self) -> Option<NftType>;75}7677impl<CrossAccountId> RmrkNft for ItemData<CrossAccountId> {78 fn rmrk_nft_type(&self) -> Option<NftType> {79 let mut value = self.const_data.as_slice();8081 NftType::decode(&mut value).ok()82 }83}8485#[derive(Encode, Decode, PartialEq, Eq)]86pub enum CollectionType {87 Regular,88 Resource,89 Base,90}9192#[derive(Encode, Decode, PartialEq, Eq)]93pub enum NftType {94 Regular,95 Resource,96 FixedPart,97 SlotPart,98 Theme99}100101impl_rmrk_value!(CollectionType, decode_error: CorruptedCollectionType);1use super::*;2use codec::{Encode, Decode};3use pallet_nonfungible::{NonfungibleHandle, ItemData};45macro_rules! impl_rmrk_value {6 ($enum_name:path, decode_error: $error:ident) => {7 impl TryFrom<&PropertyValue> for $enum_name {8 type Error = MiscError;910 fn try_from(value: &PropertyValue) -> Result<Self, Self::Error> {11 let mut value = value.as_slice();1213 <$enum_name>::decode(&mut value)14 .map_err(|_| MiscError::$error)15 }16 }1718 };19}2021#[macro_export]22macro_rules! map_common_err_to_proxy {23 (match $err:ident { $($common_err:ident => $proxy_err:ident),+ }) => {24 $(25 if $err == <CommonError<T>>::$common_err.into() {26 return <Error<T>>::$proxy_err.into()27 } else28 )+ {29 $err30 }31 };32}3334pub enum MiscError {35 RmrkPropertyValueIsTooLong,36 CorruptedCollectionType,37}3839impl<T: Config> From<MiscError> for Error<T> {40 fn from(error: MiscError) -> Self {41 match error {42 MiscError::RmrkPropertyValueIsTooLong => Self::RmrkPropertyValueIsTooLong,43 MiscError::CorruptedCollectionType => Self::CorruptedCollectionType,44 }45 }46}4748pub trait IntoNftCollection<T: Config> {49 fn into_nft_collection(self) -> Result<NonfungibleHandle<T>, Error<T>>;50}5152impl<T: Config> IntoNftCollection<T> for CollectionHandle<T> {53 fn into_nft_collection(self) -> Result<NonfungibleHandle<T>, Error<T>> {54 match self.mode {55 CollectionMode::NFT => Ok(NonfungibleHandle::cast(self)),56 _ => Err(<Error<T>>::CollectionUnknown)57 }58 }59}6061pub trait IntoPropertyValue {62 fn into_property_value(self) -> Result<PropertyValue, MiscError>;63}6465impl<T: Encode> IntoPropertyValue for T {66 fn into_property_value(self) -> Result<PropertyValue, MiscError> {67 self.encode()68 .try_into()69 .map_err(|_| MiscError::RmrkPropertyValueIsTooLong)70 }71}7273pub trait RmrkNft {74 fn rmrk_nft_type(&self) -> Option<NftType>;75}7677impl<CrossAccountId> RmrkNft for ItemData<CrossAccountId> {78 fn rmrk_nft_type(&self) -> Option<NftType> {79 let mut value = self.const_data.as_slice();8081 NftType::decode(&mut value).ok()82 }83}8485pub trait RmrkDecode<T: Decode> {86 fn decode_property(&self) -> Option<T>;87}8889impl<T: Decode> RmrkDecode<T> for RmrkString {90 fn decode_property(&self) -> Option<T> { // todo access runtime errors? // but then rmrk_nft_type must have it too91 let mut value = self.as_slice();9293 T::decode(&mut value).ok()94 }95}9697#[derive(Encode, Decode, PartialEq, Eq)]98pub enum CollectionType {99 Regular,100 Resource,101 Base,102}103104#[derive(Encode, Decode, PartialEq, Eq)]105pub enum NftType {106 Regular,107 Resource,108 FixedPart,109 SlotPart,110 Theme111}112113impl_rmrk_value!(CollectionType, decode_error: CorruptedCollectionType);runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -148,17 +148,18 @@
// TODO decide on displacement to palettes -- does RMRK belong there, spread across common and nonfungible?
use frame_support::BoundedVec;
use scale_info::prelude::string::String;
- use pallet_proxy_rmrk_core::RmrkProperty;
+ use pallet_proxy_rmrk_core::{RmrkProperty, misc::CollectionType};
- // todo check if this is a rmrk collection? or simply trust and provide anyway?
+ // todo check if this is a rmrk standard collection? or simply trust and provide anyway?
// client-is-always-right / enforce authority and order ?
let collection_id = CollectionId(collection_id);
- let collection = <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_collection(collection_id)?;
- // todo Vec::from(["rmrk:metadata", "rmrk:collection-type"])
+ let collection = <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_typed_nft_collection(collection_id, CollectionType::Regular)?;
+
let metadata = BoundedVec::try_from(
<pallet_proxy_rmrk_core::Pallet<Runtime>>::get_collection_property(collection_id, RmrkProperty::Metadata)?.into_inner()
- ).map_err(|_| <pallet_common::Error<Runtime>>::PropertyKeyIsTooLong)?;//unwrap_or_default();
+ ).map_err(|_| <pallet_common::Error<Runtime>>::PropertyKeyIsTooLong)?;
+
let nfts_count = (dispatch_unique_runtime!(collection_id.total_supply()) as Result<u32, DispatchError>)?; // todo? <Runtime>::total_supply(collection_id)
Ok(Some(RmrkCollectionInfo {
@@ -174,11 +175,11 @@
fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {
use frame_support::BoundedVec;
use up_data_structs::mapping::TokenAddressMapping;
- use pallet_proxy_rmrk_core::RmrkProperty;
+ use pallet_proxy_rmrk_core::{RmrkProperty, misc::RmrkDecode};
let collection_id = CollectionId(collection_id);
let nft_id = TokenId(nft_by_id);
-
+
let owner = match (dispatch_unique_runtime!(collection_id.token_owner(nft_id)) as Result<Option<CrossAccountId>, DispatchError>)? {
Some(owner) => match <Runtime as pallet_common::Config>::CrossTokenAddressMapping::address_to_token(&owner) {
Some((col, tok)) => RmrkAccountIdOrCollectionNftTuple::CollectionAndNftTuple(col.0, tok.0),
@@ -187,6 +188,7 @@
None => return Ok(None)
};
+ // todo displace querying property key array to rmrk proxy pallet
let keys = [
RmrkProperty::RoyaltyInfo,
RmrkProperty::Metadata,
@@ -196,19 +198,20 @@
let properties = keys.into_iter().map(
|key| BoundedVec::try_from(
- // todo nft property, not collection
<pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_property(collection_id, nft_id, key).unwrap().into_inner()
).unwrap()
)
.collect::<Vec<RmrkString>>();
+
+ let allowance = pallet_nonfungible::Allowance::<Runtime>::get((collection_id, nft_id));
Ok(Some(RmrkInstanceInfo {
owner: owner,
//recipient: , // prop?
- royalty: None,//Permill::from_percent(0), // prop, decode
+ royalty: properties[0].clone().decode_property().unwrap(),
metadata: properties[1].clone(),
- equipped: false, // prop, decode
- pending: false, // prop, decode
+ equipped: properties[2].clone().decode_property().unwrap(),
+ pending: allowance.is_some(),
}))
}
fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {
@@ -234,7 +237,7 @@
Ok(
pallet_nonfungible::Owned::<Runtime>::iter_prefix((collection_id, cross_account_id))
.map(|(child_id, _)| RmrkNftChild {
- collection_id: collection_id.0, // todo make sure they're always from this collection
+ collection_id: collection_id.0, // todo make sure they're always from this collection // spoiler: they're not
nft_id: child_id.0,
})
.collect()
@@ -315,7 +318,7 @@
let nft_id = TokenId(nft_id);
// let keys = [
- // RmrkProperty::Royalty,
+ // RmrkProperty::RoyaltyInfo,
// RmrkProperty::Metadata,
// RmrkProperty::Equipped,
// RmrkProperty::Pending,
@@ -339,10 +342,11 @@
fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {
use frame_support::BoundedVec;
use scale_info::prelude::string::String;
- use pallet_proxy_rmrk_core::RmrkProperty;
+ use pallet_proxy_rmrk_core::{RmrkProperty, misc::CollectionType};
let collection_id = CollectionId(base_id);
- let collection = <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_collection(collection_id)?;
+ let collection = <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_typed_nft_collection(collection_id, CollectionType::Base)?;
+ // todo check prop for being a base
// todo export to macro? redundancy
let keys = [
@@ -368,46 +372,47 @@
}
fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {
use frame_support::BoundedVec;
- use pallet_proxy_rmrk_core::RmrkProperty;
+ use pallet_proxy_rmrk_core::{RmrkProperty, misc::{RmrkNft, RmrkDecode}};
let collection_id = CollectionId(base_id);
-
- let keys = [
- //RmrkProperty::NftType)?,
- //RmrkProperty::PartId)?,
- RmrkProperty::Src,
- RmrkProperty::ZIndex,
- RmrkProperty::EquippableList,
- ];
+ // todo check prop for being a base
let parts = (dispatch_unique_runtime!(collection_id.collection_tokens()) as Result<Vec<TokenId>, DispatchError>)?
.iter()
.filter_map(|token_id| {
- /*let properties = keys.into_iter().map(
+ let nft_type = <pallet_nonfungible::TokenData<Runtime>>::get((collection_id, token_id))
+ //.map_err(|_| ) // no need, tis a filter_map
+ .unwrap()
+ .rmrk_nft_type()?;
+
+ // dislocate to rmrkproxycore and simply send an array of keys
+ let keys = [
+ //RmrkProperty::PartId)?,
+ RmrkProperty::Src,
+ RmrkProperty::ZIndex,
+ RmrkProperty::EquippableList,
+ ];
+
+ let properties = keys.into_iter().map(
|key| BoundedVec::try_from(
<pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_property(collection_id, *token_id, key).unwrap().into_inner()
).unwrap()
- ).collect::<Vec<RmrkString>>();*/
+ ).collect::<Vec<RmrkString>>();
- // todo ping properties for "rmrk:nft-type"
- // if none, skip, None
- let nft_type = "fixed-part";
-
match nft_type {
- "fixed-part" => Some(RmrkPartType::FixedPart(RmrkFixedPart {
+ FixedPart => Some(RmrkPartType::FixedPart(RmrkFixedPart {
id: token_id.0,
- src: BoundedVec::default(), // "rmrk:src"
- z: 0, // "rmrk:z-index"
+ src: properties[0].clone().decode_property().unwrap(),
+ z: properties[1].clone().decode_property().unwrap(),
})),
- "slot-part" => Some(RmrkPartType::SlotPart(RmrkSlotPart {
+ SlotPart => Some(RmrkPartType::SlotPart(RmrkSlotPart {
id: token_id.0,
- equippable: RmrkEquippableList::Empty, // "rmrk:equippable-list" ?
- src: BoundedVec::default(), // "rmrk:src"
- z: 0, // "rmrk:z-index"
+ src: properties[0].clone().decode_property().unwrap(),
+ z: properties[1].clone().decode_property().unwrap(),
+ equippable: properties[2].clone().decode_property().unwrap(),
})),
_ => None
}
-
})
.collect();
@@ -415,24 +420,29 @@
}
fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {
use frame_support::BoundedVec;
+ use pallet_proxy_rmrk_core::{RmrkProperty, misc::{RmrkNft, RmrkDecode}};
let collection_id = CollectionId(base_id);
+ // todo make sure this is theme
let theme_names = (dispatch_unique_runtime!(collection_id.collection_tokens()) as Result<Vec<TokenId>, DispatchError>)?
.iter()
.filter_map(|token_id| {
- let properties = pallet_nonfungible::Pallet::<Runtime>::token_properties((collection_id, token_id));
-
- // todo ping property for "rmrk:nft-type"
- // if none or not "theme", skip, None
- let nft_type = "theme";
- // can't call dispatch_unique_runtime! from here??
- <pallet_nonfungible::TokenData<Runtime>>::get((collection_id, token_id))
- .map(|t| t.const_data.into_inner())
- //.unwrap_or_default()
- // todo rework to reduce independence
+ let nft_type = <pallet_nonfungible::TokenData<Runtime>>::get((collection_id, token_id))
+ .unwrap()
+ .rmrk_nft_type()?;
+
+ match nft_type {
+ Theme => Some(
+ <pallet_proxy_rmrk_core::Pallet<Runtime>>::get_nft_property(
+ collection_id, *token_id, RmrkProperty::ThemeName
+ ).unwrap()
+ .into_inner()
+ ),
+ _ => None
+ }
})
- .collect();
+ .collect::<Vec<RmrkThemeName>>();
Ok(theme_names)
}