git.delta.rocks / unique-network / refs/commits / e51699278c06

--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@
 	PACKAGE=pallet-nonfungible NAME=erc::gen_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
 	PACKAGE=pallet-nonfungible NAME=erc::gen_impl OUTPUT=$(NONFUNGIBLE_EVM_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
 	
-UniqueRFT.sol:
+UniqueRefungible.sol:
 	PACKAGE=pallet-refungible NAME=erc::gen_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
 	PACKAGE=pallet-refungible NAME=erc::gen_impl OUTPUT=$(REFUNGIBLE_EVM_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
 
@@ -65,8 +65,8 @@
 	INPUT=$(REFUNGIBLE_EVM_STUBS)/$< OUTPUT=$(REFUNGIBLE_EVM_STUBS)/UniqueRefungibleToken.raw ./.maintain/scripts/compile_stub.sh
 	INPUT=$(REFUNGIBLE_EVM_STUBS)/$< OUTPUT=$(RENFUNGIBLE_TOKEN_EVM_ABI) ./.maintain/scripts/generate_abi.sh
 
-UniqueRefungible: UniqueRFT.sol
-	INPUT=$(REFUNGIBLE_EVM_STUBS)/$< OUTPUT=$(REFUNGIBLE_EVM_STUBS)/UniqueRFT.raw ./.maintain/scripts/compile_stub.sh
+UniqueRefungible: UniqueRefungible.sol
+	INPUT=$(REFUNGIBLE_EVM_STUBS)/$< OUTPUT=$(REFUNGIBLE_EVM_STUBS)/UniqueRefungible.raw ./.maintain/scripts/compile_stub.sh
 	INPUT=$(REFUNGIBLE_EVM_STUBS)/$< OUTPUT=$(REFUNGIBLE_EVM_ABI) ./.maintain/scripts/generate_abi.sh
 
 ContractHelpers: ContractHelpers.sol

--- a/pallets/common/CHANGELOG.MD
+++ b/pallets/common/CHANGELOG.MD
@@ -8,3 +8,8 @@
 
 -   Some methods in `#[solidity_interface]` for `CollectionHandle` had invalid
     mutability modifiers, causing invalid stub/abi generation.
+
+
+## [0.1.3] - 2022-07-25
+### Add
+-   Some static property keys and values.
\ No newline at end of file

--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-common"
-version = "0.1.2"
+version = "0.1.3"
 license = "GPLv3"
 edition = "2021"
 

--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -430,7 +430,8 @@
 	Ok(())
 }
 
-pub mod static_property_key_value {
+/// Contains static property keys and values.
+pub mod static_property {
 	use evm_coder::{
 		execution::{Result, Error},
 	};
@@ -438,27 +439,45 @@
 
 	const EXPECT_CONVERT_ERROR: &str = "length < limit";
 
-	pub fn schema_name_key() -> up_data_structs::PropertyKey {
-		property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)
-	}
+	/// Keys.
+	pub mod key {
+		use super::*;
 
-	pub fn base_uri_key() -> up_data_structs::PropertyKey {
-		property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)
+		/// Key "schemaName".
+		pub fn schema_name() -> up_data_structs::PropertyKey {
+			property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)
+		}
+
+		/// Key "baseURI".
+		pub fn base_uri() -> up_data_structs::PropertyKey {
+			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)
+		}
+
+		/// Key "url".
+		pub fn url() -> up_data_structs::PropertyKey {
+			property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)
+		}
+
+		/// Key "suffix".
+		pub fn suffix() -> up_data_structs::PropertyKey {
+			property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)
+		}
 	}
 
-	pub fn url_key() -> up_data_structs::PropertyKey {
-		property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)
-	}
+	/// Values.
+	pub mod value {
+		use super::*;
 
-	pub fn suffix_key() -> up_data_structs::PropertyKey {
-		property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)
-	}
+		/// Value "ERC721Metadata".
+		pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";
 
-	pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";
-	pub fn erc721_value() -> up_data_structs::PropertyValue {
-		property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)
+		/// Value for [`ERC721_METADATA`].
+		pub fn erc721() -> up_data_structs::PropertyValue {
+			property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)
+		}
 	}
 
+	/// Convert `byte` to [`PropertyKey`].
 	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {
 		bytes.to_vec().try_into().map_err(|_| {
 			Error::Revert(format!(
@@ -468,6 +487,7 @@
 		})
 	}
 
+	/// Convert `bytes` to [`PropertyValue`].
 	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {
 		bytes.to_vec().try_into().map_err(|_| {
 			Error::Revert(format!(

22
3All notable changes to this project will be documented in this file.3All notable changes to this project will be documented in this file.
44
5## [0.1.1] - 2022-07-145## [0.1.2] - 2022-07-25
6### Changed
7- New alghoritm for retrieving `token_iri`.
68
9## [0.1.1] - 2022-07-14
7### Added10### Added
811
9- Implementation of RPC method `token_owners`.12- Implementation of RPC method `token_owners`.
10   For reasons of compatibility with this pallet, returns only one owner if token exists.13   For reasons of compatibility with this pallet, returns only one owner if token exists.
11   This was an internal request to improve the web interface and support fractionalization event. 14   This was an internal request to improve the web interface and support fractionalization event. 
15

--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nonfungible"
-version = "0.1.1"
+version = "0.1.2"
 license = "GPLv3"
 edition = "2021"
 

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -33,7 +33,7 @@
 use pallet_evm_coder_substrate::dispatch_to_evm;
 use sp_std::vec::Vec;
 use pallet_common::{
-	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property_key_value::*},
+	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::{key, value as property_value}},
 	CollectionHandle, CollectionPropertyPermissions,
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
@@ -221,10 +221,10 @@
 	fn token_uri(&self, token_id: uint256) -> Result<string> {
 		let is_erc721 = || {
 			if let Some(shema_name) =
-				pallet_common::Pallet::<T>::get_collection_property(self.id, &schema_name_key())
+				pallet_common::Pallet::<T>::get_collection_property(self.id, &key::schema_name())
 			{
 				let shema_name = shema_name.into_inner();
-				shema_name == ERC721_METADATA
+				shema_name == property_value::ERC721_METADATA
 			} else {
 				false
 			}
@@ -232,7 +232,7 @@
 
 		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
 
-		if let Ok(url) = get_token_property(self, token_id_u32, &url_key()) {
+		if let Ok(url) = get_token_property(self, token_id_u32, &key::url()) {
 			if !url.is_empty() {
 				return Ok(url);
 			}
@@ -241,7 +241,7 @@
 		}
 
 		if let Some(base_uri) =
-			pallet_common::Pallet::<T>::get_collection_property(self.id, &base_uri_key())
+			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())
 		{
 			if !base_uri.is_empty() {
 				let base_uri = string::from_utf8(base_uri.into_inner()).map_err(|e| {
@@ -250,7 +250,7 @@
 						e
 					))
 				})?;
-				if let Ok(suffix) = get_token_property(self, token_id_u32, &suffix_key()) {
+				if let Ok(suffix) = get_token_property(self, token_id_u32, &key::suffix()) {
 					if !suffix.is_empty() {
 						return Ok(base_uri + suffix.as_str());
 					}
@@ -497,7 +497,7 @@
 		token_id: uint256,
 		token_uri: string,
 	) -> Result<bool> {
-		let key = url_key();
+		let key = key::url();
 		let permission = get_token_permission::<T>(self.id, &key)?;
 		if !permission.collection_admin {
 			return Err("Operation is not allowed".into());
@@ -702,7 +702,7 @@
 		to: address,
 		tokens: Vec<(uint256, string)>,
 	) -> Result<bool> {
-		let key = url_key();
+		let key = key::url();
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let mut expected_index = <TokensMinted<T>>::get(self.id)

--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -10,6 +10,8 @@
 test(refungible-pallet): add tests for ERC-20 EVM API for RFT token pieces ([#413](https://github.com/UniqueNetwork/unique-chain/pull/413))
 
 ## [v0.1.1] - 2022-07-14
+### Added
+- Support for properties for RFT collections and tokens.
 
 ### Other changes
 

--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -25,24 +25,24 @@
 use crate::{Config, RefungibleHandle};
 
 #[solidity_interface(
-	name = "UniqueRFT",
+	name = "UniqueRefungible",
 	is(via("CollectionHandle<T>", common_mut, Collection),)
 )]
 impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> {}
 
 // Not a tests, but code generators
-generate_stubgen!(gen_impl, UniqueRFTCall<()>, true);
-generate_stubgen!(gen_iface, UniqueRFTCall<()>, false);
+generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);
+generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);
 
 impl<T: Config> CommonEvmHandler for RefungibleHandle<T>
 where
 	T::AccountId: From<[u8; 32]>,
 {
-	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRFT.raw");
+	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");
 	fn call(
 		self,
 		handle: &mut impl PrecompileHandle,
 	) -> Option<pallet_common::erc::PrecompileResult> {
-		call::<T, UniqueRFTCall<T>, _, _>(handle, self)
+		call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)
 	}
 }

--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -28,7 +28,7 @@
 use frame_support::traits::Get;
 use pallet_common::{
 	CollectionById,
-	erc::{static_property_key_value::*, CollectionHelpersEvents},
+	erc::{static_property::{key, value as property_value}, CollectionHelpersEvents},
 };
 use crate::{SelfWeightOf, Config, weights::WeightInfo};
 
@@ -83,7 +83,6 @@
 	Ok((caller, name, description, token_prefix, base_uri_value))
 }
 
-//
 fn make_data<T: Config>(
 	name: CollectionName,
 	mode: CollectionMode,
@@ -98,7 +97,7 @@
 
 	token_property_permissions
 		.try_push(up_data_structs::PropertyKeyPermission {
-			key: url_key(),
+			key: key::url(),
 			permission: up_data_structs::PropertyPermission {
 				mutable: false,
 				collection_admin: true,
@@ -110,7 +109,7 @@
 	if add_properties {
 		token_property_permissions
 			.try_push(up_data_structs::PropertyKeyPermission {
-				key: suffix_key(),
+				key: key::suffix(),
 				permission: up_data_structs::PropertyPermission {
 					mutable: false,
 					collection_admin: true,
@@ -121,15 +120,15 @@
 
 		properties
 			.try_push(up_data_structs::Property {
-				key: schema_name_key(),
-				value: erc721_value(),
+				key: key::schema_name(),
+				value: property_value::erc721(),
 			})
 			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
 
 		if !base_uri_value.is_empty() {
 			properties
 				.try_push(up_data_structs::Property {
-					key: base_uri_key(),
+					key: key::base_uri(),
 					value: base_uri_value,
 				})
 				.map_err(|e| Error::Revert(format!("{:?}", e)))?;
@@ -152,7 +151,7 @@
 #[solidity_interface(name = "CollectionHelpers", events(CollectionHelpersEvents))]
 impl<T> EvmCollectionHelpers<T>
 where
-	T: Config + pallet_nonfungible::Config + pallet_refungible::Config 
+	T: Config + pallet_nonfungible::Config + pallet_refungible::Config,
 {
 	/// Create an NFT collection
 	/// @param name Name of the collection