From ea3a682dbe543cc72a28f2a44c4654a4f78d4d70 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Wed, 28 Jul 2021 09:00:17 +0000
Subject: [PATCH] fix: only enable sponsoring if rate limit is on


---
--- a/pallets/contract-helpers/src/lib.rs
+++ b/pallets/contract-helpers/src/lib.rs
@@ -72,9 +72,18 @@
 		Hasher2 = Twox128,
 		Key2 = T::AccountId,
 		Value = T::BlockNumber,
-		QueryKind = OptionQuery,
+		QueryKind = ValueQuery,
 	>;
 
+	impl<T: Config> Pallet<T> {
+		pub fn allowed(contract: T::AccountId, user: T::AccountId, default: bool) -> bool {
+			if !<AllowlistEnabled<T>>::get(&contract) {
+				return default;
+			}
+			<Allowlist<T>>::get(&contract, &user) || <Owner<T>>::get(contract) == user
+		}
+	}
+
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(0)]
@@ -194,10 +203,7 @@
 			{
 				let called_contract: T::AccountId =
 					T::Lookup::lookup((*dest).clone()).unwrap_or_default();
-				if <AllowlistEnabled<T>>::get(&called_contract)
-					&& !<Allowlist<T>>::get(&called_contract, who)
-					&& &<Owner<T>>::get(&called_contract) != who
-				{
+				if !<Pallet<T>>::allowed(called_contract, who.clone(), true) {
 					return Err(transaction_validity::InvalidTransaction::Call.into());
 				}
 			}
@@ -254,7 +260,9 @@
 			{
 				let called_contract: T::AccountId =
 					T::Lookup::lookup((*dest).clone()).unwrap_or_default();
-				if <SelfSponsoring<T>>::get(&called_contract) {
+				if <SelfSponsoring<T>>::get(&called_contract)
+					&& <Pallet<T>>::allowed(called_contract.clone(), who.clone(), false)
+				{
 					let last_tx_block = SponsorBasket::<T>::get(&called_contract, &who);
 					let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
 					let rate_limit = SponsoringRateLimit::<T>::get(&called_contract);

-- 
gitstuff