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

difftreelog

CORE-302 serde_json -> serde-json-core

Trubnikov Sergey2022-05-13parent: #554134b.patch.diff
in: master

3 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6114,7 +6114,7 @@
  "pallet-nonfungible",
  "parity-scale-codec",
  "scale-info",
- "serde_json",
+ "serde-json-core",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -10777,6 +10777,16 @@
 ]
 
 [[package]]
+name = "serde-json-core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8014aeea272bca0f0779778d43253f2f3375b414185b30e6ecc4d3e4a9994781"
+dependencies = [
+ "ryu",
+ "serde",
+]
+
+[[package]]
 name = "serde_derive"
 version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
modifiedpallets/evm-collection/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-collection/Cargo.toml
+++ b/pallets/evm-collection/Cargo.toml
@@ -10,7 +10,7 @@
 ] }
 ethereum = { version = "0.12.0", default-features = false }
 log = { default-features = false, version = "0.4.14" }
-serde_json = { version = "1.0.68", default-features = false, features = ["alloc"] }
+serde-json-core = { version = "0.4", default-features = false }
 
 # Substrate
 frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.21' }
@@ -47,4 +47,5 @@
     "evm-coder/std",
     "pallet-evm-coder-substrate/std",
     "pallet-evm/std",
+    "serde-json-core/std",
 ]
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_common::{CollectionHandle};22use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};23use pallet_evm::{24	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,25	account::CrossAccountId, Pallet as PalletEvm,26};27use sp_core::H160;28use up_data_structs::{29	CreateCollectionData, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,30	MAX_COLLECTION_NAME_LENGTH, OFFCHAIN_SCHEMA_LIMIT, VARIABLE_ON_CHAIN_SCHEMA_LIMIT,31	CONST_ON_CHAIN_SCHEMA_LIMIT,32};33use crate::{Config, Pallet};34use frame_support::traits::Get;3536use sp_std::{vec::Vec, rc::Rc};37use alloc::format;3839struct EvmCollection<T: Config>(SubstrateRecorder<T>);40impl<T: Config> WithRecorder<T> for EvmCollection<T> {41	fn recorder(&self) -> &SubstrateRecorder<T> {42		&self.043	}4445	fn into_recorder(self) -> SubstrateRecorder<T> {46		self.047	}48}4950#[derive(ToLog)]51pub enum CollectionEvent {52	CollectionCreated {53		#[indexed]54		owner: address,55		#[indexed]56		collection_id: address,57	},58}5960#[solidity_interface(name = "Collection")]61impl<T: Config> EvmCollection<T> {62	fn create_721_collection(63		&self,64		caller: caller,65		name: string,66		description: string,67		token_prefix: string,68	) -> Result<address> {69		let caller = T::CrossAccountId::from_eth(caller);70		let name = name71			.encode_utf16()72			.collect::<Vec<u16>>()73			.try_into()74			.map_err(|_| error_feild_too_long("name", MAX_COLLECTION_NAME_LENGTH))?;75		let description = description76			.encode_utf16()77			.collect::<Vec<u16>>()78			.try_into()79			.map_err(|_| error_feild_too_long("description", MAX_COLLECTION_DESCRIPTION_LENGTH))?;80		let token_prefix = token_prefix81			.into_bytes()82			.try_into()83			.map_err(|_| error_feild_too_long("token_prefix", MAX_TOKEN_PREFIX_LENGTH))?;8485		let data = CreateCollectionData {86			name,87			description,88			token_prefix,89			..Default::default()90		};9192		let collection_id =93			<pallet_nonfungible::Pallet<T>>::init_collection(caller.as_sub().clone(), data)94				.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;9596		let address = pallet_common::eth::collection_id_to_address(collection_id);97		<PalletEvm<T>>::deposit_log(98			CollectionEvent::CollectionCreated {99				owner: *caller.as_eth(),100				collection_id: address,101			}102			.to_log(address),103		);104		Ok(address)105	}106107	fn set_sponsor(108		&self,109		caller: caller,110		collection_address: address,111		sponsor: address,112	) -> Result<void> {113		let mut collection = collection_from_address(collection_address, &self.0)?;114		check_is_owner(caller, &collection)?;115116		let sponsor = T::CrossAccountId::from_eth(sponsor);117		collection.set_sponsor(sponsor.as_sub().clone());118		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;119		Ok(()).map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;120		Ok(())121	}122123	fn confirm_sponsorship(&self, caller: caller, collection_address: address) -> Result<void> {124		let mut collection = collection_from_address(collection_address, &self.0)?;125		let caller = T::CrossAccountId::from_eth(caller);126		if !collection.confirm_sponsorship(caller.as_sub()) {127			return Err(Error::Revert("Caller is not set as sponsor".into()));128		}129		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;130		Ok(())131	}132133	fn set_offchain_schema(134		&self,135		caller: caller,136		collection_address: address,137		schema: string,138	) -> Result<void> {139		let mut collection = collection_from_address(collection_address, &self.0)?;140		check_is_owner(caller, &collection)?;141142		let schema = schema143			.into_bytes()144			.try_into()145			.map_err(|_| error_feild_too_long(stringify!(shema), OFFCHAIN_SCHEMA_LIMIT))?;146		// collection.offchain_schema = schema;147		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;148		Ok(())149	}150151	fn set_variable_on_chain_schema(152		&self,153		caller: caller,154		collection_address: address,155		variable: string,156	) -> Result<void> {157		let mut collection = collection_from_address(collection_address, &self.0)?;158		check_is_owner(caller, &collection)?;159160		let variable = variable.into_bytes().try_into().map_err(|_| {161			error_feild_too_long(stringify!(variable), VARIABLE_ON_CHAIN_SCHEMA_LIMIT)162		})?;163		// collection.variable_on_chain_schema = variable;164		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;165		Ok(())166	}167168	fn set_const_on_chain_schema(169		&self,170		caller: caller,171		collection_address: address,172		const_on_chain: string,173	) -> Result<void> {174		let mut collection = collection_from_address(collection_address, &self.0)?;175		check_is_owner(caller, &collection)?;176177		let const_on_chain = const_on_chain.into_bytes().try_into().map_err(|_| {178			error_feild_too_long(stringify!(const_on_chain), CONST_ON_CHAIN_SCHEMA_LIMIT)179		})?;180		// collection.const_on_chain_schema = const_on_chain;181		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;182		Ok(())183	}184185	fn set_limits(186		&self,187		caller: caller,188		collection_address: address,189		limits_json: string,190	) -> Result<void> {191		let mut collection = collection_from_address(collection_address, &self.0)?;192		check_is_owner(caller, &collection)?;193194		let limits = serde_json::from_str(limits_json.as_ref())195			.map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?;196		collection.limits = limits;197		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;198		Ok(())199	}200}201202fn error_feild_too_long(feild: &str, bound: u32) -> Error {203	Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))204}205206fn collection_from_address<T: Config>(207	collection_address: address,208	recorder: &SubstrateRecorder<T>,209) -> Result<CollectionHandle<T>> {210	let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)211		.ok_or(Error::Revert("Contract is not an unique collection".into()))?;212	let collection =213		pallet_common::CollectionHandle::new_with_gas_limit(collection_id, recorder.gas_left())214			.ok_or(Error::Revert("Create collection handle error".into()))?;215	Ok(collection)216}217218fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {219	let caller = T::CrossAccountId::from_eth(caller);220	collection221		.check_is_owner(&caller)222		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;223	Ok(())224}225226pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);227impl<T: Config> OnMethodCall<T> for CollectionOnMethodCall<T> {228	fn is_reserved(contract: &sp_core::H160) -> bool {229		contract == &T::ContractAddress::get()230	}231232	fn is_used(contract: &sp_core::H160) -> bool {233		contract == &T::ContractAddress::get()234	}235236	fn call(237		source: &sp_core::H160,238		target: &sp_core::H160,239		gas_left: u64,240		input: &[u8],241		value: sp_core::U256,242	) -> Option<PrecompileResult> {243		if target != &T::ContractAddress::get() {244			return None;245		}246247		let helpers = EvmCollection::<T>(SubstrateRecorder::new(gas_left));248		pallet_evm_coder_substrate::call(*source, helpers, value, input)249	}250251	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {252		(contract == &T::ContractAddress::get())253			.then(|| include_bytes!("./stubs/Collection.raw").to_vec())254	}255}256257generate_stubgen!(collection_impl, CollectionCall<()>, true);258generate_stubgen!(collection_iface, CollectionCall<()>, false);