From a7d85fce612dd2bf0f9d77b9e31b2dfff3ad1671 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Wed, 24 Aug 2022 10:47:23 +0000 Subject: [PATCH] misk: Change bound. Update changelog --- --- a/pallets/common/src/eth.rs +++ b/pallets/common/src/eth.rs @@ -53,9 +53,9 @@ } /// Convert `CrossAccountId` to `uint256`. -pub fn convert_cross_account_to_eth_uint256(from: &T::CrossAccountId) -> Result +pub fn convert_cross_account_to_uint256(from: &T::CrossAccountId) -> uint256 where - T::AccountId: AsRef<[u8]>, + T::AccountId: AsRef<[u8; 32]>, { use pallet_evm::account::CrossAccountId; let slice = from.as_sub().as_ref(); --- 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`. --- 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 ContractHelpers 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::::get_sponsor(contract_address).ok_or("Contract has no sponsor")?; - let sponsor_sub = pallet_common::eth::convert_cross_account_to_eth_uint256::(&sponsor)?; + let sponsor_sub = pallet_common::eth::convert_cross_account_to_uint256::(&sponsor); Ok((*sponsor.as_eth(), sponsor_sub)) } @@ -206,7 +206,7 @@ pub struct HelpersOnMethodCall(PhantomData<*const T>); impl OnMethodCall for HelpersOnMethodCall where - T::AccountId: AsRef<[u8]>, + T::AccountId: AsRef<[u8; 32]>, { fn is_reserved(contract: &sp_core::H160) -> bool { contract == &T::ContractAddress::get() -- gitstuff