pallet-bounties: allow bounties to never expire

prdoc/pr_7723.prdoc

@@ -0,0 +1,7 @@
+title: '[pallet-bounties] Make BountyUpdatePeriod optional'
+doc:
+- audience: Runtime Dev
+  description: Refactored `BountyUpdatePeriod` to be optional and adjusted expiration handling to default to `BlockNumber::MAX` when `None`.
+crates:
+- name: pallet-bounties
+  bump: patch

substrate/frame/bounties/src/benchmarking.rs

@@ -152,7 +152,7 @@ benchmarks_instance_pallet! {
 		let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
 		Treasury::<T, I>::on_initialize(frame_system::Pallet::<T>::block_number());
 		let bounty_id = BountyCount::<T, I>::get() - 1;
-		set_block_number::<T, I>(T::SpendPeriod::get() + T::BountyUpdatePeriod::get() + 2u32.into());
+		set_block_number::<T, I>(T::SpendPeriod::get() + T::BountyUpdatePeriod::get().unwrap_or(BlockNumberFor::<T, I>::max_value())  + 2u32.into());
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), bounty_id)
 

substrate/frame/bounties/src/lib.rs

@@ -99,7 +99,10 @@ use frame_support::traits::{
 };
 
 use sp_runtime::{
-	traits::{AccountIdConversion, BadOrigin, BlockNumberProvider, Saturating, StaticLookup, Zero},
+	traits::{
+		AccountIdConversion, BadOrigin, BlockNumberProvider, Bounded, Saturating, StaticLookup,
+		Zero,
+	},
 	DispatchResult, Permill, RuntimeDebug,
 };
 
@@ -221,9 +224,9 @@ pub mod pallet {
 		#[pallet::constant]
 		type BountyDepositPayoutDelay: Get<BlockNumberFor<Self, I>>;
 
-		/// Bounty duration in blocks.
+		/// Optional bounty duration in blocks. If `None`, it is considered `BlockNumber::MAX`.
 		#[pallet::constant]
-		type BountyUpdatePeriod: Get<BlockNumberFor<Self, I>>;
+		type BountyUpdatePeriod: Get<Option<BlockNumberFor<Self, I>>>;
 
 		/// The curator deposit is calculated as a percentage of the curator fee.
 		///
@@ -578,8 +581,9 @@ pub mod pallet {
 						T::Currency::reserve(curator, deposit)?;
 						bounty.curator_deposit = deposit;
 
-						let update_due =
-							Self::treasury_block_number() + T::BountyUpdatePeriod::get();
+						let update_due = Self::treasury_block_number() +
+							T::BountyUpdatePeriod::get()
+								.unwrap_or(BlockNumberFor::<T, I>::max_value());
 						bounty.status =
 							BountyStatus::Active { curator: curator.clone(), update_due };
 
@@ -820,8 +824,10 @@ pub mod pallet {
 				match bounty.status {
 					BountyStatus::Active { ref curator, ref mut update_due } => {
 						ensure!(*curator == signer, Error::<T, I>::RequireCurator);
-						*update_due = (Self::treasury_block_number() +
-							T::BountyUpdatePeriod::get())
+						*update_due = (Self::treasury_block_number().saturating_add(
+							T::BountyUpdatePeriod::get()
+								.unwrap_or(BlockNumberFor::<T, I>::max_value()),
+						))
 						.max(*update_due);
 					},
 					_ => return Err(Error::<T, I>::UnexpectedStatus.into()),

substrate/frame/child-bounties/src/benchmarking.rs

@@ -25,7 +25,7 @@ use frame_support::ensure;
 use frame_system::RawOrigin;
 use pallet_bounties::Pallet as Bounties;
 use pallet_treasury::Pallet as Treasury;
-use sp_runtime::traits::BlockNumberProvider;
+use sp_runtime::traits::{BlockNumberProvider, Bounded};
 
 use crate::*;
 
@@ -273,7 +273,11 @@ mod benchmarks {
 		setup_pot_account::<T>();
 		let bounty_setup = activate_child_bounty::<T>(0, T::MaximumReasonLength::get())?;
 		Treasury::<T>::on_initialize(frame_system::Pallet::<T>::block_number());
-		set_block_number::<T>(T::SpendPeriod::get() + T::BountyUpdatePeriod::get() + 1u32.into());
+		set_block_number::<T>(
+			T::SpendPeriod::get() +
+				T::BountyUpdatePeriod::get().unwrap_or(BlockNumberFor::<T>::max_value()) +
+				1u32.into(),
+		);
 		let caller = whitelisted_caller();
 
 		#[extrinsic_call]