difftreelog
CORE-302 Add Rc for SubstrateRecorder
in: master
7 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6089,7 +6089,7 @@
"pallet-evm",
"pallet-evm-coder-substrate",
"pallet-nonfungible",
- "parity-scale-codec",
+ "parity-scale-codec 3.1.2",
"scale-info",
"sp-core",
"sp-runtime",
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -20,7 +20,7 @@
use core::ops::{Deref, DerefMut};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
-use sp_std::vec::Vec;
+use sp_std::{vec::Vec, rc::Rc};
use pallet_evm::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},
pallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -52,6 +52,9 @@
use frame_system::ensure_signed;
pub use frame_support::dispatch::DispatchResult;
+ use sp_std::{cell::RefCell, vec::Vec, rc::Rc};
+ use sp_core::{H160};
+ use frame_support::{pallet_prelude::*, traits::PalletInfo};
use frame_system::pallet_prelude::*;
/// DispatchError is opaque, but we need to somehow extract correct error in case of OutOfGas failure
pallets/evm-collection/src/eth.rsdiffbeforeafterboth1// 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;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 // Ok(())117 // }118119 // fn set_const_on_chain_schema(shema: string) -> Result<void> {120 // Ok(())121 // }122123 // fn set_variable_on_chain_schema(shema: string) -> Result<void> {124 // Ok(())125 // }126127 // fn set_limits(limits: string) -> Result<void> {128 // Ok(())129 // }130}131132fn error_feild_too_long(feild: &str, bound: u32) -> Error {133 Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))134}135136pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);137impl<T: Config> OnMethodCall<T> for CollectionOnMethodCall<T> {138 fn is_reserved(contract: &sp_core::H160) -> bool {139 contract == &T::ContractAddress::get()140 }141142 fn is_used(contract: &sp_core::H160) -> bool {143 contract == &T::ContractAddress::get()144 }145146 fn call(147 source: &sp_core::H160,148 target: &sp_core::H160,149 gas_left: u64,150 input: &[u8],151 value: sp_core::U256,152 ) -> Option<PrecompileResult> {153 // TODO: Extract to another OnMethodCall handler154 if target != &T::ContractAddress::get() {155 return None;156 }157158 let helpers = EvmCollection::<T>(SubstrateRecorder::<T>::new(gas_left));159 pallet_evm_coder_substrate::call(*source, helpers, value, input)160 }161162 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {163 (contract == &T::ContractAddress::get())164 .then(|| include_bytes!("./stubs/Collection.raw").to_vec())165 }166}167168generate_stubgen!(collection_impl, CollectionCall<()>, true);169generate_stubgen!(collection_iface, CollectionCall<()>, false);pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -28,7 +28,7 @@
};
use frame_support::traits::Get;
use up_sponsorship::SponsorshipHandler;
-use sp_std::vec::Vec;
+use sp_std::{vec::Vec, rc::Rc};
struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
impl<T: Config> WithRecorder<T> for ContractHelpers<T> {
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -33,7 +33,7 @@
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-use sp_std::collections::btree_map::BTreeMap;
+use sp_std::{collections::btree_map::BTreeMap, rc::Rc};
pub use pallet::*;
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -33,9 +33,8 @@
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
-use sp_std::{vec::Vec, vec, collections::btree_set::BTreeSet};
+use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
use core::ops::Deref;
-use sp_std::collections::btree_map::BTreeMap;
use codec::{Encode, Decode, MaxEncodedLen};
use scale_info::TypeInfo;