difftreelog
refactor merge sealed::CanBePlacedInVec traits
in: master
7 files changed
crates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive.rs
+++ b/crates/evm-coder/procedural/src/abi_derive.rs
@@ -41,7 +41,7 @@
fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {
quote! {
- impl ::evm_coder::abi::sealed::CanBePlacedInVec for #ident {}
+ impl ::evm_coder::sealed::CanBePlacedInVec for #ident {}
}
}
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -1,8 +1,8 @@
use crate::{
+ custom_signature::SignatureUnit,
execution::{Result, ResultWithPostInfo, WithPostDispatchInfo},
+ make_signature, sealed,
types::*,
- make_signature,
- custom_signature::SignatureUnit,
};
use super::{traits::*, ABI_ALIGNMENT, AbiReader, AbiWriter};
use primitive_types::{U256, H160};
crates/evm-coder/src/abi/traits.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/traits.rs
+++ b/crates/evm-coder/src/abi/traits.rs
@@ -22,12 +22,6 @@
fn size() -> usize;
}
-/// Sealed traits.
-pub mod sealed {
- /// Not all types can be placed in vec, i.e `Vec<u8>` is restricted, `bytes` should be used instead
- pub trait CanBePlacedInVec {}
-}
-
/// [`AbiReader`] implements reading of many types.
pub trait AbiRead {
/// Read item from current position, advanding decoder
crates/evm-coder/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -112,6 +112,15 @@
#[cfg(feature = "stubgen")]
pub mod solidity;
+/// Sealed traits.
+pub mod sealed {
+ /// Not every type should be directly placed in vec.
+ /// Vec encoding is not memory efficient, as every item will be padded
+ /// to 32 bytes.
+ /// Instead you should use specialized types (`bytes` in case of `Vec<u8>`)
+ pub trait CanBePlacedInVec {}
+}
+
/// Solidity type definitions (aliases from solidity name to rust type)
/// To be used in [`solidity_interface`] definitions, to make sure there is no
/// type conflict between Rust code and generated definitions
crates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -1,11 +1,7 @@
-use super::{TypeCollector, SolidityTypeName, SolidityTupleType, sealed};
-use crate::types::*;
+use super::{TypeCollector, SolidityTypeName, SolidityTupleType};
+use crate::{sealed, types::*};
use core::fmt;
-impl sealed::CanBePlacedInVec for uint256 {}
-impl sealed::CanBePlacedInVec for string {}
-impl sealed::CanBePlacedInVec for address {}
-
macro_rules! solidity_type_name {
($($ty:ty => $name:literal $simple:literal = $default:literal),* $(,)?) => {
$(
@@ -74,7 +70,6 @@
macro_rules! impl_tuples {
($($ident:ident)+) => {
- impl<$($ident),+> sealed::CanBePlacedInVec for ($($ident,)+) {}
impl<$($ident: SolidityTypeName + 'static),+> SolidityTupleType for ($($ident,)+) {
fn names(tc: &TypeCollector) -> Vec<string> {
let mut collected = Vec::with_capacity(Self::len());
crates/evm-coder/src/solidity/traits.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/traits.rs
+++ b/crates/evm-coder/src/solidity/traits.rs
@@ -1,14 +1,6 @@
use super::TypeCollector;
use core::fmt;
-pub mod sealed {
- /// Not every type should be directly placed in vec.
- /// Vec encoding is not memory efficient, as every item will be padded
- /// to 32 bytes.
- /// Instead you should use specialized types (`bytes` in case of `Vec<u8>`)
- pub trait CanBePlacedInVec {}
-}
-
pub trait StructCollect: 'static {
/// Structure name.
fn name() -> String;
pallets/common/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/>.1617//! The module contains a number of functions for converting and checking ethereum identifiers.1819use evm_coder::{20 AbiCoder,21 types::{uint256, address},22};23pub use pallet_evm::{Config, account::CrossAccountId};24use sp_core::H160;25use up_data_structs::CollectionId;2627// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 128// TODO: Unhardcode prefix29const ETH_COLLECTION_PREFIX: [u8; 16] = [30 0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,31];3233/// Maps the ethereum address of the collection in substrate.34pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {35 if eth[0..16] != ETH_COLLECTION_PREFIX {36 return None;37 }38 let mut id_bytes = [0; 4];39 id_bytes.copy_from_slice(ð[16..20]);40 Some(CollectionId(u32::from_be_bytes(id_bytes)))41}4243/// Maps the substrate collection id in ethereum.44pub fn collection_id_to_address(id: CollectionId) -> H160 {45 let mut out = [0; 20];46 out[0..16].copy_from_slice(Ð_COLLECTION_PREFIX);47 out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));48 H160(out)49}5051/// Check if the ethereum address is a collection.52pub fn is_collection(address: &H160) -> bool {53 address[0..16] == ETH_COLLECTION_PREFIX54}5556/// Convert `CrossAccountId` to `uint256`.57pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint25658where59 T::AccountId: AsRef<[u8; 32]>,60{61 let slice = from.as_sub().as_ref();62 uint256::from_big_endian(slice)63}6465/// Convert `uint256` to `CrossAccountId`.66pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId67where68 T::AccountId: From<[u8; 32]>,69{70 let mut new_admin_arr = [0_u8; 32];71 from.to_big_endian(&mut new_admin_arr);72 let account_id = T::AccountId::from(new_admin_arr);73 T::CrossAccountId::from_sub(account_id)74}7576/// Convert `CrossAccountId` to `(address, uint256)`.77pub fn convert_cross_account_to_tuple<T: Config>(78 cross_account_id: &T::CrossAccountId,79) -> (address, uint256)80where81 T::AccountId: AsRef<[u8; 32]>,82{83 if cross_account_id.is_canonical_substrate() {84 let sub = convert_cross_account_to_uint256::<T>(cross_account_id);85 (Default::default(), sub)86 } else {87 let eth = *cross_account_id.as_eth();88 (eth, Default::default())89 }90}9192/// Convert tuple `(address, uint256)` to `CrossAccountId`.93///94/// If `address` in the tuple has *default* value, then the canonical form is substrate,95/// if `uint256` has *default* value, then the ethereum form is canonical,96/// if both values are *default* or *non default*, then this is considered an invalid address and `Error` is returned.97pub fn convert_tuple_to_cross_account<T: Config>(98 eth_cross_account_id: (address, uint256),99) -> evm_coder::execution::Result<T::CrossAccountId>100where101 T::AccountId: From<[u8; 32]>,102{103 if eth_cross_account_id == Default::default() {104 Err("All fields of cross account is zeroed".into())105 } else if eth_cross_account_id.0 == Default::default() {106 Ok(convert_uint256_to_cross_account::<T>(107 eth_cross_account_id.1,108 ))109 } else if eth_cross_account_id.1 == Default::default() {110 Ok(T::CrossAccountId::from_eth(eth_cross_account_id.0))111 } else {112 Err("All fields of cross account is non zeroed".into())113 }114}115116#[derive(Debug, Default, AbiCoder)]117pub struct EthCrossAccount {118 pub(crate) eth: address,119 pub(crate) sub: uint256,120}121122impl EthCrossAccount {123 pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self124 where125 T: pallet_evm::account::Config,126 T::AccountId: AsRef<[u8; 32]>,127 {128 if cross_account_id.is_canonical_substrate() {129 Self {130 eth: Default::default(),131 sub: convert_cross_account_to_uint256::<T>(cross_account_id),132 }133 } else {134 Self {135 eth: *cross_account_id.as_eth(),136 sub: Default::default(),137 }138 }139 }140141 pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>142 where143 T: pallet_evm::account::Config,144 T::AccountId: From<[u8; 32]>,145 {146 if self.eth == Default::default() && self.sub == Default::default() {147 Err("All fields of cross account is zeroed".into())148 } else if self.eth == Default::default() {149 Ok(convert_uint256_to_cross_account::<T>(self.sub))150 } else if self.sub == Default::default() {151 Ok(T::CrossAccountId::from_eth(self.eth))152 } else {153 Err("All fields of cross account is non zeroed".into())154 }155 }156}157158#[cfg(feature = "stubgen")]159impl ::evm_coder::solidity::sealed::CanBePlacedInVec for EthCrossAccount {}160161#[cfg(feature = "stubgen")]162impl ::evm_coder::solidity::SolidityTupleType for EthCrossAccount {163 fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {164 let mut collected =165 Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityTupleType>::len());166 {167 let mut out = String::new();168 <address as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)169 .expect("no fmt error");170 collected.push(out);171 }172 {173 let mut out = String::new();174 <uint256 as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)175 .expect("no fmt error");176 collected.push(out);177 }178 collected179 }180181 fn len() -> usize {182 2183 }184}185186#[cfg(feature = "stubgen")]187impl ::evm_coder::solidity::SolidityTypeName for EthCrossAccount {188 fn solidity_name(189 writer: &mut impl ::core::fmt::Write,190 tc: &::evm_coder::solidity::TypeCollector,191 ) -> ::core::fmt::Result {192 write!(writer, "{}", tc.collect_struct::<Self>())193 }194195 fn is_simple() -> bool {196 false197 }198199 fn solidity_default(200 writer: &mut impl ::core::fmt::Write,201 tc: &::evm_coder::solidity::TypeCollector,202 ) -> ::core::fmt::Result {203 write!(writer, "{}(", tc.collect_struct::<Self>())?;204 address::solidity_default(writer, tc)?;205 write!(writer, ",")?;206 uint256::solidity_default(writer, tc)?;207 write!(writer, ")")208 }209}210211#[cfg(feature = "stubgen")]212impl ::evm_coder::solidity::StructCollect for EthCrossAccount {213 fn name() -> String {214 "EthCrossAccount".into()215 }216217 fn declaration() -> String {218 use std::fmt::Write;219220 let mut str = String::new();221 writeln!(str, "/// @dev Cross account struct").unwrap();222 writeln!(str, "struct {} {{", Self::name()).unwrap();223 writeln!(str, "\taddress eth;").unwrap();224 writeln!(str, "\tuint256 sub;").unwrap();225 writeln!(str, "}}").unwrap();226 str227 }228}