fix(kreivo-runtime): add selector to filter out tanks for memberships…

… that are not expired

runtime/kreivo/src/configuration/monetary_stuff.rs

@@ -1,11 +1,12 @@
 use super::*;
 
-use fc_traits_gas_tank::NonFungibleGasTank;
+use fc_traits_gas_tank::{NonFungibleGasTank, SelectNonFungibleItem};
 
 use pallet_asset_tx_payment::FungiblesAdapter;
 use pallet_assets::BalanceToAssetBalance;
 use pallet_transaction_payment::FungibleAdapter;
 use runtime_common::impls::AssetsToBlockAuthor;
+use virto_common::MembershipId;
 
 // #[runtime::pallet_index(10)]
 // pub type Balances
@@ -136,7 +137,22 @@ impl pallet_skip_feeless_payment::Config for Runtime {
 
 // #[runtime::pallet_index(17)]
 // pub type GasTxPayment
-pub type MembershipsGasTank = NonFungibleGasTank<Runtime, CommunityMemberships, pallet_nfts::ItemConfig>;
+
+parameter_types! {
+	pub MembershipIsNotExpired: Box<dyn SelectNonFungibleItem<CommunityId, MembershipId>> =
+		Box::new(|community, membership| {
+			use frame_support::traits::nonfungibles_v2::Inspect;
+			const MEMBERSHIP_EXPIRATION: &[u8] = &*b"membership_expiration";
+			CommunityMemberships::typed_system_attribute(&community, Some(&membership), MEMBERSHIP_EXPIRATION)
+				// If there's an expiration date, check it against block number
+				.map(|expiration| System::block_number() <= expiration)
+				// Otherwise, the membership will not expire
+				.unwrap_or(true)
+		});
+}
+
+pub type MembershipsGasTank =
+	NonFungibleGasTank<Runtime, CommunityMemberships, pallet_nfts::ItemConfig, MembershipIsNotExpired>;
 
 impl pallet_gas_transaction_payment::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;