difftreelog
path: Fix parsing simple values.
in: master
6 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2169,7 +2169,7 @@
[[package]]
name = "evm-coder"
-version = "0.1.1"
+version = "0.1.2"
dependencies = [
"ethereum",
"evm-coder-procedural",
@@ -2178,6 +2178,7 @@
"hex-literal",
"impl-trait-for-tuples",
"primitive-types",
+ "sp-std",
]
[[package]]
crates/evm-coder/CHANGELOG.mddiffbeforeafterboth--- a/crates/evm-coder/CHANGELOG.md
+++ b/crates/evm-coder/CHANGELOG.md
@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file.
+## [0.1.3] - 2022-08-29
+
+### Fixed
+
+ - Parsing simple values.
+
<!-- bureaucrate goes here -->
## [v0.1.2] 2022-08-19
@@ -21,4 +27,4 @@
- build: Upgrade polkadot to v0.9.26 85515e54c4ca1b82a2630034e55dcc804c643bf8
-- build: Upgrade polkadot to v0.9.25 cdfb9bdc7b205ff1b5134f034ef9973d769e5e6b
\ No newline at end of file
+- build: Upgrade polkadot to v0.9.25 cdfb9bdc7b205ff1b5134f034ef9973d769e5e6b
crates/evm-coder/Cargo.tomldiffbeforeafterboth--- a/crates/evm-coder/Cargo.toml
+++ b/crates/evm-coder/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "evm-coder"
-version = "0.1.1"
+version = "0.1.2"
license = "GPLv3"
edition = "2021"
@@ -11,8 +11,9 @@
primitive-types = { version = "0.11.1", default-features = false }
# Evm doesn't have reexports for log and others
ethereum = { version = "0.12.0", default-features = false }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
# Error types for execution
-evm-core = { default-features = false, git = "https://github.com/uniquenetwork/evm", branch = "unique-polkadot-v0.9.27" }
+evm-core = { default-features = false , git = "https://github.com/uniquenetwork/evm", branch = "unique-polkadot-v0.9.27" }
# We have tuple-heavy code in solidity.rs
impl-trait-for-tuples = "0.2.2"
crates/evm-coder/src/abi.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi.rs
+++ b/crates/evm-coder/src/abi.rs
@@ -28,6 +28,7 @@
types::{string, self},
};
use crate::execution::Result;
+use crate::solidity::SolidityTypeName;
const ABI_ALIGNMENT: usize = 32;
@@ -77,8 +78,8 @@
return Err(Error::Error(ExitError::OutOfOffset));
}
let mut block = [0; S];
- // Verify padding is empty
- if !buf[pad_start..pad_size].iter().all(|&v| v == 0) {
+ let is_pad_zeroed = !buf[pad_start..pad_size].iter().all(|&v| v == 0);
+ if is_pad_zeroed {
return Err(Error::Error(ExitError::InvalidRange));
}
block.copy_from_slice(&buf[block_start..block_size]);
@@ -133,7 +134,7 @@
/// Read [`Vec<u8>`] at current position, then advance
pub fn bytes(&mut self) -> Result<Vec<u8>> {
- let mut subresult = self.subresult()?;
+ let mut subresult = self.subresult(None)?;
let length = subresult.uint32()? as usize;
if subresult.buf.len() < subresult.offset + length {
return Err(Error::Error(ExitError::OutOfOffset));
@@ -179,15 +180,26 @@
}
/// Slice recursive buffer, advance one word for buffer offset
- fn subresult(&mut self) -> Result<AbiReader<'i>> {
- let offset = self.uint32()? as usize;
+ /// If `size` is [`None`] then [`Self::offset`] and [`Self::subresult_offset`] evals from [`Self::buf`].
+ fn subresult(&mut self, size: Option<usize>) -> Result<AbiReader<'i>> {
+ let subresult_offset = self.subresult_offset;
+ let offset = if let Some(size) = size {
+ self.offset += size;
+ self.subresult_offset += size;
+ 0
+ } else {
+ self.uint32()? as usize
+ };
+
if offset + self.subresult_offset > self.buf.len() {
return Err(Error::Error(ExitError::InvalidRange));
}
+
+ let new_offset = offset + subresult_offset;
Ok(AbiReader {
buf: self.buf,
- subresult_offset: offset + self.subresult_offset,
- offset: offset + self.subresult_offset,
+ subresult_offset: new_offset,
+ offset: new_offset,
})
}
@@ -355,7 +367,7 @@
Self: AbiRead<R>,
{
fn abi_read(&mut self) -> Result<Vec<R>> {
- let mut sub = self.subresult()?;
+ let mut sub = self.subresult(None)?;
let size = sub.uint32()? as usize;
sub.subresult_offset = sub.offset;
let mut out = Vec::with_capacity(size);
@@ -366,15 +378,33 @@
}
}
+fn aligned_size(size: usize) -> usize {
+ let need_align = (size % ABI_ALIGNMENT) != 0;
+ let aligned_parts = size / ABI_ALIGNMENT;
+ (aligned_parts * ABI_ALIGNMENT) + if need_align { ABI_ALIGNMENT } else { 0 }
+}
+
+#[test]
+fn test_aligned_size() {
+ assert_eq!(aligned_size(20), ABI_ALIGNMENT);
+ assert_eq!(aligned_size(32), ABI_ALIGNMENT);
+ assert_eq!(aligned_size(52), 2 * ABI_ALIGNMENT);
+ assert_eq!(aligned_size(64), 2 * ABI_ALIGNMENT);
+}
+
macro_rules! impl_tuples {
($($ident:ident)+) => {
impl<$($ident),+> sealed::CanBePlacedInVec for ($($ident,)+) {}
impl<$($ident),+> AbiRead<($($ident,)+)> for AbiReader<'_>
where
- $(Self: AbiRead<$ident>),+
+ $(
+ Self: AbiRead<$ident>,
+ )+
+ ($($ident,)+): SolidityTypeName,
{
fn abi_read(&mut self) -> Result<($($ident,)+)> {
- let mut subresult = self.subresult()?;
+ let size = if <($($ident,)+)>::is_simple() { Some(0 $(+aligned_size(sp_std::mem::size_of::<$ident>()))+) } else { None };
+ let mut subresult = self.subresult(size)?;
Ok((
$(<Self as AbiRead<$ident>>::abi_read(&mut subresult)?,)+
))
@@ -535,7 +565,7 @@
assert_eq!(encoded, alternative_encoded);
let mut decoder = AbiReader::new(&encoded);
- assert_eq!(decoder.bool().unwrap(), true);
+ assert!(decoder.bool().unwrap());
assert_eq!(decoder.string().unwrap(), "test");
}
crates/evm-coder/src/solidity.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -192,7 +192,10 @@
write!(writer, "{}", tc.collect_tuple::<Self>())
}
fn is_simple() -> bool {
- false
+ true
+ $(
+ && <$ident>::is_simple()
+ )*
}
#[allow(unused_assignments)]
fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
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 = "ERC20Mintable")]133impl<T: Config> FungibleHandle<T> {134 /// Mint tokens for `to` account.135 /// @param to account that will receive minted tokens136 /// @param amount amount of tokens to mint137 #[weight(<SelfWeightOf<T>>::create_item())]138 fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {139 let caller = T::CrossAccountId::from_eth(caller);140 let to = T::CrossAccountId::from_eth(to);141 let amount = amount.try_into().map_err(|_| "amount overflow")?;142 let budget = self143 .recorder144 .weight_calls_budget(<StructureWeight<T>>::find_parent());145 <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)146 .map_err(dispatch_to_evm::<T>)?;147 Ok(true)148 }149}150151#[solidity_interface(name = "ERC20UniqueExtensions")]152impl<T: Config> FungibleHandle<T> {153 /// Burn tokens from account154 /// @dev Function that burns an `amount` of the tokens of a given account,155 /// deducting from the sender's allowance for said account.156 /// @param from The account whose tokens will be burnt.157 /// @param amount The amount that will be burnt.158 #[weight(<SelfWeightOf<T>>::burn_from())]159 fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {160 let caller = T::CrossAccountId::from_eth(caller);161 let from = T::CrossAccountId::from_eth(from);162 let amount = amount.try_into().map_err(|_| "amount overflow")?;163 let budget = self164 .recorder165 .weight_calls_budget(<StructureWeight<T>>::find_parent());166167 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)168 .map_err(dispatch_to_evm::<T>)?;169 Ok(true)170 }171172 /// Mint tokens for multiple accounts.173 /// @param amounts array of pairs of account address and amount174 #[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]175 fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {176 let caller = T::CrossAccountId::from_eth(caller);177 let budget = self178 .recorder179 .weight_calls_budget(<StructureWeight<T>>::find_parent());180 let amounts = amounts181 .into_iter()182 .map(|(to, amount)| Ok((T::CrossAccountId::from_eth(to), amount.try_into().map_err(|_| "amount overflow")?)))183 .collect::<Result<_>>()?;184185 <Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)186 .map_err(dispatch_to_evm::<T>)?;187 Ok(true)188 }189}190191#[solidity_interface(192 name = UniqueFungible,193 is(194 ERC20,195 ERC20Mintable,196 ERC20UniqueExtensions,197 Collection(common_mut, CollectionHandle<T>),198 )199)]200impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}201202generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);203generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);204205impl<T: Config> CommonEvmHandler for FungibleHandle<T>206where207 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,208{209 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");210211 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {212 call::<T, UniqueFungibleCall<T>, _, _>(handle, self)213 }214}