Bounty Pallet: add approve_bounty_with_curator call to bounties pallet

polkadot/runtime/rococo/src/weights/pallet_bounties.rs

@@ -76,6 +76,14 @@ impl<T: frame_system::Config> pallet_bounties::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(0, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
+	fn approve_bounty_with_curator() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 0_000 picoseconds.
+		Weight::from_parts(0, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 	fn propose_curator() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`

prdoc/pr_5961.prdoc

@@ -0,0 +1,15 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "Bounties Pallet: add `approve_bounty_with_curator` call"
+
+doc:
+  - audience: [Runtime Dev, Runtime User]
+    description: |
+      Adds `approve_bounty_with_curator` call to the bounties pallet to combine `approve_bounty` and `propose_curator` into one call. If `unassign_curator` is called after `approve_bounty_with_curator` the process falls back to the previous flow of calling `propose_curator` separately.
+
+crates:
+    - name: pallet-bounties
+      bump: minor
+    - name: rococo-runtime
+      bump: minor

substrate/frame/bounties/src/benchmarking.rs

@@ -119,6 +119,16 @@ benchmarks_instance_pallet! {
 		Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
 	}: _<T::RuntimeOrigin>(approve_origin, bounty_id, curator_lookup, fee)
 
+	approve_bounty_with_curator {
+		setup_pot_account::<T, I>();
+		let (caller, curator, fee, value, reason) = setup_bounty::<T, I>(0, T::MaximumReasonLength::get());
+		let curator_lookup = T::Lookup::unlookup(curator);
+		Bounties::<T, I>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+		let bounty_id = BountyCount::<T, I>::get() - 1;
+		let approve_origin = T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+		Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
+	}: _<T::RuntimeOrigin>(approve_origin, bounty_id, curator_lookup, fee)
+
 	// Worst case when curator is inactive and any sender unassigns the curator.
 	unassign_curator {
 		setup_pot_account::<T, I>();

substrate/frame/bounties/src/lib.rs

@@ -79,6 +79,7 @@
 //! - `claim_bounty` - Claim a specific bounty amount from the Payout Address.
 //! - `unassign_curator` - Unassign an accepted curator from a specific earmark.
 //! - `close_bounty` - Cancel the earmark for a specific treasury amount and close the bounty.
+//! - `approve_bounty_with_curator` - Approve bounty and also propose curator for the bounty.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -174,6 +175,11 @@ pub enum BountyStatus<AccountId, BlockNumber> {
 		/// When the bounty can be claimed.
 		unlock_at: BlockNumber,
 	},
+	/// The bounty is approved with curator assigned.
+	ApprovedWithCurator {
+		/// The assigned curator of this bounty.
+		curator: AccountId,
+	},
 }
 
 /// The child bounty manager.
@@ -471,6 +477,15 @@ pub mod pallet {
 						// No curator to unassign at this point.
 						return Err(Error::<T, I>::UnexpectedStatus.into())
 					},
+					BountyStatus::ApprovedWithCurator { ref curator } => {
+						// Bounty not yet funded, but bounty was approved with curator.
+						// `RejectOrigin` or curator himself can unassign from this bounty.
+						ensure!(maybe_sender.map_or(true, |sender| sender == *curator), BadOrigin);
+						// This state can only be while the bounty is not yet funded so we return
+						// bounty to the `Approved` state without curator
+						bounty.status = BountyStatus::Approved;
+						return Ok(());
+					},
 					BountyStatus::CuratorProposed { ref curator } => {
 						// A curator has been proposed, but not accepted yet.
 						// Either `RejectOrigin` or the proposed curator can unassign the curator.
@@ -727,7 +742,7 @@ pub mod pallet {
 								Some(<T as Config<I>>::WeightInfo::close_bounty_proposed()).into()
 							)
 						},
-						BountyStatus::Approved => {
+						BountyStatus::Approved | BountyStatus::ApprovedWithCurator { .. } => {
 							// For weight reasons, we don't allow a council to cancel in this phase.
 							// We ask for them to wait until it is funded before they can cancel.
 							return Err(Error::<T, I>::UnexpectedStatus.into())
@@ -808,6 +823,52 @@ pub mod pallet {
 			Self::deposit_event(Event::<T, I>::BountyExtended { index: bounty_id });
 			Ok(())
 		}
+
+		/// Approve bountry and propose a curator simultaneously.
+		/// This call is a shortcut to calling `approve_bounty` and `propose_curator` separately.
+		///
+		/// May only be called from `T::SpendOrigin`.
+		///
+		/// - `bounty_id`: Bounty ID to approve.
+		/// - `curator`: The curator account whom will manage this bounty.
+		/// - `fee`: The curator fee.
+		///
+		/// ## Complexity
+		/// - O(1).
+		#[pallet::call_index(9)]
+		#[pallet::weight(<T as Config<I>>::WeightInfo::approve_bounty_with_curator())]
+		pub fn approve_bounty_with_curator(
+			origin: OriginFor<T>,
+			#[pallet::compact] bounty_id: BountyIndex,
+			curator: AccountIdLookupOf<T>,
+			#[pallet::compact] fee: BalanceOf<T, I>,
+		) -> DispatchResult {
+			let max_amount = T::SpendOrigin::ensure_origin(origin)?;
+			let curator = T::Lookup::lookup(curator)?;
+			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+				// approve bounty
+				let bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
+				ensure!(
+					bounty.value <= max_amount,
+					pallet_treasury::Error::<T, I>::InsufficientPermission
+				);
+				ensure!(bounty.status == BountyStatus::Proposed, Error::<T, I>::UnexpectedStatus);
+				ensure!(fee < bounty.value, Error::<T, I>::InvalidFee);
+
+				BountyApprovals::<T, I>::try_append(bounty_id)
+					.map_err(|()| Error::<T, I>::TooManyQueued)?;
+
+				bounty.status = BountyStatus::ApprovedWithCurator { curator: curator.clone() };
+				bounty.fee = fee;
+
+				Ok(())
+			})?;
+
+			Self::deposit_event(Event::<T, I>::BountyApproved { index: bounty_id });
+			Self::deposit_event(Event::<T, I>::CuratorProposed { bounty_id, curator });
+
+			Ok(())
+		}
 	}
 
 	#[pallet::hooks]
@@ -942,7 +1003,13 @@ impl<T: Config<I>, I: 'static> pallet_treasury::SpendFunds<T, I> for Pallet<T, I
 						if bounty.value <= *budget_remaining {
 							*budget_remaining -= bounty.value;
 
-							bounty.status = BountyStatus::Funded;
+							// jump through the funded phase if we're already approved with curator
+							if let BountyStatus::ApprovedWithCurator { curator } = &bounty.status {
+								bounty.status =
+									BountyStatus::CuratorProposed { curator: curator.clone() };
+							} else {
+								bounty.status = BountyStatus::Funded;
+							}
 
 							// return their deposit.
 							let err_amount = T::Currency::unreserve(&bounty.proposer, bounty.bond);