`c22a6144da28`

4 files changed

modifiedpallets/rmrk-proxy/src/lib.rsdiff before after both

--- a/pallets/rmrk-proxy/src/lib.rs
+++ b/pallets/rmrk-proxy/src/lib.rs
@@ -27,8 +27,10 @@
 pub use pallet::*;
 
 pub mod misc;
+pub mod property;
 
 use misc::*;
+pub use property::*;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -69,6 +71,7 @@
         /* Unique-specific events */
         CorruptedCollectionType,
         NotRmrkCollection,
+        RmrkPropertyIsTooLong,
 
         /* RMRK compatible events */
         CollectionNotEmpty,
@@ -113,8 +116,8 @@
                 &collection,
                 PropertyScope::Rmrk,
                 [
-                    rmrk_property!(Metadata, metadata),
-                    rmrk_property!(CollectionType, CollectionType::Regular),
+                    rmrk_property!(Config=T, Metadata: metadata)?,
+                    rmrk_property!(Config=T, CollectionType: CollectionType::Regular)?,
                 ].into_iter()
             )?;
 
@@ -215,7 +218,7 @@
 
     fn get_collection_type(collection_id: CollectionId) -> Result<CollectionType, DispatchError> {
         let collection_type: CollectionType = <PalletCommon<T>>::collection_properties(collection_id)
-            .get(&rmrk_property!(CollectionType))
+            .get(&rmrk_property!(Config=T, CollectionType)?)
             .ok_or(<Error<T>>::NotRmrkCollection)?
             .try_into()
             .map_err(<Error<T>>::from)?;

modifiedpallets/rmrk-proxy/src/misc.rsdiff before after both

1use super::*;1use super::*;
2use codec::{Encode, Decode};2use codec::{Encode, Decode};
3use frame_support::dispatch::Vec;
4use pallet_nonfungible::NonfungibleHandle;3use pallet_nonfungible::NonfungibleHandle;
5
6#[macro_export]
7macro_rules! rmrk_property {
8    ($key:ident, $value:expr) => {
9        Property {
10            key: rmrk_property!(@raw $key),
11            value: $value.into()
12        }
13    };
14
15    (@raw $key:ident) => {
16        RmrkProperty::$key.to_key()
17    };
18
19    ($key:ident) => {
20        PropertyScope::Rmrk.apply(rmrk_property!(@raw $key)).unwrap()
21    };
22}
234
24macro_rules! impl_rmrk_value {5macro_rules! impl_rmrk_value {
25    ($enum_name:path, decode_error: $error:ident) => {6    ($enum_name:path, decode_error: $error:ident) => {
26        impl Into<PropertyValue> for $enum_name {7        impl From<$enum_name> for PropertyValue {
27            fn into(self) -> PropertyValue {8            fn from(e: $enum_name) -> Self {
28                self.encode().try_into().unwrap()9                e.encode().try_into().unwrap()
29            }10            }
30        }11        }
3112
68    }49    }
69}50}
70
71pub enum RmrkProperty {
72    Metadata,
73    CollectionType,
74}
75
76impl RmrkProperty {
77    pub fn to_key(self) -> PropertyKey {
78        let key = |str_key: &str| {
79            PropertyKey::try_from(
80                str_key.bytes().collect::<Vec<_>>()
81            ).unwrap()
82        };
83
84        match self {
85            Self::Metadata => key("metadata"),
86            Self::CollectionType => key("collection-type"),
87        }
88    }
89}
9051
91#[derive(Encode, Decode, PartialEq, Eq)]52#[derive(Encode, Decode, PartialEq, Eq)]
92pub enum CollectionType {53pub enum CollectionType {

addedpallets/rmrk-proxy/src/property.rsdiff before after both

--- /dev/null
+++ b/pallets/rmrk-proxy/src/property.rs
@@ -0,0 +1,92 @@
+use super::*;
+use core::convert::AsRef;
+
+pub enum RmrkProperty {
+    Metadata,
+    CollectionType,
+    Recipient,
+    Royalty,
+    Equipped,
+    Pending,
+    ResourceCollection,
+    ResourcePriorities,
+    PendingRemoval,
+    Parts,
+    Base,
+    Src,
+    Slot,
+    License,
+    Thumb,
+    EquippedNft,
+    BaseType,
+    // // RmrkPartId(/* Id type? */)
+    EquippableList,
+    ZIndex,
+    ThemeName,
+    ThemeProperty(RmrkString),
+    ThemeInherit,
+}
+
+impl RmrkProperty {
+    pub fn to_key<T: Config>(self) -> Result<PropertyKey, Error<T>> {
+        fn get_bytes<T: AsRef<[u8]>>(container: &T) -> &[u8] {
+            container.as_ref()
+        }
+
+        macro_rules! key {
+            ($($component:expr),+) => {
+                PropertyKey::try_from([$(key!(@ &$component)),+].concat())
+                    .map_err(|_| <Error<T>>::RmrkPropertyIsTooLong)
+            };
+
+            (@ $key:expr) => {
+                get_bytes($key)
+            };
+        }
+
+        match self {
+            Self::Metadata => key!("metadata"),
+            Self::CollectionType => key!("collection-type"),
+            Self::Recipient => key!("recipient"),
+            Self::Royalty => key!("royalty"),
+            Self::Equipped => key!("equipped"),
+            Self::Pending => key!("pending"),
+            Self::ResourceCollection => key!("resource-collection"),
+            Self::ResourcePriorities => key!("resource-priorities"),
+            Self::PendingRemoval => key!("pending-removal"),
+            Self::Parts => key!("parts"),
+            Self::Base => key!("base"),
+            Self::Src => key!("src"),
+            Self::Slot => key!("slot"),
+            Self::License => key!("license"),
+            Self::Thumb => key!("thumb"),
+            Self::EquippedNft => key!("equipped-nft"),
+            Self::BaseType => key!("base-type"),
+            // RmrkPartId(/* Id type? */)
+            Self::EquippableList => key!("equippable-list"),
+            Self::ZIndex => key!("z-index"),
+            Self::ThemeName => key!("theme-name"),
+            Self::ThemeProperty(name) => key!("theme-property-", name),
+            Self::ThemeInherit => key!("theme-inherit"),
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! rmrk_property {
+    (Config=$cfg:ty, $key:ident: $value:expr) => {
+        rmrk_property!(@$cfg, $key).map(|key| Property {
+            key,
+            value: $value.into()
+        })
+    };
+
+    (@$cfg:ty, $key:ident) => {
+        $crate::RmrkProperty::$key.to_key::<$cfg>()
+    };
+
+    (Config=$cfg:ty, $key:ident) => {
+        PropertyScope::Rmrk.apply(rmrk_property!(@$cfg, $key)?)
+            .map_err(|_| <Error<T>>::RmrkPropertyIsTooLong)
+    };
+}

modifiedprimitives/data-structs/src/lib.rsdiff before after both

--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -924,4 +924,4 @@
 pub type RmrkThemeName = RmrkRpcString;
 pub type RmrkPropertyKey = RmrkRpcString;
 
-type RmrkString = BoundedVec<u8, RmrkStringLimit>;
+pub type RmrkString = BoundedVec<u8, RmrkStringLimit>;