difftreelog
feat updates for createERC721MetadataCompatibleCollections
in: master
13 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -665,6 +665,11 @@
property_key_from_bytes(b"schemaName").expect(EXPECT_CONVERT_ERROR)
}
+ /// Key "schemaVersion".
+ pub fn schema_version() -> up_data_structs::PropertyKey {
+ property_key_from_bytes(b"schemaVersion").expect(EXPECT_CONVERT_ERROR)
+ }
+
/// Key "baseURI".
pub fn base_uri() -> up_data_structs::PropertyKey {
property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)
@@ -672,12 +677,12 @@
/// Key "url".
pub fn url() -> up_data_structs::PropertyKey {
- property_key_from_bytes(b"url").expect(EXPECT_CONVERT_ERROR)
+ property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)
}
/// Key "suffix".
pub fn suffix() -> up_data_structs::PropertyKey {
- property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)
+ property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)
}
/// Key "parentNft".
@@ -685,7 +690,7 @@
property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)
}
- /// Key "parentNft".
+ /// Key "ERC721Metadata".
pub fn erc721_metadata() -> up_data_structs::PropertyKey {
property_key_from_bytes(b"ERC721Metadata").expect(EXPECT_CONVERT_ERROR)
}
@@ -695,6 +700,9 @@
pub mod value {
use super::*;
+ /// Value "Schema version".
+ pub const SCHEMA_VERSION: &[u8] = b"1.0.0";
+
/// Value "ERC721Metadata".
pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";
@@ -709,7 +717,12 @@
property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)
}
- /// Value for [`ERC721_METADATA`].
+ /// Value for [`SCHEMA_VERSION`].
+ pub fn schema_version() -> up_data_structs::PropertyValue {
+ property_value_from_bytes(SCHEMA_VERSION).expect(EXPECT_CONVERT_ERROR)
+ }
+
+ /// Value for [`ERC721_METADATA_SUPPORTED`].
pub fn erc721_metadata_supported() -> up_data_structs::PropertyValue {
property_value_from_bytes(ERC721_METADATA_SUPPORTED).expect(EXPECT_CONVERT_ERROR)
}
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -116,7 +116,18 @@
.try_push(up_data_structs::PropertyKeyPermission {
key: key::suffix(),
permission: up_data_structs::PropertyPermission {
- mutable: false,
+ mutable: true,
+ collection_admin: true,
+ token_owner: false,
+ },
+ })
+ .map_err(|e| Error::Revert(format!("{:?}", e)))?;
+
+ token_property_permissions
+ .try_push(up_data_structs::PropertyKeyPermission {
+ key: key::url(),
+ permission: up_data_structs::PropertyPermission {
+ mutable: true,
collection_admin: true,
token_owner: false,
},
@@ -129,6 +140,13 @@
value: property_value::erc721(),
})
.map_err(|e| Error::Revert(format!("{:?}", e)))?;
+
+ properties
+ .try_push(up_data_structs::Property {
+ key: key::schema_version(),
+ value: property_value::schema_version(),
+ })
+ .map_err(|e| Error::Revert(format!("{:?}", e)))?;
properties
.try_push(up_data_structs::Property {
@@ -266,7 +284,7 @@
}
#[weight(<SelfWeightOf<T>>::create_collection())]
- #[solidity(rename_selector = "createERC721MetadataNFTCollection")]
+ #[solidity(rename_selector = "createERC721MetadataCompatibleNFTCollection")]
fn create_nonfungible_collection_with_properties(
&mut self,
caller: caller,
@@ -339,7 +357,7 @@
}
#[weight(<SelfWeightOf<T>>::create_collection())]
- #[solidity(rename_selector = "createERC721MetadataRFTCollection")]
+ #[solidity(rename_selector = "createERC721MetadataCompatibleRFTCollection")]
fn create_refungible_collection_with_properties(
&mut self,
caller: caller,
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -23,7 +23,7 @@
}
/// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0xf62c7aa9
+/// @dev the ERC-165 identifier for this interface is 0x95eb98f4
contract CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
/// Create an NFT collection
/// @param name Name of the collection
@@ -65,9 +65,9 @@
return 0x0000000000000000000000000000000000000000;
}
- /// @dev EVM selector for this function is: 0xd1df968c,
- /// or in textual repr: createERC721MetadataNFTCollection(string,string,string,string)
- function createERC721MetadataNFTCollection(
+ /// @dev EVM selector for this function is: 0xa9e7b5c0,
+ /// or in textual repr: createERC721MetadataCompatibleNFTCollection(string,string,string,string)
+ function createERC721MetadataCompatibleNFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
@@ -112,9 +112,9 @@
return 0x0000000000000000000000000000000000000000;
}
- /// @dev EVM selector for this function is: 0xbea6a299,
- /// or in textual repr: createERC721MetadataRFTCollection(string,string,string,string)
- function createERC721MetadataRFTCollection(
+ /// @dev EVM selector for this function is: 0xa5596388,
+ /// or in textual repr: createERC721MetadataCompatibleRFTCollection(string,string,string,string)
+ function createERC721MetadataCompatibleRFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
tests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/CollectionHelpers.sol
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -18,7 +18,7 @@
}
/// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0xf62c7aa9
+/// @dev the ERC-165 identifier for this interface is 0x95eb98f4
interface CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
/// Create an NFT collection
/// @param name Name of the collection
@@ -46,9 +46,9 @@
string memory tokenPrefix
) external payable returns (address);
- /// @dev EVM selector for this function is: 0xd1df968c,
- /// or in textual repr: createERC721MetadataNFTCollection(string,string,string,string)
- function createERC721MetadataNFTCollection(
+ /// @dev EVM selector for this function is: 0xa9e7b5c0,
+ /// or in textual repr: createERC721MetadataCompatibleNFTCollection(string,string,string,string)
+ function createERC721MetadataCompatibleNFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
@@ -71,9 +71,9 @@
string memory tokenPrefix
) external payable returns (address);
- /// @dev EVM selector for this function is: 0xbea6a299,
- /// or in textual repr: createERC721MetadataRFTCollection(string,string,string,string)
- function createERC721MetadataRFTCollection(
+ /// @dev EVM selector for this function is: 0xa5596388,
+ /// or in textual repr: createERC721MetadataCompatibleRFTCollection(string,string,string,string)
+ function createERC721MetadataCompatibleRFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
tests/src/eth/collectionHelpersAbi.jsondiffbeforeafterboth--- a/tests/src/eth/collectionHelpersAbi.json
+++ b/tests/src/eth/collectionHelpersAbi.json
@@ -32,7 +32,7 @@
{ "internalType": "string", "name": "tokenPrefix", "type": "string" },
{ "internalType": "string", "name": "baseUri", "type": "string" }
],
- "name": "createERC721MetadataNFTCollection",
+ "name": "createERC721MetadataCompatibleNFTCollection",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "payable",
"type": "function"
@@ -44,7 +44,7 @@
{ "internalType": "string", "name": "tokenPrefix", "type": "string" },
{ "internalType": "string", "name": "baseUri", "type": "string" }
],
- "name": "createERC721MetadataRFTCollection",
+ "name": "createERC721MetadataCompatibleRFTCollection",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "payable",
"type": "function"
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -14,7 +14,7 @@
itEth('Can be set', async({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test'});
+ const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: []});
await collection.addAdmin(alice, {Ethereum: caller});
const address = helper.ethAddress.fromCollectionId(collection.collectionId);
@@ -24,7 +24,7 @@
const raw = (await collection.getData())?.raw;
- expect(raw.properties[1].value).to.equal('testValue');
+ expect(raw.properties[0].value).to.equal('testValue');
});
itEth('Can be deleted', async({helper}) => {
tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -97,7 +97,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
+ let result = await collectionHelpers.methods.createERC721MetadataCompatibleNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const collectionId = helper.ethAddress.extractCollectionId(collectionIdAddress);
const collection = helper.nft.getCollectionObject(collectionId);
@@ -167,7 +167,7 @@
// itWeb3('Sponsoring collection from substrate address via access list', async ({api, web3, privateKeyWrapper}) => {
// const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
// const collectionHelpers = evmCollectionHelpers(web3, owner);
- // const result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send();
+ // const result = await collectionHelpers.methods.createERC721MetadataCompatibleNFTCollection('Sponsor collection', '1', '1', '').send();
// const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
// const sponsor = privateKeyWrapper('//Alice');
// const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
@@ -223,7 +223,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
+ let result = await collectionHelpers.methods.createERC721MetadataCompatibleNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const collectionId = helper.ethAddress.extractCollectionId(collectionIdAddress);
const collection = helper.nft.getCollectionObject(collectionId);
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 {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util/playgrounds';18import {IKeyringPair} from '@polkadot/types/types';19import {Contract} from 'web3-eth-contract';202122describe('NFT: Information getting', () => {23 let donor: IKeyringPair;24 let alice: IKeyringPair;2526 before(async function() {27 await usingEthPlaygrounds(async (helper, privateKey) => {28 donor = privateKey('//Alice');29 [alice] = await helper.arrange.createAccounts([10n], donor);30 });31 });32 33 itEth('totalSupply', async ({helper}) => {34 const collection = await helper.nft.mintCollection(alice, {});35 await collection.mintToken(alice);3637 const caller = await helper.eth.createAccountWithBalance(donor);3839 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);40 const totalSupply = await contract.methods.totalSupply().call();4142 expect(totalSupply).to.equal('1');43 });4445 itEth('balanceOf', async ({helper}) => {46 const collection = await helper.nft.mintCollection(alice, {});47 const caller = await helper.eth.createAccountWithBalance(donor);4849 await collection.mintToken(alice, {Ethereum: caller});50 await collection.mintToken(alice, {Ethereum: caller});51 await collection.mintToken(alice, {Ethereum: caller});5253 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);54 const balance = await contract.methods.balanceOf(caller).call();5556 expect(balance).to.equal('3');57 });5859 itEth('ownerOf', async ({helper}) => {60 const collection = await helper.nft.mintCollection(alice, {});61 const caller = await helper.eth.createAccountWithBalance(donor);6263 const token = await collection.mintToken(alice, {Ethereum: caller});6465 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);6667 const owner = await contract.methods.ownerOf(token.tokenId).call();6869 expect(owner).to.equal(caller);70 });71});7273describe('Check ERC721 token URI for NFT', () => {74 let donor: IKeyringPair;7576 before(async function() {77 await usingEthPlaygrounds(async (_helper, privateKey) => {78 donor = privateKey('//Alice');79 });80 });8182 async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {83 const owner = await helper.eth.createAccountWithBalance(donor);84 const receiver = helper.eth.createAccount();8586 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);87 let result = await collectionHelper.methods.createERC721MetadataNFTCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});88 const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);89 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);90 91 const nextTokenId = await contract.methods.nextTokenId().call();92 expect(nextTokenId).to.be.equal('1');93 result = await contract.methods.mint(94 receiver,95 nextTokenId,96 ).send();9798 if (propertyKey && propertyValue) {99 // Set URL or suffix100 await contract.methods.setProperty(nextTokenId, propertyKey, Buffer.from(propertyValue)).send();101 }102103 const event = result.events.Transfer;104 expect(event.address).to.be.equal(collectionAddress);105 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');106 expect(event.returnValues.to).to.be.equal(receiver);107 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);108109 return {contract, nextTokenId};110 }111112 itEth('Empty tokenURI', async ({helper}) => {113 const {contract, nextTokenId} = await setup(helper, '');114 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');115 });116117 itEth('TokenURI from url', async ({helper}) => {118 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');119 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');120 });121122 itEth('TokenURI from baseURI + tokenId', async ({helper}) => {123 const {contract, nextTokenId} = await setup(helper, 'BaseURI_');124 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);125 });126127 itEth('TokenURI from baseURI + suffix', async ({helper}) => {128 const suffix = '/some/suffix';129 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);130 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);131 });132});133134describe('NFT: Plain calls', () => {135 let donor: IKeyringPair;136 let alice: IKeyringPair;137138 before(async function() {139 await usingEthPlaygrounds(async (helper, privateKey) => {140 donor = privateKey('//Alice');141 [alice] = await helper.arrange.createAccounts([10n], donor);142 });143 });144145 itEth('Can perform mint()', async ({helper}) => {146 const owner = await helper.eth.createAccountWithBalance(donor);147 const receiver = helper.eth.createAccount();148149 const {collectionAddress} = await helper.eth.createERC721MetadataNFTCollection(owner, 'Mint collection', '6', '6', '');150 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);151 const nextTokenId = await contract.methods.nextTokenId().call();152153 expect(nextTokenId).to.be.equal('1');154 const result = await contract.methods.mintWithTokenURI(155 receiver,156 nextTokenId,157 'Test URI',158 ).send();159160 const event = result.events.Transfer;161 expect(event.address).to.be.equal(collectionAddress);162 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');163 expect(event.returnValues.to).to.be.equal(receiver);164 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);165166 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');167168 // TODO: this wont work right now, need release 919000 first169 // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();170 // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();171 // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);172 });173174 //TODO: CORE-302 add eth methods175 itEth.skip('Can perform mintBulk()', async ({helper}) => {176 const caller = await helper.eth.createAccountWithBalance(donor);177 const receiver = helper.eth.createAccount();178179 const collection = await helper.nft.mintCollection(alice);180 await collection.addAdmin(alice, {Ethereum: caller});181182 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);183 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);184 {185 const bulkSize = 3;186 const nextTokenId = await contract.methods.nextTokenId().call();187 expect(nextTokenId).to.be.equal('1');188 const result = await contract.methods.mintBulkWithTokenURI(189 receiver,190 Array.from({length: bulkSize}, (_, i) => (191 [+nextTokenId + i, `Test URI ${i}`]192 )),193 ).send({from: caller});194195 const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.tokenId - b.returnValues.tokenId);196 for (let i = 0; i < bulkSize; i++) {197 const event = events[i];198 expect(event.address).to.equal(collectionAddress);199 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');200 expect(event.returnValues.to).to.equal(receiver);201 expect(event.returnValues.tokenId).to.equal(`${+nextTokenId+i}`);202203 expect(await contract.methods.tokenURI(+nextTokenId + i).call()).to.be.equal(`Test URI ${i}`);204 }205 }206 });207208 itEth('Can perform burn()', async ({helper}) => {209 const caller = await helper.eth.createAccountWithBalance(donor);210211 const collection = await helper.nft.mintCollection(alice, {});212 const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});213214 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);215 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);216217 {218 const result = await contract.methods.burn(tokenId).send({from: caller});219 220 const event = result.events.Transfer;221 expect(event.address).to.be.equal(collectionAddress);222 expect(event.returnValues.from).to.be.equal(caller);223 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');224 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);225 }226 });227228 itEth('Can perform approve()', async ({helper}) => {229 const owner = await helper.eth.createAccountWithBalance(donor);230 const spender = helper.eth.createAccount();231232 const collection = await helper.nft.mintCollection(alice, {});233 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});234235 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);236 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);237238 {239 const result = await contract.methods.approve(spender, tokenId).send({from: owner});240241 const event = result.events.Approval;242 expect(event.address).to.be.equal(collectionAddress);243 expect(event.returnValues.owner).to.be.equal(owner);244 expect(event.returnValues.approved).to.be.equal(spender);245 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);246 }247 });248249 itEth('Can perform transferFrom()', async ({helper}) => {250 const owner = await helper.eth.createAccountWithBalance(donor);251 const spender = await helper.eth.createAccountWithBalance(donor);252 const receiver = helper.eth.createAccount();253254 const collection = await helper.nft.mintCollection(alice, {});255 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});256257 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);258 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);259260 await contract.methods.approve(spender, tokenId).send({from: owner});261262 {263 const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});264265 const event = result.events.Transfer;266 expect(event.address).to.be.equal(collectionAddress);267 expect(event.returnValues.from).to.be.equal(owner);268 expect(event.returnValues.to).to.be.equal(receiver);269 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);270 }271272 {273 const balance = await contract.methods.balanceOf(receiver).call();274 expect(+balance).to.equal(1);275 }276277 {278 const balance = await contract.methods.balanceOf(owner).call();279 expect(+balance).to.equal(0);280 }281 });282283 itEth('Can perform transfer()', async ({helper}) => {284 const collection = await helper.nft.mintCollection(alice, {});285 const owner = await helper.eth.createAccountWithBalance(donor);286 const receiver = helper.eth.createAccount();287288 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});289290 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);291 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);292293 {294 const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});295296 const event = result.events.Transfer;297 expect(event.address).to.be.equal(collectionAddress);298 expect(event.returnValues.from).to.be.equal(owner);299 expect(event.returnValues.to).to.be.equal(receiver);300 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);301 }302303 {304 const balance = await contract.methods.balanceOf(owner).call();305 expect(+balance).to.equal(0);306 }307308 {309 const balance = await contract.methods.balanceOf(receiver).call();310 expect(+balance).to.equal(1);311 }312 });313});314315describe('NFT: Fees', () => {316 let donor: IKeyringPair;317 let alice: IKeyringPair;318319 before(async function() {320 await usingEthPlaygrounds(async (helper, privateKey) => {321 donor = privateKey('//Alice');322 [alice] = await helper.arrange.createAccounts([10n], donor);323 });324 });325 326 itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {327 const owner = await helper.eth.createAccountWithBalance(donor);328 const spender = helper.eth.createAccount();329330 const collection = await helper.nft.mintCollection(alice, {});331 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});332333 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);334335 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));336 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));337 });338339 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {340 const owner = await helper.eth.createAccountWithBalance(donor);341 const spender = await helper.eth.createAccountWithBalance(donor);342343 const collection = await helper.nft.mintCollection(alice, {});344 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});345346 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);347348 await contract.methods.approve(spender, tokenId).send({from: owner});349350 const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));351 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));352 });353354 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {355 const owner = await helper.eth.createAccountWithBalance(donor);356 const receiver = helper.eth.createAccount();357358 const collection = await helper.nft.mintCollection(alice, {});359 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});360361 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);362363 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));364 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));365 });366});367368describe('NFT: Substrate calls', () => {369 let donor: IKeyringPair;370 let alice: IKeyringPair;371372 before(async function() {373 await usingEthPlaygrounds(async (helper, privateKey) => {374 donor = privateKey('//Alice');375 [alice] = await helper.arrange.createAccounts([20n], donor);376 });377 });378379 itEth('Events emitted for mint()', async ({helper}) => {380 const collection = await helper.nft.mintCollection(alice, {});381 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);382 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');383384 const events: any = [];385 contract.events.allEvents((_: any, event: any) => {386 events.push(event);387 });388 const {tokenId} = await collection.mintToken(alice);389390 const event = events[0];391 expect(event.event).to.be.equal('Transfer');392 expect(event.address).to.be.equal(collectionAddress);393 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');394 expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(alice.address));395 expect(event.returnValues.tokenId).to.be.equal(tokenId.toString());396 });397398 itEth('Events emitted for burn()', async ({helper}) => {399 const collection = await helper.nft.mintCollection(alice, {});400 const token = await collection.mintToken(alice);401402 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);403 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');404 405 const events: any = [];406 contract.events.allEvents((_: any, event: any) => {407 events.push(event);408 });409410 await token.burn(alice);411412 const event = events[0];413 expect(event.event).to.be.equal('Transfer');414 expect(event.address).to.be.equal(collectionAddress);415 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));416 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');417 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());418 });419420 itEth('Events emitted for approve()', async ({helper}) => {421 const receiver = helper.eth.createAccount();422423 const collection = await helper.nft.mintCollection(alice, {});424 const token = await collection.mintToken(alice);425426 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);427 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');428 429 const events: any = [];430 contract.events.allEvents((_: any, event: any) => {431 events.push(event);432 });433434 await token.approve(alice, {Ethereum: receiver});435436 const event = events[0];437 expect(event.event).to.be.equal('Approval');438 expect(event.address).to.be.equal(collectionAddress);439 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));440 expect(event.returnValues.approved).to.be.equal(receiver);441 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());442 });443444 itEth('Events emitted for transferFrom()', async ({helper}) => {445 const [bob] = await helper.arrange.createAccounts([10n], donor);446 const receiver = helper.eth.createAccount();447448 const collection = await helper.nft.mintCollection(alice, {});449 const token = await collection.mintToken(alice);450 await token.approve(alice, {Substrate: bob.address});451452 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);453 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');454 455 const events: any = [];456 contract.events.allEvents((_: any, event: any) => {457 events.push(event);458 });459460 await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver});461 462 const event = events[0];463 expect(event.address).to.be.equal(collectionAddress);464 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));465 expect(event.returnValues.to).to.be.equal(receiver);466 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);467 });468469 itEth('Events emitted for transfer()', async ({helper}) => {470 const receiver = helper.eth.createAccount();471472 const collection = await helper.nft.mintCollection(alice, {});473 const token = await collection.mintToken(alice);474475 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);476 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');477 478 const events: any = [];479 contract.events.allEvents((_: any, event: any) => {480 events.push(event);481 });482483 await token.transfer(alice, {Ethereum: receiver});484 485 const event = events[0];486 expect(event.address).to.be.equal(collectionAddress);487 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));488 expect(event.returnValues.to).to.be.equal(receiver);489 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);490 });491});492493describe('Common metadata', () => {494 let donor: IKeyringPair;495 let alice: IKeyringPair;496497 before(async function() {498 await usingEthPlaygrounds(async (helper, privateKey) => {499 donor = privateKey('//Alice');500 [alice] = await helper.arrange.createAccounts([20n], donor);501 });502 });503504 itEth('Returns collection name', async ({helper}) => {505 const caller = await helper.eth.createAccountWithBalance(donor);506 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});507508 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);509 const name = await contract.methods.name().call();510 expect(name).to.equal('oh River');511 });512513 itEth('Returns symbol name', async ({helper}) => {514 const caller = await helper.eth.createAccountWithBalance(donor);515 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});516517 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);518 const symbol = await contract.methods.symbol().call();519 expect(symbol).to.equal('CHANGE');520 });521});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 {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util/playgrounds';18import {IKeyringPair} from '@polkadot/types/types';19import {Contract} from 'web3-eth-contract';202122describe('NFT: Information getting', () => {23 let donor: IKeyringPair;24 let alice: IKeyringPair;2526 before(async function() {27 await usingEthPlaygrounds(async (helper, privateKey) => {28 donor = privateKey('//Alice');29 [alice] = await helper.arrange.createAccounts([10n], donor);30 });31 });32 33 itEth('totalSupply', async ({helper}) => {34 const collection = await helper.nft.mintCollection(alice, {});35 await collection.mintToken(alice);3637 const caller = await helper.eth.createAccountWithBalance(donor);3839 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);40 const totalSupply = await contract.methods.totalSupply().call();4142 expect(totalSupply).to.equal('1');43 });4445 itEth('balanceOf', async ({helper}) => {46 const collection = await helper.nft.mintCollection(alice, {});47 const caller = await helper.eth.createAccountWithBalance(donor);4849 await collection.mintToken(alice, {Ethereum: caller});50 await collection.mintToken(alice, {Ethereum: caller});51 await collection.mintToken(alice, {Ethereum: caller});5253 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);54 const balance = await contract.methods.balanceOf(caller).call();5556 expect(balance).to.equal('3');57 });5859 itEth('ownerOf', async ({helper}) => {60 const collection = await helper.nft.mintCollection(alice, {});61 const caller = await helper.eth.createAccountWithBalance(donor);6263 const token = await collection.mintToken(alice, {Ethereum: caller});6465 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);6667 const owner = await contract.methods.ownerOf(token.tokenId).call();6869 expect(owner).to.equal(caller);70 });71});7273describe('Check ERC721 token URI for NFT', () => {74 let donor: IKeyringPair;7576 before(async function() {77 await usingEthPlaygrounds(async (_helper, privateKey) => {78 donor = privateKey('//Alice');79 });80 });8182 async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {83 const owner = await helper.eth.createAccountWithBalance(donor);84 const receiver = helper.eth.createAccount();8586 const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', tokenPrefix);87 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);88 89 const nextTokenId = await contract.methods.nextTokenId().call();90 expect(nextTokenId).to.be.equal('1');91 const result = await contract.methods.mint(92 receiver,93 nextTokenId,94 ).send();9596 if (propertyKey && propertyValue) {97 // Set URL or suffix98 await contract.methods.setProperty(nextTokenId, propertyKey, Buffer.from(propertyValue)).send();99 }100101 const event = result.events.Transfer;102 expect(event.address).to.be.equal(collectionAddress);103 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');104 expect(event.returnValues.to).to.be.equal(receiver);105 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);106107 return {contract, nextTokenId};108 }109110 itEth('Empty tokenURI', async ({helper}) => {111 const {contract, nextTokenId} = await setup(helper, '');112 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');113 });114115 itEth('TokenURI from url', async ({helper}) => {116 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URI', 'Token URI');117 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');118 });119120 itEth('TokenURI from baseURI + tokenId', async ({helper}) => {121 const {contract, nextTokenId} = await setup(helper, 'BaseURI_');122 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);123 });124125 itEth('TokenURI from baseURI + suffix', async ({helper}) => {126 const suffix = '/some/suffix';127 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URISuffix', suffix);128 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);129 });130});131132describe('NFT: Plain calls', () => {133 let donor: IKeyringPair;134 let alice: IKeyringPair;135136 before(async function() {137 await usingEthPlaygrounds(async (helper, privateKey) => {138 donor = privateKey('//Alice');139 [alice] = await helper.arrange.createAccounts([10n], donor);140 });141 });142143 itEth('Can perform mint()', async ({helper}) => {144 const owner = await helper.eth.createAccountWithBalance(donor);145 const receiver = helper.eth.createAccount();146147 const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', '6', '6', '');148 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);149 const nextTokenId = await contract.methods.nextTokenId().call();150151 expect(nextTokenId).to.be.equal('1');152 const result = await contract.methods.mintWithTokenURI(153 receiver,154 nextTokenId,155 'Test URI',156 ).send();157158 const event = result.events.Transfer;159 expect(event.address).to.be.equal(collectionAddress);160 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');161 expect(event.returnValues.to).to.be.equal(receiver);162 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);163164 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');165166 // TODO: this wont work right now, need release 919000 first167 // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();168 // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();169 // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);170 });171172 //TODO: CORE-302 add eth methods173 itEth.skip('Can perform mintBulk()', async ({helper}) => {174 const caller = await helper.eth.createAccountWithBalance(donor);175 const receiver = helper.eth.createAccount();176177 const collection = await helper.nft.mintCollection(alice);178 await collection.addAdmin(alice, {Ethereum: caller});179180 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);181 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);182 {183 const bulkSize = 3;184 const nextTokenId = await contract.methods.nextTokenId().call();185 expect(nextTokenId).to.be.equal('1');186 const result = await contract.methods.mintBulkWithTokenURI(187 receiver,188 Array.from({length: bulkSize}, (_, i) => (189 [+nextTokenId + i, `Test URI ${i}`]190 )),191 ).send({from: caller});192193 const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.tokenId - b.returnValues.tokenId);194 for (let i = 0; i < bulkSize; i++) {195 const event = events[i];196 expect(event.address).to.equal(collectionAddress);197 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');198 expect(event.returnValues.to).to.equal(receiver);199 expect(event.returnValues.tokenId).to.equal(`${+nextTokenId+i}`);200201 expect(await contract.methods.tokenURI(+nextTokenId + i).call()).to.be.equal(`Test URI ${i}`);202 }203 }204 });205206 itEth('Can perform burn()', async ({helper}) => {207 const caller = await helper.eth.createAccountWithBalance(donor);208209 const collection = await helper.nft.mintCollection(alice, {});210 const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});211212 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);213 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);214215 {216 const result = await contract.methods.burn(tokenId).send({from: caller});217 218 const event = result.events.Transfer;219 expect(event.address).to.be.equal(collectionAddress);220 expect(event.returnValues.from).to.be.equal(caller);221 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');222 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);223 }224 });225226 itEth('Can perform approve()', async ({helper}) => {227 const owner = await helper.eth.createAccountWithBalance(donor);228 const spender = helper.eth.createAccount();229230 const collection = await helper.nft.mintCollection(alice, {});231 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});232233 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);234 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);235236 {237 const result = await contract.methods.approve(spender, tokenId).send({from: owner});238239 const event = result.events.Approval;240 expect(event.address).to.be.equal(collectionAddress);241 expect(event.returnValues.owner).to.be.equal(owner);242 expect(event.returnValues.approved).to.be.equal(spender);243 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);244 }245 });246247 itEth('Can perform transferFrom()', async ({helper}) => {248 const owner = await helper.eth.createAccountWithBalance(donor);249 const spender = await helper.eth.createAccountWithBalance(donor);250 const receiver = helper.eth.createAccount();251252 const collection = await helper.nft.mintCollection(alice, {});253 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});254255 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);256 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);257258 await contract.methods.approve(spender, tokenId).send({from: owner});259260 {261 const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});262263 const event = result.events.Transfer;264 expect(event.address).to.be.equal(collectionAddress);265 expect(event.returnValues.from).to.be.equal(owner);266 expect(event.returnValues.to).to.be.equal(receiver);267 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);268 }269270 {271 const balance = await contract.methods.balanceOf(receiver).call();272 expect(+balance).to.equal(1);273 }274275 {276 const balance = await contract.methods.balanceOf(owner).call();277 expect(+balance).to.equal(0);278 }279 });280281 itEth('Can perform transfer()', async ({helper}) => {282 const collection = await helper.nft.mintCollection(alice, {});283 const owner = await helper.eth.createAccountWithBalance(donor);284 const receiver = helper.eth.createAccount();285286 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});287288 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);289 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);290291 {292 const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});293294 const event = result.events.Transfer;295 expect(event.address).to.be.equal(collectionAddress);296 expect(event.returnValues.from).to.be.equal(owner);297 expect(event.returnValues.to).to.be.equal(receiver);298 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);299 }300301 {302 const balance = await contract.methods.balanceOf(owner).call();303 expect(+balance).to.equal(0);304 }305306 {307 const balance = await contract.methods.balanceOf(receiver).call();308 expect(+balance).to.equal(1);309 }310 });311});312313describe('NFT: Fees', () => {314 let donor: IKeyringPair;315 let alice: IKeyringPair;316317 before(async function() {318 await usingEthPlaygrounds(async (helper, privateKey) => {319 donor = privateKey('//Alice');320 [alice] = await helper.arrange.createAccounts([10n], donor);321 });322 });323 324 itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {325 const owner = await helper.eth.createAccountWithBalance(donor);326 const spender = helper.eth.createAccount();327328 const collection = await helper.nft.mintCollection(alice, {});329 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});330331 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);332333 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));334 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));335 });336337 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {338 const owner = await helper.eth.createAccountWithBalance(donor);339 const spender = await helper.eth.createAccountWithBalance(donor);340341 const collection = await helper.nft.mintCollection(alice, {});342 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});343344 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);345346 await contract.methods.approve(spender, tokenId).send({from: owner});347348 const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));349 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));350 });351352 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {353 const owner = await helper.eth.createAccountWithBalance(donor);354 const receiver = helper.eth.createAccount();355356 const collection = await helper.nft.mintCollection(alice, {});357 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});358359 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);360361 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));362 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));363 });364});365366describe('NFT: Substrate calls', () => {367 let donor: IKeyringPair;368 let alice: IKeyringPair;369370 before(async function() {371 await usingEthPlaygrounds(async (helper, privateKey) => {372 donor = privateKey('//Alice');373 [alice] = await helper.arrange.createAccounts([20n], donor);374 });375 });376377 itEth('Events emitted for mint()', async ({helper}) => {378 const collection = await helper.nft.mintCollection(alice, {});379 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);380 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');381382 const events: any = [];383 contract.events.allEvents((_: any, event: any) => {384 events.push(event);385 });386 const {tokenId} = await collection.mintToken(alice);387388 const event = events[0];389 expect(event.event).to.be.equal('Transfer');390 expect(event.address).to.be.equal(collectionAddress);391 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');392 expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(alice.address));393 expect(event.returnValues.tokenId).to.be.equal(tokenId.toString());394 });395396 itEth('Events emitted for burn()', async ({helper}) => {397 const collection = await helper.nft.mintCollection(alice, {});398 const token = await collection.mintToken(alice);399400 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);401 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');402 403 const events: any = [];404 contract.events.allEvents((_: any, event: any) => {405 events.push(event);406 });407408 await token.burn(alice);409410 const event = events[0];411 expect(event.event).to.be.equal('Transfer');412 expect(event.address).to.be.equal(collectionAddress);413 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));414 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');415 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());416 });417418 itEth('Events emitted for approve()', async ({helper}) => {419 const receiver = helper.eth.createAccount();420421 const collection = await helper.nft.mintCollection(alice, {});422 const token = await collection.mintToken(alice);423424 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);425 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');426 427 const events: any = [];428 contract.events.allEvents((_: any, event: any) => {429 events.push(event);430 });431432 await token.approve(alice, {Ethereum: receiver});433434 const event = events[0];435 expect(event.event).to.be.equal('Approval');436 expect(event.address).to.be.equal(collectionAddress);437 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));438 expect(event.returnValues.approved).to.be.equal(receiver);439 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());440 });441442 itEth('Events emitted for transferFrom()', async ({helper}) => {443 const [bob] = await helper.arrange.createAccounts([10n], donor);444 const receiver = helper.eth.createAccount();445446 const collection = await helper.nft.mintCollection(alice, {});447 const token = await collection.mintToken(alice);448 await token.approve(alice, {Substrate: bob.address});449450 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);451 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');452 453 const events: any = [];454 contract.events.allEvents((_: any, event: any) => {455 events.push(event);456 });457458 await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver});459 460 const event = events[0];461 expect(event.address).to.be.equal(collectionAddress);462 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));463 expect(event.returnValues.to).to.be.equal(receiver);464 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);465 });466467 itEth('Events emitted for transfer()', async ({helper}) => {468 const receiver = helper.eth.createAccount();469470 const collection = await helper.nft.mintCollection(alice, {});471 const token = await collection.mintToken(alice);472473 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);474 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');475 476 const events: any = [];477 contract.events.allEvents((_: any, event: any) => {478 events.push(event);479 });480481 await token.transfer(alice, {Ethereum: receiver});482 483 const event = events[0];484 expect(event.address).to.be.equal(collectionAddress);485 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));486 expect(event.returnValues.to).to.be.equal(receiver);487 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);488 });489});490491describe('Common metadata', () => {492 let donor: IKeyringPair;493 let alice: IKeyringPair;494495 before(async function() {496 await usingEthPlaygrounds(async (helper, privateKey) => {497 donor = privateKey('//Alice');498 [alice] = await helper.arrange.createAccounts([20n], donor);499 });500 });501502 itEth('Returns collection name', async ({helper}) => {503 const caller = await helper.eth.createAccountWithBalance(donor);504 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});505506 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);507 const name = await contract.methods.name().call();508 expect(name).to.equal('oh River');509 });510511 itEth('Returns symbol name', async ({helper}) => {512 const caller = await helper.eth.createAccountWithBalance(donor);513 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});514515 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);516 const symbol = await contract.methods.symbol().call();517 expect(symbol).to.equal('CHANGE');518 });519});tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -101,7 +101,7 @@
itEth('Can perform mint()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createERC721MetadataNFTCollection(owner, 'A', 'A', 'A', '');
+ const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'A', 'A', 'A', '');
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -124,7 +124,7 @@
itEth('Can perform mint()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createERC721MetadataRFTCollection(owner, 'Minty', '6', '6', '');
+ const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Minty', '6', '6', '');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
const nextTokenId = await contract.methods.nextTokenId().call();
@@ -147,7 +147,7 @@
itEth('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createERC721MetadataRFTCollection(owner, 'MintBulky', '6', '6', '');
+ const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'MintBulky', '6', '6', '');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
{
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -80,14 +80,12 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelper.methods.createERC721MetadataNFTCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});
- const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
+ const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Mint collection', 'a', 'b', tokenPrefix);
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
const nextTokenId = await contract.methods.nextTokenId().call();
expect(nextTokenId).to.be.equal('1');
- result = await contract.methods.mint(
+ const result = await contract.methods.mint(
receiver,
nextTokenId,
).send();
@@ -112,7 +110,7 @@
});
itEth('TokenURI from url', async ({helper}) => {
- const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');
+ const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URI', 'Token URI');
expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');
});
@@ -123,7 +121,7 @@
itEth('TokenURI from baseURI + suffix', async ({helper}) => {
const suffix = '/some/suffix';
- const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);
+ const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URISuffix', suffix);
expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);
});
});
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
@@ -186,11 +186,11 @@
return {collectionId, collectionAddress};
}
- async createERC721MetadataNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
+ async createERC721MetadataCompatibleNFTCollection(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.createERC721MetadataNFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
+ const result = await collectionHelper.methods.createERC721MetadataCompatibleNFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);
@@ -210,11 +210,11 @@
return {collectionId, collectionAddress};
}
- async createERC721MetadataRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
+ 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.createERC721MetadataRFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
+ 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);
const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);