From ec38bfa9c98f6205e12669b69c0569f738743d23 Mon Sep 17 00:00:00 2001 From: tuxmain <tuxmain@zettascript.org> Date: Sat, 9 Sep 2023 15:40:27 +0200 Subject: [PATCH] fix(distance): Remember account_id who reserved --- pallets/distance/src/lib.rs | 41 ++++++++++++++---------- resources/metadata.scale | Bin 133378 -> 133609 bytes runtime/common/src/providers.rs | 6 ++-- runtime/gdev/tests/integration_tests.rs | 15 +++++++-- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/pallets/distance/src/lib.rs b/pallets/distance/src/lib.rs index b9720a57f..fc5737ea9 100644 --- a/pallets/distance/src/lib.rs +++ b/pallets/distance/src/lib.rs @@ -126,7 +126,7 @@ pub mod pallet { _, Twox64Concat, <T as pallet_certification::Config<I>>::IdtyIndex, - DistanceStatus, + (<T as frame_system::Config>::AccountId, DistanceStatus), OptionQuery, >; @@ -242,7 +242,7 @@ pub mod pallet { pub fn force_set_distance_status( origin: OriginFor<T>, identity: <T as pallet_certification::Config<I>>::IdtyIndex, - status: Option<DistanceStatus>, + status: Option<(<T as frame_system::Config>::AccountId, DistanceStatus)>, ) -> DispatchResult { ensure_root(origin)?; @@ -322,7 +322,10 @@ pub mod pallet { .try_push((idty_index, median::MedianAcc::new())) .map_err(|_| Error::<T, I>::QueueFull)?; - IdentityDistanceStatus::<T, I>::insert(idty_index, DistanceStatus::Pending); + IdentityDistanceStatus::<T, I>::insert( + idty_index, + (who, DistanceStatus::Pending), + ); DistanceStatusExpireOn::<T, I>::mutate( pallet_session::CurrentIndex::<T>::get() + T::ResultExpiration::get(), @@ -385,32 +388,36 @@ pub mod pallet { 100, //<T as Config<I>>::MaxEvaluatorsPerSession, > = Pallet::<T, I>::take_current_pool(index); for (idty, median_acc) in current_pool.0.into_iter() { - let Some(idty_value) = - pallet_identity::Identities::<T>::get(idty) else {continue}; - let account_id = idty_value.owner_key; if let Some(median_result) = median_acc.get_median() { let median = match median_result { MedianResult::One(m) => m, MedianResult::Two(m1, m2) => m1 + (m2 - m1) / 2, // Avoid overflow (since max is 1) }; if median >= T::MinAccessibleReferees::get() { - IdentityDistanceStatus::<T, I>::mutate(idty, |status| { - *status = Some(DistanceStatus::Valid) + IdentityDistanceStatus::<T, I>::mutate(idty, |entry| { + entry.as_mut().map(|(account_id, status)| { + T::Currency::unreserve( + account_id, + <T as Config<I>>::EvaluationPrice::get(), + ); + *status = DistanceStatus::Valid; + }) }); - T::Currency::unreserve( - &account_id, - <T as Config<I>>::EvaluationPrice::get(), - ); - } else { - IdentityDistanceStatus::<T, I>::remove(idty); + } else if let Some((account_id, _status)) = + IdentityDistanceStatus::<T, I>::take(idty) + { <T as Config<I>>::Currency::slash_reserved( &account_id, <T as Config<I>>::EvaluationPrice::get(), ); } - } else { - IdentityDistanceStatus::<T, I>::remove(idty); - T::Currency::unreserve(&account_id, <T as Config<I>>::EvaluationPrice::get()); + } else if let Some((account_id, _status)) = + IdentityDistanceStatus::<T, I>::take(idty) + { + <T as Config<I>>::Currency::unreserve( + &account_id, + <T as Config<I>>::EvaluationPrice::get(), + ); } } Weight::zero() diff --git a/resources/metadata.scale b/resources/metadata.scale index 50671f6abfc29105bbfd0d68104bc525fde27b4f..cff4a76115715c21574516f2db1f6534fc94a9c8 100644 GIT binary patch delta 7739 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 PiIusjc_pf>9g?g7iF$;c delta 7428 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 diff --git a/runtime/common/src/providers.rs b/runtime/common/src/providers.rs index 09010882b..cab5f76fa 100644 --- a/runtime/common/src/providers.rs +++ b/runtime/common/src/providers.rs @@ -117,7 +117,9 @@ where I: 'static, { fn is_distance_ok(idty_id: &<T as pallet_certification::Config<I>>::IdtyIndex) -> bool { - pallet_distance::Pallet::<T, I>::identity_distance_status(idty_id) - == Some(pallet_distance::DistanceStatus::Valid) + matches!( + pallet_distance::Pallet::<T, I>::identity_distance_status(idty_id), + Some((_, pallet_distance::DistanceStatus::Valid)) + ) } } diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs index edf2007d7..47f7eef77 100644 --- a/runtime/gdev/tests/integration_tests.rs +++ b/runtime/gdev/tests/integration_tests.rs @@ -346,7 +346,10 @@ fn test_ud_claimed_membership_on_and_off() { assert_ok!(Distance::force_set_distance_status( frame_system::RawOrigin::Root.into(), 1, - Some(pallet_distance::DistanceStatus::Valid) + Some(( + AccountKeyring::Alice.to_account_id(), + pallet_distance::DistanceStatus::Valid + )) )); assert_ok!(Membership::claim_membership( frame_system::RawOrigin::Signed(AccountKeyring::Alice.to_account_id()).into() @@ -669,7 +672,10 @@ fn test_validate_new_idty_after_few_uds() { assert_ok!(Distance::force_set_distance_status( frame_system::RawOrigin::Root.into(), 5, - Some(pallet_distance::DistanceStatus::Valid) + Some(( + AccountKeyring::Bob.to_account_id(), + pallet_distance::DistanceStatus::Valid + )) )); assert_ok!(Identity::validate_identity( frame_system::RawOrigin::Signed(AccountKeyring::Bob.to_account_id()).into(), @@ -727,7 +733,10 @@ fn test_claim_memberhsip_after_few_uds() { assert_ok!(Distance::force_set_distance_status( frame_system::RawOrigin::Root.into(), 5, - Some(pallet_distance::DistanceStatus::Valid) + Some(( + AccountKeyring::Eve.to_account_id(), + pallet_distance::DistanceStatus::Valid + )) )); assert_ok!(Membership::claim_membership( frame_system::RawOrigin::Signed(AccountKeyring::Eve.to_account_id()).into(), -- GitLab