git.delta.rocks / unique-network / refs/commits / d1896d4a495f

difftreelog

refac code

PraetorP2022-12-12parent: #78c3cae.patch.diff
in: master

3 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
295 None => return Ok(Default::default()),295 None => return Ok(Default::default()),
296 };296 };
297297
298 Ok(EthCrossAccount::from_substrate::<T>(&sponsor))298 Ok(EthCrossAccount::from_sub::<T>(&sponsor))
299 }299 }
300300
301 /// Get current collection limits.301 /// Get current collection limits.
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
140 }140 }
141 }141 }
142 /// Creates `EthCrossAccount` from substrate account142 /// Creates `EthCrossAccount` from substrate account
143 pub fn from_substrate<T>(account_id: &T::AccountId) -> Self143 pub fn from_sub<T>(account_id: &T::AccountId) -> Self
144 where144 where
145 T: pallet_evm::Config,145 T: pallet_evm::Config,
146 T::AccountId: AsRef<[u8; 32]>,146 T::AccountId: AsRef<[u8; 32]>,
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
25 types::*,25 types::*,
26 ToLog,26 ToLog,
27};27};
28use pallet_common::eth::EthCrossAccount;
28use pallet_evm::{29use pallet_evm::{
29 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,30 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
30 account::CrossAccountId,31 account::CrossAccountId,
174 ///175 ///
175 /// @param contractAddress The contract for which a sponsor is requested.176 /// @param contractAddress The contract for which a sponsor is requested.
176 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.177 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
177 fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {178 fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
178 let sponsor =179 Ok(EthCrossAccount::from_sub_cross_account::<T>(
179 Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;180 &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
180 Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(181 ))
181 &sponsor,
182 ))
183 }182 }
184183
185 /// Check tat contract has confirmed sponsor.184 /// Check tat contract has confirmed sponsor.