git.delta.rocks / unique-network / refs/commits / 5a68a95f44d7

difftreelog

fix usage of nesting_budget in pallet-unique

Daniel Shiposha2023-10-11parent: #437764b.patch.diff
in: master

2 files changed

modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -93,8 +93,7 @@
 	use frame_system::{ensure_root, ensure_signed};
 	use pallet_common::{
 		dispatch::{dispatch_tx, CollectionDispatch},
-		CollectionHandle, CommonCollectionOperations, CommonWeightInfo, Pallet as PalletCommon,
-		RefungibleExtensionsWeightInfo,
+		CollectionHandle, CommonWeightInfo, Pallet as PalletCommon, RefungibleExtensionsWeightInfo,
 	};
 	use pallet_evm::account::CrossAccountId;
 	use pallet_structure::weights::WeightInfo as StructureWeightInfo;
@@ -682,9 +681,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.create_item(sender, owner, data, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.create_item(sender, owner, data, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Create multiple items within a collection.
@@ -717,9 +719,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.create_multiple_items(sender, owner, items_data, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.create_multiple_items(sender, owner, items_data, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Add or change collection properties.
@@ -809,9 +814,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.set_token_properties(sender, token_id, properties, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.set_token_properties(sender, token_id, properties, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Delete specified token properties. Currently properties only work with NFTs.
@@ -842,9 +850,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.delete_token_properties(sender, token_id, property_keys, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.delete_token_properties(sender, token_id, property_keys, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Add or change token property permissions of a collection.
@@ -903,9 +914,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.create_multiple_items_ex(sender, data, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.create_multiple_items_ex(sender, data, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Completely allow or disallow transfers for a particular collection.
@@ -1012,9 +1026,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.burn_from(sender, from, item_id, value, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.burn_from(sender, from, item_id, value, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Change ownership of the token.
@@ -1050,9 +1067,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.transfer(sender, recipient, item_id, value, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.transfer(sender, recipient, item_id, value, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Allow a non-permissioned address to transfer or burn an item.
@@ -1156,9 +1176,12 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let budget = Self::structure_nesting_budget();
 
-			Self::dispatch_tx_with_nesting_budget(collection_id, &budget, |d| {
-				d.transfer_from(sender, from, recipient, item_id, value, &budget)
-			})
+			Self::refund_nesting_budget(
+				dispatch_tx::<T, _>(collection_id, |d| {
+					d.transfer_from(sender, from, recipient, item_id, value, &budget)
+				}),
+				budget,
+			)
 		}
 
 		/// Set specific limits of a collection. Empty, or None fields mean chain default.
@@ -1357,24 +1380,18 @@
 
 		fn structure_nesting_budget() -> budget::Value {
 			budget::Value::new(Self::nesting_budget())
-		}
-
-		fn nesting_budget_weight(value: &budget::Value) -> Weight {
-			T::StructureWeightInfo::find_parent().saturating_mul(value.remaining() as u64)
 		}
 
 		fn nesting_budget_predispatch_weight() -> Weight {
-			Self::nesting_budget_weight(&Self::structure_nesting_budget())
+			T::StructureWeightInfo::find_parent().saturating_mul(Self::nesting_budget() as u64)
 		}
 
-		pub fn dispatch_tx_with_nesting_budget<
-			C: FnOnce(&dyn CommonCollectionOperations<T>) -> DispatchResultWithPostInfo,
-		>(
-			collection: CollectionId,
-			budget: &budget::Value,
-			call: C,
+		pub fn refund_nesting_budget(
+			mut result: DispatchResultWithPostInfo,
+			budget: budget::Value,
 		) -> DispatchResultWithPostInfo {
-			let mut result = dispatch_tx::<T, _>(collection, call);
+			let refund_amount = budget.refund_amount();
+			let consumed = Self::nesting_budget() - refund_amount;
 
 			match &mut result {
 				Ok(PostDispatchInfo {
@@ -1387,7 +1404,9 @@
 						..
 					},
 					..
-				}) => *weight += Self::nesting_budget_weight(budget),
+				}) => {
+					*weight += T::StructureWeightInfo::find_parent().saturating_mul(consumed as u64)
+				}
 				_ => {}
 			}
modifiedprimitives/data-structs/src/budget.rsdiffbeforeafterboth
before · primitives/data-structs/src/budget.rs
1use sp_std::cell::Cell;23pub trait Budget {4	/// Returns true while not exceeded5	fn consume(&self) -> bool {6		self.consume_custom(1)7	}8	/// Returns true while not exceeded9	/// Implementations should use interior mutabilitiy10	fn consume_custom(&self, calls: u32) -> bool;11}1213pub struct Unlimited;14impl Budget for Unlimited {15	fn consume_custom(&self, _calls: u32) -> bool {16		true17	}18}1920pub struct Value(Cell<u32>);21impl Value {22	pub fn new(v: u32) -> Self {23		Self(Cell::new(v))24	}25	pub fn remaining(&self) -> u32 {26		self.0.get()27	}28}29impl Budget for Value {30	fn consume_custom(&self, calls: u32) -> bool {31		let (result, overflown) = self.0.get().overflowing_sub(calls);32		if overflown {33			return false;34		}35		self.0.set(result);36		true37	}38}
after · primitives/data-structs/src/budget.rs
1use sp_std::cell::Cell;23pub trait Budget {4	/// Returns true while not exceeded5	fn consume(&self) -> bool {6		self.consume_custom(1)7	}8	/// Returns true while not exceeded9	/// Implementations should use interior mutabilitiy10	fn consume_custom(&self, calls: u32) -> bool;11}1213pub struct Unlimited;14impl Budget for Unlimited {15	fn consume_custom(&self, _calls: u32) -> bool {16		true17	}18}1920pub struct Value(Cell<u32>);21impl Value {22	pub fn new(v: u32) -> Self {23		Self(Cell::new(v))24	}25	pub fn refund_amount(self) -> u32 {26		self.0.get()27	}28}29impl Budget for Value {30	fn consume_custom(&self, calls: u32) -> bool {31		let (result, overflown) = self.0.get().overflowing_sub(calls);32		if overflown {33			return false;34		}35		self.0.set(result);36		true37	}38}