difftreelog
Merge branch 'develop' into feature/NFTPAR-90
in: master
7 files changed
README.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -142,6 +142,12 @@
"enable_println": "bool",
"max_subject_len": "u32"
},
+ "AccessMode": {
+ "_enum": [
+ "Normal",
+ "WhiteList"
+ ]
+ },
"CollectionMode": {
"_enum": {
"Invalid": null,
@@ -181,12 +187,13 @@
"CollectionType": {
"Owner": "AccountId",
"Mode": "CollectionMode",
- "Access": "u8",
+ "Access": "AccessMode",
"DecimalPoints": "u32",
"Name": "Vec<u16>",
"Description": "Vec<u16>",
"TokenPrefix": "Vec<u8>",
"CustomDataSize": "u32",
+ "MintMode": "bool",
"OffchainSchema": "Vec<u8>",
"Sponsor": "AccountId",
"UnconfirmedSponsor": "AccountId"
@@ -196,4 +203,5 @@
"LookupSource": "AccountId",
"Weight": "u64"
}
+
```
\ No newline at end of file
node/src/chain_spec.rsdiffbeforeafterboth--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -1,8 +1,9 @@
-use nft_runtime::{
- AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Signature, SudoConfig,
- SystemConfig, WASM_BINARY,
-};
-use nft_runtime::{ContractsConfig, ContractsSchedule};
+// use nft_runtime::{
+// AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Signature, SudoConfig,
+// SystemConfig, WASM_BINARY,
+// };
+// use nft_runtime::{ContractsConfig, ContractsSchedule, NftConfig, CollectionType};
+use nft_runtime::*;
use sc_service::ChainType;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_core::{sr25519, Pair, Public};
@@ -128,6 +129,25 @@
.collect(),
}),
sudo: Some(SudoConfig { key: root_key }),
+ nft: Some(NftConfig {
+ collection: vec![(1, CollectionType {
+ owner: get_account_id_from_seed::<sr25519::Public>("Alice"),
+ mode: CollectionMode::NFT(50),
+ access: AccessMode::Normal,
+ decimal_points: 0,
+ name: vec!(),
+ description: vec!(),
+ token_prefix: vec!(),
+ custom_data_size: 50,
+ mint_mode: false,
+ offchain_schema: vec!(),
+ sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),
+ unconfirmed_sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),
+ })],
+ nft_item_id: vec!(),
+ fungible_item_id: vec!(),
+ refungible_item_id: vec!(),
+ }),
contracts: Some(ContractsConfig {
current_schedule: ContractsSchedule {
enable_println,
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -1,7 +1,8 @@
#![cfg_attr(not(feature = "std"), no_std)]
-/// For more guidance on Substrate FRAME, see the example pallet
-/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs
+#[cfg(feature = "std")]
+pub use serde::*;
+
use codec::{Decode, Encode};
pub use frame_support::{
construct_runtime, decl_event, decl_module, decl_storage,
@@ -32,7 +33,6 @@
},
FixedPointOperand, FixedU128,
};
-use sp_std::prelude::*;
#[cfg(test)]
mod mock;
@@ -40,7 +40,11 @@
#[cfg(test)]
mod tests;
-#[derive(Encode, Decode, Debug, Eq, Clone, PartialEq)]
+// Structs
+// #region
+
+#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum CollectionMode {
Invalid,
// custom data size
@@ -62,7 +66,8 @@
}
}
-#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum AccessMode {
Normal,
WhiteList,
@@ -79,15 +84,15 @@
}
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct Ownership<AccountId> {
pub owner: AccountId,
pub fraction: u128,
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct CollectionType<AccountId> {
pub owner: AccountId,
pub mode: CollectionMode,
@@ -97,51 +102,52 @@
pub description: Vec<u16>, // 256 include null escape char
pub token_prefix: Vec<u8>, // 16 include null escape char
pub custom_data_size: u32,
+ pub mint_mode: bool,
pub offchain_schema: Vec<u8>,
pub sponsor: AccountId, // Who pays fees. If set to default address, the fees are applied to the transaction sender
pub unconfirmed_sponsor: AccountId, // Sponsor address that has not yet confirmed sponsorship
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct CollectionAdminsType<AccountId> {
pub admin: AccountId,
pub collection_id: u64,
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct NftItemType<AccountId> {
pub collection: u64,
pub owner: AccountId,
pub data: Vec<u8>,
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct FungibleItemType<AccountId> {
pub collection: u64,
pub owner: AccountId,
pub value: u128,
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct ReFungibleItemType<AccountId> {
pub collection: u64,
pub owner: Vec<Ownership<AccountId>>,
pub data: Vec<u8>,
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct ApprovePermissions<AccountId> {
pub approved: AccountId,
pub amount: u64,
}
-#[derive(Encode, Decode, Default, Clone, PartialEq)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct VestingItem<AccountId, Moment> {
pub sender: AccountId,
pub recipient: AccountId,
@@ -155,6 +161,8 @@
type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
}
+// #endregion
+
decl_storage! {
trait Store for Module<T: Trait> as Nft {
@@ -164,7 +172,7 @@
ChainVersion: u64;
ItemListIndex: map hasher(blake2_128_concat) u64 => u64;
- pub Collection get(fn collection): map hasher(identity) u64 => CollectionType<T::AccountId>;
+ pub Collection get(fn collection) config(): map hasher(identity) u64 => CollectionType<T::AccountId>;
pub AdminList get(fn admin_list_collection): map hasher(identity) u64 => Vec<T::AccountId>;
pub WhiteList get(fn white_list): map hasher(identity) u64 => Vec<T::AccountId>;
@@ -175,12 +183,9 @@
pub ApprovedList get(fn approved): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) (u64, T::AccountId) => Vec<ApprovePermissions<T::AccountId>>;
/// Item collections
- pub NftItemList get(fn nft_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => NftItemType<T::AccountId>;
- pub FungibleItemList get(fn fungible_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => FungibleItemType<T::AccountId>;
- pub ReFungibleItemList get(fn refungible_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => ReFungibleItemType<T::AccountId>;
-
- // Active vesting list
- // pub VestingList get(fn vesting): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => VestingItem<T::AccountId, T::Moment>;
+ pub NftItemList get(fn nft_item_id) config(): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => NftItemType<T::AccountId>;
+ pub FungibleItemList get(fn fungible_item_id) config(): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => FungibleItemType<T::AccountId>;
+ pub ReFungibleItemList get(fn refungible_item_id) config(): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => ReFungibleItemType<T::AccountId>;
/// Index list
pub AddressTokens get(fn address_tokens): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) T::AccountId => Vec<u64>;
@@ -189,6 +194,26 @@
pub ContractSponsor get(fn contract_sponsor): map hasher(identity) T::AccountId => T::AccountId;
pub UnconfirmedContractSponsor get(fn unconfirmed_contract_sponsor): map hasher(identity) T::AccountId => T::AccountId;
}
+ add_extra_genesis {
+ build(|config: &GenesisConfig<T>| {
+ // Modification of storage
+ for (_num, _c) in &config.collection {
+ <Module<T>>::init_collection(_c);
+ }
+
+ for (_num, _q, _i) in &config.nft_item_id {
+ <Module<T>>::init_nft_token(_i);
+ }
+
+ for (_num, _q, _i) in &config.fungible_item_id {
+ <Module<T>>::init_fungible_token(_i);
+ }
+
+ for (_num, _q, _i) in &config.refungible_item_id {
+ <Module<T>>::init_refungible_token(_i);
+ }
+ })
+ }
}
decl_event!(
@@ -209,7 +234,7 @@
fn on_initialize(now: T::BlockNumber) -> Weight {
- if ChainVersion::get() == 0
+ if ChainVersion::get() < 2
{
let value = NextCollectionID::get();
CreatedCollectionCount::put(value);
@@ -224,11 +249,11 @@
// @param customDataSz size of custom data in each collection item
// returns collection ID
#[weight = 0]
- pub fn create_collection( origin,
- collection_name: Vec<u16>,
- collection_description: Vec<u16>,
- token_prefix: Vec<u8>,
- mode: CollectionMode) -> DispatchResult {
+ pub fn create_collection(origin,
+ collection_name: Vec<u16>,
+ collection_description: Vec<u16>,
+ token_prefix: Vec<u8>,
+ mode: CollectionMode) -> DispatchResult {
// Anyone can create a collection
let who = ensure_signed(origin)?;
@@ -271,6 +296,7 @@
owner: who.clone(),
name: name,
mode: mode.clone(),
+ mint_mode: false,
access: AccessMode::Normal,
description: description,
decimal_points: decimal_points,
@@ -309,6 +335,73 @@
}
#[weight = 0]
+ pub fn add_to_white_list(origin, collection_id: u64, address: T::AccountId) -> DispatchResult{
+
+ let sender = ensure_signed(origin)?;
+ Self::check_owner_or_admin_permissions(collection_id, sender)?;
+
+ let mut white_list_collection: Vec<T::AccountId>;
+ if <WhiteList<T>>::contains_key(collection_id) {
+ white_list_collection = <WhiteList<T>>::get(collection_id);
+ if !white_list_collection.contains(&address.clone())
+ {
+ white_list_collection.push(address.clone());
+ }
+ }
+ else {
+ white_list_collection = Vec::new();
+ white_list_collection.push(address.clone());
+ }
+
+ <WhiteList<T>>::insert(collection_id, white_list_collection);
+ Ok(())
+ }
+
+ #[weight = 0]
+ pub fn remove_from_white_list(origin, collection_id: u64, address: T::AccountId) -> DispatchResult{
+
+ let sender = ensure_signed(origin)?;
+ Self::check_owner_or_admin_permissions(collection_id, sender)?;
+
+ if <WhiteList<T>>::contains_key(collection_id) {
+ let mut white_list_collection = <WhiteList<T>>::get(collection_id);
+ if white_list_collection.contains(&address.clone())
+ {
+ white_list_collection.retain(|i| *i != address.clone());
+ <WhiteList<T>>::insert(collection_id, white_list_collection);
+ }
+ }
+
+ Ok(())
+ }
+
+ #[weight = 0]
+ pub fn set_public_access_mode(origin, collection_id: u64, mode: AccessMode) -> DispatchResult
+ {
+ let sender = ensure_signed(origin)?;
+
+ Self::check_owner_permissions(collection_id, sender)?;
+ let mut target_collection = <Collection<T>>::get(collection_id);
+ target_collection.access = mode;
+ <Collection<T>>::insert(collection_id, target_collection);
+
+ Ok(())
+ }
+
+ #[weight = 0]
+ pub fn set_mint_permission(origin, collection_id: u64, mint_permission: bool) -> DispatchResult
+ {
+ let sender = ensure_signed(origin)?;
+
+ Self::check_owner_permissions(collection_id, sender)?;
+ let mut target_collection = <Collection<T>>::get(collection_id);
+ target_collection.mint_mode = mint_permission;
+ <Collection<T>>::insert(collection_id, target_collection);
+
+ Ok(())
+ }
+
+ #[weight = 0]
pub fn change_collection_owner(origin, collection_id: u64, new_owner: T::AccountId) -> DispatchResult {
let sender = ensure_signed(origin)?;
@@ -405,9 +498,14 @@
pub fn create_item(origin, collection_id: u64, properties: Vec<u8>, owner: T::AccountId) -> DispatchResult {
let sender = ensure_signed(origin)?;
+ Self::collection_exists(collection_id)?;
let target_collection = <Collection<T>>::get(collection_id);
- Self::check_owner_or_admin_permissions(collection_id, sender.clone())?;
+ if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {
+ ensure!(target_collection.mint_mode == true, "Collection is not in mint mode");
+ Self::check_white_list(collection_id, owner.clone())?;
+ }
+
match target_collection.mode
{
CollectionMode::NFT(_) => {
@@ -469,13 +567,18 @@
pub fn burn_item(origin, collection_id: u64, item_id: u64) -> DispatchResult {
let sender = ensure_signed(origin)?;
- let item_owner = Self::is_item_owner(sender.clone(), collection_id, item_id);
- if !item_owner
- {
- Self::check_owner_or_admin_permissions(collection_id, sender.clone())?;
- }
+ Self::collection_exists(collection_id)?;
+
+ // Transfer permissions check
let target_collection = <Collection<T>>::get(collection_id);
+ ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||
+ Self::is_owner_or_admin_permissions(collection_id, sender.clone()),
+ "Only item owner, collection owner and admins can modify item");
+ if target_collection.access == AccessMode::WhiteList {
+ Self::check_white_list(collection_id, sender.clone())?;
+ }
+
match target_collection.mode
{
CollectionMode::NFT(_) => Self::burn_nft_item(collection_id, item_id)?,
@@ -494,11 +597,18 @@
pub fn transfer(origin, recipient: T::AccountId, collection_id: u64, item_id: u64, value: u64) -> DispatchResult {
let sender = ensure_signed(origin)?;
- ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id), "Only item owner can call transfer method");
+ // Transfer permissions check
let target_collection = <Collection<T>>::get(collection_id);
+ ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||
+ Self::is_owner_or_admin_permissions(collection_id, sender.clone()),
+ "Only item owner, collection owner and admins can modify item");
- // TODO: implement other modes
+ if target_collection.access == AccessMode::WhiteList {
+ Self::check_white_list(collection_id, sender.clone())?;
+ Self::check_white_list(collection_id, recipient.clone())?;
+ }
+
match target_collection.mode
{
CollectionMode::NFT(_) => Self::transfer_nft(collection_id, item_id, sender.clone(), recipient)?,
@@ -515,11 +625,20 @@
let sender = ensure_signed(origin)?;
+ // Transfer permissions check
+ let target_collection = <Collection<T>>::get(collection_id);
+ ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||
+ Self::is_owner_or_admin_permissions(collection_id, sender.clone()),
+ "Only item owner, collection owner and admins can approve");
+
+ if target_collection.access == AccessMode::WhiteList {
+ Self::check_white_list(collection_id, sender.clone())?;
+ Self::check_white_list(collection_id, approved.clone())?;
+ }
+
// amount param stub
let amount = 100000000;
- ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id), "Only item owner can call transfer method");
-
let list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, sender.clone()));
if list_exists {
@@ -544,25 +663,31 @@
pub fn transfer_from(origin, from: T::AccountId, recipient: T::AccountId, collection_id: u64, item_id: u64, value: u64 ) -> DispatchResult {
let sender = ensure_signed(origin)?;
- let approved_list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, from.clone()));
- if approved_list_exists
- {
+ let mut appoved_transfer = false;
+
+ // Check approve
+ if <ApprovedList<T>>::contains_key(collection_id, (item_id, from.clone())) {
let list_itm = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()));
let opt_item = list_itm.iter().find(|i| i.approved == sender.clone());
- ensure!(opt_item.is_some(), "No approve found");
+ appoved_transfer = opt_item.is_some();
ensure!(opt_item.unwrap().amount >= value, "Requested value more than approved");
+ }
+
+ // Transfer permissions check
+ let target_collection = <Collection<T>>::get(collection_id);
+ ensure!(appoved_transfer || Self::is_owner_or_admin_permissions(collection_id, sender.clone()),
+ "Only item owner, collection owner and admins can modify items");
- // remove approve
- let approve_list: Vec<ApprovePermissions<T::AccountId>> = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()))
- .into_iter().filter(|i| i.approved != sender.clone()).collect();
- <ApprovedList<T>>::insert(collection_id, (item_id, from.clone()), approve_list);
- }
- else
- {
- Self::check_owner_or_admin_permissions(collection_id, sender)?;
+ if target_collection.access == AccessMode::WhiteList {
+ Self::check_white_list(collection_id, sender.clone())?;
+ Self::check_white_list(collection_id, recipient.clone())?;
}
- let target_collection = <Collection<T>>::get(collection_id);
+ // remove approve
+ let approve_list: Vec<ApprovePermissions<T::AccountId>> = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()))
+ .into_iter().filter(|i| i.approved != sender.clone()).collect();
+ <ApprovedList<T>>::insert(collection_id, (item_id, from.clone()), approve_list);
+
match target_collection.mode
{
@@ -675,11 +800,7 @@
Ok(())
}
- fn burn_refungible_item(
- collection_id: u64,
- item_id: u64,
- owner: T::AccountId,
- ) -> DispatchResult {
+ fn burn_refungible_item(collection_id: u64, item_id: u64, owner: T::AccountId) -> DispatchResult {
ensure!(
<ReFungibleItemList<T>>::contains_key(collection_id, item_id),
"Item does not exists"
@@ -770,25 +891,27 @@
Ok(())
}
- fn check_owner_or_admin_permissions(
- collection_id: u64,
- subject: T::AccountId,
- ) -> DispatchResult {
- Self::collection_exists(collection_id)?;
+ fn is_owner_or_admin_permissions(collection_id: u64, subject: T::AccountId) -> bool {
let target_collection = <Collection<T>>::get(collection_id);
- let is_owner = subject == target_collection.owner;
-
- let no_perm_mes = "You do not have permissions to modify this collection";
+ let mut result: bool = subject == target_collection.owner;
let exists = <AdminList<T>>::contains_key(collection_id);
- if !is_owner {
- ensure!(exists, no_perm_mes);
- ensure!(
- <AdminList<T>>::get(collection_id).contains(&subject),
- no_perm_mes
- );
+ if !result & exists {
+ if <AdminList<T>>::get(collection_id).contains(&subject) {
+ result = true
+ }
}
+
+ result
+ }
+
+ fn check_owner_or_admin_permissions(collection_id: u64, subject: T::AccountId) -> DispatchResult {
+
+ Self::collection_exists(collection_id)?;
+ let result = Self::is_owner_or_admin_permissions(collection_id, subject.clone());
+
+ ensure!(result, "You do not have permissions to modify this collection");
Ok(())
}
@@ -812,6 +935,16 @@
}
}
+ fn check_white_list(collection_id: u64, address: T::AccountId) -> DispatchResult {
+
+ let mes = "Address is not in white list";
+ ensure!(<WhiteList<T>>::contains_key(collection_id), mes);
+ let wl = <WhiteList<T>>::get(collection_id);
+ ensure!(wl.contains(&address.clone()), mes);
+
+ Ok(())
+ }
+
fn transfer_fungible(
collection_id: u64,
item_id: u64,
@@ -819,6 +952,12 @@
owner: T::AccountId,
new_owner: T::AccountId,
) -> DispatchResult {
+
+ ensure!(
+ <FungibleItemList<T>>::contains_key(collection_id, item_id),
+ "Item not exists"
+ );
+
let full_item = <FungibleItemList<T>>::get(collection_id, item_id);
let amount = full_item.value;
@@ -903,6 +1042,12 @@
owner: T::AccountId,
new_owner: T::AccountId,
) -> DispatchResult {
+
+ ensure!(
+ <ReFungibleItemList<T>>::contains_key(collection_id, item_id),
+ "Item not exists"
+ );
+
let full_item = <ReFungibleItemList<T>>::get(collection_id, item_id);
let item = full_item
.owner
@@ -983,6 +1128,12 @@
sender: T::AccountId,
new_owner: T::AccountId,
) -> DispatchResult {
+
+ ensure!(
+ <NftItemList<T>>::contains_key(collection_id, item_id),
+ "Item not exists"
+ );
+
let mut item = <NftItemList<T>>::get(collection_id, item_id);
ensure!(
@@ -1014,6 +1165,80 @@
Ok(())
}
+ fn init_collection(item: &CollectionType<T::AccountId>){
+
+ // check params
+ assert!(item.decimal_points <= 4, "decimal_points parameter must be lower than 4");
+ assert!(item.name.len() <= 64, "Collection name can not be longer than 63 char");
+ assert!(item.name.len() <= 256, "Collection description can not be longer than 255 char");
+ assert!(item.token_prefix.len() <= 16, "Token prefix can not be longer than 15 char");
+
+ // Generate next collection ID
+ let next_id = CreatedCollectionCount::get()
+ .checked_add(1)
+ .expect("collection id error");
+
+ CreatedCollectionCount::put(next_id);
+ }
+
+ fn init_nft_token(item: &NftItemType<T::AccountId>){
+
+ let current_index = <ItemListIndex>::get(item.collection)
+ .checked_add(1)
+ .expect("Item list index id error");
+
+ let item_owner = item.owner.clone();
+ let collection_id = item.collection.clone();
+ Self::add_token_index(collection_id, current_index, item.owner.clone()).unwrap();
+
+ <ItemListIndex>::insert(collection_id, current_index);
+
+ // Update balance
+ let new_balance = <Balance<T>>::get(collection_id, item_owner.clone())
+ .checked_add(1)
+ .unwrap();
+ <Balance<T>>::insert(collection_id, item_owner.clone(), new_balance);
+ }
+
+ fn init_fungible_token(item: &FungibleItemType<T::AccountId>){
+
+ let current_index = <ItemListIndex>::get(item.collection)
+ .checked_add(1)
+ .expect("Item list index id error");
+ let owner = item.owner.clone();
+ let value = item.value as u64;
+
+ Self::add_token_index(item.collection, current_index, owner.clone()).unwrap();
+
+ <ItemListIndex>::insert(item.collection, current_index);
+
+ // Update balance
+ let new_balance = <Balance<T>>::get(item.collection, owner.clone())
+ .checked_add(value)
+ .unwrap();
+ <Balance<T>>::insert(item.collection, owner.clone(), new_balance);
+ }
+
+ fn init_refungible_token(item: &ReFungibleItemType<T::AccountId>){
+
+ let current_index = <ItemListIndex>::get(item.collection)
+ .checked_add(1)
+ .expect("Item list index id error");
+
+ let value = item.owner.first().unwrap().fraction as u64;
+ let owner = item.owner.first().unwrap().owner.clone();
+
+ Self::add_token_index(item.collection, current_index, owner.clone()).unwrap();
+
+ <ItemListIndex>::insert(item.collection, current_index);
+
+ // Update balance
+ let new_balance = <Balance<T>>::get(item.collection, owner.clone())
+ .checked_add(value)
+ .unwrap();
+ <Balance<T>>::insert(item.collection, owner.clone(), new_balance);
+ }
+
fn add_token_index(collection_id: u64, item_index: u64, owner: T::AccountId) -> DispatchResult {
let list_exists = <AddressTokens<T>>::contains_key(collection_id, owner.clone());
if list_exists {
@@ -1068,6 +1293,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
// Economic models
+// #region
/// Fee multiplier.
pub type Multiplier = FixedU128;
@@ -1262,3 +1488,4 @@
Ok(())
}
}
+// #endregion
\ No newline at end of file
pallets/nft/src/tests.rsdiffbeforeafterboth1// Tests to be written here2use crate::mock::*;3use crate::{ApprovePermissions, CollectionMode, Ownership};4use frame_support::{assert_noop, assert_ok};56#[test]7fn create_nft_item() {8 new_test_ext().execute_with(|| {9 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();10 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();11 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();12 let mode: CollectionMode = CollectionMode::NFT(2000);1314 let origin1 = Origin::signed(1);15 assert_ok!(TemplateModule::create_collection(16 origin1.clone(),17 col_name1.clone(),18 col_desc1.clone(),19 token_prefix1.clone(),20 mode21 ));22 assert_eq!(TemplateModule::collection(1).owner, 1);2324 assert_ok!(TemplateModule::create_item(25 origin1.clone(),26 1,27 [1, 2, 3].to_vec(),28 129 ));30 assert_eq!(TemplateModule::nft_item_id(1, 1).data, [1, 2, 3].to_vec());31 });32}3334#[test]35fn create_refungible_item() {36 new_test_ext().execute_with(|| {37 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();38 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();39 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();40 let mode: CollectionMode = CollectionMode::ReFungible(2000, 3);4142 let origin1 = Origin::signed(1);43 assert_ok!(TemplateModule::create_collection(44 origin1.clone(),45 col_name1.clone(),46 col_desc1.clone(),47 token_prefix1.clone(),48 mode49 ));50 assert_eq!(TemplateModule::collection(1).owner, 1);5152 assert_ok!(TemplateModule::create_item(53 origin1.clone(),54 1,55 [1, 2, 3].to_vec(),56 157 ));58 assert_eq!(59 TemplateModule::refungible_item_id(1, 1).data,60 [1, 2, 3].to_vec()61 );62 assert_eq!(63 TemplateModule::refungible_item_id(1, 1).owner[0],64 Ownership {65 owner: 1,66 fraction: 100067 }68 );69 });70}7172#[test]73fn create_fungible_item() {74 new_test_ext().execute_with(|| {75 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();76 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();77 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();78 let mode: CollectionMode = CollectionMode::Fungible(3);7980 let origin1 = Origin::signed(1);81 assert_ok!(TemplateModule::create_collection(82 origin1.clone(),83 col_name1.clone(),84 col_desc1.clone(),85 token_prefix1.clone(),86 mode87 ));88 assert_eq!(TemplateModule::collection(1).owner, 1);8990 assert_ok!(TemplateModule::create_item(91 origin1.clone(),92 1,93 [].to_vec(),94 195 ));96 assert_eq!(TemplateModule::fungible_item_id(1, 1).owner, 1);97 assert_eq!(TemplateModule::balance_count(1, 1), 1000);98 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);99 });100}101102#[test]103fn transfer_fungible_item() {104 new_test_ext().execute_with(|| {105 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();106 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();107 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();108 let mode: CollectionMode = CollectionMode::Fungible(3);109110 let origin1 = Origin::signed(1);111 let origin2 = Origin::signed(2);112 assert_ok!(TemplateModule::create_collection(113 origin1.clone(),114 col_name1.clone(),115 col_desc1.clone(),116 token_prefix1.clone(),117 mode118 ));119 assert_eq!(TemplateModule::collection(1).owner, 1);120121 assert_ok!(TemplateModule::create_item(122 origin1.clone(),123 1,124 [].to_vec(),125 1126 ));127 assert_eq!(TemplateModule::fungible_item_id(1, 1).owner, 1);128 assert_eq!(TemplateModule::balance_count(1, 1), 1000);129 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);130131 // change owner scenario132 assert_ok!(TemplateModule::transfer(origin1.clone(), 2, 1, 1, 1000));133 assert_eq!(TemplateModule::fungible_item_id(1, 1).owner, 2);134 assert_eq!(TemplateModule::fungible_item_id(1, 1).value, 1000);135 assert_eq!(TemplateModule::balance_count(1, 1), 0);136 assert_eq!(TemplateModule::balance_count(1, 2), 1000);137 assert_eq!(TemplateModule::address_tokens(1, 1), []);138 assert_eq!(TemplateModule::address_tokens(1, 2), [1]);139140 // split item scenario141 assert_ok!(TemplateModule::transfer(origin2.clone(), 3, 1, 1, 500));142 assert_eq!(TemplateModule::fungible_item_id(1, 1).owner, 2);143 assert_eq!(TemplateModule::fungible_item_id(1, 2).owner, 3);144 assert_eq!(TemplateModule::balance_count(1, 2), 500);145 assert_eq!(TemplateModule::balance_count(1, 3), 500);146 assert_eq!(TemplateModule::address_tokens(1, 2), [1]);147 assert_eq!(TemplateModule::address_tokens(1, 3), [2]);148149 // split item and new owner has account scenario150 assert_ok!(TemplateModule::transfer(origin2.clone(), 3, 1, 1, 200));151 assert_eq!(TemplateModule::fungible_item_id(1, 1).value, 300);152 assert_eq!(TemplateModule::fungible_item_id(1, 2).value, 700);153 assert_eq!(TemplateModule::balance_count(1, 2), 300);154 assert_eq!(TemplateModule::balance_count(1, 3), 700);155 assert_eq!(TemplateModule::address_tokens(1, 2), [1]);156 assert_eq!(TemplateModule::address_tokens(1, 3), [2]);157 });158}159160#[test]161fn transfer_refungible_item() {162 new_test_ext().execute_with(|| {163 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();164 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();165 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();166 let mode: CollectionMode = CollectionMode::ReFungible(2000, 3);167168 let origin1 = Origin::signed(1);169 let origin2 = Origin::signed(2);170 assert_ok!(TemplateModule::create_collection(171 origin1.clone(),172 col_name1.clone(),173 col_desc1.clone(),174 token_prefix1.clone(),175 mode176 ));177 assert_eq!(TemplateModule::collection(1).owner, 1);178179 assert_ok!(TemplateModule::create_item(180 origin1.clone(),181 1,182 [1, 2, 3].to_vec(),183 1184 ));185 assert_eq!(186 TemplateModule::refungible_item_id(1, 1).data,187 [1, 2, 3].to_vec()188 );189 assert_eq!(190 TemplateModule::refungible_item_id(1, 1).owner[0],191 Ownership {192 owner: 1,193 fraction: 1000194 }195 );196 assert_eq!(TemplateModule::balance_count(1, 1), 1000);197 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);198199 // change owner scenario200 assert_ok!(TemplateModule::transfer(origin1.clone(), 2, 1, 1, 1000));201 assert_eq!(202 TemplateModule::refungible_item_id(1, 1).owner[0],203 Ownership {204 owner: 2,205 fraction: 1000206 }207 );208 assert_eq!(TemplateModule::balance_count(1, 1), 0);209 assert_eq!(TemplateModule::balance_count(1, 2), 1000);210 assert_eq!(TemplateModule::address_tokens(1, 1), []);211 assert_eq!(TemplateModule::address_tokens(1, 2), [1]);212213 // split item scenario214 assert_ok!(TemplateModule::transfer(origin2.clone(), 3, 1, 1, 500));215 assert_eq!(216 TemplateModule::refungible_item_id(1, 1).owner[0],217 Ownership {218 owner: 2,219 fraction: 500220 }221 );222 assert_eq!(223 TemplateModule::refungible_item_id(1, 1).owner[1],224 Ownership {225 owner: 3,226 fraction: 500227 }228 );229 assert_eq!(TemplateModule::balance_count(1, 2), 500);230 assert_eq!(TemplateModule::balance_count(1, 3), 500);231 assert_eq!(TemplateModule::address_tokens(1, 2), [1]);232 assert_eq!(TemplateModule::address_tokens(1, 3), [1]);233234 // split item and new owner has account scenario235 assert_ok!(TemplateModule::transfer(origin2.clone(), 3, 1, 1, 200));236 assert_eq!(237 TemplateModule::refungible_item_id(1, 1).owner[0],238 Ownership {239 owner: 2,240 fraction: 300241 }242 );243 assert_eq!(244 TemplateModule::refungible_item_id(1, 1).owner[1],245 Ownership {246 owner: 3,247 fraction: 700248 }249 );250 assert_eq!(TemplateModule::balance_count(1, 2), 300);251 assert_eq!(TemplateModule::balance_count(1, 3), 700);252 assert_eq!(TemplateModule::address_tokens(1, 2), [1]);253 assert_eq!(TemplateModule::address_tokens(1, 3), [1]);254 });255}256257#[test]258fn transfer_nft_item() {259 new_test_ext().execute_with(|| {260 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();261 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();262 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();263 let mode: CollectionMode = CollectionMode::NFT(2000);264265 let origin1 = Origin::signed(1);266 assert_ok!(TemplateModule::create_collection(267 origin1.clone(),268 col_name1.clone(),269 col_desc1.clone(),270 token_prefix1.clone(),271 mode272 ));273 assert_eq!(TemplateModule::collection(1).owner, 1);274275 assert_ok!(TemplateModule::create_item(276 origin1.clone(),277 1,278 [1, 2, 3].to_vec(),279 1280 ));281 assert_eq!(TemplateModule::nft_item_id(1, 1).data, [1, 2, 3].to_vec());282 assert_eq!(TemplateModule::balance_count(1, 1), 1);283 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);284285 // default scenario286 assert_ok!(TemplateModule::transfer(origin1.clone(), 2, 1, 1, 1000));287 assert_eq!(TemplateModule::nft_item_id(1, 1).owner, 2);288 assert_eq!(TemplateModule::balance_count(1, 1), 0);289 assert_eq!(TemplateModule::balance_count(1, 2), 1);290 assert_eq!(TemplateModule::address_tokens(1, 1), []);291 assert_eq!(TemplateModule::address_tokens(1, 2), [1]);292 });293}294295#[test]296fn nft_approve_and_transfer_from() {297 new_test_ext().execute_with(|| {298 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();299 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();300 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();301 let mode: CollectionMode = CollectionMode::NFT(2000);302303 let origin1 = Origin::signed(1);304 let origin2 = Origin::signed(2);305 assert_ok!(TemplateModule::create_collection(306 origin1.clone(),307 col_name1.clone(),308 col_desc1.clone(),309 token_prefix1.clone(),310 mode311 ));312 assert_eq!(TemplateModule::collection(1).owner, 1);313314 assert_ok!(TemplateModule::create_item(315 origin1.clone(),316 1,317 [1, 2, 3].to_vec(),318 1319 ));320 assert_eq!(TemplateModule::nft_item_id(1, 1).data, [1, 2, 3].to_vec());321 assert_eq!(TemplateModule::balance_count(1, 1), 1);322 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);323324 assert_noop!(325 TemplateModule::transfer_from(origin2.clone(), 1, 3, 1, 1, 1),326 "You do not have permissions to modify this collection"327 );328329 // do approve330 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));331 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);332 assert_ok!(TemplateModule::approve(origin1.clone(), 10, 1, 1));333 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 2);334 assert_eq!(335 TemplateModule::approved(1, (1, 1))[0],336 ApprovePermissions {337 approved: 2,338 amount: 100000000339 }340 );341342 assert_ok!(TemplateModule::transfer_from(343 origin2.clone(),344 1,345 3,346 1,347 1,348 1349 ));350 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 0);351 });352}353354#[test]355fn refungible_approve_and_transfer_from() {356 new_test_ext().execute_with(|| {357 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();358 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();359 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();360 let mode: CollectionMode = CollectionMode::ReFungible(2000, 3);361362 let origin1 = Origin::signed(1);363 let origin2 = Origin::signed(2);364 assert_ok!(TemplateModule::create_collection(365 origin1.clone(),366 col_name1.clone(),367 col_desc1.clone(),368 token_prefix1.clone(),369 mode370 ));371 assert_eq!(TemplateModule::collection(1).owner, 1);372373 assert_ok!(TemplateModule::create_item(374 origin1.clone(),375 1,376 [1, 2, 3].to_vec(),377 1378 ));379 assert_eq!(380 TemplateModule::refungible_item_id(1, 1).data,381 [1, 2, 3].to_vec()382 );383 assert_eq!(384 TemplateModule::refungible_item_id(1, 1).owner[0],385 Ownership {386 owner: 1,387 fraction: 1000388 }389 );390 assert_eq!(TemplateModule::balance_count(1, 1), 1000);391 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);392393 assert_noop!(394 TemplateModule::transfer_from(origin2.clone(), 1, 3, 1, 1, 1),395 "You do not have permissions to modify this collection"396 );397398 // do approve399 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));400 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);401 assert_ok!(TemplateModule::approve(origin1.clone(), 10, 1, 1));402 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 2);403 assert_eq!(404 TemplateModule::approved(1, (1, 1))[0],405 ApprovePermissions {406 approved: 2,407 amount: 100000000408 }409 );410411 assert_ok!(TemplateModule::transfer_from(412 origin2.clone(),413 1,414 3,415 1,416 1,417 100418 ));419 assert_eq!(TemplateModule::balance_count(1, 1), 900);420 assert_eq!(TemplateModule::balance_count(1, 3), 100);421 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);422 assert_eq!(TemplateModule::address_tokens(1, 3), [1]);423424 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);425 assert_eq!(426 TemplateModule::approved(1, (1, 1))[0],427 ApprovePermissions {428 approved: 10,429 amount: 100000000430 }431 );432 });433}434435#[test]436fn fungible_approve_and_transfer_from() {437 new_test_ext().execute_with(|| {438 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();439 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();440 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();441 let mode: CollectionMode = CollectionMode::Fungible(3);442443 let origin1 = Origin::signed(1);444 let origin2 = Origin::signed(2);445 assert_ok!(TemplateModule::create_collection(446 origin1.clone(),447 col_name1.clone(),448 col_desc1.clone(),449 token_prefix1.clone(),450 mode451 ));452 assert_eq!(TemplateModule::collection(1).owner, 1);453454 assert_ok!(TemplateModule::create_item(455 origin1.clone(),456 1,457 [].to_vec(),458 1459 ));460 assert_eq!(TemplateModule::fungible_item_id(1, 1).owner, 1);461 assert_eq!(TemplateModule::balance_count(1, 1), 1000);462 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);463464 assert_noop!(465 TemplateModule::transfer_from(origin2.clone(), 1, 3, 1, 1, 1),466 "You do not have permissions to modify this collection"467 );468469 // do approve470 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));471 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);472 assert_ok!(TemplateModule::approve(origin1.clone(), 10, 1, 1));473 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 2);474 assert_eq!(475 TemplateModule::approved(1, (1, 1))[0],476 ApprovePermissions {477 approved: 2,478 amount: 100000000479 }480 );481482 assert_ok!(TemplateModule::transfer_from(483 origin2.clone(),484 1,485 3,486 1,487 1,488 100489 ));490 assert_eq!(TemplateModule::balance_count(1, 1), 900);491 assert_eq!(TemplateModule::balance_count(1, 3), 100);492 assert_eq!(TemplateModule::address_tokens(1, 1), [1]);493 assert_eq!(TemplateModule::address_tokens(1, 3), [2]);494495 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);496 assert_eq!(497 TemplateModule::approved(1, (1, 1))[0],498 ApprovePermissions {499 approved: 10,500 amount: 100000000501 }502 );503504 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));505 assert_ok!(TemplateModule::transfer_from(506 origin2.clone(),507 1,508 3,509 1,510 1,511 900512 ));513 assert_eq!(TemplateModule::balance_count(1, 1), 0);514 assert_eq!(TemplateModule::balance_count(1, 3), 1000);515 assert_eq!(TemplateModule::address_tokens(1, 1), []);516 assert_eq!(TemplateModule::address_tokens(1, 3), [2]);517518 assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 0);519 });520}521522#[test]523fn change_collection_owner() {524 new_test_ext().execute_with(|| {525 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();526 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();527 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();528 let mode: CollectionMode = CollectionMode::NFT(2000);529530 let origin1 = Origin::signed(1);531 assert_ok!(TemplateModule::create_collection(532 origin1.clone(),533 col_name1.clone(),534 col_desc1.clone(),535 token_prefix1.clone(),536 mode537 ));538 assert_ok!(TemplateModule::change_collection_owner(539 origin1.clone(),540 1,541 2542 ));543 assert_eq!(TemplateModule::collection(1).owner, 2);544 });545}546547#[test]548fn destroy_collection() {549 new_test_ext().execute_with(|| {550 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();551 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();552 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();553 let mode: CollectionMode = CollectionMode::NFT(2000);554555 let origin1 = Origin::signed(1);556 assert_ok!(TemplateModule::create_collection(557 origin1.clone(),558 col_name1.clone(),559 col_desc1.clone(),560 token_prefix1.clone(),561 mode562 ));563 assert_ok!(TemplateModule::destroy_collection(origin1.clone(), 1));564 });565}566567#[test]568fn burn_nft_item() {569 new_test_ext().execute_with(|| {570 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();571 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();572 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();573 let mode: CollectionMode = CollectionMode::NFT(2000);574575 let origin1 = Origin::signed(1);576 let origin2 = Origin::signed(2);577 assert_ok!(TemplateModule::create_collection(578 origin1.clone(),579 col_name1.clone(),580 col_desc1.clone(),581 token_prefix1.clone(),582 mode583 ));584 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));585 assert_ok!(TemplateModule::create_item(586 origin2.clone(),587 1,588 [1, 2, 3].to_vec(),589 1590 ));591592 assert_eq!(TemplateModule::nft_item_id(1, 1).data, [1, 2, 3].to_vec());593594 // check balance (collection with id = 1, user id = 1)595 assert_eq!(TemplateModule::balance_count(1, 1), 1);596597 // burn item598 assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1));599 assert_noop!(600 TemplateModule::burn_item(origin1.clone(), 1, 1),601 "Item does not exists"602 );603604 assert_eq!(TemplateModule::balance_count(1, 1), 0);605 });606}607608#[test]609fn burn_fungible_item() {610 new_test_ext().execute_with(|| {611 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();612 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();613 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();614 let mode: CollectionMode = CollectionMode::Fungible(3);615616 let origin1 = Origin::signed(1);617 let origin2 = Origin::signed(2);618 assert_ok!(TemplateModule::create_collection(619 origin1.clone(),620 col_name1.clone(),621 col_desc1.clone(),622 token_prefix1.clone(),623 mode624 ));625 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));626 assert_ok!(TemplateModule::create_item(627 origin2.clone(),628 1,629 [].to_vec(),630 1631 ));632633 // check balance (collection with id = 1, user id = 1)634 assert_eq!(TemplateModule::balance_count(1, 1), 1000);635636 // burn item637 assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1));638 assert_noop!(639 TemplateModule::burn_item(origin1.clone(), 1, 1),640 "Item does not exists"641 );642643 assert_eq!(TemplateModule::balance_count(1, 1), 0);644 });645}646647#[test]648fn burn_refungible_item() {649 new_test_ext().execute_with(|| {650 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();651 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();652 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();653 let mode: CollectionMode = CollectionMode::ReFungible(200, 3);654655 let origin1 = Origin::signed(1);656 let origin2 = Origin::signed(2);657 assert_ok!(TemplateModule::create_collection(658 origin1.clone(),659 col_name1.clone(),660 col_desc1.clone(),661 token_prefix1.clone(),662 mode663 ));664 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));665 assert_ok!(TemplateModule::create_item(666 origin2.clone(),667 1,668 [1, 2, 3].to_vec(),669 1670 ));671672 assert_eq!(673 TemplateModule::refungible_item_id(1, 1).data,674 [1, 2, 3].to_vec()675 );676677 // check balance (collection with id = 1, user id = 2)678 assert_eq!(TemplateModule::balance_count(1, 1), 1000);679680 // burn item681 assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1));682 assert_noop!(683 TemplateModule::burn_item(origin1.clone(), 1, 1),684 "Item does not exists"685 );686687 assert_eq!(TemplateModule::balance_count(1, 1), 0);688 });689}690691#[test]692fn add_collection_admin() {693 new_test_ext().execute_with(|| {694 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();695 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();696 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();697 let mode: CollectionMode = CollectionMode::NFT(2000);698699 let origin1 = Origin::signed(1);700 let origin2 = Origin::signed(2);701 let origin3 = Origin::signed(3);702 assert_ok!(TemplateModule::create_collection(703 origin1.clone(),704 col_name1.clone(),705 col_desc1.clone(),706 token_prefix1.clone(),707 mode.clone()708 ));709 assert_ok!(TemplateModule::create_collection(710 origin2.clone(),711 col_name1.clone(),712 col_desc1.clone(),713 token_prefix1.clone(),714 mode.clone()715 ));716 assert_ok!(TemplateModule::create_collection(717 origin3.clone(),718 col_name1.clone(),719 col_desc1.clone(),720 token_prefix1.clone(),721 mode.clone()722 ));723724 assert_eq!(TemplateModule::collection(1).owner, 1);725 assert_eq!(TemplateModule::collection(2).owner, 2);726 assert_eq!(TemplateModule::collection(3).owner, 3);727728 // collection admin729 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));730 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 3));731732 assert_eq!(TemplateModule::admin_list_collection(1).contains(&2), true);733 assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), true);734 });735}736737#[test]738fn remove_collection_admin() {739 new_test_ext().execute_with(|| {740 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();741 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();742 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();743 let mode: CollectionMode = CollectionMode::NFT(2000);744745 let origin1 = Origin::signed(1);746 let origin2 = Origin::signed(2);747 let origin3 = Origin::signed(3);748749 assert_ok!(TemplateModule::create_collection(750 origin1.clone(),751 col_name1.clone(),752 col_desc1.clone(),753 token_prefix1.clone(),754 mode.clone()755 ));756 assert_ok!(TemplateModule::create_collection(757 origin2.clone(),758 col_name1.clone(),759 col_desc1.clone(),760 token_prefix1.clone(),761 mode.clone()762 ));763 assert_ok!(TemplateModule::create_collection(764 origin3.clone(),765 col_name1.clone(),766 col_desc1.clone(),767 token_prefix1.clone(),768 mode.clone()769 ));770771 assert_eq!(TemplateModule::collection(1).owner, 1);772 assert_eq!(TemplateModule::collection(2).owner, 2);773 assert_eq!(TemplateModule::collection(3).owner, 3);774775 // collection admin776 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));777 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 3));778779 assert_eq!(TemplateModule::admin_list_collection(1).contains(&2), true);780 assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), true);781782 // remove admin783 assert_ok!(TemplateModule::remove_collection_admin(784 origin2.clone(),785 1,786 3787 ));788 assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), false);789 });790}791792#[test]793fn balance_of() {794 new_test_ext().execute_with(|| {795 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();796 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();797 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();798 let nft_mode: CollectionMode = CollectionMode::NFT(2000);799 let furg_mode: CollectionMode = CollectionMode::Fungible(3);800 let refung_mode: CollectionMode = CollectionMode::ReFungible(2000, 3);801802 let origin1 = Origin::signed(1);803804 assert_ok!(TemplateModule::create_collection(805 origin1.clone(),806 col_name1.clone(),807 col_desc1.clone(),808 token_prefix1.clone(),809 nft_mode.clone()810 ));811 assert_ok!(TemplateModule::create_collection(812 origin1.clone(),813 col_name1.clone(),814 col_desc1.clone(),815 token_prefix1.clone(),816 furg_mode.clone()817 ));818 assert_ok!(TemplateModule::create_collection(819 origin1.clone(),820 col_name1.clone(),821 col_desc1.clone(),822 token_prefix1.clone(),823 refung_mode.clone()824 ));825826 assert_eq!(TemplateModule::collection(1).owner, 1);827 assert_eq!(TemplateModule::collection(2).owner, 1);828 assert_eq!(TemplateModule::collection(3).owner, 1);829830 // check balance before831 assert_eq!(TemplateModule::balance_count(1, 1), 0);832 assert_eq!(TemplateModule::balance_count(2, 1), 0);833 assert_eq!(TemplateModule::balance_count(3, 1), 0);834835 // create item836 assert_ok!(TemplateModule::create_item(837 origin1.clone(),838 1,839 [1, 1, 1].to_vec(),840 1841 ));842843 assert_ok!(TemplateModule::create_item(844 origin1.clone(),845 2,846 [].to_vec(),847 1848 ));849850 assert_ok!(TemplateModule::create_item(851 origin1.clone(),852 3,853 [1, 1, 1].to_vec(),854 1855 ));856857 // check balance (collection with id = 1, user id = 1)858 assert_eq!(TemplateModule::balance_count(1, 1), 1);859 assert_eq!(TemplateModule::balance_count(2, 1), 1000);860 assert_eq!(TemplateModule::balance_count(3, 1), 1000);861 assert_eq!(TemplateModule::nft_item_id(1, 1).owner, 1);862 assert_eq!(TemplateModule::fungible_item_id(2, 1).owner, 1);863 assert_eq!(TemplateModule::refungible_item_id(3, 1).owner[0].owner, 1);864 });865}866867#[test]868fn approve() {869 new_test_ext().execute_with(|| {870 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();871 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();872 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();873 let nft_mode: CollectionMode = CollectionMode::NFT(2000);874 let origin1 = Origin::signed(1);875876 assert_ok!(TemplateModule::create_collection(877 origin1.clone(),878 col_name1.clone(),879 col_desc1.clone(),880 token_prefix1.clone(),881 nft_mode.clone()882 ));883884 assert_eq!(TemplateModule::collection(1).owner, 1);885886 // create item887 assert_ok!(TemplateModule::create_item(888 origin1.clone(),889 1,890 [1, 1, 1].to_vec(),891 1892 ));893894 // approve895 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));896 assert_eq!(TemplateModule::approved(1, (1, 1))[0].approved, 2);897 });898}899900#[test]901fn transfer_from() {902 new_test_ext().execute_with(|| {903 let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();904 let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();905 let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();906 let mode: CollectionMode = CollectionMode::NFT(2000);907 let origin1 = Origin::signed(1);908 let origin2 = Origin::signed(2);909910 assert_ok!(TemplateModule::create_collection(911 origin1.clone(),912 col_name1.clone(),913 col_desc1.clone(),914 token_prefix1.clone(),915 mode916 ));917918 assert_eq!(TemplateModule::collection(1).owner, 1);919920 // create item921 assert_ok!(TemplateModule::create_item(922 origin1.clone(),923 1,924 [1, 1, 1].to_vec(),925 1926 ));927928 // approve929 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));930 assert_eq!(TemplateModule::approved(1, (1, 1))[0].approved, 2);931 assert_ok!(TemplateModule::transfer_from(932 origin2.clone(),933 1,934 2,935 1,936 1,937 1938 ));939940 // after transfer941 assert_eq!(TemplateModule::balance_count(1, 1), 0);942 assert_eq!(TemplateModule::balance_count(1, 2), 1);943 });944}run-testnet.shdiffbeforeafterboth--- a/run-testnet.sh
+++ b/run-testnet.sh
@@ -49,6 +49,7 @@
--rpc-port $RPCPORT \
--name $NODE \
--ws-external \
+ --ws-max-connections 10000 \
--rpc-cors all \
-lruntime \
$BOOTNODES;
runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -53,8 +53,10 @@
pub use timestamp::Call as TimestampCall;
-/// Importing a nft pallet
-pub use nft;
+/// Re-export a nft pallet
+/// TODO: Check this re-export. Is this safe and good style?
+extern crate nft;
+pub use nft::*;
/// An index to a block.
pub type BlockNumber = u32;
@@ -111,7 +113,7 @@
spec_name: create_runtime_str!("nft"),
impl_name: create_runtime_str!("nft"),
authoring_version: 1,
- spec_version: 1,
+ spec_version: 2,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
@@ -318,7 +320,7 @@
Balances: balances::{Module, Call, Storage, Config<T>, Event<T>},
TransactionPayment: transaction_payment::{Module, Storage},
Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},
- Nft: nft::{Module, Call, Storage, Event<T>},
+ Nft: nft::{Module, Call, Config<T>, Storage, Event<T>},
}
);
tests/src/blocks-production.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/blocks-production.test.ts
@@ -0,0 +1,48 @@
+import usingApi from "./substrate/substrate-api";
+import promisifySubstrate from "./substrate/promisify-substrate";
+import { expect } from "chai";
+
+describe('Blocks Production', () => {
+ it('Node produces new blocks', async () => {
+ await usingApi(async api => {
+ const blocksPromise = promisifySubstrate(api, () => {
+ return new Promise<number[]>((resolve, reject) => {
+ const blockNumbers: number[] = [];
+ const unsubscribe = api.rpc.chain.subscribeNewHeads(async head => {
+ blockNumbers.push(head.number.toNumber());
+ if(blockNumbers.length >= 2) {
+ (await unsubscribe)();
+ resolve(blockNumbers);
+ }
+ });
+ })
+ })();
+
+ let blocks: number[] | undefined = undefined;
+
+ const timeoutPromise = new Promise<void>((resolve, reject) => {
+ let secondsPassed = 0;
+ let incrementSeconds = () => {
+ secondsPassed++;
+ if(secondsPassed > 5 * 60) {
+ reject('Block production test failed due to timeout.');
+ return;
+ }
+
+ if(blocks) {
+ resolve();
+ return;
+ }
+
+ setTimeout(incrementSeconds, 1000);
+ }
+
+ incrementSeconds();
+ });
+
+ blocks = await Promise.race([blocksPromise, timeoutPromise]) as number[];
+
+ expect(blocks[0]).to.be.lessThan(blocks[1]);
+ });
+ });
+});