git.delta.rocks / unique-network / refs/commits / e0a717015a56

difftreelog

chore fix code review requests

Grigoriy Simonov2022-12-06parent: #cd0ba0d.patch.diff
in: master

36 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -248,8 +248,8 @@
 	) -> Result<Option<String>>;
 
 	/// Get whether an operator is approved by a given owner.
-	#[method(name = "unique_isApprovedForAll")]
-	fn is_approved_for_all(
+	#[method(name = "unique_allowanceForAll")]
+	fn allowance_for_all(
 		&self,
 		collection: CollectionId,
 		owner: CrossAccountId,
@@ -579,7 +579,7 @@
 	pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);
 	pass_method!(total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<String> => |o| o.map(|number| number.to_string()) , unique_api);
 	pass_method!(token_owners(collection: CollectionId, token: TokenId) -> Vec<CrossAccountId>, unique_api);
-	pass_method!(is_approved_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> bool, unique_api);
+	pass_method!(allowance_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> bool, unique_api);
 }
 
 impl<C, Block, BlockNumber, CrossAccountId, AccountId>
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1535,7 +1535,7 @@
 	fn token_owner() -> Weight;
 
 	/// The price of setting approval for all
-	fn set_approval_for_all() -> Weight;
+	fn set_allowance_for_all() -> Weight;
 }
 
 /// Weight info extension trait for refungible pallet.
@@ -1844,11 +1844,11 @@
 	/// Get extension for RFT collection.
 	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>>;
 
-	/// An operator is allowed to transfer all tokens of the sender on their behalf.
+	/// The `operator` is allowed to transfer all tokens of the `owner` on their behalf.
 	/// * `owner` - Token owner
 	/// * `operator` - Operator
 	/// * `approve` - Should operator status be granted or revoked?
-	fn set_approval_for_all(
+	fn set_allowance_for_all(
 		&self,
 		owner: T::CrossAccountId,
 		operator: T::CrossAccountId,
@@ -1856,7 +1856,7 @@
 	) -> DispatchResultWithPostInfo;
 
 	/// Tells whether the given `owner` approves the `operator`.
-	fn is_approved_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool;
+	fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool;
 }
 
 /// Extension for RFT collection.
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -108,7 +108,7 @@
 		Weight::zero()
 	}
 
-	fn set_approval_for_all() -> Weight {
+	fn set_allowance_for_all() -> Weight {
 		Weight::zero()
 	}
 }
@@ -429,7 +429,7 @@
 		<TotalSupply<T>>::try_get(self.id).ok()
 	}
 
-	fn set_approval_for_all(
+	fn set_allowance_for_all(
 		&self,
 		_owner: T::CrossAccountId,
 		_operator: T::CrossAccountId,
@@ -438,7 +438,7 @@
 		fail!(<Error<T>>::SettingApprovalForAllNotAllowed)
 	}
 
-	fn is_approved_for_all(&self, _owner: T::CrossAccountId, _operator: T::CrossAccountId) -> bool {
+	fn allowance_for_all(&self, _owner: T::CrossAccountId, _operator: T::CrossAccountId) -> bool {
 		false
 	}
 }
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -223,17 +223,17 @@
 
 	}: {collection.token_owner(item)}
 
-	set_approval_for_all {
+	set_allowance_for_all {
 		bench_init!{
 			owner: sub; collection: collection(owner);
 			operator: cross_from_sub(owner); owner: cross_sub;
 		};
-	}: {<Pallet<T>>::set_approval_for_all(&collection, &owner, &operator, true)}
+	}: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)}
 
-	is_approved_for_all {
+	allowance_for_all {
 		bench_init!{
 			owner: sub; collection: collection(owner);
 			operator: cross_from_sub(owner); owner: cross_sub;
 		};
-	}: {<Pallet<T>>::is_approved_for_all(&collection, &owner, &operator)}
+	}: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}
 }
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -123,8 +123,8 @@
 		<SelfWeightOf<T>>::token_owner()
 	}
 
-	fn set_approval_for_all() -> Weight {
-		<SelfWeightOf<T>>::set_approval_for_all()
+	fn set_allowance_for_all() -> Weight {
+		<SelfWeightOf<T>>::set_allowance_for_all()
 	}
 }
 
@@ -517,19 +517,19 @@
 		}
 	}
 
-	fn set_approval_for_all(
+	fn set_allowance_for_all(
 		&self,
 		owner: T::CrossAccountId,
 		operator: T::CrossAccountId,
 		approve: bool,
 	) -> DispatchResultWithPostInfo {
 		with_weight(
-			<Pallet<T>>::set_approval_for_all(self, &owner, &operator, approve),
-			<CommonWeights<T>>::set_approval_for_all(),
+			<Pallet<T>>::set_allowance_for_all(self, &owner, &operator, approve),
+			<CommonWeights<T>>::set_allowance_for_all(),
 		)
 	}
 
-	fn is_approved_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {
-		<Pallet<T>>::is_approved_for_all(self, &owner, &operator)
+	fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {
+		<Pallet<T>>::allowance_for_all(self, &owner, &operator)
 	}
 }
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -472,8 +472,8 @@
 	/// @notice Sets or unsets the approval of a given operator.
 	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.
 	/// @param operator Operator
-	/// @param approved Is operator enabled or disabled
-	#[weight(<SelfWeightOf<T>>::set_approval_for_all())]
+	/// @param approved Should operator status be granted or revoked?
+	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]
 	fn set_approval_for_all(
 		&mut self,
 		caller: caller,
@@ -483,7 +483,7 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let operator = T::CrossAccountId::from_eth(operator);
 
-		<Pallet<T>>::set_approval_for_all(self, &caller, &operator, approved)
+		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)
 			.map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
@@ -494,13 +494,13 @@
 		Err("not implemented".into())
 	}
 
-	/// @notice Tells whether an operator is approved by a given owner.
-	#[weight(<SelfWeightOf<T>>::is_approved_for_all())]
+	/// @notice Tells whether the given `owner` approves the `operator`.
+	#[weight(<SelfWeightOf<T>>::allowance_for_all())]
 	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {
 		let owner = T::CrossAccountId::from_eth(owner);
 		let operator = T::CrossAccountId::from_eth(operator);
 
-		Ok(<Pallet<T>>::is_approved_for_all(self, &owner, &operator))
+		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
 	}
 
 	/// @notice Returns collection helper contract address
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -274,7 +274,7 @@
 
 	/// Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.
 	#[pallet::storage]
-	pub type WalletOperator<T: Config> = StorageNMap<
+	pub type CollectionAllowance<T: Config> = StorageNMap<
 		Key = (
 			Key<Twox64Concat, CollectionId>,
 			Key<Blake2_128Concat, T::CrossAccountId>,
@@ -450,7 +450,7 @@
 		<TokensBurnt<T>>::remove(id);
 		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);
 		let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);
-		let _ = <WalletOperator<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <CollectionAllowance<T>>::clear_prefix((id,), u32::MAX, None);
 		Ok(())
 	}
 
@@ -1206,7 +1206,7 @@
 		if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {
 			return Ok(());
 		}
-		if <WalletOperator<T>>::get((collection.id, from, spender)) == Some(true) {
+		if <CollectionAllowance<T>>::get((collection.id, from, spender)) {
 			return Ok(());
 		}
 		ensure!(
@@ -1345,11 +1345,11 @@
 
 	/// Sets or unsets the approval of a given operator.
 	///
-	/// An operator is allowed to transfer all token pieces of the sender on their behalf.
+	/// The `operator` is allowed to transfer all token pieces of the `owner` on their behalf.
 	/// - `owner`: Token owner
 	/// - `operator`: Operator
-	/// - `approve`: Is operator enabled or disabled
-	pub fn set_approval_for_all(
+	/// - `approve`: Should operator status be granted or revoked?
+	pub fn set_allowance_for_all(
 		collection: &NonfungibleHandle<T>,
 		owner: &T::CrossAccountId,
 		operator: &T::CrossAccountId,
@@ -1364,7 +1364,7 @@
 
 		// =========
 
-		<WalletOperator<T>>::insert((collection.id, owner, operator), approve);
+		<CollectionAllowance<T>>::insert((collection.id, owner, operator), approve);
 		<PalletEvm<T>>::deposit_log(
 			ERC721Events::ApprovalForAll {
 				owner: *owner.as_eth(),
@@ -1382,12 +1382,12 @@
 		Ok(())
 	}
 
-	/// Tells whether an operator is approved by a given owner.
-	pub fn is_approved_for_all(
+	/// Tells whether the given `owner` approves the `operator`.
+	pub fn allowance_for_all(
 		collection: &NonfungibleHandle<T>,
 		owner: &T::CrossAccountId,
 		operator: &T::CrossAccountId,
 	) -> bool {
-		<WalletOperator<T>>::get((collection.id, owner, operator)).unwrap_or(false)
+		<CollectionAllowance<T>>::get((collection.id, owner, operator))
 	}
 }
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -1021,9 +1021,9 @@
 	}
 
 	/// @notice Sets or unsets the approval of a given operator.
-	///  An operator is allowed to transfer all tokens of the sender on their behalf.
+	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.
 	/// @param operator Operator
-	/// @param approved Is operator enabled or disabled
+	/// @param approved Should operator status be granted or revoked?
 	/// @dev EVM selector for this function is: 0xa22cb465,
 	///  or in textual repr: setApprovalForAll(address,bool)
 	function setApprovalForAll(address operator, bool approved) public {
@@ -1043,7 +1043,7 @@
 		return 0x0000000000000000000000000000000000000000;
 	}
 
-	/// @notice Tells whether an operator is approved by a given owner.
+	/// @notice Tells whether the given `owner` approves the `operator`.
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) public view returns (bool) {
modifiedpallets/nonfungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -48,8 +48,8 @@
 	fn set_token_properties(b: u32, ) -> Weight;
 	fn delete_token_properties(b: u32, ) -> Weight;
 	fn token_owner() -> Weight;
-	fn set_approval_for_all() -> Weight;
-	fn is_approved_for_all() -> Weight;
+	fn set_allowance_for_all() -> Weight;
+	fn allowance_for_all() -> Weight;
 }
 
 /// Weights for pallet_nonfungible using the Substrate node and recommended hardware.
@@ -199,12 +199,12 @@
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 	}
 	// Storage: Nonfungible WalletOperator (r:0 w:1)
-	fn set_approval_for_all() -> Weight {
+	fn set_allowance_for_all() -> Weight {
 		Weight::from_ref_time(16_231_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible WalletOperator (r:1 w:0)
-	fn is_approved_for_all() -> Weight {
+	fn allowance_for_all() -> Weight {
 		Weight::from_ref_time(6_161_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 	}
@@ -356,12 +356,12 @@
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 	}
 	// Storage: Nonfungible WalletOperator (r:0 w:1)
-	fn set_approval_for_all() -> Weight {
+	fn set_allowance_for_all() -> Weight {
 		Weight::from_ref_time(16_231_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Nonfungible WalletOperator (r:1 w:0)
-	fn is_approved_for_all() -> Weight {
+	fn allowance_for_all() -> Weight {
 		Weight::from_ref_time(6_161_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 	}
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -291,17 +291,17 @@
 		let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;
 	}: {<Pallet<T>>::token_owner(collection.id, item)}
 
-	set_approval_for_all {
+	set_allowance_for_all {
 		bench_init!{
 			owner: sub; collection: collection(owner);
 			operator: cross_from_sub(owner); owner: cross_sub;
 		};
-	}: {<Pallet<T>>::set_approval_for_all(&collection, &owner, &operator, true)}
+	}: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)}
 
-	is_approved_for_all {
+	allowance_for_all {
 		bench_init!{
 			owner: sub; collection: collection(owner);
 			operator: cross_from_sub(owner); owner: cross_sub;
 		};
-	}: {<Pallet<T>>::is_approved_for_all(&collection, &owner, &operator)}
+	}: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}
 }
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -153,8 +153,8 @@
 		<SelfWeightOf<T>>::token_owner()
 	}
 
-	fn set_approval_for_all() -> Weight {
-		<SelfWeightOf<T>>::set_approval_for_all()
+	fn set_allowance_for_all() -> Weight {
+		<SelfWeightOf<T>>::set_allowance_for_all()
 	}
 }
 
@@ -521,20 +521,20 @@
 		<Pallet<T>>::total_pieces(self.id, token)
 	}
 
-	fn set_approval_for_all(
+	fn set_allowance_for_all(
 		&self,
 		owner: T::CrossAccountId,
 		operator: T::CrossAccountId,
 		approve: bool,
 	) -> DispatchResultWithPostInfo {
 		with_weight(
-			<Pallet<T>>::set_approval_for_all(self, &owner, &operator, approve),
-			<CommonWeights<T>>::set_approval_for_all(),
+			<Pallet<T>>::set_allowance_for_all(self, &owner, &operator, approve),
+			<CommonWeights<T>>::set_allowance_for_all(),
 		)
 	}
 
-	fn is_approved_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {
-		<Pallet<T>>::is_approved_for_all(self, &owner, &operator)
+	fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool {
+		<Pallet<T>>::allowance_for_all(self, &owner, &operator)
 	}
 }
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -462,10 +462,10 @@
 	}
 
 	/// @notice Sets or unsets the approval of a given operator.
-	///  An operator is allowed to transfer all tokens of the sender on their behalf.
+	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.
 	/// @param operator Operator
-	/// @param approved Is operator enabled or disabled
-	#[weight(<SelfWeightOf<T>>::set_approval_for_all())]
+	/// @param approved Should operator status be granted or revoked?
+	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]
 	fn set_approval_for_all(
 		&mut self,
 		caller: caller,
@@ -475,7 +475,7 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let operator = T::CrossAccountId::from_eth(operator);
 
-		<Pallet<T>>::set_approval_for_all(self, &caller, &operator, approved)
+		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)
 			.map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
@@ -486,13 +486,13 @@
 		Err("not implemented".into())
 	}
 
-	/// @notice Tells whether an operator is approved by a given owner.
-	#[weight(<SelfWeightOf<T>>::is_approved_for_all())]
+	/// @notice Tells whether the given `owner` approves the `operator`.
+	#[weight(<SelfWeightOf<T>>::allowance_for_all())]
 	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {
 		let owner = T::CrossAccountId::from_eth(owner);
 		let operator = T::CrossAccountId::from_eth(operator);
 
-		Ok(<Pallet<T>>::is_approved_for_all(self, &owner, &operator))
+		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
 	}
 
 	/// @notice Returns collection helper contract address
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -275,14 +275,14 @@
 
 	/// Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.
 	#[pallet::storage]
-	pub type WalletOperator<T: Config> = StorageNMap<
+	pub type CollectionAllowance<T: Config> = StorageNMap<
 		Key = (
 			Key<Twox64Concat, CollectionId>,
 			Key<Blake2_128Concat, T::CrossAccountId>,
 			Key<Blake2_128Concat, T::CrossAccountId>,
 		),
 		Value = bool,
-		QueryKind = OptionQuery,
+		QueryKind = ValueQuery,
 	>;
 
 	#[pallet::hooks]
@@ -1174,8 +1174,8 @@
 		let allowance =
 			<Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);
 
-		// Allowance if any would be reduced if spender is also wallet operator
-		if <WalletOperator<T>>::get((collection.id, from, spender)) == Some(true) {
+		// Allowance (if any) would be reduced if spender is also wallet operator
+		if <CollectionAllowance<T>>::get((collection.id, from, spender)) {
 			return Ok(allowance);
 		}
 
@@ -1408,11 +1408,11 @@
 
 	/// Sets or unsets the approval of a given operator.
 	///
-	/// An operator is allowed to transfer all tokens of the sender on their behalf.
+	/// The `operator` is allowed to transfer all token pieces of the `owner` on their behalf.
 	/// - `owner`: Token owner
 	/// - `operator`: Operator
-	/// - `approve`: Is operator enabled or disabled
-	pub fn set_approval_for_all(
+	/// - `approve`: Should operator status be granted or revoked?
+	pub fn set_allowance_for_all(
 		collection: &RefungibleHandle<T>,
 		owner: &T::CrossAccountId,
 		operator: &T::CrossAccountId,
@@ -1427,7 +1427,7 @@
 
 		// =========
 
-		<WalletOperator<T>>::insert((collection.id, owner, operator), approve);
+		<CollectionAllowance<T>>::insert((collection.id, owner, operator), approve);
 		<PalletEvm<T>>::deposit_log(
 			ERC721Events::ApprovalForAll {
 				owner: *owner.as_eth(),
@@ -1445,12 +1445,12 @@
 		Ok(())
 	}
 
-	/// Tells whether an operator is approved by a given owner.
-	pub fn is_approved_for_all(
+	/// Tells whether the given `owner` approves the `operator`.
+	pub fn allowance_for_all(
 		collection: &RefungibleHandle<T>,
 		owner: &T::CrossAccountId,
 		operator: &T::CrossAccountId,
 	) -> bool {
-		<WalletOperator<T>>::get((collection.id, owner, operator)).unwrap_or(false)
+		<CollectionAllowance<T>>::get((collection.id, owner, operator))
 	}
 }
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -1018,9 +1018,9 @@
 	}
 
 	/// @notice Sets or unsets the approval of a given operator.
-	///  An operator is allowed to transfer all tokens of the sender on their behalf.
+	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.
 	/// @param operator Operator
-	/// @param approved Is operator enabled or disabled
+	/// @param approved Should operator status be granted or revoked?
 	/// @dev EVM selector for this function is: 0xa22cb465,
 	///  or in textual repr: setApprovalForAll(address,bool)
 	function setApprovalForAll(address operator, bool approved) public {
@@ -1040,7 +1040,7 @@
 		return 0x0000000000000000000000000000000000000000;
 	}
 
-	/// @notice Tells whether an operator is approved by a given owner.
+	/// @notice Tells whether the given `owner` approves the `operator`.
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) public view returns (bool) {
modifiedpallets/refungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -55,8 +55,8 @@
 	fn delete_token_properties(b: u32, ) -> Weight;
 	fn repartition_item() -> Weight;
 	fn token_owner() -> Weight;
-	fn set_approval_for_all() -> Weight;
-	fn is_approved_for_all() -> Weight;
+	fn set_allowance_for_all() -> Weight;
+	fn allowance_for_all() -> Weight;
 }
 
 /// Weights for pallet_refungible using the Substrate node and recommended hardware.
@@ -263,12 +263,12 @@
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 	}
 	// Storage: Refungible WalletOperator (r:0 w:1)
-	fn set_approval_for_all() -> Weight {
+	fn set_allowance_for_all() -> Weight {
 		Weight::from_ref_time(16_150_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible WalletOperator (r:1 w:0)
-	fn is_approved_for_all() -> Weight {
+	fn allowance_for_all() -> Weight {
 		Weight::from_ref_time(5_901_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 	}
@@ -477,12 +477,12 @@
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 	}
 	// Storage: Refungible WalletOperator (r:0 w:1)
-	fn set_approval_for_all() -> Weight {
+	fn set_allowance_for_all() -> Weight {
 		Weight::from_ref_time(16_150_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Refungible WalletOperator (r:1 w:0)
-	fn is_approved_for_all() -> Weight {
+	fn allowance_for_all() -> Weight {
 		Weight::from_ref_time(5_901_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 	}
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -36,7 +36,7 @@
 use sp_std::vec;
 use up_data_structs::{
 	CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix,
-	CreateCollectionData, CollectionId,
+	CreateCollectionData,
 };
 
 use crate::{weights::WeightInfo, Config, SelfWeightOf};
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -1129,15 +1129,15 @@
 
 		/// Sets or unsets the approval of a given operator.
 		///
-		/// An operator is allowed to transfer all tokens of the sender on their behalf.
+		/// The `operator` is allowed to transfer all tokens of the `owner` on their behalf.
 		///
 		/// # Arguments
 		///
 		/// * `owner`: Token owner
 		/// * `operator`: Operator
-		/// * `approve`: Is operator enabled or disabled
-		#[weight = T::CommonWeightInfo::set_approval_for_all()]
-		pub fn set_approval_for_all(
+		/// * `approve`: Should operator status be granted or revoked?
+		#[weight = T::CommonWeightInfo::set_allowance_for_all()]
+		pub fn set_allowance_for_all(
 			origin,
 			collection_id: CollectionId,
 			operator: T::CrossAccountId,
@@ -1145,7 +1145,7 @@
 		) -> DispatchResultWithPostInfo {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			dispatch_tx::<T, _>(collection_id, |d| {
-				d.set_approval_for_all(sender, operator, approve)
+				d.set_allowance_for_all(sender, operator, approve)
 			})
 		}
 	}
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -134,6 +134,6 @@
 		fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec<CrossAccountId>>;
 
 		/// Get whether an operator is approved by a given owner.
-		fn is_approved_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> Result<bool>;
+		fn allowance_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> Result<bool>;
 	}
 }
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -188,8 +188,8 @@
                     dispatch_unique_runtime!(collection.total_pieces(token_id))
                 }
 
-		        fn is_approved_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> Result<bool, DispatchError> {
-                    dispatch_unique_runtime!(collection.is_approved_for_all(owner, operator))
+		        fn allowance_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> Result<bool, DispatchError> {
+                    dispatch_unique_runtime!(collection.allowance_for_all(owner, operator))
                 }
             }
modifiedruntime/common/weights.rsdiffbeforeafterboth
--- a/runtime/common/weights.rs
+++ b/runtime/common/weights.rs
@@ -121,8 +121,8 @@
 		max_weight_of!(token_owner())
 	}
 
-	fn set_approval_for_all() -> Weight {
-		max_weight_of!(set_approval_for_all())
+	fn set_allowance_for_all() -> Weight {
+		max_weight_of!(set_allowance_for_all())
 	}
 }
modifiedtests/src/approve.test.tsdiffbeforeafterboth
before · tests/src/approve.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {IKeyringPair} from '@polkadot/types/types';18import {expect, itSub, Pallets, usingPlaygrounds} from './util';192021describe('Integration Test approve(spender, collection_id, item_id, amount):', () => {22  let alice: IKeyringPair;23  let bob: IKeyringPair;24  let charlie: IKeyringPair;2526  before(async () => {27    await usingPlaygrounds(async (helper, privateKey) => {28      const donor = await privateKey({filename: __filename});29      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);30    });31  });3233  itSub('[nft] Execute the extrinsic and check approvedList', async ({helper}) => {34    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});35    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});36    await helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});37    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.true;38  });3940  itSub('[fungible] Execute the extrinsic and check approvedList', async ({helper}) => {41    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);42    await helper.ft.mintTokens(alice, collectionId, 10n, {Substrate: alice.address});43    const tokenId = await helper.ft.getLastTokenId(collectionId);44    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});45    const amount = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});46    expect(amount).to.be.equal(BigInt(1));47  });4849  itSub.ifWithPallets('[refungible] Execute the extrinsic and check approvedList', [Pallets.ReFungible], async ({helper}) => {50    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});51    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});52    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});53    const amount = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});54    expect(amount).to.be.equal(BigInt(1));55  });5657  itSub('[nft] Remove approval by using 0 amount', async ({helper}) => {58    const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});59    const collectionId = collection.collectionId;60    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});61    await helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});62    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.true;63    await helper.signTransaction(alice, helper.constructApiCall('api.tx.unique.approve', [{Substrate: bob.address}, collectionId, tokenId, 0]));64    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.false;65  });6667  itSub('[fungible] Remove approval by using 0 amount', async ({helper}) => {68    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);69    await helper.ft.mintTokens(alice, collectionId, 10n, {Substrate: alice.address});70    const tokenId = await helper.ft.getLastTokenId(collectionId);71    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});72    const amountBefore = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});73    expect(amountBefore).to.be.equal(BigInt(1));7475    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);76    const amountAfter = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});77    expect(amountAfter).to.be.equal(BigInt(0));78  });7980  itSub.ifWithPallets('[refungible] Remove approval by using 0 amount', [Pallets.ReFungible], async ({helper}) => {81    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});82    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});83    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});84    const amountBefore = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});85    expect(amountBefore).to.be.equal(BigInt(1));8687    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);88    const amountAfter = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});89    expect(amountAfter).to.be.equal(BigInt(0));90  });9192  itSub('can`t be called by collection owner on non-owned item when OwnerCanTransfer == false', async ({helper}) => {93    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});94    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});95    const approveTokenTx = () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});96    await expect(approveTokenTx()).to.be.rejected;97  });98});99100describe('Normal user can approve other users to transfer:', () => {101  let alice: IKeyringPair;102  let bob: IKeyringPair;103  let charlie: IKeyringPair;104105  before(async () => {106    await usingPlaygrounds(async (helper, privateKey) => {107      const donor = await privateKey({filename: __filename});108      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);109    });110  });111112  itSub('NFT', async ({helper}) => {113    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});114    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});115    await helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});116    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: charlie.address})).to.be.true;117  });118119  itSub('Fungible up to an approved amount', async ({helper}) => {120    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);121    await helper.ft.mintTokens(alice, collectionId, 10n, bob.address);122    const tokenId = await helper.ft.getLastTokenId(collectionId);123    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});124    const amount = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: charlie.address}, {Substrate: bob.address});125    expect(amount).to.be.equal(BigInt(1));126  });127128  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {129    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});130    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: bob.address, pieces: 100n});131    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address}, 100n);132    const amount = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: charlie.address}, {Substrate: bob.address});133    expect(amount).to.be.equal(BigInt(100n));134  });135});136137describe('Approved users can transferFrom up to approved amount:', () => {138  let alice: IKeyringPair;139  let bob: IKeyringPair;140  let charlie: IKeyringPair;141142  before(async () => {143    await usingPlaygrounds(async (helper, privateKey) => {144      const donor = await privateKey({filename: __filename});145      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);146    });147  });148149  itSub('NFT', async ({helper}) => {150    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});151    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});152    await helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});153    await helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});154    const owner = await helper.nft.getTokenOwner(collectionId, tokenId);155    expect(owner.Substrate).to.be.equal(alice.address);156  });157158  itSub('Fungible up to an approved amount', async ({helper}) => {159    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);160    await helper.ft.mintTokens(alice, collectionId, 10n, bob.address);161    const tokenId = await helper.ft.getLastTokenId(collectionId);162    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});163    const before = await helper.ft.getBalance(collectionId, {Substrate: alice.address});164    await helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);165    const after = await helper.ft.getBalance(collectionId, {Substrate: alice.address});166    expect(after - before).to.be.equal(BigInt(1));167  });168169  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {170    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});171    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: bob.address, pieces: 100n});172    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});173    const before = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});174    await helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);175    const after = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});176    expect(after - before).to.be.equal(BigInt(1));177  });178});179180describe('Approved users cannot use transferFrom to repeat transfers if approved amount was already transferred:', () => {181  let alice: IKeyringPair;182  let bob: IKeyringPair;183  let charlie: IKeyringPair;184185  before(async () => {186    await usingPlaygrounds(async (helper, privateKey) => {187      const donor = await privateKey({filename: __filename});188      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);189    });190  });191192  itSub('NFT', async ({helper}) => {193    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});194    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});195    await helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});196    await helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});197    const owner = await helper.nft.getTokenOwner(collectionId, tokenId);198    expect(owner.Substrate).to.be.equal(alice.address);199    const transferTokenFromTx = () => helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});200    await expect(transferTokenFromTx()).to.be.rejected;201  });202203  itSub('Fungible up to an approved amount', async ({helper}) => {204    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);205    await helper.ft.mintTokens(alice, collectionId, 10n, bob.address);206    const tokenId = await helper.ft.getLastTokenId(collectionId);207    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});208    const before = await helper.ft.getBalance(collectionId, {Substrate: alice.address});209    await helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);210    const after = await helper.ft.getBalance(collectionId, {Substrate: alice.address});211    expect(after - before).to.be.equal(BigInt(1));212213    const transferTokenFromTx = () => helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);214    await expect(transferTokenFromTx()).to.be.rejected;215  });216217  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {218    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});219    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: bob.address, pieces: 100n});220    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address}, 100n);221    const before = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});222    await helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 100n);223    const after = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});224    expect(after - before).to.be.equal(BigInt(100));225    const transferTokenFromTx = () => helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 100n);226    await expect(transferTokenFromTx()).to.be.rejected;227  });228});229230describe('Approved amount decreases by the transferred amount:', () => {231  let alice: IKeyringPair;232  let bob: IKeyringPair;233  let charlie: IKeyringPair;234  let dave: IKeyringPair;235236  before(async () => {237    await usingPlaygrounds(async (helper, privateKey) => {238      const donor = await privateKey({filename: __filename});239      [alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);240    });241  });242243  itSub('If a user B is approved to transfer 10 Fungible tokens from user A, they can transfer 2 tokens to user C, which will result in decreasing approval from 10 to 8. Then user B can transfer 8 tokens to user D.', async ({helper}) => {244    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);245    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);246    const tokenId = await helper.ft.getLastTokenId(collectionId);247    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 10n);248249    const charlieBefore = await helper.ft.getBalance(collectionId, {Substrate: charlie.address});250    await helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: alice.address}, {Substrate: charlie.address}, 2n);251    const charlieAfter = await helper.ft.getBalance(collectionId, {Substrate: charlie.address});252    expect(charlieAfter - charlieBefore).to.be.equal(BigInt(2));253254    const daveBefore = await helper.ft.getBalance(collectionId, {Substrate: dave.address});255    await helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: alice.address}, {Substrate: dave.address}, 8n);256    const daveAfter = await helper.ft.getBalance(collectionId, {Substrate: dave.address});257    expect(daveAfter - daveBefore).to.be.equal(BigInt(8));258  });259});260261describe('User may clear the approvals to approving for 0 amount:', () => {262  let alice: IKeyringPair;263  let bob: IKeyringPair;264  let charlie: IKeyringPair;265266  before(async () => {267    await usingPlaygrounds(async (helper, privateKey) => {268      const donor = await privateKey({filename: __filename});269      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);270    });271  });272273  itSub('NFT', async ({helper}) => {274    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});275    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});276    await helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});277    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.true;278    await helper.signTransaction(alice, helper.constructApiCall('api.tx.unique.approve', [{Substrate: bob.address}, collectionId, tokenId, 0]));279    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.false;280    const transferTokenFromTx = () => helper.nft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: bob.address});281    await expect(transferTokenFromTx()).to.be.rejected;282  });283284  itSub('Fungible', async ({helper}) => {285    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);286    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);287    const tokenId = await helper.ft.getLastTokenId(collectionId);288    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});289    const amountBefore = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});290    expect(amountBefore).to.be.equal(BigInt(1));291292    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);293    const amountAfter = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});294    expect(amountAfter).to.be.equal(BigInt(0));295296    const transferTokenFromTx = () => helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 1n);297    await expect(transferTokenFromTx()).to.be.rejected;298  });299300  itSub.ifWithPallets('ReFungible', [Pallets.ReFungible], async ({helper}) => {301    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});302    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});303    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});304    const amountBefore = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});305    expect(amountBefore).to.be.equal(BigInt(1));306307    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);308    const amountAfter = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});309    expect(amountAfter).to.be.equal(BigInt(0));310311    const transferTokenFromTx = () => helper.rft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 100n);312    await expect(transferTokenFromTx()).to.be.rejected;313  });314});315316describe('User cannot approve for the amount greater than they own:', () => {317  let alice: IKeyringPair;318  let bob: IKeyringPair;319  let charlie: IKeyringPair;320321  before(async () => {322    await usingPlaygrounds(async (helper, privateKey) => {323      const donor = await privateKey({filename: __filename});324      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);325    });326  });327328  itSub('1 for NFT', async ({helper}) => {329    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});330    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});331    const approveTx = () => helper.signTransaction(bob, helper.constructApiCall('api.tx.unique.approve', [{Substrate: charlie.address}, collectionId, tokenId, 2]));332    await expect(approveTx()).to.be.rejected;333    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: charlie.address})).to.be.false;334  });335336  itSub('Fungible', async ({helper}) => {337    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);338    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);339    const tokenId = await helper.ft.getLastTokenId(collectionId);340    const approveTx = () => helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 11n);341    await expect(approveTx()).to.be.rejected;342  });343344  itSub.ifWithPallets('ReFungible', [Pallets.ReFungible], async ({helper}) => {345    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});346    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});347    const approveTx = () => helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 101n);348    await expect(approveTx()).to.be.rejected;349  });350});351352describe('Administrator and collection owner do not need approval in order to execute TransferFrom (with owner_can_transfer_flag = true):', () => {353  let alice: IKeyringPair;354  let bob: IKeyringPair;355  let charlie: IKeyringPair;356  let dave: IKeyringPair;357358  before(async () => {359    await usingPlaygrounds(async (helper, privateKey) => {360      const donor = await privateKey({filename: __filename});361      [alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);362    });363  });364365  itSub('NFT', async ({helper}) => {366    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});367    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: true});368    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: charlie.address});369370    await helper.nft.transferTokenFrom(alice, collectionId, tokenId, {Substrate: charlie.address}, {Substrate: dave.address});371    const owner1 = await helper.nft.getTokenOwner(collectionId, tokenId);372    expect(owner1.Substrate).to.be.equal(dave.address);373374    await helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});375    await helper.nft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: dave.address}, {Substrate: alice.address});376    const owner2 = await helper.nft.getTokenOwner(collectionId, tokenId);377    expect(owner2.Substrate).to.be.equal(alice.address);378  });379380  itSub('Fungible up to an approved amount', async ({helper}) => {381    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);382    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: true});383    await helper.ft.mintTokens(alice, collectionId, 10n, charlie.address);384    const tokenId = await helper.ft.getLastTokenId(collectionId);385386    const daveBalanceBefore = await helper.ft.getBalance(collectionId, {Substrate: dave.address});387    await helper.ft.transferTokenFrom(alice, collectionId, tokenId, {Substrate: charlie.address}, {Substrate: dave.address}, 1n);388    const daveBalanceAfter = await helper.ft.getBalance(collectionId, {Substrate: dave.address});389    expect(daveBalanceAfter - daveBalanceBefore).to.be.equal(BigInt(1));390391    await helper.collection.addAdmin(alice ,collectionId, {Substrate: bob.address});392393    const aliceBalanceBefore = await helper.ft.getBalance(collectionId, {Substrate: alice.address});394    await helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: dave.address}, {Substrate: alice.address}, 1n);395    const aliceBalanceAfter = await helper.ft.getBalance(collectionId, {Substrate: alice.address});396    expect(aliceBalanceAfter - aliceBalanceBefore).to.be.equal(BigInt(1));397  });398399  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {400    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});401    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: true});402    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: charlie.address, pieces: 100n});403404    const daveBefore = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: dave.address});405    await helper.rft.transferTokenFrom(alice, collectionId, tokenId, {Substrate: charlie.address}, {Substrate: dave.address}, 1n);406    const daveAfter = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: dave.address});407    expect(daveAfter - daveBefore).to.be.equal(BigInt(1));408409    await helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});410411    const aliceBefore = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});412    await helper.rft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: dave.address}, {Substrate: alice.address}, 1n);413    const aliceAfter = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});414    expect(aliceAfter - aliceBefore).to.be.equal(BigInt(1));415  });416});417418describe('Repeated approvals add up', () => {419  let alice: IKeyringPair;420  let bob: IKeyringPair;421  let charlie: IKeyringPair;422  let dave: IKeyringPair;423424  before(async () => {425    await usingPlaygrounds(async (helper, privateKey) => {426      const donor = await privateKey({filename: __filename});427      [alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);428    });429  });430431  itSub.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. Fungible', async ({helper}) => {432    const collection = await helper.ft.mintCollection(alice, {});433    await collection.mint(alice, 10n);434    await collection.approveTokens(alice, {Substrate: bob.address}, 1n);435    await collection.approveTokens(alice, {Substrate: charlie.address}, 1n);436    // const allowances1 = await getAllowance(collectionId, 0, Alice.address, Bob.address);437    // const allowances2 = await getAllowance(collectionId, 0, Alice.address, Charlie.address);438    // expect(allowances1 + allowances2).to.be.eq(BigInt(2));439  });440441  itSub.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. ReFungible', async ({helper}) => {442    const collection = await helper.rft.mintCollection(alice, {});443    const token = await collection.mintToken(alice, 10n);444    await token.approve(alice, {Substrate: bob.address}, 1n);445    await token.approve(alice, {Substrate: charlie.address}, 1n);446    // const allowances1 = await getAllowance(collectionId, itemId, Alice.address, Bob.address);447    // const allowances2 = await getAllowance(collectionId, itemId, Alice.address, Charlie.address);448    // expect(allowances1 + allowances2).to.be.eq(BigInt(2));449  });450451  // Canceled by changing approve logic452  itSub.skip('Cannot approve for more than total user\'s amount (owned: 10, approval 1: 5 - should succeed, approval 2: 6 - should fail). Fungible', async ({helper}) => {453    const collection = await helper.ft.mintCollection(alice, {});454    await collection.mint(alice, 10n, {Substrate: dave.address});455    await collection.approveTokens(dave, {Substrate: bob.address}, 5n);456    await expect(collection.approveTokens(dave, {Substrate: charlie.address}, 6n))457      .to.be.rejectedWith('this test would fail (since it is skipped), replace this expecting message with what would have been received');458  });459460  // Canceled by changing approve logic461  itSub.skip('Cannot approve for more than total user\'s amount (owned: 100, approval 1: 50 - should succeed, approval 2: 51 - should fail). ReFungible', async ({helper}) => {462    const collection = await helper.rft.mintCollection(alice, {});463    const token = await collection.mintToken(alice, 100n, {Substrate: dave.address});464    await token.approve(dave, {Substrate: bob.address}, 50n);465    await expect(token.approve(dave, {Substrate: charlie.address}, 51n))466      .to.be.rejectedWith('this test would fail (since it is skipped), replace this expecting message with what would have been received');467  });468});469470describe('Integration Test approve(spender, collection_id, item_id, amount) with collection admin permissions:', () => {471  let alice: IKeyringPair;472  let bob: IKeyringPair;473  let charlie: IKeyringPair;474475  before(async () => {476    await usingPlaygrounds(async (helper, privateKey) => {477      const donor = await privateKey({filename: __filename});478      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);479    });480  });481482  itSub('can be called by collection admin on non-owned item', async ({helper}) => {483    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});484    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});485    await helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});486    const approveTx = () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});487    await expect(approveTx()).to.be.rejected;488  });489});490491describe('Negative Integration Test approve(spender, collection_id, item_id, amount):', () => {492  let alice: IKeyringPair;493  let bob: IKeyringPair;494  let charlie: IKeyringPair;495496  before(async () => {497    await usingPlaygrounds(async (helper, privateKey) => {498      const donor = await privateKey({filename: __filename});499      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);500    });501  });502503  itSub('[nft] Approve for a collection that does not exist', async ({helper}) => {504    const collectionId = 1 << 32 - 1;505    const approveTx = () => helper.nft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});506    await expect(approveTx()).to.be.rejected;507  });508509  itSub('[fungible] Approve for a collection that does not exist', async ({helper}) => {510    const collectionId = 1 << 32 - 1;511    const approveTx = () => helper.ft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});512    await expect(approveTx()).to.be.rejected;513  });514515  itSub.ifWithPallets('[refungible] Approve for a collection that does not exist', [Pallets.ReFungible], async ({helper}) => {516    const collectionId = 1 << 32 - 1;517    const approveTx = () => helper.rft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});518    await expect(approveTx()).to.be.rejected;519  });520521  itSub('[nft] Approve for a collection that was destroyed', async ({helper}) => {522    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});523    await helper.nft.burn(alice, collectionId);524    const approveTx = () => helper.nft.approveToken(alice, collectionId, 1, {Substrate: bob.address});525    await expect(approveTx()).to.be.rejected;526  });527528  itSub('[fungible] Approve for a collection that was destroyed', async ({helper}) => {529    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});530    await helper.ft.burn(alice, collectionId);531    const approveTx = () => helper.ft.approveToken(alice, collectionId, 1, {Substrate: bob.address});532    await expect(approveTx()).to.be.rejected;533  });534535  itSub.ifWithPallets('[refungible] Approve for a collection that was destroyed', [Pallets.ReFungible], async ({helper}) => {536    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});537    await helper.rft.burn(alice, collectionId);538    const approveTx = () => helper.rft.approveToken(alice, collectionId, 1, {Substrate: bob.address});539    await expect(approveTx()).to.be.rejected;540  });541  542  itSub('[nft] Approve transfer of a token that does not exist', async ({helper}) => {543    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});544    const approveTx = () => helper.nft.approveToken(alice, collectionId, 2, {Substrate: bob.address});545    await expect(approveTx()).to.be.rejected;546  });547548  itSub.ifWithPallets('[refungible] Approve transfer of a token that does not exist', [Pallets.ReFungible], async ({helper}) => {549    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});550    const approveTx = () => helper.rft.approveToken(alice, collectionId, 2, {Substrate: bob.address});551    await expect(approveTx()).to.be.rejected;552  });553554  itSub('[nft] Approve using the address that does not own the approved token', async ({helper}) => {555    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});556    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});557    const approveTx = () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});558    await expect(approveTx()).to.be.rejected;559  });560561  itSub('[fungible] Approve using the address that does not own the approved token', async ({helper}) => {562    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});563    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);564    const tokenId = await helper.ft.getLastTokenId(collectionId);565    const approveTx = () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});566    await expect(approveTx()).to.be.rejected;567  });568569  itSub.ifWithPallets('[refungible] Approve using the address that does not own the approved token', [Pallets.ReFungible], async ({helper}) => {570    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});571    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});572    const approveTx = () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});573    await expect(approveTx()).to.be.rejected;574  });575576  itSub.ifWithPallets('should fail if approved more ReFungibles than owned', [Pallets.ReFungible], async ({helper}) => {577    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});578    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});579    await helper.rft.transferToken(alice, collectionId, tokenId, {Substrate: bob.address}, 100n);580    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 100n);581582    const approveTx = () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 101n);583    await expect(approveTx()).to.be.rejected;584  });585586  itSub('should fail if approved more Fungibles than owned', async ({helper}) => {587    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});588    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);589    const tokenId = await helper.ft.getLastTokenId(collectionId);590591    await helper.ft.transferToken(alice, collectionId, tokenId, {Substrate: bob.address}, 10n);592    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 10n);593    const approveTx = () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 11n);594    await expect(approveTx()).to.be.rejected;595  });596597  itSub('fails when called by collection owner on non-owned item when OwnerCanTransfer == false', async ({helper}) => {598    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});599    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});600    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: false});601602    const approveTx = () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});603    await expect(approveTx()).to.be.rejected;604  });605});606607describe('Normal user can approve other users to be wallet operator:', () => {608  let alice: IKeyringPair;609  let bob: IKeyringPair;610611  before(async () => {612    await usingPlaygrounds(async (helper, privateKey) => {613      const donor = await privateKey({filename: __filename});614      [alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);615    });616  });617618  itSub('[nft] Enable and disable approval', async ({helper}) => {619    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});620    await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});621    const checkBeforeApproval = await helper.nft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});622    expect(checkBeforeApproval).to.be.false;623    await helper.nft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, true);624    const checkAfterApproval = await helper.nft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});625    expect(checkAfterApproval).to.be.true;626    await helper.nft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, false);627    const checkAfterDisapproval = await helper.nft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});628    expect(checkAfterDisapproval).to.be.false;629  });630631  itSub.ifWithPallets('[rft] Enable and disable approval', [Pallets.ReFungible], async ({helper}) => {632    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});633    const checkBeforeApproval = await helper.rft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});634    expect(checkBeforeApproval).to.be.false;635    await helper.rft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, true);636    const checkAfterApproval = await helper.rft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});637    expect(checkAfterApproval).to.be.true;638    await helper.rft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, false);639    const checkAfterDisapproval = await helper.rft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});640    expect(checkAfterDisapproval).to.be.false;641  });642});
after · tests/src/approve.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {IKeyringPair} from '@polkadot/types/types';18import {expect, itSub, Pallets, usingPlaygrounds} from './util';192021describe('Integration Test approve(spender, collection_id, item_id, amount):', () => {22  let alice: IKeyringPair;23  let bob: IKeyringPair;24  let charlie: IKeyringPair;2526  before(async () => {27    await usingPlaygrounds(async (helper, privateKey) => {28      const donor = await privateKey({filename: __filename});29      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);30    });31  });3233  itSub('[nft] Execute the extrinsic and check approvedList', async ({helper}) => {34    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});35    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});36    await helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});37    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.true;38  });3940  itSub('[fungible] Execute the extrinsic and check approvedList', async ({helper}) => {41    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);42    await helper.ft.mintTokens(alice, collectionId, 10n, {Substrate: alice.address});43    const tokenId = await helper.ft.getLastTokenId(collectionId);44    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});45    const amount = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});46    expect(amount).to.be.equal(BigInt(1));47  });4849  itSub.ifWithPallets('[refungible] Execute the extrinsic and check approvedList', [Pallets.ReFungible], async ({helper}) => {50    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});51    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});52    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});53    const amount = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});54    expect(amount).to.be.equal(BigInt(1));55  });5657  itSub('[nft] Remove approval by using 0 amount', async ({helper}) => {58    const collection = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});59    const collectionId = collection.collectionId;60    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});61    await helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});62    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.true;63    await helper.signTransaction(alice, helper.constructApiCall('api.tx.unique.approve', [{Substrate: bob.address}, collectionId, tokenId, 0]));64    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.false;65  });6667  itSub('[fungible] Remove approval by using 0 amount', async ({helper}) => {68    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);69    await helper.ft.mintTokens(alice, collectionId, 10n, {Substrate: alice.address});70    const tokenId = await helper.ft.getLastTokenId(collectionId);71    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});72    const amountBefore = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});73    expect(amountBefore).to.be.equal(BigInt(1));7475    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);76    const amountAfter = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});77    expect(amountAfter).to.be.equal(BigInt(0));78  });7980  itSub.ifWithPallets('[refungible] Remove approval by using 0 amount', [Pallets.ReFungible], async ({helper}) => {81    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});82    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});83    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});84    const amountBefore = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});85    expect(amountBefore).to.be.equal(BigInt(1));8687    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);88    const amountAfter = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});89    expect(amountAfter).to.be.equal(BigInt(0));90  });9192  itSub('can`t be called by collection owner on non-owned item when OwnerCanTransfer == false', async ({helper}) => {93    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});94    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});95    const approveTokenTx = () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});96    await expect(approveTokenTx()).to.be.rejected;97  });98});99100describe('Normal user can approve other users to transfer:', () => {101  let alice: IKeyringPair;102  let bob: IKeyringPair;103  let charlie: IKeyringPair;104105  before(async () => {106    await usingPlaygrounds(async (helper, privateKey) => {107      const donor = await privateKey({filename: __filename});108      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);109    });110  });111112  itSub('NFT', async ({helper}) => {113    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});114    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});115    await helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});116    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: charlie.address})).to.be.true;117  });118119  itSub('Fungible up to an approved amount', async ({helper}) => {120    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);121    await helper.ft.mintTokens(alice, collectionId, 10n, bob.address);122    const tokenId = await helper.ft.getLastTokenId(collectionId);123    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});124    const amount = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: charlie.address}, {Substrate: bob.address});125    expect(amount).to.be.equal(BigInt(1));126  });127128  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {129    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});130    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: bob.address, pieces: 100n});131    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address}, 100n);132    const amount = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: charlie.address}, {Substrate: bob.address});133    expect(amount).to.be.equal(BigInt(100n));134  });135});136137describe('Approved users can transferFrom up to approved amount:', () => {138  let alice: IKeyringPair;139  let bob: IKeyringPair;140  let charlie: IKeyringPair;141142  before(async () => {143    await usingPlaygrounds(async (helper, privateKey) => {144      const donor = await privateKey({filename: __filename});145      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);146    });147  });148149  itSub('NFT', async ({helper}) => {150    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});151    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});152    await helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});153    await helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});154    const owner = await helper.nft.getTokenOwner(collectionId, tokenId);155    expect(owner.Substrate).to.be.equal(alice.address);156  });157158  itSub('Fungible up to an approved amount', async ({helper}) => {159    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);160    await helper.ft.mintTokens(alice, collectionId, 10n, bob.address);161    const tokenId = await helper.ft.getLastTokenId(collectionId);162    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});163    const before = await helper.ft.getBalance(collectionId, {Substrate: alice.address});164    await helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);165    const after = await helper.ft.getBalance(collectionId, {Substrate: alice.address});166    expect(after - before).to.be.equal(BigInt(1));167  });168169  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {170    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});171    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: bob.address, pieces: 100n});172    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});173    const before = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});174    await helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);175    const after = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});176    expect(after - before).to.be.equal(BigInt(1));177  });178});179180describe('Approved users cannot use transferFrom to repeat transfers if approved amount was already transferred:', () => {181  let alice: IKeyringPair;182  let bob: IKeyringPair;183  let charlie: IKeyringPair;184185  before(async () => {186    await usingPlaygrounds(async (helper, privateKey) => {187      const donor = await privateKey({filename: __filename});188      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);189    });190  });191192  itSub('NFT', async ({helper}) => {193    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});194    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});195    await helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});196    await helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});197    const owner = await helper.nft.getTokenOwner(collectionId, tokenId);198    expect(owner.Substrate).to.be.equal(alice.address);199    const transferTokenFromTx = () => helper.nft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});200    await expect(transferTokenFromTx()).to.be.rejected;201  });202203  itSub('Fungible up to an approved amount', async ({helper}) => {204    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);205    await helper.ft.mintTokens(alice, collectionId, 10n, bob.address);206    const tokenId = await helper.ft.getLastTokenId(collectionId);207    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});208    const before = await helper.ft.getBalance(collectionId, {Substrate: alice.address});209    await helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);210    const after = await helper.ft.getBalance(collectionId, {Substrate: alice.address});211    expect(after - before).to.be.equal(BigInt(1));212213    const transferTokenFromTx = () => helper.ft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 1n);214    await expect(transferTokenFromTx()).to.be.rejected;215  });216217  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {218    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});219    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: bob.address, pieces: 100n});220    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address}, 100n);221    const before = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});222    await helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 100n);223    const after = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});224    expect(after - before).to.be.equal(BigInt(100));225    const transferTokenFromTx = () => helper.rft.transferTokenFrom(charlie, collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address}, 100n);226    await expect(transferTokenFromTx()).to.be.rejected;227  });228});229230describe('Approved amount decreases by the transferred amount:', () => {231  let alice: IKeyringPair;232  let bob: IKeyringPair;233  let charlie: IKeyringPair;234  let dave: IKeyringPair;235236  before(async () => {237    await usingPlaygrounds(async (helper, privateKey) => {238      const donor = await privateKey({filename: __filename});239      [alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);240    });241  });242243  itSub('If a user B is approved to transfer 10 Fungible tokens from user A, they can transfer 2 tokens to user C, which will result in decreasing approval from 10 to 8. Then user B can transfer 8 tokens to user D.', async ({helper}) => {244    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);245    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);246    const tokenId = await helper.ft.getLastTokenId(collectionId);247    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 10n);248249    const charlieBefore = await helper.ft.getBalance(collectionId, {Substrate: charlie.address});250    await helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: alice.address}, {Substrate: charlie.address}, 2n);251    const charlieAfter = await helper.ft.getBalance(collectionId, {Substrate: charlie.address});252    expect(charlieAfter - charlieBefore).to.be.equal(BigInt(2));253254    const daveBefore = await helper.ft.getBalance(collectionId, {Substrate: dave.address});255    await helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: alice.address}, {Substrate: dave.address}, 8n);256    const daveAfter = await helper.ft.getBalance(collectionId, {Substrate: dave.address});257    expect(daveAfter - daveBefore).to.be.equal(BigInt(8));258  });259});260261describe('User may clear the approvals to approving for 0 amount:', () => {262  let alice: IKeyringPair;263  let bob: IKeyringPair;264  let charlie: IKeyringPair;265266  before(async () => {267    await usingPlaygrounds(async (helper, privateKey) => {268      const donor = await privateKey({filename: __filename});269      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);270    });271  });272273  itSub('NFT', async ({helper}) => {274    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});275    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});276    await helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});277    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.true;278    await helper.signTransaction(alice, helper.constructApiCall('api.tx.unique.approve', [{Substrate: bob.address}, collectionId, tokenId, 0]));279    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: bob.address})).to.be.false;280    const transferTokenFromTx = () => helper.nft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: bob.address});281    await expect(transferTokenFromTx()).to.be.rejected;282  });283284  itSub('Fungible', async ({helper}) => {285    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);286    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);287    const tokenId = await helper.ft.getLastTokenId(collectionId);288    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});289    const amountBefore = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});290    expect(amountBefore).to.be.equal(BigInt(1));291292    await helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);293    const amountAfter = await helper.ft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});294    expect(amountAfter).to.be.equal(BigInt(0));295296    const transferTokenFromTx = () => helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 1n);297    await expect(transferTokenFromTx()).to.be.rejected;298  });299300  itSub.ifWithPallets('ReFungible', [Pallets.ReFungible], async ({helper}) => {301    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});302    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});303    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address});304    const amountBefore = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});305    expect(amountBefore).to.be.equal(BigInt(1));306307    await helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 0n);308    const amountAfter = await helper.rft.getTokenApprovedPieces(collectionId, tokenId, {Substrate: bob.address}, {Substrate: alice.address});309    expect(amountAfter).to.be.equal(BigInt(0));310311    const transferTokenFromTx = () => helper.rft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: bob.address}, {Substrate: charlie.address}, 100n);312    await expect(transferTokenFromTx()).to.be.rejected;313  });314});315316describe('User cannot approve for the amount greater than they own:', () => {317  let alice: IKeyringPair;318  let bob: IKeyringPair;319  let charlie: IKeyringPair;320321  before(async () => {322    await usingPlaygrounds(async (helper, privateKey) => {323      const donor = await privateKey({filename: __filename});324      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);325    });326  });327328  itSub('1 for NFT', async ({helper}) => {329    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});330    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});331    const approveTx = () => helper.signTransaction(bob, helper.constructApiCall('api.tx.unique.approve', [{Substrate: charlie.address}, collectionId, tokenId, 2]));332    await expect(approveTx()).to.be.rejected;333    expect(await helper.nft.isTokenApproved(collectionId, tokenId, {Substrate: charlie.address})).to.be.false;334  });335336  itSub('Fungible', async ({helper}) => {337    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);338    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);339    const tokenId = await helper.ft.getLastTokenId(collectionId);340    const approveTx = () => helper.ft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 11n);341    await expect(approveTx()).to.be.rejected;342  });343344  itSub.ifWithPallets('ReFungible', [Pallets.ReFungible], async ({helper}) => {345    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});346    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});347    const approveTx = () => helper.rft.approveToken(alice, collectionId, tokenId, {Substrate: bob.address}, 101n);348    await expect(approveTx()).to.be.rejected;349  });350});351352describe('Administrator and collection owner do not need approval in order to execute TransferFrom (with owner_can_transfer_flag = true):', () => {353  let alice: IKeyringPair;354  let bob: IKeyringPair;355  let charlie: IKeyringPair;356  let dave: IKeyringPair;357358  before(async () => {359    await usingPlaygrounds(async (helper, privateKey) => {360      const donor = await privateKey({filename: __filename});361      [alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);362    });363  });364365  itSub('NFT', async ({helper}) => {366    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});367    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: true});368    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: charlie.address});369370    await helper.nft.transferTokenFrom(alice, collectionId, tokenId, {Substrate: charlie.address}, {Substrate: dave.address});371    const owner1 = await helper.nft.getTokenOwner(collectionId, tokenId);372    expect(owner1.Substrate).to.be.equal(dave.address);373374    await helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});375    await helper.nft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: dave.address}, {Substrate: alice.address});376    const owner2 = await helper.nft.getTokenOwner(collectionId, tokenId);377    expect(owner2.Substrate).to.be.equal(alice.address);378  });379380  itSub('Fungible up to an approved amount', async ({helper}) => {381    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'}, 0);382    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: true});383    await helper.ft.mintTokens(alice, collectionId, 10n, charlie.address);384    const tokenId = await helper.ft.getLastTokenId(collectionId);385386    const daveBalanceBefore = await helper.ft.getBalance(collectionId, {Substrate: dave.address});387    await helper.ft.transferTokenFrom(alice, collectionId, tokenId, {Substrate: charlie.address}, {Substrate: dave.address}, 1n);388    const daveBalanceAfter = await helper.ft.getBalance(collectionId, {Substrate: dave.address});389    expect(daveBalanceAfter - daveBalanceBefore).to.be.equal(BigInt(1));390391    await helper.collection.addAdmin(alice ,collectionId, {Substrate: bob.address});392393    const aliceBalanceBefore = await helper.ft.getBalance(collectionId, {Substrate: alice.address});394    await helper.ft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: dave.address}, {Substrate: alice.address}, 1n);395    const aliceBalanceAfter = await helper.ft.getBalance(collectionId, {Substrate: alice.address});396    expect(aliceBalanceAfter - aliceBalanceBefore).to.be.equal(BigInt(1));397  });398399  itSub.ifWithPallets('ReFungible up to an approved amount', [Pallets.ReFungible], async ({helper}) => {400    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});401    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: true});402    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: charlie.address, pieces: 100n});403404    const daveBefore = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: dave.address});405    await helper.rft.transferTokenFrom(alice, collectionId, tokenId, {Substrate: charlie.address}, {Substrate: dave.address}, 1n);406    const daveAfter = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: dave.address});407    expect(daveAfter - daveBefore).to.be.equal(BigInt(1));408409    await helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});410411    const aliceBefore = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});412    await helper.rft.transferTokenFrom(bob, collectionId, tokenId, {Substrate: dave.address}, {Substrate: alice.address}, 1n);413    const aliceAfter = await helper.rft.getTokenBalance(collectionId, tokenId, {Substrate: alice.address});414    expect(aliceAfter - aliceBefore).to.be.equal(BigInt(1));415  });416});417418describe('Repeated approvals add up', () => {419  let alice: IKeyringPair;420  let bob: IKeyringPair;421  let charlie: IKeyringPair;422  let dave: IKeyringPair;423424  before(async () => {425    await usingPlaygrounds(async (helper, privateKey) => {426      const donor = await privateKey({filename: __filename});427      [alice, bob, charlie, dave] = await helper.arrange.createAccounts([100n, 100n, 100n, 100n], donor);428    });429  });430431  itSub.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. Fungible', async ({helper}) => {432    const collection = await helper.ft.mintCollection(alice, {});433    await collection.mint(alice, 10n);434    await collection.approveTokens(alice, {Substrate: bob.address}, 1n);435    await collection.approveTokens(alice, {Substrate: charlie.address}, 1n);436    // const allowances1 = await getAllowance(collectionId, 0, Alice.address, Bob.address);437    // const allowances2 = await getAllowance(collectionId, 0, Alice.address, Charlie.address);438    // expect(allowances1 + allowances2).to.be.eq(BigInt(2));439  });440441  itSub.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. ReFungible', async ({helper}) => {442    const collection = await helper.rft.mintCollection(alice, {});443    const token = await collection.mintToken(alice, 10n);444    await token.approve(alice, {Substrate: bob.address}, 1n);445    await token.approve(alice, {Substrate: charlie.address}, 1n);446    // const allowances1 = await getAllowance(collectionId, itemId, Alice.address, Bob.address);447    // const allowances2 = await getAllowance(collectionId, itemId, Alice.address, Charlie.address);448    // expect(allowances1 + allowances2).to.be.eq(BigInt(2));449  });450451  // Canceled by changing approve logic452  itSub.skip('Cannot approve for more than total user\'s amount (owned: 10, approval 1: 5 - should succeed, approval 2: 6 - should fail). Fungible', async ({helper}) => {453    const collection = await helper.ft.mintCollection(alice, {});454    await collection.mint(alice, 10n, {Substrate: dave.address});455    await collection.approveTokens(dave, {Substrate: bob.address}, 5n);456    await expect(collection.approveTokens(dave, {Substrate: charlie.address}, 6n))457      .to.be.rejectedWith('this test would fail (since it is skipped), replace this expecting message with what would have been received');458  });459460  // Canceled by changing approve logic461  itSub.skip('Cannot approve for more than total user\'s amount (owned: 100, approval 1: 50 - should succeed, approval 2: 51 - should fail). ReFungible', async ({helper}) => {462    const collection = await helper.rft.mintCollection(alice, {});463    const token = await collection.mintToken(alice, 100n, {Substrate: dave.address});464    await token.approve(dave, {Substrate: bob.address}, 50n);465    await expect(token.approve(dave, {Substrate: charlie.address}, 51n))466      .to.be.rejectedWith('this test would fail (since it is skipped), replace this expecting message with what would have been received');467  });468});469470describe('Integration Test approve(spender, collection_id, item_id, amount) with collection admin permissions:', () => {471  let alice: IKeyringPair;472  let bob: IKeyringPair;473  let charlie: IKeyringPair;474475  before(async () => {476    await usingPlaygrounds(async (helper, privateKey) => {477      const donor = await privateKey({filename: __filename});478      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);479    });480  });481482  itSub('can be called by collection admin on non-owned item', async ({helper}) => {483    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});484    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});485    await helper.collection.addAdmin(alice, collectionId, {Substrate: bob.address});486    const approveTx = () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: charlie.address});487    await expect(approveTx()).to.be.rejected;488  });489});490491describe('Negative Integration Test approve(spender, collection_id, item_id, amount):', () => {492  let alice: IKeyringPair;493  let bob: IKeyringPair;494  let charlie: IKeyringPair;495496  before(async () => {497    await usingPlaygrounds(async (helper, privateKey) => {498      const donor = await privateKey({filename: __filename});499      [alice, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);500    });501  });502503  itSub('[nft] Approve for a collection that does not exist', async ({helper}) => {504    const collectionId = 1 << 32 - 1;505    const approveTx = () => helper.nft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});506    await expect(approveTx()).to.be.rejected;507  });508509  itSub('[fungible] Approve for a collection that does not exist', async ({helper}) => {510    const collectionId = 1 << 32 - 1;511    const approveTx = () => helper.ft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});512    await expect(approveTx()).to.be.rejected;513  });514515  itSub.ifWithPallets('[refungible] Approve for a collection that does not exist', [Pallets.ReFungible], async ({helper}) => {516    const collectionId = 1 << 32 - 1;517    const approveTx = () => helper.rft.approveToken(bob, collectionId, 1, {Substrate: charlie.address});518    await expect(approveTx()).to.be.rejected;519  });520521  itSub('[nft] Approve for a collection that was destroyed', async ({helper}) => {522    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});523    await helper.nft.burn(alice, collectionId);524    const approveTx = () => helper.nft.approveToken(alice, collectionId, 1, {Substrate: bob.address});525    await expect(approveTx()).to.be.rejected;526  });527528  itSub('[fungible] Approve for a collection that was destroyed', async ({helper}) => {529    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});530    await helper.ft.burn(alice, collectionId);531    const approveTx = () => helper.ft.approveToken(alice, collectionId, 1, {Substrate: bob.address});532    await expect(approveTx()).to.be.rejected;533  });534535  itSub.ifWithPallets('[refungible] Approve for a collection that was destroyed', [Pallets.ReFungible], async ({helper}) => {536    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});537    await helper.rft.burn(alice, collectionId);538    const approveTx = () => helper.rft.approveToken(alice, collectionId, 1, {Substrate: bob.address});539    await expect(approveTx()).to.be.rejected;540  });541  542  itSub('[nft] Approve transfer of a token that does not exist', async ({helper}) => {543    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});544    const approveTx = () => helper.nft.approveToken(alice, collectionId, 2, {Substrate: bob.address});545    await expect(approveTx()).to.be.rejected;546  });547548  itSub.ifWithPallets('[refungible] Approve transfer of a token that does not exist', [Pallets.ReFungible], async ({helper}) => {549    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});550    const approveTx = () => helper.rft.approveToken(alice, collectionId, 2, {Substrate: bob.address});551    await expect(approveTx()).to.be.rejected;552  });553554  itSub('[nft] Approve using the address that does not own the approved token', async ({helper}) => {555    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});556    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});557    const approveTx = () => helper.nft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});558    await expect(approveTx()).to.be.rejected;559  });560561  itSub('[fungible] Approve using the address that does not own the approved token', async ({helper}) => {562    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});563    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);564    const tokenId = await helper.ft.getLastTokenId(collectionId);565    const approveTx = () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});566    await expect(approveTx()).to.be.rejected;567  });568569  itSub.ifWithPallets('[refungible] Approve using the address that does not own the approved token', [Pallets.ReFungible], async ({helper}) => {570    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});571    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});572    const approveTx = () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address});573    await expect(approveTx()).to.be.rejected;574  });575576  itSub.ifWithPallets('should fail if approved more ReFungibles than owned', [Pallets.ReFungible], async ({helper}) => {577    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});578    const {tokenId} = await helper.rft.mintToken(alice, {collectionId: collectionId, owner: alice.address, pieces: 100n});579    await helper.rft.transferToken(alice, collectionId, tokenId, {Substrate: bob.address}, 100n);580    await helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 100n);581582    const approveTx = () => helper.rft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 101n);583    await expect(approveTx()).to.be.rejected;584  });585586  itSub('should fail if approved more Fungibles than owned', async ({helper}) => {587    const {collectionId} = await helper.ft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});588    await helper.ft.mintTokens(alice, collectionId, 10n, alice.address);589    const tokenId = await helper.ft.getLastTokenId(collectionId);590591    await helper.ft.transferToken(alice, collectionId, tokenId, {Substrate: bob.address}, 10n);592    await helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 10n);593    const approveTx = () => helper.ft.approveToken(bob, collectionId, tokenId, {Substrate: alice.address}, 11n);594    await expect(approveTx()).to.be.rejected;595  });596597  itSub('fails when called by collection owner on non-owned item when OwnerCanTransfer == false', async ({helper}) => {598    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});599    const {tokenId} = await helper.nft.mintToken(alice, {collectionId: collectionId, owner: bob.address});600    await helper.collection.setLimits(alice, collectionId, {ownerCanTransfer: false});601602    const approveTx = () => helper.nft.approveToken(alice, collectionId, tokenId, {Substrate: charlie.address});603    await expect(approveTx()).to.be.rejected;604  });605});606607describe('Normal user can approve other users to be wallet operator:', () => {608  let alice: IKeyringPair;609  let bob: IKeyringPair;610611  before(async () => {612    await usingPlaygrounds(async (helper, privateKey) => {613      const donor = await privateKey({filename: __filename});614      [alice, bob] = await helper.arrange.createAccounts([100n, 100n], donor);615    });616  });617618  itSub('[nft] Enable and disable approval', async ({helper}) => {619    const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});620621    const checkBeforeApproval = await helper.nft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});622    expect(checkBeforeApproval).to.be.false;623624    await helper.nft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, true);625    const checkAfterApproval = await helper.nft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});626    expect(checkAfterApproval).to.be.true;627628    await helper.nft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, false);629    const checkAfterDisapproval = await helper.nft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});630    expect(checkAfterDisapproval).to.be.false;631  });632633  itSub.ifWithPallets('[rft] Enable and disable approval', [Pallets.ReFungible], async ({helper}) => {634    const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});635636    const checkBeforeApproval = await helper.rft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});637    expect(checkBeforeApproval).to.be.false;638639    await helper.rft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, true);640    const checkAfterApproval = await helper.rft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});641    expect(checkAfterApproval).to.be.true;642    643    await helper.rft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, false);644    const checkAfterDisapproval = await helper.rft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});645    expect(checkAfterDisapproval).to.be.false;646  });647});
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -672,9 +672,9 @@
 	function approve(address approved, uint256 tokenId) external;
 
 	/// @notice Sets or unsets the approval of a given operator.
-	///  An operator is allowed to transfer all tokens of the sender on their behalf.
+	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.
 	/// @param operator Operator
-	/// @param approved Is operator enabled or disabled
+	/// @param approved Should operator status be granted or revoked?
 	/// @dev EVM selector for this function is: 0xa22cb465,
 	///  or in textual repr: setApprovalForAll(address,bool)
 	function setApprovalForAll(address operator, bool approved) external;
@@ -684,7 +684,7 @@
 	///  or in textual repr: getApproved(uint256)
 	function getApproved(uint256 tokenId) external view returns (address);
 
-	/// @notice Tells whether an operator is approved by a given owner.
+	/// @notice Tells whether the given `owner` approves the `operator`.
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) external view returns (bool);
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -669,9 +669,9 @@
 	function approve(address approved, uint256 tokenId) external;
 
 	/// @notice Sets or unsets the approval of a given operator.
-	///  An operator is allowed to transfer all tokens of the sender on their behalf.
+	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.
 	/// @param operator Operator
-	/// @param approved Is operator enabled or disabled
+	/// @param approved Should operator status be granted or revoked?
 	/// @dev EVM selector for this function is: 0xa22cb465,
 	///  or in textual repr: setApprovalForAll(address,bool)
 	function setApprovalForAll(address operator, bool approved) external;
@@ -681,7 +681,7 @@
 	///  or in textual repr: getApproved(uint256)
 	function getApproved(uint256 tokenId) external view returns (address);
 
-	/// @notice Tells whether an operator is approved by a given owner.
+	/// @notice Tells whether the given `owner` approves the `operator`.
 	/// @dev EVM selector for this function is: 0xe985e9c5,
 	///  or in textual repr: isApprovedForAll(address,address)
 	function isApprovedForAll(address owner, address operator) external view returns (bool);
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -935,48 +935,54 @@
   let donor: IKeyringPair;
   let minter: IKeyringPair;
   let alice: IKeyringPair;
-  let bob: IKeyringPair;
 
   before(async function() {
     await usingEthPlaygrounds(async (helper, privateKey) => {
       donor = await privateKey({filename: __filename});
-      [minter, alice, bob] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);
+      [minter, alice] = await helper.arrange.createAccounts([100n, 100n], donor);
     });
   });
 
   itEth('[negative] Cant perform burn without approval', async ({helper}) => {
     const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
 
-    const owner = bob;
+    const owner = await helper.eth.createAccountWithBalance(donor, 100n);
     const spender = await helper.eth.createAccountWithBalance(donor, 100n);
 
-    const token = await collection.mintToken(minter, {Substrate: owner.address});
+    const token = await collection.mintToken(minter, {Ethereum: owner});
 
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = helper.ethNativeContract.collection(address, 'nft');
 
-    {
-      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);
-      await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;
-    }
+    const ownerCross = helper.ethCrossAccount.fromAddress(owner);
+    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;
+
+    await contract.methods.setApprovalForAll(spender, true).send({from: owner});
+    await contract.methods.setApprovalForAll(spender, false).send({from: owner});
+
+    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;
   });
 
   itEth('[negative] Cant perform transfer without approval', async ({helper}) => {
     const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
-    const owner = bob;
     const receiver = alice;
 
+    const owner = await helper.eth.createAccountWithBalance(donor, 100n);
     const spender = await helper.eth.createAccountWithBalance(donor, 100n);
 
-    const token = await collection.mintToken(minter, {Substrate: owner.address});
+    const token = await collection.mintToken(minter, {Ethereum: owner});
 
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = helper.ethNativeContract.collection(address, 'nft');
 
-    {
-      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);
-      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
-      await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;
-    }
+    const ownerCross = helper.ethCrossAccount.fromAddress(owner);
+    const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
+
+    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;
+
+    await contract.methods.setApprovalForAll(spender, true).send({from: owner});
+    await contract.methods.setApprovalForAll(spender, false).send({from: owner});
+    
+    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;
   });
 });
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -750,10 +750,14 @@
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = helper.ethNativeContract.collection(address, 'rft');
 
-    {
-      const ownerCross = helper.ethCrossAccount.fromAddress(owner);
-      await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;
-    }
+    const ownerCross = helper.ethCrossAccount.fromAddress(owner);
+
+    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;
+
+    await contract.methods.setApprovalForAll(spender, true).send({from: owner});
+    await contract.methods.setApprovalForAll(spender, false).send({from: owner});
+
+    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;
   });
 
   itEth('[negative] Cant perform transfer without approval', async ({helper}) => {
@@ -768,10 +772,14 @@
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = helper.ethNativeContract.collection(address, 'rft');
 
-    {
-      const ownerCross = helper.ethCrossAccount.fromAddress(owner);
-      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
-      await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;
-    }
+    const ownerCross = helper.ethCrossAccount.fromAddress(owner);
+    const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
+    
+    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;
+
+    await contract.methods.setApprovalForAll(spender, true).send({from: owner});
+    await contract.methods.setApprovalForAll(spender, false).send({from: owner});
+    
+    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;
   });
 });
modifiedtests/src/interfaces/augment-api-events.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-events.ts
+++ b/tests/src/interfaces/augment-api-events.ts
@@ -107,7 +107,7 @@
        **/
       Approved: AugmentedEvent<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, u128]>;
       /**
-       * Amount pieces of token owned by `sender` was approved for `spender`.
+       * A `sender` approves operations on all owned tokens for `spender`.
        **/
       ApprovedForAll: AugmentedEvent<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr, bool]>;
       /**
modifiedtests/src/interfaces/augment-api-query.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -406,6 +406,10 @@
        **/
       allowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<Option<PalletEvmAccountBasicCrossAccountIdRepr>>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
       /**
+       * Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.
+       **/
+      collectionAllowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]>;
+      /**
        * Used to enumerate tokens owned by account.
        **/
       owned: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: u32 | AnyNumber | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]>;
@@ -441,10 +445,6 @@
        * Total amount of minted tokens in a collection.
        **/
       tokensMinted: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<u32>, [u32]> & QueryableStorageEntry<ApiType, [u32]>;
-      /**
-       * Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.
-       **/
-      walletOperator: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<Option<bool>>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Generic query
        **/
@@ -625,6 +625,10 @@
        **/
       balance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<u128>, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, u32, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
+       * Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.
+       **/
+      collectionAllowance: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]>;
+      /**
        * Used to enumerate tokens owned by account.
        **/
       owned: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: u32 | AnyNumber | Uint8Array) => Observable<bool>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]>;
@@ -648,10 +652,6 @@
        * Total amount of pieces for token
        **/
       totalSupply: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<u128>, [u32, u32]> & QueryableStorageEntry<ApiType, [u32, u32]>;
-      /**
-       * Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.
-       **/
-      walletOperator: AugmentedQuery<ApiType, (arg1: u32 | AnyNumber | Uint8Array, arg2: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, arg3: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => Observable<Option<bool>>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]> & QueryableStorageEntry<ApiType, [u32, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmAccountBasicCrossAccountIdRepr]>;
       /**
        * Generic query
        **/
modifiedtests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -684,6 +684,10 @@
        **/
       allowance: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, sender: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, spender: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
       /**
+       * Tells whether the given `owner` approves the `operator`.
+       **/
+      allowanceForAll: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, owner: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, operator: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Option<bool>>>;
+      /**
        * Check if a user is allowed to operate within a collection
        **/
       allowed: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, account: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<bool>>;
@@ -719,10 +723,6 @@
        * Get effective collection limits
        **/
       effectiveCollectionLimits: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Option<UpDataStructsCollectionLimits>>>;
-      /**
-       * Tells whether an operator is approved by a given owner.
-       **/
-      isApprovedForAll: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, owner: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, operator: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Option<bool>>>;
       /**
        * Get the last token ID created in a collection
        **/
modifiedtests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -1547,15 +1547,15 @@
       /**
        * Sets or unsets the approval of a given operator.
        * 
-       * An operator is allowed to transfer all tokens of the sender on their behalf.
+       * The `operator` is allowed to transfer all tokens of the `owner` on their behalf.
        * 
        * # Arguments
        * 
        * * `owner`: Token owner
        * * `operator`: Operator
-       * * `approve`: Is operator enabled or disabled
+       * * `approve`: Should operator status be granted or revoked?
        **/
-      setApprovalForAll: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, operator: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, approve: bool | boolean | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, bool]>;
+      setAllowanceForAll: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, operator: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, approve: bool | boolean | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr, bool]>;
       /**
        * Set specific limits of a collection. Empty, or None fields mean chain default.
        *
modifiedtests/src/interfaces/default/types.tsdiffbeforeafterboth
--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -2312,13 +2312,13 @@
     readonly tokenId: u32;
     readonly amount: u128;
   } & Struct;
-  readonly isSetApprovalForAll: boolean;
-  readonly asSetApprovalForAll: {
+  readonly isSetAllowanceForAll: boolean;
+  readonly asSetAllowanceForAll: {
     readonly collectionId: u32;
     readonly operator: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly approve: bool;
   } & Struct;
-  readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetApprovalForAll';
+  readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetAllowanceForAll';
 }
 
 /** @name PalletUniqueError */
modifiedtests/src/interfaces/lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -2305,7 +2305,7 @@
         tokenId: 'u32',
         amount: 'u128',
       },
-      set_approval_for_all: {
+      set_allowance_for_all: {
         collectionId: 'u32',
         operator: 'PalletEvmAccountBasicCrossAccountIdRepr',
         approve: 'bool'
modifiedtests/src/interfaces/types-lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -2541,13 +2541,13 @@
       readonly tokenId: u32;
       readonly amount: u128;
     } & Struct;
-    readonly isSetApprovalForAll: boolean;
-    readonly asSetApprovalForAll: {
+    readonly isSetAllowanceForAll: boolean;
+    readonly asSetAllowanceForAll: {
       readonly collectionId: u32;
       readonly operator: PalletEvmAccountBasicCrossAccountIdRepr;
       readonly approve: bool;
     } & Struct;
-    readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetApprovalForAll';
+    readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetAllowanceForAll';
   }
 
   /** @name UpDataStructsCollectionMode (240) */
modifiedtests/src/interfaces/unique/definitions.tsdiffbeforeafterboth
--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -175,8 +175,8 @@
       [collectionParam, tokenParam], 
       'Option<u128>',
     ),
-    isApprovedForAll: fun(
-      'Tells whether an operator is approved by a given owner.', 
+    allowanceForAll: fun(
+      'Tells whether the given `owner` approves the `operator`.', 
       [collectionParam, crossAccountParam('owner'), crossAccountParam('operator')], 
       'Option<bool>',
     ),
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -1415,26 +1415,26 @@
   }
 
   /**
-   * Tells whether an operator is approved by a given owner.
+   * Tells whether the given `owner` approves the `operator`.
    * @param collectionId ID of collection
    * @param owner owner address
-	 * @param operator operator addrees
+   * @param operator operator addrees
    * @returns true if operator is enabled
    */
-  async isApprovedForAll(collectionId: number, owner: ICrossAccountId, operator: ICrossAccountId): Promise<boolean> {
-    return (await this.helper.callRpc('api.rpc.unique.isApprovedForAll', [collectionId, owner, operator])).toJSON();
+  async allowanceForAll(collectionId: number, owner: ICrossAccountId, operator: ICrossAccountId): Promise<boolean> {
+    return (await this.helper.callRpc('api.rpc.unique.allowanceForAll', [collectionId, owner, operator])).toJSON();
   }
 
   /** Sets or unsets the approval of a given operator.
-	 *  An operator is allowed to transfer all tokens of the sender on their behalf.
-	 *  @param operator Operator
-	 *  @param approved Is operator enabled or disabled
+   *  The `operator` is allowed to transfer all tokens of the `caller` on their behalf.
+   *  @param operator Operator
+   *  @param approved Should operator status be granted or revoked?
    *  @returns ```true``` if extrinsic success, otherwise ```false```
    */
-  async setApprovalForAll(signer: TSigner, collectionId: number, operator: ICrossAccountId, approved: boolean): Promise<boolean> {
+  async setAllowanceForAll(signer: TSigner, collectionId: number, operator: ICrossAccountId, approved: boolean): Promise<boolean> {
     const result = await this.helper.executeExtrinsic(
       signer,
-      'api.tx.unique.setApprovalForAll', [collectionId, operator, approved],
+      'api.tx.unique.setAllowanceForAll', [collectionId, operator, approved],
       true,
     );
     return this.helper.util.findCollectionInEvents(result.result.events, collectionId, 'common', 'ApprovedForAll');