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

difftreelog

Support sponsoring from frontier

Trubnikov Sergey2022-03-10parent: #c06ce54.patch.diff
in: master

2 files changed

modifiedpallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth
before · pallets/evm-contract-helpers/src/lib.rs
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#![cfg_attr(not(feature = "std"), no_std)]1819use codec::{Decode, Encode, MaxEncodedLen};20pub use pallet::*;21pub use eth::*;22use scale_info::TypeInfo;23pub mod eth;2425#[frame_support::pallet]26pub mod pallet {27	pub use super::*;28	use evm_coder::execution::Result;29	use frame_support::pallet_prelude::*;30	use sp_core::H160;3132	#[pallet::config]33	pub trait Config:34		frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config35	{36		type ContractAddress: Get<H160>;37		type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;38	}3940	#[pallet::error]41	pub enum Error<T> {42		/// This method is only executable by owner43		NoPermission,44	}4546	#[pallet::pallet]47	#[pallet::generate_store(pub(super) trait Store)]48	pub struct Pallet<T>(_);4950	#[pallet::storage]51	pub(super) type Owner<T: Config> =52		StorageMap<Hasher = Twox128, Key = H160, Value = H160, QueryKind = ValueQuery>;5354	#[pallet::storage]55	#[deprecated]56	pub(super) type SelfSponsoring<T: Config> =57		StorageMap<Hasher = Twox128, Key = H160, Value = bool, QueryKind = ValueQuery>;5859	#[pallet::storage]60	pub(super) type SponsoringMode<T: Config> =61		StorageMap<Hasher = Twox128, Key = H160, Value = SponsoringModeT, QueryKind = OptionQuery>;6263	#[pallet::storage]64	pub(super) type SponsoringRateLimit<T: Config> = StorageMap<65		Hasher = Twox128,66		Key = H160,67		Value = T::BlockNumber,68		QueryKind = ValueQuery,69		OnEmpty = T::DefaultSponsoringRateLimit,70	>;7172	#[pallet::storage]73	pub(super) type SponsorBasket<T: Config> = StorageDoubleMap<74		Hasher1 = Twox128,75		Key1 = H160,76		Hasher2 = Twox128,77		Key2 = H160,78		Value = T::BlockNumber,79		QueryKind = OptionQuery,80	>;8182	#[pallet::storage]83	pub(super) type AllowlistEnabled<T: Config> =84		StorageMap<Hasher = Twox128, Key = H160, Value = bool, QueryKind = ValueQuery>;8586	#[pallet::storage]87	pub(super) type Allowlist<T: Config> = StorageDoubleMap<88		Hasher1 = Twox128,89		Key1 = H160,90		Hasher2 = Twox128,91		Key2 = H160,92		Value = bool,93		QueryKind = ValueQuery,94	>;9596	impl<T: Config> Pallet<T> {97		pub fn sponsoring_mode(contract: H160) -> SponsoringModeT {98			<SponsoringMode<T>>::get(contract)99				.or_else(|| {100					<SelfSponsoring<T>>::get(contract).then(|| SponsoringModeT::Allowlisted)101				})102				.unwrap_or_default()103		}104		pub fn set_sponsoring_mode(contract: H160, mode: SponsoringModeT) {105			if mode == SponsoringModeT::Disabled {106				<SponsoringMode<T>>::remove(contract);107			} else {108				<SponsoringMode<T>>::insert(contract, mode);109			}110			<SelfSponsoring<T>>::remove(contract)111		}112113		pub fn toggle_sponsoring(contract: H160, enabled: bool) {114			Self::set_sponsoring_mode(115				contract,116				if enabled {117					SponsoringModeT::Allowlisted118				} else {119					SponsoringModeT::Disabled120				},121			)122		}123124		pub fn set_sponsoring_rate_limit(contract: H160, rate_limit: T::BlockNumber) {125			<SponsoringRateLimit<T>>::insert(contract, rate_limit);126		}127128		pub fn allowed(contract: H160, user: H160) -> bool {129			<Allowlist<T>>::get(&contract, &user) || <Owner<T>>::get(&contract) == user130		}131132		pub fn toggle_allowlist(contract: H160, enabled: bool) {133			<AllowlistEnabled<T>>::insert(contract, enabled)134		}135136		pub fn toggle_allowed(contract: H160, user: H160, allowed: bool) {137			<Allowlist<T>>::insert(contract, user, allowed);138		}139140		pub fn ensure_owner(contract: H160, user: H160) -> Result<()> {141			ensure!(<Owner<T>>::get(&contract) == user, "no permission");142			Ok(())143		}144	}145}146147#[derive(Encode, Decode, PartialEq, TypeInfo, MaxEncodedLen)]148pub enum SponsoringModeT {149	Disabled,150	Allowlisted,151	Generous,152}153154impl SponsoringModeT {155	fn from_eth(v: u8) -> Option<Self> {156		Some(match v {157			0 => Self::Disabled,158			1 => Self::Allowlisted,159			2 => Self::Generous,160			_ => return None,161		})162	}163	fn to_eth(self) -> u8 {164		match self {165			SponsoringModeT::Disabled => 0,166			SponsoringModeT::Allowlisted => 1,167			SponsoringModeT::Generous => 2,168		}169	}170}171172impl Default for SponsoringModeT {173	fn default() -> Self {174		Self::Disabled175	}176}
after · pallets/evm-contract-helpers/src/lib.rs
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#![cfg_attr(not(feature = "std"), no_std)]1819use codec::{Decode, Encode, MaxEncodedLen};20pub use pallet::*;21pub use eth::*;22use scale_info::TypeInfo;23pub mod eth;2425#[frame_support::pallet]26pub mod pallet {27	pub use super::*;28	use evm_coder::execution::Result;29	use frame_support::pallet_prelude::*;30	use sp_core::H160;3132	#[pallet::config]33	pub trait Config:34		frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config35	{36		type ContractAddress: Get<H160>;37		type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;38		type EvmAddressMapping: pallet_evm::AddressMapping<Self::AccountId>;39		type EvmBackwardsAddressMapping: up_evm_mapping::EvmBackwardsAddressMapping<Self::AccountId>;40	}4142	#[pallet::error]43	pub enum Error<T> {44		/// This method is only executable by owner45		NoPermission,46	}4748	#[pallet::pallet]49	#[pallet::generate_store(pub(super) trait Store)]50	pub struct Pallet<T>(_);5152	#[pallet::storage]53	pub(super) type Owner<T: Config> =54		StorageMap<Hasher = Twox128, Key = H160, Value = H160, QueryKind = ValueQuery>;5556	#[pallet::storage]57	#[deprecated]58	pub(super) type SelfSponsoring<T: Config> =59		StorageMap<Hasher = Twox128, Key = H160, Value = bool, QueryKind = ValueQuery>;6061	#[pallet::storage]62	pub(super) type SponsoringMode<T: Config> =63		StorageMap<Hasher = Twox128, Key = H160, Value = SponsoringModeT, QueryKind = OptionQuery>;6465	#[pallet::storage]66	pub(super) type SponsoringRateLimit<T: Config> = StorageMap<67		Hasher = Twox128,68		Key = H160,69		Value = T::BlockNumber,70		QueryKind = ValueQuery,71		OnEmpty = T::DefaultSponsoringRateLimit,72	>;7374	#[pallet::storage]75	pub(super) type SponsorBasket<T: Config> = StorageDoubleMap<76		Hasher1 = Twox128,77		Key1 = H160,78		Hasher2 = Twox128,79		Key2 = H160,80		Value = T::BlockNumber,81		QueryKind = OptionQuery,82	>;8384	#[pallet::storage]85	pub(super) type AllowlistEnabled<T: Config> =86		StorageMap<Hasher = Twox128, Key = H160, Value = bool, QueryKind = ValueQuery>;8788	#[pallet::storage]89	pub(super) type Allowlist<T: Config> = StorageDoubleMap<90		Hasher1 = Twox128,91		Key1 = H160,92		Hasher2 = Twox128,93		Key2 = H160,94		Value = bool,95		QueryKind = ValueQuery,96	>;9798	impl<T: Config> Pallet<T> {99		pub fn sponsoring_mode(contract: H160) -> SponsoringModeT {100			<SponsoringMode<T>>::get(contract)101				.or_else(|| {102					<SelfSponsoring<T>>::get(contract).then(|| SponsoringModeT::Allowlisted)103				})104				.unwrap_or_default()105		}106		pub fn set_sponsoring_mode(contract: H160, mode: SponsoringModeT) {107			if mode == SponsoringModeT::Disabled {108				<SponsoringMode<T>>::remove(contract);109			} else {110				<SponsoringMode<T>>::insert(contract, mode);111			}112			<SelfSponsoring<T>>::remove(contract)113		}114115		pub fn toggle_sponsoring(contract: H160, enabled: bool) {116			Self::set_sponsoring_mode(117				contract,118				if enabled {119					SponsoringModeT::Allowlisted120				} else {121					SponsoringModeT::Disabled122				},123			)124		}125126		pub fn set_sponsoring_rate_limit(contract: H160, rate_limit: T::BlockNumber) {127			<SponsoringRateLimit<T>>::insert(contract, rate_limit);128		}129130		pub fn allowed(contract: H160, user: H160) -> bool {131			<Allowlist<T>>::get(&contract, &user) || <Owner<T>>::get(&contract) == user132		}133134		pub fn toggle_allowlist(contract: H160, enabled: bool) {135			<AllowlistEnabled<T>>::insert(contract, enabled)136		}137138		pub fn toggle_allowed(contract: H160, user: H160, allowed: bool) {139			<Allowlist<T>>::insert(contract, user, allowed);140		}141142		pub fn ensure_owner(contract: H160, user: H160) -> Result<()> {143			ensure!(<Owner<T>>::get(&contract) == user, "no permission");144			Ok(())145		}146	}147}148149#[derive(Encode, Decode, PartialEq, TypeInfo, MaxEncodedLen)]150pub enum SponsoringModeT {151	Disabled,152	Allowlisted,153	Generous,154}155156impl SponsoringModeT {157	fn from_eth(v: u8) -> Option<Self> {158		Some(match v {159			0 => Self::Disabled,160			1 => Self::Allowlisted,161			2 => Self::Generous,162			_ => return None,163		})164	}165	fn to_eth(self) -> u8 {166		match self {167			SponsoringModeT::Disabled => 0,168			SponsoringModeT::Allowlisted => 1,169			SponsoringModeT::Generous => 2,170		}171	}172}173174impl Default for SponsoringModeT {175	fn default() -> Self {176		Self::Disabled177	}178}
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -948,6 +948,8 @@
 impl pallet_evm_contract_helpers::Config for Runtime {
 	type ContractAddress = HelpersContractAddress;
 	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
+	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
+	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
 }
 
 construct_runtime!(