difftreelog
misk: Change bound. Update changelog
in: master
3 files changed
pallets/common/src/eth.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! The module contains a number of functions for converting and checking ethereum identifiers.1819use evm_coder::{types::uint256, execution::Result};20pub use pallet_evm::account::CrossAccountId;21use sp_core::H160;22use up_data_structs::CollectionId;2324use crate::Config;2526// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 127// TODO: Unhardcode prefix28const ETH_COLLECTION_PREFIX: [u8; 16] = [29 0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,30];3132/// Maps the ethereum address of the collection in substrate.33pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {34 if eth[0..16] != ETH_COLLECTION_PREFIX {35 return None;36 }37 let mut id_bytes = [0; 4];38 id_bytes.copy_from_slice(ð[16..20]);39 Some(CollectionId(u32::from_be_bytes(id_bytes)))40}4142/// Maps the substrate collection id in ethereum.43pub fn collection_id_to_address(id: CollectionId) -> H160 {44 let mut out = [0; 20];45 out[0..16].copy_from_slice(Ð_COLLECTION_PREFIX);46 out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));47 H160(out)48}4950/// Check if the ethereum address is a collection.51pub fn is_collection(address: &H160) -> bool {52 address[0..16] == ETH_COLLECTION_PREFIX53}5455/// Convert `CrossAccountId` to `uint256`.56pub fn convert_cross_account_to_eth_uint256<T: Config>(from: &T::CrossAccountId) -> Result<uint256>57where58 T::AccountId: AsRef<[u8]>,59{60 use pallet_evm::account::CrossAccountId;61 let slice = from.as_sub().as_ref();62 uint256::from_big_endian(slice)63}pallets/evm-contract-helpers/CHANGELOG.mddiffbeforeafterboth--- a/pallets/evm-contract-helpers/CHANGELOG.md
+++ b/pallets/evm-contract-helpers/CHANGELOG.md
@@ -9,6 +9,11 @@
- Set arbitrary evm address as contract sponsor.
- Ability to remove current sponsor.
+### Removed
+ - Remove methods
+ + sponsoring_enabled
+ + toggle_sponsoring
+
### Changed
- Change `toggle_sponsoring` to `self_sponsored_enable`.
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -45,7 +45,7 @@
#[solidity_interface(name = "ContractHelpers")]
impl<T: Config> ContractHelpers<T>
where
- T::AccountId: AsRef<[u8]>,
+ T::AccountId: AsRef<[u8; 32]>,
{
/// Get contract ovner
///
@@ -110,7 +110,7 @@
fn get_sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
let sponsor =
Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
- let sponsor_sub = pallet_common::eth::convert_cross_account_to_eth_uint256::<T>(&sponsor)?;
+ let sponsor_sub = pallet_common::eth::convert_cross_account_to_uint256::<T>(&sponsor);
Ok((*sponsor.as_eth(), sponsor_sub))
}
@@ -206,7 +206,7 @@
pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);
impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>
where
- T::AccountId: AsRef<[u8]>,
+ T::AccountId: AsRef<[u8; 32]>,
{
fn is_reserved(contract: &sp_core::H160) -> bool {
contract == &T::ContractAddress::get()