From 44771a5df69618965f6ca01c733f71dd1b74572d Mon Sep 17 00:00:00 2001 From: Grigoriy Simonov Date: Wed, 12 Oct 2022 15:24:15 +0000 Subject: [PATCH] feat: updates for createERC721MetadataCompatibleCollections --- --- 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) } --- 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(>::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(>::create_collection())] - #[solidity(rename_selector = "createERC721MetadataRFTCollection")] + #[solidity(rename_selector = "createERC721MetadataCompatibleRFTCollection")] fn create_refungible_collection_with_properties( &mut self, caller: caller, --- 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, --- 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, --- 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" --- 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}) => { --- 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); --- a/tests/src/eth/nonFungible.test.ts +++ b/tests/src/eth/nonFungible.test.ts @@ -83,14 +83,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.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', tokenPrefix); const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', 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(); @@ -115,7 +113,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'); }); @@ -126,7 +124,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); }); }); @@ -146,7 +144,7 @@ const owner = await helper.eth.createAccountWithBalance(donor); const receiver = helper.eth.createAccount(); - const {collectionAddress} = await helper.eth.createERC721MetadataNFTCollection(owner, 'Mint collection', '6', '6', ''); + const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', '6', '6', ''); const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner); const nextTokenId = await contract.methods.nextTokenId().call(); --- 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(); --- 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); { --- 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); }); }); --- 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); -- gitstuff