fix(kreivo-runtime): let accounts execute transactions (#362)

* fix(kreivo-runtime): let accounts execute transactions

* fix(pallet-communities): fmt

* fix(pallet-communities): invalid type  resolution for Config::RuntimeOrigin

* change(kreivo-runtime): make sure communities can also transact

pallets/communities/src/benchmarking.rs

@@ -64,7 +64,7 @@ where
 
 	let decision_method = maybe_decision_method.unwrap_or(DecisionMethod::Rank);
 	let admin_origin: OriginFor<T> = Origin::<T>::new(community_id).into();
-	let admin_origin_caller = admin_origin.clone().into_caller();
+	let admin_origin_caller: PalletsOriginOf<T> = admin_origin.clone().into_caller();
 
 	(community_id, decision_method, admin_origin, admin_origin_caller)
 }
@@ -138,7 +138,6 @@ where
 	where
 		T: frame_system::Config + crate::Config,
 		OriginFor<T>: From<Origin<T>>,
-		<T as Config>::RuntimeEvent: From<frame_system::Event<T>>,
 		MembershipIdOf<T>: From<u32>,
 		BlockNumberFor<T>: From<u32>
 )]

pallets/communities/src/lib.rs

@@ -208,7 +208,7 @@ pub mod pallet {
 			+ From<frame_system::Origin<Self>>
 			+ From<Origin<Self>>
 			+ Clone
-			+ OriginTrait<Call = RuntimeCallFor<Self>, AccountId = Self::AccountId>;
+			+ OriginTrait<Call = RuntimeCallFor<Self>, AccountId = Self::AccountId, PalletsOrigin = PalletsOriginOf<Self>>;
 
 		/// The overarching hold reason.
 		type RuntimeHoldReason: From<HoldReason>;
@@ -532,21 +532,21 @@ pub mod pallet {
 			Self::do_dispatch_as_community_account(&community_id, *call)
 		}
 
-		/// Dispatch a callable as the community account
-		#[cfg(any(test, feature = "testnet"))]
-		#[pallet::call_index(12)]
-		#[pallet::weight({
-			let di = call.get_dispatch_info();
-			let weight = T::WeightInfo::dispatch_as_account()
-				.saturating_add(T::DbWeight::get().reads_writes(1, 1))
-				.saturating_add(di.weight);
-			(weight, di.class)
-		})]
-		pub fn dispatch_as_origin(origin: OriginFor<T>, call: Box<RuntimeCallFor<T>>) -> DispatchResultWithPostInfo {
-			let community_id = T::MemberMgmtOrigin::ensure_origin(origin)?;
-			let origin = crate::Origin::<T>::new(community_id);
-			let post = call.dispatch(origin.into()).map_err(|e| e.error)?;
-			Ok(post)
-		}
+		// /// Dispatch a callable as the community account
+		// #[pallet::call_index(12)]
+		// #[pallet::weight({
+		// 	let di = call.get_dispatch_info();
+		// 	let weight = T::WeightInfo::dispatch_as_account()
+		// 		.saturating_add(T::DbWeight::get().reads_writes(1, 1))
+		// 		.saturating_add(di.weight);
+		// 	(weight, di.class)
+		// })]
+		// // #[cfg(any(test, feature = "testnet"))]
+		// pub fn dispatch_as_origin(origin: OriginFor<T>, call: Box<RuntimeCallFor<T>>)
+		// -> DispatchResultWithPostInfo { 	let community_id =
+		// T::MemberMgmtOrigin::ensure_origin(origin)?; 	let origin =
+		// crate::Origin::<T>::new(community_id); 	let post =
+		// call.dispatch(origin.into()).map_err(|e| e.error)?; 	Ok(post)
+		// }
 	}
 }

pallets/communities/src/types.rs

@@ -19,7 +19,8 @@ pub type VoteOf<T> = Vote<AssetIdOf<T>, AssetBalanceOf<T>, NativeBalanceOf<T>>;
 pub type DecisionMethodFor<T> = DecisionMethod<AssetIdOf<T>>;
 pub type PollIndexOf<T> = <<T as Config>::Polls as Polling<Tally<T>>>::Index;
 pub type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
-pub type PalletsOriginOf<T> = <<T as Config>::RuntimeOrigin as frame_support::traits::OriginTrait>::PalletsOrigin;
+pub type PalletsOriginOf<T> =
+	<<T as frame_system::Config>::RuntimeOrigin as frame_support::traits::OriginTrait>::PalletsOrigin;
 pub type MembershipIdOf<T> = <T as Config>::MembershipId;
 pub type RuntimeCallFor<T> = <T as Config>::RuntimeCall;
 pub type RuntimeOriginFor<T> = <T as Config>::RuntimeOrigin;

runtime/kreivo/src/xcm_config.rs

@@ -23,8 +23,8 @@ use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, ConvertedConcreteId,
 	CurrencyAdapter, EnsureXcmOrigin, FungiblesAdapter, IsConcrete, LocalMint, MintLocation, NativeAsset,
 	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
-	SignedAccountId32AsNative, SovereignSignedViaLocation, StartsWith, TakeWeightCredit, UsingComponents,
-	WeightInfoBounds, WithComputedOrigin,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, StartsWith, TakeWeightCredit,
+	UsingComponents, WeightInfoBounds, WithComputedOrigin,
 };
 use xcm_executor::traits::JustTry;
 use xcm_executor::XcmExecutor;
@@ -235,7 +235,13 @@ impl xcm_executor::Config for XcmConfig {
 }
 
 /// Only communities are allowed to dispatch xcm messages
-pub type ConvertCommunityOrigin = pallet_communities::Origin<Runtime>;
+pub type CanSendXcmMessages = pallet_communities::Origin<Runtime>;
+
+/// Only signed origins are allowed to execute xcm transactions
+pub type CanExecuteXcmTransactions = (
+	pallet_communities::Origin<Runtime>,
+	SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>,
+);
 
 /// The means for routing XCM messages which are not for local execution into
 /// the right message queues.
@@ -248,9 +254,9 @@ pub type XcmRouter = (
 
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ConvertCommunityOrigin>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, CanSendXcmMessages>;
 	type XcmRouter = XcmRouter;
-	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ConvertCommunityOrigin>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, CanExecuteXcmTransactions>;
 	type XcmExecuteFilter = Nothing;
 	// ^ Disable dispatchable execute on the XCM pallet.
 	type XcmExecutor = XcmExecutor<XcmConfig>;