Mesh 1902/create nft collection mint nft #1340
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… Add NFT primitives; Add Asset associated type to NFT config
Codecov Report
@@ Coverage Diff @@
## MESH-1890/add-nft-pallet #1340 +/- ##
============================================================
+ Coverage 43.35% 43.48% +0.12%
============================================================
Files 140 144 +4
Lines 30111 30428 +317
============================================================
+ Hits 13056 13233 +177
- Misses 17055 17195 +140
|
… storage structures
…llection; Add unit tests for burn nft; Fix tests for create_nft_collection
HenriqueNogara
changed the title
Neopallium
requested changes
Dec 1, 2022
Comment on lines
+2578
to
+2580
| /// Returns `None` if there's no asset associated to the given ticker, | ||
| /// returns Some(true) if the asset exists and is of type `AssetType::NFT`, and returns Some(false) otherwise. | ||
| pub fn nft_asset(ticker: &Ticker) -> Option<bool> { |
There was a problem hiding this comment.
Should we prevent users from minting tokens (Asset.issue) if the type is AssetType::NFT?
Comment on lines
+40
to
+41
| NFTCreateCollection, | ||
| NFTMint, |
There was a problem hiding this comment.
@adamdossa Do we want protocol fees for NFT? Users still have to pay the two normal asset fees.
There was a problem hiding this comment.
I suppose that ideally we'd be able to differentiate - ideally have a separate protocol fee for minting a fungible vs. a non-fungible token.
However, if the logic is currently that NFTs have the usual register / create protocol fees that users pay for fungible assets then this is fine. We can separate out the fees as a new future feature if there is a demand for this.
Neopallium
requested changes
Dec 20, 2022
Neopallium
approved these changes
Dec 21, 2022
adamdossa
approved these changes
Jan 10, 2023
adamdossa
added a commit
that referenced
this pull request
Feb 28, 2023
* Improve execute_instruction readability; Rename variables * Mesh 1902/create nft collection mint nft (#1340) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Mesh 1915/allow nft transfers (#1369) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Add new types LegV2 and ReceiptV2 * Add from Leg to LegV2 impl and LegAsset helper function * Add base_nft_tranfer * Change base_add_instruction to allow LegV2; Change STO pallet to use LegV2 * Add lock_nft and unlock_nft functions; Change PortfolioNft to take ticker instead of NFTCollectionId * Change inner functions to handle LegV2 * Change tests and benchmarks to handle LegV2 * Allow transfering multiple nfts at once * Add parameter to allow sending deprecated event * Add tests for nft tranfer * Add extrinsics for LegV2 parameters; Add checks for non-fungible assets * Impose transaction when calling base_nft_transfer; Insert deprecated Legs in old storage; * Add test cases for LegV2 extrinsics * Change error variant in assert * Ad benchmarks for add_instruction_v2 and add_and_afirm_instructions_v2 * Add affirm_instruction_v2 and withdraw_affirmation_v2 extrinsics; Add nfts transferred check to filtered_legs * Add error when calling receipt functions for non-fungible legs * Add unit tests - receipts and duplicated nft on different legs * Add reject_instruction_v2 extrinsic and benchmark * Fix typo * Fix benchmarks for add_and_affirm_instruction_v2 * Add portfolio_kind parameter to mint_nft extrinsic * Change meaning of maxlegs to maxfungible assets * Add weight functions to all v2 extrinsics; Fix benchmarks with new parameters * Add check to portfolio validity before minting; Add check to NFT storage before deleting a portfolio; Add unit tests * Add more informative variants to invalid nft transfer * Change add_and_affirm_instruction_with_memo_v2 parameters * Add benchmark helper function * Fix transfer_nft_not_owned test to reflect description * Add additional check for compliance return; Pause compliance for tests * Mesh 1932/move nfts between portfolios (#1385) * Add move_portfolio_nfts extrinsic * Remove redundant match statement * Add benchmark; Remove pointless error * Add move_portfolio_funds_v2 extrinsic * Add missing weight implementation * Remove num_traits dependency; Add parameter to burn_nft weight function; Add V2 types to schema; Run script for generating benchmarks * Undo changes to session weights; Add v2 types to schema types * Add NonFungible types; Add `BalanceOf` to the NFT pallet; Add `asset_type` checks (#1399) * Add NonFungibleType enum; Add asset_type check for extrinsics; Ensure asset_type update is valid; Ensure asset is not frozen check for NFT * Add optional parameter for create_nft_collection; Add is_fungible and is_non_fungible functions * Change BalanceOf name to NumberOfNFTs; Add NFTCount alias type * Remove duplicated storage read * Change parameter type to NonFungibleType; Add type to schema.json * Fix doc * Rename mint and burn to issue and redeem * Update to 5.3.0 --------- Co-authored-by: Robert Gabriel Jakabosky <rjakabosky+neopallium@neoawareness.com> Co-authored-by: Adam Dossa <adam.dossa@gmail.com>
adamdossa
added a commit
that referenced
this pull request
Feb 28, 2023
* Improve execute_instruction readability; Rename variables * Mesh 1902/create nft collection mint nft (#1340) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Mesh 1915/allow nft transfers (#1369) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Add new types LegV2 and ReceiptV2 * Add from Leg to LegV2 impl and LegAsset helper function * Add base_nft_tranfer * Change base_add_instruction to allow LegV2; Change STO pallet to use LegV2 * Add lock_nft and unlock_nft functions; Change PortfolioNft to take ticker instead of NFTCollectionId * Change inner functions to handle LegV2 * Change tests and benchmarks to handle LegV2 * Allow transfering multiple nfts at once * Add parameter to allow sending deprecated event * Add tests for nft tranfer * Add extrinsics for LegV2 parameters; Add checks for non-fungible assets * Impose transaction when calling base_nft_transfer; Insert deprecated Legs in old storage; * Add test cases for LegV2 extrinsics * Change error variant in assert * Ad benchmarks for add_instruction_v2 and add_and_afirm_instructions_v2 * Add affirm_instruction_v2 and withdraw_affirmation_v2 extrinsics; Add nfts transferred check to filtered_legs * Add error when calling receipt functions for non-fungible legs * Add unit tests - receipts and duplicated nft on different legs * Add reject_instruction_v2 extrinsic and benchmark * Fix typo * Fix benchmarks for add_and_affirm_instruction_v2 * Add portfolio_kind parameter to mint_nft extrinsic * Change meaning of maxlegs to maxfungible assets * Add weight functions to all v2 extrinsics; Fix benchmarks with new parameters * Add check to portfolio validity before minting; Add check to NFT storage before deleting a portfolio; Add unit tests * Add more informative variants to invalid nft transfer * Change add_and_affirm_instruction_with_memo_v2 parameters * Add benchmark helper function * Fix transfer_nft_not_owned test to reflect description * Add additional check for compliance return; Pause compliance for tests * Mesh 1932/move nfts between portfolios (#1385) * Add move_portfolio_nfts extrinsic * Remove redundant match statement * Add benchmark; Remove pointless error * Add move_portfolio_funds_v2 extrinsic * Add missing weight implementation * Remove num_traits dependency; Add parameter to burn_nft weight function; Add V2 types to schema; Run script for generating benchmarks * Undo changes to session weights; Add v2 types to schema types * Add NonFungible types; Add `BalanceOf` to the NFT pallet; Add `asset_type` checks (#1399) * Add NonFungibleType enum; Add asset_type check for extrinsics; Ensure asset_type update is valid; Ensure asset is not frozen check for NFT * Add optional parameter for create_nft_collection; Add is_fungible and is_non_fungible functions * Change BalanceOf name to NumberOfNFTs; Add NFTCount alias type * Remove duplicated storage read * Change parameter type to NonFungibleType; Add type to schema.json * Fix doc * Rename mint and burn to issue and redeem * Update to 5.3.0 --------- Co-authored-by: Robert Gabriel Jakabosky <rjakabosky+neopallium@neoawareness.com> Co-authored-by: Adam Dossa <adam.dossa@gmail.com>
Neopallium
added a commit
that referenced
this pull request
Mar 1, 2023
* Improve execute_instruction readability; Rename variables * Mesh 1902/create nft collection mint nft (#1340) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Mesh 1915/allow nft transfers (#1369) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Add new types LegV2 and ReceiptV2 * Add from Leg to LegV2 impl and LegAsset helper function * Add base_nft_tranfer * Change base_add_instruction to allow LegV2; Change STO pallet to use LegV2 * Add lock_nft and unlock_nft functions; Change PortfolioNft to take ticker instead of NFTCollectionId * Change inner functions to handle LegV2 * Change tests and benchmarks to handle LegV2 * Allow transfering multiple nfts at once * Add parameter to allow sending deprecated event * Add tests for nft tranfer * Add extrinsics for LegV2 parameters; Add checks for non-fungible assets * Impose transaction when calling base_nft_transfer; Insert deprecated Legs in old storage; * Add test cases for LegV2 extrinsics * Change error variant in assert * Ad benchmarks for add_instruction_v2 and add_and_afirm_instructions_v2 * Add affirm_instruction_v2 and withdraw_affirmation_v2 extrinsics; Add nfts transferred check to filtered_legs * Add error when calling receipt functions for non-fungible legs * Add unit tests - receipts and duplicated nft on different legs * Add reject_instruction_v2 extrinsic and benchmark * Fix typo * Fix benchmarks for add_and_affirm_instruction_v2 * Add portfolio_kind parameter to mint_nft extrinsic * Change meaning of maxlegs to maxfungible assets * Add weight functions to all v2 extrinsics; Fix benchmarks with new parameters * Add check to portfolio validity before minting; Add check to NFT storage before deleting a portfolio; Add unit tests * Add more informative variants to invalid nft transfer * Change add_and_affirm_instruction_with_memo_v2 parameters * Add benchmark helper function * Fix transfer_nft_not_owned test to reflect description * Add additional check for compliance return; Pause compliance for tests * Mesh 1932/move nfts between portfolios (#1385) * Add move_portfolio_nfts extrinsic * Remove redundant match statement * Add benchmark; Remove pointless error * Add move_portfolio_funds_v2 extrinsic * Add missing weight implementation * Remove num_traits dependency; Add parameter to burn_nft weight function; Add V2 types to schema; Run script for generating benchmarks * Undo changes to session weights; Add v2 types to schema types * Add remove_local_metadata_key and remove_local_metadata_value extrinsics * Add unit tests for the new extrinsics * Add benchmarks for the new extrinsics * Add weights for the new benchmarks * Add two events for the new extrinsics * Add NonFungible types; Add `BalanceOf` to the NFT pallet; Add `asset_type` checks (#1399) * Add NonFungibleType enum; Add asset_type check for extrinsics; Ensure asset_type update is valid; Ensure asset is not frozen check for NFT * Add optional parameter for create_nft_collection; Add is_fungible and is_non_fungible functions * Change BalanceOf name to NumberOfNFTs; Add NFTCount alias type * Remove duplicated storage read * Change parameter type to NonFungibleType; Add type to schema.json * Fix doc * Change parameter type; Use is_locked instead of if let; Add caller did to events; Allow removing the value of a global key * Fix weight function name * Cargo lock * Add #[test] to settle_on_block * Change try_get to contains_key --------- Co-authored-by: Robert Gabriel Jakabosky <rjakabosky+neopallium@neoawareness.com>
adamdossa
pushed a commit
that referenced
this pull request
Apr 13, 2023
* Improve execute_instruction readability; Rename variables * Mesh 1902/create nft collection mint nft (#1340) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Mesh 1915/allow nft transfers (#1369) * Add nft pallet - empty create_nft_collection extrinsic * Remove GenesisConfig from nft pallet; Replace Nft runtime * Add storage definition; Add initial version of create_nft_collection; Add NFT primitives; Add Asset associated type to NFT config * Fix typo * Add initial version of mint_nft extrinsic * Add minted nft to portfolio; Return error for duplicate keys; Improve storage structures * Add unit tests * Add benchmark; Fix unit tests * Remove storage migration for nft pallet * Remove useless imports * Improve comments; Add parameter to nft benchmarks * Add check for asset type; Add check for duplicate collections for the same ticker * Undo removal of register_ticker * Add burn NFT extrinsic; Change order of create_asset in create_nft_collection; Add unit tests for burn nft; Fix tests for create_nft_collection * Add benchmark for burn_nft; Fix benchmark for create_nft_collection * Change tests to use ONE_UNIT const * Use ensure macro; Remove clones; Remove unwrap_or_default when using balance; Add did in events * Get caller did from portfolio * Use portfolio kind to check custody and perms * Remove duplicated permissions check * Add new types LegV2 and ReceiptV2 * Add from Leg to LegV2 impl and LegAsset helper function * Add base_nft_tranfer * Change base_add_instruction to allow LegV2; Change STO pallet to use LegV2 * Add lock_nft and unlock_nft functions; Change PortfolioNft to take ticker instead of NFTCollectionId * Change inner functions to handle LegV2 * Change tests and benchmarks to handle LegV2 * Allow transfering multiple nfts at once * Add parameter to allow sending deprecated event * Add tests for nft tranfer * Add extrinsics for LegV2 parameters; Add checks for non-fungible assets * Impose transaction when calling base_nft_transfer; Insert deprecated Legs in old storage; * Add test cases for LegV2 extrinsics * Change error variant in assert * Ad benchmarks for add_instruction_v2 and add_and_afirm_instructions_v2 * Add affirm_instruction_v2 and withdraw_affirmation_v2 extrinsics; Add nfts transferred check to filtered_legs * Add error when calling receipt functions for non-fungible legs * Add unit tests - receipts and duplicated nft on different legs * Add reject_instruction_v2 extrinsic and benchmark * Fix typo * Fix benchmarks for add_and_affirm_instruction_v2 * Add portfolio_kind parameter to mint_nft extrinsic * Change meaning of maxlegs to maxfungible assets * Add weight functions to all v2 extrinsics; Fix benchmarks with new parameters * Add check to portfolio validity before minting; Add check to NFT storage before deleting a portfolio; Add unit tests * Add more informative variants to invalid nft transfer * Change add_and_affirm_instruction_with_memo_v2 parameters * Add benchmark helper function * Fix transfer_nft_not_owned test to reflect description * Add additional check for compliance return; Pause compliance for tests * Mesh 1932/move nfts between portfolios (#1385) * Add move_portfolio_nfts extrinsic * Remove redundant match statement * Add benchmark; Remove pointless error * Add move_portfolio_funds_v2 extrinsic * Add missing weight implementation * Remove num_traits dependency; Add parameter to burn_nft weight function; Add V2 types to schema; Run script for generating benchmarks * Undo changes to session weights; Add v2 types to schema types * Add remove_local_metadata_key and remove_local_metadata_value extrinsics * Add unit tests for the new extrinsics * Add benchmarks for the new extrinsics * Add weights for the new benchmarks * Add two events for the new extrinsics * Add NonFungible types; Add `BalanceOf` to the NFT pallet; Add `asset_type` checks (#1399) * Add NonFungibleType enum; Add asset_type check for extrinsics; Ensure asset_type update is valid; Ensure asset is not frozen check for NFT * Add optional parameter for create_nft_collection; Add is_fungible and is_non_fungible functions * Change BalanceOf name to NumberOfNFTs; Add NFTCount alias type * Remove duplicated storage read * Change parameter type to NonFungibleType; Add type to schema.json * Fix doc * Change parameter type; Use is_locked instead of if let; Add caller did to events; Allow removing the value of a global key * Fix weight function name * Cargo lock * Add #[test] to settle_on_block * Change try_get to contains_key --------- Co-authored-by: Robert Gabriel Jakabosky <rjakabosky+neopallium@neoawareness.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Initial version of the NFT pallet. This PR should not be directly merged into the develop branch.
changelog
new features
create_nftextrinsic;mint_nftextrinsic;burn_nftextrinsic;