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

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5735,6 +5735,7 @@
 name = "pallet-evm-contract-helpers"
 version = "0.2.0"
 dependencies = [
+ "ethereum",
  "evm-coder",
  "fp-evm-mapping",
  "frame-support",

--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -9,6 +9,7 @@
     "derive",
 ] }
 log = { default-features = false, version = "0.4.14" }
+ethereum = { version = "0.12.0", default-features = false }
 
 # Substrate
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }

--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -17,7 +17,9 @@
 //! Implementation of magic contract
 
 use core::marker::PhantomData;
-use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};
+use evm_coder::{
+	abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*, ToLog,
+};
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};
 use pallet_evm::{
 	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
@@ -33,6 +35,37 @@
 use up_sponsorship::SponsorshipHandler;
 use sp_std::vec::Vec;
 
+/// Pallet events.
+#[derive(ToLog)]
+pub enum ContractHelpersEvents {
+	/// Contract sponsor was set.
+	ContractSponsorSet {
+		/// Contract address of the affected collection.
+		#[indexed]
+		contract: address,
+		/// New sponsor address.
+		#[indexed]
+		sponsor: address,
+	},
+
+	/// New sponsor was confirm.
+	ContractSponsorshipConfirmed {
+		/// Contract address of the affected collection.
+		#[indexed]
+		contract: address,
+		/// New sponsor address.
+		#[indexed]
+		sponsor: address,
+	},
+
+	/// Collection sponsor was removed.
+	ContractSponsorRemoved {
+		/// Contract address of the affected collection.
+		#[indexed]
+		contract: address,
+	},
+}
+
 /// See [`ContractHelpersCall`]
 pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
 impl<T: Config> WithRecorder<T> for ContractHelpers<T> {
@@ -46,7 +79,7 @@
 }
 
 /// @title Magic contract, which allows users to reconfigure other contracts
-#[solidity_interface(name = ContractHelpers)]
+#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]
 impl<T: Config> ContractHelpers<T>
 where
 	T::AccountId: AsRef<[u8; 32]>,
@@ -91,7 +124,7 @@
 		self.recorder().consume_sload()?;
 		self.recorder().consume_sstore()?;
 
-		Pallet::<T>::self_sponsored_enable(&T::CrossAccountId::from_eth(caller), contract_address)
+		Pallet::<T>::force_set_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)
 			.map_err(dispatch_to_evm::<T>)?;
 
 		Ok(())

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				}

--- a/runtime/common/config/ethereum.rs
+++ b/runtime/common/config/ethereum.rs
@@ -112,6 +112,7 @@
 }
 
 impl pallet_evm_contract_helpers::Config for Runtime {
+	type Event = Event;
 	type ContractAddress = HelpersContractAddress;
 	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
 }

--- a/runtime/common/config/pallets/app_promotion.rs
+++ b/runtime/common/config/pallets/app_promotion.rs
@@ -22,7 +22,7 @@
 use frame_support::{parameter_types, PalletId};
 use sp_arithmetic::Perbill;
 use up_common::{
-	constants::{ UNIQUE, RELAY_DAYS},
+	constants::{UNIQUE, RELAY_DAYS},
 	types::Balance,
 };
 

--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -85,7 +85,7 @@
                 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,
 
                 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,
-                EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,
+                EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,
                 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,
                 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,
             }