git.delta.rocks / unique-network / refs/commits / 14581b7431cf

difftreelog

COR-302 Refactor

Trubnikov Sergey2022-04-25parent: #31962dd.patch.diff
in: master

1 file changed

modifiedpallets/evm-collection/src/eth.rsdiffbeforeafterboth
before · pallets/evm-collection/src/eth.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::*, generate_stubgen, solidity_interface, types::*, ToLog};19use ethereum as _;20use pallet_common::CollectionById;21use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};22use pallet_evm::{23	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,24	account::CrossAccountId, Pallet as PalletEvm,25};26use sp_core::H160;27use up_data_structs::{28	CreateCollectionData, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,29	MAX_COLLECTION_NAME_LENGTH,30};31use crate::{Config, Pallet};32use frame_support::traits::Get;3334use sp_std::{vec::Vec, rc::Rc};35use alloc::format;3637struct EvmCollection<T: Config>(SubstrateRecorder<T>);38impl<T: Config> WithRecorder<T> for EvmCollection<T> {39	fn recorder(&self) -> &SubstrateRecorder<T> {40		&self.041	}4243	fn into_recorder(self) -> SubstrateRecorder<T> {44		self.045	}46}4748#[derive(ToLog)]49pub enum CollectionEvent {50	CollectionCreated {51		#[indexed]52		owner: address,53		#[indexed]54		collection_id: address,55	},56}5758#[solidity_interface(name = "Collection")]59impl<T: Config> EvmCollection<T> {60	fn create_721_collection(61		&self,62		caller: caller,63		name: string,64		description: string,65		token_prefix: string,66	) -> Result<address> {67		let caller = T::CrossAccountId::from_eth(caller);68		let name = name69			.encode_utf16()70			.collect::<Vec<u16>>()71			.try_into()72			.map_err(|_| error_feild_too_long("name", MAX_COLLECTION_NAME_LENGTH))?;73		let description = description74			.encode_utf16()75			.collect::<Vec<u16>>()76			.try_into()77			.map_err(|_| error_feild_too_long("description", MAX_COLLECTION_DESCRIPTION_LENGTH))?;78		let token_prefix = token_prefix79			.into_bytes()80			.try_into()81			.map_err(|_| error_feild_too_long("token_prefix", MAX_TOKEN_PREFIX_LENGTH))?;8283		let data = CreateCollectionData {84			name,85			description,86			token_prefix,87			..Default::default()88		};8990		let collection_id =91			<pallet_nonfungible::Pallet<T>>::init_collection(caller.as_sub().clone(), data)92				.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;9394		let address = pallet_common::eth::collection_id_to_address(collection_id);95		<PalletEvm<T>>::deposit_log(96			CollectionEvent::CollectionCreated {97				owner: *caller.as_eth(),98				collection_id: address,99			}100			.to_log(address),101		);102		Ok(address)103	}104105	// fn set_sponsor(collection_id: address, sponsor: address) -> Result<void> {106	// 	let collection_id =107	// 		pallet_common::eth::map_eth_to_id(&collection_id).ok_or(Error::Revert("".into()))?;108	// 	let mut collection = <CollectionById<T>>::get(collection_id).ok_or(Error::Revert("".into()))?;109	// 	let sponsor = T::CrossAccountId::from_eth(sponsor);110	// 	collection.sponsorship = SponsorshipState::Unconfirmed(sponsor.as_sub().clone());111	// 	<CollectionById<T>>::insert(collection_id, collection);112	// 	Ok(())113	// }114115	fn set_offchain_shema(shema: string) -> Result<void> {116		let shema = shema117			.into_bytes()118			.try_into()119			.map_err(|_| error_feild_too_long(stringify!(shema), OFFCHAIN_SCHEMA_LIMIT))?;120		collection.offchain_schema = shema;121		save(collection)122	}123124	fn confirm_sponsorship(&self, caller: caller, collection_address: address) -> Result<void> {125		let (_, mut collection) = collection_from_address(collection_address, &self.0)?;126		let caller = T::CrossAccountId::from_eth(caller);127		if !collection.confirm_sponsorship(caller.as_sub()) {128			return Err(Error::Revert("Caller is not set as sponsor".into()));129		}130		save(collection)131	}132133	// fn set_variable_on_chain_schema(shema: string) -> Result<void> {134	// 	Ok(())135	// }136137	fn set_variable_on_chain_schema(138		&self,139		caller: caller,140		collection_address: address,141		variable: string,142	) -> Result<void> {143		let (_, mut collection) = collection_from_address(collection_address, &self.0)?;144		check_is_owner(caller, &collection)?;145146		let variable = variable.into_bytes().try_into().map_err(|_| {147			error_feild_too_long(stringify!(variable), VARIABLE_ON_CHAIN_SCHEMA_LIMIT)148		})?;149		collection.variable_on_chain_schema = variable;150		save(collection)151	}152153	fn set_const_on_chain_schema(154		&self,155		caller: caller,156		collection_address: address,157		const_on_chain: string,158	) -> Result<void> {159		let (_, mut collection) = collection_from_address(collection_address, &self.0)?;160		check_is_owner(caller, &collection)?;161162		let const_on_chain = const_on_chain.into_bytes().try_into().map_err(|_| {163			error_feild_too_long(stringify!(const_on_chain), CONST_ON_CHAIN_SCHEMA_LIMIT)164		})?;165		collection.const_on_chain_schema = const_on_chain;166		save(collection)167	}168169	fn set_limits(170		&self,171		caller: caller,172		collection_address: address,173		limits_json: string,174	) -> Result<void> {175		let (_, mut collection) = collection_from_address(collection_address, &self.0)?;176		check_is_owner(caller, &collection)?;177178		let limits = serde_json::from_str(limits_json.as_ref())179			.map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?;180		collection.limits = limits;181		save(collection)182	}183}184185fn error_feild_too_long(feild: &str, bound: u32) -> Error {186	Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))187}188189pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);190impl<T: Config> OnMethodCall<T> for CollectionOnMethodCall<T> {191	fn is_reserved(contract: &sp_core::H160) -> bool {192		contract == &T::ContractAddress::get()193	}194195	fn is_used(contract: &sp_core::H160) -> bool {196		contract == &T::ContractAddress::get()197	}198199	fn call(200		source: &sp_core::H160,201		target: &sp_core::H160,202		gas_left: u64,203		input: &[u8],204		value: sp_core::U256,205	) -> Option<PrecompileResult> {206		// TODO: Extract to another OnMethodCall handler207		if target != &T::ContractAddress::get() {208			return None;209		}210211		let helpers = EvmCollection::<T>(SubstrateRecorder::new(gas_left));212		pallet_evm_coder_substrate::call(*source, helpers, value, input)213	}214215	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {216		(contract == &T::ContractAddress::get())217			.then(|| include_bytes!("./stubs/Collection.raw").to_vec())218	}219}220221generate_stubgen!(collection_impl, CollectionCall<()>, true);222generate_stubgen!(collection_iface, CollectionCall<()>, false);
after · pallets/evm-collection/src/eth.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::*, generate_stubgen, solidity_interface, types::*, ToLog};19use ethereum as _;20use pallet_common::CollectionById;21use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};22use pallet_evm::{23	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,24	account::CrossAccountId, Pallet as PalletEvm,25};26use sp_core::H160;27use up_data_structs::{28	CreateCollectionData, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,29	MAX_COLLECTION_NAME_LENGTH, OFFCHAIN_SCHEMA_LIMIT, VARIABLE_ON_CHAIN_SCHEMA_LIMIT,30	CONST_ON_CHAIN_SCHEMA_LIMIT,31};32use crate::{Config, Pallet};33use frame_support::traits::Get;3435use sp_std::{vec::Vec, rc::Rc};36use alloc::format;3738struct EvmCollection<T: Config>(SubstrateRecorder<T>);39impl<T: Config> WithRecorder<T> for EvmCollection<T> {40	fn recorder(&self) -> &SubstrateRecorder<T> {41		&self.042	}4344	fn into_recorder(self) -> SubstrateRecorder<T> {45		self.046	}47}4849#[derive(ToLog)]50pub enum CollectionEvent {51	CollectionCreated {52		#[indexed]53		owner: address,54		#[indexed]55		collection_id: address,56	},57}5859#[solidity_interface(name = "Collection")]60impl<T: Config> EvmCollection<T> {61	fn create_721_collection(62		&self,63		caller: caller,64		name: string,65		description: string,66		token_prefix: string,67	) -> Result<address> {68		let caller = T::CrossAccountId::from_eth(caller);69		let name = name70			.encode_utf16()71			.collect::<Vec<u16>>()72			.try_into()73			.map_err(|_| error_feild_too_long("name", MAX_COLLECTION_NAME_LENGTH))?;74		let description = description75			.encode_utf16()76			.collect::<Vec<u16>>()77			.try_into()78			.map_err(|_| error_feild_too_long("description", MAX_COLLECTION_DESCRIPTION_LENGTH))?;79		let token_prefix = token_prefix80			.into_bytes()81			.try_into()82			.map_err(|_| error_feild_too_long("token_prefix", MAX_TOKEN_PREFIX_LENGTH))?;8384		let data = CreateCollectionData {85			name,86			description,87			token_prefix,88			..Default::default()89		};9091		let collection_id =92			<pallet_nonfungible::Pallet<T>>::init_collection(caller.as_sub().clone(), data)93				.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;9495		let address = pallet_common::eth::collection_id_to_address(collection_id);96		<PalletEvm<T>>::deposit_log(97			CollectionEvent::CollectionCreated {98				owner: *caller.as_eth(),99				collection_id: address,100			}101			.to_log(address),102		);103		Ok(address)104	}105106	fn set_sponsor(107		&self,108		caller: caller,109		collection_address: address,110		sponsor: address,111	) -> Result<void> {112		let mut collection = collection_from_address(collection_address, &self.0)?;113		check_is_owner(caller, &collection)?;114115	fn set_offchain_shema(shema: string) -> Result<void> {116		let shema = shema117			.into_bytes()118			.try_into()119			.map_err(|_| error_feild_too_long(stringify!(shema), OFFCHAIN_SCHEMA_LIMIT))?;120		collection.offchain_schema = shema;121		save(collection)122	}123124	fn confirm_sponsorship(&self, caller: caller, collection_address: address) -> Result<void> {125		let mut collection = collection_from_address(collection_address, &self.0)?;126		let caller = T::CrossAccountId::from_eth(caller);127		if !collection.confirm_sponsorship(caller.as_sub()) {128			return Err(Error::Revert("Caller is not set as sponsor".into()));129		}130		save(collection)131	}132133	fn set_offchain_shema(134		&self,135		caller: caller,136		collection_address: address,137		shema: string,138	) -> Result<void> {139		let mut collection = collection_from_address(collection_address, &self.0)?;140		check_is_owner(caller, &collection)?;141142		let shema = shema143			.into_bytes()144			.try_into()145			.map_err(|_| error_feild_too_long(stringify!(shema), OFFCHAIN_SCHEMA_LIMIT))?;146		collection.offchain_schema = shema;147		save(collection)148	}149150	fn set_variable_on_chain_schema(151		&self,152		caller: caller,153		collection_address: address,154		variable: string,155	) -> Result<void> {156		let mut collection = collection_from_address(collection_address, &self.0)?;157		check_is_owner(caller, &collection)?;158159		let variable = variable.into_bytes().try_into().map_err(|_| {160			error_feild_too_long(stringify!(variable), VARIABLE_ON_CHAIN_SCHEMA_LIMIT)161		})?;162		collection.variable_on_chain_schema = variable;163		save(collection)164	}165166	fn set_const_on_chain_schema(167		&self,168		caller: caller,169		collection_address: address,170		const_on_chain: string,171	) -> Result<void> {172		let mut collection = collection_from_address(collection_address, &self.0)?;173		check_is_owner(caller, &collection)?;174175		let const_on_chain = const_on_chain.into_bytes().try_into().map_err(|_| {176			error_feild_too_long(stringify!(const_on_chain), CONST_ON_CHAIN_SCHEMA_LIMIT)177		})?;178		collection.const_on_chain_schema = const_on_chain;179		save(collection)180	}181182	fn set_limits(183		&self,184		caller: caller,185		collection_address: address,186		limits_json: string,187	) -> Result<void> {188		let mut collection = collection_from_address(collection_address, &self.0)?;189		check_is_owner(caller, &collection)?;190191		let limits = serde_json::from_str(limits_json.as_ref())192			.map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?;193		collection.limits = limits;194		save(collection)195	}196}197198fn error_feild_too_long(feild: &str, bound: u32) -> Error {199	Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))200}201202fn collection_from_address<T: Config>(203	collection_address: address,204	recorder: &Rc<SubstrateRecorder<T>>,205) -> Result<CollectionHandle<T>> {206	let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)207		.ok_or(Error::Revert("Bad ETH prefix".into()))?;208	let collection =209		pallet_common::CollectionHandle::new_with_recorder(collection_id, recorder.clone())210			.ok_or(Error::Revert("Create collection handle error".into()))?;211	Ok(collection)212}213214fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {215	let caller = T::CrossAccountId::from_eth(caller);216	collection217		.check_is_owner(&caller)218		.map_err(|e| Error::Revert(format!("{:?}", e)))?;219	Ok(())220}221222fn save<T: Config>(collection: CollectionHandle<T>) -> Result<()> {223	collection224		.save()225		.map_err(|e| Error::Revert(format!("{:?}", e)))226}227228pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);229impl<T: Config> OnMethodCall<T> for CollectionOnMethodCall<T> {230	fn is_reserved(contract: &sp_core::H160) -> bool {231		contract == &T::ContractAddress::get()232	}233234	fn is_used(contract: &sp_core::H160) -> bool {235		contract == &T::ContractAddress::get()236	}237238	fn call(239		source: &sp_core::H160,240		target: &sp_core::H160,241		gas_left: u64,242		input: &[u8],243		value: sp_core::U256,244	) -> Option<PrecompileResult> {245		// TODO: Extract to another OnMethodCall handler246		if target != &T::ContractAddress::get() {247			return None;248		}249250		let helpers = EvmCollection::<T>(SubstrateRecorder::new(gas_left));251		pallet_evm_coder_substrate::call(*source, helpers, value, input)252	}253254	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {255		(contract == &T::ContractAddress::get())256			.then(|| include_bytes!("./stubs/Collection.raw").to_vec())257	}258}259260generate_stubgen!(collection_impl, CollectionCall<()>, true);261generate_stubgen!(collection_iface, CollectionCall<()>, false);