difftreelog
misc: change uint256 to U256
in: master
10 files changed
crates/evm-coder/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -132,7 +132,6 @@
use primitive_types::{U256, H160, H256};
pub type address = H160;
- pub type uint256 = U256;
pub type bytes4 = [u8; 4];
pub type topic = H256;
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -18,12 +18,9 @@
use alloc::format;
use sp_std::{vec, vec::Vec};
-use evm_coder::{
- AbiCoder,
- types::{uint256, address},
-};
+use evm_coder::{AbiCoder, types::address};
pub use pallet_evm::{Config, account::CrossAccountId};
-use sp_core::H160;
+use sp_core::{H160, U256};
use up_data_structs::CollectionId;
// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 1
@@ -55,8 +52,8 @@
address[0..16] == ETH_COLLECTION_PREFIX
}
-/// Convert `uint256` to `CrossAccountId`.
-pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
+/// Convert `U256` to `CrossAccountId`.
+pub fn convert_uint256_to_cross_account<T: Config>(from: U256) -> T::CrossAccountId
where
T::AccountId: From<[u8; 32]>,
{
@@ -70,7 +67,7 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CrossAddress {
pub(crate) eth: address,
- pub(crate) sub: uint256,
+ pub(crate) sub: U256,
}
impl CrossAddress {
@@ -97,7 +94,7 @@
{
Self {
eth: Default::default(),
- sub: uint256::from_big_endian(account_id.as_ref()),
+ sub: U256::from_big_endian(account_id.as_ref()),
}
}
/// Converts [`CrossAddress`] to `CrossAccountId`.
@@ -187,7 +184,7 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionLimit {
field: CollectionLimitField,
- value: Option<uint256>,
+ value: Option<U256>,
}
impl CollectionLimit {
@@ -393,12 +390,12 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionNesting {
token_owner: bool,
- ids: Vec<uint256>,
+ ids: Vec<U256>,
}
impl CollectionNesting {
/// Create [`CollectionNesting`].
- pub fn new(token_owner: bool, ids: Vec<uint256>) -> Self {
+ pub fn new(token_owner: bool, ids: Vec<U256>) -> Self {
Self { token_owner, ids }
}
}
pallets/evm-contract-helpers/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//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22 abi::{AbiWriter, AbiType},23 execution::Result,24 generate_stubgen, solidity_interface,25 types::*,26 ToLog,27};28use pallet_common::eth;29use pallet_evm::{30 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,31 account::CrossAccountId,32};33use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};34use pallet_evm_transaction_payment::CallContext;35use sp_core::{H160, U256};36use up_data_structs::SponsorshipState;37use crate::{38 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,39 SponsoringRateLimit, SponsoringModeT, Sponsoring,40};41use frame_support::traits::Get;42use up_sponsorship::SponsorshipHandler;43use sp_std::vec::Vec;4445/// Pallet events.46#[derive(ToLog)]47pub enum ContractHelpersEvents {48 /// Contract sponsor was set.49 ContractSponsorSet {50 /// Contract address of the affected collection.51 #[indexed]52 contract_address: address,53 /// New sponsor address.54 sponsor: address,55 },5657 /// New sponsor was confirm.58 ContractSponsorshipConfirmed {59 /// Contract address of the affected collection.60 #[indexed]61 contract_address: address,62 /// New sponsor address.63 sponsor: address,64 },6566 /// Collection sponsor was removed.67 ContractSponsorRemoved {68 /// Contract address of the affected collection.69 #[indexed]70 contract_address: address,71 },72}7374/// See [`ContractHelpersCall`]75pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);76impl<T: Config> WithRecorder<T> for ContractHelpers<T> {77 fn recorder(&self) -> &SubstrateRecorder<T> {78 &self.079 }8081 fn into_recorder(self) -> SubstrateRecorder<T> {82 self.083 }84}8586/// @title Magic contract, which allows users to reconfigure other contracts87#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]88impl<T: Config> ContractHelpers<T>89where90 T::AccountId: AsRef<[u8; 32]>,91{92 /// Get user, which deployed specified contract93 /// @dev May return zero address in case if contract is deployed94 /// using uniquenetwork evm-migration pallet, or using other terms not95 /// intended by pallet-evm96 /// @dev Returns zero address if contract does not exists97 /// @param contractAddress Contract to get owner of98 /// @return address Owner of contract99 fn contract_owner(&self, contract_address: address) -> Result<address> {100 Ok(<Owner<T>>::get(contract_address))101 }102103 /// Set sponsor.104 /// @param contractAddress Contract for which a sponsor is being established.105 /// @param sponsor User address who set as pending sponsor.106 fn set_sponsor(107 &mut self,108 caller: caller,109 contract_address: address,110 sponsor: address,111 ) -> Result<()> {112 self.recorder().consume_sload()?;113 self.recorder().consume_sstore()?;114115 Pallet::<T>::set_sponsor(116 &T::CrossAccountId::from_eth(caller),117 contract_address,118 &T::CrossAccountId::from_eth(sponsor),119 )120 .map_err(dispatch_to_evm::<T>)?;121122 Ok(())123 }124125 /// Set contract as self sponsored.126 ///127 /// @param contractAddress Contract for which a self sponsoring is being enabled.128 fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<()> {129 self.recorder().consume_sload()?;130 self.recorder().consume_sstore()?;131132 let caller = T::CrossAccountId::from_eth(caller);133134 Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())135 .map_err(dispatch_to_evm::<T>)?;136137 Pallet::<T>::force_set_sponsor(138 contract_address,139 &T::CrossAccountId::from_eth(contract_address),140 )141 .map_err(dispatch_to_evm::<T>)?;142143 Ok(())144 }145146 /// Remove sponsor.147 ///148 /// @param contractAddress Contract for which a sponsorship is being removed.149 fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<()> {150 self.recorder().consume_sload()?;151 self.recorder().consume_sstore()?;152153 Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)154 .map_err(dispatch_to_evm::<T>)?;155156 Ok(())157 }158159 /// Confirm sponsorship.160 ///161 /// @dev Caller must be same that set via [`setSponsor`].162 ///163 /// @param contractAddress Сontract for which need to confirm sponsorship.164 fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<()> {165 self.recorder().consume_sload()?;166 self.recorder().consume_sstore()?;167168 Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)169 .map_err(dispatch_to_evm::<T>)?;170171 Ok(())172 }173174 /// Get current sponsor.175 ///176 /// @param contractAddress The contract for which a sponsor is requested.177 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.178 fn sponsor(&self, contract_address: address) -> Result<Option<eth::CrossAddress>> {179 Ok(match Pallet::<T>::get_sponsor(contract_address) {180 Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::<T>(value)),181 None => None,182 })183 }184185 /// Check tat contract has confirmed sponsor.186 ///187 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.188 /// @return **true** if contract has confirmed sponsor.189 fn has_sponsor(&self, contract_address: address) -> Result<bool> {190 Ok(Pallet::<T>::get_sponsor(contract_address).is_some())191 }192193 /// Check tat contract has pending sponsor.194 ///195 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.196 /// @return **true** if contract has pending sponsor.197 fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {198 Ok(match Sponsoring::<T>::get(contract_address) {199 SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,200 SponsorshipState::Unconfirmed(_) => true,201 })202 }203204 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {205 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)206 }207208 fn set_sponsoring_mode(209 &mut self,210 caller: caller,211 contract_address: address,212 mode: SponsoringModeT,213 ) -> Result<()> {214 self.recorder().consume_sload()?;215 self.recorder().consume_sstore()?;216217 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;218 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);219220 Ok(())221 }222223 /// Get current contract sponsoring rate limit224 /// @param contractAddress Contract to get sponsoring rate limit of225 /// @return uint32 Amount of blocks between two sponsored transactions226 fn sponsoring_rate_limit(&self, contract_address: address) -> Result<u32> {227 self.recorder().consume_sload()?;228229 Ok(<SponsoringRateLimit<T>>::get(contract_address)230 .try_into()231 .map_err(|_| "rate limit > u32::MAX")?)232 }233234 /// Set contract sponsoring rate limit235 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should236 /// pass between two sponsored transactions237 /// @param contractAddress Contract to change sponsoring rate limit of238 /// @param rateLimit Target rate limit239 /// @dev Only contract owner can change this setting240 fn set_sponsoring_rate_limit(241 &mut self,242 caller: caller,243 contract_address: address,244 rate_limit: u32,245 ) -> Result<()> {246 self.recorder().consume_sload()?;247 self.recorder().consume_sstore()?;248249 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;250 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());251 Ok(())252 }253254 /// Set contract sponsoring fee limit255 /// @dev Sponsoring fee limit - is maximum fee that could be spent by256 /// single transaction257 /// @param contractAddress Contract to change sponsoring fee limit of258 /// @param feeLimit Fee limit259 /// @dev Only contract owner can change this setting260 fn set_sponsoring_fee_limit(261 &mut self,262 caller: caller,263 contract_address: address,264 fee_limit: uint256,265 ) -> Result<()> {266 self.recorder().consume_sload()?;267 self.recorder().consume_sstore()?;268269 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;270 <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())271 .map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 /// Get current contract sponsoring fee limit276 /// @param contractAddress Contract to get sponsoring fee limit of277 /// @return uint256 Maximum amount of fee that could be spent by single278 /// transaction279 fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {280 self.recorder().consume_sload()?;281282 Ok(get_sponsoring_fee_limit::<T>(contract_address))283 }284285 /// Is specified user present in contract allow list286 /// @dev Contract owner always implicitly included287 /// @param contractAddress Contract to check allowlist of288 /// @param user User to check289 /// @return bool Is specified users exists in contract allowlist290 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {291 self.0.consume_sload()?;292 Ok(<Pallet<T>>::allowed(contract_address, user))293 }294295 /// Toggle user presence in contract allowlist296 /// @param contractAddress Contract to change allowlist of297 /// @param user Which user presence should be toggled298 /// @param isAllowed `true` if user should be allowed to be sponsored299 /// or call this contract, `false` otherwise300 /// @dev Only contract owner can change this setting301 fn toggle_allowed(302 &mut self,303 caller: caller,304 contract_address: address,305 user: address,306 is_allowed: bool,307 ) -> Result<()> {308 self.recorder().consume_sload()?;309 self.recorder().consume_sstore()?;310311 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;312 <Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);313314 Ok(())315 }316317 /// Is this contract has allowlist access enabled318 /// @dev Allowlist always can have users, and it is used for two purposes:319 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist320 /// in case of allowlist access enabled, only users from allowlist may call this contract321 /// @param contractAddress Contract to get allowlist access of322 /// @return bool Is specified contract has allowlist access enabled323 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {324 Ok(<AllowlistEnabled<T>>::get(contract_address))325 }326327 /// Toggle contract allowlist access328 /// @param contractAddress Contract to change allowlist access of329 /// @param enabled Should allowlist access to be enabled?330 fn toggle_allowlist(331 &mut self,332 caller: caller,333 contract_address: address,334 enabled: bool,335 ) -> Result<()> {336 self.recorder().consume_sload()?;337 self.recorder().consume_sstore()?;338339 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;340 <Pallet<T>>::toggle_allowlist(contract_address, enabled);341 Ok(())342 }343}344345/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]346pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);347impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>348where349 T::AccountId: AsRef<[u8; 32]>,350{351 fn is_reserved(contract: &sp_core::H160) -> bool {352 contract == &T::ContractAddress::get()353 }354355 fn is_used(contract: &sp_core::H160) -> bool {356 contract == &T::ContractAddress::get()357 }358359 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {360 // TODO: Extract to another OnMethodCall handler361 if <AllowlistEnabled<T>>::get(handle.code_address())362 && !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)363 {364 return Some(Err(PrecompileFailure::Revert {365 exit_status: ExitRevert::Reverted,366 output: {367 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));368 writer.string("Target contract is allowlisted");369 writer.finish()370 },371 }));372 }373374 if handle.code_address() != T::ContractAddress::get() {375 return None;376 }377378 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));379 pallet_evm_coder_substrate::call(handle, helpers)380 }381382 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {383 (contract == &T::ContractAddress::get())384 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())385 }386}387388/// Hooks into contract creation, storing owner of newly deployed contract389pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);390impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {391 fn on_create(owner: H160, contract: H160) {392 <Owner<T>>::insert(contract, owner);393 }394}395396/// Bridge to pallet-sponsoring397pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);398impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>399 for HelpersContractSponsoring<T>400{401 fn get_sponsor(402 who: &T::CrossAccountId,403 call_context: &CallContext,404 ) -> Option<T::CrossAccountId> {405 let contract_address = call_context.contract_address;406 let mode = <Pallet<T>>::sponsoring_mode(contract_address);407 if mode == SponsoringModeT::Disabled {408 return None;409 }410411 let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {412 Some(sponsor) => sponsor,413 None => return None,414 };415416 if mode == SponsoringModeT::Allowlisted417 && !<Pallet<T>>::allowed(contract_address, *who.as_eth())418 {419 return None;420 }421 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;422423 if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {424 let limit = <SponsoringRateLimit<T>>::get(contract_address);425426 let timeout = last_tx_block + limit;427 if block_number < timeout {428 return None;429 }430 }431432 let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);433434 if call_context.max_fee > sponsored_fee_limit {435 return None;436 }437438 <SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);439440 Some(sponsor)441 }442}443444fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {445 <SponsoringFeeLimit<T>>::get(contract_address)446 .get(&0xffffffff)447 .cloned()448 .unwrap_or(U256::MAX)449}450451generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);452generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);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//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22 abi::{AbiWriter, AbiType},23 execution::Result,24 generate_stubgen, solidity_interface,25 types::*,26 ToLog,27};28use pallet_common::eth;29use pallet_evm::{30 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,31 account::CrossAccountId,32};33use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};34use pallet_evm_transaction_payment::CallContext;35use sp_core::{H160, U256};36use up_data_structs::SponsorshipState;37use crate::{38 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,39 SponsoringRateLimit, SponsoringModeT, Sponsoring,40};41use frame_support::traits::Get;42use up_sponsorship::SponsorshipHandler;43use sp_std::vec::Vec;4445/// Pallet events.46#[derive(ToLog)]47pub enum ContractHelpersEvents {48 /// Contract sponsor was set.49 ContractSponsorSet {50 /// Contract address of the affected collection.51 #[indexed]52 contract_address: address,53 /// New sponsor address.54 sponsor: address,55 },5657 /// New sponsor was confirm.58 ContractSponsorshipConfirmed {59 /// Contract address of the affected collection.60 #[indexed]61 contract_address: address,62 /// New sponsor address.63 sponsor: address,64 },6566 /// Collection sponsor was removed.67 ContractSponsorRemoved {68 /// Contract address of the affected collection.69 #[indexed]70 contract_address: address,71 },72}7374/// See [`ContractHelpersCall`]75pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);76impl<T: Config> WithRecorder<T> for ContractHelpers<T> {77 fn recorder(&self) -> &SubstrateRecorder<T> {78 &self.079 }8081 fn into_recorder(self) -> SubstrateRecorder<T> {82 self.083 }84}8586/// @title Magic contract, which allows users to reconfigure other contracts87#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]88impl<T: Config> ContractHelpers<T>89where90 T::AccountId: AsRef<[u8; 32]>,91{92 /// Get user, which deployed specified contract93 /// @dev May return zero address in case if contract is deployed94 /// using uniquenetwork evm-migration pallet, or using other terms not95 /// intended by pallet-evm96 /// @dev Returns zero address if contract does not exists97 /// @param contractAddress Contract to get owner of98 /// @return address Owner of contract99 fn contract_owner(&self, contract_address: address) -> Result<address> {100 Ok(<Owner<T>>::get(contract_address))101 }102103 /// Set sponsor.104 /// @param contractAddress Contract for which a sponsor is being established.105 /// @param sponsor User address who set as pending sponsor.106 fn set_sponsor(107 &mut self,108 caller: caller,109 contract_address: address,110 sponsor: address,111 ) -> Result<()> {112 self.recorder().consume_sload()?;113 self.recorder().consume_sstore()?;114115 Pallet::<T>::set_sponsor(116 &T::CrossAccountId::from_eth(caller),117 contract_address,118 &T::CrossAccountId::from_eth(sponsor),119 )120 .map_err(dispatch_to_evm::<T>)?;121122 Ok(())123 }124125 /// Set contract as self sponsored.126 ///127 /// @param contractAddress Contract for which a self sponsoring is being enabled.128 fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<()> {129 self.recorder().consume_sload()?;130 self.recorder().consume_sstore()?;131132 let caller = T::CrossAccountId::from_eth(caller);133134 Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())135 .map_err(dispatch_to_evm::<T>)?;136137 Pallet::<T>::force_set_sponsor(138 contract_address,139 &T::CrossAccountId::from_eth(contract_address),140 )141 .map_err(dispatch_to_evm::<T>)?;142143 Ok(())144 }145146 /// Remove sponsor.147 ///148 /// @param contractAddress Contract for which a sponsorship is being removed.149 fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<()> {150 self.recorder().consume_sload()?;151 self.recorder().consume_sstore()?;152153 Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)154 .map_err(dispatch_to_evm::<T>)?;155156 Ok(())157 }158159 /// Confirm sponsorship.160 ///161 /// @dev Caller must be same that set via [`setSponsor`].162 ///163 /// @param contractAddress Сontract for which need to confirm sponsorship.164 fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<()> {165 self.recorder().consume_sload()?;166 self.recorder().consume_sstore()?;167168 Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)169 .map_err(dispatch_to_evm::<T>)?;170171 Ok(())172 }173174 /// Get current sponsor.175 ///176 /// @param contractAddress The contract for which a sponsor is requested.177 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.178 fn sponsor(&self, contract_address: address) -> Result<Option<eth::CrossAddress>> {179 Ok(match Pallet::<T>::get_sponsor(contract_address) {180 Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::<T>(value)),181 None => None,182 })183 }184185 /// Check tat contract has confirmed sponsor.186 ///187 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.188 /// @return **true** if contract has confirmed sponsor.189 fn has_sponsor(&self, contract_address: address) -> Result<bool> {190 Ok(Pallet::<T>::get_sponsor(contract_address).is_some())191 }192193 /// Check tat contract has pending sponsor.194 ///195 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.196 /// @return **true** if contract has pending sponsor.197 fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {198 Ok(match Sponsoring::<T>::get(contract_address) {199 SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,200 SponsorshipState::Unconfirmed(_) => true,201 })202 }203204 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {205 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)206 }207208 fn set_sponsoring_mode(209 &mut self,210 caller: caller,211 contract_address: address,212 mode: SponsoringModeT,213 ) -> Result<()> {214 self.recorder().consume_sload()?;215 self.recorder().consume_sstore()?;216217 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;218 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);219220 Ok(())221 }222223 /// Get current contract sponsoring rate limit224 /// @param contractAddress Contract to get sponsoring rate limit of225 /// @return uint32 Amount of blocks between two sponsored transactions226 fn sponsoring_rate_limit(&self, contract_address: address) -> Result<u32> {227 self.recorder().consume_sload()?;228229 Ok(<SponsoringRateLimit<T>>::get(contract_address)230 .try_into()231 .map_err(|_| "rate limit > u32::MAX")?)232 }233234 /// Set contract sponsoring rate limit235 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should236 /// pass between two sponsored transactions237 /// @param contractAddress Contract to change sponsoring rate limit of238 /// @param rateLimit Target rate limit239 /// @dev Only contract owner can change this setting240 fn set_sponsoring_rate_limit(241 &mut self,242 caller: caller,243 contract_address: address,244 rate_limit: u32,245 ) -> Result<()> {246 self.recorder().consume_sload()?;247 self.recorder().consume_sstore()?;248249 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;250 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());251 Ok(())252 }253254 /// Set contract sponsoring fee limit255 /// @dev Sponsoring fee limit - is maximum fee that could be spent by256 /// single transaction257 /// @param contractAddress Contract to change sponsoring fee limit of258 /// @param feeLimit Fee limit259 /// @dev Only contract owner can change this setting260 fn set_sponsoring_fee_limit(261 &mut self,262 caller: caller,263 contract_address: address,264 fee_limit: U256,265 ) -> Result<()> {266 self.recorder().consume_sload()?;267 self.recorder().consume_sstore()?;268269 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;270 <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())271 .map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 /// Get current contract sponsoring fee limit276 /// @param contractAddress Contract to get sponsoring fee limit of277 /// @return uint256 Maximum amount of fee that could be spent by single278 /// transaction279 fn sponsoring_fee_limit(&self, contract_address: address) -> Result<U256> {280 self.recorder().consume_sload()?;281282 Ok(get_sponsoring_fee_limit::<T>(contract_address))283 }284285 /// Is specified user present in contract allow list286 /// @dev Contract owner always implicitly included287 /// @param contractAddress Contract to check allowlist of288 /// @param user User to check289 /// @return bool Is specified users exists in contract allowlist290 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {291 self.0.consume_sload()?;292 Ok(<Pallet<T>>::allowed(contract_address, user))293 }294295 /// Toggle user presence in contract allowlist296 /// @param contractAddress Contract to change allowlist of297 /// @param user Which user presence should be toggled298 /// @param isAllowed `true` if user should be allowed to be sponsored299 /// or call this contract, `false` otherwise300 /// @dev Only contract owner can change this setting301 fn toggle_allowed(302 &mut self,303 caller: caller,304 contract_address: address,305 user: address,306 is_allowed: bool,307 ) -> Result<()> {308 self.recorder().consume_sload()?;309 self.recorder().consume_sstore()?;310311 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;312 <Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);313314 Ok(())315 }316317 /// Is this contract has allowlist access enabled318 /// @dev Allowlist always can have users, and it is used for two purposes:319 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist320 /// in case of allowlist access enabled, only users from allowlist may call this contract321 /// @param contractAddress Contract to get allowlist access of322 /// @return bool Is specified contract has allowlist access enabled323 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {324 Ok(<AllowlistEnabled<T>>::get(contract_address))325 }326327 /// Toggle contract allowlist access328 /// @param contractAddress Contract to change allowlist access of329 /// @param enabled Should allowlist access to be enabled?330 fn toggle_allowlist(331 &mut self,332 caller: caller,333 contract_address: address,334 enabled: bool,335 ) -> Result<()> {336 self.recorder().consume_sload()?;337 self.recorder().consume_sstore()?;338339 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;340 <Pallet<T>>::toggle_allowlist(contract_address, enabled);341 Ok(())342 }343}344345/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]346pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);347impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>348where349 T::AccountId: AsRef<[u8; 32]>,350{351 fn is_reserved(contract: &sp_core::H160) -> bool {352 contract == &T::ContractAddress::get()353 }354355 fn is_used(contract: &sp_core::H160) -> bool {356 contract == &T::ContractAddress::get()357 }358359 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {360 // TODO: Extract to another OnMethodCall handler361 if <AllowlistEnabled<T>>::get(handle.code_address())362 && !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)363 {364 return Some(Err(PrecompileFailure::Revert {365 exit_status: ExitRevert::Reverted,366 output: {367 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));368 writer.string("Target contract is allowlisted");369 writer.finish()370 },371 }));372 }373374 if handle.code_address() != T::ContractAddress::get() {375 return None;376 }377378 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));379 pallet_evm_coder_substrate::call(handle, helpers)380 }381382 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {383 (contract == &T::ContractAddress::get())384 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())385 }386}387388/// Hooks into contract creation, storing owner of newly deployed contract389pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);390impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {391 fn on_create(owner: H160, contract: H160) {392 <Owner<T>>::insert(contract, owner);393 }394}395396/// Bridge to pallet-sponsoring397pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);398impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>399 for HelpersContractSponsoring<T>400{401 fn get_sponsor(402 who: &T::CrossAccountId,403 call_context: &CallContext,404 ) -> Option<T::CrossAccountId> {405 let contract_address = call_context.contract_address;406 let mode = <Pallet<T>>::sponsoring_mode(contract_address);407 if mode == SponsoringModeT::Disabled {408 return None;409 }410411 let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {412 Some(sponsor) => sponsor,413 None => return None,414 };415416 if mode == SponsoringModeT::Allowlisted417 && !<Pallet<T>>::allowed(contract_address, *who.as_eth())418 {419 return None;420 }421 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;422423 if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {424 let limit = <SponsoringRateLimit<T>>::get(contract_address);425426 let timeout = last_tx_block + limit;427 if block_number < timeout {428 return None;429 }430 }431432 let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);433434 if call_context.max_fee > sponsored_fee_limit {435 return None;436 }437438 <SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);439440 Some(sponsor)441 }442}443444fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> U256 {445 <SponsoringFeeLimit<T>>::get(contract_address)446 .get(&0xffffffff)447 .cloned()448 .unwrap_or(U256::MAX)449}450451generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);452generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -32,7 +32,7 @@
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 sp_core::Get;
+use sp_core::{U256, Get};
use crate::{
Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,
@@ -46,14 +46,14 @@
from: address,
#[indexed]
to: address,
- value: uint256,
+ value: U256,
},
Approval {
#[indexed]
owner: address,
#[indexed]
spender: address,
- value: uint256,
+ value: U256,
},
}
@@ -67,7 +67,7 @@
fn symbol(&self) -> Result<string> {
Ok(string::from_utf8_lossy(&self.token_prefix).into())
}
- fn total_supply(&self) -> Result<uint256> {
+ fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<TotalSupply<T>>::get(self.id).into())
}
@@ -79,14 +79,14 @@
unreachable!()
})
}
- fn balance_of(&self, owner: address) -> Result<uint256> {
+ fn balance_of(&self, owner: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let balance = <Balance<T>>::get((self.id, owner));
Ok(balance.into())
}
#[weight(<SelfWeightOf<T>>::transfer())]
- fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+ fn transfer(&mut self, caller: caller, to: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -104,7 +104,7 @@
caller: caller,
from: address,
to: address,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
@@ -119,7 +119,7 @@
Ok(true)
}
#[weight(<SelfWeightOf<T>>::approve())]
- fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {
+ fn approve(&mut self, caller: caller, spender: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let spender = T::CrossAccountId::from_eth(spender);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -128,7 +128,7 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
- fn allowance(&self, owner: address, spender: address) -> Result<uint256> {
+ fn allowance(&self, owner: address, spender: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let spender = T::CrossAccountId::from_eth(spender);
@@ -148,7 +148,7 @@
/// @param to account that will receive minted tokens
/// @param amount amount of tokens to mint
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+ fn mint(&mut self, caller: caller, to: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -178,7 +178,7 @@
&mut self,
caller: caller,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -196,7 +196,7 @@
&mut self,
caller: caller,
spender: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let spender = spender.into_sub_cross_account::<T>()?;
@@ -214,7 +214,7 @@
/// @param amount The amount that will be burnt.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::burn_from())]
- fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
+ fn burn_from(&mut self, caller: caller, from: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -237,7 +237,7 @@
&mut self,
caller: caller,
from: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -254,7 +254,7 @@
/// Mint tokens for multiple accounts.
/// @param amounts array of pairs of account address and amount
#[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]
- fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {
+ fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, U256)>) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let budget = self
.recorder
@@ -279,7 +279,7 @@
&mut self,
caller: caller,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -298,7 +298,7 @@
caller: caller,
from: pallet_common::eth::CrossAddress,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -43,7 +43,7 @@
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
-use sp_core::Get;
+use sp_core::{U256, Get};
use crate::{
AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,
@@ -122,7 +122,7 @@
fn set_property(
&mut self,
caller: caller,
- token_id: uint256,
+ token_id: U256,
key: string,
value: bytes,
) -> Result<()> {
@@ -155,7 +155,7 @@
fn set_properties(
&mut self,
caller: caller,
- token_id: uint256,
+ token_id: U256,
properties: Vec<eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -187,7 +187,7 @@
/// @param key Property key.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]
- fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {
+ fn delete_property(&mut self, token_id: U256, caller: caller, key: string) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
@@ -209,7 +209,7 @@
#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]
fn delete_properties(
&mut self,
- token_id: uint256,
+ token_id: U256,
caller: caller,
keys: Vec<string>,
) -> Result<()> {
@@ -239,7 +239,7 @@
/// @param tokenId ID of the token.
/// @param key Property key.
/// @return Property value bytes
- fn property(&self, token_id: uint256, key: string) -> Result<bytes> {
+ fn property(&self, token_id: U256, key: string) -> Result<bytes> {
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
.try_into()
@@ -265,7 +265,7 @@
#[indexed]
to: address,
#[indexed]
- token_id: uint256,
+ token_id: U256,
},
/// @dev This emits when the approved address for an NFT is changed or
/// reaffirmed. The zero address indicates there is no approved address.
@@ -277,7 +277,7 @@
#[indexed]
approved: address,
#[indexed]
- token_id: uint256,
+ token_id: U256,
},
/// @dev This emits when an operator is enabled or disabled for an owner.
/// The operator can manage all NFTs of the owner.
@@ -322,7 +322,7 @@
///
/// @return token's const_metadata
#[solidity(rename_selector = "tokenURI")]
- fn token_uri(&self, token_id: uint256) -> Result<string> {
+ fn token_uri(&self, token_id: U256) -> Result<string> {
let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
match get_token_property(self, token_id_u32, &key::url()).as_deref() {
@@ -368,12 +368,12 @@
/// @param index A counter less than `totalSupply()`
/// @return The token identifier for the `index`th NFT,
/// (sort order not specified)
- fn token_by_index(&self, index: uint256) -> Result<uint256> {
+ fn token_by_index(&self, index: U256) -> Result<U256> {
Ok(index)
}
/// @dev Not implemented
- fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {
+ fn token_of_owner_by_index(&self, _owner: address, _index: U256) -> Result<U256> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -381,7 +381,7 @@
/// @notice Count NFTs tracked by this contract
/// @return A count of valid NFTs tracked by this contract, where each one of
/// them has an assigned and queryable owner not equal to the zero address
- fn total_supply(&self) -> Result<uint256> {
+ fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<Pallet<T>>::total_supply(self).into())
}
@@ -396,7 +396,7 @@
/// function throws for queries about the zero address.
/// @param owner An address for whom to query the balance
/// @return The number of NFTs owned by `owner`, possibly zero
- fn balance_of(&self, owner: address) -> Result<uint256> {
+ fn balance_of(&self, owner: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let balance = <AccountBalance<T>>::get((self.id, owner));
@@ -407,7 +407,7 @@
/// about them do throw.
/// @param tokenId The identifier for an NFT
/// @return The address of the owner of the NFT
- fn owner_of(&self, token_id: uint256) -> Result<address> {
+ fn owner_of(&self, token_id: U256) -> Result<address> {
self.consume_store_reads(1)?;
let token: TokenId = token_id.try_into()?;
Ok(*<TokenData<T>>::get((self.id, token))
@@ -421,19 +421,14 @@
&mut self,
_from: address,
_to: address,
- _token_id: uint256,
+ _token_id: U256,
_data: bytes,
) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
/// @dev Not implemented
- fn safe_transfer_from(
- &mut self,
- _from: address,
- _to: address,
- _token_id: uint256,
- ) -> Result<()> {
+ fn safe_transfer_from(&mut self, _from: address, _to: address, _token_id: U256) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -453,7 +448,7 @@
caller: caller,
from: address,
to: address,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
@@ -475,7 +470,7 @@
/// @param approved The new approved NFT controller
/// @param tokenId The NFT to approve
#[weight(<SelfWeightOf<T>>::approve())]
- fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<()> {
+ fn approve(&mut self, caller: caller, approved: address, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let approved = T::CrossAccountId::from_eth(approved);
let token = token_id.try_into()?;
@@ -505,7 +500,7 @@
}
/// @dev Not implemented
- fn get_approved(&self, _token_id: uint256) -> Result<address> {
+ fn get_approved(&self, _token_id: U256) -> Result<address> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -528,7 +523,7 @@
/// operator of the current owner.
/// @param tokenId The NFT to approve
#[weight(<SelfWeightOf<T>>::burn_item())]
- fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
+ fn burn(&mut self, caller: caller, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token = token_id.try_into()?;
@@ -544,8 +539,8 @@
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {
- let token_id: uint256 = <TokensMinted<T>>::get(self.id)
+ fn mint(&mut self, caller: caller, to: address) -> Result<U256> {
+ let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
.into();
@@ -560,7 +555,7 @@
/// @param tokenId ID of the minted NFT
#[solidity(hide, rename_selector = "mint")]
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {
+ fn mint_check_id(&mut self, caller: caller, to: address, token_id: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token_id: u32 = token_id.try_into()?;
@@ -601,8 +596,8 @@
caller: caller,
to: address,
token_uri: string,
- ) -> Result<uint256> {
- let token_id: uint256 = <TokensMinted<T>>::get(self.id)
+ ) -> Result<U256> {
+ let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
.into();
@@ -622,7 +617,7 @@
&mut self,
caller: caller,
to: address,
- token_id: uint256,
+ token_id: U256,
token_uri: string,
) -> Result<bool> {
let key = key::url();
@@ -730,7 +725,7 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {
+ fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
@@ -741,7 +736,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
+ fn properties(&self, token_id: U256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -772,7 +767,7 @@
&mut self,
caller: caller,
approved: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let approved = approved.into_sub_cross_account::<T>()?;
@@ -789,7 +784,7 @@
/// @param to The new owner
/// @param tokenId The NFT to transfer
#[weight(<SelfWeightOf<T>>::transfer())]
- fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
+ fn transfer(&mut self, caller: caller, to: address, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token = token_id.try_into()?;
@@ -811,7 +806,7 @@
&mut self,
caller: caller,
to: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -836,7 +831,7 @@
caller: caller,
from: eth::CrossAddress,
to: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -858,7 +853,7 @@
/// @param tokenId The NFT to transfer
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::burn_from())]
- fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
+ fn burn_from(&mut self, caller: caller, from: address, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let token = token_id.try_into()?;
@@ -882,7 +877,7 @@
&mut self,
caller: caller,
from: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -897,7 +892,7 @@
}
/// @notice Returns next free NFT ID.
- fn next_token_id(&self) -> Result<uint256> {
+ fn next_token_id(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -912,7 +907,7 @@
/// @param tokenIds IDs of the minted NFTs
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]
- fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {
+ fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<U256>) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let mut expected_index = <TokensMinted<T>>::get(self.id)
@@ -953,7 +948,7 @@
&mut self,
caller: caller,
to: address,
- tokens: Vec<(uint256, string)>,
+ tokens: Vec<(U256, string)>,
) -> Result<bool> {
let key = key::url();
let caller = T::CrossAccountId::from_eth(caller);
@@ -1005,7 +1000,7 @@
caller: caller,
to: eth::CrossAddress,
properties: Vec<eth::Property>,
- ) -> Result<uint256> {
+ ) -> Result<U256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?;
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -39,7 +39,7 @@
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 sp_core::{H160, Get};
+use sp_core::{H160, U256, Get};
use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};
use up_data_structs::{
CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,
@@ -125,7 +125,7 @@
fn set_property(
&mut self,
caller: caller,
- token_id: uint256,
+ token_id: U256,
key: string,
value: bytes,
) -> Result<()> {
@@ -158,7 +158,7 @@
fn set_properties(
&mut self,
caller: caller,
- token_id: uint256,
+ token_id: U256,
properties: Vec<eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -190,7 +190,7 @@
/// @param key Property key.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]
- fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {
+ fn delete_property(&mut self, token_id: U256, caller: caller, key: string) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
@@ -212,7 +212,7 @@
#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]
fn delete_properties(
&mut self,
- token_id: uint256,
+ token_id: U256,
caller: caller,
keys: Vec<string>,
) -> Result<()> {
@@ -242,7 +242,7 @@
/// @param tokenId ID of the token.
/// @param key Property key.
/// @return Property value bytes
- fn property(&self, token_id: uint256, key: string) -> Result<bytes> {
+ fn property(&self, token_id: U256, key: string) -> Result<bytes> {
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
.try_into()
@@ -266,7 +266,7 @@
#[indexed]
to: address,
#[indexed]
- token_id: uint256,
+ token_id: U256,
},
/// @dev Not supported
Approval {
@@ -275,7 +275,7 @@
#[indexed]
approved: address,
#[indexed]
- token_id: uint256,
+ token_id: U256,
},
/// @dev Not supported
#[allow(dead_code)]
@@ -319,7 +319,7 @@
///
/// @return token's const_metadata
#[solidity(rename_selector = "tokenURI")]
- fn token_uri(&self, token_id: uint256) -> Result<string> {
+ fn token_uri(&self, token_id: U256) -> Result<string> {
let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
match get_token_property(self, token_id_u32, &key::url()).as_deref() {
@@ -365,12 +365,12 @@
/// @param index A counter less than `totalSupply()`
/// @return The token identifier for the `index`th NFT,
/// (sort order not specified)
- fn token_by_index(&self, index: uint256) -> Result<uint256> {
+ fn token_by_index(&self, index: U256) -> Result<U256> {
Ok(index)
}
/// Not implemented
- fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {
+ fn token_of_owner_by_index(&self, _owner: address, _index: U256) -> Result<U256> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -378,7 +378,7 @@
/// @notice Count RFTs tracked by this contract
/// @return A count of valid RFTs tracked by this contract, where each one of
/// them has an assigned and queryable owner not equal to the zero address
- fn total_supply(&self) -> Result<uint256> {
+ fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<Pallet<T>>::total_supply(self).into())
}
@@ -393,7 +393,7 @@
/// function throws for queries about the zero address.
/// @param owner An address for whom to query the balance
/// @return The number of RFTs owned by `owner`, possibly zero
- fn balance_of(&self, owner: address) -> Result<uint256> {
+ fn balance_of(&self, owner: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let balance = <AccountBalance<T>>::get((self.id, owner));
@@ -407,7 +407,7 @@
/// the tokens that are partially owned.
/// @param tokenId The identifier for an RFT
/// @return The address of the owner of the RFT
- fn owner_of(&self, token_id: uint256) -> Result<address> {
+ fn owner_of(&self, token_id: U256) -> Result<address> {
self.consume_store_reads(2)?;
let token = token_id.try_into()?;
let owner = <Pallet<T>>::token_owner(self.id, token);
@@ -422,7 +422,7 @@
&mut self,
_from: address,
_to: address,
- _token_id: uint256,
+ _token_id: U256,
_data: bytes,
) -> Result<()> {
// TODO: Not implemetable
@@ -431,12 +431,7 @@
/// @dev Not implemented
#[solidity(rename_selector = "safeTransferFrom")]
- fn safe_transfer_from(
- &mut self,
- _from: address,
- _to: address,
- _token_id: uint256,
- ) -> Result<()> {
+ fn safe_transfer_from(&mut self, _from: address, _to: address, _token_id: U256) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -457,7 +452,7 @@
caller: caller,
from: address,
to: address,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
@@ -477,7 +472,7 @@
}
/// @dev Not implemented
- fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<()> {
+ fn approve(&mut self, _caller: caller, _approved: address, _token_id: U256) -> Result<()> {
Err("not implemented".into())
}
@@ -501,7 +496,7 @@
}
/// @dev Not implemented
- fn get_approved(&self, _token_id: uint256) -> Result<address> {
+ fn get_approved(&self, _token_id: U256) -> Result<address> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -556,7 +551,7 @@
/// operator of the current owner.
/// @param tokenId The RFT to approve
#[weight(<SelfWeightOf<T>>::burn_item_fully())]
- fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
+ fn burn(&mut self, caller: caller, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token = token_id.try_into()?;
@@ -575,8 +570,8 @@
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {
- let token_id: uint256 = <TokensMinted<T>>::get(self.id)
+ fn mint(&mut self, caller: caller, to: address) -> Result<U256> {
+ let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
.into();
@@ -591,7 +586,7 @@
/// @param tokenId ID of the minted RFT
#[solidity(hide, rename_selector = "mint")]
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {
+ fn mint_check_id(&mut self, caller: caller, to: address, token_id: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token_id: u32 = token_id.try_into()?;
@@ -637,8 +632,8 @@
caller: caller,
to: address,
token_uri: string,
- ) -> Result<uint256> {
- let token_id: uint256 = <TokensMinted<T>>::get(self.id)
+ ) -> Result<U256> {
+ let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
.into();
@@ -658,7 +653,7 @@
&mut self,
caller: caller,
to: address,
- token_id: uint256,
+ token_id: U256,
token_uri: string,
) -> Result<bool> {
let key = key::url();
@@ -768,7 +763,7 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {
+ fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
@@ -779,7 +774,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
+ fn properties(&self, token_id: U256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -805,7 +800,7 @@
/// @param to The new owner
/// @param tokenId The RFT to transfer
#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
- fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {
+ fn transfer(&mut self, caller: caller, to: address, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token = token_id.try_into()?;
@@ -832,7 +827,7 @@
&mut self,
caller: caller,
to: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -861,7 +856,7 @@
caller: caller,
from: eth::CrossAddress,
to: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -888,7 +883,7 @@
/// @param tokenId The RFT to transfer
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::burn_from())]
- fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {
+ fn burn_from(&mut self, caller: caller, from: address, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let token = token_id.try_into()?;
@@ -916,7 +911,7 @@
&mut self,
caller: caller,
from: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -934,7 +929,7 @@
}
/// @notice Returns next free RFT ID.
- fn next_token_id(&self) -> Result<uint256> {
+ fn next_token_id(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -949,7 +944,7 @@
/// @param tokenIds IDs of the minted RFTs
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]
- fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {
+ fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<U256>) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let mut expected_index = <TokensMinted<T>>::get(self.id)
@@ -996,7 +991,7 @@
&mut self,
caller: caller,
to: address,
- tokens: Vec<(uint256, string)>,
+ tokens: Vec<(U256, string)>,
) -> Result<bool> {
let key = key::url();
let caller = T::CrossAccountId::from_eth(caller);
@@ -1054,7 +1049,7 @@
caller: caller,
to: eth::CrossAddress,
properties: Vec<eth::Property>,
- ) -> Result<uint256> {
+ ) -> Result<U256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?;
@@ -1093,7 +1088,7 @@
/// Returns EVM address for refungible token
///
/// @param token ID of the token
- fn token_contract_address(&self, token: uint256) -> Result<address> {
+ fn token_contract_address(&self, token: U256) -> Result<address> {
Ok(T::EvmTokenAddressMapping::token_to_address(
self.id,
token.try_into().map_err(|_| "token id overflow")?,
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -37,6 +37,7 @@
use pallet_evm_coder_substrate::{call, dispatch_to_evm, WithRecorder};
use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
use sp_std::vec::Vec;
+use sp_core::U256;
use up_data_structs::TokenId;
use crate::{
@@ -55,7 +56,7 @@
Ok(collection_id_to_address(self.id))
}
- fn parent_token_id(&self) -> Result<uint256> {
+ fn parent_token_id(&self) -> Result<U256> {
Ok(self.1.into())
}
}
@@ -71,7 +72,7 @@
from: address,
#[indexed]
to: address,
- value: uint256,
+ value: U256,
},
/// @dev This event is emitted when the amount of tokens (value) is approved
/// by the owner to be used by the spender.
@@ -80,7 +81,7 @@
owner: address,
#[indexed]
spender: address,
- value: uint256,
+ value: U256,
},
}
@@ -103,7 +104,7 @@
}
/// @dev Total number of tokens in existence
- fn total_supply(&self) -> Result<uint256> {
+ fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<TotalSupply<T>>::get((self.id, self.1)).into())
}
@@ -117,7 +118,7 @@
/// @dev Gets the balance of the specified address.
/// @param owner The address to query the balance of.
/// @return An uint256 representing the amount owned by the passed address.
- fn balance_of(&self, owner: address) -> Result<uint256> {
+ fn balance_of(&self, owner: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let balance = <Balance<T>>::get((self.id, self.1, owner));
@@ -128,7 +129,7 @@
/// @param to The address to transfer to.
/// @param amount The amount to be transferred.
#[weight(<CommonWeights<T>>::transfer())]
- fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+ fn transfer(&mut self, caller: caller, to: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -151,7 +152,7 @@
caller: caller,
from: address,
to: address,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
@@ -174,7 +175,7 @@
/// @param spender The address which will spend the funds.
/// @param amount The amount of tokens to be spent.
#[weight(<SelfWeightOf<T>>::approve())]
- fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {
+ fn approve(&mut self, caller: caller, spender: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let spender = T::CrossAccountId::from_eth(spender);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -188,7 +189,7 @@
/// @param owner address The address which owns the funds.
/// @param spender address The address which will spend the funds.
/// @return A uint256 specifying the amount of tokens still available for the spender.
- fn allowance(&self, owner: address, spender: address) -> Result<uint256> {
+ fn allowance(&self, owner: address, spender: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let spender = T::CrossAccountId::from_eth(spender);
@@ -208,7 +209,7 @@
/// @param amount The amount that will be burnt.
#[weight(<SelfWeightOf<T>>::burn_from())]
#[solidity(hide)]
- fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
+ fn burn_from(&mut self, caller: caller, from: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -230,7 +231,7 @@
&mut self,
caller: caller,
from: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -256,7 +257,7 @@
&mut self,
caller: caller,
spender: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let spender = spender.into_sub_cross_account::<T>()?;
@@ -270,7 +271,7 @@
/// Throws if `msg.sender` doesn't owns all of the tokens.
/// @param amount New total amount of the tokens.
#[weight(<SelfWeightOf<T>>::repartition_item())]
- fn repartition(&mut self, caller: caller, amount: uint256) -> Result<bool> {
+ fn repartition(&mut self, caller: caller, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -286,7 +287,7 @@
&mut self,
caller: caller,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -310,7 +311,7 @@
caller: caller,
from: pallet_common::eth::CrossAddress,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -51,6 +51,12 @@
},
{
"anonymous": false,
+ "inputs": [],
+ "name": "MintingFinished",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -417,6 +423,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "finishMinting",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -504,6 +517,13 @@
},
{
"inputs": [],
+ "name": "mintingFinished",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,6 +51,12 @@
},
{
"anonymous": false,
+ "inputs": [],
+ "name": "MintingFinished",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -399,6 +405,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "finishMinting",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -486,6 +499,13 @@
},
{
"inputs": [],
+ "name": "mintingFinished",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,6 +98,16 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "from", "type": "address" },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "burnFrom",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{
"components": [
{ "internalType": "address", "name": "eth", "type": "address" },