full unbond instead

Author: dharjeezy

polkadot/runtime/westend/src/weights/pallet_staking.rs

@@ -801,7 +801,7 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 
-	fn force_unbond() -> Weight {
+	fn full_unbond() -> Weight {
 		todo!()
 	}
 }

prdoc/pr_3629.prdoc

@@ -0,0 +1,10 @@
+title: "[pallet_staking] Staking `full_unbond`"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Full unbond when staking such that to fully unbond as a validator or nominator, chilled occurs first
+      before unbonding
+
+crates:
+  - name: pallet-staking

prdoc/pr_3811.prdoc

@@ -953,7 +953,7 @@ benchmarks! {
 		assert_eq!(MinCommission::<T>::get(), Perbill::from_percent(100));
 	}
 
-	force_unbond {
+	full_unbond {
 		// clean up any existing state.
 		clear_validators_and_nominators::<T>();
 
@@ -972,7 +972,7 @@ benchmarks! {
 		let original_bonded: BalanceOf<T> = ledger.active;
 
 		whitelist_account!(controller);
-	}: _(RawOrigin::Signed(controller.clone()), original_bonded)
+	}: _(RawOrigin::Signed(controller.clone()))
 	verify {
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created after")?;
 		let new_bonded: BalanceOf<T> = ledger.active;

substrate/frame/staking/src/benchmarking.rs

@@ -1909,37 +1909,24 @@ pub mod pallet {
 			Ok(Some(T::WeightInfo::deprecate_controller_batch(controllers.len() as u32)).into())
 		}
 
-		/// Forcefully Unbonds by Chilling first
+		/// Fully Unbonds by Chilling first
 		/// Emits `Unbonded`.
 		#[pallet::call_index(29)]
 		#[pallet::weight(
-		T::WeightInfo::withdraw_unbonded_kill(SPECULATIVE_NUM_SPANS).saturating_add(T::WeightInfo::force_unbond()))
+		T::WeightInfo::withdraw_unbonded_kill(SPECULATIVE_NUM_SPANS).saturating_add(T::WeightInfo::full_unbond()))
 		]
-		pub fn force_unbond(
-			origin: OriginFor<T>,
-			#[pallet::compact] value: BalanceOf<T>,
-		) -> DispatchResultWithPostInfo {
+		pub fn full_unbond(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let controller = ensure_signed(origin)?;
 
 			let ledger = Self::ledger(StakingAccount::Controller(controller.clone()))?;
 
-			let min_active_bond = if Nominators::<T>::contains_key(&ledger.stash) {
-				MinNominatorBond::<T>::get()
-			} else if Validators::<T>::contains_key(&ledger.stash) {
-				MinValidatorBond::<T>::get()
-			} else {
-				Zero::zero()
-			};
-
-			if (ledger.active - value) <= min_active_bond {
-				Self::chill_stash(&ledger.stash);
-			}
+			Self::chill_stash(&ledger.stash);
 
-			let maybe_withdraw_weight = Self::do_unbond(controller, value)?;
+			let maybe_withdraw_weight = Self::do_unbond(controller, ledger.active)?;
 			let actual_weight = if let Some(withdraw_weight) = maybe_withdraw_weight {
-				Some(T::WeightInfo::force_unbond().saturating_add(withdraw_weight))
+				Some(T::WeightInfo::full_unbond().saturating_add(withdraw_weight))
 			} else {
-				Some(T::WeightInfo::force_unbond())
+				Some(T::WeightInfo::full_unbond())
 			};
 
 			Ok(actual_weight.into())

substrate/frame/staking/src/pallet/mod.rs

@@ -4070,7 +4070,7 @@ fn test_multi_page_payout_stakers_by_page() {
 }
 
 #[test]
-fn force_unbond_works() {
+fn full_unbond_works() {
 	//
 	// * Should test
 	// * Given an account being bonded [and chosen as a validator](not mandatory)
@@ -4107,7 +4107,7 @@ fn force_unbond_works() {
 		);
 
 		// Force Unbond all of the funds in stash which makes the call to chill first.
-		let res = Staking::force_unbond(RuntimeOrigin::signed(11), 1000);
+		let res = Staking::full_unbond(RuntimeOrigin::signed(11));
 		assert!(res.is_ok());
 	})
 }