`d190a670c95b`

7 files changed

modifiedCargo.lockdiff before after both

5735name = "pallet-evm-contract-helpers"5735name = "pallet-evm-contract-helpers"
5736version = "0.2.0"5736version = "0.2.0"
5737dependencies = [5737dependencies = [
5738 "ethereum",
5738 "evm-coder",5739 "evm-coder",
5739 "fp-evm-mapping",5740 "fp-evm-mapping",
5740 "frame-support",5741 "frame-support",

modifiedpallets/evm-contract-helpers/Cargo.tomldiff before after both

9    "derive",9    "derive",
10] }10] }
11log = { default-features = false, version = "0.4.14" }11log = { default-features = false, version = "0.4.14" }
12ethereum = { version = "0.12.0", default-features = false }
1213
13# Substrate14# Substrate
14frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }15frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }

modifiedpallets/evm-contract-helpers/src/eth.rsdiff before after both

1818
19use core::marker::PhantomData;19use core::marker::PhantomData;
20use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};20use evm_coder::{
21	abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*, ToLog,
22};
21use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};23use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};
22use pallet_evm::{24use pallet_evm::{
33use up_sponsorship::SponsorshipHandler;35use up_sponsorship::SponsorshipHandler;
34use sp_std::vec::Vec;36use sp_std::vec::Vec;
37
38/// Pallet events.
39#[derive(ToLog)]
40pub enum ContractHelpersEvents {
41	/// Contract sponsor was set.
42	ContractSponsorSet {
43		/// Contract address of the affected collection.
44		#[indexed]
45		contract: address,
46		/// New sponsor address.
47		#[indexed]
48		sponsor: address,
49	},
50
51	/// New sponsor was confirm.
52	ContractSponsorshipConfirmed {
53		/// Contract address of the affected collection.
54		#[indexed]
55		contract: address,
56		/// New sponsor address.
57		#[indexed]
58		sponsor: address,
59	},
60
61	/// Collection sponsor was removed.
62	ContractSponsorRemoved {
63		/// Contract address of the affected collection.
64		#[indexed]
65		contract: address,
66	},
67}
3568
36/// See [`ContractHelpersCall`]69/// See [`ContractHelpersCall`]
37pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);70pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
46}79}
4780
48/// @title Magic contract, which allows users to reconfigure other contracts81/// @title Magic contract, which allows users to reconfigure other contracts
49#[solidity_interface(name = ContractHelpers)]82#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]
50impl<T: Config> ContractHelpers<T>83impl<T: Config> ContractHelpers<T>
51where84where
52	T::AccountId: AsRef<[u8; 32]>,85	T::AccountId: AsRef<[u8; 32]>,
91		self.recorder().consume_sload()?;124		self.recorder().consume_sload()?;
92		self.recorder().consume_sstore()?;125		self.recorder().consume_sstore()?;
93126
94		Pallet::<T>::self_sponsored_enable(&T::CrossAccountId::from_eth(caller), contract_address)127		Pallet::<T>::force_set_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)
95			.map_err(dispatch_to_evm::<T>)?;128			.map_err(dispatch_to_evm::<T>)?;
96129
97		Ok(())130		Ok(())

modifiedpallets/evm-contract-helpers/src/lib.rsdiff before after both

1616
17#![doc = include_str!("../README.md")]17#![doc = include_str!("../README.md")]
18#![cfg_attr(not(feature = "std"), no_std)]18#![cfg_attr(not(feature = "std"), no_std)]
19#![deny(missing_docs)]19#![warn(missing_docs)]
2020
21use codec::{Decode, Encode, MaxEncodedLen};21use codec::{Decode, Encode, MaxEncodedLen};
22pub use pallet::*;22pub use pallet::*;
27#[frame_support::pallet]27#[frame_support::pallet]
28pub mod pallet {28pub mod pallet {
29	pub use super::*;29	pub use super::*;
30	use crate::eth::ContractHelpersEvents;
30	use frame_support::pallet_prelude::*;31	use frame_support::pallet_prelude::*;
31	use pallet_evm_coder_substrate::DispatchResult;32	use pallet_evm_coder_substrate::DispatchResult;
32	use sp_core::H160;33	use sp_core::H160;
33	use pallet_evm::account::CrossAccountId;34	use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
34	use up_data_structs::SponsorshipState;35	use up_data_structs::SponsorshipState;
36	use evm_coder::ToLog;
3537
36	#[pallet::config]38	#[pallet::config]
37	pub trait Config:39	pub trait Config:
38		frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config40		frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config
39	{41	{
42		/// Overarching event type.
43		type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;
44
40		/// Address, under which magic contract will be available45		/// Address, under which magic contract will be available
41		type ContractAddress: Get<H160>;46		type ContractAddress: Get<H160>;
150		QueryKind = ValueQuery,156		QueryKind = ValueQuery,
151	>;157	>;
158
159	#[pallet::event]
160	#[pallet::generate_deposit(pub fn deposit_event)]
161	pub enum Event<T: Config> {
162		/// Contract sponsor was set.
163		ContractSponsorSet(
164			/// Contract address of the affected collection.
165			H160,
166			/// New sponsor address.
167			T::AccountId,
168		),
169
170		/// New sponsor was confirm.
171		ContractSponsorshipConfirmed(
172			/// Contract address of the affected collection.
173			H160,
174			/// New sponsor address.
175			T::AccountId,
176		),
177
178		/// Collection sponsor was removed.
179		ContractSponsorRemoved(
180			/// Contract address of the affected collection.
181			H160,
182		),
183	}
152184
153	impl<T: Config> Pallet<T> {185	impl<T: Config> Pallet<T> {
154		/// Get contract owner.186		/// Get contract owner.
170				SponsorshipState::<T::CrossAccountId>::Unconfirmed(sponsor.clone()),202				SponsorshipState::<T::CrossAccountId>::Unconfirmed(sponsor.clone()),
171			);203			);
204
205			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorSet(
206				contract,
207				sponsor.as_sub().clone(),
208			));
209			<PalletEvm<T>>::deposit_log(
210				ContractHelpersEvents::ContractSponsorSet {
211					contract,
212					sponsor: *sponsor.as_eth(),
213				}
214				.to_log(contract),
215			);
172			Ok(())216			Ok(())
173		}217		}
174218
175		/// Set `contract` as self sponsored.219		/// Set sponsor as already confirmed.
176		///220		///
177		/// `sender` must be owner of contract.221		/// `sender` must be owner of contract.
178		pub fn self_sponsored_enable(sender: &T::CrossAccountId, contract: H160) -> DispatchResult {222		pub fn force_set_sponsor(sender: &T::CrossAccountId, contract: H160) -> DispatchResult {
179			Pallet::<T>::ensure_owner(contract, *sender.as_eth())?;223			Pallet::<T>::ensure_owner(contract, *sender.as_eth())?;
180			Sponsoring::<T>::insert(224			Sponsoring::<T>::insert(
181				contract,225				contract,
193			Pallet::<T>::ensure_owner(contract, *sender.as_eth())?;237			Pallet::<T>::ensure_owner(contract, *sender.as_eth())?;
194			Sponsoring::<T>::remove(contract);238			Sponsoring::<T>::remove(contract);
239
240			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorRemoved(contract));
241			<PalletEvm<T>>::deposit_log(
242				ContractHelpersEvents::ContractSponsorRemoved { contract }.to_log(contract),
243			);
244
195			Ok(())245			Ok(())
196		}246		}
202			match Sponsoring::<T>::get(contract) {252			match Sponsoring::<T>::get(contract) {
203				SponsorshipState::Unconfirmed(sponsor) => {253				SponsorshipState::Unconfirmed(sponsor) => {
204					ensure!(sponsor == *sender, Error::<T>::NoPermission);254					ensure!(sponsor == *sender, Error::<T>::NoPermission);
255					let eth_sponsor = *sponsor.as_eth();
256					let sub_sponsor = sponsor.as_sub().clone();
205					Sponsoring::<T>::insert(257					Sponsoring::<T>::insert(
206						contract,258						contract,
207						SponsorshipState::<T::CrossAccountId>::Confirmed(sponsor),259						SponsorshipState::<T::CrossAccountId>::Confirmed(sponsor),
208					);260					);
261
262					<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorshipConfirmed(
263						contract,
264						sub_sponsor,
265					));
266					<PalletEvm<T>>::deposit_log(
267						ContractHelpersEvents::ContractSponsorshipConfirmed {
268							contract,
269							sponsor: eth_sponsor,
270						}
271						.to_log(contract),
272					);
273
209					Ok(())274					Ok(())
210				}275				}

modifiedruntime/common/config/ethereum.rsdiff before after both

112}112}
113113
114impl pallet_evm_contract_helpers::Config for Runtime {114impl pallet_evm_contract_helpers::Config for Runtime {
115	type Event = Event;
115	type ContractAddress = HelpersContractAddress;116	type ContractAddress = HelpersContractAddress;
116	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;117	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
117}118}

modifiedruntime/common/config/pallets/app_promotion.rsdiff before after both

no syntactic changes

modifiedruntime/common/construct_runtime/mod.rsdiff before after both

85                Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,85                Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,
8686
87                EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,87                EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,
88                EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,88                EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,
89                EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,89                EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,
90                EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,90                EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,
91            }91            }