difftreelog
chore add check in `supports_metadata`
in: master
9 files changed
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -225,10 +225,6 @@
/// @return token's const_metadata
#[solidity(rename_selector = "tokenURI")]
fn token_uri(&self, token_id: uint256) -> Result<string> {
- if !self.supports_metadata() {
- return Ok("".into());
- }
-
let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
match get_token_property(self, token_id_u32, &key::url()).as_deref() {
@@ -714,13 +710,17 @@
impl<T: Config> NonfungibleHandle<T> {
pub fn supports_metadata(&self) -> bool {
- if let Some(erc721_metadata) =
+ let has_metadata_support_enabled = if let Some(erc721_metadata) =
pallet_common::Pallet::<T>::get_collection_property(self.id, &key::erc721_metadata())
{
*erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED
} else {
false
- }
+ };
+
+ let has_url_property_permissions = get_token_permission::<T>(self.id, &key::url()).is_ok();
+
+ has_metadata_support_enabled && has_url_property_permissions
}
}
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -108,7 +108,6 @@
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_common::{
Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,
- erc::static_property::{key, value},
eth::collection_id_to_address,
};
use pallet_structure::{Pallet as PalletStructure, Error as StructureError};
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -218,10 +218,6 @@
/// @return token's const_metadata
#[solidity(rename_selector = "tokenURI")]
fn token_uri(&self, token_id: uint256) -> Result<string> {
- if !self.supports_metadata() {
- return Ok("".into());
- }
-
let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
match get_token_property(self, token_id_u32, &key::url()).as_deref() {
@@ -770,13 +766,17 @@
impl<T: Config> RefungibleHandle<T> {
pub fn supports_metadata(&self) -> bool {
- if let Some(erc721_metadata) =
+ let has_metadata_support_enabled = if let Some(erc721_metadata) =
pallet_common::Pallet::<T>::get_collection_property(self.id, &key::erc721_metadata())
{
*erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED
} else {
false
- }
+ };
+
+ let has_url_property_permissions = get_token_permission::<T>(self.id, &key::url()).is_ok();
+
+ has_metadata_support_enabled && has_url_property_permissions
}
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -101,10 +101,7 @@
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_evm_coder_substrate::WithRecorder;
use pallet_common::{
- CommonCollectionOperations,
- erc::static_property::{key, value},
- Error as CommonError,
- eth::collection_id_to_address,
+ CommonCollectionOperations, Error as CommonError, eth::collection_id_to_address,
Event as CommonEvent, Pallet as PalletCommon,
};
use pallet_structure::Pallet as PalletStructure;
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -80,7 +80,23 @@
await usingEthPlaygrounds(async (helper, privateKey) => {
const donor = privateKey('//Alice');
const [alice] = await helper.arrange.createAccounts([10n], donor);
- ({collectionId: collection} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test', properties: [{key: 'ERC721Metadata', value: '1'}]}));
+ ({collectionId: collection} = await helper.nft.mintCollection(
+ alice,
+ {
+ name: 'test',
+ description: 'test',
+ tokenPrefix: 'test',
+ properties: [{key: 'ERC721Metadata', value: '1'}],
+ tokenPropertyPermissions: [{
+ key: 'URI',
+ permission: {
+ mutable: true,
+ collectionAdmin: true,
+ tokenOwner: false,
+ },
+ }],
+ },
+ ));
minter = helper.eth.createAccount();
});
});
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -67,7 +67,15 @@
itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const collection = await helper.nft.mintCollection(donor, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
+ const tokenPropertyPermissions = [{
+ key: 'URI',
+ permission: {
+ mutable: true,
+ collectionAdmin: true,
+ tokenOwner: false,
+ },
+ }];
+ const collection = await helper.nft.mintCollection(donor, {name: 'col', description: 'descr', tokenPrefix: 'COL', tokenPropertyPermissions});
await collection.addAdmin(donor, {Ethereum: caller});
const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);
@@ -83,7 +91,15 @@
itEth.ifWithPallets('ERC721Metadata property can be set for RFT collection', [Pallets.ReFungible], async({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const collection = await helper.rft.mintCollection(donor, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
+ const tokenPropertyPermissions = [{
+ key: 'URI',
+ permission: {
+ mutable: true,
+ collectionAdmin: true,
+ tokenOwner: false,
+ },
+ }];
+ const collection = await helper.rft.mintCollection(donor, {name: 'col', description: 'descr', tokenPrefix: 'COL', tokenPropertyPermissions});
await collection.addAdmin(donor, {Ethereum: caller});
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -501,7 +501,23 @@
itEth('Returns collection name', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE', properties: [{key: 'ERC721Metadata', value: '1'}]});
+ const tokenPropertyPermissions = [{
+ key: 'URI',
+ permission: {
+ mutable: true,
+ collectionAdmin: true,
+ tokenOwner: false,
+ },
+ }];
+ const collection = await helper.nft.mintCollection(
+ alice,
+ {
+ name: 'oh River',
+ tokenPrefix: 'CHANGE',
+ properties: [{key: 'ERC721Metadata', value: '1'}],
+ tokenPropertyPermissions,
+ },
+ );
const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);
const name = await contract.methods.name().call();
@@ -510,7 +526,23 @@
itEth('Returns symbol name', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE', properties: [{key: 'ERC721Metadata', value: '1'}]});
+ const tokenPropertyPermissions = [{
+ key: 'URI',
+ permission: {
+ mutable: true,
+ collectionAdmin: true,
+ tokenOwner: false,
+ },
+ }];
+ const collection = await helper.nft.mintCollection(
+ alice,
+ {
+ name: 'oh River',
+ tokenPrefix: 'CHANGE',
+ properties: [{key: 'ERC721Metadata', value: '1'}],
+ tokenPropertyPermissions,
+ },
+ );
const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);
const symbol = await contract.methods.symbol().call();
tests/src/eth/reFungible.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 {Pallets, requirePalletsOrSkip} from '../util/playgrounds';18import {expect, itEth, usingEthPlaygrounds} from './util/playgrounds';19import {IKeyringPair} from '@polkadot/types/types';2021describe('Refungible: Information getting', () => {22 let donor: IKeyringPair;2324 before(async function() {25 await usingEthPlaygrounds(async (helper, privateKey) => {26 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);2728 donor = privateKey('//Alice');29 });30 });3132 itEth('totalSupply', async ({helper}) => {33 const caller = await helper.eth.createAccountWithBalance(donor);34 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'TotalSupply', '6', '6');35 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);36 const nextTokenId = await contract.methods.nextTokenId().call();37 await contract.methods.mint(caller, nextTokenId).send();38 const totalSupply = await contract.methods.totalSupply().call();39 expect(totalSupply).to.equal('1');40 });4142 itEth('balanceOf', async ({helper}) => {43 const caller = await helper.eth.createAccountWithBalance(donor);44 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'BalanceOf', '6', '6');45 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);4647 {48 const nextTokenId = await contract.methods.nextTokenId().call();49 await contract.methods.mint(caller, nextTokenId).send();50 }51 {52 const nextTokenId = await contract.methods.nextTokenId().call();53 await contract.methods.mint(caller, nextTokenId).send();54 }55 {56 const nextTokenId = await contract.methods.nextTokenId().call();57 await contract.methods.mint(caller, nextTokenId).send();58 }5960 const balance = await contract.methods.balanceOf(caller).call();61 expect(balance).to.equal('3');62 });6364 itEth('ownerOf', async ({helper}) => {65 const caller = await helper.eth.createAccountWithBalance(donor);66 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf', '6', '6');67 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);6869 const tokenId = await contract.methods.nextTokenId().call();70 await contract.methods.mint(caller, tokenId).send();7172 const owner = await contract.methods.ownerOf(tokenId).call();73 expect(owner).to.equal(caller);74 });7576 itEth('ownerOf after burn', async ({helper}) => {77 const caller = await helper.eth.createAccountWithBalance(donor);78 const receiver = helper.eth.createAccount();79 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf-AfterBurn', '6', '6');80 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);8182 const tokenId = await contract.methods.nextTokenId().call();83 await contract.methods.mint(caller, tokenId).send();84 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);8586 await tokenContract.methods.repartition(2).send();87 await tokenContract.methods.transfer(receiver, 1).send();8889 await tokenContract.methods.burnFrom(caller, 1).send();9091 const owner = await contract.methods.ownerOf(tokenId).call();92 expect(owner).to.equal(receiver);93 });9495 itEth('ownerOf for partial ownership', async ({helper}) => {96 const caller = await helper.eth.createAccountWithBalance(donor);97 const receiver = helper.eth.createAccount();98 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Partial-OwnerOf', '6', '6');99 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);100101 const tokenId = await contract.methods.nextTokenId().call();102 await contract.methods.mint(caller, tokenId).send();103 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);104105 await tokenContract.methods.repartition(2).send();106 await tokenContract.methods.transfer(receiver, 1).send();107108 const owner = await contract.methods.ownerOf(tokenId).call();109 expect(owner).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');110 });111});112113describe('Refungible: Plain calls', () => {114 let donor: IKeyringPair;115116 before(async function() {117 await usingEthPlaygrounds(async (helper, privateKey) => {118 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);119120 donor = privateKey('//Alice');121 });122 });123124 itEth('Can perform mint()', async ({helper}) => {125 const owner = await helper.eth.createAccountWithBalance(donor);126 const receiver = helper.eth.createAccount();127 const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Minty', '6', '6', '');128 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);129 130 const nextTokenId = await contract.methods.nextTokenId().call();131 expect(nextTokenId).to.be.equal('1');132 const result = await contract.methods.mintWithTokenURI(133 receiver,134 nextTokenId,135 'Test URI',136 ).send();137138 const event = result.events.Transfer;139 expect(event.address).to.equal(collectionAddress);140 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');141 expect(event.returnValues.to).to.equal(receiver);142 expect(event.returnValues.tokenId).to.equal(nextTokenId);143144 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');145 });146147 itEth('Can perform mintBulk()', async ({helper}) => {148 const owner = await helper.eth.createAccountWithBalance(donor);149 const receiver = helper.eth.createAccount();150 const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'MintBulky', '6', '6', '');151 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);152153 {154 const nextTokenId = await contract.methods.nextTokenId().call();155 expect(nextTokenId).to.be.equal('1');156 const result = await contract.methods.mintBulkWithTokenURI(157 receiver,158 [159 [nextTokenId, 'Test URI 0'],160 [+nextTokenId + 1, 'Test URI 1'],161 [+nextTokenId + 2, 'Test URI 2'],162 ],163 ).send();164165 const events = result.events.Transfer;166 for (let i = 0; i < 2; i++) {167 const event = events[i];168 expect(event.address).to.equal(collectionAddress);169 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');170 expect(event.returnValues.to).to.equal(receiver);171 expect(event.returnValues.tokenId).to.equal(String(+nextTokenId + i));172 }173174 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');175 expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');176 expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');177 }178 });179180 itEth('Can perform burn()', async ({helper}) => {181 const caller = await helper.eth.createAccountWithBalance(donor);182 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Burny', '6', '6');183 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);184185 const tokenId = await contract.methods.nextTokenId().call();186 await contract.methods.mint(caller, tokenId).send();187 {188 const result = await contract.methods.burn(tokenId).send();189 const event = result.events.Transfer;190 expect(event.address).to.equal(collectionAddress);191 expect(event.returnValues.from).to.equal(caller);192 expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');193 expect(event.returnValues.tokenId).to.equal(tokenId.toString());194 }195 });196197 itEth('Can perform transferFrom()', async ({helper}) => {198 const caller = await helper.eth.createAccountWithBalance(donor);199 const receiver = helper.eth.createAccount();200 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'TransferFromy', '6', '6');201 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);202203 const tokenId = await contract.methods.nextTokenId().call();204 const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);205 await contract.methods.mint(caller, tokenId).send();206207 const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, caller);208 await tokenContract.methods.repartition(15).send();209210 {211 const tokenEvents: any = [];212 tokenContract.events.allEvents((_: any, event: any) => {213 tokenEvents.push(event);214 });215 const result = await contract.methods.transferFrom(caller, receiver, tokenId).send();216217 let event = result.events.Transfer;218 expect(event.address).to.equal(collectionAddress);219 expect(event.returnValues.from).to.equal(caller);220 expect(event.returnValues.to).to.equal(receiver);221 expect(event.returnValues.tokenId).to.equal(tokenId.toString());222223 event = tokenEvents[0];224 expect(event.address).to.equal(tokenAddress);225 expect(event.returnValues.from).to.equal(caller);226 expect(event.returnValues.to).to.equal(receiver);227 expect(event.returnValues.value).to.equal('15');228 }229230 {231 const balance = await contract.methods.balanceOf(receiver).call();232 expect(+balance).to.equal(1);233 }234235 {236 const balance = await contract.methods.balanceOf(caller).call();237 expect(+balance).to.equal(0);238 }239 });240241 itEth('Can perform transfer()', async ({helper}) => {242 const caller = await helper.eth.createAccountWithBalance(donor);243 const receiver = helper.eth.createAccount();244 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry', '6', '6');245 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);246247 const tokenId = await contract.methods.nextTokenId().call();248 await contract.methods.mint(caller, tokenId).send();249250 {251 const result = await contract.methods.transfer(receiver, tokenId).send();252 253 const event = result.events.Transfer;254 expect(event.address).to.equal(collectionAddress);255 expect(event.returnValues.from).to.equal(caller);256 expect(event.returnValues.to).to.equal(receiver);257 expect(event.returnValues.tokenId).to.equal(tokenId.toString());258 }259260 {261 const balance = await contract.methods.balanceOf(caller).call();262 expect(+balance).to.equal(0);263 }264265 {266 const balance = await contract.methods.balanceOf(receiver).call();267 expect(+balance).to.equal(1);268 }269 });270271 itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {272 const caller = await helper.eth.createAccountWithBalance(donor);273 const receiver = helper.eth.createAccount();274 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Partial-to-Full', '6', '6');275 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);276277 const tokenId = await contract.methods.nextTokenId().call();278 await contract.methods.mint(caller, tokenId).send();279280 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);281282 await tokenContract.methods.repartition(2).send();283 await tokenContract.methods.transfer(receiver, 1).send();284285 const events: any = [];286 contract.events.allEvents((_: any, event: any) => {287 events.push(event);288 });289 await tokenContract.methods.transfer(receiver, 1).send();290291 const event = events[0];292 expect(event.address).to.equal(collectionAddress);293 expect(event.returnValues.from).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');294 expect(event.returnValues.to).to.equal(receiver);295 expect(event.returnValues.tokenId).to.equal(tokenId.toString());296 });297298 itEth('transfer event on transfer from full ownership to partial ownership', async ({helper}) => {299 const caller = await helper.eth.createAccountWithBalance(donor);300 const receiver = helper.eth.createAccount();301 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Full-to-Partial', '6', '6');302 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);303304 const tokenId = await contract.methods.nextTokenId().call();305 await contract.methods.mint(caller, tokenId).send();306307 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);308309 await tokenContract.methods.repartition(2).send();310311 const events: any = [];312 contract.events.allEvents((_: any, event: any) => {313 events.push(event);314 });315 await tokenContract.methods.transfer(receiver, 1).send();316317 const event = events[0];318 expect(event.address).to.equal(collectionAddress);319 expect(event.returnValues.from).to.equal(caller);320 expect(event.returnValues.to).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');321 expect(event.returnValues.tokenId).to.equal(tokenId.toString());322 });323});324325describe('RFT: Fees', () => {326 let donor: IKeyringPair;327328 before(async function() {329 await usingEthPlaygrounds(async (helper, privateKey) => {330 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);331332 donor = privateKey('//Alice');333 });334 });335336 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {337 const caller = await helper.eth.createAccountWithBalance(donor);338 const receiver = helper.eth.createAccount();339 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer-From', '6', '6');340 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);341342 const tokenId = await contract.methods.nextTokenId().call();343 await contract.methods.mint(caller, tokenId).send();344345 const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transferFrom(caller, receiver, tokenId).send());346 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));347 expect(cost > 0n);348 });349350 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {351 const caller = await helper.eth.createAccountWithBalance(donor);352 const receiver = helper.eth.createAccount();353 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer', '6', '6');354 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);355356 const tokenId = await contract.methods.nextTokenId().call();357 await contract.methods.mint(caller, tokenId).send();358359 const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transfer(receiver, tokenId).send());360 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));361 expect(cost > 0n);362 });363});364365describe('Common metadata', () => {366 let donor: IKeyringPair;367 let alice: IKeyringPair;368369 before(async function() {370 await usingEthPlaygrounds(async (helper, privateKey) => {371 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);372373 donor = privateKey('//Alice');374 [alice] = await helper.arrange.createAccounts([20n], donor);375 });376 });377378 itEth('Returns collection name', async ({helper}) => {379 const caller = helper.eth.createAccount();380 const collection = await helper.rft.mintCollection(alice, {name: 'Leviathan', tokenPrefix: '11', properties: [{key: 'ERC721Metadata', value: '1'}]});381 382 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'rft', caller);383 const name = await contract.methods.name().call();384 expect(name).to.equal('Leviathan');385 });386387 itEth('Returns symbol name', async ({helper}) => {388 const caller = await helper.eth.createAccountWithBalance(donor);389 const {collectionId} = await helper.rft.mintCollection(alice, {name: 'Leviathan', tokenPrefix: '12', properties: [{key: 'ERC721Metadata', value: '1'}]});390 const contract = helper.ethNativeContract.collectionById(collectionId, 'rft', caller);391 const symbol = await contract.methods.symbol().call();392 expect(symbol).to.equal('12');393 });394});1// 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 {Pallets, requirePalletsOrSkip} from '../util/playgrounds';18import {expect, itEth, usingEthPlaygrounds} from './util/playgrounds';19import {IKeyringPair} from '@polkadot/types/types';2021describe('Refungible: Information getting', () => {22 let donor: IKeyringPair;2324 before(async function() {25 await usingEthPlaygrounds(async (helper, privateKey) => {26 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);2728 donor = privateKey('//Alice');29 });30 });3132 itEth('totalSupply', async ({helper}) => {33 const caller = await helper.eth.createAccountWithBalance(donor);34 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'TotalSupply', '6', '6');35 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);36 const nextTokenId = await contract.methods.nextTokenId().call();37 await contract.methods.mint(caller, nextTokenId).send();38 const totalSupply = await contract.methods.totalSupply().call();39 expect(totalSupply).to.equal('1');40 });4142 itEth('balanceOf', async ({helper}) => {43 const caller = await helper.eth.createAccountWithBalance(donor);44 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'BalanceOf', '6', '6');45 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);4647 {48 const nextTokenId = await contract.methods.nextTokenId().call();49 await contract.methods.mint(caller, nextTokenId).send();50 }51 {52 const nextTokenId = await contract.methods.nextTokenId().call();53 await contract.methods.mint(caller, nextTokenId).send();54 }55 {56 const nextTokenId = await contract.methods.nextTokenId().call();57 await contract.methods.mint(caller, nextTokenId).send();58 }5960 const balance = await contract.methods.balanceOf(caller).call();61 expect(balance).to.equal('3');62 });6364 itEth('ownerOf', async ({helper}) => {65 const caller = await helper.eth.createAccountWithBalance(donor);66 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf', '6', '6');67 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);6869 const tokenId = await contract.methods.nextTokenId().call();70 await contract.methods.mint(caller, tokenId).send();7172 const owner = await contract.methods.ownerOf(tokenId).call();73 expect(owner).to.equal(caller);74 });7576 itEth('ownerOf after burn', async ({helper}) => {77 const caller = await helper.eth.createAccountWithBalance(donor);78 const receiver = helper.eth.createAccount();79 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf-AfterBurn', '6', '6');80 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);8182 const tokenId = await contract.methods.nextTokenId().call();83 await contract.methods.mint(caller, tokenId).send();84 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);8586 await tokenContract.methods.repartition(2).send();87 await tokenContract.methods.transfer(receiver, 1).send();8889 await tokenContract.methods.burnFrom(caller, 1).send();9091 const owner = await contract.methods.ownerOf(tokenId).call();92 expect(owner).to.equal(receiver);93 });9495 itEth('ownerOf for partial ownership', async ({helper}) => {96 const caller = await helper.eth.createAccountWithBalance(donor);97 const receiver = helper.eth.createAccount();98 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Partial-OwnerOf', '6', '6');99 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);100101 const tokenId = await contract.methods.nextTokenId().call();102 await contract.methods.mint(caller, tokenId).send();103 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);104105 await tokenContract.methods.repartition(2).send();106 await tokenContract.methods.transfer(receiver, 1).send();107108 const owner = await contract.methods.ownerOf(tokenId).call();109 expect(owner).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');110 });111});112113describe('Refungible: Plain calls', () => {114 let donor: IKeyringPair;115116 before(async function() {117 await usingEthPlaygrounds(async (helper, privateKey) => {118 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);119120 donor = privateKey('//Alice');121 });122 });123124 itEth('Can perform mint()', async ({helper}) => {125 const owner = await helper.eth.createAccountWithBalance(donor);126 const receiver = helper.eth.createAccount();127 const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Minty', '6', '6', '');128 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);129 130 const nextTokenId = await contract.methods.nextTokenId().call();131 expect(nextTokenId).to.be.equal('1');132 const result = await contract.methods.mintWithTokenURI(133 receiver,134 nextTokenId,135 'Test URI',136 ).send();137138 const event = result.events.Transfer;139 expect(event.address).to.equal(collectionAddress);140 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');141 expect(event.returnValues.to).to.equal(receiver);142 expect(event.returnValues.tokenId).to.equal(nextTokenId);143144 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');145 });146147 itEth('Can perform mintBulk()', async ({helper}) => {148 const owner = await helper.eth.createAccountWithBalance(donor);149 const receiver = helper.eth.createAccount();150 const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'MintBulky', '6', '6', '');151 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);152153 {154 const nextTokenId = await contract.methods.nextTokenId().call();155 expect(nextTokenId).to.be.equal('1');156 const result = await contract.methods.mintBulkWithTokenURI(157 receiver,158 [159 [nextTokenId, 'Test URI 0'],160 [+nextTokenId + 1, 'Test URI 1'],161 [+nextTokenId + 2, 'Test URI 2'],162 ],163 ).send();164165 const events = result.events.Transfer;166 for (let i = 0; i < 2; i++) {167 const event = events[i];168 expect(event.address).to.equal(collectionAddress);169 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');170 expect(event.returnValues.to).to.equal(receiver);171 expect(event.returnValues.tokenId).to.equal(String(+nextTokenId + i));172 }173174 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');175 expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');176 expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');177 }178 });179180 itEth('Can perform burn()', async ({helper}) => {181 const caller = await helper.eth.createAccountWithBalance(donor);182 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Burny', '6', '6');183 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);184185 const tokenId = await contract.methods.nextTokenId().call();186 await contract.methods.mint(caller, tokenId).send();187 {188 const result = await contract.methods.burn(tokenId).send();189 const event = result.events.Transfer;190 expect(event.address).to.equal(collectionAddress);191 expect(event.returnValues.from).to.equal(caller);192 expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');193 expect(event.returnValues.tokenId).to.equal(tokenId.toString());194 }195 });196197 itEth('Can perform transferFrom()', async ({helper}) => {198 const caller = await helper.eth.createAccountWithBalance(donor);199 const receiver = helper.eth.createAccount();200 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'TransferFromy', '6', '6');201 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);202203 const tokenId = await contract.methods.nextTokenId().call();204 const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);205 await contract.methods.mint(caller, tokenId).send();206207 const tokenContract = helper.ethNativeContract.rftToken(tokenAddress, caller);208 await tokenContract.methods.repartition(15).send();209210 {211 const tokenEvents: any = [];212 tokenContract.events.allEvents((_: any, event: any) => {213 tokenEvents.push(event);214 });215 const result = await contract.methods.transferFrom(caller, receiver, tokenId).send();216217 let event = result.events.Transfer;218 expect(event.address).to.equal(collectionAddress);219 expect(event.returnValues.from).to.equal(caller);220 expect(event.returnValues.to).to.equal(receiver);221 expect(event.returnValues.tokenId).to.equal(tokenId.toString());222223 event = tokenEvents[0];224 expect(event.address).to.equal(tokenAddress);225 expect(event.returnValues.from).to.equal(caller);226 expect(event.returnValues.to).to.equal(receiver);227 expect(event.returnValues.value).to.equal('15');228 }229230 {231 const balance = await contract.methods.balanceOf(receiver).call();232 expect(+balance).to.equal(1);233 }234235 {236 const balance = await contract.methods.balanceOf(caller).call();237 expect(+balance).to.equal(0);238 }239 });240241 itEth('Can perform transfer()', async ({helper}) => {242 const caller = await helper.eth.createAccountWithBalance(donor);243 const receiver = helper.eth.createAccount();244 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry', '6', '6');245 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);246247 const tokenId = await contract.methods.nextTokenId().call();248 await contract.methods.mint(caller, tokenId).send();249250 {251 const result = await contract.methods.transfer(receiver, tokenId).send();252 253 const event = result.events.Transfer;254 expect(event.address).to.equal(collectionAddress);255 expect(event.returnValues.from).to.equal(caller);256 expect(event.returnValues.to).to.equal(receiver);257 expect(event.returnValues.tokenId).to.equal(tokenId.toString());258 }259260 {261 const balance = await contract.methods.balanceOf(caller).call();262 expect(+balance).to.equal(0);263 }264265 {266 const balance = await contract.methods.balanceOf(receiver).call();267 expect(+balance).to.equal(1);268 }269 });270271 itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {272 const caller = await helper.eth.createAccountWithBalance(donor);273 const receiver = helper.eth.createAccount();274 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Partial-to-Full', '6', '6');275 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);276277 const tokenId = await contract.methods.nextTokenId().call();278 await contract.methods.mint(caller, tokenId).send();279280 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);281282 await tokenContract.methods.repartition(2).send();283 await tokenContract.methods.transfer(receiver, 1).send();284285 const events: any = [];286 contract.events.allEvents((_: any, event: any) => {287 events.push(event);288 });289 await tokenContract.methods.transfer(receiver, 1).send();290291 const event = events[0];292 expect(event.address).to.equal(collectionAddress);293 expect(event.returnValues.from).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');294 expect(event.returnValues.to).to.equal(receiver);295 expect(event.returnValues.tokenId).to.equal(tokenId.toString());296 });297298 itEth('transfer event on transfer from full ownership to partial ownership', async ({helper}) => {299 const caller = await helper.eth.createAccountWithBalance(donor);300 const receiver = helper.eth.createAccount();301 const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Full-to-Partial', '6', '6');302 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);303304 const tokenId = await contract.methods.nextTokenId().call();305 await contract.methods.mint(caller, tokenId).send();306307 const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);308309 await tokenContract.methods.repartition(2).send();310311 const events: any = [];312 contract.events.allEvents((_: any, event: any) => {313 events.push(event);314 });315 await tokenContract.methods.transfer(receiver, 1).send();316317 const event = events[0];318 expect(event.address).to.equal(collectionAddress);319 expect(event.returnValues.from).to.equal(caller);320 expect(event.returnValues.to).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');321 expect(event.returnValues.tokenId).to.equal(tokenId.toString());322 });323});324325describe('RFT: Fees', () => {326 let donor: IKeyringPair;327328 before(async function() {329 await usingEthPlaygrounds(async (helper, privateKey) => {330 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);331332 donor = privateKey('//Alice');333 });334 });335336 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {337 const caller = await helper.eth.createAccountWithBalance(donor);338 const receiver = helper.eth.createAccount();339 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer-From', '6', '6');340 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);341342 const tokenId = await contract.methods.nextTokenId().call();343 await contract.methods.mint(caller, tokenId).send();344345 const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transferFrom(caller, receiver, tokenId).send());346 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));347 expect(cost > 0n);348 });349350 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {351 const caller = await helper.eth.createAccountWithBalance(donor);352 const receiver = helper.eth.createAccount();353 const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer', '6', '6');354 const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);355356 const tokenId = await contract.methods.nextTokenId().call();357 await contract.methods.mint(caller, tokenId).send();358359 const cost = await helper.eth.recordCallFee(caller, () => contract.methods.transfer(receiver, tokenId).send());360 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));361 expect(cost > 0n);362 });363});364365describe('Common metadata', () => {366 let donor: IKeyringPair;367 let alice: IKeyringPair;368369 before(async function() {370 await usingEthPlaygrounds(async (helper, privateKey) => {371 requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);372373 donor = privateKey('//Alice');374 [alice] = await helper.arrange.createAccounts([20n], donor);375 });376 });377378 itEth('Returns collection name', async ({helper}) => {379 const caller = helper.eth.createAccount();380 const tokenPropertyPermissions = [{381 key: 'URI',382 permission: {383 mutable: true,384 collectionAdmin: true,385 tokenOwner: false,386 },387 }];388 const collection = await helper.rft.mintCollection(389 alice,390 {391 name: 'Leviathan',392 tokenPrefix: '11',393 properties: [{key: 'ERC721Metadata', value: '1'}],394 tokenPropertyPermissions,395 },396 );397 398 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'rft', caller);399 const name = await contract.methods.name().call();400 expect(name).to.equal('Leviathan');401 });402403 itEth('Returns symbol name', async ({helper}) => {404 const caller = await helper.eth.createAccountWithBalance(donor);405 const tokenPropertyPermissions = [{406 key: 'URI',407 permission: {408 mutable: true,409 collectionAdmin: true,410 tokenOwner: false,411 },412 }];413 const {collectionId} = await helper.rft.mintCollection(414 alice,415 {416 name: 'Leviathan',417 tokenPrefix: '12',418 properties: [{key: 'ERC721Metadata', value: '1'}],419 tokenPropertyPermissions,420 },421 );422423 const contract = helper.ethNativeContract.collectionById(collectionId, 'rft', caller);424 const symbol = await contract.methods.symbol().call();425 expect(symbol).to.equal('12');426 });427});tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -213,7 +213,7 @@
async createERC721MetadataCompatibleRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
-
+
const result = await collectionHelper.methods.createERC721MetadataCompatibleRFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);