git.delta.rocks / unique-network / refs/commits / 41b5a1d1099f

479	}479	}
480}480}
481481
482#[impl_for_tuples(0, 24)]482#[impl_for_tuples(0, 48)]
483impl SolidityFunctions for Tuple {483impl SolidityFunctions for Tuple {
484	for_tuples!( where #( Tuple: SolidityFunctions ),* );484	for_tuples!( where #( Tuple: SolidityFunctions ),* );
485485

3232
33use crate::{33use crate::{
34	Pallet, CollectionHandle, Config, CollectionProperties,34	Pallet, CollectionHandle, Config, CollectionProperties,
35	eth::convert_substrate_address_to_cross_account_id,35	eth::{convert_cross_account_to_uint256, convert_uint256_to_cross_account},
36};36};
3737
38/// Events for ethereum collection helper.38/// Events for ethereum collection helper.
63#[solidity_interface(name = Collection)]63#[solidity_interface(name = Collection)]
64impl<T: Config> CollectionHandle<T>64impl<T: Config> CollectionHandle<T>
65where65where
66	T::AccountId: From<[u8; 32]> + AsRef<[u8]>,66	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
67{67{
68	/// Set collection property.68	/// Set collection property.
69	///69	///
177			SponsorshipState::Confirmed(ref sponsor) => sponsor,177			SponsorshipState::Confirmed(ref sponsor) => sponsor,
178		};178		};
179		let sponsor = T::CrossAccountId::from_sub(sponsor.clone());179		let sponsor = T::CrossAccountId::from_sub(sponsor.clone());
180		let sponsor_sub = convert_cross_account_to_uint256::<T>(&sponsor)?;180		let sponsor_sub = convert_cross_account_to_uint256::<T>(&sponsor);
181		Ok((*sponsor.as_eth(), sponsor_sub))181		Ok((*sponsor.as_eth(), sponsor_sub))
182	}182	}
183183
274		new_admin: uint256,274		new_admin: uint256,
275	) -> Result<void> {275	) -> Result<void> {
276		let caller = T::CrossAccountId::from_eth(caller);276		let caller = T::CrossAccountId::from_eth(caller);
277		let new_admin = convert_substrate_address_to_cross_account_id::<T>(new_admin);277		let new_admin = convert_uint256_to_cross_account::<T>(new_admin);
278		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;278		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;
279		Ok(())279		Ok(())
280	}280	}
287		admin: uint256,287		admin: uint256,
288	) -> Result<void> {288	) -> Result<void> {
289		let caller = T::CrossAccountId::from_eth(caller);289		let caller = T::CrossAccountId::from_eth(caller);
290		let admin = convert_substrate_address_to_cross_account_id::<T>(admin);290		let admin = convert_uint256_to_cross_account::<T>(admin);
291		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;291		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;
292		Ok(())292		Ok(())
293	}293	}
461	/// @param user account to verify461	/// @param user account to verify
462	/// @return "true" if account is the owner or admin462	/// @return "true" if account is the owner or admin
463	fn is_owner_or_admin_substrate(&self, user: uint256) -> Result<bool> {463	fn is_owner_or_admin_substrate(&self, user: uint256) -> Result<bool> {
464		let user = convert_substrate_address_to_cross_account_id::<T>(user);464		let user = convert_uint256_to_cross_account::<T>(user);
465		Ok(self.is_owner_or_admin(&user))465		Ok(self.is_owner_or_admin(&user))
466	}466	}
467467
494	/// @param newOwner new owner substrate account494	/// @param newOwner new owner substrate account
495	fn set_owner_substrate(&mut self, caller: caller, new_owner: uint256) -> Result<void> {495	fn set_owner_substrate(&mut self, caller: caller, new_owner: uint256) -> Result<void> {
496		let caller = T::CrossAccountId::from_eth(caller);496		let caller = T::CrossAccountId::from_eth(caller);
497		let new_owner = convert_substrate_address_to_cross_account_id::<T>(new_owner);497		let new_owner = convert_uint256_to_cross_account::<T>(new_owner);
498		self.set_owner_internal(caller, new_owner)498		self.set_owner_internal(caller, new_owner)
499			.map_err(dispatch_to_evm::<T>)499			.map_err(dispatch_to_evm::<T>)
500	}500	}

154		Collection(common_mut, CollectionHandle<T>),154		Collection(common_mut, CollectionHandle<T>),
155	)155	)
156)]156)]
157impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8]> {}157impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
158158
159generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);159generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);
160generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);160generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);
161161
162impl<T: Config> CommonEvmHandler for FungibleHandle<T>162impl<T: Config> CommonEvmHandler for FungibleHandle<T>
163where163where
164	T::AccountId: From<[u8; 32]> + AsRef<[u8]>,164	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
165{165{
166	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");166	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");
167167

740		TokenProperties,740		TokenProperties,
741	)741	)
742)]742)]
743impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8]> {}743impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
744744
745// Not a tests, but code generators745// Not a tests, but code generators
746generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);746generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);
747generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);747generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);
748748
749impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>749impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>
750where750where
751	T::AccountId: From<[u8; 32]> + AsRef<[u8]>,751	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
752{752{
753	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");753	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");
754754

789		TokenProperties,789		TokenProperties,
790	)790	)
791)]791)]
792impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8]> {}792impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
793793
794// Not a tests, but code generators794// Not a tests, but code generators
795generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);795generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);
796generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);796generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);
797797
798impl<T: Config> CommonEvmHandler for RefungibleHandle<T>798impl<T: Config> CommonEvmHandler for RefungibleHandle<T>
799where799where
800	T::AccountId: From<[u8; 32]> + AsRef<[u8]>,800	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
801{801{
802	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");802	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");
803	fn call(803	fn call(

124		+ pallet_fungible::Config124		+ pallet_fungible::Config
125		+ pallet_nonfungible::Config125		+ pallet_nonfungible::Config
126		+ pallet_refungible::Config,126		+ pallet_refungible::Config,
127	T::AccountId: From<[u8; 32]> + AsRef<[u8]>,127	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
128{128{
129	fn is_reserved(target: &H160) -> bool {129	fn is_reserved(target: &H160) -> bool {
130		map_eth_to_id(target).is_some()130		map_eth_to_id(target).is_some()