implement proposal type petition

communities/src/lib.rs

@@ -93,7 +93,8 @@ pub mod pallet {
 		///
 		/// May only be called from `T::TrustableForNonDestructiveAction`.
 		#[pallet::call_index(0)]
-		#[pallet::weight((<T as Config>::WeightInfo::new_community(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::new_community(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn new_community(
 			origin: OriginFor<T>,
 			location: Location,
@@ -168,7 +169,8 @@ pub mod pallet {
 		///
 		/// Todo: Replace `T::CommunityMaster` with community governance: #137.
 		#[pallet::call_index(1)]
-		#[pallet::weight((<T as Config>::WeightInfo::add_location(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::add_location(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn add_location(
 			origin: OriginFor<T>,
 			cid: CommunityIdentifier,
@@ -189,7 +191,8 @@ pub mod pallet {
 		///
 		/// Todo: Replace `T::CommunityMaster` with community governance: #137.
 		#[pallet::call_index(2)]
-		#[pallet::weight((<T as Config>::WeightInfo::remove_location(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::remove_location(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn remove_location(
 			origin: OriginFor<T>,
 			cid: CommunityIdentifier,
@@ -208,7 +211,8 @@ pub mod pallet {
 		///
 		/// May only be called from `T::CommunityMaster`.
 		#[pallet::call_index(3)]
-		#[pallet::weight((<T as Config>::WeightInfo::update_community_metadata(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::update_community_metadata(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn update_community_metadata(
 			origin: OriginFor<T>,
 			cid: CommunityIdentifier,
@@ -219,7 +223,8 @@ pub mod pallet {
 		}
 
 		#[pallet::call_index(4)]
-		#[pallet::weight((<T as Config>::WeightInfo::update_demurrage(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::update_demurrage(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn update_demurrage(
 			origin: OriginFor<T>,
 			cid: CommunityIdentifier,
@@ -230,7 +235,8 @@ pub mod pallet {
 		}
 
 		#[pallet::call_index(5)]
-		#[pallet::weight((<T as Config>::WeightInfo::update_nominal_income(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::update_nominal_income(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn update_nominal_income(
 			origin: OriginFor<T>,
 			cid: CommunityIdentifier,
@@ -241,7 +247,8 @@ pub mod pallet {
 		}
 
 		#[pallet::call_index(6)]
-		#[pallet::weight((<T as Config>::WeightInfo::set_min_solar_trip_time_s(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::set_min_solar_trip_time_s(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn set_min_solar_trip_time_s(
 			origin: OriginFor<T>,
 			min_solar_trip_time_s: MinSolarTripTimeType,
@@ -254,7 +261,8 @@ pub mod pallet {
 		}
 
 		#[pallet::call_index(7)]
-		#[pallet::weight((<T as Config>::WeightInfo::set_max_speed_mps(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::set_max_speed_mps(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn set_max_speed_mps(
 			origin: OriginFor<T>,
 			max_speed_mps: MaxSpeedMpsType,
@@ -267,7 +275,8 @@ pub mod pallet {
 		}
 
 		#[pallet::call_index(8)]
-		#[pallet::weight((<T as Config>::WeightInfo::purge_community(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::purge_community(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn purge_community(
 			origin: OriginFor<T>,
 			cid: CommunityIdentifier,
@@ -726,7 +735,7 @@ impl<T: Config> Pallet<T> {
 		let dateline_proxy = Location { lat: location.lat, lon: DATELINE_LON };
 		if Self::haversine_distance(location, &dateline_proxy) < DATELINE_DISTANCE_M {
 			warn!(target: LOG, "location too close to dateline: {:?}", location);
-			return Err(<Error<T>>::MinimumDistanceViolationToDateLine)?
+			return Err(<Error<T>>::MinimumDistanceViolationToDateLine)?;
 		}
 
 		let nearby_locations = Self::get_nearby_locations(location)?;
@@ -765,7 +774,7 @@ impl<T: Config> Pallet<T> {
 			if pallet_encointer_balances::Balance::<T>::contains_key(cid, account.clone()) {
 				balances.push((
 					cid,
-					<pallet_encointer_balances::Pallet<T>>::balance_entry(cid, &account.clone()),
+					<pallet_encointer_balances::Pallet<T>>::balance_entry(cid, account.clone()),
 				));
 			}
 		}

communities/src/migrations.rs

@@ -18,8 +18,6 @@ mod v0 {
 	pub type IpfsCid = UnboundedPalletString;
 
 	#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
-	#[cfg_attr(feature = "serde_derive", derive(Serialize, Deserialize))]
-	#[cfg_attr(feature = "serde_derive", serde(rename_all = "camelCase"))]
 	pub struct UnboundedCommunityMetadata {
 		/// utf8 encoded name
 		pub name: UnboundedPalletString,
@@ -105,8 +103,6 @@ pub mod v1 {
 	#[derive(
 		Encode, Decode, Default, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen,
 	)]
-	#[cfg_attr(feature = "serde_derive", derive(Serialize, Deserialize))]
-	#[cfg_attr(feature = "serde_derive", serde(rename_all = "camelCase"))]
 	pub struct CommunityMetadataV1 {
 		/// utf8 encoded name
 		pub name: PalletString,
@@ -245,7 +241,7 @@ pub mod v2 {
 					target: TARGET,
 					"skipping on_runtime_upgrade: executed on wrong storage version."
 				);
-				return T::DbWeight::get().reads(1)
+				return T::DbWeight::get().reads(1);
 			}
 			if onchain_version == StorageVersion::new(0) {
 				CommunityMetadata::<T>::translate::<UnboundedCommunityMetadata, _>(
@@ -434,13 +430,13 @@ mod test {
 			// Check that all values got migrated.
 
 			assert_eq!(
-				crate::CommunityIdentifiers::<TestRuntime>::get(),
-				BoundedVec::<
-					CommunityIdentifier,
-					<TestRuntime as Config>::MaxCommunityIdentifiers,
-				>::try_from(cids)
-				.unwrap()
-			);
+                crate::CommunityIdentifiers::<TestRuntime>::get(),
+                BoundedVec::<
+                    CommunityIdentifier,
+                    <TestRuntime as Config>::MaxCommunityIdentifiers,
+                >::try_from(cids)
+                    .unwrap()
+            );
 
 			assert_eq!(
 				crate::CommunityIdentifiersByGeohash::<TestRuntime>::get(

democracy/src/benchmarking.rs

@@ -29,7 +29,12 @@ benchmarks! {
 
 	submit_proposal {
 		let zoran = account("zoran", 1, 1);
-		let proposal_action = ProposalAction::SetInactivityTimeout(8);
+		let cid = CommunityIdentifier::default();
+		// worst case is petition
+		let proposal_action = ProposalAction::Petition(Some(cid), PalletString::try_from("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
+		xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
+		xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
+		xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx".as_bytes().to_vec()).unwrap());
 		assert!(<Proposals<T>>::iter().next().is_none());
 	}: _(RawOrigin::Signed(zoran), proposal_action)
 	verify {

democracy/src/lib.rs

@@ -21,6 +21,7 @@
 
 use encointer_primitives::{
 	ceremonies::ReputationCountType,
+	common::PalletString,
 	democracy::{Proposal, ProposalAction, ProposalIdType, ReputationVec},
 	fixed::{transcendental::sqrt, types::U64F64},
 	scheduler::{CeremonyIndexType, CeremonyPhaseType},
@@ -144,6 +145,10 @@ pub mod pallet {
 			proposal_id: ProposalIdType,
 			reason: DispatchErrorWithPostInfo,
 		},
+		PetitionApproved {
+			cid: Option<CommunityIdentifier>,
+			text: PalletString,
+		},
 	}
 
 	#[pallet::error]
@@ -227,13 +232,14 @@ pub mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::call_index(0)]
-		#[pallet::weight((<T as Config>::WeightInfo::submit_proposal(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::submit_proposal(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn submit_proposal(
 			origin: OriginFor<T>,
 			proposal_action: ProposalAction,
 		) -> DispatchResultWithPostInfo {
 			if Self::enactment_queue(proposal_action.clone().get_identifier()).is_some() {
-				return Err(Error::<T>::ProposalWaitingForEnactment.into())
+				return Err(Error::<T>::ProposalWaitingForEnactment.into());
 			}
 			let _sender = ensure_signed(origin)?;
 			let cindex = <pallet_encointer_scheduler::Pallet<T>>::current_ceremony_index();
@@ -313,7 +319,8 @@ pub mod pallet {
 		}
 
 		#[pallet::call_index(2)]
-		#[pallet::weight((<T as Config>::WeightInfo::update_proposal_state(), DispatchClass::Normal, Pays::Yes))]
+		#[pallet::weight((<T as Config>::WeightInfo::update_proposal_state(), DispatchClass::Normal, Pays::Yes)
+        )]
 		pub fn update_proposal_state(
 			origin: OriginFor<T>,
 			proposal_id: ProposalIdType,
@@ -383,12 +390,12 @@ pub mod pallet {
 
 			for community_ceremony in reputations {
 				if !Self::voting_cindexes(proposal.start_cindex)?.contains(&community_ceremony.1) {
-					continue
+					continue;
 				}
 
 				if let Some(cid) = maybe_cid {
 					if community_ceremony.0 != cid {
-						continue
+						continue;
 					}
 				}
 
@@ -401,7 +408,7 @@ pub mod pallet {
 				)
 				.is_err()
 				{
-					continue
+					continue;
 				}
 
 				eligible_reputation_count += 1;
@@ -531,7 +538,7 @@ pub mod pallet {
 
 			let turnout_permill = (tally.turnout * 1000).checked_div(electorate).unwrap_or(0);
 			if turnout_permill < T::MinTurnout::get() {
-				return Ok(false)
+				return Ok(false);
 			}
 
 			Self::positive_turnout_bias(electorate, tally.turnout, tally.ayes)
@@ -560,6 +567,9 @@ pub mod pallet {
 				ProposalAction::SetInactivityTimeout(inactivity_timeout) => {
 					CeremoniesPallet::<T>::do_set_inactivity_timeout(inactivity_timeout)?;
 				},
+				ProposalAction::Petition(maybe_cid, petition) => {
+					Self::deposit_event(Event::PetitionApproved { cid: maybe_cid, text: petition });
+				},
 			};
 
 			proposal.state = ProposalState::Enacted;

democracy/src/tests.rs

@@ -46,7 +46,7 @@ use test_utils::{
 };
 
 fn create_cid() -> CommunityIdentifier {
-	return register_test_community::<TestRuntime>(None, 0.0, 0.0)
+	return register_test_community::<TestRuntime>(None, 0.0, 0.0);
 }
 
 fn alice() -> AccountId {
@@ -959,6 +959,42 @@ fn enact_set_inactivity_timeout_works() {
 	});
 }
 
+#[test]
+fn enact_petition_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(System::block_number() + 1); // this is needed to assert events
+
+		let cid = create_cid();
+		let alice = alice();
+		let petition_text = PalletString::try_from("freedom for all".as_bytes().to_vec()).unwrap();
+		let proposal_action = ProposalAction::Petition(Some(cid), petition_text.clone());
+		assert_ok!(EncointerDemocracy::submit_proposal(
+			RuntimeOrigin::signed(alice.clone()),
+			proposal_action.clone()
+		));
+
+		// directly inject the proposal into the enactment queue
+		EnactmentQueue::<TestRuntime>::insert(proposal_action.clone().get_identifier(), 1);
+
+		run_to_next_phase();
+		// first assigning phase after proposal lifetime ended
+
+		assert_eq!(EncointerDemocracy::proposals(1).unwrap().state, ProposalState::Enacted);
+		assert_eq!(EncointerDemocracy::enactment_queue(proposal_action.get_identifier()), None);
+
+		match event_at_index::<TestRuntime>(get_num_events::<TestRuntime>() - 3).unwrap() {
+			mock::RuntimeEvent::EncointerDemocracy(Event::PetitionApproved {
+				cid: maybe_cid,
+				text,
+			}) => {
+				assert_eq!(maybe_cid, Some(cid));
+				assert_eq!(text, petition_text);
+			},
+			_ => panic!("Wrong event"),
+		};
+	});
+}
+
 #[test]
 fn enactment_error_fires_event() {
 	new_test_ext().execute_with(|| {

primitives/src/democracy.rs

@@ -9,11 +9,12 @@ use crate::{
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
-use crate::{ceremonies::ReputationCountType, scheduler::CeremonyIndexType};
+use crate::{ceremonies::ReputationCountType, common::PalletString, scheduler::CeremonyIndexType};
 #[cfg(feature = "serde_derive")]
 use serde::{Deserialize, Serialize};
 use sp_core::RuntimeDebug;
 use sp_runtime::BoundedVec;
+
 pub type ProposalIdType = u128;
 pub type VoteCountType = u128;
 pub type VoteEntry<AccountId> = (AccountId, CommunityCeremony);
@@ -55,6 +56,7 @@ pub enum ProposalAction {
 	UpdateDemurrage(CommunityIdentifier, Demurrage),
 	UpdateNominalIncome(CommunityIdentifier, NominalIncomeType),
 	SetInactivityTimeout(InactivityTimeoutType),
+	Petition(Option<CommunityIdentifier>, PalletString),
 }
 
 #[derive(Encode, Decode, RuntimeDebug, Clone, Copy, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
@@ -67,6 +69,7 @@ pub enum ProposalActionIdentifier {
 	UpdateDemurrage(CommunityIdentifier),
 	UpdateNominalIncome(CommunityIdentifier),
 	SetInactivityTimeout,
+	Petition(Option<CommunityIdentifier>),
 }
 
 impl ProposalAction {
@@ -78,6 +81,8 @@ impl ProposalAction {
 			ProposalAction::UpdateDemurrage(cid, _) => ProposalAccessPolicy::Community(cid),
 			ProposalAction::UpdateNominalIncome(cid, _) => ProposalAccessPolicy::Community(cid),
 			ProposalAction::SetInactivityTimeout(_) => ProposalAccessPolicy::Global,
+			ProposalAction::Petition(Some(cid), _) => ProposalAccessPolicy::Community(cid),
+			ProposalAction::Petition(None, _) => ProposalAccessPolicy::Global,
 		}
 	}
 
@@ -93,6 +98,7 @@ impl ProposalAction {
 				ProposalActionIdentifier::UpdateNominalIncome(cid),
 			ProposalAction::SetInactivityTimeout(_) =>
 				ProposalActionIdentifier::SetInactivityTimeout,
+			ProposalAction::Petition(maybe_cid, _) => ProposalActionIdentifier::Petition(maybe_cid),
 		}
 	}
 }