difftreelog
chore fix code review requests
in: master
36 files changed
client/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>
pallets/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.
pallets/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
}
}
pallets/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)}
}
pallets/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)
}
}
pallets/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
pallets/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))
}
}
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/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) {
pallets/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))
}
pallets/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)}
}
pallets/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)
}
}
pallets/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
pallets/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))
}
}
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/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) {
pallets/refungible/src/weights.rsdiffbeforeafterboth1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_refungible4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// pallet13// --pallet14// pallet-refungible15// --wasm-execution16// compiled17// --extrinsic18// *19// --template20// .maintain/frame-weight-template.hbs21// --steps=5022// --repeat=8023// --heap-pages=409624// --output=./pallets/refungible/src/weights.rs2526#![cfg_attr(rustfmt, rustfmt_skip)]27#![allow(unused_parens)]28#![allow(unused_imports)]29#![allow(missing_docs)]30#![allow(clippy::unnecessary_cast)]3132use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};33use sp_std::marker::PhantomData;3435/// Weight functions needed for pallet_refungible.36pub trait WeightInfo {37 fn create_item() -> Weight;38 fn create_multiple_items(b: u32, ) -> Weight;39 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight;40 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight;41 fn burn_item_partial() -> Weight;42 fn burn_item_fully() -> Weight;43 fn transfer_normal() -> Weight;44 fn transfer_creating() -> Weight;45 fn transfer_removing() -> Weight;46 fn transfer_creating_removing() -> Weight;47 fn approve() -> Weight;48 fn transfer_from_normal() -> Weight;49 fn transfer_from_creating() -> Weight;50 fn transfer_from_removing() -> Weight;51 fn transfer_from_creating_removing() -> Weight;52 fn burn_from() -> Weight;53 fn set_token_property_permissions(b: u32, ) -> Weight;54 fn set_token_properties(b: u32, ) -> Weight;55 fn delete_token_properties(b: u32, ) -> Weight;56 fn repartition_item() -> Weight;57 fn token_owner() -> Weight;58 fn set_approval_for_all() -> Weight;59 fn is_approved_for_all() -> Weight;60}6162/// Weights for pallet_refungible using the Substrate node and recommended hardware.63pub struct SubstrateWeight<T>(PhantomData<T>);64impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {65 // Storage: Refungible TokensMinted (r:1 w:1)66 // Storage: Refungible AccountBalance (r:1 w:1)67 // Storage: Refungible Balance (r:0 w:1)68 // Storage: Refungible TotalSupply (r:0 w:1)69 // Storage: Refungible Owned (r:0 w:1)70 fn create_item() -> Weight {71 Weight::from_ref_time(29_527_000)72 .saturating_add(T::DbWeight::get().reads(2 as u64))73 .saturating_add(T::DbWeight::get().writes(5 as u64))74 }75 // Storage: Refungible TokensMinted (r:1 w:1)76 // Storage: Refungible AccountBalance (r:1 w:1)77 // Storage: Refungible Balance (r:0 w:4)78 // Storage: Refungible TotalSupply (r:0 w:4)79 // Storage: Refungible Owned (r:0 w:4)80 fn create_multiple_items(b: u32, ) -> Weight {81 Weight::from_ref_time(28_541_000)82 // Standard Error: 4_00083 .saturating_add(Weight::from_ref_time(6_671_000).saturating_mul(b as u64))84 .saturating_add(T::DbWeight::get().reads(2 as u64))85 .saturating_add(T::DbWeight::get().writes(2 as u64))86 .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(b as u64)))87 }88 // Storage: Refungible TokensMinted (r:1 w:1)89 // Storage: Refungible AccountBalance (r:4 w:4)90 // Storage: Refungible Balance (r:0 w:4)91 // Storage: Refungible TotalSupply (r:0 w:4)92 // Storage: Refungible Owned (r:0 w:4)93 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {94 Weight::from_ref_time(24_366_000)95 // Standard Error: 5_00096 .saturating_add(Weight::from_ref_time(9_338_000).saturating_mul(b as u64))97 .saturating_add(T::DbWeight::get().reads(1 as u64))98 .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))99 .saturating_add(T::DbWeight::get().writes(1 as u64))100 .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(b as u64)))101 }102 // Storage: Refungible TokensMinted (r:1 w:1)103 // Storage: Refungible TotalSupply (r:0 w:1)104 // Storage: Refungible AccountBalance (r:4 w:4)105 // Storage: Refungible Balance (r:0 w:4)106 // Storage: Refungible Owned (r:0 w:4)107 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {108 Weight::from_ref_time(27_574_000)109 // Standard Error: 4_000110 .saturating_add(Weight::from_ref_time(7_193_000).saturating_mul(b as u64))111 .saturating_add(T::DbWeight::get().reads(1 as u64))112 .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))113 .saturating_add(T::DbWeight::get().writes(2 as u64))114 .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(b as u64)))115 }116 // Storage: Refungible TotalSupply (r:1 w:1)117 // Storage: Refungible Balance (r:3 w:1)118 // Storage: Refungible AccountBalance (r:1 w:1)119 // Storage: Refungible Owned (r:0 w:1)120 fn burn_item_partial() -> Weight {121 Weight::from_ref_time(42_943_000)122 .saturating_add(T::DbWeight::get().reads(5 as u64))123 .saturating_add(T::DbWeight::get().writes(4 as u64))124 }125 // Storage: Refungible TotalSupply (r:1 w:1)126 // Storage: Refungible Balance (r:1 w:1)127 // Storage: Refungible AccountBalance (r:1 w:1)128 // Storage: Refungible TokensBurnt (r:1 w:1)129 // Storage: Refungible Owned (r:0 w:1)130 // Storage: Refungible TokenProperties (r:0 w:1)131 fn burn_item_fully() -> Weight {132 Weight::from_ref_time(36_861_000)133 .saturating_add(T::DbWeight::get().reads(4 as u64))134 .saturating_add(T::DbWeight::get().writes(6 as u64))135 }136 // Storage: Refungible Balance (r:2 w:2)137 // Storage: Refungible TotalSupply (r:1 w:0)138 fn transfer_normal() -> Weight {139 Weight::from_ref_time(27_789_000)140 .saturating_add(T::DbWeight::get().reads(3 as u64))141 .saturating_add(T::DbWeight::get().writes(2 as u64))142 }143 // Storage: Refungible Balance (r:2 w:2)144 // Storage: Refungible AccountBalance (r:1 w:1)145 // Storage: Refungible TotalSupply (r:1 w:0)146 // Storage: Refungible Owned (r:0 w:1)147 fn transfer_creating() -> Weight {148 Weight::from_ref_time(32_893_000)149 .saturating_add(T::DbWeight::get().reads(4 as u64))150 .saturating_add(T::DbWeight::get().writes(4 as u64))151 }152 // Storage: Refungible Balance (r:2 w:2)153 // Storage: Refungible AccountBalance (r:1 w:1)154 // Storage: Refungible TotalSupply (r:1 w:0)155 // Storage: Refungible Owned (r:0 w:1)156 fn transfer_removing() -> Weight {157 Weight::from_ref_time(34_703_000)158 .saturating_add(T::DbWeight::get().reads(4 as u64))159 .saturating_add(T::DbWeight::get().writes(4 as u64))160 }161 // Storage: Refungible Balance (r:2 w:2)162 // Storage: Refungible AccountBalance (r:2 w:2)163 // Storage: Refungible TotalSupply (r:1 w:0)164 // Storage: Refungible Owned (r:0 w:2)165 fn transfer_creating_removing() -> Weight {166 Weight::from_ref_time(37_547_000)167 .saturating_add(T::DbWeight::get().reads(5 as u64))168 .saturating_add(T::DbWeight::get().writes(6 as u64))169 }170 // Storage: Refungible Balance (r:1 w:0)171 // Storage: Refungible Allowance (r:0 w:1)172 fn approve() -> Weight {173 Weight::from_ref_time(20_039_000)174 .saturating_add(T::DbWeight::get().reads(1 as u64))175 .saturating_add(T::DbWeight::get().writes(1 as u64))176 }177 // Storage: Refungible Allowance (r:1 w:1)178 // Storage: Refungible Balance (r:2 w:2)179 // Storage: Refungible TotalSupply (r:1 w:0)180 fn transfer_from_normal() -> Weight {181 Weight::from_ref_time(37_628_000)182 .saturating_add(T::DbWeight::get().reads(4 as u64))183 .saturating_add(T::DbWeight::get().writes(3 as u64))184 }185 // Storage: Refungible Allowance (r:1 w:1)186 // Storage: Refungible Balance (r:2 w:2)187 // Storage: Refungible AccountBalance (r:1 w:1)188 // Storage: Refungible TotalSupply (r:1 w:0)189 // Storage: Refungible Owned (r:0 w:1)190 fn transfer_from_creating() -> Weight {191 Weight::from_ref_time(42_072_000)192 .saturating_add(T::DbWeight::get().reads(5 as u64))193 .saturating_add(T::DbWeight::get().writes(5 as u64))194 }195 // Storage: Refungible Allowance (r:1 w:1)196 // Storage: Refungible Balance (r:2 w:2)197 // Storage: Refungible AccountBalance (r:1 w:1)198 // Storage: Refungible TotalSupply (r:1 w:0)199 // Storage: Refungible Owned (r:0 w:1)200 fn transfer_from_removing() -> Weight {201 Weight::from_ref_time(43_024_000)202 .saturating_add(T::DbWeight::get().reads(5 as u64))203 .saturating_add(T::DbWeight::get().writes(5 as u64))204 }205 // Storage: Refungible Allowance (r:1 w:1)206 // Storage: Refungible Balance (r:2 w:2)207 // Storage: Refungible AccountBalance (r:2 w:2)208 // Storage: Refungible TotalSupply (r:1 w:0)209 // Storage: Refungible Owned (r:0 w:2)210 fn transfer_from_creating_removing() -> Weight {211 Weight::from_ref_time(45_910_000)212 .saturating_add(T::DbWeight::get().reads(6 as u64))213 .saturating_add(T::DbWeight::get().writes(7 as u64))214 }215 // Storage: Refungible Allowance (r:1 w:1)216 // Storage: Refungible TotalSupply (r:1 w:1)217 // Storage: Refungible Balance (r:1 w:1)218 // Storage: Refungible AccountBalance (r:1 w:1)219 // Storage: Refungible TokensBurnt (r:1 w:1)220 // Storage: Refungible Owned (r:0 w:1)221 // Storage: Refungible TokenProperties (r:0 w:1)222 fn burn_from() -> Weight {223 Weight::from_ref_time(48_584_000)224 .saturating_add(T::DbWeight::get().reads(5 as u64))225 .saturating_add(T::DbWeight::get().writes(7 as u64))226 }227 // Storage: Common CollectionPropertyPermissions (r:1 w:1)228 fn set_token_property_permissions(b: u32, ) -> Weight {229 (Weight::from_ref_time(0))230 // Standard Error: 60_000231 .saturating_add(Weight::from_ref_time(15_533_000).saturating_mul(b as u64))232 .saturating_add(T::DbWeight::get().reads(1 as u64))233 .saturating_add(T::DbWeight::get().writes(1 as u64))234 }235 // Storage: Common CollectionPropertyPermissions (r:1 w:0)236 // Storage: Refungible TokenProperties (r:1 w:1)237 fn set_token_properties(b: u32, ) -> Weight {238 (Weight::from_ref_time(0))239 // Standard Error: 3_609_000240 .saturating_add(Weight::from_ref_time(590_204_000).saturating_mul(b as u64))241 .saturating_add(T::DbWeight::get().reads(2 as u64))242 .saturating_add(T::DbWeight::get().writes(1 as u64))243 }244 // Storage: Common CollectionPropertyPermissions (r:1 w:0)245 // Storage: Refungible TokenProperties (r:1 w:1)246 fn delete_token_properties(b: u32, ) -> Weight {247 (Weight::from_ref_time(0))248 // Standard Error: 3_637_000249 .saturating_add(Weight::from_ref_time(603_468_000).saturating_mul(b as u64))250 .saturating_add(T::DbWeight::get().reads(2 as u64))251 .saturating_add(T::DbWeight::get().writes(1 as u64))252 }253 // Storage: Refungible TotalSupply (r:1 w:1)254 // Storage: Refungible Balance (r:1 w:1)255 fn repartition_item() -> Weight {256 Weight::from_ref_time(22_356_000)257 .saturating_add(T::DbWeight::get().reads(2 as u64))258 .saturating_add(T::DbWeight::get().writes(2 as u64))259 }260 // Storage: Refungible Balance (r:2 w:0)261 fn token_owner() -> Weight {262 Weight::from_ref_time(9_431_000)263 .saturating_add(T::DbWeight::get().reads(2 as u64))264 }265 // Storage: Refungible WalletOperator (r:0 w:1)266 fn set_approval_for_all() -> Weight {267 Weight::from_ref_time(16_150_000 as u64)268 .saturating_add(T::DbWeight::get().writes(1 as u64))269 }270 // Storage: Refungible WalletOperator (r:1 w:0)271 fn is_approved_for_all() -> Weight {272 Weight::from_ref_time(5_901_000 as u64)273 .saturating_add(T::DbWeight::get().reads(1 as u64))274 }275}276277// For backwards compatibility and tests278impl WeightInfo for () {279 // Storage: Refungible TokensMinted (r:1 w:1)280 // Storage: Refungible AccountBalance (r:1 w:1)281 // Storage: Refungible Balance (r:0 w:1)282 // Storage: Refungible TotalSupply (r:0 w:1)283 // Storage: Refungible Owned (r:0 w:1)284 fn create_item() -> Weight {285 Weight::from_ref_time(29_527_000)286 .saturating_add(RocksDbWeight::get().reads(2 as u64))287 .saturating_add(RocksDbWeight::get().writes(5 as u64))288 }289 // Storage: Refungible TokensMinted (r:1 w:1)290 // Storage: Refungible AccountBalance (r:1 w:1)291 // Storage: Refungible Balance (r:0 w:4)292 // Storage: Refungible TotalSupply (r:0 w:4)293 // Storage: Refungible Owned (r:0 w:4)294 fn create_multiple_items(b: u32, ) -> Weight {295 Weight::from_ref_time(28_541_000)296 // Standard Error: 4_000297 .saturating_add(Weight::from_ref_time(6_671_000).saturating_mul(b as u64))298 .saturating_add(RocksDbWeight::get().reads(2 as u64))299 .saturating_add(RocksDbWeight::get().writes(2 as u64))300 .saturating_add(RocksDbWeight::get().writes((3 as u64).saturating_mul(b as u64)))301 }302 // Storage: Refungible TokensMinted (r:1 w:1)303 // Storage: Refungible AccountBalance (r:4 w:4)304 // Storage: Refungible Balance (r:0 w:4)305 // Storage: Refungible TotalSupply (r:0 w:4)306 // Storage: Refungible Owned (r:0 w:4)307 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {308 Weight::from_ref_time(24_366_000)309 // Standard Error: 5_000310 .saturating_add(Weight::from_ref_time(9_338_000).saturating_mul(b as u64))311 .saturating_add(RocksDbWeight::get().reads(1 as u64))312 .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))313 .saturating_add(RocksDbWeight::get().writes(1 as u64))314 .saturating_add(RocksDbWeight::get().writes((4 as u64).saturating_mul(b as u64)))315 }316 // Storage: Refungible TokensMinted (r:1 w:1)317 // Storage: Refungible TotalSupply (r:0 w:1)318 // Storage: Refungible AccountBalance (r:4 w:4)319 // Storage: Refungible Balance (r:0 w:4)320 // Storage: Refungible Owned (r:0 w:4)321 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {322 Weight::from_ref_time(27_574_000)323 // Standard Error: 4_000324 .saturating_add(Weight::from_ref_time(7_193_000).saturating_mul(b as u64))325 .saturating_add(RocksDbWeight::get().reads(1 as u64))326 .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))327 .saturating_add(RocksDbWeight::get().writes(2 as u64))328 .saturating_add(RocksDbWeight::get().writes((3 as u64).saturating_mul(b as u64)))329 }330 // Storage: Refungible TotalSupply (r:1 w:1)331 // Storage: Refungible Balance (r:3 w:1)332 // Storage: Refungible AccountBalance (r:1 w:1)333 // Storage: Refungible Owned (r:0 w:1)334 fn burn_item_partial() -> Weight {335 Weight::from_ref_time(42_943_000)336 .saturating_add(RocksDbWeight::get().reads(5 as u64))337 .saturating_add(RocksDbWeight::get().writes(4 as u64))338 }339 // Storage: Refungible TotalSupply (r:1 w:1)340 // Storage: Refungible Balance (r:1 w:1)341 // Storage: Refungible AccountBalance (r:1 w:1)342 // Storage: Refungible TokensBurnt (r:1 w:1)343 // Storage: Refungible Owned (r:0 w:1)344 // Storage: Refungible TokenProperties (r:0 w:1)345 fn burn_item_fully() -> Weight {346 Weight::from_ref_time(36_861_000)347 .saturating_add(RocksDbWeight::get().reads(4 as u64))348 .saturating_add(RocksDbWeight::get().writes(6 as u64))349 }350 // Storage: Refungible Balance (r:2 w:2)351 // Storage: Refungible TotalSupply (r:1 w:0)352 fn transfer_normal() -> Weight {353 Weight::from_ref_time(27_789_000)354 .saturating_add(RocksDbWeight::get().reads(3 as u64))355 .saturating_add(RocksDbWeight::get().writes(2 as u64))356 }357 // Storage: Refungible Balance (r:2 w:2)358 // Storage: Refungible AccountBalance (r:1 w:1)359 // Storage: Refungible TotalSupply (r:1 w:0)360 // Storage: Refungible Owned (r:0 w:1)361 fn transfer_creating() -> Weight {362 Weight::from_ref_time(32_893_000)363 .saturating_add(RocksDbWeight::get().reads(4 as u64))364 .saturating_add(RocksDbWeight::get().writes(4 as u64))365 }366 // Storage: Refungible Balance (r:2 w:2)367 // Storage: Refungible AccountBalance (r:1 w:1)368 // Storage: Refungible TotalSupply (r:1 w:0)369 // Storage: Refungible Owned (r:0 w:1)370 fn transfer_removing() -> Weight {371 Weight::from_ref_time(34_703_000)372 .saturating_add(RocksDbWeight::get().reads(4 as u64))373 .saturating_add(RocksDbWeight::get().writes(4 as u64))374 }375 // Storage: Refungible Balance (r:2 w:2)376 // Storage: Refungible AccountBalance (r:2 w:2)377 // Storage: Refungible TotalSupply (r:1 w:0)378 // Storage: Refungible Owned (r:0 w:2)379 fn transfer_creating_removing() -> Weight {380 Weight::from_ref_time(37_547_000)381 .saturating_add(RocksDbWeight::get().reads(5 as u64))382 .saturating_add(RocksDbWeight::get().writes(6 as u64))383 }384 // Storage: Refungible Balance (r:1 w:0)385 // Storage: Refungible Allowance (r:0 w:1)386 fn approve() -> Weight {387 Weight::from_ref_time(20_039_000)388 .saturating_add(RocksDbWeight::get().reads(1 as u64))389 .saturating_add(RocksDbWeight::get().writes(1 as u64))390 }391 // Storage: Refungible Allowance (r:1 w:1)392 // Storage: Refungible Balance (r:2 w:2)393 // Storage: Refungible TotalSupply (r:1 w:0)394 fn transfer_from_normal() -> Weight {395 Weight::from_ref_time(37_628_000)396 .saturating_add(RocksDbWeight::get().reads(4 as u64))397 .saturating_add(RocksDbWeight::get().writes(3 as u64))398 }399 // Storage: Refungible Allowance (r:1 w:1)400 // Storage: Refungible Balance (r:2 w:2)401 // Storage: Refungible AccountBalance (r:1 w:1)402 // Storage: Refungible TotalSupply (r:1 w:0)403 // Storage: Refungible Owned (r:0 w:1)404 fn transfer_from_creating() -> Weight {405 Weight::from_ref_time(42_072_000)406 .saturating_add(RocksDbWeight::get().reads(5 as u64))407 .saturating_add(RocksDbWeight::get().writes(5 as u64))408 }409 // Storage: Refungible Allowance (r:1 w:1)410 // Storage: Refungible Balance (r:2 w:2)411 // Storage: Refungible AccountBalance (r:1 w:1)412 // Storage: Refungible TotalSupply (r:1 w:0)413 // Storage: Refungible Owned (r:0 w:1)414 fn transfer_from_removing() -> Weight {415 Weight::from_ref_time(43_024_000)416 .saturating_add(RocksDbWeight::get().reads(5 as u64))417 .saturating_add(RocksDbWeight::get().writes(5 as u64))418 }419 // Storage: Refungible Allowance (r:1 w:1)420 // Storage: Refungible Balance (r:2 w:2)421 // Storage: Refungible AccountBalance (r:2 w:2)422 // Storage: Refungible TotalSupply (r:1 w:0)423 // Storage: Refungible Owned (r:0 w:2)424 fn transfer_from_creating_removing() -> Weight {425 Weight::from_ref_time(45_910_000)426 .saturating_add(RocksDbWeight::get().reads(6 as u64))427 .saturating_add(RocksDbWeight::get().writes(7 as u64))428 }429 // Storage: Refungible Allowance (r:1 w:1)430 // Storage: Refungible TotalSupply (r:1 w:1)431 // Storage: Refungible Balance (r:1 w:1)432 // Storage: Refungible AccountBalance (r:1 w:1)433 // Storage: Refungible TokensBurnt (r:1 w:1)434 // Storage: Refungible Owned (r:0 w:1)435 // Storage: Refungible TokenProperties (r:0 w:1)436 fn burn_from() -> Weight {437 Weight::from_ref_time(48_584_000)438 .saturating_add(RocksDbWeight::get().reads(5 as u64))439 .saturating_add(RocksDbWeight::get().writes(7 as u64))440 }441 // Storage: Common CollectionPropertyPermissions (r:1 w:1)442 fn set_token_property_permissions(b: u32, ) -> Weight {443 (Weight::from_ref_time(0))444 // Standard Error: 60_000445 .saturating_add(Weight::from_ref_time(15_533_000).saturating_mul(b as u64))446 .saturating_add(RocksDbWeight::get().reads(1 as u64))447 .saturating_add(RocksDbWeight::get().writes(1 as u64))448 }449 // Storage: Common CollectionPropertyPermissions (r:1 w:0)450 // Storage: Refungible TokenProperties (r:1 w:1)451 fn set_token_properties(b: u32, ) -> Weight {452 (Weight::from_ref_time(0))453 // Standard Error: 3_609_000454 .saturating_add(Weight::from_ref_time(590_204_000).saturating_mul(b as u64))455 .saturating_add(RocksDbWeight::get().reads(2 as u64))456 .saturating_add(RocksDbWeight::get().writes(1 as u64))457 }458 // Storage: Common CollectionPropertyPermissions (r:1 w:0)459 // Storage: Refungible TokenProperties (r:1 w:1)460 fn delete_token_properties(b: u32, ) -> Weight {461 (Weight::from_ref_time(0))462 // Standard Error: 3_637_000463 .saturating_add(Weight::from_ref_time(603_468_000).saturating_mul(b as u64))464 .saturating_add(RocksDbWeight::get().reads(2 as u64))465 .saturating_add(RocksDbWeight::get().writes(1 as u64))466 }467 // Storage: Refungible TotalSupply (r:1 w:1)468 // Storage: Refungible Balance (r:1 w:1)469 fn repartition_item() -> Weight {470 Weight::from_ref_time(22_356_000)471 .saturating_add(RocksDbWeight::get().reads(2 as u64))472 .saturating_add(RocksDbWeight::get().writes(2 as u64))473 }474 // Storage: Refungible Balance (r:2 w:0)475 fn token_owner() -> Weight {476 Weight::from_ref_time(9_431_000)477 .saturating_add(RocksDbWeight::get().reads(2 as u64))478 }479 // Storage: Refungible WalletOperator (r:0 w:1)480 fn set_approval_for_all() -> Weight {481 Weight::from_ref_time(16_150_000 as u64)482 .saturating_add(RocksDbWeight::get().writes(1 as u64))483 }484 // Storage: Refungible WalletOperator (r:1 w:0)485 fn is_approved_for_all() -> Weight {486 Weight::from_ref_time(5_901_000 as u64)487 .saturating_add(RocksDbWeight::get().reads(1 as u64))488 }489}1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_refungible4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// pallet13// --pallet14// pallet-refungible15// --wasm-execution16// compiled17// --extrinsic18// *19// --template20// .maintain/frame-weight-template.hbs21// --steps=5022// --repeat=8023// --heap-pages=409624// --output=./pallets/refungible/src/weights.rs2526#![cfg_attr(rustfmt, rustfmt_skip)]27#![allow(unused_parens)]28#![allow(unused_imports)]29#![allow(missing_docs)]30#![allow(clippy::unnecessary_cast)]3132use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};33use sp_std::marker::PhantomData;3435/// Weight functions needed for pallet_refungible.36pub trait WeightInfo {37 fn create_item() -> Weight;38 fn create_multiple_items(b: u32, ) -> Weight;39 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight;40 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight;41 fn burn_item_partial() -> Weight;42 fn burn_item_fully() -> Weight;43 fn transfer_normal() -> Weight;44 fn transfer_creating() -> Weight;45 fn transfer_removing() -> Weight;46 fn transfer_creating_removing() -> Weight;47 fn approve() -> Weight;48 fn transfer_from_normal() -> Weight;49 fn transfer_from_creating() -> Weight;50 fn transfer_from_removing() -> Weight;51 fn transfer_from_creating_removing() -> Weight;52 fn burn_from() -> Weight;53 fn set_token_property_permissions(b: u32, ) -> Weight;54 fn set_token_properties(b: u32, ) -> Weight;55 fn delete_token_properties(b: u32, ) -> Weight;56 fn repartition_item() -> Weight;57 fn token_owner() -> Weight;58 fn set_allowance_for_all() -> Weight;59 fn allowance_for_all() -> Weight;60}6162/// Weights for pallet_refungible using the Substrate node and recommended hardware.63pub struct SubstrateWeight<T>(PhantomData<T>);64impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {65 // Storage: Refungible TokensMinted (r:1 w:1)66 // Storage: Refungible AccountBalance (r:1 w:1)67 // Storage: Refungible Balance (r:0 w:1)68 // Storage: Refungible TotalSupply (r:0 w:1)69 // Storage: Refungible Owned (r:0 w:1)70 fn create_item() -> Weight {71 Weight::from_ref_time(29_527_000)72 .saturating_add(T::DbWeight::get().reads(2 as u64))73 .saturating_add(T::DbWeight::get().writes(5 as u64))74 }75 // Storage: Refungible TokensMinted (r:1 w:1)76 // Storage: Refungible AccountBalance (r:1 w:1)77 // Storage: Refungible Balance (r:0 w:4)78 // Storage: Refungible TotalSupply (r:0 w:4)79 // Storage: Refungible Owned (r:0 w:4)80 fn create_multiple_items(b: u32, ) -> Weight {81 Weight::from_ref_time(28_541_000)82 // Standard Error: 4_00083 .saturating_add(Weight::from_ref_time(6_671_000).saturating_mul(b as u64))84 .saturating_add(T::DbWeight::get().reads(2 as u64))85 .saturating_add(T::DbWeight::get().writes(2 as u64))86 .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(b as u64)))87 }88 // Storage: Refungible TokensMinted (r:1 w:1)89 // Storage: Refungible AccountBalance (r:4 w:4)90 // Storage: Refungible Balance (r:0 w:4)91 // Storage: Refungible TotalSupply (r:0 w:4)92 // Storage: Refungible Owned (r:0 w:4)93 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {94 Weight::from_ref_time(24_366_000)95 // Standard Error: 5_00096 .saturating_add(Weight::from_ref_time(9_338_000).saturating_mul(b as u64))97 .saturating_add(T::DbWeight::get().reads(1 as u64))98 .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))99 .saturating_add(T::DbWeight::get().writes(1 as u64))100 .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(b as u64)))101 }102 // Storage: Refungible TokensMinted (r:1 w:1)103 // Storage: Refungible TotalSupply (r:0 w:1)104 // Storage: Refungible AccountBalance (r:4 w:4)105 // Storage: Refungible Balance (r:0 w:4)106 // Storage: Refungible Owned (r:0 w:4)107 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {108 Weight::from_ref_time(27_574_000)109 // Standard Error: 4_000110 .saturating_add(Weight::from_ref_time(7_193_000).saturating_mul(b as u64))111 .saturating_add(T::DbWeight::get().reads(1 as u64))112 .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64)))113 .saturating_add(T::DbWeight::get().writes(2 as u64))114 .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(b as u64)))115 }116 // Storage: Refungible TotalSupply (r:1 w:1)117 // Storage: Refungible Balance (r:3 w:1)118 // Storage: Refungible AccountBalance (r:1 w:1)119 // Storage: Refungible Owned (r:0 w:1)120 fn burn_item_partial() -> Weight {121 Weight::from_ref_time(42_943_000)122 .saturating_add(T::DbWeight::get().reads(5 as u64))123 .saturating_add(T::DbWeight::get().writes(4 as u64))124 }125 // Storage: Refungible TotalSupply (r:1 w:1)126 // Storage: Refungible Balance (r:1 w:1)127 // Storage: Refungible AccountBalance (r:1 w:1)128 // Storage: Refungible TokensBurnt (r:1 w:1)129 // Storage: Refungible Owned (r:0 w:1)130 // Storage: Refungible TokenProperties (r:0 w:1)131 fn burn_item_fully() -> Weight {132 Weight::from_ref_time(36_861_000)133 .saturating_add(T::DbWeight::get().reads(4 as u64))134 .saturating_add(T::DbWeight::get().writes(6 as u64))135 }136 // Storage: Refungible Balance (r:2 w:2)137 // Storage: Refungible TotalSupply (r:1 w:0)138 fn transfer_normal() -> Weight {139 Weight::from_ref_time(27_789_000)140 .saturating_add(T::DbWeight::get().reads(3 as u64))141 .saturating_add(T::DbWeight::get().writes(2 as u64))142 }143 // Storage: Refungible Balance (r:2 w:2)144 // Storage: Refungible AccountBalance (r:1 w:1)145 // Storage: Refungible TotalSupply (r:1 w:0)146 // Storage: Refungible Owned (r:0 w:1)147 fn transfer_creating() -> Weight {148 Weight::from_ref_time(32_893_000)149 .saturating_add(T::DbWeight::get().reads(4 as u64))150 .saturating_add(T::DbWeight::get().writes(4 as u64))151 }152 // Storage: Refungible Balance (r:2 w:2)153 // Storage: Refungible AccountBalance (r:1 w:1)154 // Storage: Refungible TotalSupply (r:1 w:0)155 // Storage: Refungible Owned (r:0 w:1)156 fn transfer_removing() -> Weight {157 Weight::from_ref_time(34_703_000)158 .saturating_add(T::DbWeight::get().reads(4 as u64))159 .saturating_add(T::DbWeight::get().writes(4 as u64))160 }161 // Storage: Refungible Balance (r:2 w:2)162 // Storage: Refungible AccountBalance (r:2 w:2)163 // Storage: Refungible TotalSupply (r:1 w:0)164 // Storage: Refungible Owned (r:0 w:2)165 fn transfer_creating_removing() -> Weight {166 Weight::from_ref_time(37_547_000)167 .saturating_add(T::DbWeight::get().reads(5 as u64))168 .saturating_add(T::DbWeight::get().writes(6 as u64))169 }170 // Storage: Refungible Balance (r:1 w:0)171 // Storage: Refungible Allowance (r:0 w:1)172 fn approve() -> Weight {173 Weight::from_ref_time(20_039_000)174 .saturating_add(T::DbWeight::get().reads(1 as u64))175 .saturating_add(T::DbWeight::get().writes(1 as u64))176 }177 // Storage: Refungible Allowance (r:1 w:1)178 // Storage: Refungible Balance (r:2 w:2)179 // Storage: Refungible TotalSupply (r:1 w:0)180 fn transfer_from_normal() -> Weight {181 Weight::from_ref_time(37_628_000)182 .saturating_add(T::DbWeight::get().reads(4 as u64))183 .saturating_add(T::DbWeight::get().writes(3 as u64))184 }185 // Storage: Refungible Allowance (r:1 w:1)186 // Storage: Refungible Balance (r:2 w:2)187 // Storage: Refungible AccountBalance (r:1 w:1)188 // Storage: Refungible TotalSupply (r:1 w:0)189 // Storage: Refungible Owned (r:0 w:1)190 fn transfer_from_creating() -> Weight {191 Weight::from_ref_time(42_072_000)192 .saturating_add(T::DbWeight::get().reads(5 as u64))193 .saturating_add(T::DbWeight::get().writes(5 as u64))194 }195 // Storage: Refungible Allowance (r:1 w:1)196 // Storage: Refungible Balance (r:2 w:2)197 // Storage: Refungible AccountBalance (r:1 w:1)198 // Storage: Refungible TotalSupply (r:1 w:0)199 // Storage: Refungible Owned (r:0 w:1)200 fn transfer_from_removing() -> Weight {201 Weight::from_ref_time(43_024_000)202 .saturating_add(T::DbWeight::get().reads(5 as u64))203 .saturating_add(T::DbWeight::get().writes(5 as u64))204 }205 // Storage: Refungible Allowance (r:1 w:1)206 // Storage: Refungible Balance (r:2 w:2)207 // Storage: Refungible AccountBalance (r:2 w:2)208 // Storage: Refungible TotalSupply (r:1 w:0)209 // Storage: Refungible Owned (r:0 w:2)210 fn transfer_from_creating_removing() -> Weight {211 Weight::from_ref_time(45_910_000)212 .saturating_add(T::DbWeight::get().reads(6 as u64))213 .saturating_add(T::DbWeight::get().writes(7 as u64))214 }215 // Storage: Refungible Allowance (r:1 w:1)216 // Storage: Refungible TotalSupply (r:1 w:1)217 // Storage: Refungible Balance (r:1 w:1)218 // Storage: Refungible AccountBalance (r:1 w:1)219 // Storage: Refungible TokensBurnt (r:1 w:1)220 // Storage: Refungible Owned (r:0 w:1)221 // Storage: Refungible TokenProperties (r:0 w:1)222 fn burn_from() -> Weight {223 Weight::from_ref_time(48_584_000)224 .saturating_add(T::DbWeight::get().reads(5 as u64))225 .saturating_add(T::DbWeight::get().writes(7 as u64))226 }227 // Storage: Common CollectionPropertyPermissions (r:1 w:1)228 fn set_token_property_permissions(b: u32, ) -> Weight {229 (Weight::from_ref_time(0))230 // Standard Error: 60_000231 .saturating_add(Weight::from_ref_time(15_533_000).saturating_mul(b as u64))232 .saturating_add(T::DbWeight::get().reads(1 as u64))233 .saturating_add(T::DbWeight::get().writes(1 as u64))234 }235 // Storage: Common CollectionPropertyPermissions (r:1 w:0)236 // Storage: Refungible TokenProperties (r:1 w:1)237 fn set_token_properties(b: u32, ) -> Weight {238 (Weight::from_ref_time(0))239 // Standard Error: 3_609_000240 .saturating_add(Weight::from_ref_time(590_204_000).saturating_mul(b as u64))241 .saturating_add(T::DbWeight::get().reads(2 as u64))242 .saturating_add(T::DbWeight::get().writes(1 as u64))243 }244 // Storage: Common CollectionPropertyPermissions (r:1 w:0)245 // Storage: Refungible TokenProperties (r:1 w:1)246 fn delete_token_properties(b: u32, ) -> Weight {247 (Weight::from_ref_time(0))248 // Standard Error: 3_637_000249 .saturating_add(Weight::from_ref_time(603_468_000).saturating_mul(b as u64))250 .saturating_add(T::DbWeight::get().reads(2 as u64))251 .saturating_add(T::DbWeight::get().writes(1 as u64))252 }253 // Storage: Refungible TotalSupply (r:1 w:1)254 // Storage: Refungible Balance (r:1 w:1)255 fn repartition_item() -> Weight {256 Weight::from_ref_time(22_356_000)257 .saturating_add(T::DbWeight::get().reads(2 as u64))258 .saturating_add(T::DbWeight::get().writes(2 as u64))259 }260 // Storage: Refungible Balance (r:2 w:0)261 fn token_owner() -> Weight {262 Weight::from_ref_time(9_431_000)263 .saturating_add(T::DbWeight::get().reads(2 as u64))264 }265 // Storage: Refungible WalletOperator (r:0 w:1)266 fn set_allowance_for_all() -> Weight {267 Weight::from_ref_time(16_150_000 as u64)268 .saturating_add(T::DbWeight::get().writes(1 as u64))269 }270 // Storage: Refungible WalletOperator (r:1 w:0)271 fn allowance_for_all() -> Weight {272 Weight::from_ref_time(5_901_000 as u64)273 .saturating_add(T::DbWeight::get().reads(1 as u64))274 }275}276277// For backwards compatibility and tests278impl WeightInfo for () {279 // Storage: Refungible TokensMinted (r:1 w:1)280 // Storage: Refungible AccountBalance (r:1 w:1)281 // Storage: Refungible Balance (r:0 w:1)282 // Storage: Refungible TotalSupply (r:0 w:1)283 // Storage: Refungible Owned (r:0 w:1)284 fn create_item() -> Weight {285 Weight::from_ref_time(29_527_000)286 .saturating_add(RocksDbWeight::get().reads(2 as u64))287 .saturating_add(RocksDbWeight::get().writes(5 as u64))288 }289 // Storage: Refungible TokensMinted (r:1 w:1)290 // Storage: Refungible AccountBalance (r:1 w:1)291 // Storage: Refungible Balance (r:0 w:4)292 // Storage: Refungible TotalSupply (r:0 w:4)293 // Storage: Refungible Owned (r:0 w:4)294 fn create_multiple_items(b: u32, ) -> Weight {295 Weight::from_ref_time(28_541_000)296 // Standard Error: 4_000297 .saturating_add(Weight::from_ref_time(6_671_000).saturating_mul(b as u64))298 .saturating_add(RocksDbWeight::get().reads(2 as u64))299 .saturating_add(RocksDbWeight::get().writes(2 as u64))300 .saturating_add(RocksDbWeight::get().writes((3 as u64).saturating_mul(b as u64)))301 }302 // Storage: Refungible TokensMinted (r:1 w:1)303 // Storage: Refungible AccountBalance (r:4 w:4)304 // Storage: Refungible Balance (r:0 w:4)305 // Storage: Refungible TotalSupply (r:0 w:4)306 // Storage: Refungible Owned (r:0 w:4)307 fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {308 Weight::from_ref_time(24_366_000)309 // Standard Error: 5_000310 .saturating_add(Weight::from_ref_time(9_338_000).saturating_mul(b as u64))311 .saturating_add(RocksDbWeight::get().reads(1 as u64))312 .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))313 .saturating_add(RocksDbWeight::get().writes(1 as u64))314 .saturating_add(RocksDbWeight::get().writes((4 as u64).saturating_mul(b as u64)))315 }316 // Storage: Refungible TokensMinted (r:1 w:1)317 // Storage: Refungible TotalSupply (r:0 w:1)318 // Storage: Refungible AccountBalance (r:4 w:4)319 // Storage: Refungible Balance (r:0 w:4)320 // Storage: Refungible Owned (r:0 w:4)321 fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {322 Weight::from_ref_time(27_574_000)323 // Standard Error: 4_000324 .saturating_add(Weight::from_ref_time(7_193_000).saturating_mul(b as u64))325 .saturating_add(RocksDbWeight::get().reads(1 as u64))326 .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(b as u64)))327 .saturating_add(RocksDbWeight::get().writes(2 as u64))328 .saturating_add(RocksDbWeight::get().writes((3 as u64).saturating_mul(b as u64)))329 }330 // Storage: Refungible TotalSupply (r:1 w:1)331 // Storage: Refungible Balance (r:3 w:1)332 // Storage: Refungible AccountBalance (r:1 w:1)333 // Storage: Refungible Owned (r:0 w:1)334 fn burn_item_partial() -> Weight {335 Weight::from_ref_time(42_943_000)336 .saturating_add(RocksDbWeight::get().reads(5 as u64))337 .saturating_add(RocksDbWeight::get().writes(4 as u64))338 }339 // Storage: Refungible TotalSupply (r:1 w:1)340 // Storage: Refungible Balance (r:1 w:1)341 // Storage: Refungible AccountBalance (r:1 w:1)342 // Storage: Refungible TokensBurnt (r:1 w:1)343 // Storage: Refungible Owned (r:0 w:1)344 // Storage: Refungible TokenProperties (r:0 w:1)345 fn burn_item_fully() -> Weight {346 Weight::from_ref_time(36_861_000)347 .saturating_add(RocksDbWeight::get().reads(4 as u64))348 .saturating_add(RocksDbWeight::get().writes(6 as u64))349 }350 // Storage: Refungible Balance (r:2 w:2)351 // Storage: Refungible TotalSupply (r:1 w:0)352 fn transfer_normal() -> Weight {353 Weight::from_ref_time(27_789_000)354 .saturating_add(RocksDbWeight::get().reads(3 as u64))355 .saturating_add(RocksDbWeight::get().writes(2 as u64))356 }357 // Storage: Refungible Balance (r:2 w:2)358 // Storage: Refungible AccountBalance (r:1 w:1)359 // Storage: Refungible TotalSupply (r:1 w:0)360 // Storage: Refungible Owned (r:0 w:1)361 fn transfer_creating() -> Weight {362 Weight::from_ref_time(32_893_000)363 .saturating_add(RocksDbWeight::get().reads(4 as u64))364 .saturating_add(RocksDbWeight::get().writes(4 as u64))365 }366 // Storage: Refungible Balance (r:2 w:2)367 // Storage: Refungible AccountBalance (r:1 w:1)368 // Storage: Refungible TotalSupply (r:1 w:0)369 // Storage: Refungible Owned (r:0 w:1)370 fn transfer_removing() -> Weight {371 Weight::from_ref_time(34_703_000)372 .saturating_add(RocksDbWeight::get().reads(4 as u64))373 .saturating_add(RocksDbWeight::get().writes(4 as u64))374 }375 // Storage: Refungible Balance (r:2 w:2)376 // Storage: Refungible AccountBalance (r:2 w:2)377 // Storage: Refungible TotalSupply (r:1 w:0)378 // Storage: Refungible Owned (r:0 w:2)379 fn transfer_creating_removing() -> Weight {380 Weight::from_ref_time(37_547_000)381 .saturating_add(RocksDbWeight::get().reads(5 as u64))382 .saturating_add(RocksDbWeight::get().writes(6 as u64))383 }384 // Storage: Refungible Balance (r:1 w:0)385 // Storage: Refungible Allowance (r:0 w:1)386 fn approve() -> Weight {387 Weight::from_ref_time(20_039_000)388 .saturating_add(RocksDbWeight::get().reads(1 as u64))389 .saturating_add(RocksDbWeight::get().writes(1 as u64))390 }391 // Storage: Refungible Allowance (r:1 w:1)392 // Storage: Refungible Balance (r:2 w:2)393 // Storage: Refungible TotalSupply (r:1 w:0)394 fn transfer_from_normal() -> Weight {395 Weight::from_ref_time(37_628_000)396 .saturating_add(RocksDbWeight::get().reads(4 as u64))397 .saturating_add(RocksDbWeight::get().writes(3 as u64))398 }399 // Storage: Refungible Allowance (r:1 w:1)400 // Storage: Refungible Balance (r:2 w:2)401 // Storage: Refungible AccountBalance (r:1 w:1)402 // Storage: Refungible TotalSupply (r:1 w:0)403 // Storage: Refungible Owned (r:0 w:1)404 fn transfer_from_creating() -> Weight {405 Weight::from_ref_time(42_072_000)406 .saturating_add(RocksDbWeight::get().reads(5 as u64))407 .saturating_add(RocksDbWeight::get().writes(5 as u64))408 }409 // Storage: Refungible Allowance (r:1 w:1)410 // Storage: Refungible Balance (r:2 w:2)411 // Storage: Refungible AccountBalance (r:1 w:1)412 // Storage: Refungible TotalSupply (r:1 w:0)413 // Storage: Refungible Owned (r:0 w:1)414 fn transfer_from_removing() -> Weight {415 Weight::from_ref_time(43_024_000)416 .saturating_add(RocksDbWeight::get().reads(5 as u64))417 .saturating_add(RocksDbWeight::get().writes(5 as u64))418 }419 // Storage: Refungible Allowance (r:1 w:1)420 // Storage: Refungible Balance (r:2 w:2)421 // Storage: Refungible AccountBalance (r:2 w:2)422 // Storage: Refungible TotalSupply (r:1 w:0)423 // Storage: Refungible Owned (r:0 w:2)424 fn transfer_from_creating_removing() -> Weight {425 Weight::from_ref_time(45_910_000)426 .saturating_add(RocksDbWeight::get().reads(6 as u64))427 .saturating_add(RocksDbWeight::get().writes(7 as u64))428 }429 // Storage: Refungible Allowance (r:1 w:1)430 // Storage: Refungible TotalSupply (r:1 w:1)431 // Storage: Refungible Balance (r:1 w:1)432 // Storage: Refungible AccountBalance (r:1 w:1)433 // Storage: Refungible TokensBurnt (r:1 w:1)434 // Storage: Refungible Owned (r:0 w:1)435 // Storage: Refungible TokenProperties (r:0 w:1)436 fn burn_from() -> Weight {437 Weight::from_ref_time(48_584_000)438 .saturating_add(RocksDbWeight::get().reads(5 as u64))439 .saturating_add(RocksDbWeight::get().writes(7 as u64))440 }441 // Storage: Common CollectionPropertyPermissions (r:1 w:1)442 fn set_token_property_permissions(b: u32, ) -> Weight {443 (Weight::from_ref_time(0))444 // Standard Error: 60_000445 .saturating_add(Weight::from_ref_time(15_533_000).saturating_mul(b as u64))446 .saturating_add(RocksDbWeight::get().reads(1 as u64))447 .saturating_add(RocksDbWeight::get().writes(1 as u64))448 }449 // Storage: Common CollectionPropertyPermissions (r:1 w:0)450 // Storage: Refungible TokenProperties (r:1 w:1)451 fn set_token_properties(b: u32, ) -> Weight {452 (Weight::from_ref_time(0))453 // Standard Error: 3_609_000454 .saturating_add(Weight::from_ref_time(590_204_000).saturating_mul(b as u64))455 .saturating_add(RocksDbWeight::get().reads(2 as u64))456 .saturating_add(RocksDbWeight::get().writes(1 as u64))457 }458 // Storage: Common CollectionPropertyPermissions (r:1 w:0)459 // Storage: Refungible TokenProperties (r:1 w:1)460 fn delete_token_properties(b: u32, ) -> Weight {461 (Weight::from_ref_time(0))462 // Standard Error: 3_637_000463 .saturating_add(Weight::from_ref_time(603_468_000).saturating_mul(b as u64))464 .saturating_add(RocksDbWeight::get().reads(2 as u64))465 .saturating_add(RocksDbWeight::get().writes(1 as u64))466 }467 // Storage: Refungible TotalSupply (r:1 w:1)468 // Storage: Refungible Balance (r:1 w:1)469 fn repartition_item() -> Weight {470 Weight::from_ref_time(22_356_000)471 .saturating_add(RocksDbWeight::get().reads(2 as u64))472 .saturating_add(RocksDbWeight::get().writes(2 as u64))473 }474 // Storage: Refungible Balance (r:2 w:0)475 fn token_owner() -> Weight {476 Weight::from_ref_time(9_431_000)477 .saturating_add(RocksDbWeight::get().reads(2 as u64))478 }479 // Storage: Refungible WalletOperator (r:0 w:1)480 fn set_allowance_for_all() -> Weight {481 Weight::from_ref_time(16_150_000 as u64)482 .saturating_add(RocksDbWeight::get().writes(1 as u64))483 }484 // Storage: Refungible WalletOperator (r:1 w:0)485 fn allowance_for_all() -> Weight {486 Weight::from_ref_time(5_901_000 as u64)487 .saturating_add(RocksDbWeight::get().reads(1 as u64))488 }489}pallets/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};
pallets/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)
})
}
}
primitives/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>;
}
}
runtime/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))
}
}
runtime/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())
}
}
tests/src/approve.test.tsdiffbeforeafterboth--- a/tests/src/approve.test.ts
+++ b/tests/src/approve.test.ts
@@ -617,26 +617,31 @@
itSub('[nft] Enable and disable approval', async ({helper}) => {
const {collectionId} = await helper.nft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- await helper.nft.mintToken(alice, {collectionId: collectionId, owner: alice.address});
- const checkBeforeApproval = await helper.nft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
+
+ const checkBeforeApproval = await helper.nft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
expect(checkBeforeApproval).to.be.false;
- await helper.nft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, true);
- const checkAfterApproval = await helper.nft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
+
+ await helper.nft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, true);
+ const checkAfterApproval = await helper.nft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
expect(checkAfterApproval).to.be.true;
- await helper.nft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, false);
- const checkAfterDisapproval = await helper.nft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
+
+ await helper.nft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, false);
+ const checkAfterDisapproval = await helper.nft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
expect(checkAfterDisapproval).to.be.false;
});
itSub.ifWithPallets('[rft] Enable and disable approval', [Pallets.ReFungible], async ({helper}) => {
const {collectionId} = await helper.rft.mintCollection(alice, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
- const checkBeforeApproval = await helper.rft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
+
+ const checkBeforeApproval = await helper.rft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
expect(checkBeforeApproval).to.be.false;
- await helper.rft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, true);
- const checkAfterApproval = await helper.rft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
+
+ await helper.rft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, true);
+ const checkAfterApproval = await helper.rft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
expect(checkAfterApproval).to.be.true;
- await helper.rft.setApprovalForAll(alice, collectionId, {Substrate: bob.address}, false);
- const checkAfterDisapproval = await helper.rft.isApprovedForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
+
+ await helper.rft.setAllowanceForAll(alice, collectionId, {Substrate: bob.address}, false);
+ const checkAfterDisapproval = await helper.rft.allowanceForAll(collectionId, {Substrate: alice.address}, {Substrate: bob.address});
expect(checkAfterDisapproval).to.be.false;
});
});
tests/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);
tests/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);
tests/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;
});
});
tests/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;
});
});
tests/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]>;
/**
tests/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
**/
tests/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
**/
tests/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.
*
tests/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 */
tests/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'
tests/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) */
tests/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>',
),
tests/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');