difftreelog
refactor Make implementations of Abi* for EthCrossAccount via AbiCoder macro
in: master
9 files changed
.maintain/scripts/generate_abi.shdiffbeforeafterboth--- a/.maintain/scripts/generate_abi.sh
+++ b/.maintain/scripts/generate_abi.sh
@@ -4,6 +4,7 @@
dir=$PWD
tmp=$(mktemp -d)
+echo "Tmp file: $tmp/input.sol"
cd $tmp
cp $dir/$INPUT input.sol
solcjs --abi -p input.sol
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -120,42 +120,6 @@
}
}
-impl sealed::CanBePlacedInVec for EthCrossAccount {}
-
-impl AbiType for EthCrossAccount {
- const SIGNATURE: SignatureUnit = make_signature!(new fixed("(address,uint256)"));
-
- fn is_dynamic() -> bool {
- address::is_dynamic() || uint256::is_dynamic()
- }
-
- fn size() -> usize {
- <address as AbiType>::size() + <uint256 as AbiType>::size()
- }
-}
-
-impl AbiRead for EthCrossAccount {
- fn abi_read(reader: &mut AbiReader) -> Result<EthCrossAccount> {
- let size = if !EthCrossAccount::is_dynamic() {
- Some(<EthCrossAccount as AbiType>::size())
- } else {
- None
- };
- let mut subresult = reader.subresult(size)?;
- let eth = <address>::abi_read(&mut subresult)?;
- let sub = <uint256>::abi_read(&mut subresult)?;
-
- Ok(EthCrossAccount { eth, sub })
- }
-}
-
-impl AbiWrite for EthCrossAccount {
- fn abi_write(&self, writer: &mut AbiWriter) {
- self.eth.abi_write(writer);
- self.sub.abi_write(writer);
- }
-}
-
impl sealed::CanBePlacedInVec for Property {}
impl AbiType for Property {
crates/evm-coder/src/lib.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#![doc = include_str!("../README.md")]18#![deny(missing_docs)]19#![macro_use]20#![cfg_attr(not(feature = "std"), no_std)]21#[cfg(not(feature = "std"))]22extern crate alloc;2324use abi::{AbiRead, AbiReader, AbiWriter};25pub use evm_coder_procedural::{event_topic, fn_selector};26pub mod abi;27pub use events::{ToLog, ToTopic};28use execution::DispatchInfo;29pub mod execution;30#[macro_use]31pub mod custom_signature;3233/// Derives call enum implementing [`crate::Callable`], [`crate::Weighted`]34/// and [`crate::Call`] from impl block.35///36/// ## Macro syntax37///38/// `#[solidity_interface(name, is, inline_is, events)]`39/// - *name* - used in generated code, and for Call enum name40/// - *is* - used to provide inheritance in Solidity41/// - *inline_is* - same as `is`, but ERC165::SupportsInterface will work differently: For `is` SupportsInterface(A) will return true42/// if A is one of the interfaces the contract is inherited from (e.g. B is created as `is(A)`). If B is created as `inline_is(A)`43/// SupportsInterface(A) will internally create a new interface that combines all methods of A and B, so SupportsInterface(A) will return44/// false.45///46/// `#[weight(value)]`47/// Can be added to every method of impl block, used for deriving [`crate::Weighted`], which48/// is used by substrate bridge.49/// - *value*: expression, which evaluates to weight required to call this method.50/// This expression can use call arguments to calculate non-constant execution time.51/// This expression should evaluate faster than actual execution does, and may provide worse case52/// than one is called.53///54/// `#[solidity_interface(rename_selector)]`55/// - *rename_selector* - by default, selector name will be generated by transforming method name56/// from snake_case to camelCase. Use this option, if other naming convention is required.57/// I.e: method `token_uri` will be automatically renamed to `tokenUri` in selector, but name58/// required by ERC721 standard is `tokenURI`, thus we need to specify `rename_selector = "tokenURI"`59/// explicitly.60///61/// Both contract and contract methods may have doccomments, which will end up in a generated62/// solidity interface file, thus you should use [solidity syntax](https://docs.soliditylang.org/en/latest/natspec-format.html) for writing documentation in this macro63///64/// ## Example65///66/// ```ignore67/// struct SuperContract;68/// struct InlineContract;69/// struct Contract;70///71/// #[derive(ToLog)]72/// enum ContractEvents {73/// Event(#[indexed] uint32),74/// }75///76/// /// @dev This contract provides function to multiply two numbers77/// #[solidity_interface(name = MyContract, is(SuperContract), inline_is(InlineContract))]78/// impl Contract {79/// /// Multiply two numbers80/// /// @param a First number81/// /// @param b Second number82/// /// @return uint32 Product of two passed numbers83/// /// @dev This function returns error in case of overflow84/// #[weight(200 + a + b)]85/// #[solidity_interface(rename_selector = "mul")]86/// fn mul(&mut self, a: uint32, b: uint32) -> Result<uint32> {87/// Ok(a.checked_mul(b).ok_or("overflow")?)88/// }89/// }90/// ```91pub use evm_coder_procedural::solidity_interface;92/// See [`solidity_interface`]93pub use evm_coder_procedural::solidity;94/// See [`solidity_interface`]95pub use evm_coder_procedural::weight;96pub use sha3_const;9798/// Derives [`ToLog`] for enum99///100/// Selectors will be derived from variant names, there is currently no way to have custom naming101/// for them102///103/// `#[indexed]`104/// Marks this field as indexed, so it will appear in [`ethereum::Log`] topics instead of data105pub use evm_coder_procedural::ToLog;106107// Api of those modules shouldn't be consumed directly, it is only exported for usage in proc macros108#[doc(hidden)]109pub mod events;110#[doc(hidden)]111#[cfg(feature = "stubgen")]112pub mod solidity;113114/// Solidity type definitions (aliases from solidity name to rust type)115/// To be used in [`solidity_interface`] definitions, to make sure there is no116/// type conflict between Rust code and generated definitions117pub mod types {118 #![allow(non_camel_case_types, missing_docs)]119120 #[cfg(not(feature = "std"))]121 use alloc::{vec::Vec};122 use pallet_evm::account::CrossAccountId;123 use primitive_types::{U256, H160, H256};124125 pub type address = H160;126 pub type uint8 = u8;127 pub type uint16 = u16;128 pub type uint32 = u32;129 pub type uint64 = u64;130 pub type uint128 = u128;131 pub type uint256 = U256;132 pub type bytes4 = [u8; 4];133 pub type topic = H256;134135 #[cfg(not(feature = "std"))]136 pub type string = ::alloc::string::String;137 #[cfg(feature = "std")]138 pub type string = ::std::string::String;139140 #[derive(Default, Debug, PartialEq, Clone)]141 pub struct bytes(pub Vec<u8>);142143 /// Solidity doesn't have `void` type, however we have special implementation144 /// for empty tuple return type145 pub type void = ();146147 //#region Special types148 /// Makes function payable149 pub type value = U256;150 /// Makes function caller-sensitive151 pub type caller = address;152 //#endregion153154 /// Ethereum typed call message, similar to solidity155 /// `msg` object.156 pub struct Msg<C> {157 pub call: C,158 /// Address of user, which called this contract.159 pub caller: H160,160 /// Payment amount to contract.161 /// Contract should reject payment, if target call is not payable,162 /// and there is no `receiver()` function defined.163 pub value: U256,164 }165166 impl From<Vec<u8>> for bytes {167 fn from(src: Vec<u8>) -> Self {168 Self(src)169 }170 }171172 #[allow(clippy::from_over_into)]173 impl Into<Vec<u8>> for bytes {174 fn into(self) -> Vec<u8> {175 self.0176 }177 }178179 impl bytes {180 #[must_use]181 pub fn len(&self) -> usize {182 self.0.len()183 }184185 #[must_use]186 pub fn is_empty(&self) -> bool {187 self.len() == 0188 }189 }190191 #[derive(Debug, Default)]192 pub struct EthCrossAccount {193 pub(crate) eth: address,194 pub(crate) sub: uint256,195 }196197 impl EthCrossAccount {198 pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self199 where200 T: pallet_evm::Config,201 T::AccountId: AsRef<[u8; 32]>,202 {203 if cross_account_id.is_canonical_substrate() {204 Self {205 eth: Default::default(),206 sub: convert_cross_account_to_uint256::<T>(cross_account_id),207 }208 } else {209 Self {210 eth: *cross_account_id.as_eth(),211 sub: Default::default(),212 }213 }214 }215216 pub fn into_sub_cross_account<T>(&self) -> crate::execution::Result<T::CrossAccountId>217 where218 T: pallet_evm::Config,219 T::AccountId: From<[u8; 32]>,220 {221 if self.eth == Default::default() && self.sub == Default::default() {222 Err("All fields of cross account is zeroed".into())223 } else if self.eth == Default::default() {224 Ok(convert_uint256_to_cross_account::<T>(self.sub))225 } else if self.sub == Default::default() {226 Ok(T::CrossAccountId::from_eth(self.eth))227 } else {228 Err("All fields of cross account is non zeroed".into())229 }230 }231 }232233 /// Convert `CrossAccountId` to `uint256`.234 pub fn convert_cross_account_to_uint256<T: pallet_evm::Config>(235 from: &T::CrossAccountId,236 ) -> uint256237 where238 T::AccountId: AsRef<[u8; 32]>,239 {240 let slice = from.as_sub().as_ref();241 uint256::from_big_endian(slice)242 }243244 /// Convert `uint256` to `CrossAccountId`.245 pub fn convert_uint256_to_cross_account<T: pallet_evm::Config>(246 from: uint256,247 ) -> T::CrossAccountId248 where249 T::AccountId: From<[u8; 32]>,250 {251 let mut new_admin_arr = [0_u8; 32];252 from.to_big_endian(&mut new_admin_arr);253 let account_id = T::AccountId::from(new_admin_arr);254 T::CrossAccountId::from_sub(account_id)255 }256257 #[derive(Debug, Default)]258 pub struct Property {259 pub key: string,260 pub value: bytes,261 }262}263264/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro265pub trait Call: Sized {266 /// Parse call buffer into typed call enum267 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;268}269270/// Intended to be used as `#[weight]` output type271/// Should be same between evm-coder and substrate to avoid confusion272///273/// Isn't same thing as gas, some mapping is required between those types274pub type Weight = frame_support::weights::Weight;275276/// In substrate, we have benchmarking, which allows277/// us to not rely on gas metering, but instead predict amount of gas to execute call278pub trait Weighted: Call {279 /// Predict weight of this call280 fn weight(&self) -> DispatchInfo;281}282283/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro284/// on interface implementation, or for externally-owned real EVM contract285pub trait Callable<C: Call> {286 /// Call contract using specified call data287 fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;288}289290/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],291/// this structure holds parsed data for ERC165Call subvariant292///293/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every294/// implementing contract295///296/// See <https://eips.ethereum.org/EIPS/eip-165>297#[derive(Debug)]298pub enum ERC165Call {299 /// ERC165 provides single method, which returns true, if contract300 /// implements specified interface301 SupportsInterface {302 /// Requested interface303 interface_id: types::bytes4,304 },305}306307impl ERC165Call {308 /// ERC165 selector is provided by standard309 pub const INTERFACE_ID: types::bytes4 = u32::to_be_bytes(0x01ffc9a7);310}311312impl Call for ERC165Call {313 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {314 if selector != Self::INTERFACE_ID {315 return Ok(None);316 }317 Ok(Some(Self::SupportsInterface {318 interface_id: types::bytes4::abi_read(input)?,319 }))320 }321}322323/// Generate "tests", which will generate solidity code on execution and print it to stdout324/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime325///326/// This macro receives type usage as second argument, but you can use anything as generics,327/// because no bounds are implied328#[macro_export]329macro_rules! generate_stubgen {330 ($name:ident, $decl:ty, $is_impl:literal) => {331 #[cfg(feature = "stubgen")]332 #[test]333 #[ignore]334 fn $name() {335 use evm_coder::solidity::TypeCollector;336 let mut out = TypeCollector::new();337 <$decl>::generate_solidity_interface(&mut out, $is_impl);338 println!("=== SNIP START ===");339 println!("// SPDX-License-Identifier: OTHER");340 println!("// This code is automatically generated");341 println!();342 println!("pragma solidity >=0.8.0 <0.9.0;");343 println!();344 for b in out.finish() {345 println!("{}", b);346 }347 println!("=== SNIP END ===");348 }349 };350}351352#[cfg(test)]353mod tests {354 use super::*;355356 #[test]357 fn function_selector_generation() {358 assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);359 }360361 #[test]362 fn event_topic_generation() {363 assert_eq!(364 hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),365 "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",366 );367 }368}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#![doc = include_str!("../README.md")]18#![deny(missing_docs)]19#![macro_use]20#![cfg_attr(not(feature = "std"), no_std)]21#[cfg(not(feature = "std"))]22extern crate alloc;2324use abi::{AbiRead, AbiReader, AbiWriter};25pub use evm_coder_procedural::{event_topic, fn_selector};26pub mod abi;27pub use events::{ToLog, ToTopic};28use execution::DispatchInfo;29pub mod execution;30#[macro_use]31pub mod custom_signature;3233/// Derives call enum implementing [`crate::Callable`], [`crate::Weighted`]34/// and [`crate::Call`] from impl block.35///36/// ## Macro syntax37///38/// `#[solidity_interface(name, is, inline_is, events)]`39/// - *name* - used in generated code, and for Call enum name40/// - *is* - used to provide inheritance in Solidity41/// - *inline_is* - same as `is`, but ERC165::SupportsInterface will work differently: For `is` SupportsInterface(A) will return true42/// if A is one of the interfaces the contract is inherited from (e.g. B is created as `is(A)`). If B is created as `inline_is(A)`43/// SupportsInterface(A) will internally create a new interface that combines all methods of A and B, so SupportsInterface(A) will return44/// false.45///46/// `#[weight(value)]`47/// Can be added to every method of impl block, used for deriving [`crate::Weighted`], which48/// is used by substrate bridge.49/// - *value*: expression, which evaluates to weight required to call this method.50/// This expression can use call arguments to calculate non-constant execution time.51/// This expression should evaluate faster than actual execution does, and may provide worse case52/// than one is called.53///54/// `#[solidity_interface(rename_selector)]`55/// - *rename_selector* - by default, selector name will be generated by transforming method name56/// from snake_case to camelCase. Use this option, if other naming convention is required.57/// I.e: method `token_uri` will be automatically renamed to `tokenUri` in selector, but name58/// required by ERC721 standard is `tokenURI`, thus we need to specify `rename_selector = "tokenURI"`59/// explicitly.60///61/// Both contract and contract methods may have doccomments, which will end up in a generated62/// solidity interface file, thus you should use [solidity syntax](https://docs.soliditylang.org/en/latest/natspec-format.html) for writing documentation in this macro63///64/// ## Example65///66/// ```ignore67/// struct SuperContract;68/// struct InlineContract;69/// struct Contract;70///71/// #[derive(ToLog)]72/// enum ContractEvents {73/// Event(#[indexed] uint32),74/// }75///76/// /// @dev This contract provides function to multiply two numbers77/// #[solidity_interface(name = MyContract, is(SuperContract), inline_is(InlineContract))]78/// impl Contract {79/// /// Multiply two numbers80/// /// @param a First number81/// /// @param b Second number82/// /// @return uint32 Product of two passed numbers83/// /// @dev This function returns error in case of overflow84/// #[weight(200 + a + b)]85/// #[solidity_interface(rename_selector = "mul")]86/// fn mul(&mut self, a: uint32, b: uint32) -> Result<uint32> {87/// Ok(a.checked_mul(b).ok_or("overflow")?)88/// }89/// }90/// ```91pub use evm_coder_procedural::solidity_interface;92/// See [`solidity_interface`]93pub use evm_coder_procedural::solidity;94/// See [`solidity_interface`]95pub use evm_coder_procedural::weight;96pub use evm_coder_procedural::AbiCoder;97pub use sha3_const;9899/// Derives [`ToLog`] for enum100///101/// Selectors will be derived from variant names, there is currently no way to have custom naming102/// for them103///104/// `#[indexed]`105/// Marks this field as indexed, so it will appear in [`ethereum::Log`] topics instead of data106pub use evm_coder_procedural::ToLog;107108// Api of those modules shouldn't be consumed directly, it is only exported for usage in proc macros109#[doc(hidden)]110pub mod events;111#[doc(hidden)]112#[cfg(feature = "stubgen")]113pub mod solidity;114115/// Solidity type definitions (aliases from solidity name to rust type)116/// To be used in [`solidity_interface`] definitions, to make sure there is no117/// type conflict between Rust code and generated definitions118pub mod types {119 #![allow(non_camel_case_types, missing_docs)]120121 #[cfg(not(feature = "std"))]122 use alloc::{vec::Vec};123 use primitive_types::{U256, H160, H256};124125 pub type address = H160;126 pub type uint8 = u8;127 pub type uint16 = u16;128 pub type uint32 = u32;129 pub type uint64 = u64;130 pub type uint128 = u128;131 pub type uint256 = U256;132 pub type bytes4 = [u8; 4];133 pub type topic = H256;134135 #[cfg(not(feature = "std"))]136 pub type string = ::alloc::string::String;137 #[cfg(feature = "std")]138 pub type string = ::std::string::String;139140 #[derive(Default, Debug, PartialEq, Clone)]141 pub struct bytes(pub Vec<u8>);142143 /// Solidity doesn't have `void` type, however we have special implementation144 /// for empty tuple return type145 pub type void = ();146147 //#region Special types148 /// Makes function payable149 pub type value = U256;150 /// Makes function caller-sensitive151 pub type caller = address;152 //#endregion153154 /// Ethereum typed call message, similar to solidity155 /// `msg` object.156 pub struct Msg<C> {157 pub call: C,158 /// Address of user, which called this contract.159 pub caller: H160,160 /// Payment amount to contract.161 /// Contract should reject payment, if target call is not payable,162 /// and there is no `receiver()` function defined.163 pub value: U256,164 }165166 impl From<Vec<u8>> for bytes {167 fn from(src: Vec<u8>) -> Self {168 Self(src)169 }170 }171172 #[allow(clippy::from_over_into)]173 impl Into<Vec<u8>> for bytes {174 fn into(self) -> Vec<u8> {175 self.0176 }177 }178179 impl bytes {180 #[must_use]181 pub fn len(&self) -> usize {182 self.0.len()183 }184185 #[must_use]186 pub fn is_empty(&self) -> bool {187 self.len() == 0188 }189 }190191 #[derive(Debug, Default)]192 pub struct Property {193 pub key: string,194 pub value: bytes,195 }196}197198/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro199pub trait Call: Sized {200 /// Parse call buffer into typed call enum201 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;202}203204/// Intended to be used as `#[weight]` output type205/// Should be same between evm-coder and substrate to avoid confusion206///207/// Isn't same thing as gas, some mapping is required between those types208pub type Weight = frame_support::weights::Weight;209210/// In substrate, we have benchmarking, which allows211/// us to not rely on gas metering, but instead predict amount of gas to execute call212pub trait Weighted: Call {213 /// Predict weight of this call214 fn weight(&self) -> DispatchInfo;215}216217/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro218/// on interface implementation, or for externally-owned real EVM contract219pub trait Callable<C: Call> {220 /// Call contract using specified call data221 fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;222}223224/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],225/// this structure holds parsed data for ERC165Call subvariant226///227/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every228/// implementing contract229///230/// See <https://eips.ethereum.org/EIPS/eip-165>231#[derive(Debug)]232pub enum ERC165Call {233 /// ERC165 provides single method, which returns true, if contract234 /// implements specified interface235 SupportsInterface {236 /// Requested interface237 interface_id: types::bytes4,238 },239}240241impl ERC165Call {242 /// ERC165 selector is provided by standard243 pub const INTERFACE_ID: types::bytes4 = u32::to_be_bytes(0x01ffc9a7);244}245246impl Call for ERC165Call {247 fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {248 if selector != Self::INTERFACE_ID {249 return Ok(None);250 }251 Ok(Some(Self::SupportsInterface {252 interface_id: types::bytes4::abi_read(input)?,253 }))254 }255}256257/// Generate "tests", which will generate solidity code on execution and print it to stdout258/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime259///260/// This macro receives type usage as second argument, but you can use anything as generics,261/// because no bounds are implied262#[macro_export]263macro_rules! generate_stubgen {264 ($name:ident, $decl:ty, $is_impl:literal) => {265 #[cfg(feature = "stubgen")]266 #[test]267 #[ignore]268 fn $name() {269 use evm_coder::solidity::TypeCollector;270 let mut out = TypeCollector::new();271 <$decl>::generate_solidity_interface(&mut out, $is_impl);272 println!("=== SNIP START ===");273 println!("// SPDX-License-Identifier: OTHER");274 println!("// This code is automatically generated");275 println!();276 println!("pragma solidity >=0.8.0 <0.9.0;");277 println!();278 for b in out.finish() {279 println!("{}", b);280 }281 println!("=== SNIP END ===");282 }283 };284}285286#[cfg(test)]287mod tests {288 use super::*;289290 #[test]291 fn function_selector_generation() {292 assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);293 }294295 #[test]296 fn event_topic_generation() {297 assert_eq!(298 hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),299 "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",300 );301 }302}crates/evm-coder/src/solidity.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -145,7 +145,7 @@
}
}
-mod sealed {
+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.
@@ -156,7 +156,6 @@
impl sealed::CanBePlacedInVec for uint256 {}
impl sealed::CanBePlacedInVec for string {}
impl sealed::CanBePlacedInVec for address {}
-impl sealed::CanBePlacedInVec for EthCrossAccount {}
impl sealed::CanBePlacedInVec for Property {}
impl<T: SolidityTypeName + sealed::CanBePlacedInVec> SolidityTypeName for Vec<T> {
@@ -171,61 +170,6 @@
write!(writer, "new ")?;
T::solidity_name(writer, tc)?;
write!(writer, "[](0)")
- }
-}
-
-impl SolidityTupleType for EthCrossAccount {
- fn names(tc: &TypeCollector) -> Vec<string> {
- let mut collected = Vec::with_capacity(Self::len());
- {
- let mut out = string::new();
- address::solidity_name(&mut out, tc).expect("no fmt error");
- collected.push(out);
- }
- {
- let mut out = string::new();
- uint256::solidity_name(&mut out, tc).expect("no fmt error");
- collected.push(out);
- }
- collected
- }
-
- fn len() -> usize {
- 2
- }
-}
-
-impl SolidityTypeName for EthCrossAccount {
- fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
- write!(writer, "{}", tc.collect_struct::<Self>())
- }
-
- fn is_simple() -> bool {
- false
- }
-
- fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
- write!(writer, "{}(", tc.collect_struct::<Self>())?;
- address::solidity_default(writer, tc)?;
- write!(writer, ",")?;
- uint256::solidity_default(writer, tc)?;
- write!(writer, ")")
- }
-}
-
-impl StructCollect for EthCrossAccount {
- fn name() -> String {
- "EthCrossAccount".into()
- }
-
- fn declaration() -> String {
- let mut str = String::new();
- writeln!(str, "/// @dev Cross account struct").unwrap();
- writeln!(str, "struct {} {{", Self::name()).unwrap();
- writeln!(str, "\taddress eth;").unwrap();
- writeln!(str, "\tuint256 sub;").unwrap();
- writeln!(str, "}}").unwrap();
- str
}
}
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -16,6 +16,7 @@
//! This module contains the implementation of pallet methods for evm.
+pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};
use evm_coder::{
abi::AbiType,
solidity_interface, solidity, ToLog,
@@ -24,7 +25,6 @@
execution::{Result, Error},
weight,
};
-pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};
use pallet_evm_coder_substrate::dispatch_to_evm;
use sp_std::vec::Vec;
use up_data_structs::{
@@ -35,7 +35,8 @@
use crate::{
Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
- eth::convert_cross_account_to_uint256, weights::WeightInfo,
+ eth::{EthCrossAccount, convert_cross_account_to_uint256},
+ weights::WeightInfo,
};
/// Events for ethereum collection helper.
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -16,7 +16,10 @@
//! The module contains a number of functions for converting and checking ethereum identifiers.
-use evm_coder::types::{uint256, address};
+use evm_coder::{
+ AbiCoder,
+ types::{uint256, address},
+};
pub use pallet_evm::{Config, account::CrossAccountId};
use sp_core::H160;
use up_data_structs::CollectionId;
@@ -109,3 +112,111 @@
Err("All fields of cross account is non zeroed".into())
}
}
+
+#[derive(Debug, Default, AbiCoder)]
+pub struct EthCrossAccount {
+ pub(crate) eth: address,
+ pub(crate) sub: uint256,
+}
+
+impl EthCrossAccount {
+ pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
+ where
+ T: pallet_evm::account::Config,
+ T::AccountId: AsRef<[u8; 32]>,
+ {
+ if cross_account_id.is_canonical_substrate() {
+ Self {
+ eth: Default::default(),
+ sub: convert_cross_account_to_uint256::<T>(cross_account_id),
+ }
+ } else {
+ Self {
+ eth: *cross_account_id.as_eth(),
+ sub: Default::default(),
+ }
+ }
+ }
+
+ pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
+ where
+ T: pallet_evm::account::Config,
+ T::AccountId: From<[u8; 32]>,
+ {
+ if self.eth == Default::default() && self.sub == Default::default() {
+ Err("All fields of cross account is zeroed".into())
+ } else if self.eth == Default::default() {
+ Ok(convert_uint256_to_cross_account::<T>(self.sub))
+ } else if self.sub == Default::default() {
+ Ok(T::CrossAccountId::from_eth(self.eth))
+ } else {
+ Err("All fields of cross account is non zeroed".into())
+ }
+ }
+}
+
+impl ::evm_coder::solidity::sealed::CanBePlacedInVec for EthCrossAccount {}
+impl ::evm_coder::solidity::SolidityTupleType for EthCrossAccount {
+ fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {
+ let mut collected =
+ Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityTupleType>::len());
+ {
+ let mut out = String::new();
+ <address as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)
+ .expect("no fmt error");
+ collected.push(out);
+ }
+ {
+ let mut out = String::new();
+ <uint256 as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)
+ .expect("no fmt error");
+ collected.push(out);
+ }
+ collected
+ }
+
+ fn len() -> usize {
+ 2
+ }
+}
+impl ::evm_coder::solidity::SolidityTypeName for EthCrossAccount {
+ fn solidity_name(
+ writer: &mut impl ::core::fmt::Write,
+ tc: &::evm_coder::solidity::TypeCollector,
+ ) -> ::core::fmt::Result {
+ write!(writer, "{}", tc.collect_struct::<Self>())
+ }
+
+ fn is_simple() -> bool {
+ false
+ }
+
+ fn solidity_default(
+ writer: &mut impl ::core::fmt::Write,
+ tc: &::evm_coder::solidity::TypeCollector,
+ ) -> ::core::fmt::Result {
+ write!(writer, "{}(", tc.collect_struct::<Self>())?;
+ address::solidity_default(writer, tc)?;
+ write!(writer, ",")?;
+ uint256::solidity_default(writer, tc)?;
+ write!(writer, ")")
+ }
+}
+
+impl ::evm_coder::solidity::StructCollect for EthCrossAccount {
+ fn name() -> String {
+ "EthCrossAccount".into()
+ }
+
+ fn declaration() -> String {
+ use std::fmt::Write;
+
+ let mut str = String::new();
+ writeln!(str, "/// @dev Cross account struct").unwrap();
+ writeln!(str, "struct {} {{", Self::name()).unwrap();
+ writeln!(str, "\taddress eth;").unwrap();
+ writeln!(str, "\tuint256 sub;").unwrap();
+ writeln!(str, "}}").unwrap();
+ str
+ }
+}
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -24,12 +24,15 @@
weight,
};
use up_data_structs::CollectionMode;
-use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
+use pallet_common::{
+ CollectionHandle,
+ erc::{CommonEvmHandler, PrecompileResult, CollectionCall},
+ eth::EthCrossAccount,
+};
use sp_std::vec::Vec;
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
-use pallet_common::{CollectionHandle, erc::CollectionCall};
use sp_core::Get;
use crate::{
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -36,8 +36,9 @@
use pallet_evm_coder_substrate::dispatch_to_evm;
use sp_std::vec::Vec;
use pallet_common::{
+ CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
- CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
+ eth::EthCrossAccount,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -33,6 +33,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
+ eth::EthCrossAccount,
CommonCollectionOperations,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};