Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NFTs] Fix consumers issue #2653

Merged
merged 2 commits into from
Dec 19, 2023
Merged

[NFTs] Fix consumers issue #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc38445
Fix consumers issue
jsidorenko Dec 7, 2023
cff76ce
Merge branch 'master' into js/fix-consumers
jsidorenko Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions substrate/frame/nfts/src/features/transfer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,38 +124,39 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
pub(crate) fn do_transfer_ownership(
origin: T::AccountId,
collection: T::CollectionId,
owner: T::AccountId,
new_owner: T::AccountId,
) -> DispatchResult {
// Check if the new owner is acceptable based on the collection's acceptance settings.
let acceptable_collection = OwnershipAcceptance::<T, I>::get(&owner);
let acceptable_collection = OwnershipAcceptance::<T, I>::get(&new_owner);
ensure!(acceptable_collection.as_ref() == Some(&collection), Error::<T, I>::Unaccepted);

// Try to retrieve and mutate the collection details.
Collection::<T, I>::try_mutate(collection, |maybe_details| {
let details = maybe_details.as_mut().ok_or(Error::<T, I>::UnknownCollection)?;
// Check if the `origin` is the current owner of the collection.
ensure!(origin == details.owner, Error::<T, I>::NoPermission);
if details.owner == owner {
if details.owner == new_owner {
return Ok(())
}

// Move the deposit to the new owner.
T::Currency::repatriate_reserved(
&details.owner,
&owner,
&new_owner,
details.owner_deposit,
Reserved,
)?;

// Update account ownership information.
CollectionAccount::<T, I>::remove(&details.owner, &collection);
CollectionAccount::<T, I>::insert(&owner, &collection, ());
CollectionAccount::<T, I>::insert(&new_owner, &collection, ());

details.owner = owner.clone();
OwnershipAcceptance::<T, I>::remove(&owner);
details.owner = new_owner.clone();
OwnershipAcceptance::<T, I>::remove(&new_owner);
frame_system::Pallet::<T>::dec_consumers(&new_owner);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be the old owner?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, the new owner needs to call the set_accept_ownership first and then we will increase the consumers number for him. After that the old owner needs to call the transfer_collection and specify the new_owner inside the params


// Emit `OwnerChanged` event.
Self::deposit_event(Event::OwnerChanged { collection, new_owner: owner });
Self::deposit_event(Event::OwnerChanged { collection, new_owner });
Ok(())
})
}
Expand Down
6 changes: 3 additions & 3 deletions substrate/frame/nfts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,11 +1153,11 @@ pub mod pallet {
pub fn transfer_ownership(
origin: OriginFor<T>,
collection: T::CollectionId,
owner: AccountIdLookupOf<T>,
new_owner: AccountIdLookupOf<T>,
) -> DispatchResult {
let origin = ensure_signed(origin)?;
let owner = T::Lookup::lookup(owner)?;
Self::do_transfer_ownership(origin, collection, owner)
let new_owner = T::Lookup::lookup(new_owner)?;
Self::do_transfer_ownership(origin, collection, new_owner)
}

/// Change the Issuer, Admin and Freezer of a collection.
Expand Down
5 changes: 5 additions & 0 deletions substrate/frame/nfts/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,13 @@ fn transfer_owner_should_work() {
Nfts::transfer_ownership(RuntimeOrigin::signed(account(1)), 0, account(2)),
Error::<Test>::Unaccepted
);
assert_eq!(System::consumers(&account(2)), 0);

assert_ok!(Nfts::set_accept_ownership(RuntimeOrigin::signed(account(2)), Some(0)));
assert_eq!(System::consumers(&account(2)), 1);

assert_ok!(Nfts::transfer_ownership(RuntimeOrigin::signed(account(1)), 0, account(2)));
assert_eq!(System::consumers(&account(2)), 1); // one consumer is added due to deposit repatriation
Comment on lines +620 to +623
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unchanged

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. set_accept_ownership increases the number of consumers
  2. transfer_collection will need to decrease that number, but it additionally repatriates the deposit, which adds one consumer. So, without that fix, the new owner will have 2 consumers added instead of just one on collection transfer


assert_eq!(collections(), vec![(account(2), 0)]);
assert_eq!(Balances::total_balance(&account(1)), 98);
Expand Down
21 changes: 12 additions & 9 deletions substrate/frame/uniques/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,34 +856,37 @@ pub mod pallet {
pub fn transfer_ownership(
origin: OriginFor<T>,
collection: T::CollectionId,
owner: AccountIdLookupOf<T>,
new_owner: AccountIdLookupOf<T>,
) -> DispatchResult {
let origin = ensure_signed(origin)?;
let owner = T::Lookup::lookup(owner)?;
let new_owner = T::Lookup::lookup(new_owner)?;

let acceptable_collection = OwnershipAcceptance::<T, I>::get(&owner);
let acceptable_collection = OwnershipAcceptance::<T, I>::get(&new_owner);
ensure!(acceptable_collection.as_ref() == Some(&collection), Error::<T, I>::Unaccepted);

Collection::<T, I>::try_mutate(collection.clone(), |maybe_details| {
let details = maybe_details.as_mut().ok_or(Error::<T, I>::UnknownCollection)?;
ensure!(origin == details.owner, Error::<T, I>::NoPermission);
if details.owner == owner {
if details.owner == new_owner {
return Ok(())
}

// Move the deposit to the new owner.
T::Currency::repatriate_reserved(
&details.owner,
&owner,
&new_owner,
details.total_deposit,
Reserved,
)?;

CollectionAccount::<T, I>::remove(&details.owner, &collection);
CollectionAccount::<T, I>::insert(&owner, &collection, ());
details.owner = owner.clone();
OwnershipAcceptance::<T, I>::remove(&owner);
CollectionAccount::<T, I>::insert(&new_owner, &collection, ());

details.owner = new_owner.clone();
OwnershipAcceptance::<T, I>::remove(&new_owner);
frame_system::Pallet::<T>::dec_consumers(&new_owner);

Self::deposit_event(Event::OwnerChanged { collection, new_owner: owner });
Self::deposit_event(Event::OwnerChanged { collection, new_owner });
Ok(())
})
}
Expand Down
3 changes: 3 additions & 0 deletions substrate/frame/uniques/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,11 @@ fn transfer_owner_should_work() {
Uniques::transfer_ownership(RuntimeOrigin::signed(1), 0, 2),
Error::<Test>::Unaccepted
);
assert_eq!(System::consumers(&2), 0);
assert_ok!(Uniques::set_accept_ownership(RuntimeOrigin::signed(2), Some(0)));
assert_eq!(System::consumers(&2), 1);
assert_ok!(Uniques::transfer_ownership(RuntimeOrigin::signed(1), 0, 2));
assert_eq!(System::consumers(&2), 1);

assert_eq!(collections(), vec![(2, 0)]);
assert_eq!(Balances::total_balance(&1), 98);
Expand Down