difftreelog
Merge pull request #232 from UniqueNetwork/refactor/pallet-common-rpcs
in: master
Prefer api.rpc.nft to api.query.common
38 files changed
.devcontainer/devcontainer.jsondiffbeforeafterboth--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,8 @@
{
"name": "Rust",
"dockerComposeFile": "./docker-compose.yml",
- "service": "nft_private",
- "workspaceFolder": "/workspaces/nft_private",
+ "service": "unique-chain",
+ "workspaceFolder": "/workspaces/unique-chain",
"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
"lldb.executable": "/usr/bin/lldb",
.devcontainer/docker-compose.ymldiffbeforeafterboth--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,13 +1,13 @@
version: '3'
services:
- nft_private:
+ unique-chain:
build:
context: .
environment:
- JAEGER_AGENT_HOST=jaeger
- JAEGER_AGENT_PORT=6831
volumes:
- - ..:/workspaces/nft_private:cached
+ - ..:/workspaces/unique-chain:cached
- ../../polkadot:/workspaces/polkadot:cached
- ../../polkadot-launch:/workspaces/polkadot-launch:cached
#- ../../frontier:/workspaces/frontier
.github/workflows/node_build_test.ymldiffbeforeafterboth--- a/.github/workflows/node_build_test.yml
+++ b/.github/workflows/node_build_test.yml
@@ -35,10 +35,10 @@
script: |
eval $(ssh-agent -s)
ssh-add /home/devops/.ssh/git_hub
- git clone git@github.com:UniqueNetwork/nft_private.git
- cd nft_private
+ git clone git@github.com:UniqueNetwork/unique-chain.git
+ cd unique-chain
git checkout develop
# git pull --all
chmod +x ci_node.sh
./ci_node.sh
- rm -rf /home/polkadot/nft_private
+ rm -rf /home/polkadot/unique-chain
Dockerfile-parachaindiffbeforeafterboth--- a/Dockerfile-parachain
+++ b/Dockerfile-parachain
@@ -98,7 +98,7 @@
npm install --global yarn && \
yarn
-COPY --from=builder /nft_parachain/target/$PROFILE/nft /nft_private/target/$PROFILE/
+COPY --from=builder /nft_parachain/target/$PROFILE/nft /unique-chain/target/$PROFILE/
COPY --from=builder-polkadot /nft_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/
CMD export NVM_DIR="$HOME/.nvm" && \
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -3,7 +3,7 @@
use codec::Decode;
use jsonrpc_core::{Error as RpcError, ErrorCode, Result};
use jsonrpc_derive::rpc;
-use nft_data_structs::{CollectionId, TokenId};
+use nft_data_structs::{Collection, CollectionId, CollectionStats, TokenId};
use sp_api::{BlockId, BlockT, ProvideRuntimeApi};
use sp_blockchain::HeaderBackend;
use up_rpc::NftApi as NftRuntimeApi;
@@ -86,8 +86,23 @@
collection: CollectionId,
at: Option<BlockHash>,
) -> Result<Vec<CrossAccountId>>;
+ #[rpc(name = "nft_allowed")]
+ fn allowed(
+ &self,
+ collection: CollectionId,
+ user: CrossAccountId,
+ at: Option<BlockHash>,
+ ) -> Result<bool>;
#[rpc(name = "nft_lastTokenId")]
fn last_token_id(&self, collection: CollectionId, at: Option<BlockHash>) -> Result<TokenId>;
+ #[rpc(name = "nft_collectionById")]
+ fn collection_by_id(
+ &self,
+ collection: CollectionId,
+ at: Option<BlockHash>,
+ ) -> Result<Option<Collection<AccountId>>>;
+ #[rpc(name = "nft_collectionStats")]
+ fn collection_stats(&self, at: Option<BlockHash>) -> Result<CollectionStats>;
}
pub struct Nft<C, P> {
@@ -160,5 +175,8 @@
pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>);
pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>);
+ pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool);
pass_method!(last_token_id(collection: CollectionId) -> TokenId);
+ pass_method!(collection_by_id(collection: CollectionId) -> Option<Collection<AccountId>>);
+ pass_method!(collection_stats() -> CollectionStats);
}
launch-config.jsondiffbeforeafterboth--- a/launch-config.json
+++ b/launch-config.json
@@ -55,7 +55,7 @@
},
"parachains": [
{
- "bin": "../nft_private/target/release/nft",
+ "bin": "../unique-chain/target/release/nft",
"id": "2000",
"balance": "1000000000000000000000",
"nodes": [
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -19,7 +19,7 @@
pub fn create_collection_raw<T: Config, R>(
owner: T::AccountId,
mode: CollectionMode,
- handler: impl FnOnce(Collection<T>) -> Result<CollectionId, DispatchError>,
+ handler: impl FnOnce(Collection<T::AccountId>) -> Result<CollectionId, DispatchError>,
cast: impl FnOnce(CollectionHandle<T>) -> R,
) -> Result<R, DispatchError> {
T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -12,7 +12,7 @@
COLLECTION_NUMBER_LIMIT, Collection, CollectionId, CreateItemData, ExistenceRequirement,
MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_COLLECTION_NAME_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, Pays, PostDispatchInfo, TokenId, Weight,
- WithdrawReasons,
+ WithdrawReasons, CollectionStats,
};
pub use pallet::*;
use sp_core::H160;
@@ -26,7 +26,7 @@
#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]
pub struct CollectionHandle<T: Config> {
pub id: CollectionId,
- collection: Collection<T>,
+ collection: Collection<T::AccountId>,
pub recorder: pallet_evm_coder_substrate::SubstrateRecorder<T>,
}
impl<T: Config> CollectionHandle<T> {
@@ -78,7 +78,7 @@
}
}
impl<T: Config> Deref for CollectionHandle<T> {
- type Target = Collection<T>;
+ type Target = Collection<T::AccountId>;
fn deref(&self) -> &Self::Target {
&self.collection
@@ -311,7 +311,7 @@
pub type CollectionById<T> = StorageMap<
Hasher = Blake2_128Concat,
Key = CollectionId,
- Value = Collection<T>,
+ Value = Collection<<T as frame_system::Config>::AccountId>,
QueryKind = OptionQuery,
>;
@@ -344,6 +344,11 @@
Value = bool,
QueryKind = ValueQuery,
>;
+
+ /// Not used by code, exists only to provide some types to metadata
+ #[pallet::storage]
+ pub type DummyStorageValue<T> =
+ StorageValue<Value = (CollectionStats, CollectionId, TokenId), QueryKind = OptionQuery>;
}
impl<T: Config> Pallet<T> {
@@ -355,10 +360,32 @@
);
Ok(())
}
+ pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {
+ <IsAdmin<T>>::iter_prefix((collection,))
+ .map(|(a, _)| a)
+ .collect()
+ }
+ pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {
+ <Allowlist<T>>::iter_prefix((collection,))
+ .map(|(a, _)| a)
+ .collect()
+ }
+ pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {
+ <Allowlist<T>>::get((collection, user))
+ }
+ pub fn collection_stats() -> CollectionStats {
+ let created = <CreatedCollectionCount<T>>::get();
+ let destroyed = <DestroyedCollectionCount<T>>::get();
+ CollectionStats {
+ created: created.0,
+ destroyed: destroyed.0,
+ alive: created.0 - destroyed.0,
+ }
+ }
}
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T>) -> Result<CollectionId, DispatchError> {
+ pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
{
ensure!(
data.name.len() <= MAX_COLLECTION_NAME_LENGTH,
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -91,8 +91,8 @@
}
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T>) -> Result<CollectionId, DispatchError> {
- PalletCommon::init_collection(data)
+ pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
+ <PalletCommon<T>>::init_collection(data)
}
pub fn destroy_collection(
collection: FungibleHandle<T>,
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -42,8 +42,8 @@
CollectionId, CollectionMode, TokenId, SchemaVersion, SponsorshipState, MetaUpdatePermission,
};
use pallet_common::{
- account::CrossAccountId, CollectionHandle, IsAdmin, Pallet as PalletCommon,
- Error as CommonError, CommonWeightInfo, Allowlist,
+ account::CrossAccountId, CollectionHandle, Pallet as PalletCommon, Error as CommonError,
+ CommonWeightInfo,
};
use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
@@ -194,7 +194,7 @@
let who = ensure_signed(origin)?;
// Create new collection
- let new_collection = Collection::<T> {
+ let new_collection = Collection {
owner: who.clone(),
name: collection_name,
mode: mode.clone(),
@@ -212,14 +212,14 @@
};
let _id = match mode {
- CollectionMode::NFT => {PalletNonfungible::init_collection(new_collection)?},
+ CollectionMode::NFT => {<PalletNonfungible<T>>::init_collection(new_collection)?},
CollectionMode::Fungible(decimal_points) => {
// check params
ensure!(decimal_points <= MAX_DECIMAL_POINTS, Error::<T>::CollectionDecimalPointLimitExceeded);
- PalletFungible::init_collection(new_collection)?
+ <PalletFungible<T>>::init_collection(new_collection)?
}
CollectionMode::ReFungible => {
- PalletRefungible::init_collection(new_collection)?
+ <PalletRefungible<T>>::init_collection(new_collection)?
}
};
@@ -951,19 +951,5 @@
target_collection.save()
}
- }
-}
-
-// TODO: limit returned entries?
-impl<T: Config> Pallet<T> {
- pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {
- <IsAdmin<T>>::iter_prefix((collection,))
- .map(|(a, _)| a)
- .collect()
- }
- pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {
- <Allowlist<T>>::iter_prefix((collection,))
- .map(|(a, _)| a)
- .collect()
}
}
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -133,8 +133,8 @@
// unchecked calls skips any permission checks
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T>) -> Result<CollectionId, DispatchError> {
- PalletCommon::init_collection(data)
+ pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
+ <PalletCommon<T>>::init_collection(data)
}
pub fn destroy_collection(
collection: NonfungibleHandle<T>,
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -156,8 +156,8 @@
// unchecked calls skips any permission checks
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T>) -> Result<CollectionId, DispatchError> {
- PalletCommon::init_collection(data)
+ pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
+ <PalletCommon<T>>::init_collection(data)
}
pub fn destroy_collection(
collection: RefungibleHandle<T>,
primitives/nft/src/lib.rsdiffbeforeafterboth--- a/primitives/nft/src/lib.rs
+++ b/primitives/nft/src/lib.rs
@@ -209,8 +209,8 @@
#[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
-pub struct Collection<T: frame_system::Config> {
- pub owner: T::AccountId,
+pub struct Collection<AccountId> {
+ pub owner: AccountId,
pub mode: CollectionMode,
pub access: AccessMode,
pub name: Vec<u16>, // 64 include null escape char
@@ -219,7 +219,7 @@
pub mint_mode: bool,
pub offchain_schema: Vec<u8>,
pub schema_version: SchemaVersion,
- pub sponsorship: SponsorshipState<T::AccountId>,
+ pub sponsorship: SponsorshipState<AccountId>,
pub limits: CollectionLimits, // Collection private restrictions
pub variable_on_chain_schema: Vec<u8>, //
pub const_on_chain_schema: Vec<u8>, //
@@ -424,3 +424,11 @@
CreateItemData::Fungible(item)
}
}
+
+#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+pub struct CollectionStats {
+ pub created: u32,
+ pub destroyed: u32,
+ pub alive: u32,
+}
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -1,6 +1,6 @@
#![cfg_attr(not(feature = "std"), no_std)]
-use nft_data_structs::{CollectionId, TokenId};
+use nft_data_structs::{CollectionId, TokenId, Collection, CollectionStats};
use sp_std::vec::Vec;
use sp_core::H160;
use codec::Decode;
@@ -32,6 +32,9 @@
fn adminlist(collection: CollectionId) -> Vec<CrossAccountId>;
fn allowlist(collection: CollectionId) -> Vec<CrossAccountId>;
+ fn allowed(collection: CollectionId, user: CrossAccountId) -> bool;
fn last_token_id(collection: CollectionId) -> TokenId;
+ fn collection_by_id(collection: CollectionId) -> Option<Collection<AccountId>>;
+ fn collection_stats() -> CollectionStats;
}
}
runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -1045,14 +1045,23 @@
.or_else(|| <pallet_evm_contract_helpers::HelpersOnMethodCall<Self>>::get_code(&account))
}
fn adminlist(collection: CollectionId) -> Vec<CrossAccountId> {
- <pallet_nft::Pallet<Runtime>>::adminlist(collection)
+ <pallet_common::Pallet<Runtime>>::adminlist(collection)
}
fn allowlist(collection: CollectionId) -> Vec<CrossAccountId> {
- <pallet_nft::Pallet<Runtime>>::allowlist(collection)
+ <pallet_common::Pallet<Runtime>>::allowlist(collection)
+ }
+ fn allowed(collection: CollectionId, user: CrossAccountId) -> bool {
+ <pallet_common::Pallet<Runtime>>::allowed(collection, user)
}
fn last_token_id(collection: CollectionId) -> TokenId {
dispatch_nft_runtime!(collection.last_token_id())
}
+ fn collection_by_id(collection: CollectionId) -> Option<Collection<AccountId>> {
+ <pallet_common::CollectionById<Runtime>>::get(collection)
+ }
+ fn collection_stats() -> CollectionStats {
+ <pallet_common::Pallet<Runtime>>::collection_stats()
+ }
}
impl sp_api::Core<Block> for Runtime {
tests/src/addCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -8,7 +8,7 @@
import chaiAsPromised from 'chai-as-promised';
import privateKey from './substrate/privateKey';
import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';
-import {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId} from './util/helpers';
+import {addCollectionAdminExpectSuccess, createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';
chai.use(chaiAsPromised);
const expect = chai.expect;
@@ -20,7 +20,7 @@
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.equal(alice.address);
const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
@@ -38,7 +38,7 @@
const bob = privateKey('//Bob');
const charlie = privateKey('//CHARLIE');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.equal(alice.address);
const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
tests/src/addToAllowList.test.tsdiffbeforeafterboth--- a/tests/src/addToAllowList.test.ts
+++ b/tests/src/addToAllowList.test.ts
@@ -18,6 +18,7 @@
normalizeAccountId,
addCollectionAdminExpectSuccess,
addToAllowListExpectFail,
+ getCreatedCollectionCount,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -55,7 +56,7 @@
it('Allow list an address in the collection that does not exist', async () => {
await usingApi(async (api) => {
// tslint:disable-next-line: no-bitwise
- const collectionId = ((await api.query.common.createdCollectionCount()).toNumber()) + 1;
+ const collectionId = await getCreatedCollectionCount(api) + 1;
const bob = privateKey('//Bob');
const tx = api.tx.nft.addToAllowList(collectionId, normalizeAccountId(bob.address));
tests/src/approve.test.tsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//5import {IKeyringPair} from '@polkadot/types/types';6import {ApiPromise} from '@polkadot/api';7import chai from 'chai';8import chaiAsPromised from 'chai-as-promised';9import privateKey from './substrate/privateKey';10import {default as usingApi} from './substrate/substrate-api';11import {12 approveExpectFail,13 approveExpectSuccess,14 createCollectionExpectSuccess,15 createItemExpectSuccess,16 destroyCollectionExpectSuccess,17 setCollectionLimitsExpectSuccess,18 transferExpectSuccess,19 addCollectionAdminExpectSuccess,20 adminApproveFromExpectSuccess,21 transferFromExpectSuccess,22 transferFromExpectFail,23} from './util/helpers';2425chai.use(chaiAsPromised);26const expect = chai.expect;2728describe('Integration Test approve(spender, collection_id, item_id, amount):', () => {29 let alice: IKeyringPair;30 let bob: IKeyringPair;31 let charlie: IKeyringPair;3233 before(async () => {34 await usingApi(async () => {35 alice = privateKey('//Alice');36 bob = privateKey('//Bob');37 charlie = privateKey('//Charlie');38 });39 });4041 it('Execute the extrinsic and check approvedList', async () => {42 const nftCollectionId = await createCollectionExpectSuccess();43 // nft44 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');45 await approveExpectSuccess(nftCollectionId, newNftTokenId, alice, bob.address);46 // fungible47 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});48 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');49 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address);50 // reFungible51 const reFungibleCollectionId =52 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});53 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');54 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address);55 });5657 it('Remove approval by using 0 amount', async () => {58 const nftCollectionId = await createCollectionExpectSuccess();59 // nft60 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');61 await approveExpectSuccess(nftCollectionId, newNftTokenId, alice, bob.address, 1);62 await approveExpectSuccess(nftCollectionId, newNftTokenId, alice, bob.address, 0);63 // fungible64 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});65 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');66 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 1);67 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 0);68 // reFungible69 const reFungibleCollectionId =70 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});71 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');72 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 1);73 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 0);74 });7576 it('can be called by collection owner on non-owned item when OwnerCanTransfer == true', async () => {77 const collectionId = await createCollectionExpectSuccess();78 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);7980 await adminApproveFromExpectSuccess(collectionId, itemId, alice, bob.address, charlie.address);81 });82});8384describe('Normal user can approve other users to transfer:', () => {85 let alice: IKeyringPair;86 let bob: IKeyringPair;87 let charlie: IKeyringPair;8889 before(async () => {90 await usingApi(async () => {91 alice = privateKey('//Alice');92 bob = privateKey('//Bob');93 charlie = privateKey('//Charlie');94 });95 }); 9697 it('NFT', async () => {98 const collectionId = await createCollectionExpectSuccess();99 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);100 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);101 });102103 it('Fungible up to an approved amount', async () => {104 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});105 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', bob.address); 106 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);107 });108109 it('ReFungible up to an approved amount', async () => {110 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });111 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', bob.address);112 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);113 });114});115116describe('Approved users can transferFrom up to approved amount:', () => {117 let alice: IKeyringPair;118 let bob: IKeyringPair;119 let charlie: IKeyringPair;120121 before(async () => {122 await usingApi(async () => {123 alice = privateKey('//Alice');124 bob = privateKey('//Bob');125 charlie = privateKey('//Charlie');126 });127 }); 128129 it('NFT', async () => {130 const collectionId = await createCollectionExpectSuccess();131 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);132 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);133 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'NFT');134 });135136 it('Fungible up to an approved amount', async () => {137 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});138 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', bob.address); 139 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);140 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'Fungible');141 });142143 it('ReFungible up to an approved amount', async () => {144 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });145 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', bob.address);146 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);147 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'ReFungible');148 });149});150151describe('Approved users cannot use transferFrom to repeat transfers if approved amount was already transferred:', () => {152 let alice: IKeyringPair;153 let bob: IKeyringPair;154 let charlie: IKeyringPair;155156 before(async () => {157 await usingApi(async () => {158 alice = privateKey('//Alice');159 bob = privateKey('//Bob');160 charlie = privateKey('//Charlie');161 });162 }); 163164 it('NFT', async () => {165 const collectionId = await createCollectionExpectSuccess();166 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);167 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);168 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'NFT');169 await transferFromExpectFail(collectionId, itemId, charlie, bob, alice, 1);170 });171172 it('Fungible up to an approved amount', async () => {173 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});174 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', bob.address); 175 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);176 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'Fungible');177 await transferFromExpectFail(collectionId, itemId, charlie, bob, alice, 1);178 });179180 it('ReFungible up to an approved amount', async () => {181 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });182 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', bob.address);183 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);184 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'ReFungible');185 await transferFromExpectFail(collectionId, itemId, charlie, bob, alice, 1);186 });187});188189describe('Approved amount decreases by the transferred amount.:', () => {190 let alice: IKeyringPair;191 let bob: IKeyringPair;192 let charlie: IKeyringPair;193 let dave: IKeyringPair;194195 before(async () => {196 await usingApi(async () => {197 alice = privateKey('//Alice');198 bob = privateKey('//Bob');199 charlie = privateKey('//Charlie');200 dave = privateKey('//Dave');201 });202 }); 203204 it('If a user B is approved to transfer 10 Fungible tokens from user A, they can transfer 2 tokens to user C, which will result in decreasing approval from 10 to 8. Then user B can transfer 8 tokens to user D.', async () => {205 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});206 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', alice.address); 207 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 10);208 await transferFromExpectSuccess(collectionId, itemId, bob, alice, charlie, 2, 'Fungible');209 await transferFromExpectSuccess(collectionId, itemId, bob, alice, dave, 8, 'Fungible');210 });211});212213describe('User may clear the approvals to approving for 0 amount:', () => {214 let alice: IKeyringPair;215 let bob: IKeyringPair;216 let charlie: IKeyringPair;217218 before(async () => {219 await usingApi(async () => {220 alice = privateKey('//Alice');221 bob = privateKey('//Bob');222 charlie = privateKey('//Charlie');223 });224 });225226 it('NFT', async () => {227 const collectionId = await createCollectionExpectSuccess();228 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT');229 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 1);230 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 0);231 await transferFromExpectFail(collectionId, itemId, bob, bob, charlie, 1);232 });233234 it('Fungible', async () => {235 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});236 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');237 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 1);238 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 0);239 await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, bob, bob, charlie, 1);240 });241242 it('ReFungible', async () => {243 const reFungibleCollectionId =244 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});245 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');246 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 1);247 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 0);248 await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, bob, bob, charlie, 1);249 });250});251252describe('User cannot approve for the amount greater than they own:', () => {253 let alice: IKeyringPair;254 let bob: IKeyringPair;255 let charlie: IKeyringPair;256257 before(async () => {258 await usingApi(async () => {259 alice = privateKey('//Alice');260 bob = privateKey('//Bob');261 charlie = privateKey('//Charlie');262 });263 });264265 it('1 for NFT', async () => {266 const collectionId = await createCollectionExpectSuccess();267 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);268 await approveExpectFail(collectionId, itemId, bob, charlie, 2);269 });270271 it('Fungible', async () => {272 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});273 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');274 await approveExpectFail(fungibleCollectionId, newFungibleTokenId, bob, charlie, 11);275 });276277 it('ReFungible', async () => {278 const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});279 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');280 await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, bob, charlie, 101);281 });282});283284describe('Administrator and collection owner do not need approval in order to execute TransferFrom:', () => {285 let alice: IKeyringPair;286 let bob: IKeyringPair;287 let charlie: IKeyringPair;288 let dave: IKeyringPair;289290 before(async () => {291 await usingApi(async () => {292 alice = privateKey('//Alice');293 bob = privateKey('//Bob');294 charlie = privateKey('//Charlie');295 dave = privateKey('//Dave');296 });297 }); 298299 it('NFT', async () => {300 const collectionId = await createCollectionExpectSuccess();301 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', charlie.address);302 await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'NFT');303 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);304 await transferFromExpectSuccess(collectionId, itemId, bob, dave, alice, 1, 'NFT');305 });306307 it('Fungible up to an approved amount', async () => {308 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});309 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', charlie.address); 310 await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'Fungible');311 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);312 await transferFromExpectSuccess(collectionId, itemId, bob, dave, alice, 1, 'Fungible');313 });314315 it('ReFungible up to an approved amount', async () => {316 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });317 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', charlie.address);318 await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'ReFungible');319 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);320 await transferFromExpectSuccess(collectionId, itemId, bob, dave, alice, 1, 'ReFungible');321 });322});323324describe('Repeated approvals add up', () => {325 let alice: IKeyringPair;326 let bob: IKeyringPair;327 let charlie: IKeyringPair;328 let dave: IKeyringPair;329330 before(async () => {331 await usingApi(async () => {332 alice = privateKey('//Alice');333 bob = privateKey('//Bob');334 charlie = privateKey('//Charlie');335 dave = privateKey('//Dave');336 });337 }); 338339 it.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. Fungible', async () => {340 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});341 await createItemExpectSuccess(alice, collectionId, 'Fungible', alice.address);342 await approveExpectSuccess(collectionId, 0, alice, bob.address, 1);343 await approveExpectSuccess(collectionId, 0, alice, charlie.address, 1);344 // const allowances1 = await getAllowance(collectionId, 0, Alice.address, Bob.address);345 // const allowances2 = await getAllowance(collectionId, 0, Alice.address, Charlie.address);346 // expect(allowances1 + allowances2).to.be.eq(BigInt(2));347 });348349 it.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. ReFungible', async () => {350 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });351 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', alice.address);352 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 1);353 await approveExpectSuccess(collectionId, itemId, alice, charlie.address, 1);354 // const allowances1 = await getAllowance(collectionId, itemId, Alice.address, Bob.address);355 // const allowances2 = await getAllowance(collectionId, itemId, Alice.address, Charlie.address);356 // expect(allowances1 + allowances2).to.be.eq(BigInt(2));357 });358359 // Canceled by changing approve logic360 it.skip('Cannot approve for more than total user`s amount (owned: 10, approval 1: 5 - should succeed, approval 2: 6 - should fail). Fungible', async () => {361 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});362 await createItemExpectSuccess(alice, collectionId, 'Fungible', dave.address);363 await approveExpectSuccess(collectionId, 0, dave, bob.address, 5);364 await approveExpectFail(collectionId, 0, dave, charlie, 6);365 });366367 // Canceled by changing approve logic368 it.skip('Cannot approve for more than total users amount (owned: 100, approval 1: 50 - should succeed, approval 2: 51 - should fail). ReFungible', async () => {369 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });370 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', dave.address);371 await approveExpectSuccess(collectionId, itemId, dave, bob.address, 50);372 await approveExpectFail(collectionId, itemId, dave, charlie, 51);373 });374});375376describe('Integration Test approve(spender, collection_id, item_id, amount) with collection admin permissions:', () => {377 let alice: IKeyringPair;378 let bob: IKeyringPair;379 let charlie: IKeyringPair;380381 before(async () => {382 await usingApi(async () => {383 alice = privateKey('//Alice');384 bob = privateKey('//Bob');385 charlie = privateKey('//Charlie');386 });387 });388389 it('can be called by collection admin on non-owned item', async () => {390 const collectionId = await createCollectionExpectSuccess();391 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', alice.address);392393 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);394 await adminApproveFromExpectSuccess(collectionId, itemId, bob, alice.address, charlie.address);395 });396});397398describe('Negative Integration Test approve(spender, collection_id, item_id, amount):', () => {399 let alice: IKeyringPair;400 let bob: IKeyringPair;401 let charlie: IKeyringPair;402403 before(async () => {404 await usingApi(async () => {405 alice = privateKey('//Alice');406 bob = privateKey('//Bob');407 charlie = privateKey('//Charlie');408 });409 });410411 it('Approve for a collection that does not exist', async () => {412 await usingApi(async (api: ApiPromise) => {413 // nft414 const nftCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();415 await approveExpectFail(nftCollectionCount + 1, 1, alice, bob);416 // fungible417 const fungibleCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();418 await approveExpectFail(fungibleCollectionCount + 1, 0, alice, bob);419 // reFungible420 const reFungibleCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();421 await approveExpectFail(reFungibleCollectionCount + 1, 1, alice, bob);422 });423 });424425 it('Approve for a collection that was destroyed', async () => {426 // nft427 const nftCollectionId = await createCollectionExpectSuccess();428 await destroyCollectionExpectSuccess(nftCollectionId);429 await approveExpectFail(nftCollectionId, 1, alice, bob);430 // fungible431 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});432 await destroyCollectionExpectSuccess(fungibleCollectionId);433 await approveExpectFail(fungibleCollectionId, 0, alice, bob);434 // reFungible435 const reFungibleCollectionId =436 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});437 await destroyCollectionExpectSuccess(reFungibleCollectionId);438 await approveExpectFail(reFungibleCollectionId, 1, alice, bob);439 });440441 it('Approve transfer of a token that does not exist', async () => {442 // nft443 const nftCollectionId = await createCollectionExpectSuccess();444 await approveExpectFail(nftCollectionId, 2, alice, bob);445 // reFungible446 const reFungibleCollectionId =447 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});448 await approveExpectFail(reFungibleCollectionId, 2, alice, bob);449 });450451 it('Approve using the address that does not own the approved token', async () => {452 const nftCollectionId = await createCollectionExpectSuccess();453 // nft454 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');455 await approveExpectFail(nftCollectionId, newNftTokenId, bob, alice);456 // fungible457 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});458 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');459 await approveExpectFail(fungibleCollectionId, newFungibleTokenId, bob, alice);460 // reFungible461 const reFungibleCollectionId =462 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});463 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');464 await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, bob, alice);465 });466467 it('should fail if approved more ReFungibles than owned', async () => {468 const nftCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});469 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'ReFungible');470 await transferExpectSuccess(nftCollectionId, newNftTokenId, alice, bob, 100, 'ReFungible');471 await approveExpectSuccess(nftCollectionId, newNftTokenId, bob, alice.address, 100);472 await approveExpectFail(nftCollectionId, newNftTokenId, bob, alice, 101);473 });474475 it('should fail if approved more Fungibles than owned', async () => {476 const nftCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});477 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'Fungible');478 await transferExpectSuccess(nftCollectionId, newNftTokenId, alice, bob, 10, 'Fungible');479 await approveExpectSuccess(nftCollectionId, newNftTokenId, bob, alice.address, 10);480 await approveExpectFail(nftCollectionId, newNftTokenId, bob, alice, 11);481 });482483 it('fails when called by collection owner on non-owned item when OwnerCanTransfer == false', async () => {484 const collectionId = await createCollectionExpectSuccess();485 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);486 await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: false});487488 await approveExpectFail(collectionId, itemId, alice, charlie);489 });490});1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//5import {IKeyringPair} from '@polkadot/types/types';6import {ApiPromise} from '@polkadot/api';7import chai from 'chai';8import chaiAsPromised from 'chai-as-promised';9import privateKey from './substrate/privateKey';10import {default as usingApi} from './substrate/substrate-api';11import {12 approveExpectFail,13 approveExpectSuccess,14 createCollectionExpectSuccess,15 createItemExpectSuccess,16 destroyCollectionExpectSuccess,17 setCollectionLimitsExpectSuccess,18 transferExpectSuccess,19 addCollectionAdminExpectSuccess,20 adminApproveFromExpectSuccess,21 getCreatedCollectionCount,22 transferFromExpectSuccess,23 transferFromExpectFail,24} from './util/helpers';2526chai.use(chaiAsPromised);27const expect = chai.expect;2829describe('Integration Test approve(spender, collection_id, item_id, amount):', () => {30 let alice: IKeyringPair;31 let bob: IKeyringPair;32 let charlie: IKeyringPair;3334 before(async () => {35 await usingApi(async () => {36 alice = privateKey('//Alice');37 bob = privateKey('//Bob');38 charlie = privateKey('//Charlie');39 });40 });4142 it('Execute the extrinsic and check approvedList', async () => {43 const nftCollectionId = await createCollectionExpectSuccess();44 // nft45 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');46 await approveExpectSuccess(nftCollectionId, newNftTokenId, alice, bob.address);47 // fungible48 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});49 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');50 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address);51 // reFungible52 const reFungibleCollectionId =53 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});54 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');55 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address);56 });5758 it('Remove approval by using 0 amount', async () => {59 const nftCollectionId = await createCollectionExpectSuccess();60 // nft61 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');62 await approveExpectSuccess(nftCollectionId, newNftTokenId, alice, bob.address, 1);63 await approveExpectSuccess(nftCollectionId, newNftTokenId, alice, bob.address, 0);64 // fungible65 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});66 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');67 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 1);68 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 0);69 // reFungible70 const reFungibleCollectionId =71 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});72 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');73 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 1);74 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 0);75 });7677 it('can be called by collection owner on non-owned item when OwnerCanTransfer == true', async () => {78 const collectionId = await createCollectionExpectSuccess();79 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);8081 await adminApproveFromExpectSuccess(collectionId, itemId, alice, bob.address, charlie.address);82 });83});8485describe('Normal user can approve other users to transfer:', () => {86 let alice: IKeyringPair;87 let bob: IKeyringPair;88 let charlie: IKeyringPair;8990 before(async () => {91 await usingApi(async () => {92 alice = privateKey('//Alice');93 bob = privateKey('//Bob');94 charlie = privateKey('//Charlie');95 });96 }); 9798 it('NFT', async () => {99 const collectionId = await createCollectionExpectSuccess();100 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);101 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);102 });103104 it('Fungible up to an approved amount', async () => {105 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});106 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', bob.address); 107 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);108 });109110 it('ReFungible up to an approved amount', async () => {111 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });112 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', bob.address);113 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);114 });115});116117describe('Approved users can transferFrom up to approved amount:', () => {118 let alice: IKeyringPair;119 let bob: IKeyringPair;120 let charlie: IKeyringPair;121122 before(async () => {123 await usingApi(async () => {124 alice = privateKey('//Alice');125 bob = privateKey('//Bob');126 charlie = privateKey('//Charlie');127 });128 }); 129130 it('NFT', async () => {131 const collectionId = await createCollectionExpectSuccess();132 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);133 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);134 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'NFT');135 });136137 it('Fungible up to an approved amount', async () => {138 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});139 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', bob.address); 140 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);141 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'Fungible');142 });143144 it('ReFungible up to an approved amount', async () => {145 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });146 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', bob.address);147 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);148 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'ReFungible');149 });150});151152describe('Approved users cannot use transferFrom to repeat transfers if approved amount was already transferred:', () => {153 let alice: IKeyringPair;154 let bob: IKeyringPair;155 let charlie: IKeyringPair;156157 before(async () => {158 await usingApi(async () => {159 alice = privateKey('//Alice');160 bob = privateKey('//Bob');161 charlie = privateKey('//Charlie');162 });163 }); 164165 it('NFT', async () => {166 const collectionId = await createCollectionExpectSuccess();167 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);168 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);169 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'NFT');170 await transferFromExpectFail(collectionId, itemId, charlie, bob, alice, 1);171 });172173 it('Fungible up to an approved amount', async () => {174 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});175 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', bob.address); 176 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);177 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'Fungible');178 await transferFromExpectFail(collectionId, itemId, charlie, bob, alice, 1);179 });180181 it('ReFungible up to an approved amount', async () => {182 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });183 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', bob.address);184 await approveExpectSuccess(collectionId, itemId, bob, charlie.address);185 await transferFromExpectSuccess(collectionId, itemId, charlie, bob, alice, 1, 'ReFungible');186 await transferFromExpectFail(collectionId, itemId, charlie, bob, alice, 1);187 });188});189190describe('Approved amount decreases by the transferred amount.:', () => {191 let alice: IKeyringPair;192 let bob: IKeyringPair;193 let charlie: IKeyringPair;194 let dave: IKeyringPair;195196 before(async () => {197 await usingApi(async () => {198 alice = privateKey('//Alice');199 bob = privateKey('//Bob');200 charlie = privateKey('//Charlie');201 dave = privateKey('//Dave');202 });203 }); 204205 it('If a user B is approved to transfer 10 Fungible tokens from user A, they can transfer 2 tokens to user C, which will result in decreasing approval from 10 to 8. Then user B can transfer 8 tokens to user D.', async () => {206 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});207 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', alice.address); 208 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 10);209 await transferFromExpectSuccess(collectionId, itemId, bob, alice, charlie, 2, 'Fungible');210 await transferFromExpectSuccess(collectionId, itemId, bob, alice, dave, 8, 'Fungible');211 });212});213214describe('User may clear the approvals to approving for 0 amount:', () => {215 let alice: IKeyringPair;216 let bob: IKeyringPair;217 let charlie: IKeyringPair;218219 before(async () => {220 await usingApi(async () => {221 alice = privateKey('//Alice');222 bob = privateKey('//Bob');223 charlie = privateKey('//Charlie');224 });225 });226227 it('NFT', async () => {228 const collectionId = await createCollectionExpectSuccess();229 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT');230 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 1);231 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 0);232 await transferFromExpectFail(collectionId, itemId, bob, bob, charlie, 1);233 });234235 it('Fungible', async () => {236 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});237 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');238 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 1);239 await approveExpectSuccess(fungibleCollectionId, newFungibleTokenId, alice, bob.address, 0);240 await transferFromExpectFail(fungibleCollectionId, newFungibleTokenId, bob, bob, charlie, 1);241 });242243 it('ReFungible', async () => {244 const reFungibleCollectionId =245 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});246 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');247 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 1);248 await approveExpectSuccess(reFungibleCollectionId, newReFungibleTokenId, alice, bob.address, 0);249 await transferFromExpectFail(reFungibleCollectionId, newReFungibleTokenId, bob, bob, charlie, 1);250 });251});252253describe('User cannot approve for the amount greater than they own:', () => {254 let alice: IKeyringPair;255 let bob: IKeyringPair;256 let charlie: IKeyringPair;257258 before(async () => {259 await usingApi(async () => {260 alice = privateKey('//Alice');261 bob = privateKey('//Bob');262 charlie = privateKey('//Charlie');263 });264 });265266 it('1 for NFT', async () => {267 const collectionId = await createCollectionExpectSuccess();268 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);269 await approveExpectFail(collectionId, itemId, bob, charlie, 2);270 });271272 it('Fungible', async () => {273 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});274 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');275 await approveExpectFail(fungibleCollectionId, newFungibleTokenId, bob, charlie, 11);276 });277278 it('ReFungible', async () => {279 const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});280 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');281 await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, bob, charlie, 101);282 });283});284285describe('Administrator and collection owner do not need approval in order to execute TransferFrom:', () => {286 let alice: IKeyringPair;287 let bob: IKeyringPair;288 let charlie: IKeyringPair;289 let dave: IKeyringPair;290291 before(async () => {292 await usingApi(async () => {293 alice = privateKey('//Alice');294 bob = privateKey('//Bob');295 charlie = privateKey('//Charlie');296 dave = privateKey('//Dave');297 });298 }); 299300 it('NFT', async () => {301 const collectionId = await createCollectionExpectSuccess();302 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', charlie.address);303 await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'NFT');304 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);305 await transferFromExpectSuccess(collectionId, itemId, bob, dave, alice, 1, 'NFT');306 });307308 it('Fungible up to an approved amount', async () => {309 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});310 const itemId = await createItemExpectSuccess(alice, collectionId, 'Fungible', charlie.address); 311 await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'Fungible');312 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);313 await transferFromExpectSuccess(collectionId, itemId, bob, dave, alice, 1, 'Fungible');314 });315316 it('ReFungible up to an approved amount', async () => {317 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });318 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', charlie.address);319 await transferFromExpectSuccess(collectionId, itemId, alice, charlie, dave, 1, 'ReFungible');320 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);321 await transferFromExpectSuccess(collectionId, itemId, bob, dave, alice, 1, 'ReFungible');322 });323});324325describe('Repeated approvals add up', () => {326 let alice: IKeyringPair;327 let bob: IKeyringPair;328 let charlie: IKeyringPair;329 let dave: IKeyringPair;330331 before(async () => {332 await usingApi(async () => {333 alice = privateKey('//Alice');334 bob = privateKey('//Bob');335 charlie = privateKey('//Charlie');336 dave = privateKey('//Dave');337 });338 }); 339340 it.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. Fungible', async () => {341 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});342 await createItemExpectSuccess(alice, collectionId, 'Fungible', alice.address);343 await approveExpectSuccess(collectionId, 0, alice, bob.address, 1);344 await approveExpectSuccess(collectionId, 0, alice, charlie.address, 1);345 // const allowances1 = await getAllowance(collectionId, 0, Alice.address, Bob.address);346 // const allowances2 = await getAllowance(collectionId, 0, Alice.address, Charlie.address);347 // expect(allowances1 + allowances2).to.be.eq(BigInt(2));348 });349350 it.skip('Owned 10, approval 1: 1, approval 2: 1, resulting approved value: 2. ReFungible', async () => {351 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });352 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', alice.address);353 await approveExpectSuccess(collectionId, itemId, alice, bob.address, 1);354 await approveExpectSuccess(collectionId, itemId, alice, charlie.address, 1);355 // const allowances1 = await getAllowance(collectionId, itemId, Alice.address, Bob.address);356 // const allowances2 = await getAllowance(collectionId, itemId, Alice.address, Charlie.address);357 // expect(allowances1 + allowances2).to.be.eq(BigInt(2));358 });359360 // Canceled by changing approve logic361 it.skip('Cannot approve for more than total user`s amount (owned: 10, approval 1: 5 - should succeed, approval 2: 6 - should fail). Fungible', async () => {362 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'Fungible', decimalPoints: 0 }});363 await createItemExpectSuccess(alice, collectionId, 'Fungible', dave.address);364 await approveExpectSuccess(collectionId, 0, dave, bob.address, 5);365 await approveExpectFail(collectionId, 0, dave, charlie, 6);366 });367368 // Canceled by changing approve logic369 it.skip('Cannot approve for more than total users amount (owned: 100, approval 1: 50 - should succeed, approval 2: 51 - should fail). ReFungible', async () => {370 const collectionId = await createCollectionExpectSuccess({ mode:{ type: 'ReFungible' } });371 const itemId = await createItemExpectSuccess(alice, collectionId, 'ReFungible', dave.address);372 await approveExpectSuccess(collectionId, itemId, dave, bob.address, 50);373 await approveExpectFail(collectionId, itemId, dave, charlie, 51);374 });375});376377describe('Integration Test approve(spender, collection_id, item_id, amount) with collection admin permissions:', () => {378 let alice: IKeyringPair;379 let bob: IKeyringPair;380 let charlie: IKeyringPair;381382 before(async () => {383 await usingApi(async () => {384 alice = privateKey('//Alice');385 bob = privateKey('//Bob');386 charlie = privateKey('//Charlie');387 });388 });389390 it('can be called by collection admin on non-owned item', async () => {391 const collectionId = await createCollectionExpectSuccess();392 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', alice.address);393394 await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);395 await adminApproveFromExpectSuccess(collectionId, itemId, bob, alice.address, charlie.address);396 });397});398399describe('Negative Integration Test approve(spender, collection_id, item_id, amount):', () => {400 let alice: IKeyringPair;401 let bob: IKeyringPair;402 let charlie: IKeyringPair;403404 before(async () => {405 await usingApi(async () => {406 alice = privateKey('//Alice');407 bob = privateKey('//Bob');408 charlie = privateKey('//Charlie');409 });410 });411412 it('Approve for a collection that does not exist', async () => {413 await usingApi(async (api: ApiPromise) => {414 // nft415 const nftCollectionCount = await getCreatedCollectionCount(api);416 await approveExpectFail(nftCollectionCount + 1, 1, alice, bob);417 // fungible418 const fungibleCollectionCount = await getCreatedCollectionCount(api);419 await approveExpectFail(fungibleCollectionCount + 1, 0, alice, bob);420 // reFungible421 const reFungibleCollectionCount = await getCreatedCollectionCount(api);422 await approveExpectFail(reFungibleCollectionCount + 1, 1, alice, bob);423 });424 });425426 it('Approve for a collection that was destroyed', async () => {427 // nft428 const nftCollectionId = await createCollectionExpectSuccess();429 await destroyCollectionExpectSuccess(nftCollectionId);430 await approveExpectFail(nftCollectionId, 1, alice, bob);431 // fungible432 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});433 await destroyCollectionExpectSuccess(fungibleCollectionId);434 await approveExpectFail(fungibleCollectionId, 0, alice, bob);435 // reFungible436 const reFungibleCollectionId =437 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});438 await destroyCollectionExpectSuccess(reFungibleCollectionId);439 await approveExpectFail(reFungibleCollectionId, 1, alice, bob);440 });441442 it('Approve transfer of a token that does not exist', async () => {443 // nft444 const nftCollectionId = await createCollectionExpectSuccess();445 await approveExpectFail(nftCollectionId, 2, alice, bob);446 // reFungible447 const reFungibleCollectionId =448 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});449 await approveExpectFail(reFungibleCollectionId, 2, alice, bob);450 });451452 it('Approve using the address that does not own the approved token', async () => {453 const nftCollectionId = await createCollectionExpectSuccess();454 // nft455 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'NFT');456 await approveExpectFail(nftCollectionId, newNftTokenId, bob, alice);457 // fungible458 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});459 const newFungibleTokenId = await createItemExpectSuccess(alice, fungibleCollectionId, 'Fungible');460 await approveExpectFail(fungibleCollectionId, newFungibleTokenId, bob, alice);461 // reFungible462 const reFungibleCollectionId =463 await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});464 const newReFungibleTokenId = await createItemExpectSuccess(alice, reFungibleCollectionId, 'ReFungible');465 await approveExpectFail(reFungibleCollectionId, newReFungibleTokenId, bob, alice);466 });467468 it('should fail if approved more ReFungibles than owned', async () => {469 const nftCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});470 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'ReFungible');471 await transferExpectSuccess(nftCollectionId, newNftTokenId, alice, bob, 100, 'ReFungible');472 await approveExpectSuccess(nftCollectionId, newNftTokenId, bob, alice.address, 100);473 await approveExpectFail(nftCollectionId, newNftTokenId, bob, alice, 101);474 });475476 it('should fail if approved more Fungibles than owned', async () => {477 const nftCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});478 const newNftTokenId = await createItemExpectSuccess(alice, nftCollectionId, 'Fungible');479 await transferExpectSuccess(nftCollectionId, newNftTokenId, alice, bob, 10, 'Fungible');480 await approveExpectSuccess(nftCollectionId, newNftTokenId, bob, alice.address, 10);481 await approveExpectFail(nftCollectionId, newNftTokenId, bob, alice, 11);482 });483484 it('fails when called by collection owner on non-owned item when OwnerCanTransfer == false', async () => {485 const collectionId = await createCollectionExpectSuccess();486 const itemId = await createItemExpectSuccess(alice, collectionId, 'NFT', bob.address);487 await setCollectionLimitsExpectSuccess(alice, collectionId, {ownerCanTransfer: false});488489 await approveExpectFail(collectionId, itemId, alice, charlie);490 });491});tests/src/change-collection-owner.test.tsdiffbeforeafterboth--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -22,6 +22,7 @@
setMintPermissionExpectFailure,
destroyCollectionExpectFailure,
setPublicAccessModeExpectSuccess,
+ queryCollectionExpectSuccess,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -34,13 +35,13 @@
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection =await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await submitTransactionAsync(alice, changeOwnerTx);
- const collectionAfterOwnerChange = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange.owner.toString()).to.be.deep.eq(bob.address);
});
});
@@ -53,7 +54,7 @@
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
@@ -62,7 +63,7 @@
const badChangeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, alice.address);
await expect(submitTransactionExpectFailAsync(alice, badChangeOwnerTx)).to.be.rejected;
- const collectionAfterOwnerChange = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange.owner.toString()).to.be.deep.eq(bob.address);
});
});
@@ -74,13 +75,13 @@
const bob = privateKey('//Bob');
const charlie = privateKey('//Charlie');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await submitTransactionAsync(alice, changeOwnerTx);
- const collectionAfterOwnerChange = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange.owner.toString()).to.be.deep.eq(bob.address);
// After changing the owner of the collection, all privileged methods are available to the new owner
@@ -118,20 +119,20 @@
const bob = privateKey('//Bob');
const charlie = privateKey('//Charlie');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await submitTransactionAsync(alice, changeOwnerTx);
- const collectionAfterOwnerChange = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange.owner.toString()).to.be.deep.eq(bob.address);
const changeOwnerTx2 = api.tx.nft.changeCollectionOwner(collectionId, charlie.address);
await submitTransactionAsync(bob, changeOwnerTx2);
// ownership lost
- const collectionAfterOwnerChange2 = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange2 = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange2.owner.toString()).to.be.deep.eq(charlie.address);
});
});
@@ -147,7 +148,7 @@
const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;
- const collectionAfterOwnerChange = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange.owner.toString()).to.be.deep.eq(alice.address);
// Verifying that nothing bad happened (network is live, new collections can be created, etc.)
@@ -166,7 +167,7 @@
const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;
- const collectionAfterOwnerChange = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange.owner.toString()).to.be.deep.eq(alice.address);
// Verifying that nothing bad happened (network is live, new collections can be created, etc.)
@@ -195,7 +196,7 @@
const bob = privateKey('//Bob');
const charlie = privateKey('//Charlie');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
@@ -204,7 +205,7 @@
const badChangeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, alice.address);
await expect(submitTransactionExpectFailAsync(alice, badChangeOwnerTx)).to.be.rejected;
- const collectionAfterOwnerChange = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collectionAfterOwnerChange = await queryCollectionExpectSuccess(api, collectionId);
expect(collectionAfterOwnerChange.owner.toString()).to.be.deep.eq(bob.address);
await setCollectionSponsorExpectFailure(collectionId, charlie.address, '//Alice');
tests/src/confirmSponsorship.test.tsdiffbeforeafterboth--- a/tests/src/confirmSponsorship.test.ts
+++ b/tests/src/confirmSponsorship.test.ts
@@ -20,6 +20,7 @@
addToAllowListExpectSuccess,
normalizeAccountId,
addCollectionAdminExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
import {Keyring} from '@polkadot/api';
import {IKeyringPair} from '@polkadot/types/types';
@@ -330,7 +331,7 @@
// Find the collection that never existed
let collectionId = 0;
await usingApi(async (api) => {
- collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ collectionId = await getCreatedCollectionCount(api) + 1;
});
await confirmSponsorshipExpectFailure(collectionId, '//Bob');
tests/src/contracts.test.tsdiffbeforeafterboth--- a/tests/src/contracts.test.ts
+++ b/tests/src/contracts.test.ts
@@ -228,7 +228,7 @@
const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, contract.address);
await submitTransactionAsync(alice, changeAdminTx);
- expect(await isAllowlisted(collectionId, bob.address)).to.be.false;
+ expect(await isAllowlisted(api, collectionId, bob.address)).to.be.false;
{
const transferTx = contract.tx.toggleAllowList(value, gasLimit, collectionId, bob.address, true);
@@ -236,7 +236,7 @@
const result = getGenericResult(events);
expect(result.success).to.be.true;
- expect(await isAllowlisted(collectionId, bob.address)).to.be.true;
+ expect(await isAllowlisted(api, collectionId, bob.address)).to.be.true;
}
{
const transferTx = contract.tx.toggleAllowList(value, gasLimit, collectionId, bob.address, false);
@@ -244,7 +244,7 @@
const result = getGenericResult(events);
expect(result.success).to.be.true;
- expect(await isAllowlisted(collectionId, bob.address)).to.be.false;
+ expect(await isAllowlisted(api, collectionId, bob.address)).to.be.false;
}
});
});
tests/src/createMultipleItems.test.tsdiffbeforeafterboth--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -20,6 +20,7 @@
getLastTokenId,
getVariableMetadata,
getConstMetadata,
+ getCreatedCollectionCount,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -273,7 +274,7 @@
it('Create token in not existing collection', async () => {
await usingApi(async (api: ApiPromise) => {
- const collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ const collectionId = await getCreatedCollectionCount(api) + 1;
const createMultipleItemsTx = api.tx.nft
.createMultipleItems(collectionId, normalizeAccountId(alice.address), ['NFT', 'NFT', 'NFT']);
await expect(submitTransactionExpectFailAsync(alice, createMultipleItemsTx)).to.be.rejected;
tests/src/creditFeesToTreasury.test.tsdiffbeforeafterboth--- a/tests/src/creditFeesToTreasury.test.ts
+++ b/tests/src/creditFeesToTreasury.test.ts
@@ -14,6 +14,7 @@
createItemExpectSuccess,
getGenericResult,
transferExpectSuccess,
+ UNIQUE,
} from './util/helpers';
import {default as waitNewBlocks} from './substrate/wait-new-blocks';
@@ -169,12 +170,11 @@
const aliceBalanceBefore: bigint = (await api.query.system.account(alicesPublicKey)).data.free.toBigInt();
await transferExpectSuccess(collectionId, tokenId, alice, bob, 1, 'NFT');
const aliceBalanceAfter: bigint = (await api.query.system.account(alicesPublicKey)).data.free.toBigInt();
- const fee = aliceBalanceBefore - aliceBalanceAfter;
+ const fee = Number(aliceBalanceBefore - aliceBalanceAfter) / Number(UNIQUE);
- // console.log(fee.toString());
const expectedTransferFee = 0.1;
const tolerance = 0.001;
- expect(Number(fee) / 1e15 - expectedTransferFee).to.be.lessThan(tolerance);
+ expect(Number(fee) / Number(UNIQUE) - expectedTransferFee).to.be.lessThan(tolerance);
});
});
tests/src/destroyCollection.test.tsdiffbeforeafterboth--- a/tests/src/destroyCollection.test.ts
+++ b/tests/src/destroyCollection.test.ts
@@ -13,6 +13,7 @@
destroyCollectionExpectFailure,
setCollectionLimitsExpectSuccess,
addCollectionAdminExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -46,7 +47,7 @@
it('(!negative test!) Destroy a collection that never existed', async () => {
await usingApi(async (api) => {
// Find the collection that never existed
- const collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ const collectionId = await getCreatedCollectionCount(api) + 1;
await destroyCollectionExpectFailure(collectionId);
});
});
tests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -1,7 +1,7 @@
// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
/* eslint-disable */
-import type { NftDataStructsCollectionId, NftDataStructsTokenId, PalletCommonAccountBasicCrossAccountIdRepr } from './nft';
+import type { NftDataStructsCollection, NftDataStructsCollectionId, NftDataStructsCollectionStats, NftDataStructsTokenId, PalletCommonAccountBasicCrossAccountIdRepr } from './nft';
import type { Bytes, HashMap, Json, Metadata, Null, Option, StorageKey, Text, U256, U64, Vec, bool, u128, u32, u64 } from '@polkadot/types';
import type { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interfaces/author';
import type { EpochAuthorship } from '@polkadot/types/interfaces/babe';
@@ -373,6 +373,10 @@
**/
allowance: AugmentedRpc<(collection: NftDataStructsCollectionId | AnyNumber | Uint8Array, sender: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, spender: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: NftDataStructsTokenId | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
/**
+ * Check if user is allowed to use collection
+ **/
+ allowed: AugmentedRpc<(collection: NftDataStructsCollectionId | AnyNumber | Uint8Array, account: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<bool>>;
+ /**
* Get allowlist
**/
allowlist: AugmentedRpc<(collection: NftDataStructsCollectionId | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<PalletCommonAccountBasicCrossAccountIdRepr>>>;
@@ -381,6 +385,14 @@
**/
balance: AugmentedRpc<(collection: NftDataStructsCollectionId | AnyNumber | Uint8Array, account: PalletCommonAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, tokenId: NftDataStructsTokenId | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
/**
+ * Get collection by specified id
+ **/
+ collectionById: AugmentedRpc<(collection: NftDataStructsCollectionId | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Option<NftDataStructsCollection>>>;
+ /**
+ * Get collection stats
+ **/
+ collectionStats: AugmentedRpc<(at?: Hash | string | Uint8Array) => Observable<NftDataStructsCollectionStats>>;
+ /**
* Get tokens contained in collection
**/
collectionTokens: AugmentedRpc<(collection: NftDataStructsCollectionId | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<NftDataStructsTokenId>>>;
tests/src/interfaces/augment-types.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -2,7 +2,7 @@
/* eslint-disable */
import type { EthereumBlock, EthereumLog, EthereumReceipt, EthereumTransactionLegacyTransaction, EvmCoreErrorExitReason, FpRpcTransactionStatus } from './ethereum';
-import type { NftDataStructsAccessMode, NftDataStructsCollection, NftDataStructsCollectionId, NftDataStructsCollectionLimits, NftDataStructsCollectionMode, NftDataStructsCreateItemData, NftDataStructsMetaUpdatePermission, NftDataStructsSchemaVersion, NftDataStructsSponsorshipState, NftDataStructsTokenId, PalletCommonAccountBasicCrossAccountIdRepr, PalletNonfungibleItemData, PalletRefungibleItemData, PalletUnqSchedulerCallSpec, PalletUnqSchedulerReleases, PalletUnqSchedulerScheduledV2 } from './nft';
+import type { NftDataStructsAccessMode, NftDataStructsCollection, NftDataStructsCollectionId, NftDataStructsCollectionLimits, NftDataStructsCollectionMode, NftDataStructsCollectionStats, NftDataStructsCreateItemData, NftDataStructsMetaUpdatePermission, NftDataStructsSchemaVersion, NftDataStructsSponsorshipState, NftDataStructsTokenId, PalletCommonAccountBasicCrossAccountIdRepr, PalletNonfungibleItemData, PalletRefungibleItemData, PalletUnqSchedulerCallSpec, PalletUnqSchedulerReleases, PalletUnqSchedulerScheduledV2 } from './nft';
import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundStatus, CumulusPalletXcmpQueueOutboundStatus, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV1AbridgedHostConfiguration, PolkadotPrimitivesV1PersistedValidationData } from './polkadot';
import type { BitVec, Bool, Bytes, Data, I128, I16, I256, I32, I64, I8, Json, Null, Raw, StorageKey, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types';
import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';
@@ -627,6 +627,7 @@
NftDataStructsCollectionId: NftDataStructsCollectionId;
NftDataStructsCollectionLimits: NftDataStructsCollectionLimits;
NftDataStructsCollectionMode: NftDataStructsCollectionMode;
+ NftDataStructsCollectionStats: NftDataStructsCollectionStats;
NftDataStructsCreateItemData: NftDataStructsCreateItemData;
NftDataStructsMetaUpdatePermission: NftDataStructsMetaUpdatePermission;
NftDataStructsSchemaVersion: NftDataStructsSchemaVersion;
tests/src/interfaces/nft/definitions.tsdiffbeforeafterboth--- a/tests/src/interfaces/nft/definitions.ts
+++ b/tests/src/interfaces/nft/definitions.ts
@@ -40,6 +40,9 @@
constMetadata: fun('Get token constant metadata', [collectionParam, tokenParam], 'Vec<u8>'),
variableMetadata: fun('Get token variable metadata', [collectionParam, tokenParam], 'Vec<u8>'),
tokenExists: fun('Check if token exists', [collectionParam, tokenParam], 'bool'),
+ collectionById: fun('Get collection by specified id', [collectionParam], 'Option<NftDataStructsCollection>'),
+ collectionStats: fun('Get collection stats', [], 'NftDataStructsCollectionStats'),
+ allowed: fun('Check if user is allowed to use collection', [collectionParam, crossAccountParam()], 'bool'),
},
types: {
PalletCommonAccountBasicCrossAccountIdRepr: {
@@ -64,6 +67,11 @@
constOnChainSchema: 'Vec<u8>',
metaUpdatePermission: 'NftDataStructsMetaUpdatePermission',
},
+ NftDataStructsCollectionStats: {
+ created: 'u32',
+ destroyed: 'u32',
+ alive: 'u32',
+ },
NftDataStructsCollectionId: 'u32',
NftDataStructsTokenId: 'u32',
PalletNonfungibleItemData: mkDummy('NftItemData'),
tests/src/interfaces/nft/types.tsdiffbeforeafterboth--- a/tests/src/interfaces/nft/types.ts
+++ b/tests/src/interfaces/nft/types.ts
@@ -48,6 +48,13 @@
readonly dummyCollectionMode: u32;
}
+/** @name NftDataStructsCollectionStats */
+export interface NftDataStructsCollectionStats extends Struct {
+ readonly created: u32;
+ readonly destroyed: u32;
+ readonly alive: u32;
+}
+
/** @name NftDataStructsCreateItemData */
export interface NftDataStructsCreateItemData extends Struct {
readonly dummyCreateItemData: u32;
tests/src/removeCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -8,7 +8,7 @@
import chaiAsPromised from 'chai-as-promised';
import privateKey from './substrate/privateKey';
import {default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync} from './substrate/substrate-api';
-import {createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId} from './util/helpers';
+import {createCollectionExpectSuccess, destroyCollectionExpectSuccess, getAdminList, normalizeAccountId, queryCollectionExpectSuccess} from './util/helpers';
chai.use(chaiAsPromised);
const expect = chai.expect;
@@ -19,7 +19,7 @@
const collectionId = await createCollectionExpectSuccess();
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.deep.eq(alice.address);
// first - add collection admin Bob
const addAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
@@ -43,7 +43,7 @@
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
const charlie = privateKey('//Charlie');
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
// first - add collection admin Bob
const addAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
tests/src/removeCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionSponsor.test.ts
+++ b/tests/src/removeCollectionSponsor.test.ts
@@ -18,6 +18,7 @@
removeCollectionSponsorExpectFailure,
normalizeAccountId,
addCollectionAdminExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
import {Keyring} from '@polkadot/api';
import {IKeyringPair} from '@polkadot/types/types';
@@ -98,7 +99,7 @@
// Find the collection that never existed
let collectionId = 0;
await usingApi(async (api) => {
- collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ collectionId = await getCreatedCollectionCount(api) + 1;
});
await removeCollectionSponsorExpectFailure(collectionId);
tests/src/removeFromAllowList.test.tsdiffbeforeafterboth--- a/tests/src/removeFromAllowList.test.ts
+++ b/tests/src/removeFromAllowList.test.ts
@@ -37,13 +37,13 @@
});
it('ensure bob is not in allowlist after removal', async () => {
- await usingApi(async () => {
+ await usingApi(async api => {
const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await enableAllowListExpectSuccess(alice, collectionId);
await addToAllowListExpectSuccess(alice, collectionId, bob.address);
await removeFromAllowListExpectSuccess(alice, collectionId, normalizeAccountId(bob.address));
- expect(await isAllowlisted(collectionId, bob.address)).to.be.false;
+ expect(await isAllowlisted(api, collectionId, bob.address)).to.be.false;
});
});
@@ -104,13 +104,13 @@
});
it('ensure address is not in allowlist after removal', async () => {
- await usingApi(async () => {
+ await usingApi(async api => {
const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await enableAllowListExpectSuccess(alice, collectionId);
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
await addToAllowListExpectSuccess(alice, collectionId, charlie.address);
await removeFromAllowListExpectSuccess(bob, collectionId, normalizeAccountId(charlie.address));
- expect(await isAllowlisted(collectionId, charlie.address)).to.be.false;
+ expect(await isAllowlisted(api, collectionId, charlie.address)).to.be.false;
});
});
tests/src/setCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionSponsor.test.ts
+++ b/tests/src/setCollectionSponsor.test.ts
@@ -11,6 +11,7 @@
destroyCollectionExpectSuccess,
setCollectionSponsorExpectFailure,
addCollectionAdminExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
import {Keyring} from '@polkadot/api';
import {IKeyringPair} from '@polkadot/types/types';
@@ -77,7 +78,7 @@
// Find the collection that never existed
let collectionId = 0;
await usingApi(async (api) => {
- collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ collectionId = await getCreatedCollectionCount(api) + 1;
});
await setCollectionSponsorExpectFailure(collectionId, bob.address);
tests/src/setConstOnChainSchema.test.tsdiffbeforeafterboth--- a/tests/src/setConstOnChainSchema.test.ts
+++ b/tests/src/setConstOnChainSchema.test.ts
@@ -12,6 +12,8 @@
createCollectionExpectSuccess,
destroyCollectionExpectSuccess,
addCollectionAdminExpectSuccess,
+ queryCollectionExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -37,7 +39,7 @@
it('Run extrinsic with parameters of the collection id, set the scheme', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
const setShema = api.tx.nft.setConstOnChainSchema(collectionId, shema);
await submitTransactionAsync(alice, setShema);
@@ -47,7 +49,7 @@
it('Collection admin can set the scheme', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
const setShema = api.tx.nft.setConstOnChainSchema(collectionId, shema);
@@ -60,7 +62,7 @@
const collectionId = await createCollectionExpectSuccess();
const setShema = api.tx.nft.setConstOnChainSchema(collectionId, shema);
await submitTransactionAsync(alice, setShema);
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.constOnChainSchema.toString()).to.be.eq(shema);
});
});
@@ -71,7 +73,7 @@
it('Set a non-existent collection', async () => {
await usingApi(async (api) => {
// tslint:disable-next-line: radix
- const collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ const collectionId = await getCreatedCollectionCount(api) + 1;
const setShema = api.tx.nft.setConstOnChainSchema(collectionId, shema);
await expect(submitTransactionExpectFailAsync(alice, setShema)).to.be.rejected;
});
@@ -97,7 +99,7 @@
it('Execute method not on behalf of the collection owner', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
const setShema = api.tx.nft.setConstOnChainSchema(collectionId, shema);
await expect(submitTransactionExpectFailAsync(bob, setShema)).to.be.rejected;
tests/src/setPublicAccessMode.test.tsdiffbeforeafterboth--- a/tests/src/setPublicAccessMode.test.ts
+++ b/tests/src/setPublicAccessMode.test.ts
@@ -19,6 +19,7 @@
enableAllowListExpectSuccess,
normalizeAccountId,
addCollectionAdminExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -60,7 +61,7 @@
it('Set a non-existent collection', async () => {
await usingApi(async (api: ApiPromise) => {
// tslint:disable-next-line: radix
- const collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ const collectionId = await getCreatedCollectionCount(api) + 1;
const tx = api.tx.nft.setPublicAccessMode(collectionId, 'AllowList');
await expect(submitTransactionExpectFailAsync(alice, tx)).to.be.rejected;
});
tests/src/setVariableOnChainSchema.test.tsdiffbeforeafterboth--- a/tests/src/setVariableOnChainSchema.test.ts
+++ b/tests/src/setVariableOnChainSchema.test.ts
@@ -12,6 +12,8 @@
createCollectionExpectSuccess,
destroyCollectionExpectSuccess,
addCollectionAdminExpectSuccess,
+ queryCollectionExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -37,7 +39,7 @@
it('Run extrinsic with parameters of the collection id, set the scheme', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, schema);
await submitTransactionAsync(alice, setSchema);
@@ -49,7 +51,7 @@
const collectionId = await createCollectionExpectSuccess();
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, schema);
await submitTransactionAsync(alice, setSchema);
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.variableOnChainSchema.toString()).to.be.eq(schema);
});
@@ -61,7 +63,7 @@
it('Run extrinsic with parameters of the collection id, set the scheme', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, schema);
@@ -75,7 +77,7 @@
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, schema);
await submitTransactionAsync(bob, setSchema);
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.variableOnChainSchema.toString()).to.be.eq(schema);
});
@@ -87,7 +89,7 @@
it('Set a non-existent collection', async () => {
await usingApi(async (api) => {
// tslint:disable-next-line: radix
- const collectionId = (await api.query.common.createdCollectionCount()).toNumber() + 1;
+ const collectionId = await getCreatedCollectionCount(api) + 1;
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, schema);
await expect(submitTransactionExpectFailAsync(alice, setSchema)).to.be.rejected;
});
@@ -113,7 +115,7 @@
it('Execute method not on behalf of the collection owner', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, schema);
await expect(submitTransactionExpectFailAsync(bob, setSchema)).to.be.rejected;
tests/src/transfer.test.tsdiffbeforeafterboth--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -19,6 +19,7 @@
transferExpectFailure,
transferExpectSuccess,
addCollectionAdminExpectSuccess,
+ getCreatedCollectionCount,
toSubstrateAddress,
getTokenOwner,
normalizeAccountId,
@@ -136,13 +137,13 @@
it('Transfer with not existed collection_id', async () => {
await usingApi(async (api) => {
// nft
- const nftCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();
+ const nftCollectionCount = await getCreatedCollectionCount(api);
await transferExpectFailure(nftCollectionCount + 1, 1, alice, bob, 1);
// fungible
- const fungibleCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();
+ const fungibleCollectionCount = await getCreatedCollectionCount(api);
await transferExpectFailure(fungibleCollectionCount + 1, 0, alice, bob, 1);
// reFungible
- const reFungibleCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();
+ const reFungibleCollectionCount = await getCreatedCollectionCount(api);
await transferExpectFailure(reFungibleCollectionCount + 1, 1, alice, bob, 1);
});
});
tests/src/transferFrom.test.tsdiffbeforeafterboth--- a/tests/src/transferFrom.test.ts
+++ b/tests/src/transferFrom.test.ts
@@ -19,6 +19,7 @@
transferFromExpectSuccess,
burnItemExpectSuccess,
setCollectionLimitsExpectSuccess,
+ getCreatedCollectionCount,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -109,18 +110,18 @@
it('transferFrom for a collection that does not exist', async () => {
await usingApi(async (api: ApiPromise) => {
// nft
- const nftCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();
+ const nftCollectionCount = await getCreatedCollectionCount(api);
await approveExpectFail(nftCollectionCount + 1, 1, alice, bob);
await transferFromExpectFail(nftCollectionCount + 1, 1, bob, alice, charlie, 1);
// fungible
- const fungibleCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();
+ const fungibleCollectionCount = await getCreatedCollectionCount(api);
await approveExpectFail(fungibleCollectionCount + 1, 0, alice, bob);
await transferFromExpectFail(fungibleCollectionCount + 1, 0, bob, alice, charlie, 1);
// reFungible
- const reFungibleCollectionCount = (await api.query.common.createdCollectionCount()).toNumber();
+ const reFungibleCollectionCount = await getCreatedCollectionCount(api);
await approveExpectFail(reFungibleCollectionCount + 1, 1, alice, bob);
await transferFromExpectFail(reFungibleCollectionCount + 1, 1, bob, alice, charlie, 1);
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -269,7 +269,7 @@
let collectionId = 0;
await usingApi(async (api) => {
// Get number of collections before the transaction
- const collectionCountBefore = (await api.query.common.createdCollectionCount()).toNumber();
+ const collectionCountBefore = await getCreatedCollectionCount(api);
// Run the CreateCollection transaction
const alicePrivateKey = privateKey('//Alice');
@@ -288,10 +288,10 @@
const result = getCreateCollectionResult(events);
// Get number of collections after the transaction
- const collectionCountAfter = (await api.query.common.createdCollectionCount()).toNumber();
+ const collectionCountAfter = await getCreatedCollectionCount(api);
// Get the collection
- const collection = (await api.query.common.collectionById(result.collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, result.collectionId);
// What to expect
// tslint:disable-next-line:no-unused-expression
@@ -325,7 +325,7 @@
await usingApi(async (api) => {
// Get number of collections before the transaction
- const collectionCountBefore = (await api.query.common.createdCollectionCount()).toNumber();
+ const collectionCountBefore = await getCreatedCollectionCount(api);
// Run the CreateCollection transaction
const alicePrivateKey = privateKey('//Alice');
@@ -334,7 +334,7 @@
const result = getCreateCollectionResult(events);
// Get number of collections after the transaction
- const collectionCountAfter = (await api.query.common.createdCollectionCount()).toNumber();
+ const collectionCountAfter = await getCreatedCollectionCount(api);
// What to expect
// tslint:disable-next-line:no-unused-expression
@@ -364,7 +364,7 @@
}
export async function findNotExistingCollection(api: ApiPromise): Promise<number> {
- const totalNumber = (await api.query.common.createdCollectionCount()).toNumber();
+ const totalNumber = await getCreatedCollectionCount(api);
const newCollection: number = totalNumber + 1;
return newCollection;
}
@@ -398,7 +398,7 @@
expect(result).to.be.true;
// What to expect
- expect((await api.query.common.collectionById(collectionId)).isNone).to.be.true;
+ expect(await getDetailedCollectionInfo(api, collectionId)).to.be.null;
});
}
@@ -432,7 +432,7 @@
const result = getGenericResult(events);
// Get the collection
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
// What to expect
expect(result.success).to.be.true;
@@ -452,7 +452,7 @@
const result = getGenericResult(events);
// Get the collection
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
// What to expect
expect(result.success).to.be.true;
@@ -490,7 +490,7 @@
const result = getGenericResult(events);
// Get the collection
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
// What to expect
expect(result.success).to.be.true;
@@ -1058,7 +1058,7 @@
const result = getGenericResult(events);
// Get the collection
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
// What to expect
// tslint:disable-next-line:no-unused-expression
@@ -1106,7 +1106,7 @@
expect(result.success).to.be.true;
// Get the collection
- const collection = (await api.query.common.collectionById(collectionId)).unwrap();
+ const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.mintMode.toHuman()).to.be.equal(enabled);
});
@@ -1138,15 +1138,13 @@
});
}
-export async function isAllowlisted(collectionId: number, address: string | CrossAccountId) {
- return await usingApi(async (api) => {
- return (await api.query.common.allowlist(collectionId, normalizeAccountId(address))).toJSON();
- });
+export async function isAllowlisted(api: ApiPromise, collectionId: number, address: string | CrossAccountId) {
+ return (await api.rpc.nft.allowed(collectionId, normalizeAccountId(address))).toJSON();
}
export async function addToAllowListExpectSuccess(sender: IKeyringPair, collectionId: number, address: string | AccountId | CrossAccountId) {
await usingApi(async (api) => {
- expect(await isAllowlisted(collectionId, normalizeAccountId(address))).to.be.false;
+ expect(await isAllowlisted(api, collectionId, normalizeAccountId(address))).to.be.false;
// Run the transaction
const tx = api.tx.nft.addToAllowList(collectionId, normalizeAccountId(address));
@@ -1154,14 +1152,14 @@
const result = getGenericResult(events);
expect(result.success).to.be.true;
- expect(await isAllowlisted(collectionId, normalizeAccountId(address))).to.be.true;
+ expect(await isAllowlisted(api, collectionId, normalizeAccountId(address))).to.be.true;
});
}
export async function addToAllowListAgainExpectSuccess(sender: IKeyringPair, collectionId: number, address: string | AccountId) {
await usingApi(async (api) => {
- expect(await isAllowlisted(collectionId, normalizeAccountId(address))).to.be.true;
+ expect(await isAllowlisted(api, collectionId, normalizeAccountId(address))).to.be.true;
// Run the transaction
const tx = api.tx.nft.addToAllowList(collectionId, normalizeAccountId(address));
@@ -1169,7 +1167,7 @@
const result = getGenericResult(events);
expect(result.success).to.be.true;
- expect(await isAllowlisted(collectionId, normalizeAccountId(address))).to.be.true;
+ expect(await isAllowlisted(api, collectionId, normalizeAccountId(address))).to.be.true;
});
}
@@ -1215,16 +1213,16 @@
export const getDetailedCollectionInfo = async (api: ApiPromise, collectionId: number)
: Promise<NftDataStructsCollection | null> => {
- return (await api.query.common.collectionById(collectionId)).unwrapOr(null);
+ return (await api.rpc.nft.collectionById(collectionId)).unwrapOr(null);
};
export const getCreatedCollectionCount = async (api: ApiPromise): Promise<number> => {
// set global object - collectionsCount
- return (await api.query.common.createdCollectionCount()).toNumber();
+ return (await api.rpc.nft.collectionStats()).created.toNumber();
};
export async function queryCollectionExpectSuccess(api: ApiPromise, collectionId: number): Promise<NftDataStructsCollection> {
- return (await api.query.common.collectionById(collectionId)).unwrap();
+ return (await api.rpc.nft.collectionById(collectionId)).unwrap();
}
export async function waitNewBlocks(blocksCount = 1): Promise<void> {