From 84f3ed2b364665f80624a847f4fc39433e773fdd Mon Sep 17 00:00:00 2001 From: Max Andreev Date: Thu, 20 Oct 2022 10:41:45 +0000 Subject: [PATCH] Merge branch 'develop' into rapid-parallel-start-v2 --- --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -668,7 +668,7 @@ /// should be obtained with `nextTokenId` method /// @param to The new owner /// @param tokenIds IDs of the minted NFTs - // #[solidity(hide)] + #[solidity(hide)] #[weight(>::create_multiple_items(token_ids.len() as u32))] fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -705,7 +705,7 @@ /// numbers and first number should be obtained with `nextTokenId` method /// @param to The new owner /// @param tokens array of pairs of token ID and token URI for minted tokens - #[solidity(/*hide,*/ rename_selector = "mintBulkWithTokenURI")] + #[solidity(hide, rename_selector = "mintBulkWithTokenURI")] #[weight(>::create_multiple_items(tokens.len() as u32))] fn mint_bulk_with_token_uri( &mut self, --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -585,36 +585,36 @@ dummy; return 0; } + // /// @notice Function to mint multiple tokens. + // /// @dev `tokenIds` should be an array of consecutive numbers and first number + // /// should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokenIds IDs of the minted NFTs + // /// @dev EVM selector for this function is: 0x44a9945e, + // /// or in textual repr: mintBulk(address,uint256[]) + // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) { + // require(false, stub_error); + // to; + // tokenIds; + // dummy = 0; + // return false; + // } - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted NFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) { - require(false, stub_error); - to; - tokenIds; - dummy = 0; - return false; - } + // /// @notice Function to mint multiple tokens with the given tokenUris. + // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive + // /// numbers and first number should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokens array of pairs of token ID and token URI for minted tokens + // /// @dev EVM selector for this function is: 0x36543006, + // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) + // function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) public returns (bool) { + // require(false, stub_error); + // to; + // tokens; + // dummy = 0; + // return false; + // } - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) public returns (bool) { - require(false, stub_error); - to; - tokens; - dummy = 0; - return false; - } } /// @dev anonymous struct --- a/pallets/refungible/src/erc.rs +++ b/pallets/refungible/src/erc.rs @@ -705,7 +705,7 @@ /// should be obtained with `nextTokenId` method /// @param to The new owner /// @param tokenIds IDs of the minted RFTs - // #[solidity(hide)] + #[solidity(hide)] #[weight(>::create_multiple_items(token_ids.len() as u32))] fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -748,7 +748,7 @@ /// numbers and first number should be obtained with `nextTokenId` method /// @param to The new owner /// @param tokens array of pairs of token ID and token URI for minted tokens - #[solidity(/*hide,*/ rename_selector = "mintBulkWithTokenURI")] + #[solidity(hide, rename_selector = "mintBulkWithTokenURI")] #[weight(>::create_multiple_items(tokens.len() as u32))] fn mint_bulk_with_token_uri( &mut self, --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -586,35 +586,35 @@ return 0; } - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted RFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) { - require(false, stub_error); - to; - tokenIds; - dummy = 0; - return false; - } + // /// @notice Function to mint multiple tokens. + // /// @dev `tokenIds` should be an array of consecutive numbers and first number + // /// should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokenIds IDs of the minted RFTs + // /// @dev EVM selector for this function is: 0x44a9945e, + // /// or in textual repr: mintBulk(address,uint256[]) + // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) { + // require(false, stub_error); + // to; + // tokenIds; + // dummy = 0; + // return false; + // } - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) public returns (bool) { - require(false, stub_error); - to; - tokens; - dummy = 0; - return false; - } + // /// @notice Function to mint multiple tokens with the given tokenUris. + // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive + // /// numbers and first number should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokens array of pairs of token ID and token URI for minted tokens + // /// @dev EVM selector for this function is: 0x36543006, + // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) + // function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) public returns (bool) { + // require(false, stub_error); + // to; + // tokens; + // dummy = 0; + // return false; + // } /// Returns EVM address for refungible token /// --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -50,7 +50,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 929030, + spec_version: 929031, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, --- a/runtime/quartz/src/lib.rs +++ b/runtime/quartz/src/lib.rs @@ -50,7 +50,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 929030, + spec_version: 929031, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, --- a/runtime/unique/src/lib.rs +++ b/runtime/unique/src/lib.rs @@ -50,7 +50,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 929030, + spec_version: 929031, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -384,24 +384,24 @@ /// @dev EVM selector for this function is: 0x75794a3c, /// or in textual repr: nextTokenId() function nextTokenId() external view returns (uint256); + // /// @notice Function to mint multiple tokens. + // /// @dev `tokenIds` should be an array of consecutive numbers and first number + // /// should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokenIds IDs of the minted NFTs + // /// @dev EVM selector for this function is: 0x44a9945e, + // /// or in textual repr: mintBulk(address,uint256[]) + // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool); - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted NFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) external returns (bool); + // /// @notice Function to mint multiple tokens with the given tokenUris. + // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive + // /// numbers and first number should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokens array of pairs of token ID and token URI for minted tokens + // /// @dev EVM selector for this function is: 0x36543006, + // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) + // function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) external returns (bool); - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) external returns (bool); } /// @dev anonymous struct --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -385,23 +385,23 @@ /// or in textual repr: nextTokenId() function nextTokenId() external view returns (uint256); - /// @notice Function to mint multiple tokens. - /// @dev `tokenIds` should be an array of consecutive numbers and first number - /// should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokenIds IDs of the minted RFTs - /// @dev EVM selector for this function is: 0x44a9945e, - /// or in textual repr: mintBulk(address,uint256[]) - function mintBulk(address to, uint256[] memory tokenIds) external returns (bool); + // /// @notice Function to mint multiple tokens. + // /// @dev `tokenIds` should be an array of consecutive numbers and first number + // /// should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokenIds IDs of the minted RFTs + // /// @dev EVM selector for this function is: 0x44a9945e, + // /// or in textual repr: mintBulk(address,uint256[]) + // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool); - /// @notice Function to mint multiple tokens with the given tokenUris. - /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive - /// numbers and first number should be obtained with `nextTokenId` method - /// @param to The new owner - /// @param tokens array of pairs of token ID and token URI for minted tokens - /// @dev EVM selector for this function is: 0x36543006, - /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) - function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) external returns (bool); + // /// @notice Function to mint multiple tokens with the given tokenUris. + // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive + // /// numbers and first number should be obtained with `nextTokenId` method + // /// @param to The new owner + // /// @param tokens array of pairs of token ID and token URI for minted tokens + // /// @dev EVM selector for this function is: 0x36543006, + // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[]) + // function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) external returns (bool); /// Returns EVM address for refungible token /// --- a/tests/src/eth/nonFungibleAbi.json +++ b/tests/src/eth/nonFungibleAbi.json @@ -278,34 +278,6 @@ { "inputs": [ { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" } - ], - "name": "mintBulk", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { - "components": [ - { "internalType": "uint256", "name": "field_0", "type": "uint256" }, - { "internalType": "string", "name": "field_1", "type": "string" } - ], - "internalType": "struct Tuple6[]", - "name": "tokens", - "type": "tuple[]" - } - ], - "name": "mintBulkWithTokenURI", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, { "internalType": "string", "name": "tokenUri", "type": "string" } ], "name": "mintWithTokenURI", --- a/tests/src/eth/reFungible.test.ts +++ b/tests/src/eth/reFungible.test.ts @@ -131,7 +131,7 @@ expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI'); }); - itEth('Can perform mintBulk()', async ({helper}) => { + itEth.skip('Can perform mintBulk()', async ({helper}) => { const owner = await helper.eth.createAccountWithBalance(donor); const receiver = helper.eth.createAccount(); const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'MintBulky', '6', '6', ''); --- a/tests/src/eth/reFungibleAbi.json +++ b/tests/src/eth/reFungibleAbi.json @@ -278,34 +278,6 @@ { "inputs": [ { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" } - ], - "name": "mintBulk", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { - "components": [ - { "internalType": "uint256", "name": "field_0", "type": "uint256" }, - { "internalType": "string", "name": "field_1", "type": "string" } - ], - "internalType": "struct Tuple6[]", - "name": "tokens", - "type": "tuple[]" - } - ], - "name": "mintBulkWithTokenURI", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, { "internalType": "string", "name": "tokenUri", "type": "string" } ], "name": "mintWithTokenURI", -- gitstuff