difftreelog
refactor remove meta update permission
in: master
11 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -22,7 +22,7 @@
use pallet_evm::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},
- ensure, fail,
+ ensure,
traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},
BoundedVec,
weights::Pays,
@@ -30,7 +30,7 @@
use pallet_evm::GasWeightMapping;
use up_data_structs::{
COLLECTION_NUMBER_LIMIT, Collection, RpcCollection, CollectionId, CreateItemData,
- MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId,
+ MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, TokenId,
CollectionStats, MAX_TOKEN_OWNERSHIP, CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT,
FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT,
CUSTOM_DATA_LIMIT, CollectionLimits, CreateCollectionData, SponsorshipState,
@@ -134,21 +134,6 @@
<Error<T>>::AddressNotInAllowlist
);
Ok(())
- }
-
- pub fn check_can_update_meta(
- &self,
- subject: &T::CrossAccountId,
- item_owner: &T::CrossAccountId,
- ) -> DispatchResult {
- match self.meta_update_permission {
- MetaUpdatePermission::ItemOwner => {
- ensure!(subject == item_owner, <Error<T>>::NoPermission);
- Ok(())
- }
- MetaUpdatePermission::Admin => self.check_is_owner_or_admin(subject),
- MetaUpdatePermission::None => fail!(<Error<T>>::NoPermission),
- }
}
}
@@ -565,7 +550,6 @@
schema_version,
sponsorship,
limits,
- meta_update_permission,
} = <CollectionById<T>>::get(collection)?;
let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)
@@ -595,7 +579,6 @@
schema_version,
sponsorship,
limits,
- meta_update_permission,
offchain_schema: <CollectionData<T>>::get((
collection,
CollectionField::OffchainSchema,
@@ -656,7 +639,6 @@
.limits
.map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))
.unwrap_or_else(|| Ok(CollectionLimits::default()))?,
- meta_update_permission: data.meta_update_permission.unwrap_or_default(),
};
let mut collection_properties = up_data_structs::CollectionProperties::get();
pallets/unique/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -168,9 +168,4 @@
nesting_rule: None,
};
}: set_collection_limits(RawOrigin::Signed(caller.clone()), collection, cl)
-
- set_meta_update_permission_flag {
- let caller: T::AccountId = account("caller", 0, SEED);
- let collection = create_nft_collection::<T>(caller.clone())?;
- }: _(RawOrigin::Signed(caller.clone()), collection, MetaUpdatePermission::Admin)
}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -38,12 +38,12 @@
CONST_ON_CHAIN_SCHEMA_LIMIT, OFFCHAIN_SCHEMA_LIMIT,
MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
AccessMode, CreateItemData, CollectionLimits, CollectionId, CollectionMode, TokenId,
- SchemaVersion, SponsorshipState, MetaUpdatePermission, CreateCollectionData,
+ SchemaVersion, SponsorshipState, CreateCollectionData,
CreateItemExData, budget, CollectionField, Property, PropertyKey, PropertyKeyPermission,
};
use pallet_evm::account::CrossAccountId;
use pallet_common::{
- CollectionHandle, Pallet as PalletCommon, Error as CommonError, CommonWeightInfo,
+ CollectionHandle, Pallet as PalletCommon, CommonWeightInfo,
dispatch::dispatch_call, dispatch::CollectionDispatch,
};
@@ -925,34 +925,6 @@
let budget = budget::Value::new(2);
dispatch_call::<T, _>(collection_id, |d| d.transfer_from(sender, from, recipient, item_id, value, &budget))
- }
-
- /// Set meta_update_permission value for particular collection
- ///
- /// # Permissions
- ///
- /// * Collection Owner.
- ///
- /// # Arguments
- ///
- /// * collection_id: ID of the collection.
- ///
- /// * value: New flag value.
- #[weight = <SelfWeightOf<T>>::set_meta_update_permission_flag()]
- #[transactional]
- pub fn set_meta_update_permission_flag(origin, collection_id: CollectionId, value: MetaUpdatePermission) -> DispatchResult {
- let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
- let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
-
- ensure!(
- target_collection.meta_update_permission != MetaUpdatePermission::None,
- <CommonError<T>>::MetadataFlagFrozen,
- );
- target_collection.check_is_owner(&sender)?;
-
- target_collection.meta_update_permission = value;
-
- target_collection.save()
}
/// Set schema standard
pallets/unique/src/weights.rsdiffbeforeafterboth--- a/pallets/unique/src/weights.rs
+++ b/pallets/unique/src/weights.rs
@@ -49,7 +49,6 @@
fn set_const_on_chain_schema(b: u32, ) -> Weight;
fn set_schema_version() -> Weight;
fn set_collection_limits() -> Weight;
- fn set_meta_update_permission_flag() -> Weight;
}
/// Weights for pallet_unique using the Substrate node and recommended hardware.
@@ -167,12 +166,6 @@
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_limits() -> Weight {
(15_339_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_meta_update_permission_flag() -> Weight {
- (7_214_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -292,12 +285,6 @@
// Storage: Common CollectionById (r:1 w:1)
fn set_collection_limits() -> Weight {
(15_339_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
- }
- // Storage: Common CollectionById (r:1 w:1)
- fn set_meta_update_permission_flag() -> Weight {
- (7_214_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -308,6 +308,7 @@
#[version(..2)]
pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,
+ #[version(..2)]
pub meta_update_permission: MetaUpdatePermission,
}
@@ -327,7 +328,6 @@
pub sponsorship: SponsorshipState<AccountId>,
pub limits: CollectionLimits,
pub const_on_chain_schema: Vec<u8>,
- pub meta_update_permission: MetaUpdatePermission,
pub token_property_permissions: Vec<PropertyKeyPermission>,
pub properties: Vec<Property>,
}
@@ -353,7 +353,6 @@
pub pending_sponsor: Option<AccountId>,
pub limits: Option<CollectionLimits>,
pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,
- pub meta_update_permission: Option<MetaUpdatePermission>,
pub token_property_permissions: CollectionPropertiesPermissionsVec,
pub properties: CollectionPropertiesVec,
}
@@ -493,17 +492,10 @@
}
#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub enum MetaUpdatePermission {
ItemOwner,
Admin,
None,
-}
-
-impl Default for MetaUpdatePermission {
- fn default() -> Self {
- Self::ItemOwner
- }
}
#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -18,7 +18,7 @@
use crate::{Test, TestCrossAccountId, CollectionCreationPrice, Origin, Unique, new_test_ext};
use up_data_structs::{
COLLECTION_NUMBER_LIMIT, CollectionId, CreateItemData, CreateFungibleData, CreateNftData,
- CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission,
+ CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT,
TokenId, MAX_TOKEN_OWNERSHIP, CreateCollectionData, CollectionField, SchemaVersion,
CollectionMode, AccessMode,
};
@@ -2467,32 +2467,6 @@
assert_eq!(
<pallet_nonfungible::AccountBalance<Test>>::get((collection_id, account(2))),
1
- );
- });
-}
-
-#[test]
-fn set_variable_meta_flag_after_freeze() {
- new_test_ext().execute_with(|| {
- // default_limits();
-
- let collection_id =
- create_test_collection_for_owner(&CollectionMode::NFT, 2, CollectionId(1));
-
- let origin2 = Origin::signed(2);
-
- assert_ok!(Unique::set_meta_update_permission_flag(
- origin2.clone(),
- collection_id,
- MetaUpdatePermission::None,
- ));
- assert_noop!(
- Unique::set_meta_update_permission_flag(
- origin2.clone(),
- collection_id,
- MetaUpdatePermission::Admin
- ),
- CommonError::<Test>::MetadataFlagFrozen
);
});
}
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -74,7 +74,6 @@
accountTokenOwnershipLimit: 3,
},
constOnChainSchema: '0x333333',
- metaUpdatePermission: 'Admin',
});
const events = await submitTransactionAsync(alice, tx);
const result = getCreateCollectionResult(events);
@@ -91,7 +90,6 @@
expect(collection.sponsorship.asUnconfirmed.toString()).to.equal(bob.address);
expect(collection.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.equal(3);
expect(collection.constOnChainSchema.toString()).to.equal('0x333333');
- expect(collection.metaUpdatePermission.isAdmin).to.be.true;
});
});
});
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import privateKey from '../substrate/privateKey';18import {approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE, setMetadataUpdatePermissionFlagExpectSuccess} from '../util/helpers';19import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';20import nonFungibleAbi from './nonFungibleAbi.json';21import {expect} from 'chai';22import {submitTransactionAsync} from '../substrate/substrate-api';2324describe('NFT: Information getting', () => {25 itWeb3('totalSupply', async ({api, web3}) => {26 const collection = await createCollectionExpectSuccess({27 mode: {type: 'NFT'},28 });29 const alice = privateKey('//Alice');30 const caller = await createEthAccountWithBalance(api, web3);3132 await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});3334 const address = collectionIdToAddress(collection);35 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});36 const totalSupply = await contract.methods.totalSupply().call();3738 expect(totalSupply).to.equal('1');39 });4041 itWeb3('balanceOf', async ({api, web3}) => {42 const collection = await createCollectionExpectSuccess({43 mode: {type: 'NFT'},44 });45 const alice = privateKey('//Alice');4647 const caller = await createEthAccountWithBalance(api, web3);48 await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum:caller});49 await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});50 await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});5152 const address = collectionIdToAddress(collection);53 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});54 const balance = await contract.methods.balanceOf(caller).call();5556 expect(balance).to.equal('3');57 });5859 itWeb3('ownerOf', async ({api, web3}) => {60 const collection = await createCollectionExpectSuccess({61 mode: {type: 'NFT'},62 });63 const alice = privateKey('//Alice');6465 const caller = await createEthAccountWithBalance(api, web3);66 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});6768 const address = collectionIdToAddress(collection);69 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});70 const owner = await contract.methods.ownerOf(tokenId).call();7172 expect(owner).to.equal(caller);73 });74});7576describe('NFT: Plain calls', () => {77 itWeb3('Can perform mint()', async ({web3, api}) => {78 const collection = await createCollectionExpectSuccess({79 mode: {type: 'NFT'},80 });81 const alice = privateKey('//Alice');8283 const caller = await createEthAccountWithBalance(api, web3);84 const changeAdminTx = api.tx.unique.addCollectionAdmin(collection, {Ethereum: caller});85 await submitTransactionAsync(alice, changeAdminTx);86 const receiver = createEthAccount(web3);8788 const address = collectionIdToAddress(collection);89 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});9091 {92 const nextTokenId = await contract.methods.nextTokenId().call();93 expect(nextTokenId).to.be.equal('1');94 const result = await contract.methods.mintWithTokenURI(95 receiver,96 nextTokenId,97 'Test URI',98 ).send({from: caller});99 const events = normalizeEvents(result.events);100101 expect(events).to.be.deep.equal([102 {103 address,104 event: 'Transfer',105 args: {106 from: '0x0000000000000000000000000000000000000000',107 to: receiver,108 tokenId: nextTokenId,109 },110 },111 ]);112113 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');114 }115 });116 itWeb3('Can perform mintBulk()', async ({web3, api}) => {117 const collection = await createCollectionExpectSuccess({118 mode: {type: 'NFT'},119 });120 const alice = privateKey('//Alice');121122 const caller = await createEthAccountWithBalance(api, web3);123 const changeAdminTx = api.tx.unique.addCollectionAdmin(collection, {Ethereum: caller});124 await submitTransactionAsync(alice, changeAdminTx);125 const receiver = createEthAccount(web3);126127 const address = collectionIdToAddress(collection);128 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});129130 {131 const nextTokenId = await contract.methods.nextTokenId().call();132 expect(nextTokenId).to.be.equal('1');133 const result = await contract.methods.mintBulkWithTokenURI(134 receiver,135 [136 [nextTokenId, 'Test URI 0'],137 [+nextTokenId + 1, 'Test URI 1'],138 [+nextTokenId + 2, 'Test URI 2'],139 ],140 ).send({from: caller});141 const events = normalizeEvents(result.events);142143 expect(events).to.be.deep.equal([144 {145 address,146 event: 'Transfer',147 args: {148 from: '0x0000000000000000000000000000000000000000',149 to: receiver,150 tokenId: nextTokenId,151 },152 },153 {154 address,155 event: 'Transfer',156 args: {157 from: '0x0000000000000000000000000000000000000000',158 to: receiver,159 tokenId: String(+nextTokenId + 1),160 },161 },162 {163 address,164 event: 'Transfer',165 args: {166 from: '0x0000000000000000000000000000000000000000',167 to: receiver,168 tokenId: String(+nextTokenId + 2),169 },170 },171 ]);172173 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');174 expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');175 expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');176 }177 });178179 itWeb3('Can perform burn()', async ({web3, api}) => {180 const collection = await createCollectionExpectSuccess({181 mode: {type: 'NFT'},182 });183 const alice = privateKey('//Alice');184185 const owner = await createEthAccountWithBalance(api, web3);186187 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});188189 const address = collectionIdToAddress(collection);190 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});191192 {193 const result = await contract.methods.burn(tokenId).send({from: owner});194 const events = normalizeEvents(result.events);195196 expect(events).to.be.deep.equal([197 {198 address,199 event: 'Transfer',200 args: {201 from: owner,202 to: '0x0000000000000000000000000000000000000000',203 tokenId: tokenId.toString(),204 },205 },206 ]);207 }208 });209210 itWeb3('Can perform approve()', async ({web3, api}) => {211 const collection = await createCollectionExpectSuccess({212 mode: {type: 'NFT'},213 });214 const alice = privateKey('//Alice');215216 const owner = createEthAccount(web3);217 await transferBalanceToEth(api, alice, owner);218219 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});220221 const spender = createEthAccount(web3);222223 const address = collectionIdToAddress(collection);224 const contract = new web3.eth.Contract(nonFungibleAbi as any, address);225226 {227 const result = await contract.methods.approve(spender, tokenId).send({from: owner, ...GAS_ARGS});228 const events = normalizeEvents(result.events);229230 expect(events).to.be.deep.equal([231 {232 address,233 event: 'Approval',234 args: {235 owner,236 approved: spender,237 tokenId: tokenId.toString(),238 },239 },240 ]);241 }242 });243244 itWeb3('Can perform transferFrom()', async ({web3, api}) => {245 const collection = await createCollectionExpectSuccess({246 mode: {type: 'NFT'},247 });248 const alice = privateKey('//Alice');249250 const owner = createEthAccount(web3);251 await transferBalanceToEth(api, alice, owner);252253 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});254255 const spender = createEthAccount(web3);256 await transferBalanceToEth(api, alice, spender);257258 const receiver = createEthAccount(web3);259260 const address = collectionIdToAddress(collection);261 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});262263 await contract.methods.approve(spender, tokenId).send({from: owner});264265 {266 const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});267 const events = normalizeEvents(result.events);268 expect(events).to.be.deep.equal([269 {270 address,271 event: 'Transfer',272 args: {273 from: owner,274 to: receiver,275 tokenId: tokenId.toString(),276 },277 },278 ]);279 }280281 {282 const balance = await contract.methods.balanceOf(receiver).call();283 expect(+balance).to.equal(1);284 }285286 {287 const balance = await contract.methods.balanceOf(owner).call();288 expect(+balance).to.equal(0);289 }290 });291292 itWeb3('Can perform transfer()', async ({web3, api}) => {293 const collection = await createCollectionExpectSuccess({294 mode: {type: 'NFT'},295 });296 const alice = privateKey('//Alice');297298 const owner = createEthAccount(web3);299 await transferBalanceToEth(api, alice, owner);300301 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});302303 const receiver = createEthAccount(web3);304 await transferBalanceToEth(api, alice, receiver);305306 const address = collectionIdToAddress(collection);307 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});308309 {310 const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});311 const events = normalizeEvents(result.events);312 expect(events).to.be.deep.equal([313 {314 address,315 event: 'Transfer',316 args: {317 from: owner,318 to: receiver,319 tokenId: tokenId.toString(),320 },321 },322 ]);323 }324325 {326 const balance = await contract.methods.balanceOf(owner).call();327 expect(+balance).to.equal(0);328 }329330 {331 const balance = await contract.methods.balanceOf(receiver).call();332 expect(+balance).to.equal(1);333 }334 });335});336337describe('NFT: Fees', () => {338 itWeb3('approve() call fee is less than 0.2UNQ', async ({web3, api}) => {339 const collection = await createCollectionExpectSuccess({340 mode: {type: 'NFT'},341 });342 const alice = privateKey('//Alice');343344 const owner = await createEthAccountWithBalance(api, web3);345 const spender = createEthAccount(web3);346347 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});348349 const address = collectionIdToAddress(collection);350 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});351352 const cost = await recordEthFee(api, owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));353 expect(cost < BigInt(0.2 * Number(UNIQUE)));354 });355356 itWeb3('transferFrom() call fee is less than 0.2UNQ', async ({web3, api}) => {357 const collection = await createCollectionExpectSuccess({358 mode: {type: 'NFT'},359 });360 const alice = privateKey('//Alice');361362 const owner = await createEthAccountWithBalance(api, web3);363 const spender = await createEthAccountWithBalance(api, web3);364365 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});366367 const address = collectionIdToAddress(collection);368 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});369370 await contract.methods.approve(spender, tokenId).send({from: owner});371372 const cost = await recordEthFee(api, spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));373 expect(cost < BigInt(0.2 * Number(UNIQUE)));374 });375376 itWeb3('transfer() call fee is less than 0.2UNQ', async ({web3, api}) => {377 const collection = await createCollectionExpectSuccess({378 mode: {type: 'NFT'},379 });380 const alice = privateKey('//Alice');381382 const owner = await createEthAccountWithBalance(api, web3);383 const receiver = createEthAccount(web3);384385 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});386387 const address = collectionIdToAddress(collection);388 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});389390 const cost = await recordEthFee(api, owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));391 expect(cost < BigInt(0.2 * Number(UNIQUE)));392 });393});394395describe('NFT: Substrate calls', () => {396 itWeb3('Events emitted for mint()', async ({web3}) => {397 const collection = await createCollectionExpectSuccess({398 mode: {type: 'NFT'},399 });400 const alice = privateKey('//Alice');401402 const address = collectionIdToAddress(collection);403 const contract = new web3.eth.Contract(nonFungibleAbi as any, address);404405 let tokenId: number;406 const events = await recordEvents(contract, async () => {407 tokenId = await createItemExpectSuccess(alice, collection, 'NFT');408 });409410 expect(events).to.be.deep.equal([411 {412 address,413 event: 'Transfer',414 args: {415 from: '0x0000000000000000000000000000000000000000',416 to: subToEth(alice.address),417 tokenId: tokenId!.toString(),418 },419 },420 ]);421 });422423 itWeb3('Events emitted for burn()', async ({web3}) => {424 const collection = await createCollectionExpectSuccess({425 mode: {type: 'NFT'},426 });427 const alice = privateKey('//Alice');428429 const address = collectionIdToAddress(collection);430 const contract = new web3.eth.Contract(nonFungibleAbi as any, address);431432 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');433 const events = await recordEvents(contract, async () => {434 await burnItemExpectSuccess(alice, collection, tokenId);435 });436437 expect(events).to.be.deep.equal([438 {439 address,440 event: 'Transfer',441 args: {442 from: subToEth(alice.address),443 to: '0x0000000000000000000000000000000000000000',444 tokenId: tokenId.toString(),445 },446 },447 ]);448 });449450 itWeb3('Events emitted for approve()', async ({web3}) => {451 const collection = await createCollectionExpectSuccess({452 mode: {type: 'NFT'},453 });454 const alice = privateKey('//Alice');455456 const receiver = createEthAccount(web3);457458 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');459460 const address = collectionIdToAddress(collection);461 const contract = new web3.eth.Contract(nonFungibleAbi as any, address);462463 const events = await recordEvents(contract, async () => {464 await approveExpectSuccess(collection, tokenId, alice, {Ethereum: receiver}, 1);465 });466467 expect(events).to.be.deep.equal([468 {469 address,470 event: 'Approval',471 args: {472 owner: subToEth(alice.address),473 approved: receiver,474 tokenId: tokenId.toString(),475 },476 },477 ]);478 });479480 itWeb3('Events emitted for transferFrom()', async ({web3}) => {481 const collection = await createCollectionExpectSuccess({482 mode: {type: 'NFT'},483 });484 const alice = privateKey('//Alice');485 const bob = privateKey('//Bob');486487 const receiver = createEthAccount(web3);488489 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');490 await approveExpectSuccess(collection, tokenId, alice, bob.address, 1);491492 const address = collectionIdToAddress(collection);493 const contract = new web3.eth.Contract(nonFungibleAbi as any, address);494495 const events = await recordEvents(contract, async () => {496 await transferFromExpectSuccess(collection, tokenId, bob, alice, {Ethereum: receiver}, 1, 'NFT');497 });498499 expect(events).to.be.deep.equal([500 {501 address,502 event: 'Transfer',503 args: {504 from: subToEth(alice.address),505 to: receiver,506 tokenId: tokenId.toString(),507 },508 },509 ]);510 });511512 itWeb3('Events emitted for transfer()', async ({web3}) => {513 const collection = await createCollectionExpectSuccess({514 mode: {type: 'NFT'},515 });516 const alice = privateKey('//Alice');517518 const receiver = createEthAccount(web3);519520 const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');521522 const address = collectionIdToAddress(collection);523 const contract = new web3.eth.Contract(nonFungibleAbi as any, address);524525 const events = await recordEvents(contract, async () => {526 await transferExpectSuccess(collection, tokenId, alice, {Ethereum: receiver}, 1, 'NFT');527 });528529 expect(events).to.be.deep.equal([530 {531 address,532 event: 'Transfer',533 args: {534 from: subToEth(alice.address),535 to: receiver,536 tokenId: tokenId.toString(),537 },538 },539 ]);540 });541});tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -15,7 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
import privateKey from '../../substrate/privateKey';
-import {createCollectionExpectSuccess, createItemExpectSuccess, setMetadataUpdatePermissionFlagExpectSuccess} from '../../util/helpers';
+import {createCollectionExpectSuccess, createItemExpectSuccess} from '../../util/helpers';
import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents} from '../util/helpers';
import nonFungibleAbi from '../nonFungibleAbi.json';
import {expect} from 'chai';
tests/src/nesting/migration-check.test.tsdiffbeforeafterboth--- a/tests/src/nesting/migration-check.test.ts
+++ b/tests/src/nesting/migration-check.test.ts
@@ -37,7 +37,6 @@
accountTokenOwnershipLimit: 3,
},
constOnChainSchema: '0x333333',
- metaUpdatePermission: 'Admin',
});
const events = await submitTransactionAsync(alice, tx);
const result = getCreateCollectionResult(events);
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -650,28 +650,6 @@
});
}
-export async function setMetadataUpdatePermissionFlagExpectSuccess(sender: IKeyringPair, collectionId: number, flag: string) {
-
- await usingApi(async (api) => {
- const tx = api.tx.unique.setMetaUpdatePermissionFlag(collectionId, flag as any);
- const events = await submitTransactionAsync(sender, tx);
- const result = getGenericResult(events);
-
- expect(result.success).to.be.true;
- });
-}
-
-export async function setMetadataUpdatePermissionFlagExpectFailure(sender: IKeyringPair, collectionId: number, flag: string) {
-
- await usingApi(async (api) => {
- const tx = api.tx.unique.setMetaUpdatePermissionFlag(collectionId, flag as any);
- const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
- const result = getGenericResult(events);
-
- expect(result.success).to.be.false;
- });
-}
-
export async function enableContractSponsoringExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, enable: boolean) {
await usingApi(async (api) => {
const tx = api.tx.unique.enableContractSponsoring(contractAddress, enable);