Merge branch 'main' of github.com:frequency-chain/frequency into feat/eth-bridging-development

Author: mattheworris

pallets/msa/src/benchmarking.rs

@@ -353,6 +353,22 @@ mod benchmarks {
 		Ok(())
 	}
 
+	#[benchmark]
+	fn reindex_offchain() -> Result<(), BenchmarkError> {
+		let key = create_account::<T>("account", 0);
+		let caller = whitelisted_caller();
+		let msa_id = 1u64;
+		let event = OffchainReplayEvent::MsaPallet(MsaOffchainReplayEvent::KeyReIndex {
+			msa_id,
+			index_key: Some(key),
+		});
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), event);
+
+		Ok(())
+	}
+
 	impl_benchmark_test_suite!(
 		Msa,
 		crate::tests::mock::new_test_ext_keystore(),

pallets/msa/src/lib.rs

@@ -427,7 +427,7 @@ pub mod pallet {
 				Self::create_account(public_key, |_| -> DispatchResult { Ok(()) })?;
 
 			let event = Event::MsaCreated { msa_id: new_msa_id, key: new_public_key };
-			offchain_index_event::<T>(&event, new_msa_id);
+			offchain_index_event::<T>(Some(&event), new_msa_id);
 			Self::deposit_event(event);
 			Ok(())
 		}
@@ -496,7 +496,7 @@ pub mod pallet {
 
 			let event =
 				Event::MsaCreated { msa_id: new_delegator_msa_id, key: new_delegator_public_key };
-			offchain_index_event::<T>(&event, new_delegator_msa_id);
+			offchain_index_event::<T>(Some(&event), new_delegator_msa_id);
 			Self::deposit_event(event);
 			Self::deposit_event(Event::DelegationGranted {
 				delegator_id: DelegatorId(new_delegator_msa_id),
@@ -688,7 +688,7 @@ pub mod pallet {
 						msa_id,
 						key: add_key_payload.new_public_key.clone(),
 					};
-					offchain_index_event::<T>(&event, msa_id);
+					offchain_index_event::<T>(Some(&event), msa_id);
 					Self::deposit_event(event);
 					Ok(())
 				},
@@ -725,7 +725,7 @@ pub mod pallet {
 
 					// Deposit the event
 					let event = Event::PublicKeyDeleted { key: public_key_to_delete };
-					offchain_index_event::<T>(&event, who_msa_id);
+					offchain_index_event::<T>(Some(&event), who_msa_id);
 					Self::deposit_event(event);
 				},
 				None => {
@@ -811,7 +811,7 @@ pub mod pallet {
 				Some(msa_id) => {
 					Self::delete_key_for_msa(msa_id, &who)?;
 					let event = Event::PublicKeyDeleted { key: who };
-					offchain_index_event::<T>(&event, msa_id);
+					offchain_index_event::<T>(Some(&event), msa_id);
 					Self::deposit_event(event);
 					Self::deposit_event(Event::MsaRetired { msa_id });
 				},
@@ -877,6 +877,35 @@ pub mod pallet {
 			});
 			Ok(())
 		}
+
+		/// A generic endpoint to replay any offchain related event to fix any potential issues
+		#[pallet::call_index(13)]
+		#[pallet::weight(T::WeightInfo::reindex_offchain())]
+		pub fn reindex_offchain(
+			origin: OriginFor<T>,
+			event: OffchainReplayEvent<T>,
+		) -> DispatchResult {
+			let _ = ensure_signed(origin)?;
+			match event {
+				OffchainReplayEvent::MsaPallet(MsaOffchainReplayEvent::KeyReIndex {
+					msa_id,
+					index_key,
+				}) => {
+					// don't need to check existence of msa_id since it would get checked on offchain side
+					match index_key {
+						Some(key) => {
+							let event = Event::PublicKeyAdded { msa_id, key };
+							offchain_index_event::<T>(Some(&event), msa_id);
+						},
+						None => {
+							offchain_index_event::<T>(None, msa_id);
+						},
+					}
+				},
+			}
+
+			Ok(())
+		}
 	}
 }