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.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/>.1617//! ERC-20 standart support implementation.1819use core::char::{REPLACEMENT_CHARACTER, decode_utf16};20use core::convert::TryInto;21use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};22use up_data_structs::CollectionMode;23use pallet_common::erc::{CommonEvmHandler, PrecompileResult};24use sp_std::vec::Vec;25use pallet_evm::{account::CrossAccountId, PrecompileHandle};26use pallet_evm_coder_substrate::{call, dispatch_to_evm};27use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};28use pallet_common::{CollectionHandle, erc::CollectionCall};2930use crate::{31 Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,32 weights::WeightInfo,33};3435#[derive(ToLog)]36pub enum ERC20Events {37 Transfer {38 #[indexed]39 from: address,40 #[indexed]41 to: address,42 value: uint256,43 },44 Approval {45 #[indexed]46 owner: address,47 #[indexed]48 spender: address,49 value: uint256,50 },51}5253#[solidity_interface(name = ERC20, events(ERC20Events))]54impl<T: Config> FungibleHandle<T> {55 fn name(&self) -> Result<string> {56 Ok(decode_utf16(self.name.iter().copied())57 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))58 .collect::<string>())59 }60 fn symbol(&self) -> Result<string> {61 Ok(string::from_utf8_lossy(&self.token_prefix).into())62 }63 fn total_supply(&self) -> Result<uint256> {64 self.consume_store_reads(1)?;65 Ok(<TotalSupply<T>>::get(self.id).into())66 }6768 fn decimals(&self) -> Result<uint8> {69 Ok(if let CollectionMode::Fungible(decimals) = &self.mode {70 *decimals71 } else {72 unreachable!()73 })74 }75 fn balance_of(&self, owner: address) -> Result<uint256> {76 self.consume_store_reads(1)?;77 let owner = T::CrossAccountId::from_eth(owner);78 let balance = <Balance<T>>::get((self.id, owner));79 Ok(balance.into())80 }81 #[weight(<SelfWeightOf<T>>::transfer())]82 fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {83 let caller = T::CrossAccountId::from_eth(caller);84 let to = T::CrossAccountId::from_eth(to);85 let amount = amount.try_into().map_err(|_| "amount overflow")?;86 let budget = self87 .recorder88 .weight_calls_budget(<StructureWeight<T>>::find_parent());8990 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;91 Ok(true)92 }93 #[weight(<SelfWeightOf<T>>::transfer_from())]94 fn transfer_from(95 &mut self,96 caller: caller,97 from: address,98 to: address,99 amount: uint256,100 ) -> Result<bool> {101 let caller = T::CrossAccountId::from_eth(caller);102 let from = T::CrossAccountId::from_eth(from);103 let to = T::CrossAccountId::from_eth(to);104 let amount = amount.try_into().map_err(|_| "amount overflow")?;105 let budget = self106 .recorder107 .weight_calls_budget(<StructureWeight<T>>::find_parent());108109 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)110 .map_err(dispatch_to_evm::<T>)?;111 Ok(true)112 }113 #[weight(<SelfWeightOf<T>>::approve())]114 fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {115 let caller = T::CrossAccountId::from_eth(caller);116 let spender = T::CrossAccountId::from_eth(spender);117 let amount = amount.try_into().map_err(|_| "amount overflow")?;118119 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)120 .map_err(dispatch_to_evm::<T>)?;121 Ok(true)122 }123 fn allowance(&self, owner: address, spender: address) -> Result<uint256> {124 self.consume_store_reads(1)?;125 let owner = T::CrossAccountId::from_eth(owner);126 let spender = T::CrossAccountId::from_eth(spender);127128 Ok(<Allowance<T>>::get((self.id, owner, spender)).into())129 }130}131132#[solidity_interface(name = ERC20UniqueExtensions)]133impl<T: Config> FungibleHandle<T> {134 #[weight(<SelfWeightOf<T>>::burn_from())]135 fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {136 let caller = T::CrossAccountId::from_eth(caller);137 let from = T::CrossAccountId::from_eth(from);138 let amount = amount.try_into().map_err(|_| "amount overflow")?;139 let budget = self140 .recorder141 .weight_calls_budget(<StructureWeight<T>>::find_parent());142143 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)144 .map_err(dispatch_to_evm::<T>)?;145 Ok(true)146 }147}148149#[solidity_interface(150 name = UniqueFungible,151 is(152 ERC20,153 ERC20UniqueExtensions,154 Collection(common_mut, CollectionHandle<T>),155 )156)]157impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8]> {}158159generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);160generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);161162impl<T: Config> CommonEvmHandler for FungibleHandle<T>163where164 T::AccountId: From<[u8; 32]> + AsRef<[u8]>,165{166 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");167168 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {169 call::<T, UniqueFungibleCall<T>, _, _>(handle, self)170 }171}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/>.1617//! ERC-20 standart support implementation.1819use core::char::{REPLACEMENT_CHARACTER, decode_utf16};20use core::convert::TryInto;21use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};22use up_data_structs::CollectionMode;23use pallet_common::erc::{CommonEvmHandler, PrecompileResult};24use sp_std::vec::Vec;25use pallet_evm::{account::CrossAccountId, PrecompileHandle};26use pallet_evm_coder_substrate::{call, dispatch_to_evm};27use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};28use pallet_common::{CollectionHandle, erc::CollectionCall};2930use crate::{31 Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,32 weights::WeightInfo,33};3435#[derive(ToLog)]36pub enum ERC20Events {37 Transfer {38 #[indexed]39 from: address,40 #[indexed]41 to: address,42 value: uint256,43 },44 Approval {45 #[indexed]46 owner: address,47 #[indexed]48 spender: address,49 value: uint256,50 },51}5253#[solidity_interface(name = ERC20, events(ERC20Events))]54impl<T: Config> FungibleHandle<T> {55 fn name(&self) -> Result<string> {56 Ok(decode_utf16(self.name.iter().copied())57 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))58 .collect::<string>())59 }60 fn symbol(&self) -> Result<string> {61 Ok(string::from_utf8_lossy(&self.token_prefix).into())62 }63 fn total_supply(&self) -> Result<uint256> {64 self.consume_store_reads(1)?;65 Ok(<TotalSupply<T>>::get(self.id).into())66 }6768 fn decimals(&self) -> Result<uint8> {69 Ok(if let CollectionMode::Fungible(decimals) = &self.mode {70 *decimals71 } else {72 unreachable!()73 })74 }75 fn balance_of(&self, owner: address) -> Result<uint256> {76 self.consume_store_reads(1)?;77 let owner = T::CrossAccountId::from_eth(owner);78 let balance = <Balance<T>>::get((self.id, owner));79 Ok(balance.into())80 }81 #[weight(<SelfWeightOf<T>>::transfer())]82 fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {83 let caller = T::CrossAccountId::from_eth(caller);84 let to = T::CrossAccountId::from_eth(to);85 let amount = amount.try_into().map_err(|_| "amount overflow")?;86 let budget = self87 .recorder88 .weight_calls_budget(<StructureWeight<T>>::find_parent());8990 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;91 Ok(true)92 }93 #[weight(<SelfWeightOf<T>>::transfer_from())]94 fn transfer_from(95 &mut self,96 caller: caller,97 from: address,98 to: address,99 amount: uint256,100 ) -> Result<bool> {101 let caller = T::CrossAccountId::from_eth(caller);102 let from = T::CrossAccountId::from_eth(from);103 let to = T::CrossAccountId::from_eth(to);104 let amount = amount.try_into().map_err(|_| "amount overflow")?;105 let budget = self106 .recorder107 .weight_calls_budget(<StructureWeight<T>>::find_parent());108109 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)110 .map_err(dispatch_to_evm::<T>)?;111 Ok(true)112 }113 #[weight(<SelfWeightOf<T>>::approve())]114 fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {115 let caller = T::CrossAccountId::from_eth(caller);116 let spender = T::CrossAccountId::from_eth(spender);117 let amount = amount.try_into().map_err(|_| "amount overflow")?;118119 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)120 .map_err(dispatch_to_evm::<T>)?;121 Ok(true)122 }123 fn allowance(&self, owner: address, spender: address) -> Result<uint256> {124 self.consume_store_reads(1)?;125 let owner = T::CrossAccountId::from_eth(owner);126 let spender = T::CrossAccountId::from_eth(spender);127128 Ok(<Allowance<T>>::get((self.id, owner, spender)).into())129 }130}131132#[solidity_interface(name = ERC20UniqueExtensions)]133impl<T: Config> FungibleHandle<T> {134 #[weight(<SelfWeightOf<T>>::burn_from())]135 fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {136 let caller = T::CrossAccountId::from_eth(caller);137 let from = T::CrossAccountId::from_eth(from);138 let amount = amount.try_into().map_err(|_| "amount overflow")?;139 let budget = self140 .recorder141 .weight_calls_budget(<StructureWeight<T>>::find_parent());142143 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)144 .map_err(dispatch_to_evm::<T>)?;145 Ok(true)146 }147}148149#[solidity_interface(150 name = UniqueFungible,151 is(152 ERC20,153 ERC20UniqueExtensions,154 Collection(common_mut, CollectionHandle<T>),155 )156)]157impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}158159generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);160generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);161162impl<T: Config> CommonEvmHandler for FungibleHandle<T>163where164 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,165{166 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");167168 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {169 call::<T, UniqueFungibleCall<T>, _, _>(handle, self)170 }171}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.rsdiffbeforeafterboth--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -124,7 +124,7 @@
+ pallet_fungible::Config
+ pallet_nonfungible::Config
+ pallet_refungible::Config,
- T::AccountId: From<[u8; 32]> + AsRef<[u8]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
fn is_reserved(target: &H160) -> bool {
map_eth_to_id(target).is_some()