Merge remote-tracking branch 'origin/dev' into p-1240-implement-acces…

…s-control-for-accountstore-members-in-the

common/primitives/core/src/omni_account.rs

@@ -19,6 +19,14 @@ use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
 
+#[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, RuntimeDebug)]
+pub enum OmniAccountAuthType {
+    Web3,
+    Email,
+    OAuth2,
+    AuthToken,
+}
+
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, RuntimeDebug)]
 pub enum MemberAccount {
     Public(Identity),

parachain/pallets/omni-account/src/lib.rs

@@ -21,7 +21,9 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-pub use core_primitives::{Identity, Intent, MemberAccount, OmniAccountConverter};
+pub use core_primitives::{
+	Identity, Intent, MemberAccount, OmniAccountAuthType, OmniAccountConverter,
+};
 pub use frame_system::{self as system, pallet_prelude::BlockNumberFor};
 pub use pallet::*;
 
@@ -181,15 +183,25 @@ pub mod pallet {
 		/// An account store is updated
 		AccountStoreUpdated { who: T::AccountId, account_store: MemberAccounts<T> },
 		/// Some call is dispatched as omni-account origin
-		DispatchedAsOmniAccount { who: T::AccountId, result: DispatchResult },
+		DispatchedAsOmniAccount {
+			who: T::AccountId,
+			auth_type: OmniAccountAuthType,
+			result: DispatchResult,
+		},
 		/// Some call is dispatched as signed origin
-		DispatchedAsSigned { who: T::AccountId, result: DispatchResult },
+		DispatchedAsSigned {
+			who: T::AccountId,
+			auth_type: OmniAccountAuthType,
+			result: DispatchResult,
+		},
 		/// Intent is requested
 		IntentRequested { who: T::AccountId, intent: Intent },
 		/// Intent is executed
 		IntentExecuted { who: T::AccountId, intent: Intent, result: IntentExecutionResult },
 		/// Member permission set
 		AccountPermissionsSet { who: T::AccountId, member_account_hash: H256 },
+		/// An auth token is requested
+		AuthTokenRequested { who: T::AccountId, expires_at: BlockNumberFor<T> },
 	}
 
 	#[pallet::error]
@@ -213,6 +225,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			member_account_hash: H256,
 			call: Box<<T as Config>::RuntimeCall>,
+			auth_type: OmniAccountAuthType,
 		) -> DispatchResultWithPostInfo {
 			let _ = T::TEECallOrigin::ensure_origin(origin)?;
 			let omni_account = MemberAccountHash::<T>::get(member_account_hash)
@@ -222,6 +235,7 @@ pub mod pallet {
 			system::Pallet::<T>::inc_account_nonce(&omni_account);
 			Self::deposit_event(Event::DispatchedAsOmniAccount {
 				who: omni_account,
+				auth_type,
 				result: result.map(|_| ()).map_err(|e| e.error),
 			});
 			Ok(Pays::No.into())
@@ -235,6 +249,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			member_account_hash: H256,
 			call: Box<<T as Config>::RuntimeCall>,
+			auth_type: OmniAccountAuthType,
 		) -> DispatchResultWithPostInfo {
 			let _ = T::TEECallOrigin::ensure_origin(origin)?;
 			let omni_account = MemberAccountHash::<T>::get(member_account_hash)
@@ -247,6 +262,7 @@ pub mod pallet {
 			system::Pallet::<T>::inc_account_nonce(&omni_account);
 			Self::deposit_event(Event::DispatchedAsSigned {
 				who: omni_account,
+				auth_type,
 				result: result.map(|_| ()).map_err(|e| e.error),
 			});
 			Ok(Pays::No.into())
@@ -440,6 +456,18 @@ pub mod pallet {
 			Self::deposit_event(Event::AccountPermissionsSet { who, member_account_hash });
 			Ok(())
 		}
+
+		#[pallet::call_index(10)]
+		#[pallet::weight((195_000_000, DispatchClass::Normal))]
+		pub fn auth_token_requested(
+			origin: OriginFor<T>,
+			who: T::AccountId,
+			expires_at: BlockNumberFor<T>,
+		) -> DispatchResult {
+			let _ = T::TEECallOrigin::ensure_origin(origin)?;
+			Self::deposit_event(Event::AuthTokenRequested { who, expires_at });
+			Ok(())
+		}
 	}
 
 	impl<T: Config> Pallet<T> {