upgrade nimbus to get auto force-authoring (#1459)

moonbeam-foundation/nimbus#54

pallets/parachain-staking/src/delegation_requests.rs

@@ -307,27 +307,25 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
-	/// Removes the delegator's existing [ScheduledRequest] towards a given collator.
+	/// Removes the delegator's existing [ScheduledRequest] towards a given collator, if exists.
 	/// The state needs to be persisted by the caller of this function.
-	/// Returns [Error::PendingDelegationRequestDNE] if request does not exist.
 	pub(crate) fn delegation_remove_request_with_state(
 		collator: &T::AccountId,
 		delegator: &T::AccountId,
 		state: &mut Delegator<T::AccountId, BalanceOf<T>>,
-	) -> DispatchResultWithPostInfo {
+	) {
 		let mut scheduled_requests = <DelegationScheduledRequests<T>>::get(collator);
 
-		let request_idx = scheduled_requests
+		let maybe_request_idx = scheduled_requests
 			.iter()
-			.position(|x| &x.delegator == delegator)
-			.ok_or(<Error<T>>::PendingDelegationRequestDNE)?;
+			.position(|x| &x.delegator == delegator);
 
-		let request = scheduled_requests.remove(request_idx);
-		let amount = request.action.amount();
-		state.less_total = state.less_total.saturating_sub(amount);
-		<DelegationScheduledRequests<T>>::insert(collator, scheduled_requests);
-
-		Ok(().into())
+		if let Some(request_idx) = maybe_request_idx {
+			let request = scheduled_requests.remove(request_idx);
+			let amount = request.action.amount();
+			state.less_total = state.less_total.saturating_sub(amount);
+			<DelegationScheduledRequests<T>>::insert(collator, scheduled_requests);
+		}
 	}
 
 	/// Returns true if a [ScheduledRequest] exists for a given delegation

pallets/parachain-staking/src/lib.rs

@@ -968,15 +968,15 @@ pub mod pallet {
 						Delegator state also has a record. qed.",
 				);
 				if let Some(remaining) = delegator.rm_delegation(&candidate) {
+					Self::delegation_remove_request_with_state(
+						&candidate,
+						&bond.owner,
+						&mut delegator,
+					);
+
 					if remaining.is_zero() {
 						<DelegatorState<T>>::remove(&bond.owner);
 					} else {
-						Self::delegation_remove_request_with_state(
-							&candidate,
-							&bond.owner,
-							&mut delegator,
-						)
-						.ok(); // ignore DNE error
 						<DelegatorState<T>>::insert(&bond.owner, delegator);
 					}
 				}
@@ -1248,9 +1248,9 @@ pub mod pallet {
 			delegation_count: u32,
 		) -> DispatchResultWithPostInfo {
 			ensure_signed(origin)?;
-			let state = <DelegatorState<T>>::get(&delegator).ok_or(Error::<T>::DelegatorDNE)?;
+			let mut state = <DelegatorState<T>>::get(&delegator).ok_or(Error::<T>::DelegatorDNE)?;
 			state.can_execute_leave::<T>(delegation_count)?;
-			for bond in state.delegations.0 {
+			for bond in state.delegations.0.clone() {
 				if let Err(error) = Self::delegator_leaves_candidate(
 					bond.owner.clone(),
 					delegator.clone(),
@@ -1261,6 +1261,8 @@ pub mod pallet {
 						error
 					);
 				}
+
+				Self::delegation_remove_request_with_state(&bond.owner, &delegator, &mut state);
 			}
 			<DelegatorState<T>>::remove(&delegator);
 			Self::deposit_event(Event::DelegatorLeft {