0.7.0 patch 1 (#227)

* fix: fix the issue of multiple challenge generation events reported

* refactor: oss authorize update return ok(()) when existed

Author: ytqaljn

c-pallets/audit/src/lib.rs

@@ -291,6 +291,8 @@ pub mod pallet {
 		BloomFilterError,
 
 		Submitted,
+
+		Challenging,
 	}
 
 	//Relevant time nodes for storage challenges
@@ -415,12 +417,13 @@ pub mod pallet {
 			let limit = count
 				.checked_mul(2).ok_or(Error::<T>::Overflow)?
 				.checked_div(3).ok_or(Error::<T>::Overflow)?;
-
+			let now = <frame_system::Pallet<T>>::block_number();
+			
 			if ChallengeProposal::<T>::contains_key(&hash) {
 				let proposal = ChallengeProposal::<T>::get(&hash).unwrap();
 				if proposal.0 + 1 >= limit {
 					let cur_blcok = <ChallengeDuration<T>>::get();
-					let now = <frame_system::Pallet<T>>::block_number();
+					
 					if now > cur_blcok {
 						let duration = now.checked_add(&proposal.1.net_snap_shot.life).ok_or(Error::<T>::Overflow)?;
 						<ChallengeDuration<T>>::put(duration);
@@ -435,9 +438,8 @@ pub mod pallet {
 						<VerifyDuration<T>>::put(v_duration);
 						<ChallengeSnapShot<T>>::put(proposal.1);
 						let _ = ChallengeProposal::<T>::clear(ChallengeProposal::<T>::count(), None);
+						Self::deposit_event(Event::<T>::GenerateChallenge);
 					}
-
-					Self::deposit_event(Event::<T>::GenerateChallenge);
 				}
 			} else {
 				if ChallengeProposal::<T>::count() > count {

c-pallets/oss/src/lib.rs

@@ -93,8 +93,9 @@ pub mod pallet {
 			let sender = ensure_signed(origin)?;
 
 			AuthorityList::<T>::try_mutate(&sender, |authority_list| -> DispatchResult {
-				ensure!(!authority_list.contains(&operator), Error::<T>::Existed);
-				authority_list.try_push(operator.clone()).map_err(|_| Error::<T>::BoundedVecError)?;
+				if !authority_list.contains(&operator) {
+					authority_list.try_push(operator.clone()).map_err(|_| Error::<T>::BoundedVecError)?;
+				}
 
 				Ok(())
 			})?;

c-pallets/staking/src/pallet/mod.rs

@@ -1040,7 +1040,7 @@ pub mod pallet {
 
 				// Note: in case there is no current era it is fine to bond one era more.
 				let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get();
-				if let Some(mut chunk) =
+				if let Some(chunk) =
 					ledger.unlocking.last_mut().filter(|chunk| chunk.era == era)
 				{
 					// To keep the chunk count down, we only keep one chunk per era. Since

primitives/enclave-verify/src/lib.rs

@@ -16,9 +16,7 @@ use rsa::{
     PublicKey,
     Pkcs1v15Sign, 
     pkcs1::DecodeRsaPublicKey,
-    pkcs8::DecodePrivateKey,
 };
-use sp_core::bounded::BoundedVec;
 use ic_verify_bls_signature::{
     Signature as BLSSignature,
     PublicKey as BLSPubilc,

runtime/src/lib.rs

@@ -172,7 +172,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	//   `spec_version`, and `authoring_version` are the same between Wasm and native.
 	// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
 	//   the compatible custom types.
-	spec_version: 100,
+	spec_version: 101,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,