From 3c9ccd9f15bd5026d41793ab5142bc0b62ed068e Mon Sep 17 00:00:00 2001 From: chungquantin <56880684+chungquantin@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:51:59 +0700 Subject: [PATCH] fix: rebase & update integration tests --- pallets/api/src/nonfungibles/mod.rs | 38 +- pallets/api/src/nonfungibles/types.rs | 31 ++ pop-api/integration-tests/Cargo.toml | 2 + .../contracts/nonfungibles/lib.rs | 4 +- .../integration-tests/src/nonfungibles/mod.rs | 327 +++++++++++++----- .../src/nonfungibles/utils.rs | 56 ++- pop-api/src/v0/nonfungibles/mod.rs | 6 +- pop-api/src/v0/nonfungibles/types.rs | 10 + 8 files changed, 335 insertions(+), 139 deletions(-) create mode 100644 pallets/api/src/nonfungibles/types.rs diff --git a/pallets/api/src/nonfungibles/mod.rs b/pallets/api/src/nonfungibles/mod.rs index 6da7de5f..4bdd99ce 100644 --- a/pallets/api/src/nonfungibles/mod.rs +++ b/pallets/api/src/nonfungibles/mod.rs @@ -11,37 +11,17 @@ pub use pallet_nfts::{ CollectionSetting, CollectionSettings, DestroyWitness, ItemDeposit, ItemDetails, ItemMetadata, ItemSetting, MintSettings, MintType, MintWitness, }; -use sp_runtime::traits::StaticLookup; +use sp_runtime::{traits::StaticLookup, BoundedVec}; +use types::*; use weights::WeightInfo; #[cfg(feature = "runtime-benchmarks")] mod benchmarking; #[cfg(test)] mod tests; +pub mod types; pub mod weights; -type AccountIdOf = ::AccountId; -type NftsOf = pallet_nfts::Pallet>; -type NftsErrorOf = pallet_nfts::Error>; -type NftsWeightInfoOf = >>::WeightInfo; -type NftsInstanceOf = ::NftsInstance; -type BalanceOf = <>>::Currency as Currency< - ::AccountId, ->>::Balance; -type CollectionIdOf = - as Inspect<::AccountId>>::CollectionId; -type ItemIdOf = as Inspect<::AccountId>>::ItemId; -type ItemPriceOf = BalanceOf; -type CollectionDetailsFor = CollectionDetails, BalanceOf>; -type AttributeNamespaceOf = AttributeNamespace>; -type CollectionConfigFor = - CollectionConfig, BlockNumberFor, CollectionIdOf>; -// Type aliases for pallet-nfts storage items. -pub(super) type AccountBalanceOf = pallet_nfts::AccountBalance>; -pub(super) type AttributeOf = pallet_nfts::Attribute>; -pub(super) type NextCollectionIdOf = pallet_nfts::NextCollectionId>; -pub(super) type CollectionOf = pallet_nfts::Collection>; - #[frame_support::pallet] pub mod pallet { use frame_support::{ @@ -50,8 +30,6 @@ pub mod pallet { traits::Incrementable, }; use frame_system::pallet_prelude::*; - use pallet_nfts::{CancelAttributesApprovalWitness, DestroyWitness, MintWitness}; - use sp_runtime::BoundedVec; use sp_std::vec::Vec; use super::*; @@ -104,7 +82,7 @@ pub mod pallet { /// The namespace of the attribute. namespace: AttributeNamespaceOf, /// The key of the attribute. - key: BoundedVec, + key: AttributeKey, }, /// Details of a specified collection. #[codec(index = 9)] @@ -354,8 +332,8 @@ pub mod pallet { collection: CollectionIdOf, item: Option>, namespace: AttributeNamespaceOf, - key: BoundedVec, - value: BoundedVec, + key: AttributeKey, + value: AttributeValue, ) -> DispatchResult { NftsOf::::set_attribute(origin, collection, item, namespace, key, value) } @@ -374,7 +352,7 @@ pub mod pallet { collection: CollectionIdOf, item: Option>, namespace: AttributeNamespaceOf, - key: BoundedVec, + key: AttributeKey, ) -> DispatchResult { NftsOf::::clear_attribute(origin, collection, item, namespace, key) } @@ -391,7 +369,7 @@ pub mod pallet { origin: OriginFor, collection: CollectionIdOf, item: ItemIdOf, - data: BoundedVec, + data: MetadataData, ) -> DispatchResult { NftsOf::::set_metadata(origin, collection, item, data) } diff --git a/pallets/api/src/nonfungibles/types.rs b/pallets/api/src/nonfungibles/types.rs new file mode 100644 index 00000000..e15d430b --- /dev/null +++ b/pallets/api/src/nonfungibles/types.rs @@ -0,0 +1,31 @@ +use super::*; + +pub(super) type AccountIdOf = ::AccountId; +pub(super) type NftsOf = pallet_nfts::Pallet>; +pub(super) type NftsErrorOf = pallet_nfts::Error>; +pub(super) type NftsWeightInfoOf = >>::WeightInfo; +pub(super) type NftsInstanceOf = ::NftsInstance; +pub(super) type BalanceOf = + <>>::Currency as Currency< + ::AccountId, + >>::Balance; +pub(super) type CollectionIdOf = + as Inspect<::AccountId>>::CollectionId; +pub(super) type ItemIdOf = + as Inspect<::AccountId>>::ItemId; +pub(super) type ItemPriceOf = BalanceOf; +pub(super) type CollectionDetailsFor = CollectionDetails, BalanceOf>; +pub(super) type AttributeNamespaceOf = AttributeNamespace>; +pub(super) type CollectionConfigFor = + CollectionConfig, BlockNumberFor, CollectionIdOf>; +// Public due to pop-api integration tests crate. +pub type AccountBalanceOf = pallet_nfts::AccountBalance>; +pub type AttributeOf = pallet_nfts::Attribute>; +pub type AttributeKey = BoundedVec>>::KeyLimit>; +pub type AttributeValue = + BoundedVec>>::ValueLimit>; +pub type CollectionOf = pallet_nfts::Collection>; +pub type CollectionConfigOf = pallet_nfts::CollectionConfigOf>; +pub type NextCollectionIdOf = pallet_nfts::NextCollectionId>; +pub type MetadataData = + BoundedVec>>::StringLimit>; diff --git a/pop-api/integration-tests/Cargo.toml b/pop-api/integration-tests/Cargo.toml index f87cdddb..edc7017f 100644 --- a/pop-api/integration-tests/Cargo.toml +++ b/pop-api/integration-tests/Cargo.toml @@ -13,6 +13,7 @@ frame-support = { version = "36.0.0", default-features = false } frame-support-procedural = { version = "=30.0.1", default-features = false } frame-system = { version = "36.1.0", default-features = false } log = "0.4.22" +pallet-api = { path = "../../pallets/api", default-features = false } pallet-assets = { version = "37.0.0", default-features = false } pallet-balances = { version = "37.0.0", default-features = false } pallet-contracts = { version = "35.0.0", default-features = false } @@ -38,6 +39,7 @@ devnet = [ ] std = [ "frame-support/std", "frame-system/std", + "pallet-api/std", "pallet-assets/std", "pallet-balances/std", "pallet-contracts/std", diff --git a/pop-api/integration-tests/contracts/nonfungibles/lib.rs b/pop-api/integration-tests/contracts/nonfungibles/lib.rs index 13446791..717498a1 100644 --- a/pop-api/integration-tests/contracts/nonfungibles/lib.rs +++ b/pop-api/integration-tests/contracts/nonfungibles/lib.rs @@ -54,11 +54,11 @@ mod nonfungibles { pub fn allowance( &self, collection: CollectionId, + item: Option, owner: AccountId, operator: AccountId, - item: Option, ) -> Result { - api::allowance(collection, owner, operator, item) + api::allowance(collection, item, owner, operator) } #[ink(message)] diff --git a/pop-api/integration-tests/src/nonfungibles/mod.rs b/pop-api/integration-tests/src/nonfungibles/mod.rs index c92652c0..adfe7f2e 100644 --- a/pop-api/integration-tests/src/nonfungibles/mod.rs +++ b/pop-api/integration-tests/src/nonfungibles/mod.rs @@ -1,8 +1,10 @@ use frame_support::BoundedVec; +use pallet_api::nonfungibles::types::*; use pop_api::{ nonfungibles::{ events::{Approval, AttributeSet, Transfer}, - types::*, + AttributeNamespace, CancelAttributesApprovalWitness, CollectionConfig, CollectionDetails, + CollectionId, CollectionSettings, DestroyWitness, ItemId, MintSettings, MintWitness, }, primitives::BlockNumber, }; @@ -13,8 +15,8 @@ use super::*; mod utils; -const COLLECTION_ID: CollectionId = 0; -const ITEM_ID: ItemId = 1; +const COLLECTION: CollectionId = 0; +const ITEM: ItemId = 0; const CONTRACT: &str = "contracts/nonfungibles/target/ink/nonfungibles.wasm"; #[test] @@ -22,20 +24,20 @@ fn total_supply_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - // No tokens in circulation. + // No collection item is created. assert_eq!( - total_supply(&addr, COLLECTION_ID), - Ok(Nfts::collection_items(COLLECTION_ID).unwrap_or_default() as u128) + total_supply(&addr, COLLECTION), + Ok(Nfts::collection_items(COLLECTION).unwrap_or_default() as u128) ); - assert_eq!(total_supply(&addr, COLLECTION_ID), Ok(0)); + assert_eq!(total_supply(&addr, COLLECTION), Ok(0)); - // Tokens in circulation. - nfts::create_collection_and_mint_to(&addr, &addr, &ALICE, ITEM_ID); + // Collection item is created. + nfts::create_collection_and_mint_to(&addr, &addr, &ALICE, ITEM); assert_eq!( - total_supply(&addr, COLLECTION_ID), - Ok(Nfts::collection_items(COLLECTION_ID).unwrap_or_default() as u128) + total_supply(&addr, COLLECTION), + Ok(Nfts::collection_items(COLLECTION).unwrap_or_default() as u128) ); - assert_eq!(total_supply(&addr, COLLECTION_ID), Ok(1)); + assert_eq!(total_supply(&addr, COLLECTION), Ok(1)); }); } @@ -44,20 +46,14 @@ fn balance_of_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - // No tokens in circulation. - assert_eq!( - balance_of(&addr, COLLECTION_ID, ALICE), - Ok(nfts::balance_of(COLLECTION_ID, ALICE)), - ); - assert_eq!(total_supply(&addr, COLLECTION_ID), Ok(0)); + // No collection item is created. + assert_eq!(balance_of(&addr, COLLECTION, ALICE), Ok(nfts::balance_of(COLLECTION, ALICE)),); + assert_eq!(total_supply(&addr, COLLECTION), Ok(0)); - // Tokens in circulation. - nfts::create_collection_and_mint_to(&addr, &addr, &ALICE, ITEM_ID); - assert_eq!( - balance_of(&addr, COLLECTION_ID, ALICE), - Ok(nfts::balance_of(COLLECTION_ID, ALICE)), - ); - assert_eq!(total_supply(&addr, COLLECTION_ID), Ok(1)); + // Collection item is created. + nfts::create_collection_and_mint_to(&addr, &addr, &ALICE, ITEM); + assert_eq!(balance_of(&addr, COLLECTION, ALICE), Ok(nfts::balance_of(COLLECTION, ALICE)),); + assert_eq!(total_supply(&addr, COLLECTION), Ok(1)); }); } @@ -65,23 +61,20 @@ fn balance_of_works() { fn allowance_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - // No tokens in circulation. + // No collection item is created. assert_eq!( - allowance(&addr.clone(), COLLECTION_ID, addr.clone(), ALICE, None), - Ok(!Nfts::check_allowance(&COLLECTION_ID, &None, &addr, &ALICE).is_err()), + allowance(&addr.clone(), COLLECTION, None, addr.clone(), ALICE), + Ok(!Nfts::check_allowance(&COLLECTION, &None, &addr, &ALICE).is_err()), ); - assert_eq!(allowance(&addr.clone(), COLLECTION_ID, addr.clone(), ALICE, None), Ok(false)); + assert_eq!(allowance(&addr.clone(), COLLECTION, None, addr.clone(), ALICE), Ok(false)); - let (_, item) = - nfts::create_collection_mint_and_approve(&addr, &addr, ITEM_ID, &addr, &ALICE); + // Collection item is created. + let (_, item) = nfts::create_collection_mint_and_approve(&addr, &addr, ITEM, &addr, &ALICE); assert_eq!( - allowance(&addr.clone(), COLLECTION_ID, addr.clone(), ALICE, Some(item)), - Ok(Nfts::check_allowance(&COLLECTION_ID, &Some(item), &addr.clone(), &ALICE).is_ok()), - ); - assert_eq!( - allowance(&addr.clone(), COLLECTION_ID, addr.clone(), ALICE, Some(item)), - Ok(true) + allowance(&addr.clone(), COLLECTION, Some(item), addr.clone(), ALICE), + Ok(Nfts::check_allowance(&COLLECTION, &Some(item), &addr.clone(), &ALICE).is_ok()), ); + assert_eq!(allowance(&addr.clone(), COLLECTION, Some(item), addr.clone(), ALICE), Ok(true)); }); } @@ -90,24 +83,86 @@ fn transfer_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); - let before_transfer_balance = nfts::balance_of(COLLECTION_ID, ALICE); + // Collection item does not exist. + assert_eq!( + transfer(&addr, COLLECTION, ITEM, ALICE), + Err(Module { index: 50, error: [1, 0] }) + ); + // Create a collection and mint to a contract address. + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); + // Privilege to transfer a collection item is locked. + nfts::lock_item_transfer(&addr, COLLECTION, ITEM); + assert_eq!( + transfer(&addr, COLLECTION, ITEM, ALICE), + Err(Module { index: 50, error: [12, 0] }) + ); + nfts::unlock_item_transfer(&addr, COLLECTION, ITEM); + // Successful transfer. + let before_transfer_balance = nfts::balance_of(COLLECTION, ALICE); assert_ok!(transfer(&addr, collection, item, ALICE)); - let after_transfer_balance = nfts::balance_of(COLLECTION_ID, ALICE); + let after_transfer_balance = nfts::balance_of(COLLECTION, ALICE); assert_eq!(after_transfer_balance - before_transfer_balance, 1); + // Successfully emit event. + let from = account_id_from_slice(addr.as_ref()); + let to = account_id_from_slice(ALICE.as_ref()); + let expected = Transfer { from: Some(from), to: Some(to), item: ITEM }.encode(); + assert_eq!(last_contract_event(), expected.as_slice()); + // Collection item does not exist, i.e. burnt. + nfts::burn(COLLECTION, ITEM, &ALICE); + assert_eq!( + transfer(&addr, COLLECTION, ITEM, ALICE), + Err(Module { index: 50, error: [20, 0] }) + ); }); } #[test] -fn approve_works() { +fn approve_item_transfer_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + // Collection item does not exist. + assert_eq!( + approve(&addr, COLLECTION, Some(ITEM), ALICE, true), + Err(Module { index: 50, error: [20, 0] }) + ); + // Successful approvals. + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(approve(&addr, collection, Some(item), ALICE, true)); - assert!(Nfts::check_allowance(&collection, &Some(item), &addr.clone(), &ALICE).is_ok(),); + assert!(Nfts::check_allowance(&collection, &Some(item), &addr.clone(), &ALICE).is_ok()); + // Successfully emit event. + let owner = account_id_from_slice(addr.as_ref()); + let operator = account_id_from_slice(ALICE.as_ref()); + let expected = Approval { owner, operator, item: Some(item), approved: true }.encode(); + assert_eq!(last_contract_event(), expected.as_slice()); + // New value overrides old value. + assert_ok!(approve(&addr, collection, Some(item), ALICE, false)); + assert!(Nfts::check_allowance(&collection, &Some(item), &addr.clone(), &ALICE).is_err()); + }); +} - assert_ok!(Nfts::transfer(RuntimeOrigin::signed(ALICE), collection, item, BOB.into())); +#[test] +fn approve_collection_transfer_works() { + new_test_ext().execute_with(|| { + let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); + + // Collection does not exist. + assert_eq!( + approve(&addr, COLLECTION, None, ALICE, true), + Err(Module { index: 50, error: [1, 0] }) + ); + // Successful approvals. + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); + assert_ok!(approve(&addr, collection, None, ALICE, true)); + assert!(Nfts::check_allowance(&collection, &None, &addr.clone(), &ALICE).is_ok()); + // Successfully emit event. + let owner = account_id_from_slice(addr.as_ref()); + let operator = account_id_from_slice(ALICE.as_ref()); + let expected = Approval { owner, operator, item: None, approved: true }.encode(); + assert_eq!(last_contract_event(), expected.as_slice()); + // New value overrides old value. + assert_ok!(approve(&addr, collection, None, ALICE, false)); + assert!(Nfts::check_allowance(&collection, &None, &addr.clone(), &ALICE).is_err()); }); } @@ -115,7 +170,7 @@ fn approve_works() { fn owner_of_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &ALICE, ITEM_ID); + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &ALICE, ITEM); assert_eq!(owner_of(&addr, collection, item), Ok(ALICE)); }); } @@ -125,7 +180,7 @@ fn get_attribute_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(Nfts::set_attribute( RuntimeOrigin::signed(addr.clone()), @@ -153,7 +208,7 @@ fn set_attribute_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(set_attribute( &addr.clone(), @@ -165,14 +220,14 @@ fn set_attribute_works() { )); assert_eq!( - pallet_nfts::Attribute::::get(( + AttributeOf::::get(( collection, Some(item), pallet_nfts::AttributeNamespace::CollectionOwner, - AttributeKey::truncate_from("some attribute".as_bytes().to_vec()), + AttributeKey::::truncate_from("some attribute".as_bytes().to_vec()), )) .map(|attribute| attribute.0), - Some(AttributeValue::truncate_from("some value".as_bytes().to_vec())) + Some(AttributeValue::::truncate_from("some value".as_bytes().to_vec())) ); }); } @@ -182,7 +237,7 @@ fn clear_attribute_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(Nfts::set_attribute( RuntimeOrigin::signed(addr.clone()), collection, @@ -199,11 +254,11 @@ fn clear_attribute_works() { "some attribute".as_bytes().to_vec() )); assert_eq!( - pallet_nfts::Attribute::::get(( + AttributeOf::::get(( collection, Some(item), pallet_nfts::AttributeNamespace::CollectionOwner, - AttributeKey::truncate_from("some attribute".as_bytes().to_vec()), + AttributeKey::::truncate_from("some attribute".as_bytes().to_vec()), )) .map(|attribute| attribute.0), None @@ -216,7 +271,7 @@ fn approve_item_attributes_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(approve_item_attributes(&addr.clone(), collection, item, ALICE)); assert_ok!(Nfts::set_attribute( RuntimeOrigin::signed(ALICE), @@ -227,14 +282,14 @@ fn approve_item_attributes_works() { BoundedVec::truncate_from("some value".as_bytes().to_vec()), )); assert_eq!( - pallet_nfts::Attribute::::get(( + AttributeOf::::get(( collection, Some(item), pallet_nfts::AttributeNamespace::Account(ALICE), - AttributeKey::truncate_from("some attribute".as_bytes().to_vec()), + AttributeKey::::truncate_from("some attribute".as_bytes().to_vec()), )) .map(|attribute| attribute.0), - Some(AttributeValue::truncate_from("some value".as_bytes().to_vec())) + Some(AttributeValue::::truncate_from("some value".as_bytes().to_vec())) ); }); } @@ -244,7 +299,7 @@ fn cancel_item_attributes_approval_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(Nfts::approve_item_attributes( RuntimeOrigin::signed(addr.clone()), collection, @@ -283,9 +338,21 @@ fn set_metadata_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + // Collection does not exist. + assert_eq!( + set_metadata(&addr.clone(), COLLECTION, ITEM, vec![]), + Err(Module { index: 50, error: [0, 0] }) + ); + // No Permission. + let (collection, item) = nfts::create_collection_and_mint_to(&ALICE, &ALICE, &ALICE, ITEM); + assert_eq!( + set_metadata(&addr.clone(), collection, item, vec![]), + Err(Module { index: 52, error: [0, 0] }), + ); + // Successful set metadata. + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(set_metadata(&addr.clone(), collection, item, vec![])); - assert_eq!(Nfts::item_metadata(collection, item), Some(MetadataData::default())); + assert_eq!(Nfts::item_metadata(collection, item), Some(MetadataData::::default())); }); } @@ -294,12 +361,18 @@ fn clear_metadata_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); + // Collection does not exist. + assert_eq!( + clear_metadata(&addr.clone(), COLLECTION, ITEM), + Err(Module { index: 50, error: [0, 0] }) + ); + // Successful clear metadata. + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); assert_ok!(Nfts::set_metadata( RuntimeOrigin::signed(addr.clone()), collection, item, - MetadataData::default() + MetadataData::::default() )); assert_ok!(clear_metadata(&addr.clone(), collection, item)); assert_eq!(Nfts::item_metadata(collection, item), None); @@ -322,7 +395,7 @@ fn create_works() { } )); assert_eq!( - pallet_nfts::Collection::::get(collection), + CollectionOf::::get(collection), Some(pallet_nfts::CollectionDetails { owner: addr.clone(), owner_deposit: 100000000000, @@ -330,6 +403,8 @@ fn create_works() { item_metadatas: 0, item_configs: 0, attributes: 0, + item_holders: 0, + allowances: 0 }) ); }); @@ -340,13 +415,51 @@ fn destroy_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); + // Collection does not exist. + assert_eq!( + destroy( + &addr.clone(), + COLLECTION, + DestroyWitness { + item_metadatas: 0, + item_configs: 0, + attributes: 0, + item_holders: 0, + allowances: 0 + } + ), + Err(Module { index: 50, error: [1, 0] }) + ); + // Destroying can only be done by the collection owner. + let collection = nfts::create_collection(&ALICE, &ALICE); + assert_eq!( + destroy( + &addr.clone(), + collection, + DestroyWitness { + item_metadatas: 0, + item_configs: 0, + attributes: 0, + item_holders: 0, + allowances: 0 + } + ), + Err(Module { index: 50, error: [0, 0] }) + ); + // Successful destroy. let collection = nfts::create_collection(&addr, &addr); assert_ok!(destroy( &addr.clone(), collection, - DestroyWitness { item_metadatas: 0, item_configs: 0, attributes: 0 } + DestroyWitness { + item_metadatas: 0, + item_configs: 0, + attributes: 0, + item_holders: 0, + allowances: 0 + } )); - assert_eq!(pallet_nfts::Collection::::get(collection), None); + assert_eq!(CollectionOf::::get(collection), None); }); } @@ -356,26 +469,18 @@ fn set_max_supply_works() { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); let value = 10; + // Collection does not exist. + assert_eq!( + set_max_supply(&addr.clone(), COLLECTION, value), + Err(Module { index: 50, error: [32, 0] }) + ); + // Sucessfully set max supply. let collection = nfts::create_collection(&addr, &addr); assert_ok!(set_max_supply(&addr.clone(), collection, value)); - - (0..value).into_iter().for_each(|i| { - assert_ok!(Nfts::mint( - RuntimeOrigin::signed(addr.clone()), - collection, - i, - ALICE.into(), - None - )); - }); - assert!(Nfts::mint( - RuntimeOrigin::signed(addr.clone()), - collection, - value + 1, - ALICE.into(), - None - ) - .is_err()); + assert_eq!(nfts::max_supply(collection), Some(value)); + // Non-additive, sets new value. + assert_ok!(set_max_supply(&addr.clone(), collection, value + 1)); + assert_eq!(nfts::max_supply(collection), Some(value + 1)); }); } @@ -385,15 +490,50 @@ fn mint_works() { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); let value = 10; + // Collection does not exist. + assert_eq!( + mint( + &addr.clone(), + ALICE, + COLLECTION, + ITEM, + MintWitness { mint_price: None, owned_item: None } + ), + Err(Module { index: 50, error: [32, 0] }) + ); + // Mitning can only be done by the collection owner. + let collection = nfts::create_collection(&ALICE, &ALICE); + assert_eq!( + mint( + &addr.clone(), + ALICE, + collection, + ITEM, + MintWitness { mint_price: None, owned_item: None } + ), + Err(Module { index: 50, error: [0, 0] }) + ); + // Successful mint. let collection = nfts::create_collection(&addr, &addr); assert_ok!(mint( &addr.clone(), ALICE, collection, - ITEM_ID, - MintWitness { mint_price: None, owned_item: None } + ITEM, + MintWitness { owned_item: None, mint_price: None } )); - assert_eq!(nfts::balance_of(COLLECTION_ID, ALICE), 1); + assert_eq!(nfts::balance_of(collection, ALICE), 1); + // Minting an existing item ID. + assert_eq!( + mint( + &addr.clone(), + ALICE, + collection, + ITEM, + MintWitness { owned_item: None, mint_price: None } + ), + Err(Module { index: 50, error: [2, 0] }) + ); }); } @@ -402,8 +542,17 @@ fn burn_works() { new_test_ext().execute_with(|| { let addr = instantiate(CONTRACT, INIT_VALUE, vec![]); - let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM_ID); - assert_ok!(burn(&addr.clone(), collection, ITEM_ID,)); - assert_eq!(nfts::balance_of(COLLECTION_ID, addr), 0); + // Collection item does not exist. + assert_eq!( + burn(&addr.clone(), COLLECTION, ITEM), + Err(Module { index: 50, error: [20, 0] }) + ); + // Burning can only be done by the collection item owner. + let (collection, item) = nfts::create_collection_and_mint_to(&ALICE, &ALICE, &BOB, ITEM); + assert_eq!(burn(&addr.clone(), collection, item), Err(Module { index: 50, error: [0, 0] })); + // Successful burn. + let (collection, item) = nfts::create_collection_and_mint_to(&addr, &addr, &addr, ITEM); + assert_ok!(burn(&addr.clone(), collection, item)); + assert_eq!(nfts::balance_of(COLLECTION, addr.clone()), 0); }); } diff --git a/pop-api/integration-tests/src/nonfungibles/utils.rs b/pop-api/integration-tests/src/nonfungibles/utils.rs index 0c1c3c19..48d4dbaa 100644 --- a/pop-api/integration-tests/src/nonfungibles/utils.rs +++ b/pop-api/integration-tests/src/nonfungibles/utils.rs @@ -1,9 +1,5 @@ use super::*; -pub(super) type AttributeKey = BoundedVec::KeyLimit>; -pub(super) type AttributeValue = BoundedVec::ValueLimit>; -pub(super) type MetadataData = BoundedVec::StringLimit>; - pub(super) fn total_supply(addr: &AccountId32, collection: CollectionId) -> Result { let result = do_bare_call("total_supply", addr, collection.encode()); decoded::>(result.clone()) @@ -24,11 +20,11 @@ pub(super) fn balance_of( pub(super) fn allowance( addr: &AccountId32, collection: CollectionId, + item: Option, owner: AccountId32, operator: AccountId32, - item: Option, ) -> Result { - let params = [collection.encode(), owner.encode(), operator.encode(), item.encode()].concat(); + let params = [collection.encode(), item.encode(), owner.encode(), operator.encode()].concat(); let result = do_bare_call("allowance", &addr, params); decoded::>(result.clone()) .unwrap_or_else(|_| panic!("Contract reverted: {:?}", result)) @@ -82,11 +78,11 @@ pub(super) fn get_attribute( collection.encode(), item.encode(), namespace.encode(), - AttributeKey::truncate_from(key).encode(), + AttributeKey::::truncate_from(key).encode(), ] .concat(); let result = do_bare_call("get_attribute", &addr, params); - decoded::, Error>>(result.clone()) + decoded::>, Error>>(result.clone()) .unwrap_or_else(|_| panic!("Contract reverted: {:?}", result)) .map(|value| value.map(|v| v.to_vec())) } @@ -134,8 +130,8 @@ pub(super) fn set_attribute( collection.encode(), item.encode(), namespace.encode(), - AttributeKey::truncate_from(key).encode(), - AttributeValue::truncate_from(value).encode(), + AttributeKey::::truncate_from(key).encode(), + AttributeValue::::truncate_from(value).encode(), ] .concat(); let result = do_bare_call("set_attribute", &addr, params); @@ -293,10 +289,6 @@ pub(super) mod nfts { next_id } - pub(crate) fn next_collection_id() -> u32 { - pallet_nfts::NextCollectionId::::get().unwrap_or_default() - } - pub(crate) fn mint( collection: CollectionId, item: ItemId, @@ -313,8 +305,38 @@ pub(super) mod nfts { item } + pub(crate) fn burn(collection: CollectionId, item: ItemId, owner: &AccountId32) { + assert_ok!(Nfts::burn(RuntimeOrigin::signed(owner.clone()), collection, item)); + } + + pub(crate) fn lock_item_transfer(owner: &AccountId32, collection: CollectionId, item: ItemId) { + assert_ok!(Nfts::lock_item_transfer( + RuntimeOrigin::signed(owner.clone()), + collection, + item + )); + } + + pub(crate) fn unlock_item_transfer( + owner: &AccountId32, + collection: CollectionId, + item: ItemId, + ) { + assert_ok!(Nfts::unlock_item_transfer( + RuntimeOrigin::signed(owner.clone()), + collection, + item + )); + } + pub(crate) fn balance_of(collection: CollectionId, owner: AccountId32) -> u32 { - pallet_nfts::AccountBalance::::get(collection, owner) + AccountBalanceOf::::get(collection, owner) + } + + pub(crate) fn max_supply(collection: CollectionId) -> Option { + CollectionConfigOf::::get(collection) + .map(|config| config.max_supply) + .unwrap_or_default() } pub(super) fn collection_config_with_all_settings_enabled( @@ -325,4 +347,8 @@ pub(super) mod nfts { mint_settings: pallet_nfts::MintSettings::default(), } } + + pub(crate) fn next_collection_id() -> u32 { + NextCollectionIdOf::::get().unwrap_or_default() + } } diff --git a/pop-api/src/v0/nonfungibles/mod.rs b/pop-api/src/v0/nonfungibles/mod.rs index 7b2bd187..438b7fa5 100644 --- a/pop-api/src/v0/nonfungibles/mod.rs +++ b/pop-api/src/v0/nonfungibles/mod.rs @@ -44,15 +44,15 @@ pub fn balance_of(collection: CollectionId, owner: AccountId) -> Result { #[inline] pub fn allowance( collection: CollectionId, + item: Option, owner: AccountId, operator: AccountId, - item: Option, ) -> Result { build_read_state(ALLOWANCE) - .input::<(CollectionId, AccountId, AccountId, Option)>() + .input::<(CollectionId, Option, AccountId, AccountId)>() .output::, true>() .handle_error_code::() - .call(&(collection, owner, operator, item)) + .call(&(collection, item, owner, operator)) } #[inline] diff --git a/pop-api/src/v0/nonfungibles/types.rs b/pop-api/src/v0/nonfungibles/types.rs index c630f04b..5cd725ae 100644 --- a/pop-api/src/v0/nonfungibles/types.rs +++ b/pop-api/src/v0/nonfungibles/types.rs @@ -22,8 +22,12 @@ pub struct CollectionDetails { pub item_metadatas: u32, /// The total number of outstanding item configs of this collection. pub item_configs: u32, + /// The total number of accounts that hold items of the collection. + pub item_holders: u32, /// The total number of attributes for this collection. pub attributes: u32, + /// The total number of allowances to spend all items within collections. + pub allowances: u32, } /// Attribute namespaces for non-fungible tokens. @@ -69,9 +73,15 @@ pub struct DestroyWitness { /// The total number of outstanding item configs of this collection. #[codec(compact)] pub item_configs: u32, + /// The total number of accounts that hold items of the collection. + #[codec(compact)] + pub item_holders: u32, /// The total number of attributes for this collection. #[codec(compact)] pub attributes: u32, + /// The total number of allowances to spend all items within collections. + #[codec(compact)] + pub allowances: u32, } /// Witness data for items mint transactions.