`630fc898d4e4`

3 files changed

modifiedpallets/balances-adapter/src/erc.rsdiff before after both

25	}25	}
2626
27	fn approve(&mut self, _caller: Caller, _spender: Address, _amount: U256) -> Result<bool> {27	fn approve(&mut self, _caller: Caller, _spender: Address, _amount: U256) -> Result<bool> {
28		Err("Approve not supported".into())28		Err("approve not supported".into())
29	}29	}
3030
31	fn balance_of(&self, owner: Address) -> Result<U256> {31	fn balance_of(&self, owner: Address) -> Result<U256> {

modifiedpallets/nonfungible/src/erc.rsdiff before after both

273			.map_err(|_| "key too long")?;273			.map_err(|_| "key too long")?;
274274
275		let props =275		let props =
276			<TokenProperties<T>>::get((self.id, token_id)).ok_or("Token properties not found")?;276			<TokenProperties<T>>::get((self.id, token_id)).ok_or("token properties not found")?;
277		let prop = props.get(&key).ok_or("key not found")?;277		let prop = props.get(&key).ok_or("key not found")?;
278278
279		Ok(prop.to_vec().into())279		Ok(prop.to_vec().into())
367				.transpose()367				.transpose()
368				.map_err(|e| {368				.map_err(|e| {
369					Error::Revert(alloc::format!(369					Error::Revert(alloc::format!(
370						"Can not convert value \"baseURI\" to string with error \"{e}\""370						"can not convert value \"baseURI\" to string with error \"{e}\""
371					))371					))
372				})?;372				})?;
373373
658		let key = key::url();658		let key = key::url();
659		let permission = get_token_permission::<T>(self.id, &key)?;659		let permission = get_token_permission::<T>(self.id, &key)?;
660		if !permission.collection_admin {660		if !permission.collection_admin {
661			return Err("Operation is not allowed".into());661			return Err("operation is not allowed".into());
662		}662		}
663663
664		let caller = T::CrossAccountId::from_eth(caller);664		let caller = T::CrossAccountId::from_eth(caller);
685					.try_into()685					.try_into()
686					.map_err(|_| "token uri is too long")?,686					.map_err(|_| "token uri is too long")?,
687			})687			})
688			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;688			.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
689689
690		<Pallet<T>>::create_item(690		<Pallet<T>>::create_item(
691			self,691			self,
708) -> Result<String> {708) -> Result<String> {
709	collection.consume_store_reads(1)?;709	collection.consume_store_reads(1)?;
710	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))710	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
711		.map_err(|_| Error::Revert("Token properties not found".into()))?;711		.map_err(|_| Error::Revert("token properties not found".into()))?;
712	if let Some(property) = properties.get(key) {712	if let Some(property) = properties.get(key) {
713		return Ok(String::from_utf8_lossy(property).into());713		return Ok(String::from_utf8_lossy(property).into());
714	}714	}
715715
716	Err("Property tokenURI not found".into())716	Err("property tokenURI not found".into())
717}717}
718718
719fn get_token_permission<T: Config>(719fn get_token_permission<T: Config>(
720	collection_id: CollectionId,720	collection_id: CollectionId,
721	key: &PropertyKey,721	key: &PropertyKey,
722) -> Result<PropertyPermission> {722) -> Result<PropertyPermission> {
723	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)723	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)
724		.map_err(|_| Error::Revert("No permissions for collection".into()))?;724		.map_err(|_| Error::Revert("no permissions for collection".into()))?;
725	let a = token_property_permissions725	let a = token_property_permissions
726		.get(key)726		.get(key)
727		.map(Clone::clone)727		.map(Clone::clone)
728		.ok_or_else(|| {728		.ok_or_else(|| {
729			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();729			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
730			Error::Revert(alloc::format!("No permission for key {key}"))730			Error::Revert(alloc::format!("no permission for key {key}"))
731		})?;731		})?;
732	Ok(a)732	Ok(a)
733}733}
1058						.try_into()1058						.try_into()
1059						.map_err(|_| "token uri is too long")?,1059						.map_err(|_| "token uri is too long")?,
1060				})1060				})
1061				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;1061				.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
10621062
1063			data.push(CreateItemData::<T> {1063			data.push(CreateItemData::<T> {
1064				properties,1064				properties,

modifiedpallets/refungible/src/erc.rsdiff before after both

284			.map_err(|_| "key too long")?;284			.map_err(|_| "key too long")?;
285285
286		let props =286		let props =
287			<TokenProperties<T>>::get((self.id, token_id)).ok_or("Token properties not found")?;287			<TokenProperties<T>>::get((self.id, token_id)).ok_or("token properties not found")?;
288		let prop = props.get(&key).ok_or("key not found")?;288		let prop = props.get(&key).ok_or("key not found")?;
289289
290		Ok(prop.to_vec().into())290		Ok(prop.to_vec().into())
372				.transpose()372				.transpose()
373				.map_err(|e| {373				.map_err(|e| {
374					Error::Revert(alloc::format!(374					Error::Revert(alloc::format!(
375						"Can not convert value \"baseURI\" to string with error \"{e}\""375						"can not convert value \"baseURI\" to string with error \"{e}\""
376					))376					))
377				})?;377				})?;
378378
697		let key = key::url();697		let key = key::url();
698		let permission = get_token_permission::<T>(self.id, &key)?;698		let permission = get_token_permission::<T>(self.id, &key)?;
699		if !permission.collection_admin {699		if !permission.collection_admin {
700			return Err("Operation is not allowed".into());700			return Err("operation is not allowed".into());
701		}701		}
702702
703		let caller = T::CrossAccountId::from_eth(caller);703		let caller = T::CrossAccountId::from_eth(caller);
724					.try_into()724					.try_into()
725					.map_err(|_| "token uri is too long")?,725					.map_err(|_| "token uri is too long")?,
726			})726			})
727			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;727			.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
728728
729		let users = [(to, 1)]729		let users = [(to, 1)]
730			.into_iter()730			.into_iter()
749) -> Result<String> {749) -> Result<String> {
750	collection.consume_store_reads(1)?;750	collection.consume_store_reads(1)?;
751	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))751	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
752		.map_err(|_| Error::Revert("Token properties not found".into()))?;752		.map_err(|_| Error::Revert("token properties not found".into()))?;
753	if let Some(property) = properties.get(key) {753	if let Some(property) = properties.get(key) {
754		return Ok(String::from_utf8_lossy(property).into());754		return Ok(String::from_utf8_lossy(property).into());
755	}755	}
756756
757	Err("Property tokenURI not found".into())757	Err("property tokenURI not found".into())
758}758}
759759
760fn get_token_permission<T: Config>(760fn get_token_permission<T: Config>(
761	collection_id: CollectionId,761	collection_id: CollectionId,
762	key: &PropertyKey,762	key: &PropertyKey,
763) -> Result<PropertyPermission> {763) -> Result<PropertyPermission> {
764	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)764	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)
765		.map_err(|_| Error::Revert("No permissions for collection".into()))?;765		.map_err(|_| Error::Revert("no permissions for collection".into()))?;
766	let a = token_property_permissions766	let a = token_property_permissions
767		.get(key)767		.get(key)
768		.map(Clone::clone)768		.map(Clone::clone)
769		.ok_or_else(|| {769		.ok_or_else(|| {
770			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();770			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
771			Error::Revert(alloc::format!("No permission for key {key}"))771			Error::Revert(alloc::format!("no permission for key {key}"))
772		})?;772		})?;
773	Ok(a)773	Ok(a)
774}774}
1133						.try_into()1133						.try_into()
1134						.map_err(|_| "token uri is too long")?,1134						.map_err(|_| "token uri is too long")?,
1135				})1135				})
1136				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;1136				.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
11371137
1138			let create_item_data = CreateItemData::<T> {1138			let create_item_data = CreateItemData::<T> {
1139				users: users.clone(),1139				users: users.clone(),