difftreelog
fix After rebase
in: master
6 files changed
crates/evm-coder/src/solidity.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -479,7 +479,7 @@
}
}
-#[impl_for_tuples(0, 24)]
+#[impl_for_tuples(0, 48)]
impl SolidityFunctions for Tuple {
for_tuples!( where #( Tuple: SolidityFunctions ),* );
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -32,7 +32,7 @@
use crate::{
Pallet, CollectionHandle, Config, CollectionProperties,
- eth::convert_substrate_address_to_cross_account_id,
+ eth::{convert_cross_account_to_uint256, convert_uint256_to_cross_account},
};
/// Events for ethereum collection helper.
@@ -63,7 +63,7 @@
#[solidity_interface(name = Collection)]
impl<T: Config> CollectionHandle<T>
where
- T::AccountId: From<[u8; 32]> + AsRef<[u8]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// Set collection property.
///
@@ -177,7 +177,7 @@
SponsorshipState::Confirmed(ref sponsor) => sponsor,
};
let sponsor = T::CrossAccountId::from_sub(sponsor.clone());
- let sponsor_sub = convert_cross_account_to_uint256::<T>(&sponsor)?;
+ let sponsor_sub = convert_cross_account_to_uint256::<T>(&sponsor);
Ok((*sponsor.as_eth(), sponsor_sub))
}
@@ -274,7 +274,7 @@
new_admin: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
- let new_admin = convert_substrate_address_to_cross_account_id::<T>(new_admin);
+ let new_admin = convert_uint256_to_cross_account::<T>(new_admin);
<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;
Ok(())
}
@@ -287,7 +287,7 @@
admin: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
- let admin = convert_substrate_address_to_cross_account_id::<T>(admin);
+ let admin = convert_uint256_to_cross_account::<T>(admin);
<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;
Ok(())
}
@@ -461,7 +461,7 @@
/// @param user account to verify
/// @return "true" if account is the owner or admin
fn is_owner_or_admin_substrate(&self, user: uint256) -> Result<bool> {
- let user = convert_substrate_address_to_cross_account_id::<T>(user);
+ let user = convert_uint256_to_cross_account::<T>(user);
Ok(self.is_owner_or_admin(&user))
}
@@ -494,7 +494,7 @@
/// @param newOwner new owner substrate account
fn set_owner_substrate(&mut self, caller: caller, new_owner: uint256) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
- let new_owner = convert_substrate_address_to_cross_account_id::<T>(new_owner);
+ let new_owner = convert_uint256_to_cross_account::<T>(new_owner);
self.set_owner_internal(caller, new_owner)
.map_err(dispatch_to_evm::<T>)
}
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -154,14 +154,14 @@
Collection(common_mut, CollectionHandle<T>),
)
)]
-impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8]> {}
+impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);
generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);
impl<T: Config> CommonEvmHandler for FungibleHandle<T>
where
- T::AccountId: From<[u8; 32]> + AsRef<[u8]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -740,7 +740,7 @@
TokenProperties,
)
)]
-impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8]> {}
+impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
// Not a tests, but code generators
generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);
@@ -748,7 +748,7 @@
impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>
where
- T::AccountId: From<[u8; 32]> + AsRef<[u8]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -789,7 +789,7 @@
TokenProperties,
)
)]
-impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8]> {}
+impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}
// Not a tests, but code generators
generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);
@@ -797,7 +797,7 @@
impl<T: Config> CommonEvmHandler for RefungibleHandle<T>
where
- T::AccountId: From<[u8; 32]> + AsRef<[u8]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");
fn call(
runtime/common/dispatch.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 frame_support::{dispatch::DispatchResult, ensure};18use pallet_evm::{PrecompileHandle, PrecompileResult};19use sp_core::H160;20use sp_runtime::DispatchError;21use sp_std::{borrow::ToOwned, vec::Vec};22use pallet_common::{23 CollectionById, CollectionHandle, CommonCollectionOperations, erc::CommonEvmHandler,24 eth::map_eth_to_id,25};26pub use pallet_common::dispatch::CollectionDispatch;27use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};28use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};29use pallet_refungible::{30 Pallet as PalletRefungible, RefungibleHandle, erc_token::RefungibleTokenHandle,31};32use up_data_structs::{33 CollectionMode, CreateCollectionData, MAX_DECIMAL_POINTS, mapping::TokenAddressMapping,34 CollectionId,35};3637#[cfg(not(feature = "refungible"))]38use pallet_common::unsupported;3940pub enum CollectionDispatchT<T>41where42 T: pallet_fungible::Config + pallet_nonfungible::Config + pallet_refungible::Config,43{44 Fungible(FungibleHandle<T>),45 Nonfungible(NonfungibleHandle<T>),46 Refungible(RefungibleHandle<T>),47}48impl<T> CollectionDispatch<T> for CollectionDispatchT<T>49where50 T: pallet_common::Config51 + pallet_unique::Config52 + pallet_fungible::Config53 + pallet_nonfungible::Config54 + pallet_refungible::Config,55{56 fn create(57 sender: T::CrossAccountId,58 data: CreateCollectionData<T::AccountId>,59 ) -> Result<CollectionId, DispatchError> {60 let id = match data.mode {61 CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, data, false)?,62 CollectionMode::Fungible(decimal_points) => {63 // check params64 ensure!(65 decimal_points <= MAX_DECIMAL_POINTS,66 pallet_unique::Error::<T>::CollectionDecimalPointLimitExceeded67 );68 <PalletFungible<T>>::init_collection(sender, data)?69 }7071 #[cfg(feature = "refungible")]72 CollectionMode::ReFungible => <PalletRefungible<T>>::init_collection(sender, data)?,7374 #[cfg(not(feature = "refungible"))]75 CollectionMode::ReFungible => return unsupported!(T),76 };77 Ok(id)78 }7980 fn destroy(sender: T::CrossAccountId, collection: CollectionHandle<T>) -> DispatchResult {81 match collection.mode {82 CollectionMode::ReFungible => {83 PalletRefungible::destroy_collection(RefungibleHandle::cast(collection), &sender)?84 }85 CollectionMode::Fungible(_) => {86 PalletFungible::destroy_collection(FungibleHandle::cast(collection), &sender)?87 }88 CollectionMode::NFT => {89 PalletNonfungible::destroy_collection(NonfungibleHandle::cast(collection), &sender)?90 }91 }92 Ok(())93 }9495 fn dispatch(handle: CollectionHandle<T>) -> Self {96 match handle.mode {97 CollectionMode::Fungible(_) => Self::Fungible(FungibleHandle::cast(handle)),98 CollectionMode::NFT => Self::Nonfungible(NonfungibleHandle::cast(handle)),99 CollectionMode::ReFungible => Self::Refungible(RefungibleHandle::cast(handle)),100 }101 }102103 fn into_inner(self) -> CollectionHandle<T> {104 match self {105 Self::Fungible(f) => f.into_inner(),106 Self::Nonfungible(f) => f.into_inner(),107 Self::Refungible(f) => f.into_inner(),108 }109 }110111 fn as_dyn(&self) -> &dyn CommonCollectionOperations<T> {112 match self {113 Self::Fungible(h) => h,114 Self::Nonfungible(h) => h,115 Self::Refungible(h) => h,116 }117 }118}119120impl<T> pallet_evm::OnMethodCall<T> for CollectionDispatchT<T>121where122 T: pallet_common::Config123 + pallet_unique::Config124 + pallet_fungible::Config125 + pallet_nonfungible::Config126 + pallet_refungible::Config,127 T::AccountId: From<[u8; 32]> + AsRef<[u8]>,128{129 fn is_reserved(target: &H160) -> bool {130 map_eth_to_id(target).is_some()131 }132 fn is_used(target: &H160) -> bool {133 map_eth_to_id(target)134 .map(<CollectionById<T>>::contains_key)135 .unwrap_or(false)136 }137 fn get_code(target: &H160) -> Option<Vec<u8>> {138 if let Some(collection_id) = map_eth_to_id(target) {139 let collection = <CollectionById<T>>::get(collection_id)?;140 Some(141 match collection.mode {142 CollectionMode::NFT => <NonfungibleHandle<T>>::CODE,143 CollectionMode::Fungible(_) => <FungibleHandle<T>>::CODE,144 CollectionMode::ReFungible => <RefungibleHandle<T>>::CODE,145 }146 .to_owned(),147 )148 } else if let Some((collection_id, _token_id)) =149 <T as pallet_common::Config>::EvmTokenAddressMapping::address_to_token(target)150 {151 let collection = <CollectionById<T>>::get(collection_id)?;152 if collection.mode != CollectionMode::ReFungible {153 return None;154 }155 // TODO: check token existence156 Some(<RefungibleTokenHandle<T>>::CODE.to_owned())157 } else {158 None159 }160 }161 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {162 if let Some(collection_id) = map_eth_to_id(&handle.code_address()) {163 let collection =164 <CollectionHandle<T>>::new_with_gas_limit(collection_id, handle.remaining_gas())?;165 let dispatched = Self::dispatch(collection);166167 match dispatched {168 Self::Fungible(h) => h.call(handle),169 Self::Nonfungible(h) => h.call(handle),170 Self::Refungible(h) => h.call(handle),171 }172 } else if let Some((collection_id, token_id)) =173 <T as pallet_common::Config>::EvmTokenAddressMapping::address_to_token(174 &handle.code_address(),175 ) {176 let collection =177 <CollectionHandle<T>>::new_with_gas_limit(collection_id, handle.remaining_gas())?;178 if collection.mode != CollectionMode::ReFungible {179 return None;180 }181182 let h = RefungibleHandle::cast(collection);183 // TODO: check token existence184 RefungibleTokenHandle(h, token_id).call(handle)185 } else {186 None187 }188 }189}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 frame_support::{dispatch::DispatchResult, ensure};18use pallet_evm::{PrecompileHandle, PrecompileResult};19use sp_core::H160;20use sp_runtime::DispatchError;21use sp_std::{borrow::ToOwned, vec::Vec};22use pallet_common::{23 CollectionById, CollectionHandle, CommonCollectionOperations, erc::CommonEvmHandler,24 eth::map_eth_to_id,25};26pub use pallet_common::dispatch::CollectionDispatch;27use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};28use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};29use pallet_refungible::{30 Pallet as PalletRefungible, RefungibleHandle, erc_token::RefungibleTokenHandle,31};32use up_data_structs::{33 CollectionMode, CreateCollectionData, MAX_DECIMAL_POINTS, mapping::TokenAddressMapping,34 CollectionId,35};3637#[cfg(not(feature = "refungible"))]38use pallet_common::unsupported;3940pub enum CollectionDispatchT<T>41where42 T: pallet_fungible::Config + pallet_nonfungible::Config + pallet_refungible::Config,43{44 Fungible(FungibleHandle<T>),45 Nonfungible(NonfungibleHandle<T>),46 Refungible(RefungibleHandle<T>),47}48impl<T> CollectionDispatch<T> for CollectionDispatchT<T>49where50 T: pallet_common::Config51 + pallet_unique::Config52 + pallet_fungible::Config53 + pallet_nonfungible::Config54 + pallet_refungible::Config,55{56 fn create(57 sender: T::CrossAccountId,58 data: CreateCollectionData<T::AccountId>,59 ) -> Result<CollectionId, DispatchError> {60 let id = match data.mode {61 CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, data, false)?,62 CollectionMode::Fungible(decimal_points) => {63 // check params64 ensure!(65 decimal_points <= MAX_DECIMAL_POINTS,66 pallet_unique::Error::<T>::CollectionDecimalPointLimitExceeded67 );68 <PalletFungible<T>>::init_collection(sender, data)?69 }7071 #[cfg(feature = "refungible")]72 CollectionMode::ReFungible => <PalletRefungible<T>>::init_collection(sender, data)?,7374 #[cfg(not(feature = "refungible"))]75 CollectionMode::ReFungible => return unsupported!(T),76 };77 Ok(id)78 }7980 fn destroy(sender: T::CrossAccountId, collection: CollectionHandle<T>) -> DispatchResult {81 match collection.mode {82 CollectionMode::ReFungible => {83 PalletRefungible::destroy_collection(RefungibleHandle::cast(collection), &sender)?84 }85 CollectionMode::Fungible(_) => {86 PalletFungible::destroy_collection(FungibleHandle::cast(collection), &sender)?87 }88 CollectionMode::NFT => {89 PalletNonfungible::destroy_collection(NonfungibleHandle::cast(collection), &sender)?90 }91 }92 Ok(())93 }9495 fn dispatch(handle: CollectionHandle<T>) -> Self {96 match handle.mode {97 CollectionMode::Fungible(_) => Self::Fungible(FungibleHandle::cast(handle)),98 CollectionMode::NFT => Self::Nonfungible(NonfungibleHandle::cast(handle)),99 CollectionMode::ReFungible => Self::Refungible(RefungibleHandle::cast(handle)),100 }101 }102103 fn into_inner(self) -> CollectionHandle<T> {104 match self {105 Self::Fungible(f) => f.into_inner(),106 Self::Nonfungible(f) => f.into_inner(),107 Self::Refungible(f) => f.into_inner(),108 }109 }110111 fn as_dyn(&self) -> &dyn CommonCollectionOperations<T> {112 match self {113 Self::Fungible(h) => h,114 Self::Nonfungible(h) => h,115 Self::Refungible(h) => h,116 }117 }118}119120impl<T> pallet_evm::OnMethodCall<T> for CollectionDispatchT<T>121where122 T: pallet_common::Config123 + pallet_unique::Config124 + pallet_fungible::Config125 + pallet_nonfungible::Config126 + pallet_refungible::Config,127 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,128{129 fn is_reserved(target: &H160) -> bool {130 map_eth_to_id(target).is_some()131 }132 fn is_used(target: &H160) -> bool {133 map_eth_to_id(target)134 .map(<CollectionById<T>>::contains_key)135 .unwrap_or(false)136 }137 fn get_code(target: &H160) -> Option<Vec<u8>> {138 if let Some(collection_id) = map_eth_to_id(target) {139 let collection = <CollectionById<T>>::get(collection_id)?;140 Some(141 match collection.mode {142 CollectionMode::NFT => <NonfungibleHandle<T>>::CODE,143 CollectionMode::Fungible(_) => <FungibleHandle<T>>::CODE,144 CollectionMode::ReFungible => <RefungibleHandle<T>>::CODE,145 }146 .to_owned(),147 )148 } else if let Some((collection_id, _token_id)) =149 <T as pallet_common::Config>::EvmTokenAddressMapping::address_to_token(target)150 {151 let collection = <CollectionById<T>>::get(collection_id)?;152 if collection.mode != CollectionMode::ReFungible {153 return None;154 }155 // TODO: check token existence156 Some(<RefungibleTokenHandle<T>>::CODE.to_owned())157 } else {158 None159 }160 }161 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {162 if let Some(collection_id) = map_eth_to_id(&handle.code_address()) {163 let collection =164 <CollectionHandle<T>>::new_with_gas_limit(collection_id, handle.remaining_gas())?;165 let dispatched = Self::dispatch(collection);166167 match dispatched {168 Self::Fungible(h) => h.call(handle),169 Self::Nonfungible(h) => h.call(handle),170 Self::Refungible(h) => h.call(handle),171 }172 } else if let Some((collection_id, token_id)) =173 <T as pallet_common::Config>::EvmTokenAddressMapping::address_to_token(174 &handle.code_address(),175 ) {176 let collection =177 <CollectionHandle<T>>::new_with_gas_limit(collection_id, handle.remaining_gas())?;178 if collection.mode != CollectionMode::ReFungible {179 return None;180 }181182 let h = RefungibleHandle::cast(collection);183 // TODO: check token existence184 RefungibleTokenHandle(h, token_id).call(handle)185 } else {186 None187 }188 }189}