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

--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -30,6 +30,7 @@
 };
 use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
 use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
+use sp_std::vec;
 use up_data_structs::{
 	CollectionName, CollectionDescription, CollectionTokenPrefix, CreateCollectionData,
 	CollectionMode, PropertyValue,
@@ -96,63 +97,57 @@
 	base_uri_value: PropertyValue,
 	add_properties: bool,
 ) -> Result<CreateCollectionData<T::AccountId>> {
-	let mut properties = up_data_structs::CollectionPropertiesVec::default();
-	let mut token_property_permissions =
-		up_data_structs::CollectionPropertiesPermissionsVec::default();
-
-	token_property_permissions
-		.try_push(up_data_structs::PropertyKeyPermission {
-			key: key::url(),
-			permission: up_data_structs::PropertyPermission {
-				mutable: true,
-				collection_admin: true,
-				token_owner: false,
+	let token_property_permissions = if add_properties {
+		vec![
+			up_data_structs::PropertyKeyPermission {
+				key: key::url(),
+				permission: up_data_structs::PropertyPermission {
+					mutable: true,
+					collection_admin: true,
+					token_owner: false,
+				},
 			},
-		})
-		.map_err(|e| Error::Revert(format!("{:?}", e)))?;
-
-	if add_properties {
-		token_property_permissions
-			.try_push(up_data_structs::PropertyKeyPermission {
+			up_data_structs::PropertyKeyPermission {
 				key: key::suffix(),
 				permission: up_data_structs::PropertyPermission {
 					mutable: true,
 					collection_admin: true,
 					token_owner: false,
 				},
-			})
-			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
-
-		properties
-			.try_push(up_data_structs::Property {
+			},
+		]
+		.try_into()
+		.map_err(|e| Error::Revert(format!("{:?}", e)))?
+	} else {
+		up_data_structs::CollectionPropertiesPermissionsVec::default()
+	};
+	let properties = if add_properties {
+		let mut properties = vec![
+			up_data_structs::Property {
 				key: key::schema_name(),
 				value: property_value::erc721(),
-			})
-			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
-
-		properties
-			.try_push(up_data_structs::Property {
+			},
+			up_data_structs::Property {
 				key: key::schema_version(),
 				value: property_value::schema_version(),
-			})
-			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
-
-		properties
-			.try_push(up_data_structs::Property {
+			},
+			up_data_structs::Property {
 				key: key::erc721_metadata(),
 				value: property_value::erc721_metadata_supported(),
-			})
-			.map_err(|e| Error::Revert(format!("{:?}", e)))?;
-
+			},
+		];
 		if !base_uri_value.is_empty() {
-			properties
-				.try_push(up_data_structs::Property {
-					key: key::base_uri(),
-					value: base_uri_value,
-				})
-				.map_err(|e| Error::Revert(format!("{:?}", e)))?;
+			properties.push(up_data_structs::Property {
+				key: key::base_uri(),
+				value: base_uri_value,
+			})
 		}
-	}
+		properties
+			.try_into()
+			.map_err(|e| Error::Revert(format!("{:?}", e)))?
+	} else {
+		up_data_structs::CollectionPropertiesVec::default()
+	};
 
 	let data = CreateCollectionData {
 		name,

--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -49,6 +49,46 @@
     expect(data.description).to.be.eq(description);
     expect(data.raw.tokenPrefix).to.be.eq(prefix);
     expect(data.raw.mode).to.be.eq('NFT');
+
+    const options = await collection.getOptions();
+
+    expect(options.tokenPropertyPermissions).to.be.empty;
+  });
+
+  itEth('Create collection with properties', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+
+    const name = 'CollectionEVM';
+    const description = 'Some description';
+    const prefix = 'token prefix';
+    const baseUri = 'BaseURI';
+
+    // todo:playgrounds this might fail when in async environment.
+    const collectionCountBefore = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
+    const {collectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, name, description, prefix, baseUri);
+    const collectionCountAfter = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
+
+    const collection = helper.nft.getCollectionObject(collectionId);
+    const data = (await collection.getData())!;
+    
+    expect(collectionCountAfter - collectionCountBefore).to.be.eq(1);
+    expect(collectionId).to.be.eq(collectionCountAfter);
+    expect(data.name).to.be.eq(name);
+    expect(data.description).to.be.eq(description);
+    expect(data.raw.tokenPrefix).to.be.eq(prefix);
+    expect(data.raw.mode).to.be.eq('NFT');
+
+    const options = await collection.getOptions();
+    expect(options.tokenPropertyPermissions).to.be.deep.equal([
+      {
+        key: 'URI',
+        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},
+      },
+      {
+        key: 'URISuffix',
+        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},
+      },
+    ]);
   });
 
   // todo:playgrounds this test will fail when in async environment.

42    const {collectionId} = await helper.eth.createRFTCollection(owner, name, description, prefix);42    const {collectionId} = await helper.eth.createRFTCollection(owner, name, description, prefix);
43    const collectionCountAfter = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;43    const collectionCountAfter = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
44  44  
45    const collection = helper.rft.getCollectionObject(collectionId);
45    const data = (await helper.rft.getData(collectionId))!;46    const data = (await collection.getData())!;
4647
47    expect(collectionCountAfter - collectionCountBefore).to.be.eq(1);48    expect(collectionCountAfter - collectionCountBefore).to.be.eq(1);
48    expect(collectionId).to.be.eq(collectionCountAfter);49    expect(collectionId).to.be.eq(collectionCountAfter);
51    expect(data.raw.tokenPrefix).to.be.eq(prefix);52    expect(data.raw.tokenPrefix).to.be.eq(prefix);
52    expect(data.raw.mode).to.be.eq('ReFungible');53    expect(data.raw.mode).to.be.eq('ReFungible');
54
55    const options = await collection.getOptions();
56
57    expect(options.tokenPropertyPermissions).to.be.empty;
53  });58  });
59
60  
61
62  itEth('Create collection with properties', async ({helper}) => {
63    const owner = await helper.eth.createAccountWithBalance(donor);
64
65    const name = 'CollectionEVM';
66    const description = 'Some description';
67    const prefix = 'token prefix';
68    const baseUri = 'BaseURI';
69
70    // todo:playgrounds this might fail when in async environment.
71    const collectionCountBefore = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
72    const {collectionId} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, name, description, prefix, baseUri);
73    const collectionCountAfter = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
74
75    const collection = helper.rft.getCollectionObject(collectionId);
76    const data = (await collection.getData())!;
77    
78    expect(collectionCountAfter - collectionCountBefore).to.be.eq(1);
79    expect(collectionId).to.be.eq(collectionCountAfter);
80    expect(data.name).to.be.eq(name);
81    expect(data.description).to.be.eq(description);
82    expect(data.raw.tokenPrefix).to.be.eq(prefix);
83    expect(data.raw.mode).to.be.eq('ReFungible');
84
85    const options = await collection.getOptions();
86    expect(options.tokenPropertyPermissions).to.be.deep.equal([
87      {
88        key: 'URI',
89        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},
90      },
91      {
92        key: 'URISuffix',
93        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},
94      },
95    ]);
96  });
5497
55  // todo:playgrounds this test will fail when in async environment.98  // todo:playgrounds this test will fail when in async environment.
56  itEth('Check collection address exist', async ({helper}) => {99  itEth('Check collection address exist', async ({helper}) => {